From fff60e04f036ea67c1c7da70470fb77ffaa4155f Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Tue, 19 Nov 2019 17:33:39 +0100 Subject: [PATCH] nomacs: bump version. --- ...nomacs-3.8.0.recipe => nomacs-3.12.recipe} | 21 ++++--- media-gfx/nomacs/patches/nomacs-3.12.patchset | 62 +++++++++++++++++++ .../nomacs/patches/nomacs-3.8.0.patchset | 26 -------- 3 files changed, 74 insertions(+), 35 deletions(-) rename media-gfx/nomacs/{nomacs-3.8.0.recipe => nomacs-3.12.recipe} (83%) create mode 100644 media-gfx/nomacs/patches/nomacs-3.12.patchset delete mode 100644 media-gfx/nomacs/patches/nomacs-3.8.0.patchset diff --git a/media-gfx/nomacs/nomacs-3.8.0.recipe b/media-gfx/nomacs/nomacs-3.12.recipe similarity index 83% rename from media-gfx/nomacs/nomacs-3.8.0.recipe rename to media-gfx/nomacs/nomacs-3.12.recipe index 4e0fc0142..33b3fbf9d 100644 --- a/media-gfx/nomacs/nomacs-3.8.0.recipe +++ b/media-gfx/nomacs/nomacs-3.12.recipe @@ -7,13 +7,14 @@ COPYRIGHT="2011-2013 Markus Diem 2011-2013 Stefan Fiel 2011-2013 Florian Kleber" LICENSE="GNU LGPL v3" -REVISION="4" -SOURCE_URI_1="https://github.com/nomacs/nomacs/archive/3.8.0.tar.gz" -CHECKSUM_SHA256_1="f43ad1507f2890db2fbaa0cb110de3ac5efe754cf2e7a053eaabfed4d5e06845" +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/3.8.0.tar.gz" -CHECKSUM_SHA256_2="5a700b27990fb72ae8582e69143389d0cf9c9313f9b361348b9bb8339b3dabdc" -SOURCE_FILENAME_2="nomacs-plugins-$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" PATCHES="nomacs-$portVersion.patchset" ADDITIONAL_FILES="nomacs.rdef.in" @@ -59,8 +60,9 @@ BUILD_REQUIRES=" devel:libQt5PrintSupport$secondaryArchSuffix devel:libQt5Svg$secondaryArchSuffix devel:libQt5Widgets$secondaryArchSuffix - devel:libraw$secondaryArchSuffix - devel:libtiff$secondaryArchSuffix + devel:libquazip5$secondaryArchSuffix + devel:libraw$secondaryArchSuffix >= 19 + devel:libtiff$secondaryArchSuffix >= 5 devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" @@ -77,7 +79,7 @@ BUILD() { cd ImageLounge mkdir -p plugins - cp -r $sourceDir2/nomacs-plugins-$portVersion/* plugins + cp -r $sourceDir2/* plugins mkdir -p build cd build @@ -97,6 +99,7 @@ INSTALL() local MAJOR="`echo "$portVersion" | cut -d. -f1`" local MIDDLE="`echo "$portVersion" | cut -d. -f2`" local MINOR="`echo "$portVersion" | cut -d. -f3`" + MINOR="0" local INTERNAL="0" local LONG_INFO="$SUMMARY" sed \ diff --git a/media-gfx/nomacs/patches/nomacs-3.12.patchset b/media-gfx/nomacs/patches/nomacs-3.12.patchset new file mode 100644 index 000000000..4e7611ddc --- /dev/null +++ b/media-gfx/nomacs/patches/nomacs-3.12.patchset @@ -0,0 +1,62 @@ +From a95b718590cf9123a8ceea21ce49102abcd9c98b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= +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 +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 + #pragma warning(pop) // no warnings from includes - end + ++#include ++ + 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 + #endif + ++#include ++ + namespace nmc { + + DkNomacsOSXEventFilter::DkNomacsOSXEventFilter(QObject *parent) : QObject(parent) { +-- +2.24.0 + diff --git a/media-gfx/nomacs/patches/nomacs-3.8.0.patchset b/media-gfx/nomacs/patches/nomacs-3.8.0.patchset deleted file mode 100644 index 222e9e855..000000000 --- a/media-gfx/nomacs/patches/nomacs-3.8.0.patchset +++ /dev/null @@ -1,26 +0,0 @@ -From 105ea97e05c203c9d5623687889b41c7d6637282 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= -Date: Mon, 25 Dec 2017 22:08:42 +0100 -Subject: Haiku build fix - - -diff --git a/ImageLounge/CMakeLists.txt b/ImageLounge/CMakeLists.txt -index d6f9775..82834d2 100644 ---- a/ImageLounge/CMakeLists.txt -+++ b/ImageLounge/CMakeLists.txt -@@ -98,9 +98,11 @@ elseif(NOT MSVC) - message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.") - endif() - --if(CMAKE_COMPILER_IS_GNUCXX) -+if(CMAKE_COMPILER_IS_GNUCXX AND NOT HAIKU) - # Codecov - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -pthread -g -O0 -fprofile-arcs -ftest-coverage") -+else() -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -g -O0 -fprofile-arcs -ftest-coverage -lexpat") - endif() - - # find Qt --- -2.15.0 -