Accepting request 49778 from home:vuntz:branches:GNOME:Factory

Looking forward to see what breaks.. or even better: a working shell again?

OBS-URL: https://build.opensuse.org/request/show/49778
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=10

gtk+-2.90.7.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ff8bff6a422c3e8dadfc4bc1448d5e63b1de0a244eb51a8edd33cfe6f06cc2aa
-size 16921313

gtk+-2.91.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:694e887b946a3aa28af10f776bc6f79bc566d0e1be679783d4e7469bc728aeac
+size 16898729

gtk3-no-gtkapplication.patch

@@ -1,179 +0,0 @@
-Index: gtk+-2.90.7/gtk/Makefile.am
-===================================================================
---- gtk+-2.90.7.orig/gtk/Makefile.am
-+++ gtk+-2.90.7/gtk/Makefile.am
-@@ -158,7 +158,6 @@ gtk_public_h_sources =          \
- 	gtkactivatable.h	\
- 	gtkadjustment.h		\
- 	gtkalignment.h		\
--	gtkapplication.h    \
- 	gtkarrow.h		\
- 	gtkaspectframe.h	\
- 	gtkassistant.h		\
-@@ -418,7 +417,6 @@ gtk_base_c_sources =            \
- 	gtkactivatable.c	\
- 	gtkadjustment.c		\
- 	gtkalignment.c		\
--	gtkapplication.c \
- 	gtkarrow.c		\
- 	gtkaspectframe.c	\
- 	gtkassistant.c		\
-Index: gtk+-2.90.7/gtk/Makefile.in
-===================================================================
---- gtk+-2.90.7.orig/gtk/Makefile.in
-+++ gtk+-2.90.7/gtk/Makefile.in
-@@ -120,7 +120,7 @@ am__libgtk_quartz_3_0_la_SOURCES_DIST =
- 	gtksearchenginesimple.c fnmatch.c gtkaboutdialog.c \
- 	gtkaccelgroup.c gtkaccellabel.c gtkaccelmap.c gtkaccessible.c \
- 	gtkaction.c gtkactiongroup.c gtkactivatable.c gtkadjustment.c \
--	gtkalignment.c gtkapplication.c gtkarrow.c gtkaspectframe.c \
-+	gtkalignment.c gtkarrow.c gtkaspectframe.c \
- 	gtkassistant.c gtkbbox.c gtkbin.c gtkbindings.c gtkbox.c \
- 	gtkbuildable.c gtkbuilder.c gtkbuilderparser.c gtkbutton.c \
- 	gtkcalendar.c gtkcelleditable.c gtkcelllayout.c \
-@@ -201,7 +201,7 @@ am__objects_2 = gtkquery.lo gtksearcheng
- 	gtkaccelgroup.lo gtkaccellabel.lo gtkaccelmap.lo \
- 	gtkaccessible.lo gtkaction.lo gtkactiongroup.lo \
- 	gtkactivatable.lo gtkadjustment.lo gtkalignment.lo \
--	gtkapplication.lo gtkarrow.lo gtkaspectframe.lo \
-+	gtkarrow.lo gtkaspectframe.lo \
- 	gtkassistant.lo gtkbbox.lo gtkbin.lo gtkbindings.lo gtkbox.lo \
- 	gtkbuildable.lo gtkbuilder.lo gtkbuilderparser.lo gtkbutton.lo \
- 	gtkcalendar.lo gtkcelleditable.lo gtkcelllayout.lo \
-@@ -304,7 +304,7 @@ am__libgtk_win32_3_0_la_SOURCES_DIST = g
- 	gtksearchenginesimple.c fnmatch.c gtkaboutdialog.c \
- 	gtkaccelgroup.c gtkaccellabel.c gtkaccelmap.c gtkaccessible.c \
- 	gtkaction.c gtkactiongroup.c gtkactivatable.c gtkadjustment.c \
--	gtkalignment.c gtkapplication.c gtkarrow.c gtkaspectframe.c \
-+	gtkalignment.c gtkarrow.c gtkaspectframe.c \
- 	gtkassistant.c gtkbbox.c gtkbin.c gtkbindings.c gtkbox.c \
- 	gtkbuildable.c gtkbuilder.c gtkbuilderparser.c gtkbutton.c \
- 	gtkcalendar.c gtkcelleditable.c gtkcelllayout.c \
-@@ -387,7 +387,7 @@ am__libgtk_x11_3_0_la_SOURCES_DIST = gtk
- 	gtksearchenginesimple.c fnmatch.c gtkaboutdialog.c \
- 	gtkaccelgroup.c gtkaccellabel.c gtkaccelmap.c gtkaccessible.c \
- 	gtkaction.c gtkactiongroup.c gtkactivatable.c gtkadjustment.c \
--	gtkalignment.c gtkapplication.c gtkarrow.c gtkaspectframe.c \
-+	gtkalignment.c gtkarrow.c gtkaspectframe.c \
- 	gtkassistant.c gtkbbox.c gtkbin.c gtkbindings.c gtkbox.c \
- 	gtkbuildable.c gtkbuilder.c gtkbuilderparser.c gtkbutton.c \
- 	gtkcalendar.c gtkcelleditable.c gtkcelllayout.c \
-@@ -910,7 +910,6 @@ gtk_public_h_sources = \
- 	gtkactivatable.h	\
- 	gtkadjustment.h		\
- 	gtkalignment.h		\
--	gtkapplication.h    \
- 	gtkarrow.h		\
- 	gtkaspectframe.h	\
- 	gtkassistant.h		\
-@@ -1142,7 +1141,6 @@ gtk_base_c_sources = \
- 	gtkactivatable.c	\
- 	gtkadjustment.c		\
- 	gtkalignment.c		\
--	gtkapplication.c \
- 	gtkarrow.c		\
- 	gtkaspectframe.c	\
- 	gtkassistant.c		\
-@@ -1947,7 +1945,6 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkactivatable.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkadjustment.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkalignment.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkapplication.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkarrow.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkaspectframe.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkassistant.Plo@am__quote@
-Index: gtk+-2.90.7/gtk/gtk.h
-===================================================================
---- gtk+-2.90.7.orig/gtk/gtk.h
-+++ gtk+-2.90.7/gtk/gtk.h
-@@ -40,7 +40,6 @@
- #include <gtk/gtkactivatable.h>
- #include <gtk/gtkadjustment.h>
- #include <gtk/gtkalignment.h>
--#include <gtk/gtkapplication.h>
- #include <gtk/gtkarrow.h>
- #include <gtk/gtkaspectframe.h>
- #include <gtk/gtkassistant.h>
-Index: gtk+-2.90.7/gtk/tests/defaultvalue.c
-===================================================================
---- gtk+-2.90.7.orig/gtk/tests/defaultvalue.c
-+++ gtk+-2.90.7/gtk/tests/defaultvalue.c
-@@ -75,7 +75,7 @@ test_type (gconstpointer data)
- 
-   /* These can't be freely constructed/destroyed */
-   if (g_type_is_a (type, GTK_TYPE_PRINT_JOB) ||
--      g_type_is_a (type, GTK_TYPE_APPLICATION) ||
-+      /* g_type_is_a (type, GTK_TYPE_APPLICATION) || */
-       g_type_is_a (type, GDK_TYPE_PIXBUF_LOADER) ||
-       g_type_is_a (type, gdk_pixbuf_simple_anim_iter_get_type ()))
-     return;
-Index: gtk+-2.90.7/gtk/tests/Makefile.am
-===================================================================
---- gtk+-2.90.7.orig/gtk/tests/Makefile.am
-+++ gtk+-2.90.7/gtk/tests/Makefile.am
-@@ -92,7 +92,7 @@ TEST_PROGS			+= action
- action_SOURCES			 = action.c
- action_LDADD			 = $(progs_ldadd)
- 
--SAMPLE_PROGS = gtk-example-application
-+#SAMPLE_PROGS = gtk-example-application
- gtk_example_application_SOURCES	= gtk-example-application.c
- gtk_example_application_LDADD	= $(progs_ldadd)
- 
-Index: gtk+-2.90.7/gtk/tests/Makefile.in
-===================================================================
---- gtk+-2.90.7.orig/gtk/tests/Makefile.in
-+++ gtk+-2.90.7/gtk/tests/Makefile.in
-@@ -56,7 +56,7 @@ am__EXEEXT_2 = testing$(EXEEXT) liststor
- 	recentmanager$(EXEEXT) floating$(EXEEXT) object$(EXEEXT) \
- 	builder$(EXEEXT) $(am__EXEEXT_1) textbuffer$(EXEEXT) \
- 	filtermodel$(EXEEXT) expander$(EXEEXT) action$(EXEEXT)
--am__EXEEXT_3 = gtk-example-application$(EXEEXT)
-+#am__EXEEXT_3 = gtk-example-application$(EXEEXT)
- PROGRAMS = $(noinst_PROGRAMS)
- am_action_OBJECTS = action.$(OBJEXT)
- action_OBJECTS = $(am_action_OBJECTS)
-@@ -474,7 +474,7 @@ expander_SOURCES = expander.c
- expander_LDADD = $(progs_ldadd)
- action_SOURCES = action.c
- action_LDADD = $(progs_ldadd)
--SAMPLE_PROGS = gtk-example-application
-+#SAMPLE_PROGS = gtk-example-application
- gtk_example_application_SOURCES = gtk-example-application.c
- gtk_example_application_LDADD = $(progs_ldadd)
- all: all-am
-Index: gtk+-2.90.7/tests/Makefile.am
-===================================================================
---- gtk+-2.90.7.orig/tests/Makefile.am
-+++ gtk+-2.90.7/tests/Makefile.am
-@@ -93,7 +93,7 @@ noinst_PROGRAMS =  $(TEST_PROGS)	\
- 	testwrapbox
- 
- if USE_X11
--noinst_PROGRAMS += testapplication
-+#noinst_PROGRAMS += testapplication
- endif
- 
- if HAVE_CXX
-Index: gtk+-2.90.7/tests/Makefile.in
-===================================================================
---- gtk+-2.90.7.orig/tests/Makefile.in
-+++ gtk+-2.90.7/tests/Makefile.in
-@@ -69,7 +69,7 @@ noinst_PROGRAMS = $(am__EXEEXT_1) simple
- 	testtooltips$(EXEEXT) testexpander$(EXEEXT) \
- 	testvolumebutton$(EXEEXT) testwrapbox$(EXEEXT) $(am__EXEEXT_3) \
- 	$(am__EXEEXT_4)
--@USE_X11_TRUE@am__append_1 = testapplication
-+#@USE_X11_TRUE@am__append_1 = testapplication
- @HAVE_CXX_TRUE@am__append_2 = autotestkeywords
- @HAVE_CXX_TRUE@TESTS = autotestkeywords$(EXEEXT)
- @HAVE_CXX_TRUE@@HAVE_OBJC_TRUE@am__append_3 = -DHAVE_OBJC=1 -x objective-c++
-@@ -86,7 +86,7 @@ CONFIG_CLEAN_VPATH_FILES =
- am__EXEEXT_1 =
- @USE_X11_TRUE@am__EXEEXT_2 = testsocket$(EXEEXT) \
- @USE_X11_TRUE@	testsocket_child$(EXEEXT)
--@USE_X11_TRUE@am__EXEEXT_3 = testapplication$(EXEEXT)
-+#@USE_X11_TRUE@am__EXEEXT_3 = testapplication$(EXEEXT)
- @HAVE_CXX_TRUE@am__EXEEXT_4 = autotestkeywords$(EXEEXT)
- PROGRAMS = $(noinst_PROGRAMS)
- am__autotestkeywords_SOURCES_DIST = autotestkeywords.cc

gtk3.changes

@@ -1,3 +1,57 @@
+-------------------------------------------------------------------
+Tue Oct  5 09:49:22 CEST 2010 - vuntz@opensuse.org
+
+- Update to version 2.91.0:
+  + The rendering cleanup work has landed. This is a large change
+    that affects many APIs.
+    - All gtkstyle functions have been changed to take a cairo_t
+      argument instead of a window + area.
+    - GdkPixmap is gone. APIs that took pixmaps are being replaced
+      by ones that take pixbufs or cairo surfaces, or regions
+      (where pixmaps were used as masks). In background handling,
+      pixmaps have been replaced by cairo patterns, see
+      gdk_window_set_background_pattern().
+    - GdkColormap is gone. It is replaced by visuals, see
+      gtk_widget_set_visual().
+    - The ::expose-event signal on GtkWidget has been replaced by a
+      ::draw signal.
+    - gtk_widget_get_snapshot() has been removed. Instead,
+      gtk_widget_draw() can render a widget onto an cairo_t.
+  + The GtkSizeRequest interface has been merged into GtkWidget,
+    and GtkCellSizeRequest has been merged into GtkCellRenderer.
+    The wrapper functions have been renamed to include 'preferred',
+    e.g gtk_size_request_get_width() is now
+    gtk_widget_get_preferred_width() and
+    gtk_cell_size_request_get_width_for_height() is now
+    gtk_cell_renderer_get_preferred_width_for_height().
+  + GtkObject has been removed. The ::destroy signal has been moved
+    to GtkWidget. At the same time, GtkWidgetFlags have been
+    removed, they already had getters and setters anyway.
+  + GtkWidget has gained generic alignment and padding properties:
+    halign, valign, margin-left, margin-right, margin-top,
+    margin-bottom. These can be used instead of container-specific
+    child properties or GtkMisc and GtkAlignment widgets.
+  + Container widgets can now let GTK+ handle border-width for
+    them, using gtk_container_class_handle_border_width()
+  + The GtkEditableClass struct has been renamed to
+    GtkEditableInterface
+  + Mouse wheel scrolling has been removed from GtkNotebook
+  + The default policy for scrolled windows has been changed to
+    'automatic'
+  + Global url hooks have been removed from GtkAboutDialog and
+    GtkLinkButton
+  + The global window creation hook has been removed from
+    GtkNotebook
+  + The error handling in GDK has been modernized and avoids
+    synchronizing X requests as much as possible
+  + Fixed Bugs: bgo#323904, bgo#339745, bgo#468672, bgo#486839,
+    bgo#601731, bgo#617316, bgo#621590, bgo#623664, bgo#628829,
+    bgo#629177, bgo#629277, bgo#629387, bgo#629598, bgo#629608,
+    bgo#629733, bgo#629748, bgo#629785, bgo#630033, bgo#630226,
+    bgo#630520, bgo#630521, bgo#630532.
+  + Updated translations.
+- Drop gtk3-no-gtkapplication.patch: we have glib 2.27.0 now.
+
 -------------------------------------------------------------------
 Sat Sep 18 12:35:00 CEST 2010 - vuntz@opensuse.org
 

gtk3.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package gtk3 (Version 2.90.7)
+# spec file for package gtk3 (Version 2.91.0)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # Copyright (c) 2010 Dominique Leuenebrger, Amsterdam, Netherlands
@@ -20,7 +20,7 @@
 
 Name:           gtk3
 %define _name gtk+
-Version:        2.90.7
+Version:        2.91.0
 Release:        1
 # FIXME: 2.90.5 doesn't compile with parallel build (bgo#624304). Check if this is still true for later versions.
 License:        LGPLv2.1+
@@ -40,8 +40,6 @@ Patch1:         gtk3-path-local.patch
 Patch2:         gtk3-bnc129753-localize-font-style-name.patch
 # PATCH-FIX-UPSTREAM gtk3-bnc130159-bgo319483-async-font-selection.patch bnc130159 bgo319483 federico@novell.com - Load fonts asynchronously in GtkFontSelection to make it appear faster for CJK languages
 Patch3:         gtk3-bnc130159-bgo319483-async-font-selection.patch
-# PATCH-FIX-OPENSUSE gtk3-no-gtkapplication.patch vuntz@opensuse.org -- Drop GtkApplication. This is needed to keep gtk3 building against glib 2.25/2.26
-Patch4:         gtk3-no-gtkapplication.patch
 BuildRequires:  fdupes
 BuildRequires:  cups-devel
 BuildRequires:  gnome-patch-translation
@@ -148,9 +146,6 @@ cp -a %{S:1} .
 %patch1 -p0
 %patch2 -p1
 %patch3 -p1
-# Hack to make sure we're right to remove GtkApplication
-test ! -f %{_includedir}/glib-2.0/gio/gapplication.h
-%patch4 -p1
 gnome-patch-translation-update
 
 %build