From nobody Tue Apr 29 15:04:13 2025 X-Original-To: dev-commits-ports-main@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 4Zn3W15m7Qz5v8DG; Tue, 29 Apr 2025 15:04:13 +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 4Zn3W156Tsz3dKx; Tue, 29 Apr 2025 15:04:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745939053; 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=e6vnSjxLg/QVr8ydPUpAuwpHcrrAMsMuWna+WA+Vht0=; b=vc2OROPdZrC0pwKm4V8GUO3WeVkS6WuJH3zOy0/f+e29FLng6zSNfeoxojfRknkaLXd8Fg UOdcec8ElNAwDbPuRo6EMQfiUYBdK8uWHK7UvjGkNntzIxI/HjI7kCzF/HTIPm05Y4KHVn 07x2lf1gh6L7ye7ZljXAMs9RoACI3KbtKO4KecdF//lC16zunzFUAhzG5j3HL2lG7Pm88L k5ln15VaO2tAUmljgGLC3eh9ireMB15zyfcUmRTyixvJqNmM8fdI5ZXHbS5/7dKmToadKg 3dezBbHN1ll9zuBufZoKGTPymHyovCgBqzAZXLwiqLbPtOdQ6iJiBISx4/n69A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745939053; a=rsa-sha256; cv=none; b=iWLW9Q0dvYy9X7iyk8YXF9qZ7o6UKRCZgF7Thh9ukIJAWzTS0NjhPDX5+Q2Hjn3zU/mKNV 2m/PDfnQ//NwFST8nO6/UGOkejm/OrXhKcfXbkZi0HCRGpBbaHIejvs3lObfeYktw0CCDp ikqASV8M2M8afc9fWECIxF7Cb32YXR08kwwtb93zUAlQ2T9kqxaI6pcbKGuWRc9L9CWF9U NZhcD9c2weKkSKz8rmh/nCAZ+yHcTJTFLEHSt9mVYcJ0xCwfnqYt0I/gEAVgozg1cW6lLh OzGH82ccC97ndeWyZlCFSkLYk/hBU67UvV3eXM72X8R08lcdzpraIw6H8YCWiA== 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=1745939053; 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=e6vnSjxLg/QVr8ydPUpAuwpHcrrAMsMuWna+WA+Vht0=; b=NoaAEx+uE1ANWAzpfuO5ds41vWUH+V24DSzNyHX08f0OrYUHK4Qfi+m7nAM0sUzwU/1oyO JBW9/ebDanTW5/TX5K2g55p8xPR3Q+QVN61giV07gD8N/4r/F5JoXU/BFAtTFsqYqGBY8f lNWEmNGW5cQP8T+1OLZ/fr79EVBp5jF59FoG7n5Q2I8wE6VfhsWGTO04BJ7NBBhHTHdWNI mbzn50HIyl2+G7UjuCQ3ZEINRnlVwxWv7NQqBecewUkWmW9ZyFXTekUdJQj3MlqchhYYLg zxjsyVS1pQfExhHu8I4vLQRz+5fcOfgVKixnhmKznUCP05V4MvPWsOLs92VUmQ== 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 4Zn3W14hz8z9Rv; Tue, 29 Apr 2025 15:04:13 +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 53TF4DJS035569; Tue, 29 Apr 2025 15:04:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53TF4DsR035566; Tue, 29 Apr 2025 15:04:13 GMT (envelope-from git) Date: Tue, 29 Apr 2025 15:04:13 GMT Message-Id: <202504291504.53TF4DsR035566@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: 2889b8b22ae7 - main - deskutils/calibre: Add patch to fix build with Qt 6.9 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2889b8b22ae79dc4ff2823fe442200a1a476f8a4 Auto-Submitted: auto-generated The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=2889b8b22ae79dc4ff2823fe442200a1a476f8a4 commit 2889b8b22ae79dc4ff2823fe442200a1a476f8a4 Author: Guido Falsi AuthorDate: 2025-04-29 14:56:15 +0000 Commit: Guido Falsi CommitDate: 2025-04-29 14:56:15 +0000 deskutils/calibre: Add patch to fix build with Qt 6.9 While here refresh patches. PR: 286051 --- deskutils/calibre/files/patch-setup_build.py | 4 ++-- deskutils/calibre/files/patch-setup_iso__codes.py | 4 ++-- .../calibre/files/patch-src_calibre_gui2_____init____.py | 11 +++++++++++ deskutils/calibre/files/patch-src_calibre_linux.py | 12 ++++++------ 4 files changed, 21 insertions(+), 10 deletions(-) diff --git a/deskutils/calibre/files/patch-setup_build.py b/deskutils/calibre/files/patch-setup_build.py index e3e05d0f22ea..d2e31e3be30a 100644 --- a/deskutils/calibre/files/patch-setup_build.py +++ b/deskutils/calibre/files/patch-setup_build.py @@ -1,6 +1,6 @@ ---- setup/build.py.orig 2023-12-15 00:57:56 UTC +--- setup/build.py.orig 2025-04-18 03:14:01 UTC +++ setup/build.py -@@ -703,6 +703,7 @@ sip-file = {os.path.basename(sipf)!r} +@@ -701,6 +701,7 @@ sip-file = {os.path.basename(sipf)!r} include-dirs = {ext.inc_dirs} qmake-QT = {ext.qt_modules} sip-file = {os.path.basename(sipf)!r} diff --git a/deskutils/calibre/files/patch-setup_iso__codes.py b/deskutils/calibre/files/patch-setup_iso__codes.py index 1dece69c176c..e23074d72157 100644 --- a/deskutils/calibre/files/patch-setup_iso__codes.py +++ b/deskutils/calibre/files/patch-setup_iso__codes.py @@ -1,4 +1,4 @@ ---- setup/iso_codes.py.orig 2024-07-31 01:47:58 UTC +--- setup/iso_codes.py.orig 2025-04-18 03:14:01 UTC +++ setup/iso_codes.py @@ -2,6 +2,7 @@ import fnmatch # License: GPLv3 Copyright: 2023, Kovid Goyal @@ -10,7 +10,7 @@ import shutil @@ -24,40 +25,60 @@ class ISOData(Command): description = 'Get ISO codes name localization data' - top_level_filename = 'iso-codes-main' + top_level_filename = 'iso-codes-main' _zip_data = None + extracted = False diff --git a/deskutils/calibre/files/patch-src_calibre_gui2_____init____.py b/deskutils/calibre/files/patch-src_calibre_gui2_____init____.py new file mode 100644 index 000000000000..1558a1a4702c --- /dev/null +++ b/deskutils/calibre/files/patch-src_calibre_gui2_____init____.py @@ -0,0 +1,11 @@ +--- src/calibre/gui2/__init__.py.orig 2025-04-18 03:14:01 UTC ++++ src/calibre/gui2/__init__.py +@@ -1619,6 +1619,8 @@ def ensure_app(headless=True): + has_headless = ismacos or islinux or isbsd + if headless and has_headless: + args += ['-platformpluginpath', plugins_loc, '-platform', os.environ.get('CALIBRE_HEADLESS_PLATFORM', 'headless')] ++ if isbsd: ++ os.environ['QTWEBENGINE_CHROMIUM_FLAGS'] = '--disable-gpu' + if ismacos: + os.environ['QT_MAC_DISABLE_FOREGROUND_APPLICATION_TRANSFORM'] = '1' + if headless and iswindows: diff --git a/deskutils/calibre/files/patch-src_calibre_linux.py b/deskutils/calibre/files/patch-src_calibre_linux.py index d1a8db112ff4..e75706872eac 100644 --- a/deskutils/calibre/files/patch-src_calibre_linux.py +++ b/deskutils/calibre/files/patch-src_calibre_linux.py @@ -1,6 +1,6 @@ ---- src/calibre/linux.py.orig 2023-12-15 00:57:56 UTC +--- src/calibre/linux.py.orig 2025-04-18 03:14:01 UTC +++ src/calibre/linux.py -@@ -1108,7 +1108,7 @@ TryExec=ebook-viewer +@@ -1111,7 +1111,7 @@ TryExec=ebook-viewer GenericName=Viewer for E-books Comment=Viewer for E-books in all the major formats TryExec=ebook-viewer @@ -8,8 +8,8 @@ +Exec=ebook-viewer %f Icon=calibre-viewer Categories=Office;Viewer; - ''' -@@ -1121,7 +1121,7 @@ TryExec=ebook-edit + Keywords=epub;ebook;viewer; +@@ -1125,7 +1125,7 @@ TryExec=ebook-edit GenericName=Editor for E-books Comment=Edit E-books in various formats TryExec=ebook-edit @@ -17,8 +17,8 @@ +Exec=ebook-edit %f Icon=calibre-ebook-edit Categories=Office;WordProcessor - ''' -@@ -1134,7 +1134,7 @@ TryExec=calibre + Keywords=epub;ebook;editor; +@@ -1139,7 +1139,7 @@ TryExec=calibre GenericName=E-book library management Comment=E-book library management: Convert, view, share, catalogue all your e-books TryExec=calibre