public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/Zim] rawhide: move to new upstream version 0.77.0 and remove no longer needed patches
@ 2026-06-21 12:36 Jos de Kloe
  0 siblings, 0 replies; only message in thread
From: Jos de Kloe @ 2026-06-21 12:36 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/Zim
Branch : rawhide
Commit : 122a7e974418292eefe263ebba1562100eb3dabc
Author : Jos de Kloe <josdekloe@gmail.com>
Date   : 2026-06-21T14:35:36+02:00
Stats  : +4/-95 in 5 file(s)
URL    : https://src.fedoraproject.org/rpms/Zim/c/122a7e974418292eefe263ebba1562100eb3dabc?branch=rawhide

Log:
move to new upstream version 0.77.0 and remove no longer needed patches

---
diff --git a/0000-Disable-TestPlugins-test.patch b/0000-Disable-TestPlugins-test.patch
deleted file mode 100644
index dd5aef8..0000000
--- a/0000-Disable-TestPlugins-test.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 2288dbcf35fd73c9d2ce1071c4a4d499194f1e90 Mon Sep 17 00:00:00 2001
-From: Otto Liljalaakso <otto.liljalaakso@iki.fi>
-Date: Sat, 2 Aug 2025 21:46:51 +0300
-Subject: [PATCH] Disable TestPlugins test
-
-Recently, this test case started crashing on Fedora 43. It is also
-disabled on upstream CI for mac OS for the same reason,so I consider
-the test case itself suspect and just disable it.
-
-diff --git a/tests/plugins.py b/tests/plugins.py
-index 71a54438..740a529f 100644
---- a/tests/plugins.py
-+++ b/tests/plugins.py
-@@ -114,7 +114,7 @@ class TestPluginManager(tests.TestCase):
- 		self.assertRaises(ImportError, manager.load_plugin, 'nonexistingplugin')
- 
- 
--class TestPlugins(tests.TestCase):
-+class TestPlugins():
- 	'''Test case to initiate all (loadable) plugins and load some extensions'''
- 
- 	def runTest(self):
--- 
-2.50.1
-

diff --git a/2859.patch b/2859.patch
deleted file mode 100644
index 47e6610..0000000
--- a/2859.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 6942565ffa999a7dce311658a7dc8114efde5bf8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
-Date: Tue, 5 Aug 2025 13:31:24 +0200
-Subject: [PATCH] Install icons even when building Python wheels
-
-Fixes https://github.com/zim-desktop-wiki/zim-desktop-wiki/issues/2858
----
- setup.py | 15 ++++++++++-----
- 1 file changed, 10 insertions(+), 5 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index ee95dc844..a9ada7d5d 100755
---- a/setup.py
-+++ b/setup.py
-@@ -39,6 +39,7 @@
- 
- PO_FOLDER = 'translations'
- LOCALE_FOLDER = 'locale'
-+ICON_SIZES = ('16', '22', '24', '32', '48')
- 
- 
- # Helper routines
-@@ -109,10 +110,14 @@ def collect_data_files():
- 	]
- 
- 	# xdg/hicolor -> PREFIX/share/icons/hicolor
--	for dir, dirs, files in os.walk('xdg/hicolor'):
--		if files:
--			target = os.path.join('share', 'icons', dir[4:])
--			files = [os.path.join(dir, f) for f in files]
-+	sizes = [s + 'x' + s for s in ICON_SIZES] + ['scalable']
-+	for size in sizes:
-+		for kind, basename in (('apps', 'org.zim_wiki.Zim'),
-+		                       ('mimetypes', 'application-x-zim-notebook')):
-+			extension = '.svg' if size == 'scalable' else '.png'
-+			filename = basename + extension
-+			target = os.path.join('share', 'icons', 'hicolor', size, kind)
-+			files = [os.path.join('xdg', 'hicolor', size, kind, filename)]
- 			data_files.append((target, files))
- 
- 	# mono icons -> PREFIX/share/icons/ubuntu-mono-light | -dark
-@@ -167,7 +172,7 @@ def fix_dist():
- 		'mimetypes/application-x-zim-notebook.svg'
- 	):
- 		shutil.copy('icons/zim48.svg', 'xdg/hicolor/scalable/' + name)
--	for size in ('16', '22', '24', '32', '48'):
-+	for size in ICON_SIZES:
- 		dir = size + 'x' + size
- 		os.makedirs('xdg/hicolor/%s/apps' % dir)
- 		os.makedirs('xdg/hicolor/%s/mimetypes' % dir)

diff --git a/Zim.spec b/Zim.spec
index 8c1b2ec..51bc7c2 100644
--- a/Zim.spec
+++ b/Zim.spec
@@ -1,5 +1,5 @@
 Name:           Zim
-Version:        0.76.3
+Version:        0.77.0
 Release:        %autorelease
 Summary:        Desktop wiki & notekeeper
 
@@ -9,12 +9,6 @@ Summary:        Desktop wiki & notekeeper
 License:        GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT
 URL:            http://zim-wiki.org/
 Source0:        http://www.zim-wiki.org/downloads/zim-%{version}.tar.gz
-# Crashes the test run, and is also disabled for Mac OS in upstream repo
-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
 
@@ -65,7 +59,8 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.zim_wiki.Zim.desk
 # 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:
+# 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 \

diff --git a/sources b/sources
index f91b27a..c726211 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (zim-0.76.3.tar.gz) = fb71f62e46279e63d7b2d3ad01cea4b61b6d8813c98e6166fc6d8e9369e6303af352e71ec3d166c94b578cafec8a88f79bde7b26b47afda214de8962ccab2087
+SHA512 (zim-0.77.0.tar.gz) = 77039956c702d6b7ac496919de0b7d7a207fd7b3f9789d63c18e1bb40305b7aafd743e3cb3bd0c38786a460e4708c708fb3c3b43d2b858dc9c731f784b9ba999

diff --git a/zim_2934.patch b/zim_2934.patch
deleted file mode 100644
index e13206b..0000000
--- a/zim_2934.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-06-21 12:36 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-21 12:36 [rpms/Zim] rawhide: move to new upstream version 0.77.0 and remove no longer needed patches Jos de Kloe

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox