commit: d2d7c1b5b3e7207257f6e82b0c98210b9037fb3a
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Mon May 28 14:10:57 2018 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> 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 )
