| 1 |
commit: 2c93d4c95f28c62aaded3d4bc95dc9cfca9cef64 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Dec 4 20:04:30 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Dec 4 21:52:17 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c93d4c9 |
| 7 |
|
| 8 |
app-admin/testdisk: Fix qtbindir |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/616008 |
| 11 |
Package-Manager: Portage-2.3.16, Repoman-2.3.6 |
| 12 |
|
| 13 |
app-admin/testdisk/Manifest | 2 +- |
| 14 |
.../testdisk/files/testdisk-7.0-qtbindir.patch | 27 ++++++++++++++++++++++ |
| 15 |
app-admin/testdisk/testdisk-7.0-r3.ebuild | 2 ++ |
| 16 |
3 files changed, 30 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest |
| 19 |
index 2f2df7b27b6..aaf4fce8fb0 100644 |
| 20 |
--- a/app-admin/testdisk/Manifest |
| 21 |
+++ b/app-admin/testdisk/Manifest |
| 22 |
@@ -1 +1 @@ |
| 23 |
-DIST testdisk-7.0.tar.bz2 676990 SHA256 00bb3b6b22e6aba88580eeb887037aef026968c21a87b5f906c6652cbee3442d SHA512 b1ebe1d2fca453660a17623b70c06e0195cb5f07056fb7bc683d575c034fb71dfb793582c804dcff0ca57789a6de84bbf13b1a554353811660996e42199102e2 WHIRLPOOL 9ef3ed733f13477435123089cbd6168c189591284aa72dc9636470b35a21a32222d6871916b43e3c2ba4ac6da85979d6ec249b22c2573b77db7b2bcc280b85f1 |
| 24 |
+DIST testdisk-7.0.tar.bz2 676990 BLAKE2B deeeee290f05d4a992ff69c990cca8480c74e67ba2df0b523640833b968ed98dc9f44e5f33b2666daf07286dd8349b98171d6c65f7f3baae3d5cca159a5c9584 SHA512 b1ebe1d2fca453660a17623b70c06e0195cb5f07056fb7bc683d575c034fb71dfb793582c804dcff0ca57789a6de84bbf13b1a554353811660996e42199102e2 |
| 25 |
|
| 26 |
diff --git a/app-admin/testdisk/files/testdisk-7.0-qtbindir.patch b/app-admin/testdisk/files/testdisk-7.0-qtbindir.patch |
| 27 |
new file mode 100644 |
| 28 |
index 00000000000..cb99e503829 |
| 29 |
--- /dev/null |
| 30 |
+++ b/app-admin/testdisk/files/testdisk-7.0-qtbindir.patch |
| 31 |
@@ -0,0 +1,27 @@ |
| 32 |
+--- a/configure.ac 2015-04-18 11:04:47.000000000 +0200 |
| 33 |
++++ b/configure.ac 2017-12-04 20:34:51.804861863 +0100 |
| 34 |
+@@ -854,17 +854,14 @@ |
| 35 |
+ |
| 36 |
+ if test "$use_qt" = "true"; |
| 37 |
+ then |
| 38 |
+- PKG_CHECK_MODULES(QTGUI, [QtGui >= 4.0.1],,use_qt=false) |
| 39 |
+- AC_CHECK_TOOLS(MOC,[moc-qt4 moc],) |
| 40 |
+- if test x$MOC = x ; then |
| 41 |
+- AC_MSG_WARN(Could not find a moc-qt4 or moc tool in your PATH.) |
| 42 |
++ PKG_CHECK_MODULES([QTGUI], [QtCore >= 4.8.0 QtGui], [ |
| 43 |
++ QT_PATH="$( eval $PKG_CONFIG --variable=libdir QtCore )/bin" |
| 44 |
++ AC_PATH_PROGS([MOC], [moc-qt4 moc], [moc], [$QT_PATH]) |
| 45 |
++ AC_PATH_PROGS([RCC], [rcc-qt4 rcc], [rcc], [$QT_PATH]) |
| 46 |
++ ], [ |
| 47 |
++ AC_MSG_ERROR([Qt4 not found]) |
| 48 |
+ use_qt=false |
| 49 |
+- fi |
| 50 |
+- AC_CHECK_TOOLS(RCC,[rcc-qt4 rcc],) |
| 51 |
+- if test x$RCC = x ; then |
| 52 |
+- AC_MSG_WARN(Could not find a rcc-qt4 or rcc tool in your PATH.) |
| 53 |
+- use_qt=false |
| 54 |
+- fi |
| 55 |
++ ]) |
| 56 |
+ qphotorec_LDADD="$qphotorec_LDADD $QTGUI_LIBS" |
| 57 |
+ qphotorec_CXXFLAGS="$qphotorec_CXXFLAGS $QTGUI_CFLAGS" |
| 58 |
+ fi |
| 59 |
|
| 60 |
diff --git a/app-admin/testdisk/testdisk-7.0-r3.ebuild b/app-admin/testdisk/testdisk-7.0-r3.ebuild |
| 61 |
index 22e8db9dfe2..30247d7d1ca 100644 |
| 62 |
--- a/app-admin/testdisk/testdisk-7.0-r3.ebuild |
| 63 |
+++ b/app-admin/testdisk/testdisk-7.0-r3.ebuild |
| 64 |
@@ -47,6 +47,8 @@ RDEPEND="!static? ( ${DEPEND} )" |
| 65 |
AUTOTOOLS_IN_SOURCE_BUILD=1 |
| 66 |
DOCS=( ) |
| 67 |
|
| 68 |
+PATCHES=( "${FILESDIR}/${P}-qtbindir.patch" ) |
| 69 |
+ |
| 70 |
src_configure() { |
| 71 |
local myconf |
Archives