[packages/geeqie] - up to 1.7.2
mrozowik
mrozowik at pld-linux.org
Tue Feb 1 00:17:16 CET 2022
commit c1e75bb96a8f579c05a91ad96882748a8dab5372
Author: Krzysztof Mrozowicz <mrozowik at pld-linux.org>
Date: Mon Jan 31 23:17:04 2022 +0000
- up to 1.7.2
0001-Fix-829-segfault-with-clutter-gtk.patch | 35 ----------------------------
geeqie.spec | 21 ++++++++---------
2 files changed, 10 insertions(+), 46 deletions(-)
---
diff --git a/geeqie.spec b/geeqie.spec
index a26142f..583d65f 100644
--- a/geeqie.spec
+++ b/geeqie.spec
@@ -12,14 +12,13 @@ Summary: Graphics file browser utility
Summary(hu.UTF-8): Képfájl-böngésző eszköz
Summary(pl.UTF-8): Narzędzie do przeglądania plików graficznych
Name: geeqie
-Version: 1.6
+Version: 1.7.2
Release: 1
License: GPL v2+
Group: X11/Applications/Graphics
-Source0: http://www.geeqie.org/%{name}-%{version}.tar.xz
-# Source0-md5: e7401c0e117c423456d5fab468c3149c
+Source0: https://github.com/BestImageViewer/geeqie/releases/download/v%{version}/%{name}-%{version}.tar.xz
+# Source0-md5: 78bfcf8f0af60117958caa846355de66
Patch0: libdir-fix.patch
-Patch4: 0001-Fix-829-segfault-with-clutter-gtk.patch
URL: http://www.geeqie.org/
BuildRequires: autoconf >= 2.57
BuildRequires: automake
@@ -30,7 +29,7 @@ BuildRequires: exiv2-devel >= 0.11
BuildRequires: ffmpegthumbnailer-devel >= 2.1.0
BuildRequires: gdk-pixbuf2-devel >= 2
BuildRequires: gettext-tools
-BuildRequires: glib2-devel >= 1:2.24.0
+BuildRequires: glib2-devel >= 1:2.52.0
BuildRequires: gnome-doc-utils
BuildRequires: graphviz
%{?with_gtk2:BuildRequires: gtk+2-devel >= 2:2.20.0}
@@ -41,7 +40,9 @@ BuildRequires: lcms2-devel >= 2.0
%{?with_champlain:BuildRequires: libchamplain-devel >= 0.12}
BuildRequires: libheif-devel >= 1.3.2
BuildRequires: libjpeg-devel
+BuildRequires: libjxl-devel >= 0.3.7
BuildRequires: libpng-devel
+BuildRequires: libraw-devel >= 0.20
BuildRequires: libstdc++-devel
BuildRequires: libtiff-devel
BuildRequires: lirc-devel
@@ -86,7 +87,6 @@ i opcje filtrowania, jak również wsparcie dla zewnętrznego edytora.
%prep
%setup -q
%patch0 -p1
-%patch4 -p1
%build
%{__sed} -i '1s,/usr/bin/awk,/bin/awk,' \
@@ -99,8 +99,9 @@ install -d auxdir
%{__automake}
%configure \
%{!?with_clutter:--disable-gpu-accel} \
- --enable-gtk3%{?with_gtk2:=no} \
- %{?with_champlain:--enable-map}
+ %{?with_gtk2:--disable-gtk3} \
+ %{?with_champlain:--enable-map} \
+ --enable-lirc
%{__make}
@@ -108,7 +109,6 @@ install -d auxdir
rm -rf $RPM_BUILD_ROOT
%{__make} install \
- GNOME_DOC_TOOL=/disable-install-hook \
DESTDIR=$RPM_BUILD_ROOT
%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/%{name}/{applications,template.desktop}
@@ -127,7 +127,7 @@ rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc AUTHORS README.md TODO doc/html
+%doc AUTHORS README.md TODO NEWS doc/html
%attr(755,root,root) %{_bindir}/%{name}
%{_mandir}/man1/%{name}.1*
%{_desktopdir}/%{name}.desktop
@@ -142,7 +142,6 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/%{name}/geeqie-symlink
%attr(755,root,root) %{_libdir}/%{name}/geeqie-tethered-photography
%attr(755,root,root) %{_libdir}/%{name}/geeqie-tethered-photography-hook-script
-%attr(755,root,root) %{_libdir}/%{name}/geeqie-ufraw
%attr(755,root,root) %{_libdir}/%{name}/geocode-parameters.awk
%attr(755,root,root) %{_libdir}/%{name}/lensID
%{_libdir}/%{name}/geocode-parameters.awk
diff --git a/0001-Fix-829-segfault-with-clutter-gtk.patch b/0001-Fix-829-segfault-with-clutter-gtk.patch
deleted file mode 100644
index 1e2609f..0000000
--- a/0001-Fix-829-segfault-with-clutter-gtk.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From f34ea0700048c27319a2256408171adda32a7580 Mon Sep 17 00:00:00 2001
-From: Colin Clark <colin.clark at cclark.uk>
-Date: Sat, 9 Jan 2021 11:35:41 +0000
-Subject: [PATCH] Fix #829: segfault with clutter-gtk
-
-https://github.com/BestImageViewer/geeqie/issues/829
-
-This fix might cause other problems which might be cured by calling:
-LIBGL_ALWAYS_INDIRECT=1 geeqie
-
-or, worst case:
-geeqie --disable-clutter
----
- src/main.c | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/src/main.c b/src/main.c
-index f497240d..4af654fe 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -904,11 +904,6 @@ gint main(gint argc, gchar *argv[])
- #ifdef HAVE_GTHREAD
- #if !GLIB_CHECK_VERSION(2,32,0)
- g_thread_init(NULL);
--#endif
--#ifdef HAVE_CLUTTER
--/* FIXME: see below */
-- putenv("LIBGL_ALWAYS_INDIRECT=1");
-- XInitThreads();
- #endif
- gdk_threads_init();
- gdk_threads_enter();
---
-2.29.2
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/geeqie.git/commitdiff/c1e75bb96a8f579c05a91ad96882748a8dab5372
More information about the pld-cvs-commit
mailing list