Sync from SUSE:SLFO:Main libcddb revision 4c90a52db7b134b68c4b0f810c4ff3c7
This commit is contained in:
parent
a7ecd364af
commit
1588ea6e87
@ -1,7 +1,9 @@
|
||||
Index: Makefile.am
|
||||
===================================================================
|
||||
--- Makefile.am.orig 2003-05-28 17:55:14.000000000 +0200
|
||||
+++ Makefile.am 2007-10-09 08:08:47.000000000 +0200
|
||||
---
|
||||
Makefile.am | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -1,5 +1,5 @@
|
||||
|
||||
-SUBDIRS = include lib examples tests
|
||||
|
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 22 19:04:27 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
|
||||
|
||||
- Add pointer-types.patch to fix compilation error with GCC 14
|
||||
(bsc#1221698).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 29 15:42:19 UTC 2024 - pgajdos@suse.com
|
||||
|
||||
- Use %patch -P N instead of deprecated %patchN.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu May 4 09:53:33 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
|
10
libcddb.spec
10
libcddb.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file
|
||||
# spec file for package libcddb
|
||||
#
|
||||
# Copyright (c) 2023 SUSE LLC
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -34,6 +34,9 @@ URL: https://libcddb.sourceforge.net/
|
||||
Source: http://downloads.sourceforge.net/project/%{_name}/%{_name}/%{version}/%{_name}-%{version}.tar.bz2
|
||||
Source2: baselibs.conf
|
||||
Patch0: libcddb-no-examples.patch
|
||||
# PATCH-FIX-UPSTREAM pointer-types.patch bsc#1221698 mcepl@suse.com
|
||||
# Patch from https://src.fedoraproject.org/rpms/libcddb/raw/rawhide/f/pointer-types.patch
|
||||
Patch1: pointer-types.patch
|
||||
BuildRequires: libtool
|
||||
BuildRequires: pkgconfig
|
||||
%if %{BUILD_UTILS}
|
||||
@ -75,10 +78,11 @@ tries to be as cross-platform as possible.
|
||||
%prep
|
||||
%setup -q -n %{_name}-%{version}
|
||||
%if !%{BUILD_UTILS}
|
||||
%patch0
|
||||
%patch -p1 -P 0
|
||||
%else
|
||||
sed -i 's:\(\.\.\|\$(top_builddir)\)/[^/]*/lib\([^ ]*\)\.la:-l\2:g' */Makefile.am
|
||||
%endif
|
||||
%patch -p1 -P 1
|
||||
|
||||
%build
|
||||
autoreconf -f -i
|
||||
|
15
pointer-types.patch
Normal file
15
pointer-types.patch
Normal file
@ -0,0 +1,15 @@
|
||||
---
|
||||
lib/cddb_net.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/lib/cddb_net.c
|
||||
+++ b/lib/cddb_net.c
|
||||
@@ -325,7 +325,7 @@ int timeout_connect(int sockfd, const st
|
||||
default:
|
||||
/* we got connected, check error condition */
|
||||
l = sizeof(rv);
|
||||
- getsockopt(sockfd, SOL_SOCKET, SO_ERROR, &rv, &l);
|
||||
+ getsockopt(sockfd, SOL_SOCKET, SO_ERROR, &rv, (socklen_t * restrict)&l);
|
||||
if (rv) {
|
||||
/* something went wrong, simulate normal connect behaviour */
|
||||
errno = rv;
|
Loading…
Reference in New Issue
Block a user