Bug#1052381: gdm3 FTBFS when systemdsystemunitdir changes in systemd.pc

[Helmut Grohne]

Source: gdm3
Version: 45~beta-1
Severity: normal
Tags: ftbfs patch
User: helmutg at debian.org
Usertags: dep17m2

We want to change the value of systemdsystemunitdir in systemd.pc. The
gdm3 upstream build system consumes this value, but the Debian packaging
hard codes its current value. Consequently, gdm3 will FTBFS when the
value changes. Consider applying the attached patch to avoid that from
happening.

Helmut
-------------- next part --------------
diff -Nru gdm3-45~beta/debian/changelog gdm3-45~beta/debian/changelog
--- gdm3-45~beta/debian/changelog	2023-09-07 15:28:08.000000000 +0200
+++ gdm3-45~beta/debian/changelog	2023-09-21 08:16:20.000000000 +0200
@@ -1,3 +1,10 @@
+gdm3 (45~beta-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Do not FTBFS when systemdsystemunitdir changes in systemd.pc. (Closes: #-1)
+
+ -- Helmut Grohne <helmut at subdivi.de>  Thu, 21 Sep 2023 08:16:20 +0200
+
 gdm3 (45~beta-1) unstable; urgency=medium
 
   * New upstream release
diff -Nru gdm3-45~beta/debian/control gdm3-45~beta/debian/control
--- gdm3-45~beta/debian/control	2023-09-07 15:28:08.000000000 +0200
+++ gdm3-45~beta/debian/control	2023-09-21 08:15:11.000000000 +0200
@@ -40,7 +40,9 @@
                libxcb1-dev,
                libxdmcp-dev,
                meson (>= 0.57),
+               pkgconf,
                systemd,
+               systemd-dev,
                udev [linux-any]
 Standards-Version: 4.6.2
 Vcs-Browser: https://salsa.debian.org/gnome-team/gdm
diff -Nru gdm3-45~beta/debian/gdm3.install gdm3-45~beta/debian/gdm3.install
--- gdm3-45~beta/debian/gdm3.install	2023-09-07 15:28:08.000000000 +0200
+++ gdm3-45~beta/debian/gdm3.install	2023-09-21 08:16:20.000000000 +0200
@@ -3,9 +3,9 @@
 etc/dbus-1/system.d/gdm.conf		usr/share/dbus-1/system.d
 etc/gdm3/*
 
-lib/systemd/
+${systemdsystemunitdir}
 usr/lib/systemd/
-[linux-any] lib/udev
+[linux-any] ${udevdir}
 lib/${DEB_HOST_MULTIARCH}/security/*.so
 usr/bin/gdm-screenshot
 usr/libexec/gdm-*
diff -Nru gdm3-45~beta/debian/gdm3.links gdm3-45~beta/debian/gdm3.links
--- gdm3-45~beta/debian/gdm3.links	2023-09-07 15:28:08.000000000 +0200
+++ gdm3-45~beta/debian/gdm3.links	2023-09-21 08:16:20.000000000 +0200
@@ -1,2 +1,2 @@
 etc/gdm3/greeter.dconf-defaults usr/share/gdm/dconf/90-debian-settings
-lib/systemd/system/gdm.service lib/systemd/system/gdm3.service
+${env:systemdsystemunitdir}/gdm.service ${env:systemdsystemunitdir}/gdm3.service
diff -Nru gdm3-45~beta/debian/rules gdm3-45~beta/debian/rules
--- gdm3-45~beta/debian/rules	2023-09-07 15:28:08.000000000 +0200
+++ gdm3-45~beta/debian/rules	2023-09-21 08:16:20.000000000 +0200
@@ -7,6 +7,9 @@
 
 built_binaries := $(shell dh_listpackages)
 
+export systemdsystemunitdir = $(shell pkgconf --variable=systemdsystemunitdir systemd | sed s,^/,,)
+export udevdir = $(shell pkgconf --variable=udevdir udev | sed s,^/,,)
+
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs