pool/liblbxutil
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- u_fno-common.patch

Browse Source 
* 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
This commit is contained in:
Stefan Dirsch 2020-01-08 17:50:20 +00:00 committed by Git OBS Bridge
parent 82a471bccb
commit 5116ebb2d1
3 changed files with 55 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
liblbxutil.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
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)
-------------------------------------------------------------------
Mon Apr 15 12:32:17 UTC 2013 - mmeister@suse.com

6
liblbxutil.spec
View File

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

45
u_fno-common.patch Normal file
View File

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