mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-08-05 21:37:15 +02:00
testing/nomacs: upgrade to 3.16.224
This commit is contained in:
Will Sinatra
psykose
parent
d0c2be75b1
commit
0db3b7336a
@ -1,60 +1,69 @@
|
||||
# Maintainer:
|
||||
# Contributor: mio <miyopan@e.email>
|
||||
# Maintainer: Will Sinatra <wpsinatra@gmail.com>
|
||||
pkgname=nomacs
|
||||
pkgver=3.14.2
|
||||
pkgver=3.16.224
|
||||
pkgrel=0
|
||||
pkgdesc="Small and fast Qt image viewer"
|
||||
_pluginsver=3.16
|
||||
pkgdesc="Cross platform image viewer"
|
||||
url="https://nomacs.org/"
|
||||
arch="all"
|
||||
license="GPL-3.0-or-later"
|
||||
depends="qt5-qtimageformats"
|
||||
makedepends="cmake
|
||||
qt5-qtbase-dev
|
||||
qt5-qttools-dev
|
||||
qt5-qtsvg-dev
|
||||
arch="all !s390x"
|
||||
makedepends="
|
||||
cmake
|
||||
exiv2-dev
|
||||
quazip-dev
|
||||
libraw-dev
|
||||
libwebp-dev
|
||||
lcov
|
||||
libzip-dev"
|
||||
libzip-dev
|
||||
opencv-dev
|
||||
qt5-qtbase-dev
|
||||
qt5-qtscript-dev
|
||||
qt5-qtsvg-dev
|
||||
qt5-qttools-dev
|
||||
quazip-dev
|
||||
samurai
|
||||
tiff-dev
|
||||
"
|
||||
subpackages="$pkgname-doc $pkgname-lang"
|
||||
options="!check" # no test suite
|
||||
source="$pkgname-$pkgver.tar.gz::https://github.com/nomacs/nomacs/archive/$pkgver.tar.gz
|
||||
fix-std-cout.patch"
|
||||
builddir="$srcdir/$pkgname-$pkgver/ImageLounge"
|
||||
source="nomacs-$pkgver.tar.gz::https://github.com/nomacs/nomacs/archive/$pkgver.tar.gz
|
||||
nomacs-plugins-$_pluginsver.tar.gz::https://github.com/nomacs/nomacs-plugins/archive/$_pluginsver.tar.gz
|
||||
use-system-quazip.patch
|
||||
"
|
||||
options="!check" # No tests
|
||||
builddir="$srcdir"/nomacs-"$pkgver"/ImageLounge
|
||||
|
||||
prepare() {
|
||||
default_prepare
|
||||
|
||||
rm -r ../3rd-party
|
||||
|
||||
rmdir plugins
|
||||
ln -sfv "$srcdir"/nomacs-plugins-$_pluginsver plugins
|
||||
}
|
||||
|
||||
build() {
|
||||
if [ "$CBUILD" != "$CHOST" ]; then
|
||||
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
|
||||
fi
|
||||
cmake \
|
||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||
-DBUILD_SHARED_LIBS=True \
|
||||
cmake -B build -G Ninja \
|
||||
-DCMAKE_BUILD_TYPE=None \
|
||||
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
|
||||
-DCMAKE_C_FLAGS="$CFLAGS" \
|
||||
-DENABLE_OPENCV=False \
|
||||
-DENABLE_RAW=False \
|
||||
-DENABLE_TIFF=False \
|
||||
-DENABLE_QT_DEBUG=False \
|
||||
-DENABLE_TRANSLATIONS=True \
|
||||
-DENABLE_PLUGINS=False \
|
||||
-DUSE_SYSTEM_QUAZIP=True \
|
||||
${CMAKE_CROSSOPTS} .
|
||||
make
|
||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||
-DENABLE_TRANSLATIONS=TRUE \
|
||||
-DUSE_SYSTEM_QUAZIP=ON
|
||||
cmake --build build
|
||||
}
|
||||
|
||||
package() {
|
||||
make DESTDIR="$pkgdir" install
|
||||
DESTDIR="$pkgdir" cmake --install build
|
||||
}
|
||||
|
||||
lang() {
|
||||
pkgdesc="Languages for package $pkgname"
|
||||
depends=""
|
||||
local langdir="usr/share/$pkgname/Image Lounge/translations"
|
||||
pkgdesc="translations for $pkgname"
|
||||
install_if="$pkgname=$pkgver-r$pkgrel lang"
|
||||
|
||||
mkdir -p "$subpkgdir"/"$langdir"
|
||||
mv "$pkgdir"/"$langdir"/* "$subpkgdir"/"$langdir"/
|
||||
mkdir -p "$subpkgdir/usr/share/nomacs/Image Lounge/"
|
||||
mv "$pkgdir/usr/share/nomacs/Image Lounge/translations/" \
|
||||
"$subpkgdir/usr/share/nomacs/Image Lounge/"
|
||||
}
|
||||
|
||||
sha512sums="58104c85078bdbff7f65625658bb01b152631470eea93a43494eed55ae5e2441b7bcf3ed6c8f1aef07831bc99c80af94467fcc0e15dc1d282ef313bfcb3c81e9 nomacs-3.14.2.tar.gz
|
||||
1530398feaa341687fd5e0117507b2262d46deb3052988e97156beee81d9611c8035be03ab616868a2dcff93fa5e82279f6a73af7edc70630451cfa28f9a4765 fix-std-cout.patch"
|
||||
sha512sums="
|
||||
7ca8e713eedd71bc3dd3804a9a09ece15badb74949b155ea4da72a0ea129be173c8d0951604a6139d4490525cd420da8635773c11f0d133f666a48dcd9064257 nomacs-3.16.224.tar.gz
|
||||
cd72f6ddbe3e07d7ed97f08405bac7574f4f3285c81e835f5630e011c8a9b105f23d892fed8084cb35ce521aca5524db071d0edb8bb04850dd2209d9ed019747 nomacs-plugins-3.16.tar.gz
|
||||
90ce22da77712bafd145840e2fa5d1ec79e28e7be9b81cdfb0edb64c62fe3c4429ba5f1dcbd05a30c2b4fc786c4009d0b92a67a06696198f722bfd786f778a06 use-system-quazip.patch
|
||||
"
|
||||
|
||||
@ -1,20 +0,0 @@
|
||||
--- a/src/DkGui/DkNoMacs.cpp
|
||||
+++ b/src/DkGui/DkNoMacs.cpp
|
||||
@@ -25,6 +25,7 @@
|
||||
|
||||
*******************************************************************************************************/
|
||||
|
||||
+#include <iostream>
|
||||
#include "DkNoMacs.h"
|
||||
|
||||
// my stuff
|
||||
--- a/src/DkCore/DkMetaData.cpp
|
||||
+++ b/src/DkCore/DkMetaData.cpp
|
||||
@@ -25,6 +25,7 @@
|
||||
|
||||
*******************************************************************************************************/
|
||||
|
||||
+#include <iostream>
|
||||
#include "DkMetaData.h"
|
||||
#include "DkUtils.h"
|
||||
#include "DkMath.h"
|
||||
102
testing/nomacs/use-system-quazip.patch
Normal file
102
testing/nomacs/use-system-quazip.patch
Normal file
@ -0,0 +1,102 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 1a31e58..a8664dc 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -150,6 +150,7 @@ include_directories (
|
||||
${QUAZIP_ZLIB_INCLUDE_DIR}
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/libqpsd # needed for linux psd hack
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/drif
|
||||
+ QuaZip::QuaZip
|
||||
)
|
||||
|
||||
if (APPLE) # todo: somehow add this to Mac.cmake or MacBuildTarget.cmake
|
||||
diff --git a/cmake/Unix.cmake b/cmake/Unix.cmake
|
||||
index 5567084..ef7cc03 100644
|
||||
--- a/cmake/Unix.cmake
|
||||
+++ b/cmake/Unix.cmake
|
||||
@@ -104,12 +104,8 @@ if(ENABLE_QUAZIP)
|
||||
if(USE_SYSTEM_QUAZIP)
|
||||
SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
|
||||
|
||||
- find_package(QuaZip5 QUIET)
|
||||
- if(NOT QUAZIP_FOUND)
|
||||
- message(FATAL_ERROR "QUAZIP not found. It's mandatory when used with ENABLE_QUAZIP enabled, you can also disable USE_SYSTEM_QUAZIP")
|
||||
- else()
|
||||
- add_definitions(-DWITH_QUAZIP)
|
||||
- endif()
|
||||
+ find_package(QuaZip-Qt5 REQUIRED)
|
||||
+ add_definitions(-DWITH_QUAZIP)
|
||||
else()
|
||||
find_package(ZLIB REQUIRED)
|
||||
set(QUAZIP_INCLUDE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/quazip-0.7/quazip ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/quazip-0.7/)
|
||||
diff --git a/cmake/UnixBuildTarget.cmake b/cmake/UnixBuildTarget.cmake
|
||||
index af3c766..e71fe8b 100644
|
||||
--- a/cmake/UnixBuildTarget.cmake
|
||||
+++ b/cmake/UnixBuildTarget.cmake
|
||||
@@ -48,6 +48,7 @@ target_link_libraries(
|
||||
${OpenCV_LIBS}
|
||||
${TIFF_LIBRARIES}
|
||||
${QUAZIP_LIBRARIES}
|
||||
+ QuaZip::QuaZip
|
||||
)
|
||||
set_property(TARGET ${DLL_CORE_NAME} PROPERTY VERSION ${NOMACS_VERSION_MAJOR}.${NOMACS_VERSION_MINOR}.${NOMACS_VERSION_PATCH})
|
||||
set_property(TARGET ${DLL_CORE_NAME} PROPERTY SOVERSION ${NOMACS_VERSION_MAJOR})
|
||||
diff --git a/src/DkCore/DkBasicLoader.cpp b/src/DkCore/DkBasicLoader.cpp
|
||||
index d29ae33..0045cb2 100644
|
||||
--- a/src/DkCore/DkBasicLoader.cpp
|
||||
+++ b/src/DkCore/DkBasicLoader.cpp
|
||||
@@ -54,7 +54,7 @@
|
||||
|
||||
// quazip
|
||||
#ifdef WITH_QUAZIP
|
||||
-#include <quazip5/JlCompress.h>
|
||||
+#include <JlCompress.h>
|
||||
#endif
|
||||
|
||||
// opencv
|
||||
diff --git a/src/DkCore/DkImageContainer.cpp b/src/DkCore/DkImageContainer.cpp
|
||||
index 75fd1b2..d486d38 100644
|
||||
--- a/src/DkCore/DkImageContainer.cpp
|
||||
+++ b/src/DkCore/DkImageContainer.cpp
|
||||
@@ -41,7 +41,7 @@
|
||||
|
||||
// quazip
|
||||
#ifdef WITH_QUAZIP
|
||||
-#include <quazip5/JlCompress.h>
|
||||
+#include <JlCompress.h>
|
||||
#endif
|
||||
#pragma warning(pop) // no warnings from includes - end
|
||||
|
||||
diff --git a/src/DkCore/DkImageLoader.cpp b/src/DkCore/DkImageLoader.cpp
|
||||
index 2c1c38e..6327615 100644
|
||||
--- a/src/DkCore/DkImageLoader.cpp
|
||||
+++ b/src/DkCore/DkImageLoader.cpp
|
||||
@@ -79,7 +79,7 @@
|
||||
|
||||
// quazip
|
||||
#ifdef WITH_QUAZIP
|
||||
-#include <quazip5/JlCompress.h>
|
||||
+#include <JlCompress.h>
|
||||
#endif
|
||||
|
||||
// opencv
|
||||
@@ -2212,4 +2212,4 @@ QString DkImageLoader::fileName() const {
|
||||
return mCurrentImage->fileName();
|
||||
}
|
||||
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff --git a/src/DkGui/DkDialog.cpp b/src/DkGui/DkDialog.cpp
|
||||
index 008c9a3..fc21ee5 100644
|
||||
--- a/src/DkGui/DkDialog.cpp
|
||||
+++ b/src/DkGui/DkDialog.cpp
|
||||
@@ -97,7 +97,7 @@
|
||||
|
||||
// quazip
|
||||
#ifdef WITH_QUAZIP
|
||||
-#include <quazip5/JlCompress.h>
|
||||
+#include <JlCompress.h>
|
||||
#endif
|
||||
|
||||
#pragma warning(pop) // no warnings from includes - end
|
||||
Loading…
Reference in New Issue
Block a user