From 615567491bab900c1ecc24c52d110e96cd5b0227 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Wed, 27 Jul 2016 02:27:03 +0200 Subject: [PATCH] testdisk: make x86-only; add separate qphotorec package --- app-admin/testdisk/testdisk-7.1_git.recipe | 43 +++++++++++++++++++--- 1 file changed, 37 insertions(+), 6 deletions(-) diff --git a/app-admin/testdisk/testdisk-7.1_git.recipe b/app-admin/testdisk/testdisk-7.1_git.recipe index 50b330c88..0bbdb3ecf 100644 --- a/app-admin/testdisk/testdisk-7.1_git.recipe +++ b/app-admin/testdisk/testdisk-7.1_git.recipe @@ -32,17 +32,23 @@ REVISION="1" SOURCE_URI="git+http://git.cgsecurity.org/testdisk.git#d0c0bf21ddadd60c7bb2188a66d39039d5cd2f9c" #CHECKSUM_SHA256="" -ARCHITECTURES="?x86 x86_gcc2 ?x86_64" +ARCHITECTURES="x86 !x86_gcc2 ?x86_64" +SECONDARY_ARCHITECTURES="x86" -#TODO: separate package for qphotorec? +#TODO: add SVG icon to qphotorec #TODO: require libntfs3g, ext2fs, reiserfs PROVIDES=" testdisk$secondaryArchSuffix = $portVersion - cmd:testdisk$secondaryArchSuffix = $portVersion - cmd:photorec$secondaryArchSuffix = $portVersion - cmd:fidentify$secondaryArchSuffix = $portVersion + cmd:testdisk = $portVersion compat >= 7.1 + cmd:photorec = $portVersion compat >= 7.1 + cmd:fidentify = $portVersion compat >= 7.1 " +PROVIDES_qt=" + testdisk${secondaryArchSuffix}_qt = $portVersion + cmd:qphotorec = $portVersion compat >= 7.1 + " + REQUIRES=" haiku$secondaryArchSuffix lib:libiconv$secondaryArchSuffix @@ -51,12 +57,23 @@ REQUIRES=" lib:libuuid$secondaryArchSuffix lib:libz$secondaryArchSuffix " +REQUIRES_qt=" + testdisk${secondaryArchSuffix} == $portVersion base + haiku$secondaryArchSuffix + lib:libiconv$secondaryArchSuffix + lib:libjpeg$secondaryArchSuffix + lib:libncurses$secondaryArchSuffix + lib:libuuid$secondaryArchSuffix + lib:libz$secondaryArchSuffix + lib:libqt5$secondaryArchSuffix + " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libiconv$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix devel:libncurses$secondaryArchSuffix + devel:libqt5$secondaryArchSuffix devel:libuuid$secondaryArchSuffix devel:libz$secondaryArchSuffix " @@ -74,11 +91,25 @@ BUILD() #mkdir config #automake --add-missing -f -c autoreconf -vfi - runConfigure ./configure + runConfigure --omit-dirs "binDir" ./configure \ + --bindir=$prefix/bin \ + --disable-stack-protector make } INSTALL() { make install + + addAppDeskbarSymlink $prefix/bin/qphotorec "QPhotoRec" + + # cleanup XDG stuff we do not need + rm -R $dataDir/applications + rm -R $dataDir/icons + + packageEntries qt \ + $prefix/bin/qphotorec \ + $manDir/*/qphotorec.* \ + $manDir/*/*/qphotorec.* \ + $dataDir/deskbar/menu/Applications/QPhotoRec }