From nobody Sun Jul 21 20:35:46 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WRwCl03BVz5QRjf; Sun, 21 Jul 2024 20:35:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WRwCk6Yf2z4Fnr; Sun, 21 Jul 2024 20:35:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721594146; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hvroA2S9t7vrJxXvhDzobL61S+z+SgKzOhi9VdrV3oQ=; b=ZlLe8R+cdmm/a//IULSn3evYOWBzMqcwUObgToO6peWYRMCCbkj8HOsTX09g77NlBx8wCI zQTiECEHhp917MJSGSRV8dEYgoOLqoSMBVG791dOQQRZhqf9Eia6lLamHhiCIrNBaK0OP+ nFyuQeHgylWaetcGW8yMlLjUy7BJvIA62EnV+12UPWajnE137jUKrlc7E1W/DSnqZPqe43 WuQaR/x6GO4ThJ0YcA+WRkso2q1utornXXE9BTC8TVwu09Eeuvn19pQJIpw0zwfsU/1oP4 JX61nlLZhvRYdUoc6B3R7OgmCeX2Srch4NkYs1tpd29Q013+CsiBVu4E97jecg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721594146; a=rsa-sha256; cv=none; b=JXZwj7IqRKAtkOA0TfAshRh7tmri0bEXnDWeJdkEc7AlzIuePUKxEYDEHU3NvRSrEqs42Q HE0xJrybSz1AzjPNP+QfGjceLvMoz/1HYBxhQDhY3dSfc6sCy8iJa8B+rxBVNhuEeVviCr M1BZ4KKAfKw9XC3AlpL5CfoQ/iSZUp47DsvUjBKErYv4+IY1518EphFeaQbh4+iIWtHtBK RdMX6ypIqdqgaVUi+Ida+t5X6RJo2EA5eF1JFJLdSu8WZSaQhRJRcStQPSRhP25zUvEmX4 OlnG7pOUEqz+3AEVo4pgC0413xYX4lp4hhw9XKCe4+fuJWgH1aIs4qxL3On31w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721594146; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hvroA2S9t7vrJxXvhDzobL61S+z+SgKzOhi9VdrV3oQ=; b=HAftf6BVkFPqRdyt43/4MLpvrW8djSY0o2W8dzcOcxLqvFHKswUlTIApFr4Do21OeV3fcS eXFC5IkOcdB/PRQRUwJuJIetAIhAFUWnSmZWVNM7jSxGwTb0tx327GY6NaCdnDy1iCOrPN +8LdO82o9Ubp827zglVp3J+ckU9STGjeT8+XviCOL+IkzuNfT1kyr28LSrTc5Rta8NvAjB 5M14Ib5jQAx278HpM0CRIuylbexDUiCuHRZRFLg+DyVOzpFvYjt33rg2y39Do8qgn4WZJo oe9Ma9sXutdSKga93lVK+SXT3/v9PFor0MKF4Iw10vXim+pL6q99S2e8sIY23Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WRwCk68dSzFb5; Sun, 21 Jul 2024 20:35:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46LKZkl0068867; Sun, 21 Jul 2024 20:35:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46LKZkPU068864; Sun, 21 Jul 2024 20:35:46 GMT (envelope-from git) Date: Sun, 21 Jul 2024 20:35:46 GMT Message-Id: <202407212035.46LKZkPU068864@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ruslan Makhmatkhanov Subject: git: e82618c5043a - main - deskutils/zim: fix runtime with sqlite >= 3.41.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e82618c5043a998f84ecfbd71ba59ee19bd2558e Auto-Submitted: auto-generated The branch main has been updated by rm: URL: https://cgit.FreeBSD.org/ports/commit/?id=e82618c5043a998f84ecfbd71ba59ee19bd2558e commit e82618c5043a998f84ecfbd71ba59ee19bd2558e Author: Ruslan Makhmatkhanov AuthorDate: 2024-07-21 20:33:23 +0000 Commit: Ruslan Makhmatkhanov 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)