From 2788c20a1d466bef898d78517e3aba09608a2b22 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 07:43:26 +0000 Subject: [PATCH 1/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From d7bfc78032039c652b6ae27ad5ba38b6e7218dde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Sat, 11 Nov 2023 18:28:47 +0100 Subject: [PATCH 2/8] Convert to SPDX licensing License reanalysis done with scancode-toolkit. --- viewnior.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/viewnior.spec b/viewnior.spec index 37e039d..ccc8832 100644 --- a/viewnior.spec +++ b/viewnior.spec @@ -3,7 +3,7 @@ Version: 1.8 Release: %autorelease Summary: Elegant image viewer -License: GPLv3+ +License: GPL-3.0-or-later URL: http://siyanpanayotov.com/project/viewnior/ Source0: https://github.com/hellosiyan/Viewnior/archive/%{name}-%{version}.tar.gz From b7a62f02bb81197f3f0a6b20310f69b527ddb05b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Sat, 11 Nov 2023 18:31:38 +0100 Subject: [PATCH 3/8] Fix build with >=exiv2-0.28.0 --- ...exiv2-0.28.0-raise-minimum-to-0.27.0.patch | 100 ++++++++++++++++++ viewnior.spec | 3 +- 2 files changed, 102 insertions(+), 1 deletion(-) create mode 100644 0001-Fix-build-with-exiv2-0.28.0-raise-minimum-to-0.27.0.patch diff --git a/0001-Fix-build-with-exiv2-0.28.0-raise-minimum-to-0.27.0.patch b/0001-Fix-build-with-exiv2-0.28.0-raise-minimum-to-0.27.0.patch new file mode 100644 index 0000000..c8ed300 --- /dev/null +++ b/0001-Fix-build-with-exiv2-0.28.0-raise-minimum-to-0.27.0.patch @@ -0,0 +1,100 @@ +From 8767bc47c2cc9591745ee2b3214fff38eaab114f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= +Date: Sat, 11 Nov 2023 18:17:04 +0100 +Subject: [PATCH] Fix build with >=exiv2-0.28.0, raise minimum to 0.27.0 + +- enables use of EXIV2_TEST_VERSION macro +- add compatibility for exiv2-0.28.0 +--- + meson.build | 2 +- + src/uni-exiv2.cpp | 21 +++++++++++++++------ + 2 files changed, 16 insertions(+), 7 deletions(-) + +diff --git a/meson.build b/meson.build +index 8f91fb5..9ef9f09 100644 +--- a/meson.build ++++ b/meson.build +@@ -28,7 +28,7 @@ viewnior_deps = [ + dependency('gio-2.0', version: glib_ver), + dependency('shared-mime-info', version: '>= 0.20'), + dependency('gdk-pixbuf-2.0', version: '>= 0.21'), +- dependency('exiv2', version: '>= 0.21'), ++ dependency('exiv2', version: '>= 0.27'), + ] + # + +diff --git a/src/uni-exiv2.cpp b/src/uni-exiv2.cpp +index 0d14b9f..d03edd7 100644 +--- a/src/uni-exiv2.cpp ++++ b/src/uni-exiv2.cpp +@@ -22,12 +22,21 @@ + + #include + #include ++#include + + #include "uni-exiv2.hpp" + ++#if EXIV2_TEST_VERSION(0,28,0) ++ typedef Exiv2::Error Exiv2Error; ++ typedef Exiv2::Image::UniquePtr ImagePtr; ++#else ++ typedef Exiv2::AnyError Exiv2Error; ++ typedef Exiv2::Image::AutoPtr ImagePtr; ++#endif ++ + #define ARRAY_SIZE(array) (sizeof array/sizeof(array[0])) + +-static Exiv2::Image::AutoPtr cached_image; ++static ImagePtr cached_image; + + extern "C" + void +@@ -35,7 +44,7 @@ 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); ++ ImagePtr image = Exiv2::ImageFactory::open(uri); + if ( image.get() == 0 ) { + return; + } +@@ -80,7 +89,7 @@ uni_read_exiv2_map(const char *uri, void (*callback)(const char*, const char*, v + } + } + } +- } catch (Exiv2::AnyError& e) { ++ } catch (Exiv2Error& e) { + std::cerr << "Exiv2: '" << e << "'\n"; + } + } +@@ -103,7 +112,7 @@ uni_read_exiv2_to_cache(const char *uri) + } + + cached_image->readMetadata(); +- } catch (Exiv2::AnyError& e) { ++ } catch (Exiv2Error& e) { + std::cerr << "Exiv2: '" << e << "'\n"; + } + +@@ -121,7 +130,7 @@ uni_write_exiv2_from_cache(const char *uri) + } + + try { +- Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(uri); ++ ImagePtr image = Exiv2::ImageFactory::open(uri); + if ( image.get() == 0 ) { + return 2; + } +@@ -133,7 +142,7 @@ uni_write_exiv2_from_cache(const char *uri) + cached_image.reset(NULL); + + return 0; +- } catch (Exiv2::AnyError& e) { ++ } catch (Exiv2Error& e) { + std::cerr << "Exiv2: '" << e << "'\n"; + } + +-- +2.41.0 + diff --git a/viewnior.spec b/viewnior.spec index ccc8832..1432277 100644 --- a/viewnior.spec +++ b/viewnior.spec @@ -5,7 +5,8 @@ Summary: Elegant image viewer License: GPL-3.0-or-later URL: http://siyanpanayotov.com/project/viewnior/ -Source0: https://github.com/hellosiyan/Viewnior/archive/%{name}-%{version}.tar.gz +Source: https://github.com/hellosiyan/Viewnior/archive/%{name}-%{version}.tar.gz +Patch: 0001-Fix-build-with-exiv2-0.28.0-raise-minimum-to-0.27.0.patch BuildRequires: pkgconfig(gtk+-2.0) >= 2.20 BuildRequires: pkgconfig(glib-2.0) >= 2.32 From 77c15fc07cda62e0ca2db1ae3331358d8a84ef87 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:45:20 +0000 Subject: [PATCH 4/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From c0b90b461addaebacc4165ec566d775e1be35a09 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 14:19:15 +0000 Subject: [PATCH 5/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From f8f4585bf7c55e8dddec139fbbeaaa9681317e89 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:04:41 +0000 Subject: [PATCH 6/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From a047c4135c4c89c763db1ae57dbc7ad7f53fba59 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 19:54:00 +0000 Subject: [PATCH 7/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From ab84cdbc95ce5bdd74103eb38bff34269b30e8f8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:28:37 +0000 Subject: [PATCH 8/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild