[Pkg-xfce-commits] [Git][xfce-extras-team/lightdm][debian/master] 6 commits: d/p/10_fix-build-glibc-2.33.patch: Fix FTBFS with glibc 2.33.

Unit 193 (@unit193) gitlab at salsa.debian.org
Tue Jan 11 09:54:09 GMT 2022



Unit 193   pushed to branch debian/master at Xfce external packages / lightdm


Commits:
5e20a301 by handsome_feng at 2022-01-11T04:42:31-05:00
d/p/10_fix-build-glibc-2.33.patch: Fix FTBFS with glibc 2.33.

Closes: #1002132

- - - - -
68d9a7cb by Unit 193 at 2022-01-11T04:43:42-05:00
d/control: Bump dh compat to 13.

- - - - -
5fa115c6 by Unit 193 at 2022-01-11T04:44:32-05:00
d/control: R³: no

- - - - -
0d97c5f8 by Unit 193 at 2022-01-11T04:45:07-05:00
d/rules: Drop '--as-needed' as it is now default in stable.

- - - - -
decde344 by Unit 193 at 2022-01-11T04:49:14-05:00
Update Standards-Version to 4.6.0.

- - - - -
8aeb9bb4 by Unit 193 at 2022-01-11T04:53:40-05:00
Update changelog for release.

- - - - -


5 changed files:

- debian/changelog
- debian/control
- + debian/patches/10_fix-build-glibc-2.33.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,20 @@
+lightdm (1.26.0-8) unstable; urgency=medium
+
+  * Team upload.
+
+  [ handsome_feng ]
+  * d/p/10_fix-build-glibc-2.33.patch: Fix FTBFS with glibc 2.33.
+    (Closes: #1002132)
+
+  [ Unit 193 ]
+  * d/control:
+    - Bump dh compat to 13.
+    - R³: no
+  * d/rules: Drop '--as-needed' as it is now default in stable.
+  * Update Standards-Version to 4.6.0.
+
+ -- Unit 193 <unit193 at debian.org>  Tue, 11 Jan 2022 04:49:23 -0500
+
 lightdm (1.26.0-7) unstable; urgency=medium
 
   [ Debian Janitor ]


=====================================
debian/control
=====================================
@@ -3,7 +3,7 @@ Section: x11
 Priority: optional
 Maintainer: Debian Xfce Maintainers <debian-xfce at lists.debian.org>
 Uploaders: Yves-Alexis Perez <corsac at debian.org>
-Build-Depends: debhelper-compat (= 12),
+Build-Depends: debhelper-compat (= 13),
                dpkg-dev (>= 1.16.1),
                gobject-introspection,
                gtk-doc-tools,
@@ -22,7 +22,8 @@ Build-Depends: debhelper-compat (= 12),
                qtbase5-dev,
                valac,
                yelp-tools
-Standards-Version: 4.5.0
+Rules-Requires-Root: no
+Standards-Version: 4.6.0
 Homepage: https://launchpad.net/lightdm
 Vcs-Git: https://salsa.debian.org/xfce-extras-team/lightdm.git
 Vcs-Browser: https://salsa.debian.org/xfce-extras-team/lightdm


=====================================
debian/patches/10_fix-build-glibc-2.33.patch
=====================================
@@ -0,0 +1,55 @@
+From: Martin Liska <mliska at suse.cz>
+Date: Thu, 4 Feb 2021 11:18:05 +0100
+Subject: [PATCH] Glibc 2.33 fix.
+
+The library does not declare __fxstatat64 and friends in a header file.
+Thus the following warning appears:
+
+```
+libsystem.c:333:1: error: no previous prototype for '__xstat' [-Werror=missing-prototypes]
+  333 | __xstat (int version, const char *path, struct stat *buf)
+      | ^~~~~~~
+libsystem.c:342:1: error: no previous prototype for '__xstat64' [-Werror=missing-prototypes]
+  342 | __xstat64 (int version, const char *path, struct stat64 *buf)
+      | ^~~~~~~~~
+libsystem.c:351:1: error: no previous prototype for '__fxstatat' [-Werror=missing-prototypes]
+  351 | __fxstatat(int ver, int dirfd, const char *pathname, struct stat *buf, int flags)
+      | ^~~~~~~~~~
+libsystem.c:360:1: error: no previous prototype for '__fxstatat64' [-Werror=missing-prototypes]
+  360 | __fxstatat64(int ver, int dirfd, const char *pathname, struct stat64 *buf, int flags)
+      | ^~~~~~~~~~~~
+```
+
+Fixed #167.
+
+Origin: upstream, https://github.com/canonical/lightdm/commit/270b3bfcf84939ab2d71db3f3470cffd36816852
+Bug-Debian: https://bugs.debian.org/1002132
+
+---
+ tests/src/libsystem.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/tests/src/libsystem.c b/tests/src/libsystem.c
+index b47b4523..aed3b8cf 100644
+--- a/tests/src/libsystem.c
++++ b/tests/src/libsystem.c
+@@ -329,6 +329,10 @@ stat64 (const char *path, struct stat64 *buf)
+     return _stat64 (new_path, buf);
+ }
+ 
++// glibc 2.33 and newer does not declare these functions in a header file
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Wmissing-prototypes"
++
+ int
+ __xstat (int version, const char *path, struct stat *buf)
+ {
+@@ -365,6 +369,8 @@ __fxstatat64(int ver, int dirfd, const char *pathname, struct stat64 *buf, int f
+     return ___fxstatat64 (ver, dirfd, new_path, buf, flags);
+ }
+ 
++#pragma GCC diagnostic pop
++
+ DIR *
+ opendir (const char *name)
+ {


=====================================
debian/patches/series
=====================================
@@ -5,3 +5,4 @@
 06_change-user-dirs.patch
 08_reset-SIGPIPE-before-exec.patch
 09_hide_systemd_nologin.patch
+10_fix-build-glibc-2.33.patch


=====================================
debian/rules
=====================================
@@ -3,7 +3,7 @@
 include /usr/share/dpkg/pkg-info.mk
 include /usr/share/dpkg/architecture.mk
 
-export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -Wl,-O1
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,-O1
 export DEB_CXXFLAGS_MAINT_APPEND=-fvisibility=hidden
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 



View it on GitLab: https://salsa.debian.org/xfce-extras-team/lightdm/-/compare/1562d76b9ce57fba4c66b23cfdf4185d4a8fbe53...8aeb9bb42c4fb6f29af90e9fabf58efba94b43f3

-- 
View it on GitLab: https://salsa.debian.org/xfce-extras-team/lightdm/-/compare/1562d76b9ce57fba4c66b23cfdf4185d4a8fbe53...8aeb9bb42c4fb6f29af90e9fabf58efba94b43f3
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/20220111/b285174f/attachment-0001.htm>


More information about the Pkg-xfce-commits mailing list