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 04B76138332 for ; Mon, 28 May 2018 14:56:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B8EFDE086D; Mon, 28 May 2018 14:56:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 7D133E0863 for ; Mon, 28 May 2018 14:56:23 +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 37351335C72 for ; Mon, 28 May 2018 14:56:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7AAFC2A0 for ; Mon, 28 May 2018 14:56:20 +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: <1527519356.d2d7c1b5b3e7207257f6e82b0c98210b9037fb3a.hattya@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/uim/files/, app-i18n/uim/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-i18n/uim/files/uim-1.5.4-zhTW.patch app-i18n/uim/files/uim-1.6.0-gentoo.patch app-i18n/uim/files/uim-1.8.6-gentoo.patch app-i18n/uim/files/uim-zh-TW.patch app-i18n/uim/uim-1.8.6-r1.ebuild app-i18n/uim/uim-1.8.6-r2.ebuild X-VCS-Directories: app-i18n/uim/files/ app-i18n/uim/ X-VCS-Committer: hattya X-VCS-Committer-Name: Akinori Hattori X-VCS-Revision: d2d7c1b5b3e7207257f6e82b0c98210b9037fb3a X-VCS-Branch: master Date: Mon, 28 May 2018 14:56:20 +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: 20b5dcfb-cdf9-4346-b264-28cee0937122 X-Archives-Hash: c631a1db130317280ce74b807635e3d8 commit: d2d7c1b5b3e7207257f6e82b0c98210b9037fb3a Author: Akinori Hattori gentoo org> AuthorDate: Mon May 28 14:10:57 2018 +0000 Commit: Akinori Hattori gentoo org> CommitDate: Mon May 28 14:55:56 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2d7c1b5 app-i18n/uim: update patches Package-Manager: Portage-2.3.24, Repoman-2.3.6 app-i18n/uim/files/uim-1.6.0-gentoo.patch | 11 --------- app-i18n/uim/files/uim-1.8.6-gentoo.patch | 28 ++++++++++++++++++++++ .../{uim-1.5.4-zhTW.patch => uim-zh-TW.patch} | 5 ++-- app-i18n/uim/uim-1.8.6-r1.ebuild | 4 ++-- app-i18n/uim/uim-1.8.6-r2.ebuild | 4 ++-- 5 files changed, 34 insertions(+), 18 deletions(-) diff --git a/app-i18n/uim/files/uim-1.6.0-gentoo.patch b/app-i18n/uim/files/uim-1.6.0-gentoo.patch deleted file mode 100644 index 206a1cdfb1e..00000000000 --- a/app-i18n/uim/files/uim-1.6.0-gentoo.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur uim-1.6.0.orig/configure.ac uim-1.6.0/configure.ac ---- uim-1.6.0.orig/configure.ac 2010-08-02 09:30:14.000000000 +0900 -+++ uim-1.6.0/configure.ac 2010-08-14 08:30:34.000000000 +0900 -@@ -1696,6 +1696,7 @@ - - QT_CONFIG_OPTS="release" - fi -+QT_CONFIG_OPTS="$QT_CONFIG_OPTS nostrip" - - AC_ARG_ENABLE(warnings-into-error, - AC_HELP_STRING([--enable-warnings-into-error], diff --git a/app-i18n/uim/files/uim-1.8.6-gentoo.patch b/app-i18n/uim/files/uim-1.8.6-gentoo.patch new file mode 100644 index 00000000000..0feee5a7099 --- /dev/null +++ b/app-i18n/uim/files/uim-1.8.6-gentoo.patch @@ -0,0 +1,28 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -36,6 +36,7 @@ + AC_PATH_PROGS(SHA1, sha1 sha1sum) + AC_PATH_PROGS(SED, sed gsed) + AX_PATH_QMAKE4 ++PKG_PROG_PKG_CONFIG + + AM_MAINTAINER_MODE + +@@ -1792,7 +1793,7 @@ + fi + AX_LANG_WNOERROR # end AC_LANG_WERROR + +- QT_CONFIG_OPTS="debug" ++ QT_CONFIG_OPTS="debug nostrip" + else + CFLAGS="$CFLAGS -DNDEBUG" + CXXFLAGS="$CXXFLAGS -DNDEBUG" +@@ -1810,7 +1811,7 @@ + AX_CFLAGS_GCC_OPTION([-Wno-unused-variable], [SCIM_CFLAGS]) + AX_LANG_WNOERROR # end AC_LANG_WERROR + +- QT_CONFIG_OPTS="release" ++ QT_CONFIG_OPTS="release nostrip" + fi + + AC_ARG_ENABLE(warnings-into-error, diff --git a/app-i18n/uim/files/uim-1.5.4-zhTW.patch b/app-i18n/uim/files/uim-zh-TW.patch similarity index 79% rename from app-i18n/uim/files/uim-1.5.4-zhTW.patch rename to app-i18n/uim/files/uim-zh-TW.patch index 3836a210caa..f7385001317 100644 --- a/app-i18n/uim/files/uim-1.5.4-zhTW.patch +++ b/app-i18n/uim/files/uim-zh-TW.patch @@ -1,6 +1,5 @@ -diff -Naur uim-1.5.4.orig/xim/convdisp.cpp uim-1.5.4/xim/convdisp.cpp ---- uim-1.5.4.orig/xim/convdisp.cpp 2008-02-13 23:43:42.000000000 +0900 -+++ uim-1.5.4/xim/convdisp.cpp 2008-12-10 02:04:35.000000000 +0900 +--- a/xim/convdisp.cpp ++++ b/xim/convdisp.cpp @@ -69,7 +69,7 @@ #endif diff --git a/app-i18n/uim/uim-1.8.6-r1.ebuild b/app-i18n/uim/uim-1.8.6-r1.ebuild index a976c85b750..8ede2635d9f 100644 --- a/app-i18n/uim/uim-1.8.6-r1.ebuild +++ b/app-i18n/uim/uim-1.8.6-r1.ebuild @@ -80,8 +80,8 @@ RDEPEND="${CDEPEND} )" PATCHES=( - "${FILESDIR}"/${PN}-1.6.0-gentoo.patch - "${FILESDIR}"/${PN}-1.5.4-zhTW.patch + "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${PN}-zh-TW.patch ) DOCS=( AUTHORS NEWS README RELNOTE ) diff --git a/app-i18n/uim/uim-1.8.6-r2.ebuild b/app-i18n/uim/uim-1.8.6-r2.ebuild index 35e99a234b8..f2b009491e2 100644 --- a/app-i18n/uim/uim-1.8.6-r2.ebuild +++ b/app-i18n/uim/uim-1.8.6-r2.ebuild @@ -83,9 +83,9 @@ RDEPEND="${CDEPEND} )" PATCHES=( - "${FILESDIR}"/${PN}-1.6.0-gentoo.patch - "${FILESDIR}"/${PN}-1.5.4-zhTW.patch + "${FILESDIR}"/${P}-gentoo.patch "${FILESDIR}"/${P}-libressl.patch + "${FILESDIR}"/${PN}-zh-TW.patch ) DOCS=( AUTHORS NEWS README RELNOTE )