[Pkg-xfce-commits] [Git][xfce-team/desktop/xfce4-settings][debian/master] 2 commits: Make it possible to build again on non-Linux platforms:

[Yves-Alexis Perez (@corsac)]

Yves-Alexis Perez pushed to branch debian/master at xfce / desktop / xfce4-settings


Commits:
94bf2e22 by Pino Toscano at 2025-10-04T19:20:47+02:00
Make it possible to build again on non-Linux platforms:

- limit the libcolord-dev, libgtk-layer-shell-dev, libwayland-dev,
  and xserver-xorg-input-libinput-dev build dependencies as linux-any,
  as they are all Linux-specific bits
- pass --enable-colord to configure only on Linux (matching the build
  dependency)

Gbp-Dch: Full

- - - - -
df68640d by Yves-Alexis Perez at 2025-10-20T06:42:52+00:00
Merge branch 'non-linux' into 'debian/master'

Make it possible to build again on non-Linux platforms

See merge request xfce-team/desktop/xfce4-settings!4
- - - - -


2 changed files:

- debian/control
- debian/rules


Changes:

=====================================
debian/control
=====================================
@@ -5,13 +5,13 @@ Maintainer: Debian Xfce Maintainers <debian-xfce at lists.debian.org>
 Uploaders: Yves-Alexis Perez <corsac at debian.org>
 Build-Depends: debhelper-compat (= 13),
                gettext,
-               libcolord-dev,
+               libcolord-dev [linux-any],
                libexo-2-dev,
                libgarcon-1-dev,
                libgtk-3-dev,
-               libgtk-layer-shell-dev,
+               libgtk-layer-shell-dev [linux-any],
                libnotify-dev,
-               libwayland-dev,
+               libwayland-dev [linux-any],
                libxcursor-dev,
                libxfce4ui-2-dev (>= 4.19.5),
                libxfce4util-dev (>= 4.17.2),
@@ -20,7 +20,7 @@ Build-Depends: debhelper-compat (= 13),
                libxml2-utils,
                libxrandr-dev,
                xfce4-dev-tools,
-               xserver-xorg-input-libinput-dev
+               xserver-xorg-input-libinput-dev [linux-any],
 Rules-Requires-Root: no
 Standards-Version: 4.7.0
 Homepage: https://docs.xfce.org/xfce/xfce4-settings/start


=====================================
debian/rules
=====================================
@@ -2,19 +2,24 @@
 
 export DEB_LDFLAGS_MAINT_APPEND=-Wl,-O1 -Wl,-z,defs
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+include /usr/share/dpkg/architecture.mk
+
+ifeq (linux,$(DEB_HOST_ARCH_OS))
+    EXTRA_CONFIGURE_ARGS += --enable-colord
+endif
 
 %:
 	dh $@
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-		--enable-colord \
 		--enable-libnotify \
 		--enable-libxklavier \
 		--enable-pluggable-dialogs \
 		--enable-sound-settings \
 		--enable-xcursor \
-		--with-helper-path-prefix=/usr/share
+		--with-helper-path-prefix=/usr/share \
+		$(EXTRA_CONFIGURE_ARGS)
 
 execute_after_dh_auto_install:
 	# Debianise helpers



View it on GitLab: https://salsa.debian.org/xfce-team/desktop/xfce4-settings/-/compare/806b201062d3cc184cfc84c505267decc1fa01b7...df68640dc2bbfe9268d72cce0457233ffc158073

-- 
View it on GitLab: https://salsa.debian.org/xfce-team/desktop/xfce4-settings/-/compare/806b201062d3cc184cfc84c505267decc1fa01b7...df68640dc2bbfe9268d72cce0457233ffc158073
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-xfce-commits/attachments/20251020/92e47cd5/attachment-0001.htm>