Hello community, here is the log from the commit of package gtk2-engine-murrine for openSUSE:Factory checked in at 2012-01-09 15:17:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gtk2-engine-murrine (Old) and /work/SRC/openSUSE:Factory/.gtk2-engine-murrine.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gtk2-engine-murrine", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/gtk2-engine-murrine/gtk2-engine-murrine.changes 2011-09-23 02:02:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gtk2-engine-murrine.new/gtk2-engine-murrine.changes 2012-01-09 15:17:16.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Nov 28 10:27:34 UTC 2011 - [email protected] + +- Add gtk2-engine-murrine-glib.patch: Fix build with glib 2.31: + only glib.h can be included. + +------------------------------------------------------------------- New: ---- gtk2-engine-murrine-glib.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtk2-engine-murrine.spec ++++++ --- /var/tmp/diff_new_pack.PZoRvw/_old 2012-01-09 15:17:17.000000000 +0100 +++ /var/tmp/diff_new_pack.PZoRvw/_new 2012-01-09 15:17:17.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package gtk2-engine-murrine (Version 0.98.1.1) +# spec file for package gtk2-engine-murrine # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,6 +28,8 @@ Url: http://ftp.gnome.org/pub/GNOME/sources/murrine/ Source: http://ftp.gnome.org/pub/GNOME/sources/murrine/0.98/%{_name}-%{version}.tar.bz2 Source2: baselibs.conf +# PATCH-FIX-UPSTREAM gtk2-engine-murrine-glib.patch bgo#665022 [email protected] -- Fix build with glib 2.31: only glib.h can be included. +Patch0: gtk2-engine-murrine-glib.patch BuildRequires: gtk2-devel >= 2.12.0 BuildRequires: intltool BuildRequires: pkg-config @@ -40,6 +42,7 @@ %prep %setup -q -n %{_name}-%{version} +%patch0 -p1 %build %configure --enable-animation ++++++ gtk2-engine-murrine-glib.patch ++++++ >From acfbf5fe58065aec99220ad5f7955666d869c1f0 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger <[email protected]> Date: Mon, 28 Nov 2011 11:20:09 +0100 Subject: [PATCH] glib 2.31 compatibility: only glib.h can be included. --- src/animation.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/animation.c b/src/animation.c index feb8a10..4b4c5f1 100644 --- a/src/animation.c +++ b/src/animation.c @@ -21,7 +21,7 @@ #include "animation.h" #ifdef HAVE_ANIMATION -#include <glib/gtimer.h> +#include <glib.h> struct _AnimationInfo { -- 1.7.7 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
