[packages/viewnior] - updated to 1.8, added exiv2 patch to support exiv2 0.28

[qboosh]

commit b7f6cbe86a5f97931bf868986accf9880be95de7
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Jul 28 09:48:37 2023 +0200

    - updated to 1.8, added exiv2 patch to support exiv2 0.28

 viewnior-appdata.patch |  9 ---------
 viewnior-exiv2.patch   | 14 ++++++++++++++
 viewnior.spec          | 52 +++++++++++++++++---------------------------------
 3 files changed, 32 insertions(+), 43 deletions(-)
---
diff --git a/viewnior.spec b/viewnior.spec
index 46cdb08..6d51d9b 100644
--- a/viewnior.spec
+++ b/viewnior.spec
@@ -1,26 +1,26 @@
 Summary:	Elegant image viewer
 Summary(pl.UTF-8):	Elegancka przeglądarka obrazków
 Name:		viewnior
-Version:	1.6
-Release:	3
+Version:	1.8
+Release:	1
 License:	GPL v3+
 Group:		X11/Applications
-#Source0Download: https://github.com/xsisqox/Viewnior/releases
-Source0:	https://github.com/xsisqox/Viewnior/archive/%{name}-%{version}.tar.gz
-# Source0-md5:	f7d497360c48ce4bce09328d934cc4a4
-Patch0:		%{name}-appdata.patch
-URL:		http://siyanpanayotov.com/project/viewnior/
-BuildRequires:	autoconf >= 2.61
-BuildRequires:	automake >= 1:1.11
+#Source0Download: https://github.com/hellosiyan/Viewnior/tags
+Source0:	https://github.com/hellosiyan/Viewnior/archive/%{name}-%{version}.tar.gz
+# Source0-md5:	29d773910df2d120c193ff2e2bc971f3
+Patch0:		%{name}-exiv2.patch
+URL:		https://siyanpanayotov.com/project/viewnior/
 BuildRequires:	desktop-file-utils
 BuildRequires:	exiv2-devel >= 0.21
 BuildRequires:	gdk-pixbuf2-devel >= 2.4.0
-BuildRequires:	gettext-devel
+BuildRequires:	gettext-tools
 BuildRequires:	glib2-devel >= 1:2.32
 BuildRequires:	gtk+2-devel >= 2:2.20
-BuildRequires:	intltool >= 0.35.0
-BuildRequires:	libtool
+BuildRequires:	libstdc++-devel
+BuildRequires:	meson >= 0.43.0
+BuildRequires:	ninja >= 1.5
 BuildRequires:	pkgconfig
+BuildRequires:	rpmbuild(macros) >= 1.736
 BuildRequires:	shared-mime-info >= 0.20
 Requires(post,postun):	desktop-file-utils
 Requires(post,postun):	gtk-update-icon-cache
@@ -65,34 +65,18 @@ Możliwości obejmują między innymi:
 %patch0 -p1
 
 %build
-install -d m4
-%{__glib_gettextize}
-%{__intltoolize}
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-	--disable-silent-rules \
-	--enable-wallpaper
+%meson build
 
-%{__make}
+%ninja_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__make} install \
-	INSTALL='install -p' \
-	DESTDIR=$RPM_BUILD_ROOT
 
-%find_lang %{name}
+%ninja_install -C build
 
 desktop-file-validate $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
 
-# check when manual install becomes obsolete and can be dropped
-test ! -f $RPM_BUILD_ROOT%{_datadir}/appdata/viewnior.appdata.xml || exit 1
-install -d $RPM_BUILD_ROOT%{_datadir}/appdata
-cp -p data/%{name}.appdata.xml $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -107,10 +91,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog-20090517 NEWS README TODO
+%doc AUTHORS NEWS README.md TODO
 %attr(755,root,root) %{_bindir}/viewnior
 %{_datadir}/%{name}
-%{_datadir}/appdata/viewnior.appdata.xml
+%{_datadir}/metainfo/viewnior.metainfo.xml
 %{_desktopdir}/viewnior.desktop
 %{_iconsdir}/hicolor/*x*/apps/viewnior.png
 %{_iconsdir}/hicolor/scalable/apps/viewnior.svg
diff --git a/viewnior-appdata.patch b/viewnior-appdata.patch
deleted file mode 100644
index 26aa7d2..0000000
--- a/viewnior-appdata.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- Viewnior-viewnior-1.6/data/viewnior.appdata.xml.orig	2015-12-17 17:33:39.000000000 +0100
-+++ Viewnior-viewnior-1.6/data/viewnior.appdata.xml	2016-09-11 07:48:44.453621283 +0200
-@@ -20,4 +20,4 @@
-     <screenshot>http://siyanpanayotov.com/wp-content/uploads/2014/04/vnr_navigation_window.png</screenshot>
-   </screenshots>
-   <updatecontact>hello_at_siyanpanayotov.com</updatecontact>
--</application>
-\ No newline at end of file
-+</component>
diff --git a/viewnior-exiv2.patch b/viewnior-exiv2.patch
new file mode 100644
index 0000000..b7191a8
--- /dev/null
+++ b/viewnior-exiv2.patch
@@ -0,0 +1,14 @@
+--- Viewnior-viewnior-1.8/src/uni-exiv2.cpp.orig	2021-11-21 15:49:46.000000000 +0100
++++ Viewnior-viewnior-1.8/src/uni-exiv2.cpp	2023-07-28 09:45:56.518065839 +0200
+@@ -27,6 +27,11 @@
+ 
+ #define ARRAY_SIZE(array) (sizeof array/sizeof(array[0]))
+ 
++#if EXIV2_TEST_VERSION (0,28,0)
++#define AutoPtr UniquePtr
++#define AnyError Error
++#endif
++ 
+ static Exiv2::Image::AutoPtr cached_image;
+ 
+ extern "C"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/viewnior.git/commitdiff/b7f6cbe86a5f97931bf868986accf9880be95de7