From fb50aec9f90a0a845e351e5132358ec657194507 Mon Sep 17 00:00:00 2001 From: Robin Lee Date: Oct 02 2022 02:39:15 +0000 Subject: Update to 0.75.0 --- diff --git a/.gitignore b/.gitignore index c242dd5..88f2ceb 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ /zim-0.74.1.tar.gz /zim-0.74.2.tar.gz /zim-0.74.3.tar.gz +/zim-desktop-wiki-0.75.0.tar.gz diff --git a/0001-Fix-ControlledDict-on-Python-3.11.patch b/0001-Fix-ControlledDict-on-Python-3.11.patch deleted file mode 100644 index 7274b09..0000000 --- a/0001-Fix-ControlledDict-on-Python-3.11.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 7313bb973575fe96bf8425b39110f90d855cd3eb Mon Sep 17 00:00:00 2001 -From: Otto Liljalaakso -Date: Thu, 4 Aug 2022 21:56:45 +0300 -Subject: [PATCH] Fix ControlledDict.pop on Python 3.11 - -The fix for Python Issue BPO-27275 changes OrderedDict.pop() behavior -so that it does not call __delitem__ any more. -On the other hand, ControlledDict expects such call to happen -to emit the 'changed' event. -Fixed by overriding pop() in ControlledDict -so that it explictly emits 'changed'. - -Fixes #2087 ---- - zim/config/dicts.py | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/zim/config/dicts.py b/zim/config/dicts.py -index 458a8f9e..0f3e44d4 100644 ---- a/zim/config/dicts.py -+++ b/zim/config/dicts.py -@@ -74,6 +74,13 @@ class ControlledDict(DefinitionOrderedDict, SignalEmitter, ConnectorMixin): - self.disconnect_from(v) - self.emit('changed') - -+ def pop(self, key, default=None): -+ # Only emit changed once here -+ with self.block_signals('changed'): -+ v = DefinitionOrderedDict.pop(self, key, default) -+ self.emit('changed') -+ return v -+ - def update(self, E=(), **F): - # Only emit changed once here - with self.block_signals('changed'): --- -2.37.1 - diff --git a/Zim.spec b/Zim.spec index aeae398..0d459b0 100644 --- a/Zim.spec +++ b/Zim.spec @@ -1,5 +1,7 @@ +%global proj zim-desktop-wiki + Name: Zim -Version: 0.74.3 +Version: 0.75.0 Release: %autorelease Summary: Desktop wiki & notekeeper @@ -7,9 +9,7 @@ Summary: Desktop wiki & notekeeper # ./zim/plugins/pageindex/generictreemodel,.py which is LGPLv2+ License: GPLv2+ and LGPLv2+ URL: http://zim-wiki.org/ -Source0: http://www.zim-wiki.org/downloads/zim-%{version}.tar.gz -# https://github.com/zim-desktop-wiki/zim-desktop-wiki/pull/2117 -Patch0: 0001-Fix-ControlledDict-on-Python-3.11.patch +Source0: https://github.com/%{proj}/%{proj}/archive/%{version}.tar.gz#/%{proj}-%{version}.tar.gz BuildArch: noarch BuildRequires: desktop-file-utils @@ -34,7 +34,7 @@ and feel of an outliner. This tool is intended to keep track of TODO lists or to serve as a personal scratch book. %prep -%autosetup -p1 -n zim-%{version} +%autosetup -p1 -n %{proj}-%{version} %build ./setup.py build diff --git a/sources b/sources index 83b0bdc..eaa0690 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zim-0.74.3.tar.gz) = 92a530a827b9eb83289e7ffbf3f0e8ca3d9a7a770c0e6a6114541b290f76c6fd00248543170a5444d65bbd7ac7578101658db9639cf569c76324ec7b03344f9a +SHA512 (zim-desktop-wiki-0.75.0.tar.gz) = 9b8c5be64b2d45de2b02770e91f1950928d8f2214fc0c6099cd57bf61e3749911f46c4ec7815c9e322559ce155db2475e3b1347a81d2b76a82cd848dd4af3864