From cc6a15a2b7c35df0c86668beb34ac73c284d5f64a097f99dafe1b1f3198cbe29 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Wed, 21 Dec 2011 04:10:32 +0000 Subject: [PATCH] Accepting request 97280 from home:vuntz:branches:GNOME:Factory Update to 3.3.6 OBS-URL: https://build.opensuse.org/request/show/97280 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=71 --- gtk+-3.3.4.tar.bz2 | 3 -- gtk+-3.3.6.tar.xz | 3 ++ gtk3-parallel-build.patch | 28 ------------------- gtk3.changes | 59 +++++++++++++++++++++++++++++++++++---- gtk3.spec | 37 ++++++++++-------------- 5 files changed, 71 insertions(+), 59 deletions(-) delete mode 100644 gtk+-3.3.4.tar.bz2 create mode 100644 gtk+-3.3.6.tar.xz delete mode 100644 gtk3-parallel-build.patch diff --git a/gtk+-3.3.4.tar.bz2 b/gtk+-3.3.4.tar.bz2 deleted file mode 100644 index 092e54f..0000000 --- a/gtk+-3.3.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:76f08e8aae8ab18865593163c2ee0b694b9618a81536fd56c76ddf124a0df669 -size 17402387 diff --git a/gtk+-3.3.6.tar.xz b/gtk+-3.3.6.tar.xz new file mode 100644 index 0000000..18efdbe --- /dev/null +++ b/gtk+-3.3.6.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ae614b054fa313ae11400eb3446c5b83b41366885946b9375142536ee4944c16 +size 12922180 diff --git a/gtk3-parallel-build.patch b/gtk3-parallel-build.patch deleted file mode 100644 index 37d1ce0..0000000 --- a/gtk3-parallel-build.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 7756f499950cd77d6b8db70a8d49309c459c7cd2 Mon Sep 17 00:00:00 2001 -From: Alexander Larsson -Date: Mon, 28 Nov 2011 08:12:28 +0000 -Subject: Fix up makefile rules for parallel builds - -The gtkwin32css.h generation code used a temporary filename that was also -used by some other files, which is racy. Use a unique one. ---- -diff --git a/gtk/Makefile.am b/gtk/Makefile.am -index 083252f..f082677 100644 ---- a/gtk/Makefile.am -+++ b/gtk/Makefile.am -@@ -913,9 +913,9 @@ gtkmarshalers.c: @REBUILD@ gtkmarshalers.list - gtkwin32css.h: stamp-gtkwin32css.h - @true - stamp-gtkwin32css.h: @REBUILD@ gtk-win32.css -- $(AWK) 'BEGIN { print "static const char *gtk_win32_default_css = " } { print " \"" $$0 "\\n\""} END { print ";" }' < $(srcdir)/gtk-win32.css >> xgen-gmlh\ -- && (cmp -s xgen-gmlh gtkwin32css.h || cp xgen-gmlh gtkwin32css.h) \ -- && rm -f xgen-gmlh \ -+ $(AWK) 'BEGIN { print "static const char *gtk_win32_default_css = " } { print " \"" $$0 "\\n\""} END { print ";" }' < $(srcdir)/gtk-win32.css >> xgen-gw3c\ -+ && (cmp -s xgen-gw3c gtkwin32css.h || cp xgen-gw3c gtkwin32css.h) \ -+ && rm -f xgen-gw3c \ - && echo timestamp > $(@F) - - gtktypebuiltins.h: stamp-gtktypebuiltins.h --- -cgit v0.9.0.2 - diff --git a/gtk3.changes b/gtk3.changes index 4bd772b..1cdca73 100644 --- a/gtk3.changes +++ b/gtk3.changes @@ -1,7 +1,56 @@ +------------------------------------------------------------------- +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 subpackage typelib-1_0-Gtk-3_0. +- 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 @@ -19,11 +68,12 @@ Tue Nov 22 08:38:28 UTC 2011 - dimstar@opensuse.org functions; instead use function attributes + Make GtkCellRendererAccel support naked keyvals, so it can be used in gnome-control-center - + GDK changes + + 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 + + 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 @@ -48,8 +98,7 @@ Tue Nov 22 08:38:28 UTC 2011 - dimstar@opensuse.org 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: - fontsel has been deprecated. +- Rebase gtk3-bnc130159-bgo319483-async-font-selection.patch. ------------------------------------------------------------------- Thu Oct 29 09:03:57 UTC 2011 - dimstar@opensuse.org diff --git a/gtk3.spec b/gtk3.spec index ca5b39c..8da6f2f 100644 --- a/gtk3.spec +++ b/gtk3.spec @@ -24,13 +24,13 @@ Name: gtk3 %define _name gtk+ -Version: 3.3.4 -Release: 1 -License: LGPLv2.1+ +Version: 3.3.6 +Release: 0 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.3/%{_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-FIX-UPSTREAM gtk3-parallel-build.patch dimstar@opensuse.org -- Fix up makefile rules for parallel build. Taken from upstream git. -Patch4: gtk3-parallel-build.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 @@ -103,7 +104,7 @@ 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) +Summary: The GTK+ toolkit library (version 3) -- Introspection bindings Group: System/Libraries %description -n typelib-1_0-Gtk-3_0 @@ -111,8 +112,9 @@ 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} @@ -128,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} @@ -144,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} @@ -160,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} @@ -177,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} @@ -193,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} @@ -209,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} @@ -228,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 @@ -240,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 @@ -252,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} @@ -274,7 +267,6 @@ 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} @@ -296,7 +288,6 @@ cp -a %{S:1} . %endif %patch1 -p0 %patch3 -p1 -%patch4 -p1 %build %configure \