diff --git a/app-editors/featherpad/featherpad-1.1.0.recipe b/app-editors/featherpad/featherpad-1.4.1.recipe similarity index 87% rename from app-editors/featherpad/featherpad-1.1.0.recipe rename to app-editors/featherpad/featherpad-1.4.1.recipe index ac3bf2492..f85864202 100644 --- a/app-editors/featherpad/featherpad-1.1.0.recipe +++ b/app-editors/featherpad/featherpad-1.4.1.recipe @@ -20,14 +20,15 @@ environment and has: * Text zooming * Appropriate but non-interrupting prompts" HOMEPAGE="https://github.com/tsujan/FeatherPad" -COPYRIGHT="2016, 2018 Pedram Pourang" +COPYRIGHT="2014-2023 Pedram Pourang" LICENSE="GNU GPL v3" -REVISION="2" +REVISION="1" SOURCE_URI="https://github.com/tsujan/FeatherPad/archive/refs/tags/V$portVersion.tar.gz" -CHECKSUM_SHA256="82bd94996f0d7be23be1b150a22d88b9c0b19c9852d5c2c7388e61ea9e05be03" +CHECKSUM_SHA256="e60258388ca3039e434d7b661548113057a85443a1a288843b5ec6044b4206dc" SOURCE_FILENAME="FeatherPad-$portVersion-tar.gz" SOURCE_DIR="FeatherPad-$portVersion" ADDITIONAL_FILES="featherpad.rdef.in" +PATCHES="featherpad-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" @@ -38,11 +39,9 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix - lib:libGL$secondaryArchSuffix lib:libhunspell_1.7$secondaryArchSuffix lib:libQt5Core$secondaryArchSuffix lib:libQt5Gui$secondaryArchSuffix - lib:libQt5Network$secondaryArchSuffix lib:libQt5PrintSupport$secondaryArchSuffix lib:libQt5Svg$secondaryArchSuffix lib:libQt5Widgets$secondaryArchSuffix @@ -51,11 +50,9 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - devel:libGL$secondaryArchSuffix devel:libhunspell_1.7$secondaryArchSuffix devel:libQt5Core$secondaryArchSuffix devel:libQt5Gui$secondaryArchSuffix - devel:libQt5Network$secondaryArchSuffix devel:libQt5PrintSupport$secondaryArchSuffix devel:libQt5Svg$secondaryArchSuffix devel:libQt5Widgets$secondaryArchSuffix @@ -73,18 +70,16 @@ BUILD_PREREQUIRES=" BUILD() { - mkdir -p build - cd build - cmake .. -DCMAKE_INSTALL_PREFIX:PATH="$appsDir/FeatherPad" \ + cmake -B build -S . \ + -DCMAKE_INSTALL_PREFIX:PATH="$appsDir/FeatherPad" \ -DCMAKE_BUILD_TYPE=Release - make $jobArgs + make -C build $jobArgs } INSTALL() { - cd build - make install + make -C build install mv $appsDir/FeatherPad/featherpad \ $appsDir/FeatherPad/FeatherPad diff --git a/app-editors/featherpad/patches/featherpad-1.4.1.patchset b/app-editors/featherpad/patches/featherpad-1.4.1.patchset new file mode 100644 index 000000000..40a0115e9 --- /dev/null +++ b/app-editors/featherpad/patches/featherpad-1.4.1.patchset @@ -0,0 +1,25 @@ +From 7ac8e90375736bb4085476803d37716941ec4366 Mon Sep 17 00:00:00 2001 +From: Chris Roberts +Date: Sun, 7 Jan 2024 11:58:04 -0700 +Subject: Use system icons by default on Haiku + + +diff --git a/featherpad/config.cpp b/featherpad/config.cpp +index 9360341..3b75d68 100644 +--- a/featherpad/config.cpp ++++ b/featherpad/config.cpp +@@ -119,7 +119,11 @@ Config::Config(): + closeWithLastTab_ (false), + sharedSearchHistory_ (false), + disableMenubarAccel_ (false), ++#if defined(Q_OS_HAIKU) ++ sysIcons_ (true), ++#else + sysIcons_ (false), ++#endif + vLineDistance_ (-80), + tabPosition_ (0), + maxSHSize_ (2), +-- +2.42.1 +