public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/gnome:gnome-next commit in: x11-libs/gtk+/files/, x11-libs/gtk+/
@ 2011-07-20 23:42 Alexandre Restovtsev
  0 siblings, 0 replies; 6+ messages in thread
From: Alexandre Restovtsev @ 2011-07-20 23:42 UTC (permalink / raw
  To: gentoo-commits

commit:     16b56962c067c0567cb4a5e5966175e61cc72eac
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Wed Jul 20 23:32:41 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Jul 20 23:32:41 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=16b56962

x11-libs/gtk+: 3.1.8 → 3.1.8-r1, fix theming crashes with glib-2.29.12

Add an upstream patch to fix theming engine crashes with glib-2.29.12
caused by a subtle change in GParamSpec API. See gnome bugs 654627 and
654695.

Also, gnome2-live.eclass comes with a gnome2_src_prepare wrapper.

---
 ...k+-3.1.8-themingengine-new-gparamspec-api.patch |   28 ++++++++++++++++++++
 .../{gtk+-3.1.8.ebuild => gtk+-3.1.8-r1.ebuild}    |    7 ++++-
 x11-libs/gtk+/gtk+-9999.ebuild                     |    4 ++-
 3 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/x11-libs/gtk+/files/gtk+-3.1.8-themingengine-new-gparamspec-api.patch b/x11-libs/gtk+/files/gtk+-3.1.8-themingengine-new-gparamspec-api.patch
new file mode 100644
index 0000000..d14c7e9
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-3.1.8-themingengine-new-gparamspec-api.patch
@@ -0,0 +1,28 @@
+From 7741f5a09a841c4dc93727b990defc303510ed2c Mon Sep 17 00:00:00 2001
+From: Florian Müllner <fmuellner@gnome.org>
+Date: Fri, 15 Jul 2011 18:45:59 +0000
+Subject: theming-engine: Adjust register_property() to recent glib change
+
+GParamSpec now uses an intern'ed string for 'name', so the code
+in gtk_theming_engine_register_property() which prefixes the name
+with a namespace has to be adjusted.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=654695
+---
+diff --git a/gtk/gtkthemingengine.c b/gtk/gtkthemingengine.c
+index 66adad6..64a2bc5 100644
+--- a/gtk/gtkthemingengine.c
++++ b/gtk/gtkthemingengine.c
+@@ -391,8 +391,8 @@ gtk_theming_engine_register_property (const gchar            *name_space,
+ 
+   /* FIXME: hack hack hack, replacing pspec->name to include namespace */
+   name = g_strdup_printf ("-%s-%s", name_space, pspec->name);
+-  g_free (pspec->name);
+-  pspec->name = name;
++  pspec->name = (char *)g_intern_string (name);
++  g_free (name);
+ 
+   gtk_style_properties_register_property (parse_func, pspec);
+ }
+--
+cgit v0.9

diff --git a/x11-libs/gtk+/gtk+-3.1.8.ebuild b/x11-libs/gtk+/gtk+-3.1.8-r1.ebuild
similarity index 95%
rename from x11-libs/gtk+/gtk+-3.1.8.ebuild
rename to x11-libs/gtk+/gtk+-3.1.8-r1.ebuild
index 1182825..4ceeca9 100644
--- a/x11-libs/gtk+/gtk+-3.1.8.ebuild
+++ b/x11-libs/gtk+/gtk+-3.1.8-r1.ebuild
@@ -77,7 +77,9 @@ DEPEND="${COMMON_DEPEND}
 	test? (
 		media-fonts/font-misc-misc
 		media-fonts/font-cursor-misc )"
+# >=dev-libs/glib-2.29.12 needed at runtime, see gnome bugs 654627, 654695
 RDEPEND="${COMMON_DEPEND}
+	>=dev-libs/glib-2.29.12
 	!<gnome-base/gail-1000
 	packagekit? ( app-admin/packagekit-base )"
 PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
@@ -120,7 +122,10 @@ src_prepare() {
 		[[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS demos Makefile.in
 	fi
 
-	[[ ${PV} = 9999 ]] && gnome2-live_src_prepare
+	# Fixes constant crashes with glib-2.29.12; will be in next release
+	epatch "${FILESDIR}/${P}-themingengine-new-gparamspec-api.patch"
+
+	gnome2_src_prepare
 }
 
 src_configure() {

diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild
index 1182825..4259e9a 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-9999.ebuild
@@ -77,7 +77,9 @@ DEPEND="${COMMON_DEPEND}
 	test? (
 		media-fonts/font-misc-misc
 		media-fonts/font-cursor-misc )"
+# >=dev-libs/glib-2.29.12 needed at runtime, see gnome bugs 654627, 654695
 RDEPEND="${COMMON_DEPEND}
+	>=dev-libs/glib-2.29.12
 	!<gnome-base/gail-1000
 	packagekit? ( app-admin/packagekit-base )"
 PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
@@ -120,7 +122,7 @@ src_prepare() {
 		[[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS demos Makefile.in
 	fi
 
-	[[ ${PV} = 9999 ]] && gnome2-live_src_prepare
+	gnome2_src_prepare
 }
 
 src_configure() {



^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gnome:gnome-next commit in: x11-libs/gtk+/files/, x11-libs/gtk+/
@ 2011-07-23 17:46 Alexandre Restovtsev
  0 siblings, 0 replies; 6+ messages in thread
From: Alexandre Restovtsev @ 2011-07-23 17:46 UTC (permalink / raw
  To: gentoo-commits

commit:     ac4dc90fd5041baf7295c9d27589f5e7b291f8c9
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Sat Jul 23 17:25:54 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sat Jul 23 17:25:54 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ac4dc90f

x11-libs/gtk+: 3.1.8-r1 → 3.1.10

Version bump with a new save dialog and lots of a11y changes. Update
dependencies. Theming engine patch no longer needed.

---
 ...k+-3.1.8-themingengine-new-gparamspec-api.patch |   28 --------------------
 .../{gtk+-3.1.8-r1.ebuild => gtk+-3.1.10.ebuild}   |    9 +-----
 x11-libs/gtk+/gtk+-9999.ebuild                     |    6 +---
 3 files changed, 4 insertions(+), 39 deletions(-)

diff --git a/x11-libs/gtk+/files/gtk+-3.1.8-themingengine-new-gparamspec-api.patch b/x11-libs/gtk+/files/gtk+-3.1.8-themingengine-new-gparamspec-api.patch
deleted file mode 100644
index d14c7e9..0000000
--- a/x11-libs/gtk+/files/gtk+-3.1.8-themingengine-new-gparamspec-api.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 7741f5a09a841c4dc93727b990defc303510ed2c Mon Sep 17 00:00:00 2001
-From: Florian Müllner <fmuellner@gnome.org>
-Date: Fri, 15 Jul 2011 18:45:59 +0000
-Subject: theming-engine: Adjust register_property() to recent glib change
-
-GParamSpec now uses an intern'ed string for 'name', so the code
-in gtk_theming_engine_register_property() which prefixes the name
-with a namespace has to be adjusted.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=654695
----
-diff --git a/gtk/gtkthemingengine.c b/gtk/gtkthemingengine.c
-index 66adad6..64a2bc5 100644
---- a/gtk/gtkthemingengine.c
-+++ b/gtk/gtkthemingengine.c
-@@ -391,8 +391,8 @@ gtk_theming_engine_register_property (const gchar            *name_space,
- 
-   /* FIXME: hack hack hack, replacing pspec->name to include namespace */
-   name = g_strdup_printf ("-%s-%s", name_space, pspec->name);
--  g_free (pspec->name);
--  pspec->name = name;
-+  pspec->name = (char *)g_intern_string (name);
-+  g_free (name);
- 
-   gtk_style_properties_register_property (parse_func, pspec);
- }
---
-cgit v0.9

diff --git a/x11-libs/gtk+/gtk+-3.1.8-r1.ebuild b/x11-libs/gtk+/gtk+-3.1.10.ebuild
similarity index 95%
rename from x11-libs/gtk+/gtk+-3.1.8-r1.ebuild
rename to x11-libs/gtk+/gtk+-3.1.10.ebuild
index 4ceeca9..908a1f1 100644
--- a/x11-libs/gtk+/gtk+-3.1.8-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-3.1.10.ebuild
@@ -49,8 +49,8 @@ COMMON_DEPEND="!aqua? (
 		>=x11-libs/gdk-pixbuf-2.22.0:2[introspection?]
 	)
 	xinerama? ( x11-libs/libXinerama )
-	>=dev-libs/glib-2.29.4
-	>=x11-libs/pango-1.24.0[introspection?]
+	>=dev-libs/glib-2.29.14
+	>=x11-libs/pango-1.29.0[introspection?]
 	>=dev-libs/atk-1.30[introspection?]
 	>=x11-libs/gtk+-2.24:2
 	media-libs/fontconfig
@@ -77,9 +77,7 @@ DEPEND="${COMMON_DEPEND}
 	test? (
 		media-fonts/font-misc-misc
 		media-fonts/font-cursor-misc )"
-# >=dev-libs/glib-2.29.12 needed at runtime, see gnome bugs 654627, 654695
 RDEPEND="${COMMON_DEPEND}
-	>=dev-libs/glib-2.29.12
 	!<gnome-base/gail-1000
 	packagekit? ( app-admin/packagekit-base )"
 PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
@@ -122,9 +120,6 @@ src_prepare() {
 		[[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS demos Makefile.in
 	fi
 
-	# Fixes constant crashes with glib-2.29.12; will be in next release
-	epatch "${FILESDIR}/${P}-themingengine-new-gparamspec-api.patch"
-
 	gnome2_src_prepare
 }
 

diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild
index 4259e9a..908a1f1 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-9999.ebuild
@@ -49,8 +49,8 @@ COMMON_DEPEND="!aqua? (
 		>=x11-libs/gdk-pixbuf-2.22.0:2[introspection?]
 	)
 	xinerama? ( x11-libs/libXinerama )
-	>=dev-libs/glib-2.29.4
-	>=x11-libs/pango-1.24.0[introspection?]
+	>=dev-libs/glib-2.29.14
+	>=x11-libs/pango-1.29.0[introspection?]
 	>=dev-libs/atk-1.30[introspection?]
 	>=x11-libs/gtk+-2.24:2
 	media-libs/fontconfig
@@ -77,9 +77,7 @@ DEPEND="${COMMON_DEPEND}
 	test? (
 		media-fonts/font-misc-misc
 		media-fonts/font-cursor-misc )"
-# >=dev-libs/glib-2.29.12 needed at runtime, see gnome bugs 654627, 654695
 RDEPEND="${COMMON_DEPEND}
-	>=dev-libs/glib-2.29.12
 	!<gnome-base/gail-1000
 	packagekit? ( app-admin/packagekit-base )"
 PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"



^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gnome:gnome-next commit in: x11-libs/gtk+/files/, x11-libs/gtk+/
@ 2011-08-13 19:33 Alexandre Restovtsev
  0 siblings, 0 replies; 6+ messages in thread
From: Alexandre Restovtsev @ 2011-08-13 19:33 UTC (permalink / raw
  To: gentoo-commits

commit:     2504725431a463e159013d7e1136a08b1d0c71d2
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Sat Aug 13 19:22:11 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sat Aug 13 19:22:11 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=25047254

x11-libs/gtk+: sync with gx86

Sync with changes in gx86; no revision bump since there should be very
little user-visible impact. Also, update gdk-pixbuf dependency for the
live ebuild.

---
 x11-libs/gtk+/files/settings.ini |    4 ++++
 x11-libs/gtk+/gtk+-3.1.10.ebuild |   23 ++++++-----------------
 x11-libs/gtk+/gtk+-9999.ebuild   |   27 ++++++++-------------------
 3 files changed, 18 insertions(+), 36 deletions(-)

diff --git a/x11-libs/gtk+/files/settings.ini b/x11-libs/gtk+/files/settings.ini
new file mode 100644
index 0000000..a65c0a8
--- /dev/null
+++ b/x11-libs/gtk+/files/settings.ini
@@ -0,0 +1,4 @@
+[Settings]
+gtk-theme-name = Adwaita
+gtk-icon-theme-name = gnome
+gtk-cursor-theme-name = Adwaita

diff --git a/x11-libs/gtk+/gtk+-3.1.10.ebuild b/x11-libs/gtk+/gtk+-3.1.10.ebuild
index 908a1f1..eea39c5 100644
--- a/x11-libs/gtk+/gtk+-3.1.10.ebuild
+++ b/x11-libs/gtk+/gtk+-3.1.10.ebuild
@@ -14,11 +14,11 @@ HOMEPAGE="http://www.gtk.org/"
 
 LICENSE="LGPL-2"
 SLOT="3"
-# NOTE: *-macos support is BROKEN. See `quartz-backend` etc in configure
 # NOTE: This gtk+ has multi-gdk-backend support, see:
 #  * http://blogs.gnome.org/kris/2010/12/29/gdk-3-0-on-mac-os-x/
 #  * http://mail.gnome.org/archives/gtk-devel-list/2010-November/msg00099.html
-# NOTE: Lots of aqua stuff in this ebuild is probably very broken
+# I tried this and got it all compiling, but the end result is unusable as it
+# horribly mixes up the backends -- grobian
 IUSE="aqua colord cups debug doc examples +introspection packagekit test vim-syntax xinerama"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
@@ -66,9 +66,6 @@ DEPEND="${COMMON_DEPEND}
 		x11-proto/inputproto
 		x11-proto/damageproto
 	)
-	x86-interix? (
-		sys-libs/itx-bind
-	)
 	xinerama? ( x11-proto/xineramaproto )
 	>=dev-util/gtk-doc-am-1.11
 	doc? (
@@ -102,12 +99,6 @@ src_prepare() {
 	sed '\%/recent-manager/add%,/recent_manager_purge/ d' \
 		-i gtk/tests/recentmanager.c || die "sed 2 failed"
 
-	if use x86-interix; then
-		# activate the itx-bind package...
-		append-flags "-I${EPREFIX}/usr/include/bind"
-		append-ldflags "-L${EPREFIX}/usr/lib/bind"
-	fi
-
 	if ! use test; then
 		# don't waste time building tests
 		strip_builddir SRC_SUBDIRS tests Makefile.am
@@ -158,14 +149,12 @@ src_test() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "Installation failed"
+	emake DESTDIR="${D}" install
 
-	# see bug #133241
-	echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc"
 	insinto /etc/gtk-3.0
-	doins "${T}"/gtkrc || die "doins gtkrc failed"
+	doins "${FILESDIR}"/settings.ini
 
-	dodoc AUTHORS ChangeLog* HACKING NEWS* README* || die "dodoc failed"
+	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
 
 	# Remove unneeded *.la files
 	find "${ED}" -name "*.la" -delete
@@ -190,7 +179,7 @@ pkg_postinst() {
 	if ! has_version "app-text/evince"; then
 		elog "Please install app-text/evince for print preview functionality."
 		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
-		elog "add it to your gtkrc."
+		elog "add it to your settings.ini file."
 	fi
 }
 

diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild
index 908a1f1..24226ab 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-9999.ebuild
@@ -14,11 +14,11 @@ HOMEPAGE="http://www.gtk.org/"
 
 LICENSE="LGPL-2"
 SLOT="3"
-# NOTE: *-macos support is BROKEN. See `quartz-backend` etc in configure
 # NOTE: This gtk+ has multi-gdk-backend support, see:
 #  * http://blogs.gnome.org/kris/2010/12/29/gdk-3-0-on-mac-os-x/
 #  * http://mail.gnome.org/archives/gtk-devel-list/2010-November/msg00099.html
-# NOTE: Lots of aqua stuff in this ebuild is probably very broken
+# I tried this and got it all compiling, but the end result is unusable as it
+# horribly mixes up the backends -- grobian
 IUSE="aqua colord cups debug doc examples +introspection packagekit test vim-syntax xinerama"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
@@ -42,11 +42,11 @@ COMMON_DEPEND="!aqua? (
 		x11-libs/libXcomposite
 		x11-libs/libXdamage
 		>=x11-libs/cairo-1.10.0[X,svg]
-		>=x11-libs/gdk-pixbuf-2.22.0:2[X,introspection?]
+		>=x11-libs/gdk-pixbuf-2.23.5:2[X,introspection?]
 	)
 	aqua? (
 		>=x11-libs/cairo-1.10.0[aqua,svg]
-		>=x11-libs/gdk-pixbuf-2.22.0:2[introspection?]
+		>=x11-libs/gdk-pixbuf-2.23.5:2[introspection?]
 	)
 	xinerama? ( x11-libs/libXinerama )
 	>=dev-libs/glib-2.29.14
@@ -66,9 +66,6 @@ DEPEND="${COMMON_DEPEND}
 		x11-proto/inputproto
 		x11-proto/damageproto
 	)
-	x86-interix? (
-		sys-libs/itx-bind
-	)
 	xinerama? ( x11-proto/xineramaproto )
 	>=dev-util/gtk-doc-am-1.11
 	doc? (
@@ -102,12 +99,6 @@ src_prepare() {
 	sed '\%/recent-manager/add%,/recent_manager_purge/ d' \
 		-i gtk/tests/recentmanager.c || die "sed 2 failed"
 
-	if use x86-interix; then
-		# activate the itx-bind package...
-		append-flags "-I${EPREFIX}/usr/include/bind"
-		append-ldflags "-L${EPREFIX}/usr/lib/bind"
-	fi
-
 	if ! use test; then
 		# don't waste time building tests
 		strip_builddir SRC_SUBDIRS tests Makefile.am
@@ -158,14 +149,12 @@ src_test() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "Installation failed"
+	emake DESTDIR="${D}" install
 
-	# see bug #133241
-	echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc"
 	insinto /etc/gtk-3.0
-	doins "${T}"/gtkrc || die "doins gtkrc failed"
+	doins "${FILESDIR}"/settings.ini
 
-	dodoc AUTHORS ChangeLog* HACKING NEWS* README* || die "dodoc failed"
+	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
 
 	# Remove unneeded *.la files
 	find "${ED}" -name "*.la" -delete
@@ -190,7 +179,7 @@ pkg_postinst() {
 	if ! has_version "app-text/evince"; then
 		elog "Please install app-text/evince for print preview functionality."
 		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
-		elog "add it to your gtkrc."
+		elog "add it to your settings.ini file."
 	fi
 }
 



^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gnome:gnome-next commit in: x11-libs/gtk+/files/, x11-libs/gtk+/
@ 2011-09-07 21:30 Alexandre Restovtsev
  0 siblings, 0 replies; 6+ messages in thread
From: Alexandre Restovtsev @ 2011-09-07 21:30 UTC (permalink / raw
  To: gentoo-commits

commit:     3f4e494e299e791b6123856a36c9763b64021c2a
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Wed Sep  7 20:34:57 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Sep  7 20:34:57 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3f4e494e

x11-libs/gtk+: 3.1.16 → 3.1.18

Version bump, features gtktreeview and gtkfilechooser improvements. Add
some useful upstream patches (ignore disabled xi devices, initialize a
potentially uninitialized variable, use the correct weak ref).

---
 .../gtk+/files/gtk+-3.1.18-disabled-devices.patch  |   26 ++++++++++++++++++++
 ...tk+-3.1.18-gtkselection-uninitialized-var.patch |   25 +++++++++++++++++++
 .../gtk+/files/gtk+-3.1.18-iconview-weak-ref.patch |   23 +++++++++++++++++
 .../{gtk+-3.1.16.ebuild => gtk+-3.1.18.ebuild}     |    3 ++
 4 files changed, 77 insertions(+), 0 deletions(-)

diff --git a/x11-libs/gtk+/files/gtk+-3.1.18-disabled-devices.patch b/x11-libs/gtk+/files/gtk+-3.1.18-disabled-devices.patch
new file mode 100644
index 0000000..c1a585c
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-3.1.18-disabled-devices.patch
@@ -0,0 +1,26 @@
+commit 79ff1b669c74ecb3d876d4616a9fc4fad640f521
+Author: Carlos Garnacho <carlosg@gnome.org>
+Date:   Tue Sep 6 19:22:59 2011 +0200
+
+    x11: Don't create GdkDevices for disabled devices
+    
+    Fixes bug #658379 - Disabled devices still added to list on startup,
+    spotted by Bastien Nocera. Do not create GdkDevices for disabled
+    devices on device manager construction, leading to a confusing initial
+    state.
+
+diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c
+index 425efee..c921ce0 100644
+--- a/gdk/x11/gdkdevicemanager-xi2.c
++++ b/gdk/x11/gdkdevicemanager-xi2.c
+@@ -417,6 +417,10 @@ gdk_x11_device_manager_xi2_constructed (GObject *object)
+   for (i = 0; i < ndevices; i++)
+     {
+       dev = &info[i];
++
++      if (!dev->enabled)
++	      continue;
++
+       add_device (device_manager, dev, FALSE);
+ 
+       if (dev->use == XIMasterPointer ||

diff --git a/x11-libs/gtk+/files/gtk+-3.1.18-gtkselection-uninitialized-var.patch b/x11-libs/gtk+/files/gtk+-3.1.18-gtkselection-uninitialized-var.patch
new file mode 100644
index 0000000..e66a7d4
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-3.1.18-gtkselection-uninitialized-var.patch
@@ -0,0 +1,25 @@
+commit 057a50d58e940056c6f5407812a67405308aa983
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date:   Wed Sep 7 16:19:44 2011 -0400
+
+    Bug 658398 - Use of uninitialized variable reported by Valgrind
+    
+    Fix it.
+
+diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c
+index 7fbc996..9e2295f 100644
+--- a/gtk/gtkselection.c
++++ b/gtk/gtkselection.c
+@@ -1097,11 +1097,10 @@ gtk_selection_convert (GtkWidget *widget,
+     {
+       GtkWidget *owner_widget;
+       gpointer owner_widget_ptr;
+-      GtkSelectionData selection_data;
++      GtkSelectionData selection_data = {0};
+       
+       selection_data.selection = selection;
+       selection_data.target = target;
+-      selection_data.data = NULL;
+       selection_data.length = -1;
+       selection_data.display = display;
+       

diff --git a/x11-libs/gtk+/files/gtk+-3.1.18-iconview-weak-ref.patch b/x11-libs/gtk+/files/gtk+-3.1.18-iconview-weak-ref.patch
new file mode 100644
index 0000000..8a1593a
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-3.1.18-iconview-weak-ref.patch
@@ -0,0 +1,23 @@
+commit 8b9f0402b02a34d2e987936f134a20dc3effd34b
+Author: Cosimo Cecchi <cosimoc@gnome.org>
+Date:   Tue Sep 6 18:26:54 2011 -0400
+
+    iconview: fix a typo while removing the a11y adjustment weak ref
+    
+    The code sets old_adj_ptr to the location containing the old weak ref,
+    but then wants to remove a weak ref from &view->old_hadj, causing warnings
+    when disposing the widget.
+
+diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
+index a252e0f..8b4a184 100644
+--- a/gtk/gtkiconview.c
++++ b/gtk/gtkiconview.c
+@@ -8089,7 +8089,7 @@ gtk_icon_view_accessible_set_adjustment (AtkObject      *accessible,
+   if (*old_adj_ptr)
+     {
+       g_object_remove_weak_pointer (G_OBJECT (*old_adj_ptr),
+-                                    (gpointer *)&view->old_hadj);
++                                    (gpointer *)old_adj_ptr);
+       g_signal_handlers_disconnect_by_func (*old_adj_ptr,
+                                             gtk_icon_view_accessible_adjustment_changed,
+                                             accessible);

diff --git a/x11-libs/gtk+/gtk+-3.1.16.ebuild b/x11-libs/gtk+/gtk+-3.1.18.ebuild
similarity index 98%
rename from x11-libs/gtk+/gtk+-3.1.16.ebuild
rename to x11-libs/gtk+/gtk+-3.1.18.ebuild
index ec98b3a..d078fb7 100644
--- a/x11-libs/gtk+/gtk+-3.1.16.ebuild
+++ b/x11-libs/gtk+/gtk+-3.1.18.ebuild
@@ -111,6 +111,9 @@ src_prepare() {
 		[[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS demos Makefile.in
 	fi
 
+	# Useful upstream patches, will be in next release
+	epatch "${FILESDIR}/${P}"-*.patch
+
 	gnome2_src_prepare
 }
 



^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gnome:gnome-next commit in: x11-libs/gtk+/files/, x11-libs/gtk+/
@ 2011-09-18 23:01 Alexandre Restovtsev
  0 siblings, 0 replies; 6+ messages in thread
From: Alexandre Restovtsev @ 2011-09-18 23:01 UTC (permalink / raw
  To: gentoo-commits

commit:     f432f2005661e4c49130268a3827f2a69349cccd
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Wed Sep 14 21:35:18 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sun Sep 18 22:13:38 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f432f200

x11-libs/gtk+: 3.1.18 → 3.1.90

Version bump with improvements in the tree model and font chooser; file
chooser is now compatible with tracker-0.12 dbus API.

---
 .../gtk+/files/gtk+-3.1.18-disabled-devices.patch  |   26 --------------------
 ...tk+-3.1.18-gtkselection-uninitialized-var.patch |   25 -------------------
 .../gtk+/files/gtk+-3.1.18-iconview-weak-ref.patch |   23 -----------------
 ...gtk+-3.1.90-gtk_application_startup-chain.patch |   22 ++++++++++++++++
 .../gtk+-3.1.90-gtk_icon_view_draw-return.patch    |   23 +++++++++++++++++
 .../gtk+-3.1.90-gtk_tree_view_draw-return.patch    |   24 ++++++++++++++++++
 .../{gtk+-3.1.18.ebuild => gtk+-3.1.90.ebuild}     |    0
 7 files changed, 69 insertions(+), 74 deletions(-)

diff --git a/x11-libs/gtk+/files/gtk+-3.1.18-disabled-devices.patch b/x11-libs/gtk+/files/gtk+-3.1.18-disabled-devices.patch
deleted file mode 100644
index c1a585c..0000000
--- a/x11-libs/gtk+/files/gtk+-3.1.18-disabled-devices.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit 79ff1b669c74ecb3d876d4616a9fc4fad640f521
-Author: Carlos Garnacho <carlosg@gnome.org>
-Date:   Tue Sep 6 19:22:59 2011 +0200
-
-    x11: Don't create GdkDevices for disabled devices
-    
-    Fixes bug #658379 - Disabled devices still added to list on startup,
-    spotted by Bastien Nocera. Do not create GdkDevices for disabled
-    devices on device manager construction, leading to a confusing initial
-    state.
-
-diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c
-index 425efee..c921ce0 100644
---- a/gdk/x11/gdkdevicemanager-xi2.c
-+++ b/gdk/x11/gdkdevicemanager-xi2.c
-@@ -417,6 +417,10 @@ gdk_x11_device_manager_xi2_constructed (GObject *object)
-   for (i = 0; i < ndevices; i++)
-     {
-       dev = &info[i];
-+
-+      if (!dev->enabled)
-+	      continue;
-+
-       add_device (device_manager, dev, FALSE);
- 
-       if (dev->use == XIMasterPointer ||

diff --git a/x11-libs/gtk+/files/gtk+-3.1.18-gtkselection-uninitialized-var.patch b/x11-libs/gtk+/files/gtk+-3.1.18-gtkselection-uninitialized-var.patch
deleted file mode 100644
index e66a7d4..0000000
--- a/x11-libs/gtk+/files/gtk+-3.1.18-gtkselection-uninitialized-var.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-commit 057a50d58e940056c6f5407812a67405308aa983
-Author: Behdad Esfahbod <behdad@behdad.org>
-Date:   Wed Sep 7 16:19:44 2011 -0400
-
-    Bug 658398 - Use of uninitialized variable reported by Valgrind
-    
-    Fix it.
-
-diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c
-index 7fbc996..9e2295f 100644
---- a/gtk/gtkselection.c
-+++ b/gtk/gtkselection.c
-@@ -1097,11 +1097,10 @@ gtk_selection_convert (GtkWidget *widget,
-     {
-       GtkWidget *owner_widget;
-       gpointer owner_widget_ptr;
--      GtkSelectionData selection_data;
-+      GtkSelectionData selection_data = {0};
-       
-       selection_data.selection = selection;
-       selection_data.target = target;
--      selection_data.data = NULL;
-       selection_data.length = -1;
-       selection_data.display = display;
-       

diff --git a/x11-libs/gtk+/files/gtk+-3.1.18-iconview-weak-ref.patch b/x11-libs/gtk+/files/gtk+-3.1.18-iconview-weak-ref.patch
deleted file mode 100644
index 8a1593a..0000000
--- a/x11-libs/gtk+/files/gtk+-3.1.18-iconview-weak-ref.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 8b9f0402b02a34d2e987936f134a20dc3effd34b
-Author: Cosimo Cecchi <cosimoc@gnome.org>
-Date:   Tue Sep 6 18:26:54 2011 -0400
-
-    iconview: fix a typo while removing the a11y adjustment weak ref
-    
-    The code sets old_adj_ptr to the location containing the old weak ref,
-    but then wants to remove a weak ref from &view->old_hadj, causing warnings
-    when disposing the widget.
-
-diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
-index a252e0f..8b4a184 100644
---- a/gtk/gtkiconview.c
-+++ b/gtk/gtkiconview.c
-@@ -8089,7 +8089,7 @@ gtk_icon_view_accessible_set_adjustment (AtkObject      *accessible,
-   if (*old_adj_ptr)
-     {
-       g_object_remove_weak_pointer (G_OBJECT (*old_adj_ptr),
--                                    (gpointer *)&view->old_hadj);
-+                                    (gpointer *)old_adj_ptr);
-       g_signal_handlers_disconnect_by_func (*old_adj_ptr,
-                                             gtk_icon_view_accessible_adjustment_changed,
-                                             accessible);

diff --git a/x11-libs/gtk+/files/gtk+-3.1.90-gtk_application_startup-chain.patch b/x11-libs/gtk+/files/gtk+-3.1.90-gtk_application_startup-chain.patch
new file mode 100644
index 0000000..da5653f
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-3.1.90-gtk_application_startup-chain.patch
@@ -0,0 +1,22 @@
+From f86351c05f88d3d7911615fc27ddd8091260caf3 Mon Sep 17 00:00:00 2001
+From: Ryan Lortie <desrt@desrt.ca>
+Date: Wed, 14 Sep 2011 18:02:51 +0000
+Subject: GtkApplication: chain up ::startup
+
+---
+diff --git a/gtk/gtkapplication.c b/gtk/gtkapplication.c
+index c6db4e8..c192d75 100644
+--- a/gtk/gtkapplication.c
++++ b/gtk/gtkapplication.c
+@@ -97,6 +97,9 @@ gtk_application_focus_in_event_cb (GtkWindow      *window,
+ static void
+ gtk_application_startup (GApplication *application)
+ {
++  G_APPLICATION_CLASS (gtk_application_parent_class)
++    ->startup (application);
++
+   gtk_init (0, 0);
+ }
+ 
+--
+cgit v0.9.0.2

diff --git a/x11-libs/gtk+/files/gtk+-3.1.90-gtk_icon_view_draw-return.patch b/x11-libs/gtk+/files/gtk+-3.1.90-gtk_icon_view_draw-return.patch
new file mode 100644
index 0000000..1f4505d
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-3.1.90-gtk_icon_view_draw-return.patch
@@ -0,0 +1,23 @@
+From 9ddc11fbb5a2e4bb1f9d71c7278feab874add1d6 Mon Sep 17 00:00:00 2001
+From: Benjamin Otte <otte@redhat.com>
+Date: Wed, 14 Sep 2011 14:09:36 +0000
+Subject: iconview: Don't rturn TRUE from draw handler
+
+---
+diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
+index 8b4a184..2324889 100644
+--- a/gtk/gtkiconview.c
++++ b/gtk/gtkiconview.c
+@@ -1683,9 +1683,7 @@ gtk_icon_view_draw (GtkWidget *widget,
+ 
+   cairo_restore (cr);
+ 
+-  GTK_WIDGET_CLASS (gtk_icon_view_parent_class)->draw (widget, cr);
+-
+-  return TRUE;
++  return GTK_WIDGET_CLASS (gtk_icon_view_parent_class)->draw (widget, cr);
+ }
+ 
+ static gboolean
+--
+cgit v0.9.0.2

diff --git a/x11-libs/gtk+/files/gtk+-3.1.90-gtk_tree_view_draw-return.patch b/x11-libs/gtk+/files/gtk+-3.1.90-gtk_tree_view_draw-return.patch
new file mode 100644
index 0000000..87be406
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-3.1.90-gtk_tree_view_draw-return.patch
@@ -0,0 +1,24 @@
+From 9e8b2f2521d1961930bf29b890df9eef89dfc019 Mon Sep 17 00:00:00 2001
+From: Benjamin Otte <otte@redhat.com>
+Date: Wed, 14 Sep 2011 14:03:54 +0000
+Subject: treeview: Return FALSE from draw handler
+
+... like every widget should.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=658981
+---
+diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
+index 8eaeee8..3b2ec9e 100644
+--- a/gtk/gtktreeview.c
++++ b/gtk/gtktreeview.c
+@@ -5383,7 +5383,7 @@ gtk_tree_view_draw (GtkWidget *widget,
+                                     button, cr);
+     }
+ 
+-  return TRUE;
++  return FALSE;
+ }
+ 
+ enum
+--
+cgit v0.9.0.2

diff --git a/x11-libs/gtk+/gtk+-3.1.18.ebuild b/x11-libs/gtk+/gtk+-3.1.90.ebuild
similarity index 100%
rename from x11-libs/gtk+/gtk+-3.1.18.ebuild
rename to x11-libs/gtk+/gtk+-3.1.90.ebuild



^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gnome:gnome-next commit in: x11-libs/gtk+/files/, x11-libs/gtk+/
@ 2011-09-26  4:46 Alexandre Restovtsev
  0 siblings, 0 replies; 6+ messages in thread
From: Alexandre Restovtsev @ 2011-09-26  4:46 UTC (permalink / raw
  To: gentoo-commits

commit:     d2bd426ba125617d1beeaba7e7b30d39e6914bc1
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Mon Sep 26 03:02:57 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Mon Sep 26 03:02:57 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=d2bd426b

x11-libs/gtk+: 3.1.90 → 3.2.0

Bump to gnome-3.2 version. Patches were applied upstream.

---
 ...gtk+-3.1.90-gtk_application_startup-chain.patch |   22 ------------------
 .../gtk+-3.1.90-gtk_icon_view_draw-return.patch    |   23 -------------------
 .../gtk+-3.1.90-gtk_tree_view_draw-return.patch    |   24 --------------------
 .../gtk+/{gtk+-3.1.90.ebuild => gtk+-3.2.0.ebuild} |    3 --
 4 files changed, 0 insertions(+), 72 deletions(-)

diff --git a/x11-libs/gtk+/files/gtk+-3.1.90-gtk_application_startup-chain.patch b/x11-libs/gtk+/files/gtk+-3.1.90-gtk_application_startup-chain.patch
deleted file mode 100644
index da5653f..0000000
--- a/x11-libs/gtk+/files/gtk+-3.1.90-gtk_application_startup-chain.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From f86351c05f88d3d7911615fc27ddd8091260caf3 Mon Sep 17 00:00:00 2001
-From: Ryan Lortie <desrt@desrt.ca>
-Date: Wed, 14 Sep 2011 18:02:51 +0000
-Subject: GtkApplication: chain up ::startup
-
----
-diff --git a/gtk/gtkapplication.c b/gtk/gtkapplication.c
-index c6db4e8..c192d75 100644
---- a/gtk/gtkapplication.c
-+++ b/gtk/gtkapplication.c
-@@ -97,6 +97,9 @@ gtk_application_focus_in_event_cb (GtkWindow      *window,
- static void
- gtk_application_startup (GApplication *application)
- {
-+  G_APPLICATION_CLASS (gtk_application_parent_class)
-+    ->startup (application);
-+
-   gtk_init (0, 0);
- }
- 
---
-cgit v0.9.0.2

diff --git a/x11-libs/gtk+/files/gtk+-3.1.90-gtk_icon_view_draw-return.patch b/x11-libs/gtk+/files/gtk+-3.1.90-gtk_icon_view_draw-return.patch
deleted file mode 100644
index 1f4505d..0000000
--- a/x11-libs/gtk+/files/gtk+-3.1.90-gtk_icon_view_draw-return.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 9ddc11fbb5a2e4bb1f9d71c7278feab874add1d6 Mon Sep 17 00:00:00 2001
-From: Benjamin Otte <otte@redhat.com>
-Date: Wed, 14 Sep 2011 14:09:36 +0000
-Subject: iconview: Don't rturn TRUE from draw handler
-
----
-diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
-index 8b4a184..2324889 100644
---- a/gtk/gtkiconview.c
-+++ b/gtk/gtkiconview.c
-@@ -1683,9 +1683,7 @@ gtk_icon_view_draw (GtkWidget *widget,
- 
-   cairo_restore (cr);
- 
--  GTK_WIDGET_CLASS (gtk_icon_view_parent_class)->draw (widget, cr);
--
--  return TRUE;
-+  return GTK_WIDGET_CLASS (gtk_icon_view_parent_class)->draw (widget, cr);
- }
- 
- static gboolean
---
-cgit v0.9.0.2

diff --git a/x11-libs/gtk+/files/gtk+-3.1.90-gtk_tree_view_draw-return.patch b/x11-libs/gtk+/files/gtk+-3.1.90-gtk_tree_view_draw-return.patch
deleted file mode 100644
index 87be406..0000000
--- a/x11-libs/gtk+/files/gtk+-3.1.90-gtk_tree_view_draw-return.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 9e8b2f2521d1961930bf29b890df9eef89dfc019 Mon Sep 17 00:00:00 2001
-From: Benjamin Otte <otte@redhat.com>
-Date: Wed, 14 Sep 2011 14:03:54 +0000
-Subject: treeview: Return FALSE from draw handler
-
-... like every widget should.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=658981
----
-diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
-index 8eaeee8..3b2ec9e 100644
---- a/gtk/gtktreeview.c
-+++ b/gtk/gtktreeview.c
-@@ -5383,7 +5383,7 @@ gtk_tree_view_draw (GtkWidget *widget,
-                                     button, cr);
-     }
- 
--  return TRUE;
-+  return FALSE;
- }
- 
- enum
---
-cgit v0.9.0.2

diff --git a/x11-libs/gtk+/gtk+-3.1.90.ebuild b/x11-libs/gtk+/gtk+-3.2.0.ebuild
similarity index 98%
rename from x11-libs/gtk+/gtk+-3.1.90.ebuild
rename to x11-libs/gtk+/gtk+-3.2.0.ebuild
index d078fb7..ec98b3a 100644
--- a/x11-libs/gtk+/gtk+-3.1.90.ebuild
+++ b/x11-libs/gtk+/gtk+-3.2.0.ebuild
@@ -111,9 +111,6 @@ src_prepare() {
 		[[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS demos Makefile.in
 	fi
 
-	# Useful upstream patches, will be in next release
-	epatch "${FILESDIR}/${P}"-*.patch
-
 	gnome2_src_prepare
 }
 



^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-09-26  5:05 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-18 23:01 [gentoo-commits] proj/gnome:gnome-next commit in: x11-libs/gtk+/files/, x11-libs/gtk+/ Alexandre Restovtsev
  -- strict thread matches above, loose matches on Subject: below --
2011-09-26  4:46 Alexandre Restovtsev
2011-09-07 21:30 Alexandre Restovtsev
2011-08-13 19:33 Alexandre Restovtsev
2011-07-23 17:46 Alexandre Restovtsev
2011-07-20 23:42 Alexandre Restovtsev

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox