From eaa91e5c9f5f88ec473f50984fb2ee7b19320aeb1409fcec484d6e70cde0e7af Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 30 Nov 2010 08:59:52 +0000 Subject: [PATCH 1/2] Accepting request 54139 from home:vuntz:branches:GNOME:Factory OBS-URL: https://build.opensuse.org/request/show/54139 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=21 --- gtk3.changes | 6 ++++++ gtk3.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gtk3.changes b/gtk3.changes index bdcce13..3ca5b7f 100644 --- a/gtk3.changes +++ b/gtk3.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Nov 30 09:47:32 CET 2010 - vuntz@opensuse.org + +- Make gtk3-devel depend on python-xml instead of pyxml: pyxml will + be removed, and we really wanted to use python-xml anyway. + ------------------------------------------------------------------- Wed Nov 17 17:17:36 CET 2010 - dimstar@opensuse.org diff --git a/gtk3.spec b/gtk3.spec index 421611c..cefdb87 100644 --- a/gtk3.spec +++ b/gtk3.spec @@ -256,7 +256,7 @@ Summary: The GTK+ toolkit library (version 3) -- Development Files Group: Development/Libraries/X11 Requires: libgtk-3_0-0 = %{version} # gtk-builder-convert needs this. -Requires: pyxml +Requires: python-xml %description devel GTK+ is a multi-platform toolkit for creating graphical user interfaces. From fe0193f13cc6e87edb6c3d5c191d21f16cf355533cf01b83b3aa3da31ec42d15 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Tue, 30 Nov 2010 12:53:33 +0000 Subject: [PATCH 2/2] Accepting request 54160 from home:dimstar:branches:GNOME:Factory thanks OBS-URL: https://build.opensuse.org/request/show/54160 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=22 --- gtk+-2.91.4.tar.bz2 | 3 --- gtk+-2.91.5.tar.bz2 | 3 +++ gtk3-introspection-build-fix.patch | 26 -------------------------- gtk3.changes | 20 ++++++++++++++++++++ gtk3.spec | 7 ++----- 5 files changed, 25 insertions(+), 34 deletions(-) delete mode 100644 gtk+-2.91.4.tar.bz2 create mode 100644 gtk+-2.91.5.tar.bz2 delete mode 100644 gtk3-introspection-build-fix.patch diff --git a/gtk+-2.91.4.tar.bz2 b/gtk+-2.91.4.tar.bz2 deleted file mode 100644 index 1e1a8a6..0000000 --- a/gtk+-2.91.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1e56f27762e3755190134dc9a02c2487b980164611eded43097184fbc2c16bba -size 16346360 diff --git a/gtk+-2.91.5.tar.bz2 b/gtk+-2.91.5.tar.bz2 new file mode 100644 index 0000000..ad6758d --- /dev/null +++ b/gtk+-2.91.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3893a158682e4954e31847c5f4aaa1b1f0ff259cff8d141f8ed8a58121e2cc21 +size 16380309 diff --git a/gtk3-introspection-build-fix.patch b/gtk3-introspection-build-fix.patch deleted file mode 100644 index 327eb04..0000000 --- a/gtk3-introspection-build-fix.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: gtk+-2.91.4/gtk/Makefile.am -=================================================================== ---- gtk+-2.91.4.orig/gtk/Makefile.am -+++ gtk+-2.91.4/gtk/Makefile.am -@@ -918,7 +918,7 @@ Gtk_3_0_gir_CFLAGS = \ - -DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API - Gtk_3_0_gir_LIBS = $(gtktargetlib) - if USE_X11 --Gtk_3_0_gir_LIBS += $(top_builddir)/gdk/x11/libgdk-x11.la -+Gtk_3_0_gir_LIBS += $(top_builddir)/gdk/libgdk-x11-3.0.la - endif - Gtk_3_0_gir_FILES = $(introspection_files) - INTROSPECTION_GIRS += Gtk-3.0.gir -Index: gtk+-2.91.4/gtk/Makefile.in -=================================================================== ---- gtk+-2.91.4.orig/gtk/Makefile.in -+++ gtk+-2.91.4/gtk/Makefile.in -@@ -68,7 +68,7 @@ DIST_COMMON = $(am__gtkunixprintinclude_ - @USE_QUARTZ_TRUE@@USE_WIN32_FALSE@@USE_X11_FALSE@am__append_12 = $(gtk_use_quartz_c_sources) - @USE_QUARTZ_FALSE@@USE_WIN32_FALSE@@USE_X11_FALSE@am__append_13 = $(gtk_use_stub_c_sources) - @HAVE_INTROSPECTION_TRUE@@USE_X11_TRUE@am__append_14 = --add-include-path=$(top_builddir)/gdk/x11 --@HAVE_INTROSPECTION_TRUE@@USE_X11_TRUE@am__append_15 = $(top_builddir)/gdk/x11/libgdk-x11.la -+@HAVE_INTROSPECTION_TRUE@@USE_X11_TRUE@am__append_15 = $(top_builddir)/gdk/libgdk-x11-3.0.la - @HAVE_INTROSPECTION_TRUE@am__append_16 = Gtk-3.0.gir - @HAVE_INTROSPECTION_TRUE@am__append_17 = $(gir_DATA) $(typelibs_DATA) - bin_PROGRAMS = gtk-query-immodules-3.0$(EXEEXT) \ diff --git a/gtk3.changes b/gtk3.changes index 3ca5b7f..e97ba1a 100644 --- a/gtk3.changes +++ b/gtk3.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Tue Nov 30 09:48:47 CET 2010 - dimstar@opensuse.org + +- Update to version 2.91.5: + + GtkSwitch: a new widget that provides switch-like on/off + functionality + + Deprecations and cleanups: + - GtkCallbackMarshal and GtkFunction have been deprecated + - gtk_init_add has been removed + - The ::size-request signal has been removed + - GtkRuler has been removed + + The default value for the GtkBox::fill property has been + changed back to TRUE + + Bugs fixed: bgo#613942, bgo#629955, bgo#633324, bgo#633896, + bgo#634474, bgo#634558, bgo#634592, bgo#634697, bgo#634821, + bgo#634987, bgo#635175, bgo#635253, bgo#635307, bgo#635380, + bgo#635588, bgo#635693, bgo#635879. + + Updated translations. +- Drop gtk3-introspection-build-fix.patch: fixed upstream. + ------------------------------------------------------------------- Tue Nov 30 09:47:32 CET 2010 - vuntz@opensuse.org diff --git a/gtk3.spec b/gtk3.spec index cefdb87..e6238b3 100644 --- a/gtk3.spec +++ b/gtk3.spec @@ -1,5 +1,5 @@ # -# spec file for package gtk3 (Version 2.91.4) +# spec file for package gtk3 (Version 2.91.5) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 Dominique Leuenebrger, Amsterdam, Netherlands @@ -22,7 +22,7 @@ Name: gtk3 %define _name gtk+ -Version: 2.91.4 +Version: 2.91.5 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+ @@ -42,8 +42,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-UPSTREAM gtk3-introspection-build-fix.patch vuntz@opensuse.org -- Fix build of introspection data, taken from git -Patch4: gtk3-introspection-build-fix.patch BuildRequires: fdupes BuildRequires: cups-devel BuildRequires: gnome-patch-translation @@ -276,7 +274,6 @@ cp -a %{S:1} . %patch1 -p0 %patch2 -p1 %patch3 -p1 -%patch4 -p1 gnome-patch-translation-update %build