Accepting request 860168 from X11:XOrg

- 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/request/show/860168
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-cf-files?expand=0&rev=13
This commit is contained in:
Dominique Leuenberger 2021-01-08 16:32:29 +00:00 committed by Git OBS Bridge
commit 0ecf8e6479
3 changed files with 45 additions and 3 deletions

View File

@ -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

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Jan 4 11:53:49 UTC 2021 - Stefan Dirsch <sndirsch@suse.com>
- 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

View File

@ -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