commit: 2c93d4c95f28c62aaded3d4bc95dc9cfca9cef64 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Dec 4 20:04:30 2017 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Dec 4 21:52:17 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c93d4c9
app-admin/testdisk: Fix qtbindir Closes: https://bugs.gentoo.org/616008 Package-Manager: Portage-2.3.16, Repoman-2.3.6 app-admin/testdisk/Manifest | 2 +- .../testdisk/files/testdisk-7.0-qtbindir.patch | 27 ++++++++++++++++++++++ app-admin/testdisk/testdisk-7.0-r3.ebuild | 2 ++ 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest index 2f2df7b27b6..aaf4fce8fb0 100644 --- a/app-admin/testdisk/Manifest +++ b/app-admin/testdisk/Manifest @@ -1 +1 @@ -DIST testdisk-7.0.tar.bz2 676990 SHA256 00bb3b6b22e6aba88580eeb887037aef026968c21a87b5f906c6652cbee3442d SHA512 b1ebe1d2fca453660a17623b70c06e0195cb5f07056fb7bc683d575c034fb71dfb793582c804dcff0ca57789a6de84bbf13b1a554353811660996e42199102e2 WHIRLPOOL 9ef3ed733f13477435123089cbd6168c189591284aa72dc9636470b35a21a32222d6871916b43e3c2ba4ac6da85979d6ec249b22c2573b77db7b2bcc280b85f1 +DIST testdisk-7.0.tar.bz2 676990 BLAKE2B deeeee290f05d4a992ff69c990cca8480c74e67ba2df0b523640833b968ed98dc9f44e5f33b2666daf07286dd8349b98171d6c65f7f3baae3d5cca159a5c9584 SHA512 b1ebe1d2fca453660a17623b70c06e0195cb5f07056fb7bc683d575c034fb71dfb793582c804dcff0ca57789a6de84bbf13b1a554353811660996e42199102e2 diff --git a/app-admin/testdisk/files/testdisk-7.0-qtbindir.patch b/app-admin/testdisk/files/testdisk-7.0-qtbindir.patch new file mode 100644 index 00000000000..cb99e503829 --- /dev/null +++ b/app-admin/testdisk/files/testdisk-7.0-qtbindir.patch @@ -0,0 +1,27 @@ +--- a/configure.ac 2015-04-18 11:04:47.000000000 +0200 ++++ b/configure.ac 2017-12-04 20:34:51.804861863 +0100 +@@ -854,17 +854,14 @@ + + if test "$use_qt" = "true"; + then +- PKG_CHECK_MODULES(QTGUI, [QtGui >= 4.0.1],,use_qt=false) +- AC_CHECK_TOOLS(MOC,[moc-qt4 moc],) +- if test x$MOC = x ; then +- AC_MSG_WARN(Could not find a moc-qt4 or moc tool in your PATH.) ++ PKG_CHECK_MODULES([QTGUI], [QtCore >= 4.8.0 QtGui], [ ++ QT_PATH="$( eval $PKG_CONFIG --variable=libdir QtCore )/bin" ++ AC_PATH_PROGS([MOC], [moc-qt4 moc], [moc], [$QT_PATH]) ++ AC_PATH_PROGS([RCC], [rcc-qt4 rcc], [rcc], [$QT_PATH]) ++ ], [ ++ AC_MSG_ERROR([Qt4 not found]) + use_qt=false +- fi +- AC_CHECK_TOOLS(RCC,[rcc-qt4 rcc],) +- if test x$RCC = x ; then +- AC_MSG_WARN(Could not find a rcc-qt4 or rcc tool in your PATH.) +- use_qt=false +- fi ++ ]) + qphotorec_LDADD="$qphotorec_LDADD $QTGUI_LIBS" + qphotorec_CXXFLAGS="$qphotorec_CXXFLAGS $QTGUI_CFLAGS" + fi diff --git a/app-admin/testdisk/testdisk-7.0-r3.ebuild b/app-admin/testdisk/testdisk-7.0-r3.ebuild index 22e8db9dfe2..30247d7d1ca 100644 --- a/app-admin/testdisk/testdisk-7.0-r3.ebuild +++ b/app-admin/testdisk/testdisk-7.0-r3.ebuild @@ -47,6 +47,8 @@ RDEPEND="!static? ( ${DEPEND} )" AUTOTOOLS_IN_SOURCE_BUILD=1 DOCS=( ) +PATCHES=( "${FILESDIR}/${P}-qtbindir.patch" ) + src_configure() { local myconf
