[Git][xorg-team/lib/waffle][debian-unstable] 4 commits: d/changelog: Start 1.8.1-2 changelog

Jordan Justen pushed to branch debian-unstable at X Strike Force / lib / waffle


Commits:
e5890207 by Jordan Justen at 2026-04-25T06:57:57-07:00
d/changelog: Start 1.8.1-2 changelog

Signed-off-by: Jordan Justen <[email protected]>

- - - - -
0a9feb6e by Jordan Justen at 2026-04-25T06:59:14-07:00
d/control: Standards-Version 4.7.0 => 4.7.4

Signed-off-by: Jordan Justen <[email protected]>

- - - - -
8d4bd39b by Jordan Justen at 2026-04-28T02:40:37-07:00
d/patches: Add patch from upstream for glibc 2.43 (Closes: #1128852)

Signed-off-by: Jordan Justen <[email protected]>

- - - - -
c0b6578c by Jordan Justen at 2026-04-28T02:45:50-07:00
d/changelog: Release 1.8.1-2 to unstable

Signed-off-by: Jordan Justen <[email protected]>

- - - - -


5 changed files:

- debian/changelog
- debian/control
- debian/patches/0001-debian-Patch-docbookx.dtd-url-to-local-file-path.patch
- + debian/patches/0002-c11-threads-fix-build-on-c23.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+waffle (1.8.1-2) unstable; urgency=medium
+
+  * d/control: Standards-Version 4.7.0 => 4.7.4
+  * d/patches: Add patch from upstream for glibc 2.43 (Closes: #1128852)
+
+ -- Jordan Justen <[email protected]>  Tue, 28 Apr 2026 02:44:58 -0700
+
 waffle (1.8.1-1) unstable; urgency=medium
 
   * New upstream release


=====================================
debian/control
=====================================
@@ -20,7 +20,7 @@ Build-Depends: bash-completion,
                python3-setuptools,
                wayland-protocols,
                xsltproc
-Standards-Version: 4.7.0
+Standards-Version: 4.7.4
 Rules-Requires-Root: no
 Homepage: https://waffle.freedesktop.org/
 Vcs-Git: https://salsa.debian.org/xorg-team/lib/waffle.git


=====================================
debian/patches/0001-debian-Patch-docbookx.dtd-url-to-local-file-path.patch
=====================================
@@ -67,7 +67,7 @@ index 16ca4b8..d611f61 100644
  <legalnotice>
    <para>
 diff --git a/man/waffle.7.xml b/man/waffle.7.xml
-index 5c6a34d..1f15e2c 100644
+index 2f6f63f..84d6bf3 100644
 --- a/man/waffle.7.xml
 +++ b/man/waffle.7.xml
 @@ -1,6 +1,6 @@
@@ -115,7 +115,7 @@ index 91fca9b..6caa281 100644
  <!--
    Copyright Intel 2012
 diff --git a/man/waffle_display.3.xml b/man/waffle_display.3.xml
-index 9896247..029ff68 100644
+index 87e76b2..0a89b19 100644
 --- a/man/waffle_display.3.xml
 +++ b/man/waffle_display.3.xml
 @@ -1,6 +1,6 @@
@@ -211,7 +211,7 @@ index eb7c5d8..db78b58 100644
  <!--
    Copyright Intel 2012
 diff --git a/man/waffle_init.3.xml b/man/waffle_init.3.xml
-index e443060..3cab311 100644
+index 67acfdb..1a55b6b 100644
 --- a/man/waffle_init.3.xml
 +++ b/man/waffle_init.3.xml
 @@ -1,6 +1,6 @@
@@ -307,7 +307,7 @@ index a150830..4c94f34 100644
  <!--
    Copyright Intel 2012
 diff --git a/man/wflinfo.1.xml b/man/wflinfo.1.xml
-index 2f54aaa..ea129d4 100644
+index 30327fc..d16b22d 100644
 --- a/man/wflinfo.1.xml
 +++ b/man/wflinfo.1.xml
 @@ -1,6 +1,6 @@


=====================================
debian/patches/0002-c11-threads-fix-build-on-c23.patch
=====================================
@@ -0,0 +1,50 @@
+From: Khem Raj <[email protected]>
+Date: Mon, 10 Nov 2025 19:20:22 -0800
+Subject: c11/threads: fix build on c23
+
+C23/glibc is now including once_init in stdlib.h
+
+https://patchwork.sourceware.org/project/glibc/patch/[email protected]/#213088
+
+Conditionally check if glibc already provided c23 definition via stdlib.h
+
+Signed-off-by: Khem Raj <[email protected]>
+(cherry picked from commit 6b3c46483844faba4dfe7dd90dc2b0cd06e67158)
+---
+ third_party/threads/threads.h       | 3 ++-
+ third_party/threads/threads_posix.c | 3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/third_party/threads/threads.h b/third_party/threads/threads.h
+index b4db50c..cdc7bea 100644
+--- a/third_party/threads/threads.h
++++ b/third_party/threads/threads.h
+@@ -102,8 +102,9 @@ typedef pthread_cond_t  cnd_t;
+ typedef pthread_t       thrd_t;
+ typedef pthread_key_t   tss_t;
+ typedef pthread_mutex_t mtx_t;
++#ifndef __once_flag_defined
+ typedef pthread_once_t  once_flag;
+-
++#endif
+ #else
+ #error Not supported on this platform.
+ #endif
+diff --git a/third_party/threads/threads_posix.c b/third_party/threads/threads_posix.c
+index bc50825..d93013b 100644
+--- a/third_party/threads/threads_posix.c
++++ b/third_party/threads/threads_posix.c
+@@ -75,11 +75,12 @@ static void *impl_thrd_routine(void *p)
+ 
+ /*--------------- 7.25.2 Initialization functions ---------------*/
+ // 7.25.2.1
++#ifndef __once_flag_defined
+ void call_once(once_flag *flag, void (*func)(void))
+ {
+     pthread_once(flag, func);
+ }
+-
++#endif
+ 
+ /*------------- 7.25.3 Condition variable functions -------------*/
+ // 7.25.3.1


=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
 0001-debian-Patch-docbookx.dtd-url-to-local-file-path.patch
+0002-c11-threads-fix-build-on-c23.patch



View it on GitLab: https://salsa.debian.org/xorg-team/lib/waffle/-/compare/620554e22f71b7dfc9a517b2672ec7b4ff133c6b...c0b6578c9411915550c7010ac3558d0c69852bae

-- 
View it on GitLab: https://salsa.debian.org/xorg-team/lib/waffle/-/compare/620554e22f71b7dfc9a517b2672ec7b4ff133c6b...c0b6578c9411915550c7010ac3558d0c69852bae
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help