From 2bc2838a26db9f14ac26bf4bc02f1fdc078c69eb Mon Sep 17 00:00:00 2001 From: miqlas <5569059+extrowerk@users.noreply.github.com> Date: Mon, 9 Apr 2018 18:17:48 +0200 Subject: [PATCH] Cutter 1.3 (#2374) * WIP * Cutter: needs radare 2.4.0 * Cleanup --- .../{cutter-1.1.recipe => cutter-1.3.recipe} | 15 ++++++++++----- .../{cutter-1.1.patchset => cutter-1.3.patchset} | 0 2 files changed, 10 insertions(+), 5 deletions(-) rename dev-util/cutter/{cutter-1.1.recipe => cutter-1.3.recipe} (88%) rename dev-util/cutter/patches/{cutter-1.1.patchset => cutter-1.3.patchset} (100%) diff --git a/dev-util/cutter/cutter-1.1.recipe b/dev-util/cutter/cutter-1.3.recipe similarity index 88% rename from dev-util/cutter/cutter-1.1.recipe rename to dev-util/cutter/cutter-1.3.recipe index 6bdf7ab6c..5619db432 100644 --- a/dev-util/cutter/cutter-1.1.recipe +++ b/dev-util/cutter/cutter-1.3.recipe @@ -17,7 +17,8 @@ COPYRIGHT="2017 xarkes, thestr4ng3r, ballessay, Hugo Teso" LICENSE="GNU GPL v3" REVISION="1" SOURCE_URI="$HOMEPAGE/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="ed1be7778f6a733343d4628a0ba2598f6c3f521e08c6d45289a58c2313e2297b" +CHECKSUM_SHA256="1fee0ec58a2ad15046a9bf3c2f4b92db385db7c7af2f6a64a13f3fb8d51b2dcf" +SOURCE_FILENAME="cutter-$portVersion.tar.gz" PATCHES="cutter-$portVersion.patchset" ADDITIONAL_FILES="cutter.rdef.in" @@ -30,6 +31,7 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix +# cmd:python3 lib:libQt5Core$secondaryArchSuffix lib:libQt5Gui$secondaryArchSuffix lib:libQt5Svg$secondaryArchSuffix @@ -66,7 +68,7 @@ BUILD_REQUIRES=" devel:libQt5Gui$secondaryArchSuffix devel:libQt5Svg$secondaryArchSuffix devel:libQt5Widgets$secondaryArchSuffix - devel:libr2$secondaryArchSuffix + devel:libr2$secondaryArchSuffix >= 2.4.0 devel:libssl$secondaryArchSuffix " BUILD_PREREQUIRES=" @@ -75,6 +77,7 @@ BUILD_PREREQUIRES=" cmd:ld$secondaryArchSuffix cmd:make cmd:pkg_config$secondaryArchSuffix +# cmd:python3 cmd:qmake$secondaryArchSuffix >= 5 " @@ -83,8 +86,10 @@ BUILD() cd src mkdir -p build cd build - export RADARE2_INC_DIR="`finddir B_SYSTEM_HEADERS_DIRECTORY`/libr" - cmake .. + export RADARE2_INC_DIR="$portPackageLinksDir/devel~libr2/.self/$relativeIncludeDir/libr" + cmake .. \ + -DCUTTER_ENABLE_QTWEBENGINE=OFF \ + -DCUTTER_ENABLE_JUPYTER=OFF make $jobArgs } @@ -92,7 +97,7 @@ INSTALL() { cd src/build mkdir -p $appsDir - cp cutter $appsDir/Cutter + cp Cutter $appsDir/Cutter local MAJOR="`echo "$portVersion" | cut -d. -f1`" local MIDDLE="`echo "$portVersion" | cut -d. -f2`" diff --git a/dev-util/cutter/patches/cutter-1.1.patchset b/dev-util/cutter/patches/cutter-1.3.patchset similarity index 100% rename from dev-util/cutter/patches/cutter-1.1.patchset rename to dev-util/cutter/patches/cutter-1.3.patchset