[Pkg-xfce-commits] [Git][xfce-extras-team/lightdm][debian/master] 5 commits: d/patch: add upstream patch for 64b time_t build failure
Yves-Alexis Perez (@corsac)
gitlab at salsa.debian.org
Fri Apr 19 15:10:03 BST 2024
Yves-Alexis Perez pushed to branch debian/master at Xfce external packages / lightdm
Commits:
a5948981 by Yves-Alexis Perez at 2024-04-19T12:35:36+02:00
d/patch: add upstream patch for 64b time_t build failure
Closes: #1067561
- - - - -
791572b8 by Yves-Alexis Perez at 2024-04-19T14:26:07+02:00
d/control: replace pkg-config build-dep by pkgconf
- - - - -
02a78d06 by Yves-Alexis Perez at 2024-04-19T15:34:19+02:00
d/gir1.2-lightdm-1.install: move typelib to multi-arch dir
- - - - -
571e20b1 by Yves-Alexis Perez at 2024-04-19T15:34:26+02:00
finalize changelog
- - - - -
a3b5e33a by Yves-Alexis Perez at 2024-04-19T15:34:44+02:00
upload lightdm 1.32.0-5 to unstable
- - - - -
6 changed files:
- debian/changelog
- debian/control
- debian/gir1.2-lightdm-1.install
- + debian/patches/0007-Fix-tests-failing-on-32-bit-architectures-using-64-b.patch
- − debian/patches/09_time64-t-fix-for-arm-32bit.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+lightdm (1.32.0-5) unstable; urgency=medium
+
+ * d/patch: add upstream patch for 64b time_t build failure (Closes: #1067561)
+ * d/control: replace pkg-config build-dep by pkgconf
+ * d/gir1.2-lightdm-1.install: move typelib to multi-arch dir
+ * Upload to unstable
+
+ -- Yves-Alexis Perez <corsac at debian.org> Fri, 19 Apr 2024 15:34:32 +0200
+
lightdm (1.32.0-5~exp1) experimental; urgency=medium
* Non-maintainer upload to experimental.
=====================================
debian/control
=====================================
@@ -17,7 +17,7 @@ Build-Depends: debhelper-compat (= 13),
libxcb1-dev,
libxdmcp-dev,
libxklavier-dev,
- pkg-config,
+ pkgconf,
qtbase5-dev,
valac,
yelp-tools
=====================================
debian/gir1.2-lightdm-1.install
=====================================
@@ -1 +1 @@
-usr/lib/*/girepository-1.0 /usr/lib/
+usr/lib/*/girepository-1.0
=====================================
debian/patches/0007-Fix-tests-failing-on-32-bit-architectures-using-64-b.patch
=====================================
@@ -0,0 +1,65 @@
+From: Robert Ancell <robert.ancell at canonical.com>
+Date: Fri, 19 Apr 2024 09:13:59 +1200
+Subject: Fix tests failing on 32 bit architectures using 64 bit time
+ handling.
+
+open/creat/stat are aliases to the 64 bit versions when this is enabled and
+LightDM was therefore defining them twice.
+
+Fixes https://github.com/canonical/lightdm/issues/352
+---
+ tests/src/libsystem.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/tests/src/libsystem.c b/tests/src/libsystem.c
+index 1c68dc1..ebb60e7 100644
+--- a/tests/src/libsystem.c
++++ b/tests/src/libsystem.c
+@@ -242,6 +242,7 @@ open_wrapper (const char *func, const char *pathname, int flags, mode_t mode)
+ return _open (new_path, flags, mode);
+ }
+
++#ifndef __USE_FILE_OFFSET64
+ int
+ open (const char *pathname, int flags, ...)
+ {
+@@ -255,6 +256,7 @@ open (const char *pathname, int flags, ...)
+ }
+ return open_wrapper ("open", pathname, flags, mode);
+ }
++#endif
+
+ int
+ open64 (const char *pathname, int flags, ...)
+@@ -288,6 +290,7 @@ unlinkat (int dirfd, const char *pathname, int flags)
+ return _unlinkat (dirfd, new_path, flags);
+ }
+
++#ifndef __USE_FILE_OFFSET64
+ int
+ creat (const char *pathname, mode_t mode)
+ {
+@@ -296,6 +299,7 @@ creat (const char *pathname, mode_t mode)
+ g_autofree gchar *new_path = redirect_path (pathname);
+ return _creat (new_path, mode);
+ }
++#endif
+
+ int
+ creat64 (const char *pathname, mode_t mode)
+@@ -320,6 +324,7 @@ access (const char *pathname, int mode)
+ return _access (new_path, mode);
+ }
+
++#ifndef __USE_FILE_OFFSET64
+ int
+ stat (const char *path, struct stat *buf)
+ {
+@@ -328,6 +333,7 @@ stat (const char *path, struct stat *buf)
+ g_autofree gchar *new_path = redirect_path (path);
+ return _stat (new_path, buf);
+ }
++#endif
+
+ int
+ stat64 (const char *path, struct stat64 *buf)
=====================================
debian/patches/09_time64-t-fix-for-arm-32bit.patch deleted
=====================================
@@ -1,15 +0,0 @@
-Description: Fix FTBFS: Error: symbol `open64' is already defined.
-Author: Andrey Rakhmatullin <wrar at debian.org>
-
---- a/tests/src/libsystem.c
-+++ b/tests/src/libsystem.c
-@@ -1,6 +1,9 @@
- #define _GNU_SOURCE
- #define __USE_GNU
-
-+#undef _FILE_OFFSET_BITS
-+#undef _TIME_BITS
-+
- #include <config.h>
-
- #include <stdlib.h>
=====================================
debian/patches/series
=====================================
@@ -4,4 +4,4 @@
06_change-user-dirs.patch
08_reset-SIGPIPE-before-exec.patch
0006-Add-ICEAuthority-file-to-the-AppArmor-profile-for-gu.patch
-09_time64-t-fix-for-arm-32bit.patch
+0007-Fix-tests-failing-on-32-bit-architectures-using-64-b.patch
View it on GitLab: https://salsa.debian.org/xfce-extras-team/lightdm/-/compare/3371f7da9efc1d34327f4d406fc4c02db265131d...a3b5e33ab42741cd1fe42b1313634e7f817a8389
--
View it on GitLab: https://salsa.debian.org/xfce-extras-team/lightdm/-/compare/3371f7da9efc1d34327f4d406fc4c02db265131d...a3b5e33ab42741cd1fe42b1313634e7f817a8389
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/20240419/70fdafe5/attachment-0001.htm>
More information about the Pkg-xfce-commits
mailing list