haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 20:20:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Nomacs: bump version. fix locales.

Browse Source
This commit is contained in:
Gerasim Troeglazov
2020-12-05 23:34:03 +10:00
parent 676cdb4ddb
commit 772fb52d0b
3 changed files with 40 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
media-gfx/nomacs/nomacs-3.14.2.recipe → media-gfx/nomacs/nomacs-3.16.recipe
View File

@@ -8,15 +8,15 @@ COPYRIGHT="2011-2020 Markus Diem
2011-2020 Florian Kleber"
LICENSE="GNU LGPL v3"
REVISION="1"
SOURCE_URI="https://github.com/nomacs/nomacs/archive/$portVersion.tar.gz"
CHECKSUM_SHA256="0e9e59fac5e369c1141692b723c2139ca28d59a9b0a909f0685bc437d3aa183f"
SOURCE_URI="https://github.com/nomacs/nomacs/archive/$portVersion.224.tar.gz"
CHECKSUM_SHA256="bbc7e9048026ef9e0d2b64902c88050f17a679ef3d3c009de2c3b7de5d1d217c"
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%.*}"
SOURCE_DIR="nomacs-$portVersion.224"
SOURCE_URI_2="https://github.com/nomacs/nomacs-plugins/archive/$portVersion.tar.gz"
CHECKSUM_SHA256_2="ab6a91c582d48f4a4697d80ce549886921888cfbb32ea8b8c3b172fb7139225a"
SOURCE_FILENAME_2="nomacs-plugins-$portVersion.tar.gz"
SOURCE_DIR_2="nomacs-plugins-$portVersion"
PATCHES="nomacs-$portVersion.patchset"
PATCHES_2="nomacs-plugins-$portVersion.patchset"
ADDITIONAL_FILES="
nomacs.rdef.in
haikuicons.zip
@@ -74,7 +74,7 @@ BUILD_PREREQUIRES="
cmd:cmake
cmd:g++$secondaryArchSuffix
cmd:lcov
cmd:lrelease$secondaryArchSuffix >= 5
cmd:lrelease$secondaryArchSuffix
cmd:make
cmd:pkg_config$secondaryArchSuffix
cmd:python2
@@ -97,6 +97,7 @@ BUILD()
cmake .. \
-DUSE_SYSTEM_QUAZIP=ON \
-DENABLE_TRANSLATIONS=ON \
$cmakeDirArgs
make $jobArgs
@@ -107,11 +108,11 @@ INSTALL()
cd ImageLounge/build
make install
local APP_SIGNATURE="application/x-vnd.qt5-ImageLounge"
local APP_SIGNATURE="application/x-vnd.nomacs"
local MAJOR="`echo "$portVersion" | cut -d. -f1`"
local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
local MINOR="`echo "$portVersion" | cut -d. -f3`"
MINOR="0"
# local MINOR="`echo "$portVersion" | cut -d. -f3`"
local MINOR="0"
local INTERNAL="0"
local LONG_INFO="$SUMMARY"
sed \
@@ -128,6 +129,7 @@ INSTALL()
mv $prefix/lib $appsDir/Nomacs
mv $appsDir/Nomacs/lib/nomacs-plugins $appsDir/Nomacs/plugins
mv $prefix/share/man/man1 $manDir
mv "$prefix/share/nomacs/Image Lounge/translations" $appsDir/Nomacs
rm -rf $prefix/bin $prefix/share
addResourcesToBinaries nomacs.rdef $appsDir/Nomacs/Nomacs

54
media-gfx/nomacs/patches/nomacs-3.14.2.patchset → media-gfx/nomacs/patches/nomacs-3.16.patchset
View File

@@ -1,14 +1,14 @@
From 95079ec9a60401fc73edbca6b4c96a8dac11a714 Mon Sep 17 00:00:00 2001
From 98f80641a286588708595bfb4afe3afb7791d6a9 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
index 1a31e58..9ee09e5 100644
--- a/ImageLounge/CMakeLists.txt
+++ b/ImageLounge/CMakeLists.txt
@@ -98,7 +98,11 @@ endif()
@@ -103,7 +103,11 @@ endif()
if (ENABLE_CODE_COV AND CMAKE_COMPILER_IS_GNUCXX)
# Codecov
@@ -22,20 +22,20 @@ index 32791e7..cb82083 100644
# find Qt
--
2.26.0
2.28.0
From 65026cb10087cafc5919579b2ca33c8d7443723e Mon Sep 17 00:00:00 2001
From 4a5aab3e5451171b91fed7f3c5639930c78c738f 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
index e8dee7b..f1a4fbd 100644
--- a/ImageLounge/src/DkCore/DkSettings.cpp
+++ b/ImageLounge/src/DkCore/DkSettings.cpp
@@ -844,8 +844,8 @@ void DkSettings::setToDefaultSettings() {
@@ -855,8 +855,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);
@@ -47,20 +47,20 @@ index e73df0f..aa2d6b8 100644
display_p.thumbSize = 64;
display_p.iconSize = 16;
--
2.26.0
2.28.0
From 557f8d16c4fc6f0123762af4372a6380717bcc44 Mon Sep 17 00:00:00 2001
From d7484c02d3b2477e08138903c6e5400ff4fd668d 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
index 6d69cfd..01dca69 100644
--- a/ImageLounge/src/DkCore/DkPluginManager.cpp
+++ b/ImageLounge/src/DkCore/DkPluginManager.cpp
@@ -1303,7 +1303,7 @@ void DkPluginManager::createPluginsPath() {
@@ -1306,7 +1306,7 @@ void DkPluginManager::createPluginsPath() {
#ifdef WITH_PLUGINS
// initialize plugin paths -----------------------------------------
@@ -70,20 +70,20 @@ index 1f99cee..81dd73d 100644
#else
QDir pluginsDir = QCoreApplication::applicationDirPath() + "/../lib/nomacs-plugins/";
--
2.26.0
2.28.0
From 46438fbe7f83ca1b52f781e1b7a73c75f4991166 Mon Sep 17 00:00:00 2001
From 91238b4d6d8751e331abb0e7f9708edb3279e179 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
index 8c2bc05..ac6064f 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) {
@@ -1004,7 +1004,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) {
@@ -94,7 +94,7 @@ index fc30b74..2e046a7 100644
if (icon.isNull())
return icon;
@@ -1226,6 +1228,7 @@ QPixmap DkImage::colorizePixmap(const QPixmap& icon, const QColor& col, float op
@@ -1019,6 +1021,7 @@ QPixmap DkImage::colorizePixmap(const QPixmap& icon, const QColor& col, float op
painter.drawPixmap(glow.rect(), sGlow);
return glow;
@@ -103,20 +103,20 @@ index fc30b74..2e046a7 100644
QPixmap DkImage::loadIcon(const QString & filePath, const QSize& size, const QColor& col) {
--
2.26.0
2.28.0
From 7b82a0d093f3b48812a31fe796601bab78b86cbb Mon Sep 17 00:00:00 2001
From 61771756ff5e4a1577824b71ff8413b2de2baa4e 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
index f1a4fbd..de6be1c 100644
--- a/ImageLounge/src/DkCore/DkSettings.cpp
+++ b/ImageLounge/src/DkCore/DkSettings.cpp
@@ -844,7 +844,7 @@ void DkSettings::setToDefaultSettings() {
@@ -855,7 +855,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);
@@ -126,10 +126,10 @@ index aa2d6b8..8809491 100644
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
index 7bd4dd6..794e829 100644
--- a/ImageLounge/src/DkGui/DkPreferenceWidgets.cpp
+++ b/ImageLounge/src/DkGui/DkPreferenceWidgets.cpp
@@ -302,7 +302,7 @@ void DkGeneralPreference::createLayout() {
@@ -303,7 +303,7 @@ void DkGeneralPreference::createLayout() {
iconColorChooser->setColor(&DkSettingsManager::param().display().iconColor);
connect(iconColorChooser, SIGNAL(accepted()), this, SLOT(showRestartLabel()));
@@ -139,20 +139,20 @@ index ae0fd2f..48ae585 100644
bgColorChooser->setColor(&DkSettingsManager::param().display().bgColor);
connect(bgColorChooser, SIGNAL(accepted()), this, SLOT(showRestartLabel()));
--
2.26.0
2.28.0
From 37db1e7bdc3c383f8eaa3d2d90e334efc171ecde Mon Sep 17 00:00:00 2001
From 5abd3ca15f574bfbf91844c1656c040dd7d06e77 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
index de6be1c..7cc20be 100644
--- a/ImageLounge/src/DkCore/DkSettings.cpp
+++ b/ImageLounge/src/DkCore/DkSettings.cpp
@@ -848,7 +848,7 @@ void DkSettings::setToDefaultSettings() {
@@ -859,7 +859,7 @@ void DkSettings::setToDefaultSettings() {
display_p.iconColor = QColor(0, 0, 0, 255);
display_p.bgColorFrameless = QColor(0, 0, 0, 180);
display_p.thumbSize = 64;
@@ -162,5 +162,5 @@ index 8809491..e10c6c2 100644
display_p.antiAliasing = true;
display_p.highQualityAntiAliasing = false;
--
2.26.0
2.28.0

21
media-gfx/nomacs/patches/nomacs-plugins-3.14.2.patchset
View File

@@ -1,21 +0,0 @@
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