From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1704750-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 3378715812D
for <garchives@archives.gentoo.org>; Wed, 01 Jan 2025 10:37:05 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 3D8AAE0769;
Wed, 01 Jan 2025 10:37:04 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 14851E0718
for <gentoo-commits@lists.gentoo.org>; Wed, 01 Jan 2025 10:37:03 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 080B333BF29
for <gentoo-commits@lists.gentoo.org>; Wed, 01 Jan 2025 10:37:03 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 4017B11B5
for <gentoo-commits@lists.gentoo.org>; Wed, 01 Jan 2025 10:37:01 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org>
Message-ID: <1735727810.3566e1a38aef4edf9344b0d70896a3c0fa36c5a6.asturm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/nomacs/, media-gfx/nomacs/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-gfx/nomacs/Manifest media-gfx/nomacs/files/nomacs-3.16.224-DkMath-ostream.patch media-gfx/nomacs/files/nomacs-3.16.224-exiv2-0.28.patch media-gfx/nomacs/files/nomacs-3.16.224-libdir-plugins.patch media-gfx/nomacs/files/nomacs-3.16.224-libdir.patch media-gfx/nomacs/files/nomacs-3.16.224-quazip1.patch media-gfx/nomacs/nomacs-3.16.224-r6.ebuild
X-VCS-Directories: media-gfx/nomacs/ media-gfx/nomacs/files/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: 3566e1a38aef4edf9344b0d70896a3c0fa36c5a6
X-VCS-Branch: master
Date: Wed, 01 Jan 2025 10:37:01 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 0584c0ef-561f-4d01-b2de-a471901af5fb
X-Archives-Hash: 5edf3a5fa8654530a2041880ed87fc82
commit: 3566e1a38aef4edf9344b0d70896a3c0fa36c5a6
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 1 09:04:49 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 1 10:36:50 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3566e1a3
media-gfx/nomacs: drop 3.16.224-r6
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/nomacs/Manifest | 2 -
.../files/nomacs-3.16.224-DkMath-ostream.patch | 24 --
.../nomacs/files/nomacs-3.16.224-exiv2-0.28.patch | 241 ---------------------
.../files/nomacs-3.16.224-libdir-plugins.patch | 23 --
.../nomacs/files/nomacs-3.16.224-libdir.patch | 30 ---
.../nomacs/files/nomacs-3.16.224-quazip1.patch | 127 -----------
media-gfx/nomacs/nomacs-3.16.224-r6.ebuild | 86 --------
7 files changed, 533 deletions(-)
diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest
index 65f4d3852ff5..f36b951538dc 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -1,4 +1,2 @@
-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
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
-}