[ldoce5viewer] Fix python-3.12 issue
by Leigh Scott
commit fa281e32f02f0d5dc076375e622d75427fe416a6
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Apr 4 02:36:39 2024 +0100
Fix python-3.12 issue
ldoce5viewer.spec | 6 +++-
py312_fix.patch | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 90 insertions(+), 1 deletion(-)
---
diff --git a/ldoce5viewer.spec b/ldoce5viewer.spec
index 1d934df..ee899eb 100644
--- a/ldoce5viewer.spec
+++ b/ldoce5viewer.spec
@@ -4,7 +4,7 @@
Name: ldoce5viewer
Version: 0
-Release: 26.%{date}git%{shortcommit0}%{?dist}
+Release: 27.%{date}git%{shortcommit0}%{?dist}
Summary: Viewer Application for the Longman Dictionary (LDOCE 5)
License: GPLv3+ and Public Domain
URL: https://forward-backward.co.jp/ldoce5viewer/
@@ -23,6 +23,7 @@ Patch3: https://github.com/dwrobel/ldoce5viewer/commit/e17a19a86c5f7a02c
# Inkscape 1.0.2 changed argument from --export-file= to --export-filename=
# Not sent upstream as it's read-only now.
Patch4: https://github.com/dwrobel/ldoce5viewer/commit/6bb1cc5a3df2f72b590e923034...
+Patch5: py312_fix.patch
BuildArch: noarch
@@ -145,6 +146,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%changelog
+* Thu Apr 04 2024 Leigh Scott <leigh123linux(a)gmail.com> - 0-27.20180309git377ff48
+- Fix python-3.12 issue
+
* Sat Feb 03 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 0-26.20180309git377ff48
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
diff --git a/py312_fix.patch b/py312_fix.patch
new file mode 100644
index 0000000..7cb89af
--- /dev/null
+++ b/py312_fix.patch
@@ -0,0 +1,85 @@
+diff -uNrp a/ldoce5viewer/ldoce5/extract.py b/ldoce5viewer/ldoce5/extract.py
+--- a/ldoce5viewer/ldoce5/extract.py 2018-03-09 07:31:10.000000000 +0000
++++ b/ldoce5viewer/ldoce5/extract.py 2024-04-04 01:46:43.391462108 +0100
+@@ -6,7 +6,7 @@ from __future__ import absolute_import
+ from __future__ import unicode_literals
+
+ import re
+-from cgi import escape
++from html import escape
+ from itertools import chain
+
+ import lxml.etree as et
+diff -uNrp a/ldoce5viewer/ldoce5/idmreader.py b/ldoce5viewer/ldoce5/idmreader.py
+--- a/ldoce5viewer/ldoce5/idmreader.py 2018-03-09 07:31:10.000000000 +0000
++++ b/ldoce5viewer/ldoce5/idmreader.py 2024-04-04 02:27:26.733504457 +0100
+@@ -6,7 +6,7 @@ import os.path
+ from struct import unpack
+ from zlib import decompress
+ try:
+- from configparser import SafeConfigParser
++ from configparser import ConfigParser
+ except:
+ from ConfigParser import SafeConfigParser
+
+@@ -82,9 +82,9 @@ def is_ldoce5_dir(path):
+ def list_files(data_root, archive_name):
+
+ def _parse_cft(path):
+- cp = SafeConfigParser()
++ cp = ConfigParser()
+ with open(path, 'r') as f:
+- cp.readfp(f)
++ cp.read_file(f)
+ r = {}
+ r['offsets'] = {}
+ offset = 0
+diff -uNrp a/ldoce5viewer/ldoce5/transform.py b/ldoce5viewer/ldoce5/transform.py
+--- a/ldoce5viewer/ldoce5/transform.py 2018-03-09 07:31:10.000000000 +0000
++++ b/ldoce5viewer/ldoce5/transform.py 2024-04-04 01:47:09.961908140 +0100
+@@ -6,7 +6,7 @@ This module generates HTML data from LDO
+ from __future__ import absolute_import
+ from __future__ import unicode_literals
+
+-from cgi import escape
++from html import escape
+
+ import lxml.etree as et
+
+diff -uNrp a/ldoce5viewer/qtgui/indexer.py b/ldoce5viewer/qtgui/indexer.py
+--- a/ldoce5viewer/qtgui/indexer.py 2018-03-09 07:31:10.000000000 +0000
++++ b/ldoce5viewer/qtgui/indexer.py 2024-04-04 01:46:04.610811106 +0100
+@@ -10,7 +10,7 @@ try:
+ import cPickle as pickle
+ except:
+ import pickle
+-from cgi import escape
++from html import escape
+ from struct import Struct
+ import traceback
+
+diff -uNrp a/ldoce5viewer/qtgui/ui/custom.py b/ldoce5viewer/qtgui/ui/custom.py
+--- a/ldoce5viewer/qtgui/ui/custom.py 2018-03-09 07:31:10.000000000 +0000
++++ b/ldoce5viewer/qtgui/ui/custom.py 2024-04-04 02:04:45.003621642 +0100
+@@ -83,10 +83,10 @@ class LineEdit(QLineEdit):
+ rect = self.rect()
+ self._buttonFind.move(
+ framewidth + 3 - 1,
+- (rect.height() - ICONSIZE) / 2 - 1)
++ (rect.height() - ICONSIZE) // 2 - 1)
+ self._buttonClear.move(
+ rect.width() - framewidth - 3 - ICONSIZE - 1,
+- (rect.height() - ICONSIZE) / 2 - 1)
++ (rect.height() - ICONSIZE) // 2 - 1)
+
+ def __onTextChanged(self, text):
+ self._buttonClear.setVisible(bool(text))
+@@ -147,7 +147,7 @@ class HtmlListWidget(QListWidget):
+ doc = self._doc
+ doc.setDefaultFont(option.font)
+ doc.setHtml('<body>MNmn012<span class="p">012</span></body>')
+- height = doc.size().height() + self.MARGIN_V * 2
++ height = int(doc.size().height() + self.MARGIN_V * 2)
+ s = self._item_size = QSize(0, height)
+ return s
+
7 months, 3 weeks
[kodi-inputstream-adaptive/f40] Update to 21.4.4
by Michael Cronenworth
commit e0736cb81852ee2dad1aadc87854508dcfcbaf5e
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Wed Apr 3 16:58:59 2024 -0500
Update to 21.4.4
.gitignore | 2 +-
kodi-inputstream-adaptive.spec | 9 ++++++---
sources | 4 ++--
3 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2c4f989..cc7c3b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
/inputstream.adaptive-*.tar.gz
-/Bento4-1.6.0-639-8-Omega.tar.gz
+/Bento4-1.6.0-641-Omega.tar.gz
diff --git a/kodi-inputstream-adaptive.spec b/kodi-inputstream-adaptive.spec
index 9cacb16..ddc5fe1 100644
--- a/kodi-inputstream-adaptive.spec
+++ b/kodi-inputstream-adaptive.spec
@@ -4,11 +4,11 @@
# Internal bento4 version (forked and maintained by Kodi developers, and
# required by this addon, see depends/common/bento4/bento4.txt)
-%global internal_bento4_version 1.6.0-639
-%global internal_bento4_tag %{internal_bento4_version}-8-Omega
+%global internal_bento4_version 1.6.0-641
+%global internal_bento4_tag %{internal_bento4_version}-Omega
Name: kodi-inputstream-adaptive
-Version: 21.4.3
+Version: 21.4.4
Release: 1%{?dist}
Summary: Adaptive file addon for Kodi's InputStream interface
@@ -69,6 +69,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/%{name}.met
%changelog
+* Wed Apr 03 2024 Michael Cronenworth <mike(a)cchtml.com> - 21.4.4-1
+- Update to 21.4.4
+
* Mon Mar 11 2024 Michael Cronenworth <mike(a)cchtml.com> - 21.4.3-1
- Update to 21.4.3
diff --git a/sources b/sources
index 7fcb875..22a1cac 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (Bento4-1.6.0-639-8-Omega.tar.gz) = 852537f6e6ed598f6c1eae2051833007291aa323a145b832074ca8bb76927a59883ba079c606b28ad0c75a3d3da111e61f10af2fca24f8da0d5dd64f1f83e14c
-SHA512 (inputstream.adaptive-21.4.3-Omega.tar.gz) = 4f3fd25a7a104684b88b71d039e85fbd4d9ea502b805e38d7cccf5964b0cb931c3ac7873cd2dcf45650218c0584864d2f35bb37aaaee305ba092698c4b904138
+SHA512 (Bento4-1.6.0-641-Omega.tar.gz) = 6d08b8e028cc5a73fa634e42cb4c0e89cc4a7a700177df7ef8e9be18c02077baae25e5a0f1b8d9cb4ceb2a6ff3108e41a4a07aae5f64d9372e915efce0fbd861
+SHA512 (inputstream.adaptive-21.4.4-Omega.tar.gz) = fbd7a625106ad7cdffd8ba6390d1cbedfb92c26bb0059f80253f0cce3788829da58da57cf36b4c9c2a158fa4be226272c6443281186766b5ee42bc718c96b167
7 months, 3 weeks
[kodi-inputstream-adaptive] Update to 21.4.4
by Michael Cronenworth
commit e9d551895aabf716ddca1f95c9e9501d706ba3b6
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Wed Apr 3 16:58:59 2024 -0500
Update to 21.4.4
.gitignore | 2 +-
kodi-inputstream-adaptive.spec | 9 ++++++---
sources | 4 ++--
3 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2c4f989..cc7c3b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
/inputstream.adaptive-*.tar.gz
-/Bento4-1.6.0-639-8-Omega.tar.gz
+/Bento4-1.6.0-641-Omega.tar.gz
diff --git a/kodi-inputstream-adaptive.spec b/kodi-inputstream-adaptive.spec
index 9cacb16..ddc5fe1 100644
--- a/kodi-inputstream-adaptive.spec
+++ b/kodi-inputstream-adaptive.spec
@@ -4,11 +4,11 @@
# Internal bento4 version (forked and maintained by Kodi developers, and
# required by this addon, see depends/common/bento4/bento4.txt)
-%global internal_bento4_version 1.6.0-639
-%global internal_bento4_tag %{internal_bento4_version}-8-Omega
+%global internal_bento4_version 1.6.0-641
+%global internal_bento4_tag %{internal_bento4_version}-Omega
Name: kodi-inputstream-adaptive
-Version: 21.4.3
+Version: 21.4.4
Release: 1%{?dist}
Summary: Adaptive file addon for Kodi's InputStream interface
@@ -69,6 +69,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/%{name}.met
%changelog
+* Wed Apr 03 2024 Michael Cronenworth <mike(a)cchtml.com> - 21.4.4-1
+- Update to 21.4.4
+
* Mon Mar 11 2024 Michael Cronenworth <mike(a)cchtml.com> - 21.4.3-1
- Update to 21.4.3
diff --git a/sources b/sources
index 7fcb875..22a1cac 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (Bento4-1.6.0-639-8-Omega.tar.gz) = 852537f6e6ed598f6c1eae2051833007291aa323a145b832074ca8bb76927a59883ba079c606b28ad0c75a3d3da111e61f10af2fca24f8da0d5dd64f1f83e14c
-SHA512 (inputstream.adaptive-21.4.3-Omega.tar.gz) = 4f3fd25a7a104684b88b71d039e85fbd4d9ea502b805e38d7cccf5964b0cb931c3ac7873cd2dcf45650218c0584864d2f35bb37aaaee305ba092698c4b904138
+SHA512 (Bento4-1.6.0-641-Omega.tar.gz) = 6d08b8e028cc5a73fa634e42cb4c0e89cc4a7a700177df7ef8e9be18c02077baae25e5a0f1b8d9cb4ceb2a6ff3108e41a4a07aae5f64d9372e915efce0fbd861
+SHA512 (inputstream.adaptive-21.4.4-Omega.tar.gz) = fbd7a625106ad7cdffd8ba6390d1cbedfb92c26bb0059f80253f0cce3788829da58da57cf36b4c9c2a158fa4be226272c6443281186766b5ee42bc718c96b167
7 months, 3 weeks
[telegram-desktop] Update to 4.16.1.
by Vasiliy Glazov
commit edaa7f62bdfdce888bd9e6be970ec40fd9f22612
Author: Vasiliy Glazov <vascom2(a)gmail.com>
Date: Wed Apr 3 05:28:32 2024 +0300
Update to 4.16.1.
sources | 2 +-
telegram-desktop.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/sources b/sources
index 5f1bb5b..f20c8d7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tdesktop-4.15.2-full.tar.gz) = 6e65183d5e77d17e11d0c70e1654373e69f6243f2879cf403701e23acd5aed9df6c6892a1c7c83fd975a858e90e20d73824d0754a2f96ad5af6e3de6515e2627
+SHA512 (tdesktop-4.16.1-full.tar.gz) = fb8da3e6ff6885b75e3e8f58fd080926cfbf28a7c47579197823e369d538534af6e7949b5d02905809db22b3e4595596fc32a3bcd7cef1b1cdcf327935316c8c
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 791b240..58cbee9 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -5,7 +5,7 @@
%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
Name: telegram-desktop
-Version: 4.15.2
+Version: 4.16.1
Release: 1%{?dist}
# Application and 3rd-party modules licensing:
@@ -169,6 +169,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%{_metainfodir}/*.metainfo.xml
%changelog
+* Wed Apr 03 2024 Vasiliy Glazov <vascom2(a)gmail.com> - 4.16.1-1
+- Update to 4.16.1
+
* Wed Mar 13 2024 Vasiliy Glazov <vascom2(a)gmail.com> - 4.15.2-1
- Update to 4.15.2
7 months, 3 weeks
