t(const QSize& si - return DkRotatingRect(rr); - } - --Exiv2::Image::AutoPtr DkMetaDataT::loadSidecar(const QString& filePath) const { -+Exiv2::Image::UniquePtr DkMetaDataT::loadSidecar(const QString& filePath) const { - -- Exiv2::Image::AutoPtr xmpImg; -+ Exiv2::Image::UniquePtr xmpImg; - - //TODO: check if the file type supports xmp - -@@ -1409,7 +1409,7 @@ bool DkMetaDataT::setXMPValue(Exiv2::XmpData& xmpData, - setXMPValueSuccessful = true; - } - else { -- Exiv2::Value::AutoPtr v = Exiv2::Value::create(Exiv2::xmpText); -+ Exiv2::Value::UniquePtr v = Exiv2::Value::create(Exiv2::xmpText); - if (!v->read(xmpValue.toStdString())) { - if (!xmpData.add(Exiv2::XmpKey(key), v.get())) - setXMPValueSuccessful = true; diff --git a/graphics/nomacs/files/patch-ImageLounge_src_DkCore_DkMetaData.h b/graphics/nomacs/files/patch-ImageLounge_src_DkCore_DkMetaData.h deleted file mode 100644 index ef9042eeaff1..000000000000 --- a/graphics/nomacs/files/patch-ImageLounge_src_DkCore_DkMetaData.h +++ /dev/null @@ -1,20 +0,0 @@ ---- ImageLounge/src/DkCore/DkMetaData.h.orig 2020-07-17 07:05:29 UTC -+++ ImageLounge/src/DkCore/DkMetaData.h -@@ -148,7 +148,7 @@ class DllCoreExport DkMetaDataT { (public) - - protected: - -- Exiv2::Image::AutoPtr loadSidecar(const QString& filePath) const; -+ Exiv2::Image::UniquePtr loadSidecar(const QString& filePath) const; - - enum { - not_loaded, -@@ -157,7 +157,7 @@ class DllCoreExport DkMetaDataT { (public) - dirty, - }; - -- Exiv2::Image::AutoPtr mExifImg; -+ Exiv2::Image::UniquePtr mExifImg; - QString mFilePath; - QStringList mQtKeys; - QStringList mQtValues; diff --git a/graphics/nomacs/files/patch-ImageLounge_src_DkGui_DkThumbsWidgets.cpp b/graphics/nomacs/files/patch-ImageLounge_src_DkGui_DkThumbsWidgets.cpp deleted file mode 100644 index 37c997b38609..000000000000 --- a/graphics/nomacs/files/patch-ImageLounge_src_DkGui_DkThumbsWidgets.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- ImageLounge/src/DkGui/DkThumbsWidgets.cpp.orig 2020-05-30 09:28:31 UTC -+++ ImageLounge/src/DkGui/DkThumbsWidgets.cpp -@@ -61,6 +61,7 @@ - #include - #include - #include -+#include - #pragma warning(pop) // no warnings from includes - end - - namespace nmc { diff --git a/graphics/nomacs/files/patch-ImageLounge_src_DkGui_DkViewPort.cpp b/graphics/nomacs/files/patch-ImageLounge_src_DkGui_DkViewPort.cpp deleted file mode 100644 index fdc040e9f57b..000000000000 --- a/graphics/nomacs/files/patch-ImageLounge_src_DkGui_DkViewPort.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- ImageLounge/src/DkGui/DkViewPort.cpp.orig 2020-05-30 09:28:31 UTC -+++ ImageLounge/src/DkGui/DkViewPort.cpp -@@ -60,6 +60,7 @@ - #include - #include - #include -+#include - - #include - #pragma warning(pop) // no warnings from includes - end diff --git a/graphics/nomacs/files/patch-ImageLounge_src_DkGui_DkWidgets.cpp b/graphics/nomacs/files/patch-ImageLounge_src_DkGui_DkWidgets.cpp deleted file mode 100644 index 2ef9942fa677..000000000000 --- a/graphics/nomacs/files/patch-ImageLounge_src_DkGui_DkWidgets.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- ImageLounge/src/DkGui/DkWidgets.cpp.orig 2020-05-30 09:28:31 UTC -+++ ImageLounge/src/DkGui/DkWidgets.cpp -@@ -51,6 +51,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/graphics/nomacs/pkg-plist b/graphics/nomacs/pkg-plist index 7f1e273bdc28..5fbd3d2b712d 100644 --- a/graphics/nomacs/pkg-plist +++ b/graphics/nomacs/pkg-plist @@ -1,22 +1,22 @@ bin/nomacs lib/libnomacsCore.so -lib/libnomacsCore.so.3 -lib/libnomacsCore.so.3.16.0 +lib/libnomacsCore.so.%%SOVER%% +lib/libnomacsCore.so.%%VERSION%% %%PLUGINS%%lib/nomacs-plugins/libCompositePlugin.so -%%PLUGINS%%lib/nomacs-plugins/libCompositePlugin.so.3 -%%PLUGINS%%lib/nomacs-plugins/libCompositePlugin.so.3.16.0 +%%PLUGINS%%lib/nomacs-plugins/libCompositePlugin.so.%%SOVER%% +%%PLUGINS%%lib/nomacs-plugins/libCompositePlugin.so.%%VERSION%% %%PLUGINS%%lib/nomacs-plugins/libaffineTransformPlugin.so -%%PLUGINS%%lib/nomacs-plugins/libaffineTransformPlugin.so.3 -%%PLUGINS%%lib/nomacs-plugins/libaffineTransformPlugin.so.3.16.0 +%%PLUGINS%%lib/nomacs-plugins/libaffineTransformPlugin.so.%%SOVER%% +%%PLUGINS%%lib/nomacs-plugins/libaffineTransformPlugin.so.%%VERSION%% %%PLUGINS%%lib/nomacs-plugins/libfakeMiniaturesPlugin.so -%%PLUGINS%%lib/nomacs-plugins/libfakeMiniaturesPlugin.so.3 -%%PLUGINS%%lib/nomacs-plugins/libfakeMiniaturesPlugin.so.3.16.0 +%%PLUGINS%%lib/nomacs-plugins/libfakeMiniaturesPlugin.so.%%SOVER%% +%%PLUGINS%%lib/nomacs-plugins/libfakeMiniaturesPlugin.so.%%VERSION%% %%PLUGINS%%lib/nomacs-plugins/libpageExtractionPlugin.so -%%PLUGINS%%lib/nomacs-plugins/libpageExtractionPlugin.so.3 -%%PLUGINS%%lib/nomacs-plugins/libpageExtractionPlugin.so.3.16.0 +%%PLUGINS%%lib/nomacs-plugins/libpageExtractionPlugin.so.%%SOVER%% +%%PLUGINS%%lib/nomacs-plugins/libpageExtractionPlugin.so.%%VERSION%% %%PLUGINS%%lib/nomacs-plugins/libpaintPlugin.so -%%PLUGINS%%lib/nomacs-plugins/libpaintPlugin.so.3 -%%PLUGINS%%lib/nomacs-plugins/libpaintPlugin.so.3.16.0 +%%PLUGINS%%lib/nomacs-plugins/libpaintPlugin.so.%%SOVER%% +%%PLUGINS%%lib/nomacs-plugins/libpaintPlugin.so.%%VERSION%% share/applications/org.nomacs.ImageLounge.desktop share/icons/hicolor/scalable/apps/org.nomacs.ImageLounge.svg share/man/man1/nomacs.1.gz @@ -24,33 +24,32 @@ share/metainfo/org.nomacs.ImageLounge.appdata.xml %%DATADIR%%/Image Lounge/themes/Dark-Theme.css %%DATADIR%%/Image Lounge/themes/Light-Theme.css %%DATADIR%%/Image Lounge/themes/System.css -%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_als.qm -%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_ar.qm -%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_bg.qm -%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_br_pt.qm -%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_bs.qm -%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_ca.qm -%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_cs.qm -%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_de.qm -%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_el.qm -%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_es.qm -%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_et.qm -%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_fi.qm -%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_fr.qm -%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_hr.qm -%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_hu.qm -%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_id.qm -%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_it.qm -%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_ja.qm -%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_ko.qm -%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_nl.qm -%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_pl.qm -%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_pt.qm -%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_ru.qm -%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_sk.qm -%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_sr.qm -%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_sv.qm -%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_tr.qm -%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_tw_zh.qm -%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_uk.qm -%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_zh_CN.qm +%%NLS%%%%DATADIR%%/Image Lounge/translations/nomacs_ar.qm +%%NLS%%%%DATADIR%%/Image Lounge/translations/nomacs_bg.qm +%%NLS%%%%DATADIR%%/Image Lounge/translations/nomacs_bs.qm +%%NLS%%%%DATADIR%%/Image Lounge/translations/nomacs_ca.qm +%%NLS%%%%DATADIR%%/Image Lounge/translations/nomacs_cs.qm +%%NLS%%%%DATADIR%%/Image Lounge/translations/nomacs_de.qm +%%NLS%%%%DATADIR%%/Image Lounge/translations/nomacs_el.qm +%%NLS%%%%DATADIR%%/Image Lounge/translations/nomacs_es.qm +%%NLS%%%%DATADIR%%/Image Lounge/translations/nomacs_et.qm +%%NLS%%%%DATADIR%%/Image Lounge/translations/nomacs_fi.qm +%%NLS%%%%DATADIR%%/Image Lounge/translations/nomacs_fr.qm +%%NLS%%%%DATADIR%%/Image Lounge/translations/nomacs_hr.qm +%%NLS%%%%DATADIR%%/Image Lounge/translations/nomacs_hu.qm +%%NLS%%%%DATADIR%%/Image Lounge/translations/nomacs_id.qm +%%NLS%%%%DATADIR%%/Image Lounge/translations/nomacs_it.qm +%%NLS%%%%DATADIR%%/Image Lounge/translations/nomacs_ja.qm +%%NLS%%%%DATADIR%%/Image Lounge/translations/nomacs_ko.qm +%%NLS%%%%DATADIR%%/Image Lounge/translations/nomacs_nl.qm +%%NLS%%%%DATADIR%%/Image Lounge/translations/nomacs_pl.qm +%%NLS%%%%DATADIR%%/Image Lounge/translations/nomacs_pt.qm +%%NLS%%%%DATADIR%%/Image Lounge/translations/nomacs_pt_BR.qm +%%NLS%%%%DATADIR%%/Image Lounge/translations/nomacs_ru.qm +%%NLS%%%%DATADIR%%/Image Lounge/translations/nomacs_sk.qm +%%NLS%%%%DATADIR%%/Image Lounge/translations/nomacs_sr.qm +%%NLS%%%%DATADIR%%/Image Lounge/translations/nomacs_sv.qm +%%NLS%%%%DATADIR%%/Image Lounge/translations/nomacs_tr.qm +%%NLS%%%%DATADIR%%/Image Lounge/translations/nomacs_uk.qm +%%NLS%%%%DATADIR%%/Image Lounge/translations/nomacs_zh_CN.qm +%%NLS%%%%DATADIR%%/Image Lounge/translations/nomacs_zh_TW.qm