From 9d611d34271dbd03cb138957414c2d0c57d764bfd8ab1a5a8fcffc63f196fbec Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 4 Jan 2021 12:06:25 +0000 Subject: [PATCH] - u_xorg-cf-files-D_DEFAULT_SOURCE.patch - switched from usage of "-D_BSD_SOURCE -D_SVID_SOURCE" to "D_DEFAULT_SOURCE" as suggested by gcc (boo#1180429) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-cf-files?expand=0&rev=20 --- u_xorg-cf-files-D_DEFAULT_SOURCE.patch | 33 ++++++++++++++++++++++++++ xorg-cf-files.changes | 7 ++++++ xorg-cf-files.spec | 8 ++++--- 3 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 u_xorg-cf-files-D_DEFAULT_SOURCE.patch diff --git a/u_xorg-cf-files-D_DEFAULT_SOURCE.patch b/u_xorg-cf-files-D_DEFAULT_SOURCE.patch new file mode 100644 index 0000000..1a87e05 --- /dev/null +++ b/u_xorg-cf-files-D_DEFAULT_SOURCE.patch @@ -0,0 +1,33 @@ +diff -u -p xorg-cf-files-1.0.6.orig/gnu.cf xorg-cf-files-1.0.6/gnu.cf +--- xorg-cf-files-1.0.6.orig/gnu.cf 2021-01-04 12:47:28.399794000 +0100 ++++ xorg-cf-files-1.0.6/gnu.cf 2021-01-04 12:49:14.978974000 +0100 +@@ -21,7 +21,7 @@ XCOMM operating system: OSName (OSMajor + + #define GNUSourceDefines -D_POSIX_C_SOURCE=199309L \ + -D_POSIX_SOURCE -D_XOPEN_SOURCE \ +- -D_BSD_SOURCE -D_SVID_SOURCE ++ -D_DEFAULT_SOURCE + + XCOMM XXXMB: What about _GNU_SOURCE, see Linux/UseInstalled? + +diff -u -p xorg-cf-files-1.0.6.orig/linux.cf xorg-cf-files-1.0.6/linux.cf +--- xorg-cf-files-1.0.6.orig/linux.cf 2021-01-04 12:47:28.194801000 +0100 ++++ xorg-cf-files-1.0.6/linux.cf 2021-01-04 12:49:59.493049000 +0100 +@@ -232,7 +232,7 @@ InstallNamedTargetNoClobber(install,file + #if LinuxCLibMajorVersion >= 6 + # define LinuxSourceDefines -D_POSIX_C_SOURCE=199309L \ + -D_POSIX_SOURCE -D_XOPEN_SOURCE \ +- -D_BSD_SOURCE -D_SVID_SOURCE \ ++ -D_DEFAULT_SOURCE \ + -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \ + LinuxAdditionalIncludes LinuxGnuSourceDefines \ + LinuxLocaleDefines +@@ -251,7 +251,7 @@ InstallNamedTargetNoClobber(install,file + # endif + #else + # define LinuxSourceDefines -D_POSIX_SOURCE -D_POSIX_C_SOURCE=2 \ +- -D_BSD_SOURCE -D_SVID_SOURCE \ ++ -D_DEFAULT_SOURCE \ + LinuxGnuSourceDefines LinuxLocaleDefines + # define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC + # ifndef HasLibCrypt diff --git a/xorg-cf-files.changes b/xorg-cf-files.changes index d6b6072..6c82719 100644 --- a/xorg-cf-files.changes +++ b/xorg-cf-files.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Jan 4 11:53:49 UTC 2021 - Stefan Dirsch + +- u_xorg-cf-files-D_DEFAULT_SOURCE.patch + - switched from usage of "-D_BSD_SOURCE -D_SVID_SOURCE" to + "D_DEFAULT_SOURCE" as suggested by gcc (boo#1180429) + ------------------------------------------------------------------- Thu Sep 27 19:07:30 UTC 2018 - sndirsch@suse.com diff --git a/xorg-cf-files.spec b/xorg-cf-files.spec index ae242e2..34cd31a 100644 --- a/xorg-cf-files.spec +++ b/xorg-cf-files.spec @@ -1,7 +1,7 @@ # # spec file for package xorg-cf-files # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -22,9 +22,10 @@ Release: 0 Summary: Data files for the imake utility License: MIT Group: Development/Tools/Building -Url: http://xorg.freedesktop.org/ +URL: http://xorg.freedesktop.org/ Source0: http://xorg.freedesktop.org/releases/individual/util/%{name}-%{version}.tar.bz2 Patch0: u_riscv.patch +Patch1: u_xorg-cf-files-D_DEFAULT_SOURCE.patch BuildRequires: font-util >= 1.1 BuildRequires: pkgconfig(xorg-macros) >= 1.4 Requires: gccmakedep @@ -53,6 +54,7 @@ converted. %prep %setup -q %patch0 -p1 +%patch1 -p1 cat > host.def << EOF #define ConfigDir %_configdir