Accepting request 99067 from GNOME:Factory

Pushing G:F

OBS-URL: https://build.opensuse.org/request/show/99067
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gtk3?expand=0&rev=28

gtk+-3.2.1.tar.bz2

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

gtk+-3.3.6.tar.xz

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

gtk3-bnc130159-bgo319483-async-font-selection.patch

@@ -1,7 +1,7 @@
 Index: gtk+-2.90.6/gtk/gtkfontsel.c
 ===================================================================
---- gtk+-2.90.6.orig/gtk/gtkfontsel.c
+--- gtk+-2.90.6.orig/gtk/deprecated/gtkfontsel.c
-+++ gtk+-2.90.6/gtk/gtkfontsel.c
++++ gtk+-2.90.6/gtk/deprecated/gtkfontsel.c
 @@ -130,6 +130,8 @@ struct _GtkFontSelectionDialogPrivate
  #define FONT_STYLE_LIST_WIDTH	170
  #define FONT_SIZE_LIST_WIDTH	60

gtk3-immodule-fallback.patch

@@ -1,81 +0,0 @@
-diff --git a/gtk/gtkimmodule.c b/gtk/gtkimmodule.c
-index 593a868..c5bd139 100644
---- a/gtk/gtkimmodule.c
-+++ b/gtk/gtkimmodule.c
-@@ -648,6 +648,26 @@ match_locale (const gchar *locale,
-   return 0;
- }
- 
-+static const gchar *
-+lookup_immodule (gchar **immodules_list)
-+{
-+  while (immodules_list && *immodules_list)
-+    {
-+      if (g_strcmp0 (*immodules_list, SIMPLE_ID) == 0)
-+        return SIMPLE_ID;
-+      else
-+       {
-+         GtkIMModule *module;
-+         module = g_hash_table_lookup (contexts_hash, *immodules_list);
-+         if (module)
-+           return module->contexts[0]->context_id;
-+       }
-+      immodules_list++;
-+    }
-+
-+  return NULL;
-+}
-+
- /**
-  * _gtk_im_module_get_default_context_id:
-  * @client_window: a window
-@@ -664,7 +684,7 @@ _gtk_im_module_get_default_context_id (GdkWindow *client_window)
-   const gchar *context_id = NULL;
-   gint best_goodness = 0;
-   gint i;
--  gchar *tmp_locale, *tmp;
-+  gchar *tmp_locale, *tmp, **immodules;
-   const gchar *envvar;
-   GdkScreen *screen;
-   GtkSettings *settings;
-@@ -672,11 +692,16 @@ _gtk_im_module_get_default_context_id (GdkWindow *client_window)
-   if (!contexts_hash)
-     gtk_im_module_initialize ();
- 
--  envvar = g_getenv ("GTK_IM_MODULE");
--  if (envvar &&
--      (strcmp (envvar, SIMPLE_ID) == 0 ||
--       g_hash_table_lookup (contexts_hash, envvar))) 
--    return envvar;
-+  envvar = g_getenv("GTK_IM_MODULE");
-+  if (envvar)
-+    {
-+        immodules = g_strsplit(envvar, ":", 0);
-+        context_id = lookup_immodule(immodules);
-+        g_strfreev(immodules);
-+
-+        if (context_id)
-+          return context_id;
-+    }
- 
-   /* Check if the certain immodule is set in XSETTINGS.
-    */
-@@ -687,15 +712,9 @@ _gtk_im_module_get_default_context_id (GdkWindow *client_window)
-       g_object_get (G_OBJECT (settings), "gtk-im-module", &tmp, NULL);
-       if (tmp)
-         {
--          if (strcmp (tmp, SIMPLE_ID) == 0)
--            context_id = SIMPLE_ID;
--          else
--            {
--              GtkIMModule *module;
--              module = g_hash_table_lookup (contexts_hash, tmp);
--              if (module)
--                context_id = module->contexts[0]->context_id;
--            }
-+          immodules = g_strsplit(tmp, ":", 0);
-+          context_id = lookup_immodule(immodules);
-+          g_strfreev(immodules);
-           g_free (tmp);
- 
-        	  if (context_id)

gtk3-path-local.patch

@@ -17,7 +17,7 @@ Index: gtk/gtkmodules.c
 ===================================================================
 --- gtk/gtkmodules.c.orig
 +++ gtk/gtkmodules.c
-@@ -58,6 +58,7 @@ get_module_path (void)
+@@ -60,6 +60,7 @@ get_module_path (void)
    gchar *home_gtk_dir = NULL;
    gchar *module_path;
    gchar *default_dir;
@@ -25,7 +25,7 @@ Index: gtk/gtkmodules.c
    static gchar **result = NULL;
  
    if (result)
-@@ -71,25 +72,32 @@ get_module_path (void)
+@@ -73,25 +74,32 @@ get_module_path (void)
    exe_prefix = g_getenv ("GTK_EXE_PREFIX");
  
    if (exe_prefix)
@@ -35,7 +35,7 @@ Index: gtk/gtkmodules.c
 +  }
    else
 +  {
-     default_dir = g_build_filename (GTK_LIBDIR, "gtk-3.0", NULL);
+     default_dir = g_build_filename (_gtk_get_libdir (), "gtk-3.0", NULL);
 +    local_dir = g_build_filename ("/usr/local", SUSE_HACK_LIB, "gtk-3.0", NULL);
 +  }
  
@@ -81,7 +81,7 @@ Index: gtk/Makefile.in
 ===================================================================
 --- gtk/Makefile.in.orig
 +++ gtk/Makefile.in
-@@ -926,8 +926,10 @@ DIST_SUBDIRS = theme-bits tests
+@@ -806,8 +806,10 @@ SUBDIRS = a11y . tests
  @HAVE_CUPS_FALSE@@HAVE_PAPI_CUPS_FALSE@@HAVE_PAPI_TRUE@GTK_PRINT_BACKENDS = file,papi
  @HAVE_CUPS_TRUE@@HAVE_PAPI_CUPS_FALSE@GTK_PRINT_BACKENDS = file,cups
  @HAVE_PAPI_CUPS_TRUE@GTK_PRINT_BACKENDS = file,papi,cups

gtk3.changes

@@ -1,3 +1,131 @@
+-------------------------------------------------------------------
+Tue Dec 20 08:59:47 UTC 2011 - vuntz@opensuse.org
+
+- Update to version 3.3.6:
+  + GtkApplication has grown support for exporting application
+    menus and menubars on the bus, as a GMenuModel. The new
+    GtkApplicationWindow toplevel automatically displays these menu
+    models when needed.
+  + GtkSpinButtons have received a long-overdue face-lift to make
+    them easier to use with both mouse and touch.
+  + GtkScale has gained a has-origin property to request filled-in
+    drawing of the trough.
+  + GtkWindow can now request that the window manager hide the
+    titlebar when the window is maximized.
+  + The GtkTreeView accessibility support and the core treeview
+    code have been extensively refactored; performance should be
+    much improved. But watch out for regressions.
+  + The GtkFileChooser entry completion code has been extensively
+    refactored; it now uses GtkEntryCompletion.
+  + Excessive dependencies have been culled from Requires: lines in
+    pc files. Dependent modules may have to declare dependencies
+    that they were getting 'for free' in the past.
+  + Theming improvements:
+    - The background-clip and background-origin CSS properties have
+      been implemented.
+  + Win32 improvements:
+    - Theming of column headers, radio buttons and menuitems,
+      notebook tabs, etc has been fixed.
+    - Menus, tooltips, and other popups show above the task bar.
+  + Wayland:
+    - The Wayland backend has been updated to the current Wayland
+      API.
+  + Bugs fixed:
+    - bgo#664640: CUPS authentication does not work
+    - bgo#641999: Consider adding a workarea API
+    - bgo#603823, bgo#640317, bgo#646461, bgo#650943, bgo#661428,
+      bgo#662814, bgo#664137, bgo#664456, bgo#664467, bgo#664469,
+      bgo#664537, bgo#665140, bgo#665326, bgo#665616, bgo#665741,
+      bgo#665999, bgo#666242, bgo#657578, bgo#659445, bgo#663573,
+      bgo#666392, bgo#666552.
+  + Updated translations.
+- Add xz BuildRequires because we can't build a package for a
+  xz-compressed tarball without explicitly specifying that... See
+  bnc#697467 for more details.
+- Add explicit pkgconfig(gmodule-2.0) and pkgconfig(pangoft2)
+  BuildRequires: they were missing before.
+- Drop gtk3-parallel-build.patch: fixed upstream.
+
+-------------------------------------------------------------------
+Thu Dec  8 22:05:42 UTC 2011 - dimstar@opensuse.org
+
+- Split typelib files into typelib-1_0-Gtk-3_0 subpackage.
+- Add typelib-1_0-Gtk-3_0 Requires to devel subpackage.
+
+-------------------------------------------------------------------
+Wed Nov 30 20:08:11 UTC 2011 - dimstar@opensuse.org
+
+- Add gtk3-parallel-build.patch: Fix up makefile rules for parallel
+  builds. Avoids random build failures. Taken from git, commit
+  id=7756f49.
+
+-------------------------------------------------------------------
+Tue Nov 22 08:38:28 UTC 2011 - dimstar@opensuse.org
+
+- Update to version 3.3.4:
+  + The beagle search backend has been dropped
+  + Stop using GDK/GTK_DISABLE_DEPRECATED guards for deprecated
+    functions; instead use function attributes
+  + Make GtkCellRendererAccel support naked keyvals, so it can
+    be used in gnome-control-center
+  + GDK changes:
+    - Make the Mod1 == Alt assumption official
+    - The Broadway backend has initial support for V7+ websockets
+  + GtkApplication no longer uses gtk_main internally
+  + GtkNotebook now destroys its action widgets, instead of leaking
+    them
+  + Theming improvements:
+    - Background images can now be tiled instead of stretched,
+      using the background-repeat CSS property
+    - Unfocused windows can be themed differently, using
+      the 'window-unfocused' state flag
+  + Accessibility improvements:
+    - Much better treeview performance
+    - Completely ignore invisible columns in treeviews
+    - Many a11y/treeview-related crashes fixed
+    - Combo box keybindings are reported again
+    - Textview respects display lines again
+  + OS X improvements
+  + Win32 improvements
+  + Bugs fixed: bgo#84314, bgo#142874, bgo#169811, bgo#171456,
+    bgo#324254, bgo#516822, bgo#542777, bgo#552041, bgo#603559,
+    bgo#604156, bgo#606727, bgo#612359, bgo#616544, bgo#628049,
+    bgo#631384, bgo#647460, bgo#652239, bgo#658841, bgo#658842,
+    bgo#659151, bgo#659257, bgo#661858, bgo#661859, bgo#661997,
+    bgo#662160, bgo#662628, bgo#662670, bgo#662691, bgo#662755,
+    bgo#662839, bgo#662870, bgo#662953, bgo#663073, bgo#663138,
+    bgo#663182, bgo#663345, bgo#663396, bgo#663522, bgo#663605,
+    bgo#663694, bgo#663761, bgo#663825, bgo#663856, bgo#663994,
+    bgo#664021, bgo#664027, bgo#664132.
+- Drop gtk3-immodule-fallback.patch: fixed upstream.
+- Rebase gtk3-bnc130159-bgo319483-async-font-selection.patch.
+
+-------------------------------------------------------------------
+Thu Oct 29 09:03:57 UTC 2011 - dimstar@opensuse.org
+
+- Update to version 3.3.2:
+  + GtkCellRendererAccel can show virtual modifiers
+  + Theming improvements:
+    - CSS: 'transparent' can be used a color
+    - Improved notebook tab rendering
+    - Support opacity and rounded corners for tooltips
+  + Improvements of cross-platform key and button event handling:
+    - Support '<Primary>' in accelerator strings
+    - Use appropriate modifiers for extending and modifying
+      selections, depending on the platform
+    - Use the appropriate button for triggering context menus,
+      depending on the platform
+  + OS X improvements.
+  + Bugs fixed: bgo#628936, bgo#653289, bgo#655057, bgo#657770,
+    bgo#658767, bgo#658772, bgo#659022, bgo#659655, bgo#660687,
+    bgo#660730, bgo#659602, bgo#659406, bgo#660619, bgo#599617,
+    bgo#628936, bgo#631167, bgo#651818, bgo#659672, bgo#660139,
+    bgo#660833, bgo#661032, bgo#661089, bgo#661780, bgo#661835,
+    bgo#662024, bgo#662132, bgo#662177, bgo#662230, bgo#662308,
+    bgo#662467, bgo#662481, bgo#662629.
+  + Updated translations.
+- Rebase gtk3-path-local.patch.
+
 -------------------------------------------------------------------
 Fri Oct 28 12:50:50 UTC 2011 - vuntz@opensuse.org
 

gtk3.spec

@@ -24,13 +24,13 @@
 
 Name:           gtk3
 %define _name gtk+
-Version:        3.2.1
+Version:        3.3.6
-Release:        1
+Release:        0
-License:        LGPLv2.1+
 Summary:        The GTK+ toolkit library (version 3)
-Url:            http://www.gtk.org/
+License:        LGPL-2.1+
 Group:          System/Libraries
-Source:         http://download.gnome.org/sources/gtk+/3.2/%{_name}-%{version}.tar.bz2
+Url:            http://www.gtk.org/
+Source:         http://download.gnome.org/sources/gtk+/3.3/%{_name}-%{version}.tar.xz
 Source1:        README.SUSE
 Source2:        settings.ini
 Source3:        macros.gtk3
@@ -41,18 +41,20 @@ Patch0:         gtk3-GTK_PATH64.patch
 Patch1:         gtk3-path-local.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-FEATURE-UPSTREAM gtk3-immodule-fallback.patch bgo#603559 bnc#723382 vuntz@opensuse.org -- Make it possible to specify fallback im modules in GTK_IM_MODULE; useful in case a module doesn't exist for both gtk2 and gtk3
-Patch4:         gtk3-immodule-fallback.patch
-BuildRequires:  fdupes
 BuildRequires:  cups-devel
+BuildRequires:  fdupes
+# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467
+BuildRequires:  xz
 BuildRequires:  pkgconfig(atk) >= 2.1.5
 BuildRequires:  pkgconfig(cairo)
 BuildRequires:  pkgconfig(colord)
 BuildRequires:  pkgconfig(fontconfig)
 BuildRequires:  pkgconfig(gdk-pixbuf-2.0) >= 2.23.5
-BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(glib-2.0) >= 2.31.6
+BuildRequires:  pkgconfig(gmodule-2.0)
 BuildRequires:  pkgconfig(gobject-introspection-1.0)
 BuildRequires:  pkgconfig(pango)
+BuildRequires:  pkgconfig(pangoft2)
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xcomposite)
 BuildRequires:  pkgconfig(xcursor)
@@ -70,7 +72,6 @@ Offering a complete set of widgets, GTK+ is suitable for projects
 ranging from small one-off projects to complete application suites.
 
 %package -n libgtk-3-0
-License:        LGPLv2.1+
 Summary:        The GTK+ toolkit library (version 3)
 Group:          System/Libraries
 Requires(post): %{name}-tools
@@ -102,8 +103,18 @@ GTK+ is a multi-platform toolkit for creating graphical user interfaces.
 Offering a complete set of widgets, GTK+ is suitable for projects
 ranging from small one-off projects to complete application suites.
 
+%package -n typelib-1_0-Gtk-3_0
+Summary:        The GTK+ toolkit library (version 3) -- Introspection bindings
+Group:          System/Libraries
+
+%description -n typelib-1_0-Gtk-3_0
+GTK+ is a multi-platform toolkit for creating graphical user interfaces.
+Offering a complete set of widgets, GTK+ is suitable for projects
+ranging from small one-off projects to complete application suites.
+
+This package provides the GObject Introspection bindings for GTK+.
+
 %package immodule-amharic
-License:        LGPLv2.1+
 Summary:        The GTK+ toolkit library (version 3) -- Amharic Input Method
 Group:          System/Libraries
 Requires:       %{name} = %{version}
@@ -119,7 +130,6 @@ ranging from small one-off projects to complete application suites.
 This package provides an input method for Amharic.
 
 %package immodule-inuktitut
-License:        LGPLv2.1+
 Summary:        The GTK+ toolkit library (version 3) -- Inuktitut Input Method
 Group:          System/Libraries
 Requires:       %{name} = %{version}
@@ -135,7 +145,6 @@ ranging from small one-off projects to complete application suites.
 This package provides an input method for Inuktitut.
 
 %package immodule-multipress
-License:        LGPLv2.1+
 Summary:        The GTK+ toolkit library (version 3) -- Multipress Input Method
 Group:          System/Libraries
 Requires:       %{name} = %{version}
@@ -151,7 +160,6 @@ This package provides an input method which allows text entry via the
 multi-press method, as on a mobile phone.
 
 %package immodule-thai
-License:        LGPLv2.1+
 Summary:        The GTK+ toolkit library (version 3) -- Thai-Lao Input Method
 Group:          System/Libraries
 Requires:       %{name} = %{version}
@@ -168,7 +176,6 @@ ranging from small one-off projects to complete application suites.
 This package provides an input method for Thai-Lao.
 
 %package immodules-tigrigna
-License:        LGPLv2.1+
 Summary:        The GTK+ toolkit library (version 3) -- Tigrigna Input Methods
 Group:          System/Libraries
 Requires:       %{name} = %{version}
@@ -184,7 +191,6 @@ ranging from small one-off projects to complete application suites.
 This package provides two input methods for Tigrigna.
 
 %package immodule-vietnamese
-License:        LGPLv2.1+
 Summary:        The GTK+ toolkit library (version 3) -- Vietnamese Input Method
 Group:          System/Libraries
 Requires:       %{name} = %{version}
@@ -200,7 +206,6 @@ ranging from small one-off projects to complete application suites.
 This package provides an input method for Vietnamese.
 
 %package immodule-xim
-License:        LGPLv2.1+
 Summary:        The GTK+ toolkit library (version 3) -- X Input Method
 Group:          System/Libraries
 Requires:       %{name} = %{version}
@@ -219,7 +224,6 @@ ranging from small one-off projects to complete application suites.
 This package provides an input method based on the X Input Method.
 
 %package tools
-License:        LGPLv2.1+
 Summary:        The GTK+ toolkit library (version 3) -- Tools
 Group:          System/Libraries
 Requires(post): update-alternatives
@@ -231,7 +235,6 @@ Offering a complete set of widgets, GTK+ is suitable for projects
 ranging from small one-off projects to complete application suites.
 
 %package data
-License:        LGPLv2.1+
 Summary:        The GTK+ toolkit library (version 3) -- Data Files
 Group:          System/Libraries
 BuildArch:      noarch
@@ -243,7 +246,6 @@ Offering a complete set of widgets, GTK+ is suitable for projects
 ranging from small one-off projects to complete application suites.
 
 %package branding-upstream
-License:        LGPLv2.1+
 Summary:        The GTK+ toolkit library (version 3) -- Upstream theme configuration
 Group:          System/Libraries
 Requires:       libgtk-3-0 = %{version}
@@ -265,10 +267,10 @@ This package provides the upstream theme configuration for widgets and
 icon themes.
 
 %package devel
-License:        LGPLv2.1+
 Summary:        The GTK+ toolkit library (version 3) -- Development Files
 Group:          Development/Libraries/X11
 Requires:       libgtk-3-0 = %{version}
+Requires:       typelib-1_0-Gtk-3_0 = %{version}
 
 %description devel
 GTK+ is a multi-platform toolkit for creating graphical user interfaces.
@@ -286,7 +288,6 @@ cp -a %{S:1} .
 %endif
 %patch1 -p0
 %patch3 -p1
-%patch4 -p1
 
 %build
 %configure \
@@ -465,6 +466,9 @@ fi
 %{_libdir}/libgailutil-3.so.*
 %{_libdir}/libgdk-3.so.*
 %{_libdir}/libgtk-3.so.*
+
+%files -n typelib-1_0-Gtk-3_0
+%defattr(-,root,root)
 %{_libdir}/girepository-1.0/Gdk-3.0.typelib
 %{_libdir}/girepository-1.0/GdkX11-3.0.typelib
 %{_libdir}/girepository-1.0/Gtk-3.0.typelib