[neon/backports-noble/poppler-noble/Neon/unstable] debian: hack to remove conflicting /usr/bin/curl-config file

Carlos De Maine null at kde.org
Fri Jun 12 01:23:05 BST 2026


Git commit 309199461e60a078b2ce4a3477813ef914e472d8 by Carlos De Maine.
Committed on 12/06/2026 at 00:23.
Pushed by carlosdem into branch 'Neon/unstable'.

hack to remove conflicting /usr/bin/curl-config file

M  +1    -1    debian/control
M  +7    -2    debian/rules

https://invent.kde.org/neon/backports-noble/poppler-noble/-/commit/309199461e60a078b2ce4a3477813ef914e472d8

diff --git a/debian/control b/debian/control
index 3748cfc..e034330 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13),
                dh-sequence-gir,
                cmake,
                libboost-dev (>= 1.71.0),
-               libcurl4-gnutls-dev [!i386],
+               libcurl4-gnutls-dev,
                libglib2.0-dev (>= 2.64),
                libfontconfig-dev,
                libcairo2-dev (>= 1.16.0),
diff --git a/debian/rules b/debian/rules
index a9415a1..706d51b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,6 @@ CONFIGURE_ARGS :=				\
 	-DENABLE_GLIB=ON			\
 	-DENABLE_QT5=ON				\
 	-DENABLE_CPP=ON				\
-	-DENABLE_GTK_DOC=$(if $(filter libpoppler-glib-doc,$(shell dh_listpackages)),ON,OFF) \
 	-DENABLE_UNSTABLE_API_ABI_HEADERS=ON	\
 	-DENABLE_CMS=lcms2			\
 	-DENABLE_LIBOPENJPEG=openjpeg2		\
@@ -33,13 +32,19 @@ CONFIGURE_ARGS += -DENABLE_QT6=OFF
 endif
 
 ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
-CONFIGURE_ARGS += -DENABLE_LIBCURL=OFF
+CONFIGURE_ARGS += -DENABLE_GTK_DOC=OFF
+else
+CONFIGURE_ARGS += -DENABLE_GTK_DOC=ON
 endif
+
 %:
 	dh $@
 
 override_dh_auto_clean:
 	cp ../poppler-poppler_24.08.0.orig.tar.gz ../poppler_24.08.0.orig.tar.gz
+	ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
+	rm /usr/bin/curl-config
+	endif
 	dh_auto_clean
 	rm -f glib/reference/html/*
 	rm -f $(SYMBOLS_generated)


More information about the Neon-commits mailing list