From f5f315ecc03081c57abdc3ff7e813f62c3887c77a100a033480298c4be9cfa8a Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Wed, 17 Aug 2011 20:43:36 +0000 Subject: [PATCH 1/3] Accepting request 79024 from home:dimstar:branches:GNOME:Factory Update to 3.1.12 OBS-URL: https://build.opensuse.org/request/show/79024 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=54 --- gtk+-3.1.10.tar.bz2 | 3 --- gtk+-3.1.12.tar.bz2 | 3 +++ gtk3-enabledeprecated.patch | 11 +++++++++++ gtk3.changes | 18 ++++++++++++++++++ gtk3.spec | 7 +++++-- 5 files changed, 37 insertions(+), 5 deletions(-) delete mode 100644 gtk+-3.1.10.tar.bz2 create mode 100644 gtk+-3.1.12.tar.bz2 create mode 100644 gtk3-enabledeprecated.patch diff --git a/gtk+-3.1.10.tar.bz2 b/gtk+-3.1.10.tar.bz2 deleted file mode 100644 index 91b2407..0000000 --- a/gtk+-3.1.10.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:40bec15c44f95a269526e0aab3fad3c0d1d66f3d3445507887b20af6f4269f81 -size 17293442 diff --git a/gtk+-3.1.12.tar.bz2 b/gtk+-3.1.12.tar.bz2 new file mode 100644 index 0000000..6fbce0b --- /dev/null +++ b/gtk+-3.1.12.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aefdfa7222792197aa542a79ae11df16fa600f80454d6feda51309a5ebe015aa +size 17304192 diff --git a/gtk3-enabledeprecated.patch b/gtk3-enabledeprecated.patch new file mode 100644 index 0000000..a1ed858 --- /dev/null +++ b/gtk3-enabledeprecated.patch @@ -0,0 +1,11 @@ +diff -ur gtk+-3.1.12//tests/testtoplevelembed.c gtk+-3.1.12.patched//tests/testtoplevelembed.c +--- gtk+-3.1.12//tests/testtoplevelembed.c 2011-07-28 05:25:56.000000000 +0200 ++++ gtk+-3.1.12.patched//tests/testtoplevelembed.c 2011-08-16 12:22:45.576604909 +0200 +@@ -1,4 +1,7 @@ + #include "config.h" ++ ++#undef GTK_DISABLE_DEPRECATED ++ + #include + + GtkWidget *notebook; diff --git a/gtk3.changes b/gtk3.changes index 499b445..38f941d 100644 --- a/gtk3.changes +++ b/gtk3.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Tue Aug 16 11:26:38 CEST 2011 - dimstar@opensuse.org + +- Update to version 3.1.12: + + GtkFontChooserDialog: A newly designed font selection dialog + that is intended to replace GtkFontSelectionDialog + + Drawing of focus rectangles is now optional; it can be turned + off altogether, or until actual keyboard interaction happens, + with the gtk-visible-focus setting. + + OS X: Fixes for 10.7 (Lion) + + Bugs fixed: bgo#407885, bgo#508601, bgo#599664, bgo#645258, + bgo#649567, bgo#652991, bgo#653817, bgo#653964, bgo#655074, + bgo#655122, bgo#655173, bgo#655495, bgo#655496, bgo#655545, + bgo#655822, bgo#656098, bgo#656421. + + Updated translations. +- Add gtk3-enabledeprecated.patch: Fix build by enabling deprecated + symbols for the test suite. + ------------------------------------------------------------------- Sun Jul 24 10:41:11 CEST 2011 - vuntz@opensuse.org diff --git a/gtk3.spec b/gtk3.spec index e978bad..f0a50d0 100644 --- a/gtk3.spec +++ b/gtk3.spec @@ -24,7 +24,7 @@ Name: gtk3 %define _name gtk+ -Version: 3.1.10 +Version: 3.1.12 Release: 1 License: LGPLv2.1+ Summary: The GTK+ toolkit library (version 3) @@ -43,6 +43,8 @@ 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-enabledeprecated.patch bgo#656639 dimstar@opensuse.org -- Fix building of testtoplevelembed.c by allowing deprecated symbols +Patch4: gtk3-enabledeprecated.patch BuildRequires: fdupes BuildRequires: cups-devel BuildRequires: gnome-patch-translation @@ -50,7 +52,7 @@ BuildRequires: pkgconfig(atk) BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(colord) BuildRequires: pkgconfig(fontconfig) -BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.21.0 +BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.23.5 BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(pango) @@ -289,6 +291,7 @@ cp -a %{S:1} . %patch1 -p0 %patch2 -p1 %patch3 -p1 +%patch4 -p1 gnome-patch-translation-update %build From f9e0ef66e677e703197d60afcf162f71094f6c49d73decbc075a58e16256dae3 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 1 Sep 2011 23:49:01 +0000 Subject: [PATCH 2/3] Accepting request 80576 from home:vuntz:branches:GNOME:Factory Update to 3.1.16 OBS-URL: https://build.opensuse.org/request/show/80576 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=55 --- gtk+-3.1.12.tar.bz2 | 3 --- gtk+-3.1.16.tar.bz2 | 3 +++ gtk3-enabledeprecated.patch | 11 ----------- gtk3.changes | 28 ++++++++++++++++++++++++++++ gtk3.spec | 7 ++----- 5 files changed, 33 insertions(+), 19 deletions(-) delete mode 100644 gtk+-3.1.12.tar.bz2 create mode 100644 gtk+-3.1.16.tar.bz2 delete mode 100644 gtk3-enabledeprecated.patch diff --git a/gtk+-3.1.12.tar.bz2 b/gtk+-3.1.12.tar.bz2 deleted file mode 100644 index 6fbce0b..0000000 --- a/gtk+-3.1.12.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aefdfa7222792197aa542a79ae11df16fa600f80454d6feda51309a5ebe015aa -size 17304192 diff --git a/gtk+-3.1.16.tar.bz2 b/gtk+-3.1.16.tar.bz2 new file mode 100644 index 0000000..df669ca --- /dev/null +++ b/gtk+-3.1.16.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7c9e5d17ecd85fad30e12f0ac6580232b5549c7c8b6f320fdfaee38e245c3b12 +size 17384944 diff --git a/gtk3-enabledeprecated.patch b/gtk3-enabledeprecated.patch deleted file mode 100644 index a1ed858..0000000 --- a/gtk3-enabledeprecated.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ur gtk+-3.1.12//tests/testtoplevelembed.c gtk+-3.1.12.patched//tests/testtoplevelembed.c ---- gtk+-3.1.12//tests/testtoplevelembed.c 2011-07-28 05:25:56.000000000 +0200 -+++ gtk+-3.1.12.patched//tests/testtoplevelembed.c 2011-08-16 12:22:45.576604909 +0200 -@@ -1,4 +1,7 @@ - #include "config.h" -+ -+#undef GTK_DISABLE_DEPRECATED -+ - #include - - GtkWidget *notebook; diff --git a/gtk3.changes b/gtk3.changes index 38f941d..87e26e4 100644 --- a/gtk3.changes +++ b/gtk3.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Wed Aug 31 09:52:16 CEST 2011 - vuntz@opensuse.org + +- Update to version 3.1.16: + + Make distcheck work again, and fix errors that crept in by lack + of a working distcheck. + + Bugs fixed: bgo#656223. +- Remove sed hack in %prep introduced for 3.1.14 since it's now + unneeded. + +------------------------------------------------------------------- +Tue Aug 30 13:23:29 CEST 2011 - vuntz@opensuse.org + +- Update to version 3.1.14: + + GtkTreeView: The GtkTreeModelFilter and GtkTreeModelSort + implementations have been improved and a comprehensive test + suite has been added. + + GtkFileChooser: The selected file(s) can now be copied to the + clipboard. + + Bugs fixed: bgo#656851, bgo#344858, bgo#349502, bgo#621076, + bgo#634136, bgo#649588, bgo#650762, bgo#651827, bgo#656986, + bgo#657146, bgo#657260, bgo#657359, bgo#657384. + + Updated translations. +- Remove build of tests with a sed hack in %prep due to missing + file in this tarball. This hack will get removed with the next + release. +- Drop gtk3-enabledeprecated.patch: fixed upstream. + ------------------------------------------------------------------- Tue Aug 16 11:26:38 CEST 2011 - dimstar@opensuse.org diff --git a/gtk3.spec b/gtk3.spec index f0a50d0..b1fc31e 100644 --- a/gtk3.spec +++ b/gtk3.spec @@ -24,7 +24,7 @@ Name: gtk3 %define _name gtk+ -Version: 3.1.12 +Version: 3.1.16 Release: 1 License: LGPLv2.1+ Summary: The GTK+ toolkit library (version 3) @@ -43,12 +43,10 @@ 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-enabledeprecated.patch bgo#656639 dimstar@opensuse.org -- Fix building of testtoplevelembed.c by allowing deprecated symbols -Patch4: gtk3-enabledeprecated.patch BuildRequires: fdupes BuildRequires: cups-devel BuildRequires: gnome-patch-translation -BuildRequires: pkgconfig(atk) +BuildRequires: pkgconfig(atk) >= 2.1.5 BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(colord) BuildRequires: pkgconfig(fontconfig) @@ -291,7 +289,6 @@ cp -a %{S:1} . %patch1 -p0 %patch2 -p1 %patch3 -p1 -%patch4 -p1 gnome-patch-translation-update %build From 1b1373a7debadd5f668e8e47008574727bccbc40755357bc2877d790d23447b4 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Tue, 6 Sep 2011 19:46:47 +0000 Subject: [PATCH 3/3] Accepting request 81143 from home:vuntz:branches:GNOME:Factory Update to 3.1.18 OBS-URL: https://build.opensuse.org/request/show/81143 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=56 --- gtk+-3.1.16.tar.bz2 | 3 --- gtk+-3.1.18.tar.bz2 | 3 +++ gtk3.changes | 13 +++++++++++++ gtk3.spec | 5 +++-- 4 files changed, 19 insertions(+), 5 deletions(-) delete mode 100644 gtk+-3.1.16.tar.bz2 create mode 100644 gtk+-3.1.18.tar.bz2 diff --git a/gtk+-3.1.16.tar.bz2 b/gtk+-3.1.16.tar.bz2 deleted file mode 100644 index df669ca..0000000 --- a/gtk+-3.1.16.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7c9e5d17ecd85fad30e12f0ac6580232b5549c7c8b6f320fdfaee38e245c3b12 -size 17384944 diff --git a/gtk+-3.1.18.tar.bz2 b/gtk+-3.1.18.tar.bz2 new file mode 100644 index 0000000..df5727a --- /dev/null +++ b/gtk+-3.1.18.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e6f1afcdf87932cb3fb78f65b9459b3e5bae44481d8c9f0ca3be9c388c0ad975 +size 17397213 diff --git a/gtk3.changes b/gtk3.changes index 87e26e4..922959a 100644 --- a/gtk3.changes +++ b/gtk3.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Tue Sep 6 09:13:56 UTC 2011 - vuntz@opensuse.org + +- Update to version 3.1.18: + + GtkFileChooser: It is no possible to go to the containing + folder of a selected file in recent files or search results. + + Bugs fixed: bgo#530253, bgo#566202, bgo#581435, bgo#655631, + bgo#657793, bgo#657882, bgo#657963, bgo#657985, bgo#658008, + bgo#658077, bgo#658111, bgo#658168, bgo#658200. + + Updated translations. +- Pass explicit --enable-colord to configure to make sure we build + colord support. + ------------------------------------------------------------------- Wed Aug 31 09:52:16 CEST 2011 - vuntz@opensuse.org diff --git a/gtk3.spec b/gtk3.spec index b1fc31e..fe79d22 100644 --- a/gtk3.spec +++ b/gtk3.spec @@ -24,7 +24,7 @@ Name: gtk3 %define _name gtk+ -Version: 3.1.16 +Version: 3.1.18 Release: 1 License: LGPLv2.1+ Summary: The GTK+ toolkit library (version 3) @@ -299,7 +299,8 @@ gnome-patch-translation-update %if %{build_broadway_backend} --enable-broadway-backend \ %endif - --enable-introspection + --enable-introspection \ + --enable-colord %{__make} V=1 %{?_smp_mflags} %install