diff --git a/0001-Glib-Threads-Private-Fix-gobj.patch b/0001-Glib-Threads-Private-Fix-gobj.patch deleted file mode 100644 index c953513..0000000 --- a/0001-Glib-Threads-Private-Fix-gobj.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 37d57ae9572b7d74aa385a30313eceae7f2d3fce Mon Sep 17 00:00:00 2001 -From: Kjell Ahlstedt -Date: Wed, 20 Dec 2017 20:00:32 +0100 -Subject: [PATCH] Glib::Threads::Private: Fix gobj() - -Bug 791711 ---- - glib/src/threads.hg | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/glib/src/threads.hg b/glib/src/threads.hg -index 86d7a17b62f4..c82a6130bbeb 100644 ---- a/glib/src/threads.hg -+++ b/glib/src/threads.hg -@@ -628,7 +628,7 @@ public: - */ - inline void replace(T* data); - -- GPrivate* gobj() { return gobject_; } -+ GPrivate* gobj() { return &gobject_; } - - private: - GPrivate gobject_; --- -2.14.3 - -diff -urN glibmm-2.54.1-old/glib/glibmm/threads.h glibmm-2.54.1/glib/glibmm/threads.h ---- glibmm-2.54.1-old/glib/glibmm/threads.h 2018-02-02 16:44:05.000000000 +0100 -+++ glibmm-2.54.1/glib/glibmm/threads.h 2018-02-02 16:47:04.000000000 +0100 -@@ -657,7 +657,7 @@ - */ - inline void replace(T* data); - -- GPrivate* gobj() { return gobject_; } -+ GPrivate* gobj() { return &gobject_; } - - private: - GPrivate gobject_; diff --git a/glibmm24.spec b/glibmm24.spec index 51c998b..99e42b6 100644 --- a/glibmm24.spec +++ b/glibmm24.spec @@ -5,17 +5,14 @@ %global libsigc_version 2.9.1 Name: glibmm24 -Version: 2.54.1 -Release: 3%{?dist} +Version: 2.56.0 +Release: 1%{?dist} Summary: C++ interface for the GLib library License: LGPLv2+ URL: http://www.gtkmm.org/ Source0: http://ftp.gnome.org/pub/GNOME/sources/glibmm/%{release_version}/glibmm-%{version}.tar.xz -# Backported from upstream -Patch0: 0001-Glib-Threads-Private-Fix-gobj.patch - BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: libsigc++20-devel >= %{libsigc_version} BuildRequires: m4 @@ -55,7 +52,6 @@ This package contains the full API documentation for %{name}. %prep %setup -q -n glibmm-%{version} -%patch0 -p1 %build @@ -96,6 +92,9 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' %changelog +* Mon Apr 02 2018 Kalev Lember - 2.56.0-1 +- Update to 2.56.0 + * Wed Feb 07 2018 Fedora Release Engineering - 2.54.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 0c5dd04..2e7313b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (glibmm-2.54.1.tar.xz) = 94f2a4d6972684e25e38ff2e6bcfc1e9c5e4d096856d3419320c14166e27e26b1ad69be434337e9b70c23842989988113521aae7a800ef2f29e81f1ae6c25a13 +SHA512 (glibmm-2.56.0.tar.xz) = 65e577009019e30e340ae5fe6e4c854e5a75551b2eb83ad85403d73eb4e77879783162d4c3c354bc37be0be842f0ddffc1977021a5e0c32985fb596d86929c08