From 6854913aa1a57839328baafb435b84f9baacae65 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 17 May 2023 22:10:38 +0100 Subject: gentoo auto-resync : 17:05:2023 - 22:10:37 --- media-gfx/viewnior/Manifest | 7 +- ....17-Replace-calls-to-getenv-with-g_getenv.patch | 28 ------- .../viewnior-0.17-update_metadata_location.patch | 42 ---------- ...or-1.8-add-support-for-exiv-0.28.0-errors.patch | 62 +++++++++++++++ ...or-1.8-change-exiv2-AutoPtr-to-unique_ptr.patch | 92 ++++++++++++++++++++++ media-gfx/viewnior/viewnior-1.7-r2.ebuild | 52 ------------ media-gfx/viewnior/viewnior-1.8-r1.ebuild | 50 ++++++++++++ 7 files changed, 207 insertions(+), 126 deletions(-) delete mode 100644 media-gfx/viewnior/files/0.17-Replace-calls-to-getenv-with-g_getenv.patch delete mode 100644 media-gfx/viewnior/files/viewnior-0.17-update_metadata_location.patch create mode 100644 media-gfx/viewnior/files/viewnior-1.8-add-support-for-exiv-0.28.0-errors.patch create mode 100644 media-gfx/viewnior/files/viewnior-1.8-change-exiv2-AutoPtr-to-unique_ptr.patch delete mode 100644 media-gfx/viewnior/viewnior-1.7-r2.ebuild create mode 100644 media-gfx/viewnior/viewnior-1.8-r1.ebuild (limited to 'media-gfx/viewnior') diff --git a/media-gfx/viewnior/Manifest b/media-gfx/viewnior/Manifest index 97d85488a2ff..2082773f7c2d 100644 --- a/media-gfx/viewnior/Manifest +++ b/media-gfx/viewnior/Manifest @@ -1,7 +1,6 @@ -AUX 0.17-Replace-calls-to-getenv-with-g_getenv.patch 1182 BLAKE2B 37a7f395e35a8ac3edbfd3b8d057275c1981347c6e5018c8bca29322ebc33a32b16e0880bddcd394cb9da4315eb26592f9342d8cf58c88f1a29f902e858d8f97 SHA512 190f6b1fd7f4640022274207254be0967718c3d602bc521557a3e4eed6afca274bf650cf9e06ed4ec9a0527eca6b45c39c4b8e1091064b8408dac8033ca07c9d -AUX viewnior-0.17-update_metadata_location.patch 1260 BLAKE2B c3b522f56bcc039978e559f3f0bc4095f5b7750c5d3b54ada39c43631275b0e619a0aed04cabe6a6ca7c0237bed687f46db0eff226f6ab8a6184b08783e09628 SHA512 6ce85095c0cbecfa4d2e9da1a9fa76aec0ef38a585d9aa588403fe9afb76b3faf041144b050e56ad6ec87769cf164c4d7f854003a09d7e21919205903f0f0c2e -DIST viewnior-1.7.tar.gz 165719 BLAKE2B 906ab0b632fcc102ac62dd77d6742c2121c46cd92adc0dfe9ba772bf697eff356519dbb6219016a6470903c855aa4c9081f0d61ca1607d8d1b6d8e03236a19bc SHA512 5ba17d7b5ceeffa65b04213f179c1439b09ac44e412e0750dde159b118a714f28d3a290509a402b234e4e7ba5b185fc73eef65d418598f344911e4e2c1373fe5 +AUX viewnior-1.8-add-support-for-exiv-0.28.0-errors.patch 1669 BLAKE2B db9e54bc50492fb6b96a45fbbba38e1ee5989c4e9a96f430a7af8fc2445122b740833c32fd82436e15e5b1ff4cb6369382f486b0acb08c331b80f6d95f4faad9 SHA512 014e7aaeacf192c6323b05c80c826a9432fc5c6c4fada1e32e2407280e7abc56a5fa919c867350f3e36ed46fefe5e23a36050fb443db13eebbc5b3c7d178c783 +AUX viewnior-1.8-change-exiv2-AutoPtr-to-unique_ptr.patch 2695 BLAKE2B 7b1f23195267443b5920b1e11cb1bc4f9177e86f32bc74f92f6afcc8b2a16bf42dc7f40e9865e37ca0d5bb76a3f9916654df34b41a66bd11f03540f10624c5b1 SHA512 b2921294703d2791f2bc8e71de758ae42031b14b422eab462cebb5f49c410736c67dce919358425f77ef17c941f7e4f363f932af605696cc745c40fc4fa5c9a7 DIST viewnior-1.8.tar.gz 169219 BLAKE2B 6f6da16aa987acce8a48d24a645e1c033f113bb6e291da9f17810a7a04e5007d27c2f1afe3c62cc2d192003633a4128fb04a031160fbd51efbd0bb7dfabd8970 SHA512 0f9698801172ef6b8f5df4132526b2e605e9aa9fd69cf41a091a3623de9b2e84ca857e625aaa9e83f29df318f70a13fb458bac0df11ae46837b78ef257a00bee -EBUILD viewnior-1.7-r2.ebuild 1167 BLAKE2B 138ed55bfa3439f8030218cb981459eeb4c5347e159f6628e7b22ec5a275892a1aafc85c8d19e34cafb0764284bb4001d7c25c22cdc53a3dc762b8e63a72051e SHA512 520c347b2388a4d31adbb90492ef32577223fa24bc4df6e3c05e316f9bc482ad424894054cf3424fd80d1fa17eef601211387cb70a460905eaba9a6405f08aef +EBUILD viewnior-1.8-r1.ebuild 1173 BLAKE2B b8073d6aed8c8d9da43a6da039e3af38ec00a4c097ee3572af1f997f54a026cb1f65d7a689cf5d5760f87dd07a7759981697c7082208039b895978f42e323c79 SHA512 f659bc34c2c6d756d2b83a0ff3cc9fb0529704f18617fe2f7f4a1900ef8c84d1703d4ff3bdf218a676d32af25c5ef72d5e2bca69cd27afb111cf2e4c5da384c4 EBUILD viewnior-1.8.ebuild 1027 BLAKE2B 427897227918751fdaa92ae2395ce90c78d9bdc88fa3ff9c9547e7b7e067b9be4deb432be0f947f58995a2b458cc0197409e49f5252ac198ad7a014be8421282 SHA512 1daf715031ad705376d19321c1d493514157add317bb74449a967fe14d9183ca897e12b1b7e3cb223d94915ef4158fc17ce54541a4047268328ec172d5213a3c MISC metadata.xml 553 BLAKE2B 7fa77da8d1dcd0a0b6d53f1de26b13ead4edaf6be6ea93858328ce412c7c97e40240aebbedd68ccc66469992b637b11d14763435e3451ac16dc1a1a72e9f2e2a SHA512 e3b2daa2db92f02e6e2c7e51828a60acd9b74a99949643e1cdc429e9f02dacf0e3f7b7d7c8bc86c10eb46fe1aaa06f3b07d8e7ddc491951f8e14f881d69c61d0 diff --git a/media-gfx/viewnior/files/0.17-Replace-calls-to-getenv-with-g_getenv.patch b/media-gfx/viewnior/files/0.17-Replace-calls-to-getenv-with-g_getenv.patch deleted file mode 100644 index fc7fc119359a..000000000000 --- a/media-gfx/viewnior/files/0.17-Replace-calls-to-getenv-with-g_getenv.patch +++ /dev/null @@ -1,28 +0,0 @@ -Using getenv() triggers compile errors in Open Build Service. -Thanks to Axel Köllhofer for the patch. ---- - src/uni-utils.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/uni-utils.c b/src/uni-utils.c -index 8152848..1b4992a 100755 ---- a/src/uni-utils.c -+++ b/src/uni-utils.c -@@ -106,10 +106,10 @@ uni_detect_desktop_environment () - { - VnrPrefsDesktop environment = VNR_PREFS_DESKTOP_GNOME3; - -- gchar *xdg_current_desktop = g_ascii_strup(getenv("XDG_CURRENT_DESKTOP"), -1); -- gchar *xdg_session_desktop = g_ascii_strup(getenv("XDG_SESSION_DESKTOP"), -1); -- gchar *desktop_session = g_ascii_strdown(getenv("DESKTOP_SESSION"), -1); -- gchar *gdmsession = g_ascii_strdown(getenv("GDMSESSION"), -1); -+ gchar *xdg_current_desktop = g_ascii_strup(g_getenv("XDG_CURRENT_DESKTOP"), -1); -+ gchar *xdg_session_desktop = g_ascii_strup(g_getenv("XDG_SESSION_DESKTOP"), -1); -+ gchar *desktop_session = g_ascii_strdown(g_getenv("DESKTOP_SESSION"), -1); -+ gchar *gdmsession = g_ascii_strdown(g_getenv("GDMSESSION"), -1); - - if (!g_strcmp0(xdg_current_desktop, "GNOME") || !g_strcmp0(xdg_session_desktop, "GNOME")) - { --- -2.18.1 - diff --git a/media-gfx/viewnior/files/viewnior-0.17-update_metadata_location.patch b/media-gfx/viewnior/files/viewnior-0.17-update_metadata_location.patch deleted file mode 100644 index 492186059d91..000000000000 --- a/media-gfx/viewnior/files/viewnior-0.17-update_metadata_location.patch +++ /dev/null @@ -1,42 +0,0 @@ -From f338c37881a860952aa10cc437bc72fa0b49a823 Mon Sep 17 00:00:00 2001 -From: tastytea -Date: Thu, 21 May 2020 20:07:45 +0200 -Subject: [PATCH] Rename appdata.xml to metainfo.xml and change install dir. - -The new name is used since AppStream 0.9.8 (2016-08-10) and the new -location is used since AppStream 0.9.4 (2016-04-18). ---- - data/meson.build | 6 +++--- - data/{viewnior.appdata.xml => viewnior.metainfo.xml} | 0 - 2 files changed, 3 insertions(+), 3 deletions(-) - rename data/{viewnior.appdata.xml => viewnior.metainfo.xml} (100%) - -diff --git a/data/meson.build b/data/meson.build -index 55070fc..05d734e 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -17,8 +17,8 @@ install_data( - ) - - install_data( -- 'viewnior.appdata.xml', -- install_dir: join_paths(datadir, 'appdata') -+ 'viewnior.metainfo.xml', -+ install_dir: join_paths(datadir, 'metainfo') - ) - - desktop = i18n.merge_file( -@@ -39,4 +39,4 @@ if desktop_file_validate.found() - desktop.full_path() - ] - ) --endif -\ No newline at end of file -+endif -diff --git a/data/viewnior.appdata.xml b/data/viewnior.metainfo.xml -similarity index 100% -rename from data/viewnior.appdata.xml -rename to data/viewnior.metainfo.xml --- -2.26.2 - diff --git a/media-gfx/viewnior/files/viewnior-1.8-add-support-for-exiv-0.28.0-errors.patch b/media-gfx/viewnior/files/viewnior-1.8-add-support-for-exiv-0.28.0-errors.patch new file mode 100644 index 000000000000..41b478f95caf --- /dev/null +++ b/media-gfx/viewnior/files/viewnior-1.8-add-support-for-exiv-0.28.0-errors.patch @@ -0,0 +1,62 @@ +# upstream PR: + +From 60312f7435492338299d519e739da1f33df02f8c Mon Sep 17 00:00:00 2001 +From: tastytea +Date: Tue, 16 May 2023 11:17:00 +0200 +Subject: [PATCH] add support for exiv-0.28.0 errors + +exiv2-0.28.0 changed Exiv2::AnyError to Exiv2::Error. +--- + src/uni-exiv2.cpp | 15 ++++++++++++--- + 1 file changed, 12 insertions(+), 3 deletions(-) + +diff --git a/src/uni-exiv2.cpp b/src/uni-exiv2.cpp +index 77064c2..567a50f 100644 +--- a/src/uni-exiv2.cpp ++++ b/src/uni-exiv2.cpp +@@ -28,6 +28,15 @@ + + #define ARRAY_SIZE(array) (sizeof array/sizeof(array[0])) + ++#define EXIV_ERROR Exiv2::AnyError ++#ifdef EXIV2_VERSION ++ #ifdef EXIV2_TEST_VERSION ++ #if EXIV2_TEST_VERSION(0,28,0) ++ #define EXIV_ERROR Exiv2::Error ++ #endif ++ #endif ++#endif ++ + static std::unique_ptr cached_image; + + extern "C" +@@ -81,7 +90,7 @@ uni_read_exiv2_map(const char *uri, void (*callback)(const char*, const char*, v + } + } + } +- } catch (Exiv2::AnyError& e) { ++ } catch (EXIV_ERROR& e) { + std::cerr << "Exiv2: '" << e << "'\n"; + } + } +@@ -104,7 +113,7 @@ uni_read_exiv2_to_cache(const char *uri) + } + + cached_image->readMetadata(); +- } catch (Exiv2::AnyError& e) { ++ } catch (EXIV_ERROR& e) { + std::cerr << "Exiv2: '" << e << "'\n"; + } + +@@ -134,7 +143,7 @@ uni_write_exiv2_from_cache(const char *uri) + cached_image.reset(nullptr); + + return 0; +- } catch (Exiv2::AnyError& e) { ++ } catch (EXIV_ERROR& e) { + std::cerr << "Exiv2: '" << e << "'\n"; + } + +-- +2.39.3 + diff --git a/media-gfx/viewnior/files/viewnior-1.8-change-exiv2-AutoPtr-to-unique_ptr.patch b/media-gfx/viewnior/files/viewnior-1.8-change-exiv2-AutoPtr-to-unique_ptr.patch new file mode 100644 index 000000000000..a49748e39f36 --- /dev/null +++ b/media-gfx/viewnior/files/viewnior-1.8-change-exiv2-AutoPtr-to-unique_ptr.patch @@ -0,0 +1,92 @@ +# upstream PR: + +From e98d86aecf20a1651552090c7b25d5fcdd41133a Mon Sep 17 00:00:00 2001 +From: tastytea +Date: Tue, 16 May 2023 10:54:40 +0200 +Subject: [PATCH] change exiv2 AutoPtr to unique_ptr + +exiv2-0.28.0 removed Exiv2::Image::AutoPtr and added +Exiv2::Image::UniquePtr instead. since it's a typedef for +std::unique_ptr, i'm using that directly instead of adding a +condition on the exiv2 version. +--- + src/uni-exiv2.cpp | 21 +++++++++++---------- + 1 file changed, 11 insertions(+), 10 deletions(-) + +diff --git a/src/uni-exiv2.cpp b/src/uni-exiv2.cpp +index 0d14b9f..77064c2 100644 +--- a/src/uni-exiv2.cpp ++++ b/src/uni-exiv2.cpp +@@ -22,12 +22,13 @@ + + #include + #include ++#include + + #include "uni-exiv2.hpp" + + #define ARRAY_SIZE(array) (sizeof array/sizeof(array[0])) + +-static Exiv2::Image::AutoPtr cached_image; ++static std::unique_ptr cached_image; + + extern "C" + void +@@ -35,8 +36,8 @@ uni_read_exiv2_map(const char *uri, void (*callback)(const char*, const char*, v + { + Exiv2::LogMsg::setLevel(Exiv2::LogMsg::mute); + try { +- Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(uri); +- if ( image.get() == 0 ) { ++ std::unique_ptr image = Exiv2::ImageFactory::open(uri); ++ if (image == nullptr) { + return; + } + +@@ -91,14 +92,14 @@ uni_read_exiv2_to_cache(const char *uri) + { + Exiv2::LogMsg::setLevel(Exiv2::LogMsg::mute); + +- if ( cached_image.get() != NULL ) { ++ if (cached_image != nullptr) { + cached_image->clearMetadata(); +- cached_image.reset(NULL); ++ cached_image.reset(nullptr); + } + + try { + cached_image = Exiv2::ImageFactory::open(uri); +- if ( cached_image.get() == 0 ) { ++ if (cached_image == nullptr) { + return 1; + } + +@@ -116,13 +117,13 @@ uni_write_exiv2_from_cache(const char *uri) + { + Exiv2::LogMsg::setLevel(Exiv2::LogMsg::mute); + +- if ( cached_image.get() == NULL ) { ++ if (cached_image == nullptr) { + return 1; + } + + try { +- Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(uri); +- if ( image.get() == 0 ) { ++ std::unique_ptr image = Exiv2::ImageFactory::open(uri); ++ if (image == nullptr) { + return 2; + } + +@@ -130,7 +131,7 @@ uni_write_exiv2_from_cache(const char *uri) + image->writeMetadata(); + + cached_image->clearMetadata(); +- cached_image.reset(NULL); ++ cached_image.reset(nullptr); + + return 0; + } catch (Exiv2::AnyError& e) { +-- +2.39.3 + diff --git a/media-gfx/viewnior/viewnior-1.7-r2.ebuild b/media-gfx/viewnior/viewnior-1.7-r2.ebuild deleted file mode 100644 index 10cdce44775a..000000000000 --- a/media-gfx/viewnior/viewnior-1.7-r2.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit meson xdg - -DESCRIPTION="Fast and simple image viewer" -HOMEPAGE=" - https://siyanpanayotov.com/project/viewnior/ - https://github.com/hellosiyan/Viewnior -" -SRC_URI="https://github.com/hellosiyan/${PN^}/archive/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" -IUSE="" - -RDEPEND=" - dev-libs/glib:2 - media-gfx/exiv2:0= - x11-libs/gtk+:2 -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-util/glib-utils - virtual/pkgconfig -" - -S="${WORKDIR}/${PN^}-${P}" - -PATCHES=( - "${FILESDIR}/0.17-Replace-calls-to-getenv-with-g_getenv.patch" - "${FILESDIR}/viewnior-0.17-update_metadata_location.patch" -) - -src_prepare() { - xdg_src_prepare - - # That script would update icon cache and desktop database. - sed -i "s/meson.add_install_script('meson_post_install.py')//" meson.build \ - || die 'Failed to remove post-install-script invocation from meson.build' - # Don't let meson compress the manpage. - sed -i "s/subdir('man')//" meson.build \ - || die 'Failed to remove manpage compression from meson.build' -} - -src_install() { - meson_src_install - doman man/viewnior.1 -} diff --git a/media-gfx/viewnior/viewnior-1.8-r1.ebuild b/media-gfx/viewnior/viewnior-1.8-r1.ebuild new file mode 100644 index 000000000000..b2520150b2f9 --- /dev/null +++ b/media-gfx/viewnior/viewnior-1.8-r1.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson xdg + +DESCRIPTION="Fast and simple image viewer" +HOMEPAGE="https://siyanpanayotov.com/project/viewnior" +SRC_URI="https://github.com/hellosiyan/${PN^}/archive/${P}.tar.gz" +S="${WORKDIR}/${PN^}-${P}" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +IUSE="" + +RDEPEND=" + dev-libs/glib:2 + media-gfx/exiv2:0= + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:2 +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/glib-utils + sys-devel/gettext + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.8-change-exiv2-AutoPtr-to-unique_ptr.patch + "${FILESDIR}"/${PN}-1.8-add-support-for-exiv-0.28.0-errors.patch +) + +src_prepare() { + # That script would update icon cache and desktop database. + sed -i "s/meson.add_install_script('meson_post_install.py')//" meson.build \ + || die 'Failed to remove post-install-script invocation from meson.build' + # Don't let meson compress the manpage. + sed -i "s/subdir('man')//" meson.build \ + || die 'Failed to remove manpage compression from meson.build' + + default +} + +src_install() { + meson_src_install + doman man/viewnior.1 +} -- cgit v1.2.3