From 82a471bccbe27576484c37135f7cb3725f14194fd4b955247250cb881fc78195 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Sun, 27 Apr 2014 22:06:51 +0000 Subject: [PATCH 1/3] Obsoletes: xorg-x11-proto-devel -> Provides: xorg-x11-proto-devel OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/liblbxutil?expand=0&rev=11 --- liblbxutil.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/liblbxutil.spec b/liblbxutil.spec index 4c6d169..40ce196 100644 --- a/liblbxutil.spec +++ b/liblbxutil.spec @@ -1,7 +1,7 @@ # # spec file for package liblbxutil # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed From 5116ebb2d135cce1e29dd6e7a2b39b0d6f7a86cb6672699fd3a5a43f73f987eb Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 8 Jan 2020 17:50:20 +0000 Subject: [PATCH 2/3] - u_fno-common.patch * fix build with gcc's -fno-common option (boo#1160278) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/liblbxutil?expand=0&rev=12 --- liblbxutil.changes | 6 ++++++ liblbxutil.spec | 6 ++++-- u_fno-common.patch | 45 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 u_fno-common.patch diff --git a/liblbxutil.changes b/liblbxutil.changes index baeecec..bca8e04 100644 --- a/liblbxutil.changes +++ b/liblbxutil.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 8 17:48:26 UTC 2020 - Stefan Dirsch + +- u_fno-common.patch + * fix build with gcc's -fno-common option (boo#1160278) + ------------------------------------------------------------------- Mon Apr 15 12:32:17 UTC 2013 - mmeister@suse.com diff --git a/liblbxutil.spec b/liblbxutil.spec index 40ce196..56cc081 100644 --- a/liblbxutil.spec +++ b/liblbxutil.spec @@ -1,7 +1,7 @@ # # spec file for package liblbxutil # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2020 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 @@ -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/ # @@ -28,6 +28,7 @@ Url: http://xorg.freedesktop.org/ #Git-Clone: git://anongit.freedesktop.org/xorg/lib/liblbxutil #Git-Web: http://cgit.freedesktop.org/xorg/lib/liblbxutil/ Source: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2 +Patch0: u_fno-common.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build #git#BuildRequires: autoconf >= 2.57, automake, libtool BuildRequires: pkgconfig @@ -65,6 +66,7 @@ in %lname. %prep %setup -q +%patch0 -p1 %build %configure --disable-static diff --git a/u_fno-common.patch b/u_fno-common.patch new file mode 100644 index 0000000..05ad08c --- /dev/null +++ b/u_fno-common.patch @@ -0,0 +1,45 @@ +diff -u -r liblbxutil-1.1.0/src/lbx_zlib/lbx_zlib.c liblbxutil-1.1.0/src/lbx_zlib/lbx_zlib.c +--- liblbxutil-1.1.0/src/lbx_zlib/lbx_zlib.c 2009-11-03 06:55:28.000000000 +0100 ++++ liblbxutil-1.1.0/src/lbx_zlib/lbx_zlib.c 2020-01-08 18:42:27.748352503 +0100 +@@ -55,7 +55,7 @@ + #ifdef WIN32 + #define _WILLWINSOCK_ + #endif +-#define _BSD_SOURCE ++#define DEFAULT_SOURCE + #include + #include + #include +diff -u -r liblbxutil-1.1.0/src/lbx_zlib/lbx_zlib.h liblbxutil-1.1.0/src/lbx_zlib/lbx_zlib.h +--- liblbxutil-1.1.0/src/lbx_zlib/lbx_zlib.h 2009-11-03 06:52:21.000000000 +0100 ++++ liblbxutil-1.1.0/src/lbx_zlib/lbx_zlib.h 2020-01-08 18:38:26.711719446 +0100 +@@ -136,9 +136,9 @@ + #endif + + /* lbx_zlib.c */ +-unsigned long stream_out_compressed; +-unsigned long stream_out_uncompressed; +-unsigned long stream_out_plain; +-unsigned long stream_in_compressed; +-unsigned long stream_in_uncompressed; +-unsigned long stream_in_plain; ++extern unsigned long stream_out_compressed; ++extern unsigned long stream_out_uncompressed; ++extern unsigned long stream_out_plain; ++extern unsigned long stream_in_compressed; ++extern unsigned long stream_in_uncompressed; ++extern unsigned long stream_in_plain; +diff -u -r liblbxutil-1.1.0/src/lbx_zlib/reqstats.c liblbxutil-1.1.0/src/lbx_zlib/reqstats.c +--- liblbxutil-1.1.0/src/lbx_zlib/reqstats.c 2009-11-03 06:39:14.000000000 +0100 ++++ liblbxutil-1.1.0/src/lbx_zlib/reqstats.c 2020-01-08 18:40:15.229805230 +0100 +@@ -43,8 +43,8 @@ + + #define LBX_CODE 136 /* XXX - this should not be hardcoded - on todo list */ + +-extern unsigned long stream_in_compressed; +-extern unsigned long stream_in_plain; ++unsigned long stream_in_compressed; ++unsigned long stream_in_plain; + extern unsigned long stream_in_packet_header_bytes; + extern unsigned long stream_in_uncompressed_bytes; + From 3220629009975efa33e51491dc314098108e117ab1fdaf60f7ecd3a7f012de01 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 8 Jan 2020 23:01:58 +0000 Subject: [PATCH 3/3] - added baselibs.conf as source to specfile OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/liblbxutil?expand=0&rev=13 --- liblbxutil.changes | 1 + liblbxutil.spec | 1 + 2 files changed, 2 insertions(+) diff --git a/liblbxutil.changes b/liblbxutil.changes index bca8e04..e85c5c8 100644 --- a/liblbxutil.changes +++ b/liblbxutil.changes @@ -3,6 +3,7 @@ Wed Jan 8 17:48:26 UTC 2020 - Stefan Dirsch - u_fno-common.patch * fix build with gcc's -fno-common option (boo#1160278) +- added baselibs.conf as source to specfile ------------------------------------------------------------------- Mon Apr 15 12:32:17 UTC 2013 - mmeister@suse.com diff --git a/liblbxutil.spec b/liblbxutil.spec index 56cc081..2732530 100644 --- a/liblbxutil.spec +++ b/liblbxutil.spec @@ -28,6 +28,7 @@ Url: http://xorg.freedesktop.org/ #Git-Clone: git://anongit.freedesktop.org/xorg/lib/liblbxutil #Git-Web: http://cgit.freedesktop.org/xorg/lib/liblbxutil/ Source: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2 +Source1: baselibs.conf Patch0: u_fno-common.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build #git#BuildRequires: autoconf >= 2.57, automake, libtool