configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 429a4af9bb53bd0b69170e5e518352c47b3c00a0
Author: Rene Engelhard <[email protected]>
AuthorDate: Thu Sep 8 05:07:45 2022 +0200
Commit: René Engelhard <[email protected]>
CommitDate: Thu Sep 8 05:18:35 2022 +0200
revert configure.ac check for graphite2 to 0.9.3
root@frodo:/# grep Version /usr/lib/x86_64-linux-gnu/pkgconfig/graphite2.pc
Version: 3.0.1
root@frodo:/# dpkg -l libgraphite2-dev
Desired=Unknown/Install/Remove/Purge/Hold
|
Status=Not/Inst/Conf-files/Unpacked/halF-conf/Half-inst/trig-aWait/Trig-pend
|/ Err?=(none)/Reinst-required (Status,Err: uppercase=bad)
||/ Name Version Architecture Description
+++-======================-============-============-==========================>
ii libgraphite2-dev:amd64 1.3.14-1 amd64 Development files for
libg
2.0.0 is a internal version (see
https://github.com/silnrsi/graphite/commit/175151a45f4c228af912d52f8c299b96b124a136).
At least 2.0.0 is fullfilled, but probably we shouldn't use it
for checks
Change-Id: I70ac1ff20ca5d583bbfa961bfd275ff6432d243c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139627
Reviewed-by: خالد حسني <[email protected]>
Tested-by: René Engelhard <[email protected]>
diff --git a/configure.ac b/configure.ac
index 6f8158940266..7b03df8ee0aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10878,7 +10878,7 @@ dnl
===================================================================
GRAPHITE_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/graphite/include
-DGRAPHITE2_STATIC"
GRAPHITE_LIBS_internal="-L${WORKDIR}/LinkTarget/StaticLibrary -lgraphite"
-libo_CHECK_SYSTEM_MODULE([graphite],[GRAPHITE],[graphite2 >= 2.0.0])
+libo_CHECK_SYSTEM_MODULE([graphite],[GRAPHITE],[graphite2 >= 0.9.3])
HARFBUZZ_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/harfbuzz/src"
HARFBUZZ_LIBS_internal="-L${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs
-lharfbuzz"
