git: e82618c5043a - main - deskutils/zim: fix runtime with sqlite >= 3.41.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 21 Jul 2024 20:35:46 UTC
The branch main has been updated by rm: URL: https://cgit.FreeBSD.org/ports/commit/?id=e82618c5043a998f84ecfbd71ba59ee19bd2558e commit e82618c5043a998f84ecfbd71ba59ee19bd2558e Author: Ruslan Makhmatkhanov <rm@FreeBSD.org> AuthorDate: 2024-07-21 20:33:23 +0000 Commit: Ruslan Makhmatkhanov <rm@FreeBSD.org> CommitDate: 2024-07-21 20:33:23 +0000 deskutils/zim: fix runtime with sqlite >= 3.41.0 Fix submitted in upstream PR: https://github.com/zim-desktop-wiki/zim-desktop-wiki/pull/2640 Local patch should be removed after new zim release. PR: 280355 Reported by: denverh@comcast.net --- deskutils/zim/Makefile | 2 +- .../zim/files/patch-zim_notebook_index_____init____.py | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/deskutils/zim/Makefile b/deskutils/zim/Makefile index a1cc047d6c06..e30083f230e8 100644 --- a/deskutils/zim/Makefile +++ b/deskutils/zim/Makefile @@ -1,6 +1,6 @@ PORTNAME= zim DISTVERSION= 0.75.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= deskutils python MASTER_SITES= https://www.zim-wiki.org/downloads/ diff --git a/deskutils/zim/files/patch-zim_notebook_index_____init____.py b/deskutils/zim/files/patch-zim_notebook_index_____init____.py new file mode 100644 index 000000000000..a9e02be2ed95 --- /dev/null +++ b/deskutils/zim/files/patch-zim_notebook_index_____init____.py @@ -0,0 +1,14 @@ +https://github.com/zim-desktop-wiki/zim-desktop-wiki/pull/2640 + +--- zim/notebook/index/__init__.py.orig 2021-11-29 13:46:48 UTC ++++ zim/notebook/index/__init__.py +@@ -138,7 +138,8 @@ class Index(SignalEmitter): + def _db_init(self): + tables = [r[0] for r in self._db.execute( + 'SELECT name FROM sqlite_master ' +- 'WHERE type="table" and name NOT LIKE "sqlite%"' ++ 'WHERE type=? and name NOT LIKE ?', ++ ('table', 'sqlite%') + )] + for table in tables: + self._db.execute('DROP TABLE %s' % table)