| 1 |
commit: 35b51bf25341d839d9e1018fd87bb4b591620505 |
| 2 |
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jun 3 02:17:47 2018 +0000 |
| 4 |
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jun 3 02:18:51 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35b51bf2 |
| 7 |
|
| 8 |
app-i18n/uim: fix build with USE=qt4 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/657052 |
| 11 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 12 |
|
| 13 |
app-i18n/uim/files/uim-1.8.6-qt.patch | 16 ++++++++++++++++ |
| 14 |
app-i18n/uim/uim-1.8.6-r1.ebuild | 4 +++- |
| 15 |
app-i18n/uim/uim-1.8.6-r2.ebuild | 4 +++- |
| 16 |
3 files changed, 22 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-i18n/uim/files/uim-1.8.6-qt.patch b/app-i18n/uim/files/uim-1.8.6-qt.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..6c0cb7eee66 |
| 21 |
--- /dev/null |
| 22 |
+++ b/app-i18n/uim/files/uim-1.8.6-qt.patch |
| 23 |
@@ -0,0 +1,16 @@ |
| 24 |
+--- a/m4/ax_path_qmake4.m4 |
| 25 |
++++ b/m4/ax_path_qmake4.m4 |
| 26 |
+@@ -23,10 +23,10 @@ |
| 27 |
+ # the copyright notice and this notice are preserved. |
| 28 |
+ |
| 29 |
+ AC_DEFUN([AX_PATH_QMAKE4], [ |
| 30 |
+- ax_guessed_qt4_dirs="/usr/lib/qt4/bin:/usr/local/lib/qt4/bin:/usr/qt4/bin:/usr/local/qt4/bin:${QT4DIR}/bin:${QTDIR}/bin" |
| 31 |
++ ax_guessed_qt4_dirs="${QT4DIR}/bin:${QTDIR}/bin" |
| 32 |
+ AC_PROG_EGREP |
| 33 |
+- AC_PATH_PROGS(_QMAKE4, [qmake-qt4 qmake4], [], ["$PATH:$ax_guessed_qt4_dirs"]) |
| 34 |
+- AC_PATH_PROGS(_QMAKE, [qmake], [], ["$PATH:$ax_guessed_qt4_dirs"]) |
| 35 |
++ AC_PATH_PROGS(_QMAKE4, [qmake-qt4 qmake4], [], ["$ax_guessed_qt4_dirs:$PATH"]) |
| 36 |
++ AC_PATH_PROGS(_QMAKE, [qmake], [], ["$ax_guessed_qt4_dirs:$PATH"]) |
| 37 |
+ |
| 38 |
+ AC_CACHE_CHECK([for Qt4 version of qmake], ax_cv_path_QMAKE4, [ |
| 39 |
+ ax_cv_path_QMAKE4=no |
| 40 |
|
| 41 |
diff --git a/app-i18n/uim/uim-1.8.6-r1.ebuild b/app-i18n/uim/uim-1.8.6-r1.ebuild |
| 42 |
index 84c5fa527eb..af634f34baf 100644 |
| 43 |
--- a/app-i18n/uim/uim-1.8.6-r1.ebuild |
| 44 |
+++ b/app-i18n/uim/uim-1.8.6-r1.ebuild |
| 45 |
@@ -3,7 +3,7 @@ |
| 46 |
|
| 47 |
EAPI="6" |
| 48 |
|
| 49 |
-inherit autotools elisp-common gnome2-utils |
| 50 |
+inherit autotools elisp-common gnome2-utils qmake-utils |
| 51 |
|
| 52 |
DESCRIPTION="A multilingual input method framework" |
| 53 |
HOMEPAGE="https://github.com/uim/uim" |
| 54 |
@@ -78,6 +78,7 @@ RDEPEND="${CDEPEND} |
| 55 |
|
| 56 |
PATCHES=( |
| 57 |
"${FILESDIR}"/${P}-gentoo.patch |
| 58 |
+ "${FILESDIR}"/${P}-qt.patch |
| 59 |
"${FILESDIR}"/${P}-tinfo.patch |
| 60 |
"${FILESDIR}"/${PN}-zh-TW.patch |
| 61 |
) |
| 62 |
@@ -144,6 +145,7 @@ src_configure() { |
| 63 |
myconf+=( --disable-pref ) |
| 64 |
fi |
| 65 |
|
| 66 |
+ export QT4DIR="$(qt4_get_libdir)" |
| 67 |
econf "${myconf[@]}" |
| 68 |
} |
| 69 |
|
| 70 |
|
| 71 |
diff --git a/app-i18n/uim/uim-1.8.6-r2.ebuild b/app-i18n/uim/uim-1.8.6-r2.ebuild |
| 72 |
index ccec49f2869..8ecd96c0215 100644 |
| 73 |
--- a/app-i18n/uim/uim-1.8.6-r2.ebuild |
| 74 |
+++ b/app-i18n/uim/uim-1.8.6-r2.ebuild |
| 75 |
@@ -3,7 +3,7 @@ |
| 76 |
|
| 77 |
EAPI="6" |
| 78 |
|
| 79 |
-inherit autotools elisp-common gnome2-utils |
| 80 |
+inherit autotools elisp-common gnome2-utils qmake-utils |
| 81 |
|
| 82 |
DESCRIPTION="A multilingual input method framework" |
| 83 |
HOMEPAGE="https://github.com/uim/uim" |
| 84 |
@@ -82,6 +82,7 @@ RDEPEND="${CDEPEND} |
| 85 |
PATCHES=( |
| 86 |
"${FILESDIR}"/${P}-gentoo.patch |
| 87 |
"${FILESDIR}"/${P}-libressl.patch |
| 88 |
+ "${FILESDIR}"/${P}-qt.patch |
| 89 |
"${FILESDIR}"/${P}-tinfo.patch |
| 90 |
"${FILESDIR}"/${PN}-zh-TW.patch |
| 91 |
) |
| 92 |
@@ -148,6 +149,7 @@ src_configure() { |
| 93 |
myconf+=( --disable-pref ) |
| 94 |
fi |
| 95 |
|
| 96 |
+ export QT4DIR="$(qt4_get_libdir)" |
| 97 |
econf "${myconf[@]}" |
| 98 |
} |
Archives