[packages/cairo] Drop dead options.

arekm arekm at pld-linux.org
Sun Aug 23 12:37:39 CEST 2026


commit f735743382cd370e62cc5f3f7c0aeeba3109f9cb
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sun Aug 23 12:36:39 2026 +0200

    Drop dead options.

 cairo.spec | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/cairo.spec b/cairo.spec
index 087354c..19b6ac1 100644
--- a/cairo.spec
+++ b/cairo.spec
@@ -1,8 +1,6 @@
 #
 # Conditional build:
 %bcond_without	apidocs		# disable gtk-doc
-%bcond_without	pdf		# PDF surface backend
-%bcond_without	svg		# SVG surface backend
 %bcond_without	xcb		# XCB backend
 %bcond_with	tests		# perform tests (can fail due to out of memory)
 %bcond_without	static_libs	# static libraries
@@ -11,7 +9,7 @@ Summary:	Cairo - multi-platform 2D graphics library
 Summary(pl.UTF-8):	Cairo - wieloplatformowa biblioteka graficzna 2D
 Name:		cairo
 Version:	1.18.4
-Release:	3
+Release:	4
 License:	LGPL v2.1 or MPL v1.1
 Group:		Libraries
 Source0:	https://www.cairographics.org/releases/%{name}-%{version}.tar.xz
@@ -26,10 +24,13 @@ BuildRequires:	fonttools
 # pkgconfig(freetype2) >= 25.0.19
 BuildRequires:	freetype-devel >= 1:2.13.0
 BuildRequires:	gcc >= 6:4.7
+%if %{with tests}
+BuildRequires:	ghostscript
+%endif
 BuildRequires:	glib2-devel >= 1:2.14
 %{?with_apidocs:BuildRequires:	gtk-doc >= 1.15}
 BuildRequires:	libpng-devel >= 2:1.4.0
-%if %{with svg} && %{with tests}
+%if %{with tests}
 BuildRequires:	librsvg-devel >= 2.35.0
 %endif
 %if %{with tests}
@@ -41,7 +42,7 @@ BuildRequires:	meson >= 1.3.0
 BuildRequires:	ninja >= 1.5
 BuildRequires:	pixman-devel >= 0.42.3
 BuildRequires:	pkgconfig >= 1:0.18
-%if %{with pdf} && %{with tests}
+%if %{with tests}
 BuildRequires:	poppler-glib-devel >= 0.17.4
 %endif
 BuildRequires:	rpm >= 4.4.9-56
@@ -204,7 +205,7 @@ Dokumentacja API Cairo.
 	-Dspectre=%{__enabled_disabled tests} \
 	-Dsymbol-lookup=enabled \
 	-Dtee=enabled \
-	-Dtests=disabled \
+	-Dtests=%{__enabled_disabled tests} \
 	-Dxcb=%{__enabled_disabled xcb} \
 	-Dxlib=enabled \
 	-Dzlib=enabled
@@ -248,12 +249,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_pkgconfigdir}/cairo.pc
 %{_pkgconfigdir}/cairo-fc.pc
 %{_pkgconfigdir}/cairo-ft.pc
-%{?with_pdf:%{_pkgconfigdir}/cairo-pdf.pc}
+%{_pkgconfigdir}/cairo-pdf.pc
 %{_pkgconfigdir}/cairo-png.pc
 %{_pkgconfigdir}/cairo-ps.pc
 %{_pkgconfigdir}/cairo-script.pc
 %{_pkgconfigdir}/cairo-script-interpreter.pc
-%{?with_svg:%{_pkgconfigdir}/cairo-svg.pc}
+%{_pkgconfigdir}/cairo-svg.pc
 %{_pkgconfigdir}/cairo-tee.pc
 %{?with_xcb:%{_pkgconfigdir}/cairo-xcb.pc}
 %{?with_xcb:%{_pkgconfigdir}/cairo-xcb-shm.pc}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/cairo.git/commitdiff/f735743382cd370e62cc5f3f7c0aeeba3109f9cb



More information about the pld-cvs-commit mailing list