Accepting request 544171 from X11:XOrg

OBS-URL: https://build.opensuse.org/request/show/544171
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xset?expand=0&rev=7

U_xset_fix-warning-about-usage-format-string.patch

@@ -0,0 +1,24 @@
+From c3ce2c28deac121db0de50af63c902e5883fe140 Mon Sep 17 00:00:00 2001
+From: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date: Sat, 17 Aug 2013 18:25:49 +0200
+Subject: Fix one last warning about usage() format string.
+
+Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+diff --git a/xset.c b/xset.c
+index f461d4b..98f552f 100644
+--- a/xset.c
++++ b/xset.c
+@@ -325,8 +325,7 @@ main(int argc, char *argv[])
+ 			    usage("low-mark must be greater than 0");
+ 			}
+ 			if (himark <= lowmark) {
+-			    usage("hi-mark must be greater than low-mark",
+-				  NULL);
++			    usage("hi-mark must be greater than low-mark");
+ 			}
+ 			if (i >= argc) {
+ 			    set_font_cache(dpy, himark, lowmark, balance);
+-- 
+cgit v0.10.2

xset.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Nov 20 23:27:49 UTC 2017 - zaitor@opensuse.org
+
+- Add U_xset_fix-warning-about-usage-format-string.patch: Fix one
+  last warning about usage() format string.
+
 -------------------------------------------------------------------
 Sat Aug 17 18:03:55 UTC 2013 - zaitor@opensuse.org
 

xset.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package xset
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -24,6 +24,7 @@ License:        MIT
 Group:          System/X11/Utilities
 Url:            http://xorg.freedesktop.org/
 Source0:        http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.bz2
+Patch0:         U_xset_fix-warning-about-usage-format-string.patch
 BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xext)
@@ -42,6 +43,7 @@ display.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure