public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/gramps] rawhide: Allow GExiv2 0.16
@ 2026-09-01 16:27 Yaakov Selkowitz
0 siblings, 0 replies; only message in thread
From: Yaakov Selkowitz @ 2026-09-01 16:27 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/gramps
Branch : rawhide
Commit : 85e96555729b063c1b77c9c4d0238a43562d0ef0
Author : Yaakov Selkowitz <yselkowi@redhat.com>
Date : 2026-08-31T21:09:53-04:00
Stats : +84/-1 in 2 file(s)
URL : https://src.fedoraproject.org/rpms/gramps/c/85e96555729b063c1b77c9c4d0238a43562d0ef0?branch=rawhide
Log:
Allow GExiv2 0.16
https://github.com/gramps-project/gramps/pull/2271
---
diff --git a/2271.patch b/2271.patch
new file mode 100644
index 0000000..5c9c39e
--- /dev/null
+++ b/2271.patch
@@ -0,0 +1,76 @@
+From 41243e919a49a9d453d7ee43c11a3bb27a62cd2a Mon Sep 17 00:00:00 2001
+From: John Ralls <jralls@ceridwen.us>
+Date: Sat, 25 Apr 2026 16:50:32 -0700
+Subject: [PATCH] Allow newer versions of GExiv2.
+
+The latest release of GExiv2 is 0.16 and most major distributions are
+include at least 0.14. gi.require_version with a literal version
+string doesn't permit those newer versions to be imported.
+---
+ gramps/grampsapp.py | 9 +++++----
+ gramps/plugins/gramplet/gramplet.gpr.py | 5 +++--
+ gramps/plugins/lib/libmetadata.py | 6 +++++-
+ 3 files changed, 13 insertions(+), 7 deletions(-)
+
+diff --git a/gramps/grampsapp.py b/gramps/grampsapp.py
+index 90d9079d25b..37715eaacf2 100644
+--- a/gramps/grampsapp.py
++++ b/gramps/grampsapp.py
+@@ -356,8 +356,9 @@ def show_settings():
+ import gi
+
+ repository = gi.Repository.get_default()
+- if repository.enumerate_versions("GExiv2"):
+- gi.require_version("GExiv2", "0.10")
++ v_array = repository.enumerate_versions("GExiv2")
++ if v_array:
++ gi.require_version("GExiv2", v_array[-1])
+ from gi.repository import GExiv2
+
+ try:
+@@ -369,8 +370,8 @@ def show_settings():
+
+ except ImportError:
+ gexiv2_str = "not found"
+- except ValueError:
+- gexiv2_str = "not new enough"
++ except ValueError as err:
++ gexiv2_str = f"Version error: {err}"
+
+ try:
+ vers_str = Popen(["exiv2", "-V"], stdout=PIPE).communicate(input=None)[0]
+diff --git a/gramps/plugins/gramplet/gramplet.gpr.py b/gramps/plugins/gramplet/gramplet.gpr.py
+index 123a5be57cb..4ce902f868b 100644
+--- a/gramps/plugins/gramplet/gramplet.gpr.py
++++ b/gramps/plugins/gramplet/gramplet.gpr.py
+@@ -518,10 +518,11 @@
+ from gi import Repository
+
+ repository = Repository.get_default()
+- if repository.enumerate_versions("GExiv2"):
++ v_array = repository.enumerate_versions("GExiv2")
++ if v_array:
+ import gi
+
+- gi.require_version("GExiv2", "0.10")
++ gi.require_version("GExiv2", v_array[-1])
+ from gi.repository import GExiv2
+
+ available = True
+diff --git a/gramps/plugins/lib/libmetadata.py b/gramps/plugins/lib/libmetadata.py
+index 171a5862dec..5c1da2b388b 100644
+--- a/gramps/plugins/lib/libmetadata.py
++++ b/gramps/plugins/lib/libmetadata.py
+@@ -38,7 +38,11 @@
+ from gi.repository import Gtk
+ import gi
+
+-gi.require_version("GExiv2", "0.10")
++repository = gi.Repository.get_default()
++v_array = repository.enumerate_versions("GExiv2")
++if not v_array:
++ raise ValueError("GExiv2 is not installed")
++gi.require_version("GExiv2", v_array[-1])
+ from gi.repository import GExiv2
+ from gi.repository import Gdk
+ from gi.repository import GdkPixbuf
diff --git a/gramps.spec b/gramps.spec
index cc197ee..0569e0a 100644
--- a/gramps.spec
+++ b/gramps.spec
@@ -1,11 +1,14 @@
Name: gramps
Version: 6.0.8
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Genealogical Research and Analysis Management Programming System
License: GPL-2.0-or-later
URL: https://gramps-project.org/
Source0: https://github.com/gramps-project/gramps/archive/v%{version}/gramps-%{version}.tar.gz
+# Allow GExiv2 0.16
+Patch: https://github.com/gramps-project/gramps/pull/2271.patch
+
BuildArch: noarch
BuildRequires: desktop-file-utils
@@ -43,6 +46,7 @@ based plugin system.
%prep
%setup -q
+%patch -P0 -p1
%generate_buildrequires
%pyproject_buildrequires
@@ -116,6 +120,9 @@ desktop-file-install --delete-original \
%{python3_sitelib}/gramps/plugins
%changelog
+* Tue Sep 01 2026 Yaakov Selkowitz <yselkowi@redhat.com> - 6.0.8-4
+- Allow GExiv2 0.16
+
* Thu Jul 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.8-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-09-01 16:27 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-01 16:27 [rpms/gramps] rawhide: Allow GExiv2 0.16 Yaakov Selkowitz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox