Accepting request 762023 from X11:XOrg

- u_fno-common.patch
  * fix build with gcc's -fno-common option (boo#1160278) 
- added baselibs.conf as source to specfile

OBS-URL: https://build.opensuse.org/request/show/762023
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/liblbxutil?expand=0&rev=9

liblbxutil.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jan  8 17:48:26 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
+
+- 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
 

liblbxutil.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package liblbxutil
 #
-# Copyright (c) 2013 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,8 @@ 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
 BuildRequires:  pkgconfig
@@ -65,6 +67,7 @@ in %lname.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --disable-static

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 <X11/Xos.h>
+ #include <X11/Xfuncs.h>
+ #include <stdio.h>
+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;
+