From f6c7f1fa6c5d9a775843e57a281fb4320d5d5c2c94eee1d00543817a24145b24 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 28 Feb 2018 08:28:12 +0000 Subject: [PATCH 1/2] Accepting request 580545 from home:Andreas_Schwab:gcc8 - gcc8.patch: add missing address operator OBS-URL: https://build.opensuse.org/request/show/580545 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glibmm2_4?expand=0&rev=10 --- gcc8.patch | 13 +++++++++++++ glibmm2_4.changes | 5 +++++ glibmm2_4.spec | 6 ++++-- 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 gcc8.patch diff --git a/gcc8.patch b/gcc8.patch new file mode 100644 index 0000000..c9e496c --- /dev/null +++ b/gcc8.patch @@ -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_; diff --git a/glibmm2_4.changes b/glibmm2_4.changes index c4b77c4..2e4cb6a 100644 --- a/glibmm2_4.changes +++ b/glibmm2_4.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 27 09:11:55 UTC 2018 - schwab@suse.de + +- gcc8.patch: add missing address operator + ------------------------------------------------------------------- Thu Sep 14 08:45:45 UTC 2017 - zaitor@opensuse.org diff --git a/glibmm2_4.spec b/glibmm2_4.spec index a699e38..60cd5f0 100644 --- a/glibmm2_4.spec +++ b/glibmm2_4.spec @@ -1,7 +1,7 @@ # # 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 # remain the property of their copyright owners, unless otherwise agreed @@ -24,11 +24,12 @@ Name: glibmm2_4 Version: 2.52.1 Release: 0 Summary: C++ Interface for Glib -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Development/Libraries/C and C++ Url: http://www.gtkmm.org/ Source0: http://download.gnome.org/sources/glibmm/2.52/%{_name}-%{version}.tar.xz Source99: baselibs.conf +Patch0: gcc8.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: pkgconfig(gio-2.0) @@ -87,6 +88,7 @@ C++ and makes it possible for gtkmm to wrap GObject-based APIs. %prep %setup -q -n %{_name}-%{version} +%patch0 -p1 %build %configure --disable-static From 3754685cfdc9742d42d451fc3ecee4e14f9b673721d699f0f8bccf7f79963e93 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 28 Feb 2018 08:30:06 +0000 Subject: [PATCH 2/2] - Package COPYING as %license instead of %doc. - Add gcc8.patch: add missing address operator. OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glibmm2_4?expand=0&rev=11 --- glibmm2_4.changes | 7 ++++++- glibmm2_4.spec | 19 ++++++------------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/glibmm2_4.changes b/glibmm2_4.changes index 2e4cb6a..c8bf67f 100644 --- a/glibmm2_4.changes +++ b/glibmm2_4.changes @@ -1,7 +1,12 @@ +------------------------------------------------------------------- +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 -- gcc8.patch: add missing address operator +- Add gcc8.patch: add missing address operator. ------------------------------------------------------------------- Thu Sep 14 08:45:45 UTC 2017 - zaitor@opensuse.org diff --git a/glibmm2_4.spec b/glibmm2_4.spec index 60cd5f0..9fa7505 100644 --- a/glibmm2_4.spec +++ b/glibmm2_4.spec @@ -18,9 +18,8 @@ # Update baselibs.conf when changing this %define so_ver -2_4-1 - -Name: glibmm2_4 %define _name glibmm +Name: glibmm2_4 Version: 2.52.1 Release: 0 Summary: C++ Interface for Glib @@ -29,15 +28,16 @@ Group: Development/Libraries/C and C++ Url: http://www.gtkmm.org/ Source0: http://download.gnome.org/sources/glibmm/2.52/%{_name}-%{version}.tar.xz 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: gcc-c++ +BuildRequires: pkgconfig BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(glib-2.0) >= 2.49.7 BuildRequires: pkgconfig(gmodule-2.0) >= 2.49.7 BuildRequires: pkgconfig(gobject-2.0) >= 2.49.7 BuildRequires: pkgconfig(sigc++-2.0) >= 2.9.1 -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Glibmm is the official C++ interface for the popular cross-platform @@ -45,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. %package -n libglibmm%{so_ver} - Summary: C++ Interface for Glib Group: System/Libraries Provides: glibmm2 = %{version} @@ -59,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. %package -n libgiomm%{so_ver} - Summary: C++ Interface for Gio Group: System/Libraries @@ -96,29 +94,24 @@ make %{?_smp_mflags} %install %make_install -rm %{buildroot}%{_libdir}/*.la +find %{buildroot} -type f -name "*.la" -delete -print %fdupes %{buildroot} %post -n libglibmm%{so_ver} -p /sbin/ldconfig - %postun -n libglibmm%{so_ver} -p /sbin/ldconfig - %post -n libgiomm%{so_ver} -p /sbin/ldconfig - %postun -n libgiomm%{so_ver} -p /sbin/ldconfig %files -n libglibmm%{so_ver} -%defattr (-, root, root) -%doc AUTHORS COPYING ChangeLog NEWS README +%license COPYING +%doc AUTHORS ChangeLog NEWS README %{_libdir}/libglibmm-2.4.so.* %{_libdir}/libglibmm_generate_extra_defs-2.4.so.* %files -n libgiomm%{so_ver} -%defattr (-, root, root) %{_libdir}/libgiomm-2.4.so.* %files devel -%defattr (-, root, root) %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc %{_includedir}/*