Hello community, here is the log from the commit of package gtksourceviewmm for openSUSE:Factory checked in at 2016-06-25 02:23:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gtksourceviewmm (Old) and /work/SRC/openSUSE:Factory/.gtksourceviewmm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gtksourceviewmm" Changes: -------- --- /work/SRC/openSUSE:Factory/gtksourceviewmm/gtksourceviewmm.changes 2016-03-29 14:28:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gtksourceviewmm.new/gtksourceviewmm.changes 2016-06-25 02:23:24.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Jun 20 22:56:09 UTC 2016 - [email protected] + +- Add gtksourceviewmm-C++11-fix-deprecated.patch: C++11: Markup: + Deprecated operator const void*(), adding explicit operator + bool(). Patch from upstream git. + +------------------------------------------------------------------- New: ---- gtksourceviewmm-C++11-fix-deprecated.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtksourceviewmm.spec ++++++ --- /var/tmp/diff_new_pack.9s81cW/_old 2016-06-25 02:23:25.000000000 +0200 +++ /var/tmp/diff_new_pack.9s81cW/_new 2016-06-25 02:23:25.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package gtksourceviewmm # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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,6 +24,8 @@ Group: System/Libraries Url: http://projects.gnome.org/gtksourceviewmm/ Source0: http://download.gnome.org/sources/gtksourceviewmm/3.18/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM gtksourceviewmm-C++11-fix-deprecated.patch [email protected] -- C++11: Markup: Deprecated operator const void*(), adding explicit operator bool(). +Patch0: gtksourceviewmm-C++11-fix-deprecated.patch BuildRequires: gcc-c++ BuildRequires: pkgconfig(glibmm-2.4) >= 2.46.1 BuildRequires: pkgconfig(gtkmm-3.0) >= 3.18.0 @@ -50,6 +52,7 @@ %prep %setup -q +%patch0 -p1 %build %configure \ ++++++ gtksourceviewmm-C++11-fix-deprecated.patch ++++++ >From 60565786a5d0f5089489134eb8c0c0dfe796d680 Mon Sep 17 00:00:00 2001 From: Murray Cumming <[email protected]> Date: Sun, 10 Apr 2016 16:22:47 +0200 Subject: C++11: Markup: Deprecated operator const void*(), adding explicit operator bool(). --- gtksourceview/gtksourceviewmm/markup.cc | 7 +++++++ gtksourceview/gtksourceviewmm/markup.h | 19 +++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/gtksourceview/gtksourceviewmm/markup.cc b/gtksourceview/gtksourceviewmm/markup.cc index d853a4f..f2450d2 100644 --- a/gtksourceview/gtksourceviewmm/markup.cc +++ b/gtksourceview/gtksourceviewmm/markup.cc @@ -52,10 +52,17 @@ Markup& Markup::operator=(const Markup& other) return *this; } +#ifndef GTKMM_DISABLE_DEPRECATED Markup::operator const void*() const { return !(markup_.empty()) ? GINT_TO_POINTER(1) : 0; } +#endif // GTKMM_DISABLE_DEPRECATED + +Markup::operator bool() const +{ + return !(markup_.empty()); +} bool Markup::equal(const Markup& rhs) const { diff --git a/gtksourceview/gtksourceviewmm/markup.h b/gtksourceview/gtksourceviewmm/markup.h index d4b82ba..56f98cf 100644 --- a/gtksourceview/gtksourceviewmm/markup.h +++ b/gtksourceview/gtksourceviewmm/markup.h @@ -87,8 +87,11 @@ public: */ Markup& operator=(const Markup& other); +#ifndef GTKMM_DISABLE_DEPRECATED /** This typedef is just to make it more obvious that * our operator const void*() should be used like operator bool(). + * + * @deprecated Use the explicit operator bool() instead. */ typedef const void* BoolExpr; @@ -102,8 +105,24 @@ public: * @return @c true if Markup is not empty, otherwise @c false. * * @newin{2,10} + * + * @deprecated Use the explicit operator bool() instead. */ operator BoolExpr() const; +#endif // GTKMM_DISABLE_DEPRECATED + + /** Checks if Markup is not empty. + * For instance, + * @code + * if(markup) + * do_something() + * @endcode + * + * @return @c true if Markup is not empty, otherwise @c false. + * + * @newin{3,20} + */ + explicit operator bool() const; /** Checks if @a other Markup is the same as this one. * -- cgit v0.12
