diff --git a/app-admin/testdisk/testdisk-7.1_git.recipe b/app-admin/testdisk/testdisk-7.1~git.recipe similarity index 78% rename from app-admin/testdisk/testdisk-7.1_git.recipe rename to app-admin/testdisk/testdisk-7.1~git.recipe index 0648cb9d4..0b16ecb73 100644 --- a/app-admin/testdisk/testdisk-7.1_git.recipe +++ b/app-admin/testdisk/testdisk-7.1~git.recipe @@ -28,11 +28,13 @@ tool in performing onsite recovery." HOMEPAGE="http://www.cgsecurity.org/wiki/TestDisk" COPYRIGHT="1998-2008 Christophe GRENIER" LICENSE="GNU GPL v2" -REVISION="1" -SOURCE_URI="git+http://git.cgsecurity.org/testdisk.git#d0c0bf21ddadd60c7bb2188a66d39039d5cd2f9c" -#CHECKSUM_SHA256="" +REVISION="2" +gitCommit="d0c0bf21ddadd60c7bb2188a66d39039d5cd2f9c" +SOURCE_URI=" https://git.cgsecurity.org/cgit/testdisk/snapshot/testdisk-$gitCommit.tar.gz" +CHECKSUM_SHA256="d2e0d02ca5df40db3d46e705721d36ee875928e57387d7a6919c219757a9dea3" +SOURCE_DIR="testdisk-$gitCommit" -ARCHITECTURES="x86 !x86_gcc2 x86_64" +ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" #TODO: add SVG icon to qphotorec @@ -40,13 +42,13 @@ SECONDARY_ARCHITECTURES="x86" PROVIDES=" testdisk$secondaryArchSuffix = $portVersion - cmd:testdisk = $portVersion compat >= 7.1 - cmd:photorec = $portVersion compat >= 7.1 - cmd:fidentify = $portVersion compat >= 7.1 + cmd:testdisk = $portVersion + cmd:photorec = $portVersion + cmd:fidentify = $portVersion " PROVIDES_qt=" testdisk${secondaryArchSuffix}_qt = $portVersion - cmd:qphotorec = $portVersion compat >= 7.1 + cmd:qphotorec = $portVersion " REQUIRES=" @@ -63,9 +65,11 @@ REQUIRES_qt=" lib:libiconv$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:libncurses$secondaryArchSuffix + lib:libQt5Core$secondaryArchSuffix + lib:libQt5Gui$secondaryArchSuffix + lib:libQt5Widgets$secondaryArchSuffix lib:libuuid$secondaryArchSuffix lib:libz$secondaryArchSuffix - lib:libqt5$secondaryArchSuffix " BUILD_REQUIRES=" @@ -73,7 +77,9 @@ BUILD_REQUIRES=" devel:libiconv$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix devel:libncurses$secondaryArchSuffix - devel:libqt5$secondaryArchSuffix + devel:libQt5Core$secondaryArchSuffix + devel:libQt5Gui$secondaryArchSuffix + devel:libQt5Widgets$secondaryArchSuffix devel:libuuid$secondaryArchSuffix devel:libz$secondaryArchSuffix " @@ -88,13 +94,12 @@ BUILD_PREREQUIRES=" BUILD() { - #mkdir config - #automake --add-missing -f -c - autoreconf -vfi + export CXXFLAGS="-std=c++11" + autoreconf -fi runConfigure --omit-dirs "binDir" ./configure \ - --bindir=$prefix/bin \ - --disable-stack-protector - make + --bindir=$prefix/bin \ + --disable-stack-protector + make $jobArgs } INSTALL()