testdisk: drop patch has it has been upstreamed

This commit is contained in:
François Revol
2014-10-28 13:36:48 +01:00
parent 93177c4e23
commit afa774e4f1
2 changed files with 1 additions and 37 deletions

View File

@@ -1,34 +0,0 @@
From 2e1fbe466f798841db5115a2e6915888d02336bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Mon, 27 Oct 2014 22:19:34 +0100
Subject: [PATCH] configure.ac: Do the AM_CONDITIONAL() after finally setting
the variable
Avoids trying to compile qphotorec when Qt is not available.
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 4d54612..016b686 100644
--- a/configure.ac
+++ b/configure.ac
@@ -311,7 +311,6 @@ case "$target" in
;;
esac
-AM_CONDITIONAL(USEQT, test "$use_qt" = true)
AM_CONDITIONAL(USEICON, test "$use_icon" = yes)
# Checks for programs.
@@ -854,6 +853,7 @@ then
qphotorec_LDADD="$qphotorec_LDADD $QTGUI_LIBS"
qphotorec_CXXFLAGS="$qphotorec_CXXFLAGS $QTGUI_CFLAGS"
fi
+AM_CONDITIONAL(USEQT, test "$use_qt" = true)
# e2fsprogs may be using pthread
# checks for pthreads
--
1.8.3.4

View File

@@ -27,7 +27,7 @@ Those more familiar with such procedures should find TestDisk a handy \
tool in performing onsite recovery.
"
HOMEPAGE="http://www.cgsecurity.org/wiki/TestDisk"
SRC_URI="git+http://git.cgsecurity.org/testdisk.git#ec73370ff2f8e1b5fd626203cfb2c142b1a01a24"
SRC_URI="git+http://git.cgsecurity.org/testdisk.git#c603941b7fd2323a4d8631ac05688b7b4460e088"
#CHECKSUM_SHA256=""
REVISION="1"
ARCHITECTURES="?x86 x86_gcc2 ?x86_64"
@@ -72,8 +72,6 @@ BUILD_PREREQUIRES="
cmd:pkg_config
"
PATCHES="testdisk-7.0_git.patchset"
BUILD()
{
#mkdir config