git: 2889b8b22ae7 - main - deskutils/calibre: Add patch to fix build with Qt 6.9
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 29 Apr 2025 15:04:13 UTC
The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=2889b8b22ae79dc4ff2823fe442200a1a476f8a4 commit 2889b8b22ae79dc4ff2823fe442200a1a476f8a4 Author: Guido Falsi <madpilot@FreeBSD.org> AuthorDate: 2025-04-29 14:56:15 +0000 Commit: Guido Falsi <madpilot@FreeBSD.org> 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 <kovid at kovidgoyal.net> @@ -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