Accepting request 729114 from GNOME:Next

Drop obsolete patch

OBS-URL: https://build.opensuse.org/request/show/729114
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libsigc++2?expand=0&rev=59
This commit is contained in:
Bjørn Lie 2019-09-09 10:53:47 +00:00 committed by Git OBS Bridge
parent 88abbce5f2
commit d32cb7f84e
3 changed files with 11 additions and 18 deletions

View File

@ -1,10 +0,0 @@
Index: libsigc++-2.6.2/sigc++.pc.in
===================================================================
--- libsigc++-2.6.2.orig/sigc++.pc.in
+++ libsigc++-2.6.2/sigc++.pc.in
@@ -15,4 +15,4 @@ Description: Typesafe signal and callbac
Version: @PACKAGE_VERSION@
URL: http://libsigc.sourceforge.net/
Libs: -L${libdir} -lsigc-@SIGCXX_API_VERSION@
-Cflags: -I${includedir}/sigc++-@SIGCXX_API_VERSION@ -I${libdir}/sigc++-@SIGCXX_API_VERSION@/include
+Cflags: -I${includedir}/sigc++-@SIGCXX_API_VERSION@ -I${libdir}/sigc++-@SIGCXX_API_VERSION@/include -std=c++11

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sat Sep 7 17:58:29 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
- Drop conditional libsigc++-std-c11.patch: No longer needed for
any currently supported version of openSUSE.
- Use make_build macro.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Aug 14 16:45:24 CEST 2019 - bjorn.lie@gmail.com Wed Aug 14 16:45:24 CEST 2019 - bjorn.lie@gmail.com

View File

@ -24,10 +24,9 @@ Summary: Typesafe Signal Framework for C++
License: LGPL-2.1-or-later License: LGPL-2.1-or-later
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
URL: http://libsigc.sourceforge.net/ URL: http://libsigc.sourceforge.net/
Source: http://download.gnome.org/sources/libsigc++/2.10/%{_name}-%{version}.tar.xz Source0: https://download.gnome.org/sources/libsigc++/2.10/%{_name}-%{version}.tar.xz
Source99: baselibs.conf Source99: baselibs.conf
# PATCH-FIX-OPENSUSE libsigc++-std-c11.patch dimstar@opensuse.org -- Add -std=c11 to CFLAGS when using libsigc++ to build. This is not upstreamable in this form as the used CXX macro should handle that, so needs more work (and entry points in mm-common)
Patch0: libsigc++-std-c11.patch
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: m4 BuildRequires: m4
BuildRequires: pkgconfig BuildRequires: pkgconfig
@ -70,13 +69,10 @@ of use unmatched by other C++ callback libraries.
%prep %prep
%setup -q -n %{_name}-%{version} %setup -q -n %{_name}-%{version}
if [ $(gcc -dumpversion | awk -F. '{print $1}') -lt 6 ]; then
%patch0 -p1
fi
%build %build
%configure --disable-static %configure --disable-static
make %{?_smp_mflags} %make_build
%install %install
%make_install %make_install
@ -84,7 +80,7 @@ find %{buildroot} -type f -name "*.la" -delete -print
%check %check
export MALLOC_CHECK_=2 MALLOC_PERTURB_=$((${RANDOM:-256} % 256)) export MALLOC_CHECK_=2 MALLOC_PERTURB_=$((${RANDOM:-256} % 256))
make %{?_smp_mflags} check %make_build check
unset MALLOC_CHECK_ MALLOC_PERTURB_ unset MALLOC_CHECK_ MALLOC_PERTURB_
%post -n libsigc-2_0-0 -p /sbin/ldconfig %post -n libsigc-2_0-0 -p /sbin/ldconfig