[packages/kde4-calligra] - add bcond to disable docs, building is broken on i686

baggins baggins at pld-linux.org
Mon Nov 15 09:29:02 CET 2021


commit 3212c849d8baa50ea4950dd3384d2bf49809d439
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Nov 15 09:28:29 2021 +0100

    - add bcond to disable docs, building is broken on i686

 kde4-calligra.spec | 3 +++
 no-doc.patch       | 9 +++++++++
 2 files changed, 12 insertions(+)
---
diff --git a/kde4-calligra.spec b/kde4-calligra.spec
index 9b790a4..e5bc5a3 100644
--- a/kde4-calligra.spec
+++ b/kde4-calligra.spec
@@ -17,6 +17,7 @@
 # Conditional build:
 %bcond_without	pdf		# build without PDF support
 %bcond_without	pqxx		# build postgresql driver for kexi
+%bcond_without	doc		# build handbooks
 
 %define		_state		stable
 %define		orgname		calligra
@@ -39,6 +40,7 @@ Patch2:		%{orgname}-icu.patch
 Patch3:		%{orgname}-boost.patch
 Patch4:		build.patch
 Patch5:		gcc11.patch
+Patch6:		no-doc.patch
 URL:		http://www.calligra-suite.org/
 BuildRequires:	GraphicsMagick-devel
 BuildRequires:	OpenColorIO-devel
@@ -384,6 +386,7 @@ the Plasma Active platform.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%{!?with_doc:%patch6 -p1}
 
 %build
 install -d build
diff --git a/no-doc.patch b/no-doc.patch
new file mode 100644
index 0000000..92bd6ad
--- /dev/null
+++ b/no-doc.patch
@@ -0,0 +1,9 @@
+--- calligra-2.9.11/cmake/productsets/desktop.cmake~	2016-02-02 20:53:13.000000000 +0100
++++ calligra-2.9.11/cmake/productsets/desktop.cmake	2021-11-15 09:23:34.884800706 +0100
+@@ -21,6 +21,4 @@
+         APP_CONVERTER
+         FILEMANAGER
+         OKULAR
+-        # docs
+-        DOC
+ )
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kde4-calligra.git/commitdiff/3212c849d8baa50ea4950dd3384d2bf49809d439



More information about the pld-cvs-commit mailing list