Nomacs: bump version

This commit is contained in:
Gerasim Troeglazov
2020-06-09 17:21:52 +10:00
parent 37850cb278
commit 3e750b0b38
6 changed files with 266 additions and 87 deletions

Binary file not shown.

View File

@@ -14,17 +14,58 @@ resource app_version {
long_info = "@LONG_INFO@"
};
resource vector_icon {
$"6E6369660204FF9903006699080A04B480B480C980B480C980C980B480C9800A"
$"06B840B900C5BFB900404040C680BE40C680BE40400207C380C73FC380C73FC3"
$"80C7A9C2BFC800C329C800C2BFC800BB40C800BB40C800BAD6C800BA80C73FBA"
$"80C7A9BA80C6D6BB40C680BAD6C680BB40C680C2BFC680C2BFC680C329C680C3"
$"80C73FC380C6D6C380C73F0206C149BAB8C149BAB8C0FFBB02C03ABAB8C084BB"
$"02BFEFBA6DC03AB9A8BFEFB9F3C03AB9A8C368B67AC368B67AC3B3B62FC478B6"
$"7AC42DB62FC4C2B6C4C478B789C4C2B73FC478B7890A062020B90020B900B480"
$"B480B480B480B90020B9000A0620CB0020C500B480C500B480C980B900C980B9"
$"00CB000A06CB00CB00C500CB00C500C980C980C980C980C500CB00C5000A06CB"
$"0020CB00B900C980B900C980B480C500B480C50020080A0001002022220A0101"
$"012022220A0101022022220A0101032022220A0101042022220A010105202222"
$"0A0101062022220A010107202222"
resource("QT:QPA_FLAGS") "Q_REF_TO_ARGV|Q_REF_TO_FORK";
resource file_types message {
"types" = "image"
};
resource vector_icon {
$"6E6369660B05010387E1F102000602B900B82A1E40AB8668BA7FA54A2FFF485E"
$"1000FFFFFFFF90E1FF03FF97D903DEADED020006023700000000000000003E50"
$"0049A00049E0000085E2F1FF05AAC3020106023A40000000000000003B400048"
$"E0004AE000007DD4F2FF1098C505FF03BF500002000602341593389580BB61CD"
$"36BA5E4A9C4649AC3F00FFFF80FFFFD50004015F0B020BB9F6B693B9F6B693B9"
$"3FB70EB893B8AFB8A8B7CDB880B96EB964BAA8B8E9BA1EBA50BB7ABCAFBC39BB"
$"7BBBFBBE81BC98C232BBDCC071BC7FC2E8BB91C42ABAA6C3A5BB3BC4DFBA10C4"
$"EBB825C540B908C4A7B765C364B666C410B6CFC204B595BECEB545C066B536BD"
$"1DB538B9F6B693BB60B59EB9F6B693B9F6B693B9F6B693B9F6B693000AB9B6B6"
$"51B9B6B651BB05B574BE24B4FCBC98B517C000B4E5C392B61DC1EFB52FC46FB6"
$"9CC578B85FC541B75BC5ACB94AC499BADDC53ABA37C420BB3FC315BBDCC39ABB"
$"8CC04FBD07BA4FBBC1BD0DBD02B9BEBB63B8AFBA8AB92CBB03B832B9DAB836B8"
$"1CB7EFB8EFB877B759B9B6B651B90DB6C0B9B6B651020CB9F6B693B9F6B693BB"
$"60B59EBECEB545BD1DB538C066B536C364B666C204B595C410B6CFC4EBB825C4"
$"A7B765C540B908C42ABAA6C4DFBA10C426BA13C38AB916C401B977C21FB7D4BE"
$"49B787C022B76FBCD4B79DBA31B8FDBB4FB801B9B5B969B964BAA8B96CBA04B8"
$"E9BA1EB893B8AFB880B96EB8A8B7CDB9F6B693B93FB70EB9F6B693B9F6B693B9"
$"F6B693B9F6B6930213B8AFBA8AB8AFBA8AB92CBB03BA4FBBC1B9BEBB63BB04BC"
$"71BC94BDA5BBD2BD04BD51BE38BECBBF60BE06BED7C009BE6CC274BC71C13CBD"
$"6BC2ADBC43C315BBDCC2E0BC0EC39ABB8CC499BADDC420BB3FC46FBB42C3DFBB"
$"E4C428BB94C298BD6DBF7FBFF3C109BEB0BF62C048BF6DC0FEBF70C0A5BF74C2"
$"4CBF77C4EABF62C39CBF70C4E7BF63C4E1BF6AC4E4BF5DC349BF5CC019BF6EC1"
$"B1BF2BC034BECAC06CBEFBC050BE93C04ABE26C003BE5CC027BD09BF3FBB02BD"
$"76BC03BE5DBA7ABCF9B98BBBDEBA05BC69B935BB76B8AFBA8AB8E7BB06B8AFBA"
$"8AB8AFBA8AB8AFBA8AB8AFBA8A0609FFFF01BA31B8FDBA31B8FDBB4FB801BE49"
$"B787BCD4B79DC022B76FC38AB916C21FB7D4C401B977C42ABAA6C426BA13C3A5"
$"BB3BC232BBDCC2E8BB91C071BC7FBCAFBC39BE81BC98BB7BBBFBB964BAA8BA50"
$"BB7AB96CBA04BA31B8FDB9B5B969BA31B8FDB8FD0607FF1FBA4FBBC1BA4FBBC1"
$"BD0DBD02C315BBDCC04FBD07C2E0BC0EC274BC71C2ADBC43C13CBD6BBECBBF60"
$"C009BE6CBE06BED7BC94BDA5BD51BE38BBD2BD04BA4FBBC1BB04BC71BA4FBBC1"
$"BBC1020FBE26C003BE26C003BE5CC027BECAC06CBE93C04ABEFBC050BF5CC019"
$"BF2BC034BF6EC1B1BF63C4E1BF5DC349BF6AC4E4BF77C4EABF70C4E7C060C519"
$"C1C3C679C182C573C17DC63CC0F1C5BEC13DC5F6C07DC56FBF66C547BFF0C54F"
$"BF60C5A1BF56C657BF5FC5FD3FC6EABE38C680BE62C707BE21C619BE1AC546BE"
$"23C5AFBD3BC54CBBDAC660BC70C5C1BC21C564BE23C4E9BD40C515BE2CC348BE"
$"26C003BE25C1A5BE26C003BE26C003BE26C003BE26C003020BBBDAC660BBDAC6"
$"60BC70C5C1BE1AC546BD3BC54C3E4EBF66C5473E4EBFF0C54FC0F1C5BEC07DC5"
$"6FC13DC5F6C1C3C679C17DC63CC1C5C6DBC173C792C1BFC74AC0D5C7EDBF74C8"
$"4DC02CC83DBEAAC85FBD19C80EBDD6C85EBCB4C7E3BBFDC769BC57C7A7BBCEC7"
$"1ABBDAC660BBBEC6B8BBDAC660BBDAC660BBDAC660BBDAC6600608FF7FBBFDC7"
$"69BBFDC769BC57C7A7BD19C80EBCB4C7E3BDD6C85EBF74C84DBEAAC85FC02CC8"
$"3DC173C792C0D5C7EDC12DC817C00DC877C094C84DBEDFC8C1BC7EC801BD88C8"
$"AFBC44C7DEBBFDC769BC1CC7A5BBFDC769C7690803453352265B2802044030C3"
$"4530BC3A30304030BC3A30C3454050BC3A50C34550504050C34550BC3A0B0A0A"
$"010A0240A0000000000000003E4000C0000049C0000A00040706030110011784"
$"22040A020102000A020103000A030104000A01020001000A0801091001178423"
$"040A0901091001178123040A040105000A060107000A05010600"
};

View File

@@ -3,22 +3,26 @@ DESCRIPTION="nomacs is a free, open source image viewer, which supports \
multiple platforms. You can use it for viewing all common image formats \
including RAW and psd images."
HOMEPAGE="https://nomacs.org/"
COPYRIGHT="2011-2013 Markus Diem
2011-2013 Stefan Fiel
2011-2013 Florian Kleber"
COPYRIGHT="2011-2020 Markus Diem
2011-2020 Stefan Fiel
2011-2020 Florian Kleber"
LICENSE="GNU LGPL v3"
REVISION="1"
SOURCE_URI_1="https://github.com/nomacs/nomacs/archive/$portVersion.tar.gz"
CHECKSUM_SHA256_1="f4a32169e6c0cb939971da2732e4d67c6e2e649506da1b55bfc94963a26280ff"
SOURCE_FILENAME_1="nomacs-$portVersion.tar.gz"
SOURCE_URI_2="https://github.com/nomacs/nomacs-plugins/archive/${portVersion}.0.tar.gz"
CHECKSUM_SHA256_2="57374f5846f1e733acad9f81ee2c71a3c8d9be8f88e1c8ab32245cb937eadc0a"
SOURCE_FILENAME_2="nomacs-plugins-${portVersion}.0.tar.gz"
SOURCE_DIR_2="nomacs-plugins-${portVersion}.0"
SOURCE_URI="https://github.com/nomacs/nomacs/archive/$portVersion.tar.gz"
CHECKSUM_SHA256="0e9e59fac5e369c1141692b723c2139ca28d59a9b0a909f0685bc437d3aa183f"
SOURCE_FILENAME="nomacs-$portVersion.tar.gz"
SOURCE_URI_2="https://github.com/nomacs/nomacs-plugins/archive/${portVersion%.*}.tar.gz"
CHECKSUM_SHA256_2="df752bc57c0136a367553457452ee5b44b35524536e5fea1b51083d4ac09b76a"
SOURCE_FILENAME_2="nomacs-plugins-${portVersion%.*}.tar.gz"
SOURCE_DIR_2="nomacs-plugins-${portVersion%.*}"
PATCHES="nomacs-$portVersion.patchset"
ADDITIONAL_FILES="nomacs.rdef.in"
PATCHES_2="nomacs-plugins-$portVersion.patchset"
ADDITIONAL_FILES="
nomacs.rdef.in
haikuicons.zip
"
ARCHITECTURES="?x86_gcc2 x86 x86_64"
ARCHITECTURES="!x86_gcc2 x86_64"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
@@ -40,6 +44,7 @@ REQUIRES="
lib:libQt5PrintSupport$secondaryArchSuffix
lib:libQt5Svg$secondaryArchSuffix
lib:libQt5Widgets$secondaryArchSuffix
lib:libquazip5$secondaryArchSuffix
lib:libraw$secondaryArchSuffix
lib:libtiff$secondaryArchSuffix
lib:libz$secondaryArchSuffix
@@ -73,8 +78,14 @@ BUILD_PREREQUIRES="
cmd:make
cmd:pkg_config$secondaryArchSuffix
cmd:python2
cmd:unzip
"
PATCH()
{
unzip -o $sourceDir/../../additional-files/haikuicons.zip -d $sourceDir/ImageLounge/src/img
}
BUILD()
{
cd ImageLounge
@@ -85,6 +96,7 @@ BUILD()
cd build
cmake .. \
-DUSE_SYSTEM_QUAZIP=ON \
$cmakeDirArgs
make $jobArgs
@@ -114,6 +126,7 @@ INSTALL()
mkdir -p $appsDir/Nomacs $manDir
mv $prefix/bin/nomacs $appsDir/Nomacs/Nomacs
mv $prefix/lib $appsDir/Nomacs
mv $appsDir/Nomacs/lib/nomacs-plugins $appsDir/Nomacs/plugins
mv $prefix/share/man/man1 $manDir
rm -rf $prefix/bin $prefix/share

View File

@@ -1,62 +0,0 @@
From a95b718590cf9123a8ceea21ce49102abcd9c98b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Mon, 25 Dec 2017 22:08:42 +0100
Subject: Haiku build fix
diff --git a/ImageLounge/CMakeLists.txt b/ImageLounge/CMakeLists.txt
index fdcd694..72874ad 100644
--- a/ImageLounge/CMakeLists.txt
+++ b/ImageLounge/CMakeLists.txt
@@ -101,7 +101,11 @@ endif()
if (ENABLE_CODE_COV AND CMAKE_COMPILER_IS_GNUCXX)
# Codecov
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -pthread -g -O0 -fprofile-arcs -ftest-coverage")
+ if (HAIKU)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -g -O0 -fprofile-arcs -ftest-coverage -lexpat")
+ else()
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -pthread -g -O0 -fprofile-arcs -ftest-coverage")
+ endif()
endif()
# find Qt
--
2.24.0
From 53cacb2039fe88cc76e8a200d9cdb9795ab54c78 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 19 Nov 2019 17:30:30 +0100
Subject: include iostream.
diff --git a/ImageLounge/src/DkCore/DkMetaData.cpp b/ImageLounge/src/DkCore/DkMetaData.cpp
index d195757..affec7b 100644
--- a/ImageLounge/src/DkCore/DkMetaData.cpp
+++ b/ImageLounge/src/DkCore/DkMetaData.cpp
@@ -42,6 +42,8 @@
#include <QApplication>
#pragma warning(pop) // no warnings from includes - end
+#include <iostream>
+
namespace nmc {
// DkMetaDataT --------------------------------------------------------------------
diff --git a/ImageLounge/src/DkGui/DkNoMacs.cpp b/ImageLounge/src/DkGui/DkNoMacs.cpp
index 6a412f7..bbfba23 100644
--- a/ImageLounge/src/DkGui/DkNoMacs.cpp
+++ b/ImageLounge/src/DkGui/DkNoMacs.cpp
@@ -96,6 +96,8 @@
#include <QWinTaskbarButton>
#endif
+#include <iostream>
+
namespace nmc {
DkNomacsOSXEventFilter::DkNomacsOSXEventFilter(QObject *parent) : QObject(parent) {
--
2.24.0

View File

@@ -0,0 +1,166 @@
From 95079ec9a60401fc73edbca6b4c96a8dac11a714 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Mon, 25 Dec 2017 22:08:42 +0100
Subject: Haiku build fix
diff --git a/ImageLounge/CMakeLists.txt b/ImageLounge/CMakeLists.txt
index 32791e7..cb82083 100644
--- a/ImageLounge/CMakeLists.txt
+++ b/ImageLounge/CMakeLists.txt
@@ -98,7 +98,11 @@ endif()
if (ENABLE_CODE_COV AND CMAKE_COMPILER_IS_GNUCXX)
# Codecov
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -pthread -g -O0 -fprofile-arcs -ftest-coverage")
+ if (HAIKU)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -g -O0 -fprofile-arcs -ftest-coverage -lexpat")
+ else()
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -pthread -g -O0 -fprofile-arcs -ftest-coverage")
+ endif()
endif()
# find Qt
--
2.26.0
From 65026cb10087cafc5919579b2ca33c8d7443723e 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 e73df0f..aa2d6b8 100644
--- a/ImageLounge/src/DkCore/DkSettings.cpp
+++ b/ImageLounge/src/DkCore/DkSettings.cpp
@@ -844,8 +844,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.26.0
From 557f8d16c4fc6f0123762af4372a6380717bcc44 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 1f99cee..81dd73d 100644
--- a/ImageLounge/src/DkCore/DkPluginManager.cpp
+++ b/ImageLounge/src/DkCore/DkPluginManager.cpp
@@ -1303,7 +1303,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 = QCoreApplication::applicationDirPath() + "/../lib/nomacs-plugins/";
--
2.26.0
From 46438fbe7f83ca1b52f781e1b7a73c75f4991166 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 fc30b74..2e046a7 100644
--- a/ImageLounge/src/DkCore/DkImageStorage.cpp
+++ b/ImageLounge/src/DkCore/DkImageStorage.cpp
@@ -1211,7 +1211,9 @@ cv::Mat DkImage::applyLUT(const cv::Mat& src, const cv::Mat& lut) {
#endif // WITH_OPENCV
QPixmap DkImage::colorizePixmap(const QPixmap& icon, const QColor& col, float opacity) {
-
+#ifdef __HAIKU__
+ return icon;
+#else
if (icon.isNull())
return icon;
@@ -1226,6 +1228,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.26.0
From 7b82a0d093f3b48812a31fe796601bab78b86cbb 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 aa2d6b8..8809491 100644
--- a/ImageLounge/src/DkCore/DkSettings.cpp
+++ b/ImageLounge/src/DkCore/DkSettings.cpp
@@ -844,7 +844,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 ae0fd2f..48ae585 100644
--- a/ImageLounge/src/DkGui/DkPreferenceWidgets.cpp
+++ b/ImageLounge/src/DkGui/DkPreferenceWidgets.cpp
@@ -302,7 +302,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.26.0
From 37db1e7bdc3c383f8eaa3d2d90e334efc171ecde 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 8809491..e10c6c2 100644
--- a/ImageLounge/src/DkCore/DkSettings.cpp
+++ b/ImageLounge/src/DkCore/DkSettings.cpp
@@ -848,7 +848,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.26.0

View File

@@ -0,0 +1,21 @@
From a9dbac0e35b13ac370793e2fac01e301014f8930 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 9 Jun 2020 09:44:27 +1000
Subject: Fix for Qt 5.15
diff --git a/PageExtractionPlugin/src/DkPageSegmentation.cpp b/PageExtractionPlugin/src/DkPageSegmentation.cpp
index 60d8722..21f2a21 100644
--- a/PageExtractionPlugin/src/DkPageSegmentation.cpp
+++ b/PageExtractionPlugin/src/DkPageSegmentation.cpp
@@ -29,6 +29,7 @@
#pragma warning(push, 0) // no warnings from includes - begin
#include <QDebug>
#include <QPainter>
+#include <QPainterPath>
#include <opencv2/imgproc/imgproc_c.h>
#include <opencv2/imgproc/imgproc.hpp>
--
2.26.0