Hello community, here is the log from the commit of package clutter-gtk for openSUSE:Factory checked in at 2018-12-31 09:39:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/clutter-gtk (Old) and /work/SRC/openSUSE:Factory/.clutter-gtk.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "clutter-gtk" Mon Dec 31 09:39:19 2018 rev:55 rq:661747 version:1.8.4 Changes: -------- --- /work/SRC/openSUSE:Factory/clutter-gtk/clutter-gtk.changes 2018-03-14 19:26:32.459831239 +0100 +++ /work/SRC/openSUSE:Factory/.clutter-gtk.new.28833/clutter-gtk.changes 2018-12-31 09:39:20.702562488 +0100 @@ -1,0 +2,9 @@ +Thu Dec 27 21:26:32 UTC 2018 - [email protected] + +- Add upstream bug fix patches: + + clutter-gtk-Add-private-header.patch: Add private header for + GtkClutterEmbed. + + clutter-gtk-Declare-private-callbacks-static.patch: Declare + private callbacks as static. + +------------------------------------------------------------------- New: ---- clutter-gtk-Add-private-header.patch clutter-gtk-Declare-private-callbacks-static.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ clutter-gtk.spec ++++++ --- /var/tmp/diff_new_pack.r8UEF8/_old 2018-12-31 09:39:21.102562161 +0100 +++ /var/tmp/diff_new_pack.r8UEF8/_new 2018-12-31 09:39:21.102562161 +0100 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -25,6 +25,11 @@ Url: http://clutter-project.org/ Source0: https://download.gnome.org/sources/clutter-gtk/1.8/%{name}-%{version}.tar.xz Source99: baselibs.conf +# PATCH-FIX-UPSTREAM clutter-gtk-Add-private-header.patch -- Add private header for GtkClutterEmbed +Patch0: clutter-gtk-Add-private-header.patch +# PATCH-FIX-UPSTREAM clutter-gtk-Declare-private-callbacks-static.patch -- Declare private callbacks as static +Patch1: clutter-gtk-Declare-private-callbacks-static.patch + BuildRequires: gobject-introspection-devel BuildRequires: gtk-doc BuildRequires: meson @@ -83,7 +88,7 @@ %lang_package %prep -%setup -q +%autosetup -p1 %build %meson \ ++++++ clutter-gtk-Add-private-header.patch ++++++ >From 52abb3fe2e97af2a9e25d5c8c180b16e24b843fd Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi <[email protected]> Date: Wed, 11 Jul 2018 00:35:17 +0100 Subject: [PATCH] Add private header for GtkClutterEmbed Declare _gtk_clutter_embed_set_child_active() in a shared private header, so we can avoid a compiler warning. --- clutter-gtk/Makefile.am | 5 ++-- clutter-gtk/gtk-clutter-embed-private.h | 34 +++++++++++++++++++++++++ clutter-gtk/gtk-clutter-embed.c | 8 +++--- clutter-gtk/gtk-clutter-offscreen.c | 11 +++----- 4 files changed, 46 insertions(+), 12 deletions(-) create mode 100644 clutter-gtk/gtk-clutter-embed-private.h diff --git a/clutter-gtk/Makefile.am b/clutter-gtk/Makefile.am index f84bf2c..0cba73d 100644 --- a/clutter-gtk/Makefile.am +++ b/clutter-gtk/Makefile.am @@ -22,6 +22,7 @@ AM_CFLAGS = $(MAINTAINER_CFLAGS) $(CLUTTER_GTK_DEPS_CFLAGS) lib_LTLIBRARIES = libclutter-gtk-@[email protected] +# please, keep the lists sorted alphabetically source_c = \ gtk-clutter-actor.c \ gtk-clutter-embed.c \ @@ -40,11 +41,11 @@ source_h_public = \ $() source_h_private = \ - gtk-clutter-offscreen.h \ gtk-clutter-actor-internal.h \ + gtk-clutter-embed-private.h \ + gtk-clutter-offscreen.h \ $() -# please, keep the list sorted alphabetically libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_SOURCES = $(source_c) $(source_h) $(source_h_private) libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_LIBADD = $(CLUTTER_GTK_DEPS_LIBS) $(LIBM) libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_LDFLAGS = $(CLUTTER_GTK_LT_LDFLAGS) diff --git a/clutter-gtk/gtk-clutter-embed-private.h b/clutter-gtk/gtk-clutter-embed-private.h new file mode 100644 index 0000000..45fcf7f --- /dev/null +++ b/clutter-gtk/gtk-clutter-embed-private.h @@ -0,0 +1,34 @@ +/* gtk-clutter-embed-private.h: Embeddable ClutterStage + * + * Copyright (C) 2007 OpenedHand + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not see <http://www.fsf.org/licensing>. + * + * Authors: + * Iain Holmes <[email protected]> + * Emmanuele Bassi <[email protected]> + */ + +#pragma once + +#include "gtk-clutter-embed.h" + +G_BEGIN_DECLS + +void +_gtk_clutter_embed_set_child_active (GtkClutterEmbed *embed, + GtkWidget *child, + gboolean active); + +G_END_DECLS diff --git a/clutter-gtk/gtk-clutter-embed.c b/clutter-gtk/gtk-clutter-embed.c index e8c31d4..5979847 100644 --- a/clutter-gtk/gtk-clutter-embed.c +++ b/clutter-gtk/gtk-clutter-embed.c @@ -71,12 +71,14 @@ #include "config.h" -#include <math.h> -#include <string.h> -#include "gtk-clutter-embed.h" +#include "gtk-clutter-embed-private.h" + #include "gtk-clutter-offscreen.h" #include "gtk-clutter-actor.h" +#include <math.h> +#include <string.h> + #include <glib-object.h> #include <gdk/gdk.h> diff --git a/clutter-gtk/gtk-clutter-offscreen.c b/clutter-gtk/gtk-clutter-offscreen.c index c4ebc94..e9d2386 100644 --- a/clutter-gtk/gtk-clutter-offscreen.c +++ b/clutter-gtk/gtk-clutter-offscreen.c @@ -4,17 +4,14 @@ #include "config.h" -#include <gtk/gtk.h> - -#include "gtk-clutter-embed.h" #include "gtk-clutter-offscreen.h" + +#include "gtk-clutter-embed-private.h" #include "gtk-clutter-actor-internal.h" -G_DEFINE_TYPE (GtkClutterOffscreen, _gtk_clutter_offscreen, GTK_TYPE_BIN); +#include <gtk/gtk.h> -void _gtk_clutter_embed_set_child_active (GtkClutterEmbed *embed, - GtkWidget *child, - gboolean active); +G_DEFINE_TYPE (GtkClutterOffscreen, _gtk_clutter_offscreen, GTK_TYPE_BIN) static void gtk_clutter_offscreen_add (GtkContainer *container, -- 2.18.1 ++++++ clutter-gtk-Declare-private-callbacks-static.patch ++++++ >From 6d9ce6e9241b18bf1f9b39c5e803e2b8a67ef783 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi <[email protected]> Date: Wed, 11 Jul 2018 00:36:11 +0100 Subject: [PATCH] Declare private callbacks as static Avoid a compiler warning. --- examples/gtk-clutter-test-actor.c | 2 +- examples/gtk-clutter-test.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/gtk-clutter-test-actor.c b/examples/gtk-clutter-test-actor.c index 9c7d3de..e1b3c54 100644 --- a/examples/gtk-clutter-test-actor.c +++ b/examples/gtk-clutter-test-actor.c @@ -16,7 +16,7 @@ static gboolean do_rotate = TRUE; static int nwidgets; /* Timeline handler */ -void +static void frame_cb (ClutterTimeline *timeline, gint msecs, gpointer data) diff --git a/examples/gtk-clutter-test.c b/examples/gtk-clutter-test.c index e61cd84..3fce37f 100644 --- a/examples/gtk-clutter-test.c +++ b/examples/gtk-clutter-test.c @@ -67,7 +67,7 @@ input_cb (ClutterStage *stage, /* Timeline handler */ -void +static void frame_cb (ClutterTimeline *timeline, gint msecs, gpointer data) -- 2.18.1
