From c7ff96094df08c085cf8bc07671a0b65cfb76a72 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Fri, 19 Dec 2025 07:45:04 +0100 Subject: [PATCH] nomacs, bump to 3.21.1 (#13395) fixes build for new exiv2 --- ...omacs-3.17.recipe => nomacs-3.21.1.recipe} | 24 ++- media-gfx/nomacs/patches/nomacs-3.17.patchset | 138 ------------------ .../nomacs/patches/nomacs-3.21.1.patchset | 84 +++++++++++ 3 files changed, 94 insertions(+), 152 deletions(-) rename media-gfx/nomacs/{nomacs-3.17.recipe => nomacs-3.21.1.recipe} (91%) delete mode 100644 media-gfx/nomacs/patches/nomacs-3.17.patchset create mode 100644 media-gfx/nomacs/patches/nomacs-3.21.1.patchset diff --git a/media-gfx/nomacs/nomacs-3.17.recipe b/media-gfx/nomacs/nomacs-3.21.1.recipe similarity index 91% rename from media-gfx/nomacs/nomacs-3.17.recipe rename to media-gfx/nomacs/nomacs-3.21.1.recipe index 516700d3c..faa67ddbe 100644 --- a/media-gfx/nomacs/nomacs-3.17.recipe +++ b/media-gfx/nomacs/nomacs-3.21.1.recipe @@ -7,11 +7,10 @@ COPYRIGHT="2011-2020 Markus Diem 2011-2020 Stefan Fiel 2011-2020 Florian Kleber" LICENSE="GNU LGPL v3" -REVISION="3" -SOURCE_URI="https://github.com/nomacs/nomacs/archive/$portVersion.2282.tar.gz" -CHECKSUM_SHA256="bf89d4c6072a7647af95edc161b2d5e45b7ce25aa256e48b655dcf37350433e4" +REVISION="1" +SOURCE_URI="https://github.com/nomacs/nomacs/archive/$portVersion.tar.gz" +CHECKSUM_SHA256="7d0841d00ed6538328d4ffc91d8f3f53f457d50860f231c928deadc8d6e7aaad" SOURCE_FILENAME="nomacs-$portVersion.tar.gz" -SOURCE_DIR="nomacs-$portVersion.2282" SOURCE_URI_2="https://github.com/nomacs/nomacs-plugins/archive/3.16.tar.gz" CHECKSUM_SHA256_2="ab6a91c582d48f4a4697d80ce549886921888cfbb32ea8b8c3b172fb7139225a" SOURCE_FILENAME_2="nomacs-plugins-$portVersion.tar.gz" @@ -27,7 +26,7 @@ SECONDARY_ARCHITECTURES="x86" PROVIDES=" nomacs$secondaryArchSuffix = $portVersion - app:Nomacs$secondaryArchSuffix = $portVersion + app:Nomacs = $portVersion " REQUIRES=" haiku$secondaryArchSuffix @@ -94,22 +93,19 @@ BUILD() mkdir -p plugins cp -r $sourceDir2/* plugins - mkdir -p build - cd build - - cmake .. \ - -DCMAKE_BUILD_TYPE=Release \ + cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ + $cmakeDirArgs \ -DUSE_SYSTEM_QUAZIP=ON \ -DENABLE_TRANSLATIONS=ON \ - $cmakeDirArgs + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 - make $jobArgs + make -C build $jobArgs } INSTALL() { - cd ImageLounge/build - make install + cd ImageLounge + make -C build install local APP_SIGNATURE="application/x-vnd.nomacs" local MAJOR="`echo "$portVersion" | cut -d. -f1`" diff --git a/media-gfx/nomacs/patches/nomacs-3.17.patchset b/media-gfx/nomacs/patches/nomacs-3.17.patchset deleted file mode 100644 index c4c6a04b9..000000000 --- a/media-gfx/nomacs/patches/nomacs-3.17.patchset +++ /dev/null @@ -1,138 +0,0 @@ -From 1c9b36974f0da1e01d8988b3e093442ae5070033 Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Tue, 9 Jun 2020 12:06:32 +1000 -Subject: Change default bgColor - - -diff --git a/ImageLounge/src/DkCore/DkSettings.cpp b/ImageLounge/src/DkCore/DkSettings.cpp -index d2ce1c8..738597f 100644 ---- a/ImageLounge/src/DkCore/DkSettings.cpp -+++ b/ImageLounge/src/DkCore/DkSettings.cpp -@@ -872,8 +872,8 @@ void DkSettings::setToDefaultSettings() - display_p.highlightColor = QColor(0, 204, 255); - display_p.hudBgColor = QColor(0, 0, 0, 100); - display_p.hudFgdColor = QColor(255, 255, 255); -- display_p.bgColor = QColor(100, 100, 100, 255); -- display_p.iconColor = QColor(100, 100, 100, 255); -+ display_p.bgColor = QColor(216, 216, 216, 255); -+ display_p.iconColor = QColor(0, 0, 0, 255); - display_p.bgColorFrameless = QColor(0, 0, 0, 180); - display_p.thumbSize = 64; - display_p.iconSize = 16; --- -2.37.3 - - -From e20ca22f39fd981d5ef3db5f9afba3a9736c700d Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Tue, 9 Jun 2020 12:06:48 +1000 -Subject: Fix plugins dir - - -diff --git a/ImageLounge/src/DkCore/DkPluginManager.cpp b/ImageLounge/src/DkCore/DkPluginManager.cpp -index 8025108..9f6f621 100644 ---- a/ImageLounge/src/DkCore/DkPluginManager.cpp -+++ b/ImageLounge/src/DkCore/DkPluginManager.cpp -@@ -1311,7 +1311,7 @@ void DkPluginManager::createPluginsPath() - { - #ifdef WITH_PLUGINS - // initialize plugin paths ----------------------------------------- --#ifdef Q_OS_WIN -+#if defined(Q_OS_WIN) || defined(Q_OS_HAIKU) - QDir pluginsDir = QCoreApplication::applicationDirPath() + "/plugins"; - #else - QDir pluginsDir = QLibraryInfo::location(QLibraryInfo::LibrariesPath) + "/nomacs-plugins/"; --- -2.37.3 - - -From bd425113d52f07b16faab74200ef58f2821c54ca Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Tue, 9 Jun 2020 16:38:41 +1000 -Subject: Disable colorize icons - - -diff --git a/ImageLounge/src/DkCore/DkImageStorage.cpp b/ImageLounge/src/DkCore/DkImageStorage.cpp -index 119caf6..6b0e874 100644 ---- a/ImageLounge/src/DkCore/DkImageStorage.cpp -+++ b/ImageLounge/src/DkCore/DkImageStorage.cpp -@@ -992,6 +992,9 @@ cv::Mat DkImage::applyLUT(const cv::Mat &src, const cv::Mat &lut) - - QPixmap DkImage::colorizePixmap(const QPixmap &icon, const QColor &col, float opacity) - { -+#ifdef __HAIKU__ -+ return icon; -+#else - if (icon.isNull()) - return icon; - -@@ -1006,6 +1009,7 @@ QPixmap DkImage::colorizePixmap(const QPixmap &icon, const QColor &col, float op - painter.drawPixmap(glow.rect(), sGlow); - - return glow; -+#endif - } - - QPixmap DkImage::loadIcon(const QString &filePath, const QSize &size, const QColor &col) --- -2.37.3 - - -From 19c6b364c9e270e786e162a3f7b10b895ed47354 Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Tue, 9 Jun 2020 16:39:14 +1000 -Subject: Use system color for panel background - - -diff --git a/ImageLounge/src/DkCore/DkSettings.cpp b/ImageLounge/src/DkCore/DkSettings.cpp -index 738597f..96f42b4 100644 ---- a/ImageLounge/src/DkCore/DkSettings.cpp -+++ b/ImageLounge/src/DkCore/DkSettings.cpp -@@ -872,7 +872,7 @@ void DkSettings::setToDefaultSettings() - display_p.highlightColor = QColor(0, 204, 255); - display_p.hudBgColor = QColor(0, 0, 0, 100); - display_p.hudFgdColor = QColor(255, 255, 255); -- display_p.bgColor = QColor(216, 216, 216, 255); -+ display_p.bgColor = QApplication::palette().color(QPalette::Window); - display_p.iconColor = QColor(0, 0, 0, 255); - display_p.bgColorFrameless = QColor(0, 0, 0, 180); - display_p.thumbSize = 64; -diff --git a/ImageLounge/src/DkGui/DkPreferenceWidgets.cpp b/ImageLounge/src/DkGui/DkPreferenceWidgets.cpp -index c220a90..25089fb 100644 ---- a/ImageLounge/src/DkGui/DkPreferenceWidgets.cpp -+++ b/ImageLounge/src/DkGui/DkPreferenceWidgets.cpp -@@ -308,7 +308,7 @@ void DkGeneralPreference::createLayout() - iconColorChooser->setColor(&DkSettingsManager::param().display().iconColor); - connect(iconColorChooser, SIGNAL(accepted()), this, SLOT(showRestartLabel())); - -- DkColorChooser *bgColorChooser = new DkColorChooser(QColor(100, 100, 100, 255), tr("Background Color"), this); -+ DkColorChooser* bgColorChooser = new DkColorChooser(QWidget::palette().color(QPalette::Window), tr("Background Color"), this); - bgColorChooser->setObjectName("backgroundColor"); - bgColorChooser->setColor(&DkSettingsManager::param().display().bgColor); - connect(bgColorChooser, SIGNAL(accepted()), this, SLOT(showRestartLabel())); --- -2.37.3 - - -From 1c17bb198010795fd33e17f670f683ff4af87f74 Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Tue, 9 Jun 2020 16:57:18 +1000 -Subject: Set iconSize to 22px by default - - -diff --git a/ImageLounge/src/DkCore/DkSettings.cpp b/ImageLounge/src/DkCore/DkSettings.cpp -index 96f42b4..db577e0 100644 ---- a/ImageLounge/src/DkCore/DkSettings.cpp -+++ b/ImageLounge/src/DkCore/DkSettings.cpp -@@ -876,7 +876,7 @@ void DkSettings::setToDefaultSettings() - display_p.iconColor = QColor(0, 0, 0, 255); - display_p.bgColorFrameless = QColor(0, 0, 0, 180); - display_p.thumbSize = 64; -- display_p.iconSize = 16; -+ display_p.iconSize = 22; - display_p.thumbPreviewSize = 64; - display_p.antiAliasing = true; - display_p.highQualityAntiAliasing = false; --- -2.37.3 - diff --git a/media-gfx/nomacs/patches/nomacs-3.21.1.patchset b/media-gfx/nomacs/patches/nomacs-3.21.1.patchset new file mode 100644 index 000000000..297df56eb --- /dev/null +++ b/media-gfx/nomacs/patches/nomacs-3.21.1.patchset @@ -0,0 +1,84 @@ +From 7b243fdcf529a39353533658a01d72463be486b8 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Tue, 9 Jun 2020 12:06:48 +1000 +Subject: Fix plugins dir + + +diff --git a/ImageLounge/src/DkCore/DkPluginManager.cpp b/ImageLounge/src/DkCore/DkPluginManager.cpp +index cee4a6a..3ce08df 100644 +--- a/ImageLounge/src/DkCore/DkPluginManager.cpp ++++ b/ImageLounge/src/DkCore/DkPluginManager.cpp +@@ -1299,7 +1299,7 @@ void DkPluginManager::createPluginsPath() + { + #ifdef WITH_PLUGINS + // initialize plugin paths ----------------------------------------- +-#if defined(Q_OS_WIN) ++#if defined(Q_OS_WIN) || defined(Q_OS_HAIKU) + QDir pluginsDir = QCoreApplication::applicationDirPath() + "/plugins"; + #elif defined(Q_OS_MAC) + // .app/Contents/PlugIns contains Qt plugins so make our own subdirectory here. +-- +2.51.0 + + +From 80b30f4f8c6bdcd52592f52ec581395552e1d5b6 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Tue, 9 Jun 2020 16:38:41 +1000 +Subject: Disable colorize icons + + +diff --git a/ImageLounge/src/DkCore/DkImageStorage.cpp b/ImageLounge/src/DkCore/DkImageStorage.cpp +index b43cfd6..3d422c3 100644 +--- a/ImageLounge/src/DkCore/DkImageStorage.cpp ++++ b/ImageLounge/src/DkCore/DkImageStorage.cpp +@@ -1144,6 +1144,9 @@ cv::Mat DkImage::applyLUT(const cv::Mat &src, const cv::Mat &lut) + + QPixmap DkImage::colorizePixmap(const QPixmap &icon, const QColor &col, float opacity) + { ++#ifdef __HAIKU__ ++ return icon; ++#else + if (icon.isNull()) + return icon; + +@@ -1158,6 +1161,7 @@ QPixmap DkImage::colorizePixmap(const QPixmap &icon, const QColor &col, float op + painter.drawPixmap(glow.rect(), sGlow); + + return glow; ++#endif + } + + QPixmap DkImage::loadIcon(const QString &filePath, const QSize &size, const QColor &col) +-- +2.51.0 + + +From 1b104aeaafdf359021bc6fbadd094b1707096ae5 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Tue, 9 Jun 2020 16:57:18 +1000 +Subject: Set iconSize to 22px by default + + +diff --git a/ImageLounge/src/DkCore/DkSettings.cpp b/ImageLounge/src/DkCore/DkSettings.cpp +index 744f63e..dafef47 100644 +--- a/ImageLounge/src/DkCore/DkSettings.cpp ++++ b/ImageLounge/src/DkCore/DkSettings.cpp +@@ -899,12 +899,12 @@ void DkSettings::setToDefaultSettings() + display_p.highlightColor = QColor(0, 204, 255); + display_p.hudBgColor = QColor(0, 0, 0, 100); + display_p.hudFgdColor = QColor(255, 255, 255); +- display_p.bgColor = QColor(100, 100, 100, 255); ++ display_p.bgColor = QApplication::palette().color(QPalette::Window); + display_p.fgColor = QColor(0, 0, 0, 255); +- display_p.iconColor = QColor(100, 100, 100, 255); ++ display_p.iconColor = QColor(0, 0, 0, 255); + display_p.bgColorFrameless = QColor(0, 0, 0, 180); + display_p.thumbSize = 64; +- display_p.iconSize = 20; ++ display_p.iconSize = 16; + display_p.thumbPreviewSize = 64; + display_p.antiAliasing = true; + display_p.highQualityAntiAliasing = false; +-- +2.51.0 +