commit: 35b51bf25341d839d9e1018fd87bb4b591620505 Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> AuthorDate: Sun Jun 3 02:17:47 2018 +0000 Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> CommitDate: Sun Jun 3 02:18:51 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35b51bf2
app-i18n/uim: fix build with USE=qt4 Closes: https://bugs.gentoo.org/657052 Package-Manager: Portage-2.3.24, Repoman-2.3.6 app-i18n/uim/files/uim-1.8.6-qt.patch | 16 ++++++++++++++++ app-i18n/uim/uim-1.8.6-r1.ebuild | 4 +++- app-i18n/uim/uim-1.8.6-r2.ebuild | 4 +++- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/app-i18n/uim/files/uim-1.8.6-qt.patch b/app-i18n/uim/files/uim-1.8.6-qt.patch new file mode 100644 index 00000000000..6c0cb7eee66 --- /dev/null +++ b/app-i18n/uim/files/uim-1.8.6-qt.patch @@ -0,0 +1,16 @@ +--- a/m4/ax_path_qmake4.m4 ++++ b/m4/ax_path_qmake4.m4 +@@ -23,10 +23,10 @@ + # the copyright notice and this notice are preserved. + + AC_DEFUN([AX_PATH_QMAKE4], [ +- ax_guessed_qt4_dirs="/usr/lib/qt4/bin:/usr/local/lib/qt4/bin:/usr/qt4/bin:/usr/local/qt4/bin:${QT4DIR}/bin:${QTDIR}/bin" ++ ax_guessed_qt4_dirs="${QT4DIR}/bin:${QTDIR}/bin" + AC_PROG_EGREP +- AC_PATH_PROGS(_QMAKE4, [qmake-qt4 qmake4], [], ["$PATH:$ax_guessed_qt4_dirs"]) +- AC_PATH_PROGS(_QMAKE, [qmake], [], ["$PATH:$ax_guessed_qt4_dirs"]) ++ AC_PATH_PROGS(_QMAKE4, [qmake-qt4 qmake4], [], ["$ax_guessed_qt4_dirs:$PATH"]) ++ AC_PATH_PROGS(_QMAKE, [qmake], [], ["$ax_guessed_qt4_dirs:$PATH"]) + + AC_CACHE_CHECK([for Qt4 version of qmake], ax_cv_path_QMAKE4, [ + ax_cv_path_QMAKE4=no diff --git a/app-i18n/uim/uim-1.8.6-r1.ebuild b/app-i18n/uim/uim-1.8.6-r1.ebuild index 84c5fa527eb..af634f34baf 100644 --- a/app-i18n/uim/uim-1.8.6-r1.ebuild +++ b/app-i18n/uim/uim-1.8.6-r1.ebuild @@ -3,7 +3,7 @@ EAPI="6" -inherit autotools elisp-common gnome2-utils +inherit autotools elisp-common gnome2-utils qmake-utils DESCRIPTION="A multilingual input method framework" HOMEPAGE="https://github.com/uim/uim"; @@ -78,6 +78,7 @@ RDEPEND="${CDEPEND} PATCHES=( "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${P}-qt.patch "${FILESDIR}"/${P}-tinfo.patch "${FILESDIR}"/${PN}-zh-TW.patch ) @@ -144,6 +145,7 @@ src_configure() { myconf+=( --disable-pref ) fi + export QT4DIR="$(qt4_get_libdir)" econf "${myconf[@]}" } diff --git a/app-i18n/uim/uim-1.8.6-r2.ebuild b/app-i18n/uim/uim-1.8.6-r2.ebuild index ccec49f2869..8ecd96c0215 100644 --- a/app-i18n/uim/uim-1.8.6-r2.ebuild +++ b/app-i18n/uim/uim-1.8.6-r2.ebuild @@ -3,7 +3,7 @@ EAPI="6" -inherit autotools elisp-common gnome2-utils +inherit autotools elisp-common gnome2-utils qmake-utils DESCRIPTION="A multilingual input method framework" HOMEPAGE="https://github.com/uim/uim"; @@ -82,6 +82,7 @@ RDEPEND="${CDEPEND} PATCHES=( "${FILESDIR}"/${P}-gentoo.patch "${FILESDIR}"/${P}-libressl.patch + "${FILESDIR}"/${P}-qt.patch "${FILESDIR}"/${P}-tinfo.patch "${FILESDIR}"/${PN}-zh-TW.patch ) @@ -148,6 +149,7 @@ src_configure() { myconf+=( --disable-pref ) fi + export QT4DIR="$(qt4_get_libdir)" econf "${myconf[@]}" }
