[packages/calibre] add upstream patch to fix build with icu >= 75

atler atler at pld-linux.org
Tue Jan 21 12:44:19 CET 2025


commit 201a8f67c7f2c73187a8e7924dc044884063db39
Author: Jan Palus <atler at pld-linux.org>
Date:   Tue Jan 21 11:40:03 2025 +0100

    add upstream patch to fix build with icu >= 75

 calibre.spec | 12 +++++++-----
 icu75.patch  | 22 ++++++++++++++++++++++
 2 files changed, 29 insertions(+), 5 deletions(-)
---
diff --git a/calibre.spec b/calibre.spec
index c30ac71..066e568 100644
--- a/calibre.spec
+++ b/calibre.spec
@@ -24,6 +24,7 @@ Patch1:		%{name}-locales.patch
 Patch2:		shebang-python-fix.patch
 Patch3:		desktop-integration.patch
 Patch4:		%{name}-env_module.patch
+Patch5:		icu75.patch
 %define		baeutifulsoup_ver 3.0.5
 %define		pil_ver 1.1.6
 %define		pyqt6_ver 6.3.1
@@ -175,11 +176,12 @@ Pakiet ten dostarcza uzupełnianie nazw dla calibre w powłoce zsh.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+%patch -P0 -p1
+%patch -P1 -p1
+%patch -P2 -p1
+%patch -P3 -p1
+%patch -P4 -p1
+%patch -P5 -p1
 
 # 64bit target build fix
 %{__sed} -i -e "s!'/usr/lib'!'%{_libdir}'!g" setup/build_environment.py
diff --git a/icu75.patch b/icu75.patch
new file mode 100644
index 0000000..dcdde31
--- /dev/null
+++ b/icu75.patch
@@ -0,0 +1,22 @@
+From a3d3d8d33e314ccabb5099e78e4056a79b7c9aa2 Mon Sep 17 00:00:00 2001
+From: Kovid Goyal <kovid at kovidgoyal.net>
+Date: Mon, 20 May 2024 08:13:34 +0530
+Subject: [PATCH] Apparently we need --std=c++17 to compile against libicu 75.1
+
+---
+ setup/extensions.json | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup/extensions.json b/setup/extensions.json
+index 38c268520b05..742a6273c363 100644
+--- a/setup/extensions.json
++++ b/setup/extensions.json
+@@ -82,7 +82,7 @@
+         "name": "sqlite_extension",
+         "headers": "calibre/utils/cpp_binding.h",
+         "sources": "calibre/db/sqlite_extension.cpp",
+-		"needs_c++": "14",
++		"needs_c++": "17",
+         "libraries": "icudata icui18n icuuc icuio stemmer",
+         "windows_libraries": "icudt icuin icuuc icuio libstemmer",
+         "lib_dirs": "!icu_lib_dirs",
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/calibre.git/commitdiff/deaf957c6ed6d4dd7116979e05f87d734d61a606



More information about the pld-cvs-commit mailing list