public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Jos de Kloe <josdekloe@gmail.com>
To: git-commits@fedoraproject.org
Subject: [rpms/Zim] f43: new patch to fix github issue #2934; and enable vcs/git test case
Date: Sun, 21 Jun 2026 12:51:50 GMT [thread overview]
Message-ID: <178204631099.1.12302436508451564547.rpms-Zim-aaefe1fda405@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/Zim
Branch : f43
Commit : aaefe1fda405e04d64ee031059d32fa493a6995d
Author : Jos de Kloe <josdekloe@gmail.com>
Date : 2026-04-04T13:03:24+02:00
Stats : +26/-2 in 2 file(s)
URL : https://src.fedoraproject.org/rpms/Zim/c/aaefe1fda405e04d64ee031059d32fa493a6995d?branch=f43
Log:
new patch to fix github issue #2934; and enable vcs/git test case
---
diff --git a/Zim.spec b/Zim.spec
index e7a8fdc..8c1b2ec 100644
--- a/Zim.spec
+++ b/Zim.spec
@@ -13,6 +13,9 @@ Source0: http://www.zim-wiki.org/downloads/zim-%{version}.tar.gz
Patch: 0000-Disable-TestPlugins-test.patch
# Install icons even when building Python wheels
Patch: https://github.com/zim-desktop-wiki/zim-desktop-wiki/pull/2859.patch
+# See: https://github.com/zim-desktop-wiki/zim-desktop-wiki/issues/2934
+Patch: zim_2934.patch
+
BuildArch: noarch
BuildRequires: desktop-file-utils
@@ -23,8 +26,10 @@ BuildRequires: gobject-introspection
# for tests
BuildRequires: /usr/bin/xvfb-run
BuildRequires: glibc-langpack-en
+# needed to test vcs/git integration
+BuildRequires: git
-Requires: python3-gobject
+Requires: python3-gobject, gobject-introspection
Requires: gtk3, python3-pyxdg
Recommends: libappindicator-gtk3
@@ -56,7 +61,15 @@ cat zim.lang >> %{pyproject_files}
desktop-file-validate %{buildroot}%{_datadir}/applications/org.zim_wiki.Zim.desktop
%check
-LANG=en_US.UTF-8 xvfb-run ./test.py
+# this is needed to allow the vcs/git integration test to pass
+# since it executes "git commit"
+git config --global user.email "you@example.com"
+git config --global user.name "Your Name"
+# for some unknown reason settings these env variables does not have the expected effect:
+#GIT_COMMITTER_NAME=test \
+#GIT_COMMITTER_EMAIL=test@test.com \
+LANG=en_US.UTF-8 \
+xvfb-run ./test.py
%files -f %{pyproject_files}
%doc *.md contrib/
diff --git a/zim_2934.patch b/zim_2934.patch
new file mode 100644
index 0000000..e13206b
--- /dev/null
+++ b/zim_2934.patch
@@ -0,0 +1,11 @@
+--- zim-0.76.3.unchanged/zim/gui/pageview/textview.py 2025-03-28 13:36:01.000000000 +0100
++++ zim-0.76.3/zim/gui/pageview/textview.py 2026-04-04 11:56:07.289152563 +0200
+@@ -174,7 +174,7 @@ class TextView(Gtk.TextView):
+ # Clear old widgets
+ for child in self.get_children():
+ if isinstance(child, InsertedObjectWidget):
+- self._object_widgets.remove(child)
++ self._object_widgets.discard(child)
+ self.remove(child)
+
+ # Set new buffer
reply other threads:[~2026-06-21 12:51 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178204631099.1.12302436508451564547.rpms-Zim-aaefe1fda405@fedoraproject.org \
--to=josdekloe@gmail.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox