diff options
| author |   Akinori Hattori <hattya@gentoo.org> | 2018-08-29 21:42:52 +0900 |
|---|---|---|
| committer | Akinori Hattori <hattya@gentoo.org> | 2018-08-29 21:46:32 +0900 |
| commit | a5cfb0c36c36a3dc93e3ed874babfe8b90406a2b (patch) | |
| tree | b39760b0624c483ae28f668a73e515102fdcc2f1 /dev-libs/m17n-lib/files | |
| parent | net-ftp/filezilla: 3.36.0 bump (diff) | |
| download | gentoo-a5cfb0c36c36a3dc93e3ed874babfe8b90406a2b.tar.gz gentoo-a5cfb0c36c36a3dc93e3ed874babfe8b90406a2b.tar.bz2 gentoo-a5cfb0c36c36a3dc93e3ed874babfe8b90406a2b.zip | |
dev-libs/m17n-lib: update patches
Package-Manager: Portage-2.3.40, Repoman-2.3.9
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-gui.patch | 13 |
2 files changed, 18 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-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) - |