featherpad, bump version (#10428)

app-editors/featherpad/featherpad-1.5.1.recipe

@@ -22,13 +22,13 @@ environment and has:
 HOMEPAGE="https://github.com/tsujan/FeatherPad"
 COPYRIGHT="2014-2023 Pedram Pourang"
 LICENSE="GNU GPL v3"
-REVISION="3"
+REVISION="1"
 SOURCE_URI="https://github.com/tsujan/FeatherPad/archive/refs/tags/V$portVersion.tar.gz"
-CHECKSUM_SHA256="e60258388ca3039e434d7b661548113057a85443a1a288843b5ec6044b4206dc"
+CHECKSUM_SHA256="2826b3dc26877284d7bb5b62430e99b4fbcf45862af89549e4b4e9f40b16c3c5"
 SOURCE_FILENAME="FeatherPad-$portVersion-tar.gz"
 SOURCE_DIR="FeatherPad-$portVersion"
-ADDITIONAL_FILES="featherpad.rdef.in"
 PATCHES="featherpad-$portVersion.patchset"
+ADDITIONAL_FILES="featherpad.rdef.in"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
@@ -74,9 +74,7 @@ BUILD()
 {
 	cmake -B build -S . \
 		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX:PATH="$prefix" \
-		-DENABLE_QT5=OFF
-
+		-DCMAKE_INSTALL_PREFIX=$prefix
 	make -C build $jobArgs
 }
 

app-editors/featherpad/patches/featherpad-1.5.1.patchset

@@ -1,14 +1,14 @@
-From e08dfe9ee4217ae0145491283dba7077c091815e Mon Sep 17 00:00:00 2001
+From 4b7e2bc530ade4a3cd193fb59e18423d1e88d2f2 Mon Sep 17 00:00:00 2001
 From: Chris Roberts <cpr420@gmail.com>
 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
+index b8fd6a4..48fdac4 100644
 --- a/featherpad/config.cpp
 +++ b/featherpad/config.cpp
-@@ -119,7 +119,11 @@ Config::Config():
+@@ -65,7 +65,11 @@ Config::Config():
      closeWithLastTab_ (false),
      sharedSearchHistory_ (false),
      disableMenubarAccel_ (false),
@@ -21,22 +21,22 @@ index 9360341..3b75d68 100644
      tabPosition_ (0),
      maxSHSize_ (2),
 -- 
-2.42.1
+2.43.2
 
 
-From 62eace94e9bd208162d356cd10a927ae5059e90c Mon Sep 17 00:00:00 2001
+From b6d80caebf37027ba62450db952c9131a622b81f Mon Sep 17 00:00:00 2001
 From: Chris Roberts <cpr420@gmail.com>
 Date: Sun, 7 Jan 2024 14:42:11 -0700
 Subject: Add .recipe files to sh syntax highlighter
 
 
 diff --git a/featherpad/syntax.cpp b/featherpad/syntax.cpp
-index d69c53d..c29ac64 100644
+index 762877c..cbc1b57 100644
 --- a/featherpad/syntax.cpp
 +++ b/featherpad/syntax.cpp
 @@ -91,7 +91,8 @@ void FPwin::setProgLang (TextEdit *textEdit)
-                  || baseName == ".xprofile" || baseName == ".profile"
-                  || baseName == ".bash_aliases" || baseName == ".mkshrc"
+                  || baseName == ".bash_aliases" || baseName == ".xprofile"
+                  || baseName == ".profile" || baseName == ".mkshrc"
                   || baseName == ".zprofile" || baseName == ".zlogin"
 -                 || baseName == ".zshrc" || baseName == ".zshenv")
 +                 || baseName == ".zshrc" || baseName == ".zshenv"
@@ -45,10 +45,10 @@ index d69c53d..c29ac64 100644
          else if (fname.endsWith (".rb"))
              progLan = "ruby";
 -- 
-2.42.1
+2.43.2
 
 
-From 5a6fea547faf33dc0f8632176735f5044cd688d4 Mon Sep 17 00:00:00 2001
+From 0baea21f981c7365cdd0f5c71eef92557164fea7 Mon Sep 17 00:00:00 2001
 From: Chris Roberts <cpr420@gmail.com>
 Date: Sun, 7 Jan 2024 19:34:26 -0700
 Subject: Remove Haiku specific customizations to the data directories
@@ -57,11 +57,11 @@ These interfere with packaging layout by putting files in the top level when usi
 We'll use the standard 'featherpad' subdirectory.
 
 diff --git a/featherpad/CMakeLists.txt b/featherpad/CMakeLists.txt
-index 118d542..34175a6 100644
+index 634630e..bb8de84 100644
 --- a/featherpad/CMakeLists.txt
 +++ b/featherpad/CMakeLists.txt
-@@ -189,7 +189,7 @@ if(Qt${QT_VERSION_MAJOR}LinguistTools_FOUND)
-   endif()
+@@ -140,7 +140,7 @@ if(Qt6LinguistTools_FOUND)
+   qt6_add_translation(QM_FILES ${TS_FILES})
    add_executable(featherpad ${featherpad_SRCS} ${featherpad_DBUS_SRCS} ${featherpad_RESOURCES} ${EXTRA_HEADERS} ${DESKTOP_FILE} ${QM_FILES})
    if(HAIKU)
 -    install(FILES ${QM_FILES} DESTINATION "${CMAKE_INSTALL_PREFIX}/translations")
@@ -69,7 +69,7 @@ index 118d542..34175a6 100644
    elseif(APPLE)
      SET_SOURCE_FILES_PROPERTIES(${QM_FILES} PROPERTIES MACOSX_PACKAGE_LOCATION Resources/translations)
    elseif(UNIX OR OS2)
-@@ -232,9 +232,11 @@ endif()
+@@ -171,9 +171,11 @@ endif()
  
  # installation
  if(HAIKU)
@@ -85,10 +85,10 @@ index 118d542..34175a6 100644
    SET_TARGET_PROPERTIES(featherpad PROPERTIES RESOURCE ${HELP_FILE})
    SET_TARGET_PROPERTIES(featherpad PROPERTIES RESOURCE ${HELP_TR_FILES})
 diff --git a/featherpad/fpwin.cpp b/featherpad/fpwin.cpp
-index fb22688..1183861 100644
+index 61d9e2c..e75a4ec 100644
 --- a/featherpad/fpwin.cpp
 +++ b/featherpad/fpwin.cpp
-@@ -6364,9 +6364,7 @@ void FPwin::helpDoc()
+@@ -6235,9 +6235,7 @@ void FPwin::helpDoc()
      if (!langs.isEmpty())
          lang = langs.first().replace ('-', '_');
  
@@ -99,7 +99,7 @@ index fb22688..1183861 100644
      QString helpPath (qApp->applicationDirPath() + QStringLiteral ("/../Resources/") + "/help_" + lang);
  #else
      QString helpPath (QStringLiteral (DATADIR) + "/featherpad/help_" + lang);
-@@ -6375,9 +6373,7 @@ void FPwin::helpDoc()
+@@ -6246,9 +6244,7 @@ void FPwin::helpDoc()
      if (!QFile::exists (helpPath) && !langs.isEmpty())
      {
          lang = langs.first().split (QLatin1Char ('_')).first();
@@ -110,7 +110,7 @@ index fb22688..1183861 100644
          helpPath = qApp->applicationDirPath() + QStringLiteral ("/../Resources/") + "/help_" + lang;
  #else
          helpPath = QStringLiteral (DATADIR) + "/featherpad/help_" + lang;
-@@ -6386,9 +6382,7 @@ void FPwin::helpDoc()
+@@ -6257,9 +6253,7 @@ void FPwin::helpDoc()
  
      if (!QFile::exists (helpPath))
      {
@@ -122,10 +122,10 @@ index fb22688..1183861 100644
  #else
          helpPath =  QStringLiteral (DATADIR) + "/featherpad/help";
 diff --git a/featherpad/main.cpp b/featherpad/main.cpp
-index 4738abd..edb083e 100644
+index e610dfe..d54a823 100644
 --- a/featherpad/main.cpp
 +++ b/featherpad/main.cpp
-@@ -112,9 +112,7 @@ int main (int argc, char **argv)
+@@ -96,9 +96,7 @@ int main (int argc, char **argv)
      }
  
      QTranslator FPTranslator;
@@ -137,5 +137,5 @@ index 4738abd..edb083e 100644
  #else
      if (FPTranslator.load ("featherpad_" + lang, QStringLiteral (DATADIR) + "/featherpad/translations"))
 -- 
-2.42.1
+2.43.2