summaryrefslogtreecommitdiff
path: root/media-gfx
diff options
context:
space:
mode:
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/Manifest.gzbin38342 -> 38342 bytes
-rw-r--r--media-gfx/converseen/Manifest3
-rw-r--r--media-gfx/converseen/converseen-0.12.2.4.ebuild67
-rw-r--r--media-gfx/converseen/files/converseen-0.12.2.4-appdata-path.patch11
-rw-r--r--media-gfx/freecad/Manifest1
-rw-r--r--media-gfx/freecad/files/freecad-1.0.0-Gentoo-specific-don-t-check-vcs.patch15
-rw-r--r--media-gfx/nomacs/Manifest8
-rw-r--r--media-gfx/nomacs/files/nomacs-3.16.224-DkMath-ostream.patch24
-rw-r--r--media-gfx/nomacs/files/nomacs-3.16.224-exiv2-0.28.patch241
-rw-r--r--media-gfx/nomacs/files/nomacs-3.16.224-libdir-plugins.patch23
-rw-r--r--media-gfx/nomacs/files/nomacs-3.16.224-libdir.patch30
-rw-r--r--media-gfx/nomacs/files/nomacs-3.16.224-quazip1.patch127
-rw-r--r--media-gfx/nomacs/nomacs-3.16.224-r6.ebuild86
13 files changed, 81 insertions, 555 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index adb60e068d71..507466234f5e 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
Binary files differ
diff --git a/media-gfx/converseen/Manifest b/media-gfx/converseen/Manifest
index 7e4e1ed8bb72..1319559286c4 100644
--- a/media-gfx/converseen/Manifest
+++ b/media-gfx/converseen/Manifest
@@ -1,6 +1,9 @@
AUX converseen-0.12.0.1-graphicsmagick-support.patch 3555 BLAKE2B 4f8880e02f893c0cb7533c4fd4e0d50f6e737917d0cec5a762c6a65f1febbefde79d1e0d973d3e5a72e0aabf138d6cecec285c81f16a83bed6fa1fcb90926c9d SHA512 d81214d953f3b83dab9c829ae26ebef318633c7ae02c6b467806ef60ac177d90bbb5f5f3dc8278da53b75083a1e7c145e4847b31ab6739594ce0909d45c68be6
+AUX converseen-0.12.2.4-appdata-path.patch 443 BLAKE2B 2612b12962d7f3dea8159f4990e0f9e940bb64994427f8d57f85f00278ed56cfc3626e590e8a0f9988fd919567a350269f3ae362a8d38102d016ccc328dc94e0 SHA512 e6f2cbad9e9a01e37579435a5a8c71a58600d50d7a07e1172a3b02867737f28ab64f3d5bb9a4f0cdd682fb359a4afb891ae9d27aabb5850ea9030a6200bc1503
AUX converseen-0.9.9.0-appdata-path.patch 604 BLAKE2B ca524ae4a52f74b687e0e0246d758178d4287b3e866651293233c7055a38cdf6330fd2c2dfb0728c0b07f37b631dbd1c59159039b56be35fbc349d183dfd0dbd SHA512 411696d39dcca09a33119537600efd80bcf675714ea72548500f9c2a1112e61d53edc6d891cef770aac3cdd2cb881e169b4ab833521ae152859609871807066e
AUX converseen-0.9.9.0-no-update.patch 540 BLAKE2B b8a7bcf561a4be48fdf9137a40c1f5b1451915a6cf4b2043f9adaf8dd1aa853b331ee1499bb34d05ae9e7da2d9f3f0515c62dca8146d4957126054557ebfcceb SHA512 b5ed008bd7a01cb99ec97faa6c9bd412009f1d438c420e201d2605c713ff57c346391d5389ed019c0538a263154d1ed36c4a581d0582d2c2eadf8dc77a67b97b
DIST converseen-0.12.0.1.tar.gz 2296100 BLAKE2B 83a0271e1451fa196852d717332fa7446cd22bac7b675f3f306692aa1e11d4c5500d033fd9bbb7dd4ec9190ff3b15149bad1e9646006f533d930fc1d686b0a9b SHA512 4e6efa44953b097f8c6af19e3d849caf570a0fa2db673133e1d8ca2abee98b43d2fbd2d12e6c8c2a8ec6a9dd61a1ca3f25ee7a7787791cc783d8c967eacb9d9d
+DIST converseen-0.12.2.4.tar.gz 941270 BLAKE2B 4ac582a2dc3bbbabb48c1d12fe4ba4ed1d61b20e946645edab4eb6ac2d62cfa2df149b61c60842b36b55239694013661af4dd7c27a5195ee25f808d0a9b29605 SHA512 7d207207859f57037038b595935e3b0c5b202eda6a39e64226f6e898d5c3762077424a52f2ae6029263eae672607d05e30bf4ad2005ce15fd50348cca374413a
EBUILD converseen-0.12.0.1.ebuild 1749 BLAKE2B 33e5141dfbac0ed89edfcca3f02c4c6092e3da22260229f44f60b0f03a616a6870877adfd26ce082eb2989fa736723740c363509c676cf76add5137a77fdcd19 SHA512 0d15cf3903d400ea87874662cfb1377bac1bd6edb80722aac08419e79fa343d3b9140de3e7c527260375402ef4f158b3916bcfa762692e688a3df74cec2eae76
+EBUILD converseen-0.12.2.4.ebuild 1791 BLAKE2B 3e0ec07dadc38c435614891914ba56e955cf584e7451d00c991c46a26fd8958e58c185ef7183617634a4896643c8918ee39415dd4df1c5f38631fb1e338d07e4 SHA512 127821787c152a07f1551ff84be88a41d6b8ef26add62b2961875a0d222c96fe44301a139f8f95d13919b05cb56fa0fc2c52c203c1bf3cc3b6099c9dfbb17490
MISC metadata.xml 490 BLAKE2B 7ee59abe13eee7dff622a3e7b701f6e0128a208e3e49f5b22b3fcaf06357991a50ece3ffa9cb607675f94a7784efcec37c2176464e4c7741efbfb8b8427cb5dc SHA512 a56719d55ea41683315c5d3f98b8351d3b15b68fd8f598a9e692691c771a94bec23b8263c8a017e29d63a20a8de8b440db1acfd26558c6f8d51add12e4016ba6
diff --git a/media-gfx/converseen/converseen-0.12.2.4.ebuild b/media-gfx/converseen/converseen-0.12.2.4.ebuild
new file mode 100644
index 000000000000..8096327f78f3
--- /dev/null
+++ b/media-gfx/converseen/converseen-0.12.2.4.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Batch image converter and resizer based on ImageMagick"
+HOMEPAGE="https://converseen.fasterland.net/
+ https://github.com/Faster3ck/Converseen/"
+SRC_URI="https://github.com/Faster3ck/Converseen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P^}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="graphicsmagick debug"
+
+RDEPEND="
+ dev-qt/qtbase:6[gui,network,widgets]
+ graphicsmagick? ( media-gfx/graphicsmagick:=[cxx,imagemagick] )
+ !graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/qttools[linguist]"
+
+PATCHES=(
+ "${FILESDIR}/${P}-appdata-path.patch"
+ "${FILESDIR}/${PN}-0.9.9.0-no-update.patch"
+ "${FILESDIR}/${PN}-0.12.0.1-graphicsmagick-support.patch"
+)
+
+src_prepare() {
+ cmake_src_prepare
+
+ if use graphicsmagick; then
+ # Replace variables in CMakeLists.txt
+ sed -i -e "s/GENTOO_LIB/\/usr\/$(get_libdir)/g" \
+ -e "s/GENTOO_INCLUDE/\/usr\/include/g" \
+ "${S}/CMakeLists.txt" ||
+ die "Failed to sed graphicsmagick patch"
+
+ # Replace MagickCore in globals.cpp
+ sed -i -e "s/MagickCore/MagickLib/" "${S}/src/globals.cpp" ||
+ die "Failed to sed globals.cpp"
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(-DUSE_QT6=yes)
+ cmake_src_configure
+}
+
+pkg_postinst() {
+ elog "Please note that due to security policy restrictions"
+ elog "on media-gfx/imagemagick the support for PS, PDF and"
+ elog "XPS files must be explicitly enabled by commenting out"
+ elog "the respective policies in /etc/ImageMagick-7/policy.xml."
+ elog "See https://wiki.gentoo.org/wiki/ImageMagick#Troubleshooting"
+ elog "for more information."
+
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}
diff --git a/media-gfx/converseen/files/converseen-0.12.2.4-appdata-path.patch b/media-gfx/converseen/files/converseen-0.12.2.4-appdata-path.patch
new file mode 100644
index 000000000000..2b07399b420d
--- /dev/null
+++ b/media-gfx/converseen/files/converseen-0.12.2.4-appdata-path.patch
@@ -0,0 +1,11 @@
+--- a/converseen.pro 2024-10-29 16:39:33.000000000 +0100
++++ b/converseen.pro 2025-01-01 19:30:59.323494846 +0100
+@@ -171,7 +171,7 @@
+ desktopFile.files = res/converseen.desktop
+ kdeservicemenu.path = $${SHARE_DIR}/kio/servicemenus
+ kdeservicemenu.files = res/converseen_import.desktop
+- appdata.path = /usr/share/appdata/
++ appdata.path = /usr/share/metainfo/
+ appdata.files = converseen.appdata.xml
+
+ isEmpty(QMAKE_LRELEASE) {
diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index 1cf0ae2842bc..c1fb4b72f827 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -1,5 +1,4 @@
AUX freecad-0.21.0-0001-Gentoo-specific-disable-ccache-usage.patch 381 BLAKE2B 2fe05252a4e7846006c5f4e679eae5416ede589b9a6ad5fc30425933bedf933bf586b711c2c7d6a59c3881d454ea76ca39e0556a5a31c3769032694f0858e264 SHA512 731befc86267de4e5fa2caf619a8ae9692580d7025ebc26a80f6744a3104263622c38d87d0d8a263a1a15ef1c1d78c9ff3351aa463a9943941bd7d96d946e516
-AUX freecad-1.0.0-Gentoo-specific-don-t-check-vcs.patch 350 BLAKE2B e1b612ac81f73546a3a7ae93e447aba6e3f28dea1292f5d308f567307c8c6146b8dfdcc1cef946c64991d41c41fa9c8949f56e2e8573833bad2a3826bab960ba SHA512 f96678dbfe13668a9f65131996ddc5eb2cbe80296b7eb2cc7d248e3ee1d991bea95568b0241da8387106812aac5762c330afb1d8c38b2281c3ee2600db120627
AUX freecad-1.0.0-r1-Gentoo-specific-don-t-check-vcs.patch 347 BLAKE2B 1c8119aec9408d77db8e09c34b86ba6a8da268509959ba5839b1ad0bb6c5b4023326055170836bf164d0d1e0a13a91ac601bde7eb6b184e4f9b1425e93ce9d38 SHA512 63bb73d0de1e12d3a34a2d055e3ddc2bdbdae5c1c67cd7c9a26047abfeda48943d793f30d190ae28f6f8e9ee7072f671badd4b8f3df29824b401bed0dbf90ed5
AUX freecad-9999-Gentoo-specific-don-t-check-vcs.patch 322 BLAKE2B 431b69d749c5639d2407207632ab48f1af36319290c1016985ed2431fe7a5314a5df8373a0a5235fcd08de5762dd090dd89b73846703348d5e2e0fac7c9c7048 SHA512 f67b3bfa013a497d0372649d9339665dd5c48b2dd00814e55ee6fcad6580a8219139f6c1931f2da5e210d181205af55e19b91a4d08b4d0dc7d45fcef358eb0ed
AUX freecad-9999-tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch 469 BLAKE2B 23e56fbc49b3c3d5ede85e6ec15d26c88c93590fce105e0b75e8b0bd3fee125c500cd59d8db0144c610edb371df318396e056333ec7a411f7647b38d18006efc SHA512 82737af95603ff1f667bf49ee43b85b411eeeb5fd9b577ad7fca6e02bcbfda5c3bbb6c70386e5f69d2181d6226574f82cb68b7e66dfe8f4bb14d946f594582cf
diff --git a/media-gfx/freecad/files/freecad-1.0.0-Gentoo-specific-don-t-check-vcs.patch b/media-gfx/freecad/files/freecad-1.0.0-Gentoo-specific-don-t-check-vcs.patch
deleted file mode 100644
index 3c8b61ab56a4..000000000000
--- a/media-gfx/freecad/files/freecad-1.0.0-Gentoo-specific-don-t-check-vcs.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/src/Tools/SubWCRev.py
-+++ b/src/Tools/SubWCRev.py
-@@ -509,12 +509,6 @@ def main():
- bindir = a
-
- vcs = [
-- GitControl(),
-- DebianGitHub(),
-- BazaarControl(),
-- Subversion(),
-- MercurialControl(),
-- DebianChangelog(),
- UnknownControl(),
- ]
- for i in vcs:
diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest
index 0f63b018459f..dcde255ea10e 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -1,12 +1,4 @@
-AUX nomacs-3.16.224-DkMath-ostream.patch 626 BLAKE2B 249c6092e77c784b70ce38e9c56e8e263684b3b7eae4a91e23444ede548b0b7a1773c95da4307bdb2179538ee9324145a8aec74af71cec153c40159e02f9b8ec SHA512 fe68ceb1498324be52974b0960c9e50b607f8e4cd364d658da0252ebcf80924becd3da002992b92114570bced57b3345372324998b2f5460983e83132e421575
-AUX nomacs-3.16.224-exiv2-0.28.patch 8575 BLAKE2B c6918ecb4e76919cae9a3080b6859477ec0139dcdef2680f05324251106cfab8b58f671a7f53f9ae9da20e86cff98ca07717f9bb84313a45a1b481738ff58429 SHA512 23180634c3f173a826cca7c85e3fbf851f2f69b135f69006dcbf358f298261f9d177d193a30967fb10874e45b10e32dda74e8bdd50cf630d5356abfd043c40f1
-AUX nomacs-3.16.224-libdir-plugins.patch 1083 BLAKE2B 19659194ba203c6d92693d00d4931a7e22684308456ccf218ad9664f5a19aa31f36fc302b89ef3625f5a4750b777c0b639e0371b8b6e01a3b25e6dc2de2ee8e7 SHA512 a5687c398ed9c97cbb999b2f28a8fed2cc8a8d1ff0e2964f1b3e25a45e303a76e438325b54f7859e3efd56d602ced8027f3faaddef55a34df0e4701486196968
-AUX nomacs-3.16.224-libdir.patch 1028 BLAKE2B 1a8076d5eb934a41599d94cba322413a8f96be9e8bc1bdcc5492b39da6210b9e0ac315e7b359d651c54b80154f9d07ceed742421ed0f83d362e5076996aab4be SHA512 930d95777696d7fd9ab56922dd8ec98beb10b51008bbfbc04daa268677e66d985b062d20c533e9627f7662844bbb2c8d7aa9647d74d4399787c40a78b5bb773d
-AUX nomacs-3.16.224-quazip1.patch 3844 BLAKE2B 5d92aa57971f137e5009db945f739eaff57bbf2a5ea6ce842dafd51f0107f6c6dfb349da719e935e732cb7736d9a97d96806ee48fdd97ff953863ba920aff2ab SHA512 888c8125edcbbbc3034b132f776bf59e53e6259e66c55f4df4e9c7fa8a874928a2ea766b52c6ef8dcc0d493f81982ca4cb6ac737f677e3948dcedb9052603e9f
-DIST nomacs-3.16.224.tar.gz 1932366 BLAKE2B 4a2dc6ef70b0ae5dc9c9397bd2c88ede0db2bb8660e1907d08b36c4a9cf5a9bd151180aa4b2d6b5f529c1786004a6621eff88fa4bc851d60835e8ba6d6269602 SHA512 7ca8e713eedd71bc3dd3804a9a09ece15badb74949b155ea4da72a0ea129be173c8d0951604a6139d4490525cd420da8635773c11f0d133f666a48dcd9064257
DIST nomacs-3.19.1.tar.gz 1928697 BLAKE2B ee8a10ebd777a589df179b51591893fe083505b066bf409e11a54a4bc21054d6d61d8c5e397cf01fa7907fd2e4b69401729a8fab7f1a8079769bfef53692230b SHA512 7cbe80d6c336547a00761c64e591444827998aa79a52d51219ca69aacca4d3361c1e7cbccba1f9c06c7e93f09f4b732abd25757107e1c50d8a43eb45ced0ee97
-DIST nomacs-plugins-3.16.tar.gz 561522 BLAKE2B 2bda4f36d56709653f6696af3404e416fd2d9fe7fa11de9636643c728028018ac769df3e2e519799322c5c42006cdc114d0e6406f9f60294234b07d9fd8d8409 SHA512 cd72f6ddbe3e07d7ed97f08405bac7574f4f3285c81e835f5630e011c8a9b105f23d892fed8084cb35ce521aca5524db071d0edb8bb04850dd2209d9ed019747
DIST nomacs-plugins-3.19.0.tar.gz 559925 BLAKE2B 4e3d8e07974d418510d2e806980bc9793567813b9418c0754dcaaa9e6f43e88d76e35264f05e05b2e21345467c8038db3c37ce3d1b003adcd3b019796a737080 SHA512 36b96b0270cb7cc34ee3f9f948eb1f2e5b4facd1f6eb273afe1fbf865c7712fb6487ef59f3d4e7723b9bca7930255f4247a8381c05ee8cfb9acf2b5cc225303c
-EBUILD nomacs-3.16.224-r6.ebuild 1989 BLAKE2B 00d46fb6e2501fd71f69b256490c5899753498a6a144b8976f91edd1a660aa6c0daaac79d27f36bcc5af961abce8bf39c1a37625c1fde17af0ab130b29712edb SHA512 5a34f23eeb69b567f6e8aca96479599bdbfd0f9d683af1d08f6b1b41de62fe2bee259a8f07241740c43c1cc5ad1962d182aff03915c91612d14ad4408df80ec9
EBUILD nomacs-3.19.1-r1.ebuild 1700 BLAKE2B 16f9b8ed491594f72782cd1c988f9d103f6baa94919f586c6c315c1358f7d6b92ce5326487a1e15be5f025442af6eddc96698484cb37abad617f143d6c73ad17 SHA512 5791ad99cf402dffe908d11f70500ca93e2f5b4f9105c0b13449812617ba85aecc5a95675ac352d29ca5c8f630d07c99011768dce330e0b3eed9c9b8fa3efa5f
MISC metadata.xml 513 BLAKE2B 89bb56aaec4fc3411a5460f33d5915b4c1910c1385d5c6370d47af01a89bdeb3342a9ce206f531c5dc47e1c93930a0aa3f19e721a555ecdaa7c853ecb9504028 SHA512 f451fc573bcf1e4e9e413d5346eb5bb0d3c2b728dfe3eb3c88ad6097402a1038d625361656169f445797c793ea9323de9b4b95856533355721576394f703f7ea
diff --git a/media-gfx/nomacs/files/nomacs-3.16.224-DkMath-ostream.patch b/media-gfx/nomacs/files/nomacs-3.16.224-DkMath-ostream.patch
deleted file mode 100644
index 318953f7896a..000000000000
--- a/media-gfx/nomacs/files/nomacs-3.16.224-DkMath-ostream.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From aca8443079ff926be873a77e3077b249a12487dd Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <sultan@gentoo.org>
-Date: Sun, 23 Jan 2022 18:51:56 +0100
-Subject: [PATCH] IWYU: add missing ostream in DkMath
-
----
- src/DkCore/DkMath.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/DkCore/DkMath.h b/src/DkCore/DkMath.h
-index c37ef23..2c3a5be 100644
---- a/src/DkCore/DkMath.h
-+++ b/src/DkCore/DkMath.h
-@@ -30,6 +30,7 @@
- #pragma warning(push, 0) // no warnings from includes - begin
- #include <cmath>
- #include <float.h>
-+#include <ostream>
- #include <QDebug>
- #include <QPointF>
- #include <QPolygonF>
---
-2.34.1
-
diff --git a/media-gfx/nomacs/files/nomacs-3.16.224-exiv2-0.28.patch b/media-gfx/nomacs/files/nomacs-3.16.224-exiv2-0.28.patch
deleted file mode 100644
index 280d7ec59e8b..000000000000
--- a/media-gfx/nomacs/files/nomacs-3.16.224-exiv2-0.28.patch
+++ /dev/null
@@ -1,241 +0,0 @@
-From 6785f15d9ed05ebc66ee200b3c94451c6c633646 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 3 Sep 2023 13:30:43 +0200
-Subject: [PATCH] Fix 3.16.224 build with exiv2-0.28
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- ImageLounge/src/DkCore/DkMetaData.cpp | 59 ++++++++++++++++++---------
- ImageLounge/src/DkCore/DkMetaData.h | 4 +-
- 2 files changed, 41 insertions(+), 22 deletions(-)
-
-diff --git a/ImageLounge/src/DkCore/DkMetaData.cpp b/ImageLounge/src/DkCore/DkMetaData.cpp
-index bf1d111e..5eaeebf4 100644
---- a/ImageLounge/src/DkCore/DkMetaData.cpp
-+++ b/ImageLounge/src/DkCore/DkMetaData.cpp
-@@ -73,8 +73,12 @@ void DkMetaDataT::readMetaData(const QString& filePath, QSharedPointer<QByteArra
- mExifImg = Exiv2::ImageFactory::open(strFilePath);
- }
- else {
-+#if EXIV2_TEST_VERSION(0, 28, 0)
-+ mExifImg = Exiv2::ImageFactory::open((const byte *)ba->constData(), ba->size());
-+#else
- Exiv2::BasicIo::AutoPtr exifBuffer(new Exiv2::MemIo((const byte*)ba->constData(), ba->size()));
- mExifImg = Exiv2::ImageFactory::open(exifBuffer);
-+#endif
- }
- }
- catch (...) {
-@@ -155,14 +159,18 @@ bool DkMetaDataT::saveMetaData(QSharedPointer<QByteArray>& ba, bool force) {
- Exiv2::ExifData &exifData = mExifImg->exifData();
- Exiv2::XmpData &xmpData = mExifImg->xmpData();
- Exiv2::IptcData &iptcData = mExifImg->iptcData();
--
-- Exiv2::Image::AutoPtr exifImgN;
-+ std::unique_ptr<Exiv2::Image> exifImgN;
-+#if !EXIV2_TEST_VERSION(0, 28, 0)
- Exiv2::MemIo::AutoPtr exifMem;
-+#endif
-
- try {
--
-+#if EXIV2_TEST_VERSION(0, 28, 0)
-+ exifImgN = Exiv2::ImageFactory::open((byte *)ba->data(), ba->size());
-+#else
- exifMem = Exiv2::MemIo::AutoPtr(new Exiv2::MemIo((byte*)ba->data(), ba->size()));
- exifImgN = Exiv2::ImageFactory::open(exifMem);
-+#endif
- }
- catch (...) {
-
-@@ -186,8 +194,13 @@ bool DkMetaDataT::saveMetaData(QSharedPointer<QByteArray>& ba, bool force) {
-
- // now get the data again
- Exiv2::DataBuf exifBuf = exifImgN->io().read((long)exifImgN->io().size());
-+#if EXIV2_TEST_VERSION(0, 28, 0)
-+ if (!exifBuf.empty()) {
-+ QSharedPointer<QByteArray> tmp = QSharedPointer<QByteArray>(new QByteArray((const char *)exifBuf.c_data(), exifBuf.size()));
-+#else
- if (exifBuf.pData_) {
- QSharedPointer<QByteArray> tmp = QSharedPointer<QByteArray>(new QByteArray((const char*)exifBuf.pData_, exifBuf.size_));
-+#endif
-
- if (tmp->size() > qRound(ba->size()*0.5f))
- ba = tmp;
-@@ -197,7 +210,7 @@ bool DkMetaDataT::saveMetaData(QSharedPointer<QByteArray>& ba, bool force) {
- else
- return false;
-
-- mExifImg = exifImgN;
-+ mExifImg.swap(exifImgN);
- mExifState = loaded;
-
- return true;
-@@ -250,7 +263,7 @@ int DkMetaDataT::getOrientationDegree() const {
-
- if (pos != exifData.end() && pos->count() != 0) {
-
-- Exiv2::Value::AutoPtr v = pos->getValue();
-+ std::unique_ptr<Exiv2::Value> v = pos->getValue();
- orientation = (int)pos->toFloat();
-
- switch (orientation) {
-@@ -315,7 +328,7 @@ int DkMetaDataT::getRating() const {
- Exiv2::ExifData::iterator pos = exifData.findKey(key);
-
- if (pos != exifData.end() && pos->count() != 0) {
-- Exiv2::Value::AutoPtr v = pos->getValue();
-+ std::unique_ptr<Exiv2::Value> v = pos->getValue();
- exifRating = v->toFloat();
- }
- }
-@@ -327,7 +340,7 @@ int DkMetaDataT::getRating() const {
-
- //xmp Rating tag
- if (pos != xmpData.end() && pos->count() != 0) {
-- Exiv2::Value::AutoPtr v = pos->getValue();
-+ std::unique_ptr<Exiv2::Value> v = pos->getValue();
- xmpRating = v->toFloat();
- }
-
-@@ -336,7 +349,7 @@ int DkMetaDataT::getRating() const {
- key = Exiv2::XmpKey("Xmp.MicrosoftPhoto.Rating");
- pos = xmpData.findKey(key);
- if (pos != xmpData.end() && pos->count() != 0) {
-- Exiv2::Value::AutoPtr v = pos->getValue();
-+ std::unique_ptr<Exiv2::Value> v = pos->getValue();
- xmpRating = v->toFloat();
- }
- }
-@@ -399,7 +412,7 @@ QString DkMetaDataT::getNativeExifValue(const QString& key) const {
- if (pos->count () < 2000) { // diem: this is about performance - adobe obviously embeds whole images into tiff exiv data
-
- //qDebug() << "pos count: " << pos->count();
-- //Exiv2::Value::AutoPtr v = pos->getValue();
-+ //std::unique_ptr<Exiv2::Value> v = pos->getValue();
- info = exiv2ToQString(pos->toString());
-
- }
-@@ -436,7 +449,7 @@ QString DkMetaDataT::getXmpValue(const QString& key) const {
- }
-
- if (pos != xmpData.end() && pos->count() != 0) {
-- Exiv2::Value::AutoPtr v = pos->getValue();
-+ std::unique_ptr<Exiv2::Value> v = pos->getValue();
- info = exiv2ToQString(pos->toString());
- }
- }
-@@ -478,7 +491,7 @@ QString DkMetaDataT::getExifValue(const QString& key) const {
- }
-
- if (pos != exifData.end() && pos->count() != 0) {
-- //Exiv2::Value::AutoPtr v = pos->getValue();
-+ //std::unique_ptr<Exiv2::Value> v = pos->getValue();
- info = exiv2ToQString(pos->toString());
- }
- }
-@@ -508,7 +521,7 @@ QString DkMetaDataT::getIptcValue(const QString& key) const {
- }
-
- if (pos != iptcData.end() && pos->count() != 0) {
-- Exiv2::Value::AutoPtr v = pos->getValue();
-+ std::unique_ptr<Exiv2::Value> v = pos->getValue();
- info = exiv2ToQString(pos->toString());
- }
- }
-@@ -653,8 +666,11 @@ QImage DkMetaDataT::getThumbnail() const {
- try {
- Exiv2::ExifThumb thumb(exifData);
- Exiv2::DataBuf buffer = thumb.copy();
--
-+#if EXIV2_TEST_VERSION(0, 28, 0)
-+ QByteArray ba = QByteArray((char *)buffer.c_data(), buffer.size());
-+#else
- QByteArray ba = QByteArray((char*)buffer.pData_, buffer.size_);
-+#endif
- qThumb.loadFromData(ba);
- }
- catch (...) {
-@@ -931,9 +947,12 @@ void DkMetaDataT::setThumbnail(QImage thumb) {
-
- try {
- // whipe all exif data of the thumbnail
-+#if EXIV2_TEST_VERSION(0, 28, 0)
-+ Exiv2::Image::UniquePtr exifImgThumb = Exiv2::ImageFactory::open((const byte *)ba.constData(), ba.size());
-+#else
- Exiv2::MemIo::AutoPtr exifBufferThumb(new Exiv2::MemIo((const byte*)ba.constData(), ba.size()));
- Exiv2::Image::AutoPtr exifImgThumb = Exiv2::ImageFactory::open(exifBufferThumb);
--
-+#endif
- if (exifImgThumb.get() != 0 && exifImgThumb->good())
- exifImgThumb->clearExifData();
- }
-@@ -1045,11 +1064,11 @@ void DkMetaDataT::setOrientation(int o) {
- pos = exifData.findKey(key);
- }
-
-- Exiv2::Value::AutoPtr v = pos->getValue();
-+ std::unique_ptr<Exiv2::Value> v = pos->getValue();
- Exiv2::UShortValue* prv = dynamic_cast<Exiv2::UShortValue*>(v.release());
- if (!prv) return;
-
-- Exiv2::UShortValue::AutoPtr rv = Exiv2::UShortValue::AutoPtr(prv);
-+ std::unique_ptr<Exiv2::UShortValue> rv = std::unique_ptr<Exiv2::UShortValue>(prv);
- if (rv->value_.empty()) return;
-
- orientation = (int) rv->value_[0];
-@@ -1110,7 +1129,7 @@ void DkMetaDataT::setRating(int r) {
- exifData["Exif.Image.Rating"] = uint16_t(r);
- exifData["Exif.Image.RatingPercent"] = uint16_t(r);
-
-- Exiv2::Value::AutoPtr v = Exiv2::Value::create(Exiv2::xmpText);
-+ std::unique_ptr<Exiv2::Value> v = Exiv2::Value::create(Exiv2::xmpText);
- v->read(sRating);
- xmpData.add(Exiv2::XmpKey("Xmp.xmp.Rating"), v.get());
- v->read(sRatingPercent);
-@@ -1354,9 +1373,9 @@ DkRotatingRect DkMetaDataT::getXMPRect(const QSize& size) const {
- return DkRotatingRect(rr);
- }
-
--Exiv2::Image::AutoPtr DkMetaDataT::loadSidecar(const QString& filePath) const {
-+std::unique_ptr<Exiv2::Image> DkMetaDataT::loadSidecar(const QString& filePath) const {
-
-- Exiv2::Image::AutoPtr xmpImg;
-+ std::unique_ptr<Exiv2::Image> xmpImg;
-
- //TODO: check if the file type supports xmp
-
-@@ -1409,7 +1428,7 @@ bool DkMetaDataT::setXMPValue(Exiv2::XmpData& xmpData, QString xmpKey, QString x
- setXMPValueSuccessful = true;
- }
- else {
-- Exiv2::Value::AutoPtr v = Exiv2::Value::create(Exiv2::xmpText);
-+ std::unique_ptr<Exiv2::Value> v = Exiv2::Value::create(Exiv2::xmpText);
- if (!v->read(xmpValue.toStdString())) {
- if (!xmpData.add(Exiv2::XmpKey(key), v.get()))
- setXMPValueSuccessful = true;
-diff --git a/ImageLounge/src/DkCore/DkMetaData.h b/ImageLounge/src/DkCore/DkMetaData.h
-index c1f73c93..183a906a 100644
---- a/ImageLounge/src/DkCore/DkMetaData.h
-+++ b/ImageLounge/src/DkCore/DkMetaData.h
-@@ -148,7 +148,7 @@ public:
-
- protected:
-
-- Exiv2::Image::AutoPtr loadSidecar(const QString& filePath) const;
-+ std::unique_ptr<Exiv2::Image> loadSidecar(const QString& filePath) const;
-
- enum {
- not_loaded,
-@@ -157,7 +157,7 @@ protected:
- dirty,
- };
-
-- Exiv2::Image::AutoPtr mExifImg;
-+ std::unique_ptr<Exiv2::Image> mExifImg;
- QString mFilePath;
- QStringList mQtKeys;
- QStringList mQtValues;
---
-2.42.0
-
diff --git a/media-gfx/nomacs/files/nomacs-3.16.224-libdir-plugins.patch b/media-gfx/nomacs/files/nomacs-3.16.224-libdir-plugins.patch
deleted file mode 100644
index 0c613929add0..000000000000
--- a/media-gfx/nomacs/files/nomacs-3.16.224-libdir-plugins.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From e1d32cd424462b2ac414d3a4ea3e1285d5ca2aef Mon Sep 17 00:00:00 2001
-From: Markus Diem <diemmarkus@gmail.com>
-Date: Mon, 27 Jul 2020 13:11:31 +0200
-Subject: [PATCH] patches wrong plugin installation path
-
-- thanks to @tieugene
----
- ImageLounge/plugins/cmake/Utils.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/Utils.cmake b/cmake/Utils.cmake
-index f2d1b62..5578aa7 100644
---- a/ImageLounge/plugins/cmake/Utils.cmake
-+++ b/ImageLounge/plugins/cmake/Utils.cmake
-@@ -139,7 +139,7 @@ macro(NMC_CREATE_TARGETS)
-
- elseif(UNIX)
- set_target_properties(${PROJECT_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${NOMACS_BUILD_DIRECTORY}/plugins)
-- install(TARGETS ${PROJECT_NAME} RUNTIME LIBRARY DESTINATION lib/nomacs-plugins)
-+ install(TARGETS ${PROJECT_NAME} RUNTIME LIBRARY DESTINATION lib${LIB_SUFFIX}/nomacs-plugins)
- set_property(TARGET ${PROJECT_NAME} PROPERTY VERSION ${NOMACS_VERSION_MAJOR}.${NOMACS_VERSION_MINOR}.${NOMACS_VERSION_PATCH})
- set_property(TARGET ${PROJECT_NAME} PROPERTY SOVERSION ${NOMACS_VERSION_MAJOR})
- endif(MSVC)
diff --git a/media-gfx/nomacs/files/nomacs-3.16.224-libdir.patch b/media-gfx/nomacs/files/nomacs-3.16.224-libdir.patch
deleted file mode 100644
index 50b73028f303..000000000000
--- a/media-gfx/nomacs/files/nomacs-3.16.224-libdir.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From c8f6c325c5f5170bb473c41ee716b781d37bdd41 Mon Sep 17 00:00:00 2001
-From: Markus Diem <diemmarkus@gmail.com>
-Date: Mon, 27 Jul 2020 13:19:01 +0200
-Subject: [PATCH] fixes plugin path for fedora
-
-- thanks @tieugene
-- beta version: 3.17
----
- ImageLounge/src/DkCore/DkPluginManager.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/ImageLounge/src/DkCore/DkPluginManager.cpp
-+++ b/ImageLounge/src/DkCore/DkPluginManager.cpp
-@@ -62,6 +62,7 @@
- #include <QAction>
- #include <QMenu>
- #include <QJsonValue>
-+#include <QLibraryInfo>
- #pragma warning(pop) // no warnings from includes - end
-
- #ifdef QT_NO_DEBUG_OUTPUT
-@@ -1309,7 +1310,7 @@ void DkPluginManager::createPluginsPath() {
- #ifdef Q_OS_WIN
- QDir pluginsDir = QCoreApplication::applicationDirPath() + "/plugins";
- #else
-- QDir pluginsDir = QCoreApplication::applicationDirPath() + "/../lib/nomacs-plugins/";
-+ QDir pluginsDir = QLibraryInfo::location(QLibraryInfo::LibrariesPath) + "/nomacs-plugins/";
- #endif // Q_OS_WIN
-
- if (!pluginsDir.exists())
diff --git a/media-gfx/nomacs/files/nomacs-3.16.224-quazip1.patch b/media-gfx/nomacs/files/nomacs-3.16.224-quazip1.patch
deleted file mode 100644
index 06f6b8c2fb81..000000000000
--- a/media-gfx/nomacs/files/nomacs-3.16.224-quazip1.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From b4a1e98a83598072ea6d720ae4d56d380bee5a75 Mon Sep 17 00:00:00 2001
-From: Petr Vanek <petr@yarpen.cz>
-Date: Sun, 15 Nov 2020 19:15:59 +0100
-Subject: [PATCH] fixed #569 Build fails with quazip 1.0 (#576)
-
----
- cmake/Unix.cmake | 28 +++++++++++++++------
- src/DkCore/DkBasicLoader.cpp | 4 +++
- src/DkCore/DkImageContainer.cpp | 4 +++
- src/DkCore/DkImageLoader.cpp | 6 ++++-
- src/DkGui/DkDialog.cpp | 4 +++
- 5 files changed, 37 insertions(+), 9 deletions(-)
-
-diff --git a/cmake/Unix.cmake b/cmake/Unix.cmake
-index 5567084b..c90ba320 100644
---- a/cmake/Unix.cmake
-+++ b/cmake/Unix.cmake
-@@ -102,14 +102,26 @@ unset(QT_ROOT CACHE)
-
- 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()
-+ # Let's try QuaZip1 first (it's the bright future)
-+ find_package(QuaZip-Qt5 QUIET)
-+ if (QuaZip-Qt5_FOUND)
-+ message(STATUS "QUAZIP: QuaZip-1 for Qt5 found")
-+ set(QUAZIP_LIBRARIES QuaZip::QuaZip)
-+ add_definitions(-DWITH_QUAZIP1)
-+ else ()
-+ message(WARNING "QUAZIP: 1.x not found. Trying to find 0.x")
-+ # QuaZip < 1.0. This leg can be removed (including cmake/FindQuaZip5.cmake)
-+ # ater the final migration to 1.x in Linux distros
-+ SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
-+
-+ find_package(QuaZip5 QUIET)
-+ if(NOT QUAZIP_FOUND)
-+ message(FATAL_ERROR "QUAZIP: even 0.x not found. It's mandatory when used with ENABLE_QUAZIP enabled, you can also disable USE_SYSTEM_QUAZIP")
-+ endif()
-+
-+ endif (QuaZip-Qt5_FOUND)
-+ # we have any QuaZip after all
-+ 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/src/DkCore/DkBasicLoader.cpp b/src/DkCore/DkBasicLoader.cpp
-index 7f9e889c..b7edfd43 100644
---- a/src/DkCore/DkBasicLoader.cpp
-+++ b/src/DkCore/DkBasicLoader.cpp
-@@ -54,8 +54,12 @@
-
- // quazip
- #ifdef WITH_QUAZIP
-+#ifdef WITH_QUAZIP1
-+#include <quazip/JlCompress.h>
-+#else
- #include <quazip5/JlCompress.h>
- #endif
-+#endif
-
- // opencv
- #ifdef WITH_OPENCV
-diff --git a/src/DkCore/DkImageContainer.cpp b/src/DkCore/DkImageContainer.cpp
-index 810994d3..150da9c2 100644
---- a/src/DkCore/DkImageContainer.cpp
-+++ b/src/DkCore/DkImageContainer.cpp
-@@ -41,8 +41,12 @@
-
- // quazip
- #ifdef WITH_QUAZIP
-+#ifdef WITH_QUAZIP1
-+#include <quazip/JlCompress.h>
-+#else
- #include <quazip5/JlCompress.h>
- #endif
-+#endif
- #pragma warning(pop) // no warnings from includes - end
-
- #pragma warning(disable: 4251) // TODO: remove
-diff --git a/src/DkCore/DkImageLoader.cpp b/src/DkCore/DkImageLoader.cpp
-index 09d25d23..e4186f2b 100644
---- a/src/DkCore/DkImageLoader.cpp
-+++ b/src/DkCore/DkImageLoader.cpp
-@@ -79,8 +79,12 @@
-
- // quazip
- #ifdef WITH_QUAZIP
-+#ifdef WITH_QUAZIP1
-+#include <quazip/JlCompress.h>
-+#else
- #include <quazip5/JlCompress.h>
- #endif
-+#endif
-
- // opencv
- #ifdef WITH_OPENCV
-@@ -2212,4 +2216,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 008c9a3b..85842eca 100644
---- a/src/DkGui/DkDialog.cpp
-+++ b/src/DkGui/DkDialog.cpp
-@@ -97,8 +97,12 @@
-
- // quazip
- #ifdef WITH_QUAZIP
-+#ifdef WITH_QUAZIP1
-+#include <quazip/JlCompress.h>
-+#else
- #include <quazip5/JlCompress.h>
- #endif
-+#endif
-
- #pragma warning(pop) // no warnings from includes - end
-
diff --git a/media-gfx/nomacs/nomacs-3.16.224-r6.ebuild b/media-gfx/nomacs/nomacs-3.16.224-r6.ebuild
deleted file mode 100644
index d174453289b1..000000000000
--- a/media-gfx/nomacs/nomacs-3.16.224-r6.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_BUILD_TYPE="Release" # buildsys: what a mess
-PLUGIN_PKG="${PN}-plugins-$(ver_cut 1-2)"
-inherit cmake xdg
-
-DESCRIPTION="Qt-based image viewer"
-HOMEPAGE="https://nomacs.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-plugins? ( https://github.com/${PN}/${PN}-plugins/archive/$(ver_cut 1-2).tar.gz -> ${PLUGIN_PKG}.tar.gz )"
-CMAKE_USE_DIR="${S}/ImageLounge"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86 ~amd64-linux"
-IUSE="+opencv plugins raw +tiff zip"
-
-REQUIRED_USE="
- raw? ( opencv )
- tiff? ( opencv )
-"
-
-RDEPEND="
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5[jpeg]
- dev-qt/qtnetwork:5
- dev-qt/qtprintsupport:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- media-gfx/exiv2:=
- opencv? ( >=media-libs/opencv-3.4:= )
- raw? ( media-libs/libraw:= )
- tiff? (
- dev-qt/qtimageformats:5
- media-libs/tiff:=
- )
- zip? ( dev-libs/quazip:0=[qt5(+)] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-qt/linguist-tools:5
- virtual/pkgconfig
-"
-
-DOCS=( src/changelog.txt )
-
-PATCHES=(
- "${FILESDIR}"/${P}-libdir.patch
- "${FILESDIR}"/${P}-exiv2-0.28.patch # bug 906488
-)
-
-src_prepare() {
- if use plugins ; then
- rmdir ImageLounge/plugins || die
- mv -v ../${PLUGIN_PKG} ImageLounge/plugins || die
- fi
-
- # from git master # reuse existing patches w/o paths adjusted
- pushd "ImageLounge" > /dev/null || die
- eapply "${FILESDIR}"/${P}-quazip1.patch
- eapply "${FILESDIR}"/${P}-DkMath-ostream.patch
- popd > /dev/null || die
-
- use plugins && eapply "${FILESDIR}"/${P}-libdir-plugins.patch
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DQT_QMAKE_EXECUTABLE=qmake5 # bug 847112
- -DENABLE_CODE_COV=OFF
- -DUSE_SYSTEM_QUAZIP=ON
- -DENABLE_TRANSLATIONS=ON
- -DENABLE_OPENCV=$(usex opencv)
- -DENABLE_PLUGINS=$(usex plugins)
- -DENABLE_RAW=$(usex raw)
- -DENABLE_TIFF=$(usex tiff)
- -DENABLE_QUAZIP=$(usex zip)
- )
- cmake_src_configure
-}
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-08 22:07:41 +0000