diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-08-29 20:19:23 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-08-29 20:19:23 +0100 |
commit | 12bb627384ddfd47382b9f1b6464481a58d01ebb (patch) | |
tree | f9760c04ccd4fcd7de214e2acd5b0e43fb530aa9 /dev-libs/m17n-lib/files | |
parent | 5fdd950c7ae03e12746a45c86d85861beaacc846 (diff) |
gentoo resync : 29.08.2018
Diffstat (limited to 'dev-libs/m17n-lib/files')
-rw-r--r-- | dev-libs/m17n-lib/files/m17n-lib-configure.patch | 25 | ||||
-rw-r--r-- | dev-libs/m17n-lib/files/m17n-lib-freetype.patch (renamed from dev-libs/m17n-lib/files/m17n-lib-1.7.0-no-freetype.patch) | 0 | ||||
-rw-r--r-- | dev-libs/m17n-lib/files/m17n-lib-ftconfig.patch | 29 | ||||
-rw-r--r-- | dev-libs/m17n-lib/files/m17n-lib-gui.patch | 13 | ||||
-rw-r--r-- | dev-libs/m17n-lib/files/m17n-lib-pkg-config.patch | 19 |
5 files changed, 66 insertions, 20 deletions
diff --git a/dev-libs/m17n-lib/files/m17n-lib-configure.patch b/dev-libs/m17n-lib/files/m17n-lib-configure.patch index 00ba09493f3d..04ffc7749a5b 100644 --- a/dev-libs/m17n-lib/files/m17n-lib-configure.patch +++ b/dev-libs/m17n-lib/files/m17n-lib-configure.patch @@ -1,6 +1,17 @@ --- a/configure.ac +++ b/configure.ac -@@ -125,7 +125,9 @@ if test "x$no_x" != "xyes"; then +@@ -97,8 +97,8 @@ + + dnl Checks which levels of APIs should be compiled. + +-AC_ARG_ENABLE(gui, +- AS_HELP_STRING([--enable-gui],[enable GUI level APIs (default is YES)])) ++AC_ARG_WITH(gui, ++ AS_HELP_STRING([--with-gui],[enable GUI level APIs (default is YES)])) + + AM_CONDITIONAL(WITH_GUI, test x$with_gui != xno) + +@@ -125,7 +125,9 @@ X11_LD_FLAGS="-lXt -lX11" M17N_EXT_LIBS="$M17N_EXT_LIBS X11" @@ -11,7 +22,7 @@ AC_DEFINE(HAVE_X11_XAW_COMMAND_H, 1, [Define to 1 if you have the Xaw header files.]) XAW_LD_FLAGS="-lXaw -lXmu" -@@ -149,7 +151,9 @@ else +@@ -149,7 +151,9 @@ fi AC_CHECK_LIB(fribidi, fribidi_set_mirroring, HAVE_FRIBIDI=yes, HAVE_FRIBIDI=no) AC_CHECK_HEADER(fribidi/fribidi.h,, HAVE_FRIBIDI=no) @@ -22,7 +33,7 @@ AC_DEFINE(HAVE_FRIBIDI, 1, [Define to 1 if you have Fribidi library and header file.]) M17N_EXT_LIBS="$M17N_EXT_LIBS fribidi" -@@ -202,8 +206,10 @@ fi +@@ -202,8 +206,10 @@ AC_SUBST(OTF_LD_FLAGS) dnl Check for Freetype2 usability. @@ -34,7 +45,7 @@ FREETYPE_INC=`freetype-config --cflags` save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $FREETYPE_INC" -@@ -255,7 +261,9 @@ AC_CHECK_HEADER(X11/Xft/Xft.h,, HAVE_XFT2=no, +@@ -255,7 +261,9 @@ #else Version too old. Compiling this line should fail. #endif]) @@ -45,7 +56,7 @@ AC_DEFINE(HAVE_XFT2, 1, [Define to 1 if you have Xft2 library and header file.]) M17N_EXT_LIBS="$M17N_EXT_LIBS xft2" -@@ -330,7 +338,9 @@ else +@@ -330,7 +338,9 @@ fi AC_CHECK_LIB(xml2, xmlParseMemory, HAVE_XML2=yes, HAVE_XML2=no) AC_CHECK_HEADER(libxml/tree.h,, HAVE_XML2=no, /**/) @@ -56,7 +67,7 @@ AC_DEFINE(HAVE_XML2, 1, [Define to 1 if you have libxml2 library and header file]) M17N_EXT_LIBS="$M17N_EXT_LIBS xml2" -@@ -344,7 +354,9 @@ AC_SUBST(XML2_LD_FLAGS) +@@ -344,7 +354,9 @@ dnl Check for Anthy usability. PKG_CHECK_MODULES(ANTHY, anthy, HAVE_ANTHY=yes, HAVE_ANTHY=no) @@ -67,7 +78,7 @@ AC_DEFINE(HAVE_ANTHY, 1, [Define to 1 if you have Anthy library and header file]) M17N_EXT_LIBS="$M17N_EXT_LIBS anthy" -@@ -355,7 +367,9 @@ AC_SUBST(ANTHY_LD_FLAGS) +@@ -355,7 +367,9 @@ dnl Check for Ispell usability. AC_CHECK_PROG(HAVE_ISPELL, ispell, yes) diff --git a/dev-libs/m17n-lib/files/m17n-lib-1.7.0-no-freetype.patch b/dev-libs/m17n-lib/files/m17n-lib-freetype.patch index 59b040c4335b..59b040c4335b 100644 --- a/dev-libs/m17n-lib/files/m17n-lib-1.7.0-no-freetype.patch +++ b/dev-libs/m17n-lib/files/m17n-lib-freetype.patch diff --git a/dev-libs/m17n-lib/files/m17n-lib-ftconfig.patch b/dev-libs/m17n-lib/files/m17n-lib-ftconfig.patch new file mode 100644 index 000000000000..203f836bf942 --- /dev/null +++ b/dev-libs/m17n-lib/files/m17n-lib-ftconfig.patch @@ -0,0 +1,29 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -210,21 +210,20 @@ + dnl Check for Freetype2 usability. + AC_ARG_WITH(freetype, + AS_HELP_STRING([--with-freetype],[enable Freetype support])) +-AC_CHECK_PROG(HAVE_FREETYPE_CONFIG, freetype-config, yes) +-if test "x$with_freetype" != "xno" -a "x$HAVE_FREETYPE_CONFIG" = "xyes"; then +- FREETYPE_INC=`freetype-config --cflags` ++if test "x$with_freetype" != "xno"; then ++ PKG_CHECK_MODULES([FT2], [freetype2]) + save_CPPFLAGS="$CPPFLAGS" +- CPPFLAGS="$CPPFLAGS $FREETYPE_INC" ++ CPPFLAGS="$CPPFLAGS $FT2_CFLAGS" + AC_CHECK_HEADER(ft2build.h, HAVE_FREETYPE=yes, + HAVE_FREETYPE=no CPPFLAGS="$save_CPPFLAGS") + if test "x$HAVE_FREETYPE" = "xyes" ; then + save_LIBS="$LIBS" +- LIBS="$LIBS `freetype-config --libs`" ++ LIBS="$LIBS $FT2_LIBS" + AC_CHECK_LIB(freetype, FT_Init_FreeType, HAVE_FREETYPE=yes, + HAVE_FREETYPE=no) + LIBS="$save_LIBS" + if test "x$HAVE_FREETYPE" = "xyes"; then +- FREETYPE_LD_FLAGS=`freetype-config --libs` ++ FREETYPE_LD_FLAGS=$FT2_LIBS + AC_DEFINE(HAVE_FREETYPE, 1, + [Define to 1 if you have FreeType library and header file.]) + M17N_EXT_LIBS="$M17N_EXT_LIBS freetype" diff --git a/dev-libs/m17n-lib/files/m17n-lib-gui.patch b/dev-libs/m17n-lib/files/m17n-lib-gui.patch deleted file mode 100644 index b60d81bbc221..000000000000 --- a/dev-libs/m17n-lib/files/m17n-lib-gui.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -97,8 +97,8 @@ - - dnl Checks which levels of APIs should be compiled. - --AC_ARG_ENABLE(gui, -- AS_HELP_STRING([--enable-gui],[enable GUI level APIs (default is YES)])) -+AC_ARG_WITH(gui, -+ AS_HELP_STRING([--with-gui],[enable GUI level APIs (default is YES)])) - - AM_CONDITIONAL(WITH_GUI, test x$with_gui != xno) - diff --git a/dev-libs/m17n-lib/files/m17n-lib-pkg-config.patch b/dev-libs/m17n-lib/files/m17n-lib-pkg-config.patch new file mode 100644 index 000000000000..aabe12e586d8 --- /dev/null +++ b/dev-libs/m17n-lib/files/m17n-lib-pkg-config.patch @@ -0,0 +1,19 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -120,7 +120,6 @@ + M17N_EXT_LIBS= + + AC_CHECK_PROG(HAVE_PKG_CONFIG, pkg-config, yes) +-AM_CONDITIONAL([HAVE_PKG_CONFIG], [test x$HAVE_PKG_CONFIG = xyes]) + + if test "x$no_x" != "xyes"; then + AC_DEFINE(HAVE_X11, 1, [Define to 1 if you have X11.]) +@@ -318,6 +317,8 @@ + + fi + ++AM_CONDITIONAL([HAVE_PKG_CONFIG], [test x$HAVE_PKG_CONFIG = xyes]) ++ + dnl Check for libxml2 usability. + save_CPPFLAGS="$CPPFLAGS" + save_LIBS="$LIBS" |