Accepting request 580879 from GNOME:Factory
- Package COPYING as %license instead of %doc. - Add gcc8.patch: add missing address operator. OBS-URL: https://build.opensuse.org/request/show/580879 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glibmm2_4?expand=0&rev=5
This commit is contained in:
commit
9470ea654d
13
gcc8.patch
Normal file
13
gcc8.patch
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
Index: glibmm-2.52.1/glib/glibmm/threads.h
|
||||||
|
===================================================================
|
||||||
|
--- glibmm-2.52.1.orig/glib/glibmm/threads.h
|
||||||
|
+++ glibmm-2.52.1/glib/glibmm/threads.h
|
||||||
|
@@ -657,7 +657,7 @@ public:
|
||||||
|
*/
|
||||||
|
inline void replace(T* data);
|
||||||
|
|
||||||
|
- GPrivate* gobj() { return gobject_; }
|
||||||
|
+ GPrivate* gobj() { return &gobject_; }
|
||||||
|
|
||||||
|
private:
|
||||||
|
GPrivate gobject_;
|
@ -1,3 +1,13 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Feb 28 08:30:00 UTC 2018 - dimstar@opensuse.org
|
||||||
|
|
||||||
|
- Package COPYING as %license instead of %doc.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Feb 27 09:11:55 UTC 2018 - schwab@suse.de
|
||||||
|
|
||||||
|
- Add gcc8.patch: add missing address operator.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Sep 14 08:45:45 UTC 2017 - zaitor@opensuse.org
|
Thu Sep 14 08:45:45 UTC 2017 - zaitor@opensuse.org
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package glibmm2_4
|
# spec file for package glibmm2_4
|
||||||
#
|
#
|
||||||
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
|
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -18,25 +18,26 @@
|
|||||||
|
|
||||||
# Update baselibs.conf when changing this
|
# Update baselibs.conf when changing this
|
||||||
%define so_ver -2_4-1
|
%define so_ver -2_4-1
|
||||||
|
|
||||||
Name: glibmm2_4
|
|
||||||
%define _name glibmm
|
%define _name glibmm
|
||||||
|
Name: glibmm2_4
|
||||||
Version: 2.52.1
|
Version: 2.52.1
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: C++ Interface for Glib
|
Summary: C++ Interface for Glib
|
||||||
License: LGPL-2.1+
|
License: LGPL-2.1-or-later
|
||||||
Group: Development/Libraries/C and C++
|
Group: Development/Libraries/C and C++
|
||||||
Url: http://www.gtkmm.org/
|
Url: http://www.gtkmm.org/
|
||||||
Source0: http://download.gnome.org/sources/glibmm/2.52/%{_name}-%{version}.tar.xz
|
Source0: http://download.gnome.org/sources/glibmm/2.52/%{_name}-%{version}.tar.xz
|
||||||
Source99: baselibs.conf
|
Source99: baselibs.conf
|
||||||
|
# PATCH-FIX-UPSTREAM gcc8.patch schwab@suse.de -- Add missing address operator, fixes build wity GCC 8.
|
||||||
|
Patch0: gcc8.patch
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
|
BuildRequires: pkgconfig
|
||||||
BuildRequires: pkgconfig(gio-2.0)
|
BuildRequires: pkgconfig(gio-2.0)
|
||||||
BuildRequires: pkgconfig(glib-2.0) >= 2.49.7
|
BuildRequires: pkgconfig(glib-2.0) >= 2.49.7
|
||||||
BuildRequires: pkgconfig(gmodule-2.0) >= 2.49.7
|
BuildRequires: pkgconfig(gmodule-2.0) >= 2.49.7
|
||||||
BuildRequires: pkgconfig(gobject-2.0) >= 2.49.7
|
BuildRequires: pkgconfig(gobject-2.0) >= 2.49.7
|
||||||
BuildRequires: pkgconfig(sigc++-2.0) >= 2.9.1
|
BuildRequires: pkgconfig(sigc++-2.0) >= 2.9.1
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Glibmm is the official C++ interface for the popular cross-platform
|
Glibmm is the official C++ interface for the popular cross-platform
|
||||||
@ -44,7 +45,6 @@ library Glib. It provides non-UI API that is not available in standard
|
|||||||
C++ and makes it possible for gtkmm to wrap GObject-based APIs.
|
C++ and makes it possible for gtkmm to wrap GObject-based APIs.
|
||||||
|
|
||||||
%package -n libglibmm%{so_ver}
|
%package -n libglibmm%{so_ver}
|
||||||
|
|
||||||
Summary: C++ Interface for Glib
|
Summary: C++ Interface for Glib
|
||||||
Group: System/Libraries
|
Group: System/Libraries
|
||||||
Provides: glibmm2 = %{version}
|
Provides: glibmm2 = %{version}
|
||||||
@ -58,7 +58,6 @@ library Glib. It provides non-UI API that is not available in standard
|
|||||||
C++ and makes it possible for gtkmm to wrap GObject-based APIs.
|
C++ and makes it possible for gtkmm to wrap GObject-based APIs.
|
||||||
|
|
||||||
%package -n libgiomm%{so_ver}
|
%package -n libgiomm%{so_ver}
|
||||||
|
|
||||||
Summary: C++ Interface for Gio
|
Summary: C++ Interface for Gio
|
||||||
Group: System/Libraries
|
Group: System/Libraries
|
||||||
|
|
||||||
@ -87,6 +86,7 @@ C++ and makes it possible for gtkmm to wrap GObject-based APIs.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{_name}-%{version}
|
%setup -q -n %{_name}-%{version}
|
||||||
|
%patch0 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure --disable-static
|
%configure --disable-static
|
||||||
@ -94,29 +94,24 @@ make %{?_smp_mflags}
|
|||||||
|
|
||||||
%install
|
%install
|
||||||
%make_install
|
%make_install
|
||||||
rm %{buildroot}%{_libdir}/*.la
|
find %{buildroot} -type f -name "*.la" -delete -print
|
||||||
%fdupes %{buildroot}
|
%fdupes %{buildroot}
|
||||||
|
|
||||||
%post -n libglibmm%{so_ver} -p /sbin/ldconfig
|
%post -n libglibmm%{so_ver} -p /sbin/ldconfig
|
||||||
|
|
||||||
%postun -n libglibmm%{so_ver} -p /sbin/ldconfig
|
%postun -n libglibmm%{so_ver} -p /sbin/ldconfig
|
||||||
|
|
||||||
%post -n libgiomm%{so_ver} -p /sbin/ldconfig
|
%post -n libgiomm%{so_ver} -p /sbin/ldconfig
|
||||||
|
|
||||||
%postun -n libgiomm%{so_ver} -p /sbin/ldconfig
|
%postun -n libgiomm%{so_ver} -p /sbin/ldconfig
|
||||||
|
|
||||||
%files -n libglibmm%{so_ver}
|
%files -n libglibmm%{so_ver}
|
||||||
%defattr (-, root, root)
|
%license COPYING
|
||||||
%doc AUTHORS COPYING ChangeLog NEWS README
|
%doc AUTHORS ChangeLog NEWS README
|
||||||
%{_libdir}/libglibmm-2.4.so.*
|
%{_libdir}/libglibmm-2.4.so.*
|
||||||
%{_libdir}/libglibmm_generate_extra_defs-2.4.so.*
|
%{_libdir}/libglibmm_generate_extra_defs-2.4.so.*
|
||||||
|
|
||||||
%files -n libgiomm%{so_ver}
|
%files -n libgiomm%{so_ver}
|
||||||
%defattr (-, root, root)
|
|
||||||
%{_libdir}/libgiomm-2.4.so.*
|
%{_libdir}/libgiomm-2.4.so.*
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%defattr (-, root, root)
|
|
||||||
%{_libdir}/*.so
|
%{_libdir}/*.so
|
||||||
%{_libdir}/pkgconfig/*.pc
|
%{_libdir}/pkgconfig/*.pc
|
||||||
%{_includedir}/*
|
%{_includedir}/*
|
||||||
|
Loading…
Reference in New Issue
Block a user