diff options
Diffstat (limited to 'Tools/efl')
| -rw-r--r-- | Tools/efl/jhbuild.modules | 9 | ||||
| -rw-r--r-- | Tools/efl/patches/harfbuzz-icu-detection-fix.patch | 36 |
2 files changed, 41 insertions, 4 deletions
diff --git a/Tools/efl/jhbuild.modules b/Tools/efl/jhbuild.modules index 55287880d..04de528ba 100644 --- a/Tools/efl/jhbuild.modules +++ b/Tools/efl/jhbuild.modules @@ -153,11 +153,12 @@ </autotools> <autotools id="harfbuzz" autogen-sh="configure"> - <branch module="software/harfbuzz/release/harfbuzz-0.9.2.tar.bz2" version="0.9.2" - checkoutdir="harfbuzz-0.9.2" + <branch module="software/harfbuzz/release/harfbuzz-0.9.6.tar.bz2" version="0.9.6" + checkoutdir="harfbuzz-0.9.6" repo="freedesktop.org" - hash="sha256:c9b581d6357a32043b84ec78179390b582448de790deb487dfdb90b632dc8558" - md5sum="f1c1a2793b44b4d6613f58cc92caa366"> + hash="sha256:394a849d6061993018754b0cc04110891ad215e3df3f6953b75dcc55a11f9d9b" + md5sum="f3a100a0512c185b211a0deb4790c34c"> + <patch file="harfbuzz-icu-detection-fix.patch" strip="1" /> </branch> </autotools> diff --git a/Tools/efl/patches/harfbuzz-icu-detection-fix.patch b/Tools/efl/patches/harfbuzz-icu-detection-fix.patch new file mode 100644 index 000000000..567e24d6c --- /dev/null +++ b/Tools/efl/patches/harfbuzz-icu-detection-fix.patch @@ -0,0 +1,36 @@ +diff --git a/configure.ac b/configure.ac +index b1948f1..9ae69dd 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -184,6 +184,31 @@ fi + AM_CONDITIONAL(HAVE_ICU_LE, $have_icu_le) + + dnl ========================================================================== ++dnl Fallback to icu-config if ICU pkg-config files could not be found ++dnl ========================================================================== ++ ++if test "$have_icu" != "true"; then ++ AC_PATH_PROG(icu_config, icu-config, no) ++ AC_MSG_CHECKING([for ICU by using icu-config fallback]) ++ if test "$icu_config" != "no"; then ++ # We don't use --cflags as this gives us a lot of things that we don't ++ # necessarily want, like debugging and optimization flags ++ # See man (1) icu-config for more info. ++ ICU_CFLAGS=`$icu_config --cppflags` ++ ICU_LIBS=`$icu_config --ldflags-libsonly --ldflags-layout` ++ AC_SUBST(ICU_CFLAGS) ++ AC_SUBST(ICU_LIBS) ++ AC_DEFINE(HAVE_ICU_LE, 1, [Have ICU Layout Engine library]) ++ AC_DEFINE(HAVE_ICU, 1, [Have ICU library]) ++ AM_CONDITIONAL(HAVE_ICU, true) ++ AM_CONDITIONAL(HAVE_ICU_LE, true) ++ AC_MSG_RESULT([yes]) ++ else ++ AC_MSG_RESULT([no]) ++ fi ++fi ++ ++dnl ========================================================================== + + PKG_CHECK_MODULES(GRAPHITE2, graphite2, have_graphite=true, have_graphite=false) + if $have_graphite; then |