From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1365F138335 for ; Wed, 29 Aug 2018 12:47:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E8BC4E07D8; Wed, 29 Aug 2018 12:47:07 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A7A77E07D8 for ; Wed, 29 Aug 2018 12:47:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 82DCE33BE93 for ; Wed, 29 Aug 2018 12:47:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EB8263B5 for ; Wed, 29 Aug 2018 12:47:03 +0000 (UTC) From: "Akinori Hattori" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Akinori Hattori" Message-ID: <1535546792.a5cfb0c36c36a3dc93e3ed874babfe8b90406a2b.hattya@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/m17n-lib/, dev-libs/m17n-lib/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/m17n-lib/files/m17n-lib-configure.patch dev-libs/m17n-lib/files/m17n-lib-gui.patch dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild dev-libs/m17n-lib/m17n-lib-1.8.0.ebuild X-VCS-Directories: dev-libs/m17n-lib/ dev-libs/m17n-lib/files/ X-VCS-Committer: hattya X-VCS-Committer-Name: Akinori Hattori X-VCS-Revision: a5cfb0c36c36a3dc93e3ed874babfe8b90406a2b X-VCS-Branch: master Date: Wed, 29 Aug 2018 12:47:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f9c260b7-6532-4afa-94f2-a4b6ac111a20 X-Archives-Hash: d90257a65e606211649408a9f451b23e commit: a5cfb0c36c36a3dc93e3ed874babfe8b90406a2b Author: Akinori Hattori gentoo org> AuthorDate: Wed Aug 29 12:42:52 2018 +0000 Commit: Akinori Hattori gentoo org> CommitDate: Wed Aug 29 12:46:32 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5cfb0c3 dev-libs/m17n-lib: update patches Package-Manager: Portage-2.3.40, Repoman-2.3.9 dev-libs/m17n-lib/files/m17n-lib-configure.patch | 25 +++++++++++++++++------- dev-libs/m17n-lib/files/m17n-lib-gui.patch | 13 ------------ dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild | 1 - dev-libs/m17n-lib/m17n-lib-1.8.0.ebuild | 1 - 4 files changed, 18 insertions(+), 22 deletions(-) diff --git a/dev-libs/m17n-lib/files/m17n-lib-configure.patch b/dev-libs/m17n-lib/files/m17n-lib-configure.patch index 00ba09493f3..04ffc7749a5 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 b60d81bbc22..00000000000 --- 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/m17n-lib-1.7.0.ebuild b/dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild index 089a7275cc9..b5dcd1285ee 100644 --- a/dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild +++ b/dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild @@ -36,7 +36,6 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}"/${PN}-configure.patch "${FILESDIR}"/${PN}-freetype.patch - "${FILESDIR}"/${PN}-gui.patch "${FILESDIR}"/${PN}-ispell.patch "${FILESDIR}"/${PN}-parallel-make.patch ) diff --git a/dev-libs/m17n-lib/m17n-lib-1.8.0.ebuild b/dev-libs/m17n-lib/m17n-lib-1.8.0.ebuild index 7ea10bb0d92..ca3d353d0df 100644 --- a/dev-libs/m17n-lib/m17n-lib-1.8.0.ebuild +++ b/dev-libs/m17n-lib/m17n-lib-1.8.0.ebuild @@ -36,7 +36,6 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}"/${PN}-configure.patch "${FILESDIR}"/${PN}-freetype.patch - "${FILESDIR}"/${PN}-gui.patch "${FILESDIR}"/${PN}-ispell.patch "${FILESDIR}"/${PN}-parallel-make.patch )