commit d0be18fe58c564e1cb6195e0856b10b33e15519f
Author: Jan Palus <at...@pld-linux.org>
Date: Fri Jul 14 13:04:05 2023 +0200
up to 1.10.0
- upstream build fix from:
https://codeberg.org/dnkl/yambar/pulls/312
build.patch | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
yambar.spec | 6 ++++--
2 files changed, 63 insertions(+), 2 deletions(-)
---
diff --git a/yambar.spec b/yambar.spec
index 2f076a5..2662aa9 100644
--- a/yambar.spec
+++ b/yambar.spec
@@ -1,11 +1,12 @@
Summary: Modular status panel for X11 and Wayland
Name: yambar
-Version: 1.9.0
+Version: 1.10.0
Release: 1
License: MIT
Group: Applications
Source0: https://codeberg.org/dnkl/yambar/archive/%{version}.tar.gz
-# Source0-md5: 76a11ffc037684893316957af6ecd80c
+# Source0-md5: 30c6503f385f9b72562aa1dbba60358b
+Patch0: build.patch
URL: https://codeberg.org/dnkl/yambar/
BuildRequires: alsa-lib-devel
BuildRequires: bison
@@ -62,6 +63,7 @@ ZSH completion for yambar command line.
%prep
%setup -q -n %{name}
+%patch0 -p1
%build
%meson build
diff --git a/build.patch b/build.patch
new file mode 100644
index 0000000..e802deb
--- /dev/null
+++ b/build.patch
@@ -0,0 +1,59 @@
+From e1fc3a0e29b608110f0965a19f35d85fb3df03e6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= <dan...@ekloef.se>
+Date: Fri, 14 Jul 2023 12:52:19 +0200
+Subject: [PATCH 1/2] =?UTF-8?q?tag:=20explicitly=20initialize=20=E2=80=98f?=
+ =?UTF-8?q?mt=E2=80=99?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes the following compiler warning/error:
+
+ In file included from /usr/include/stdio.h:906,
+ from ../tag.c:6:
+ In function ‘snprintf’,
+ inlined from ‘tags_expand_template’ at ../tag.c:708:13:
+ /usr/include/bits/stdio2.h:54:10: error: ‘fmt’ may be used uninitialized
[-Werror=maybe-uninitialized]
+ 54 | return __builtin___snprintf_chk (__s, __n, __USE_FORTIFY_LEVEL - 1,
+ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ 55 | __glibc_objsize (__s), __fmt,
+ | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ 56 | __va_arg_pack ());
+ | ~~~~~~~~~~~~~~~~~
+ ../tag.c: In function ‘tags_expand_template’:
+ ../tag.c:677:25: note: ‘fmt’ was declared here
+ 677 | const char *fmt;
+ | ^~~
+ cc1: all warnings being treated as errors
+
+Closes #311
+---
+ tag.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/tag.c b/tag.c
+index b098eb7..0f44d7e 100644
+--- a/tag.c
++++ b/tag.c
+@@ -674,7 +674,7 @@ tags_expand_template(const char *template, const struct
tag_set *tags)
+ const long max = tag->max(tag);
+ long value = kind == VALUE_MIN ? min : max;
+
+- const char *fmt;
++ const char *fmt = NULL;
+ switch (format) {
+ case FMT_DEFAULT: fmt = zero_pad ? "%0*ld" : "%*ld"; break;
+ case FMT_HEX: fmt = zero_pad ? "%0*lx" : "%*lx"; break;
+@@ -704,6 +704,8 @@ tags_expand_template(const char *template, const struct
tag_set *tags)
+ }
+ }
+
++ assert(fmt != NULL);
++
+ char str[24];
+ snprintf(str, sizeof(str), fmt, digits, value);
+ sbuf_append(&formatted, str);
+--
+2.30.8
+
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/yambar.git/commitdiff/d0be18fe58c564e1cb6195e0856b10b33e15519f
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
