public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/files/, x11-libs/gtk+/
@ 2011-02-25  9:39 Priit Laes
  0 siblings, 0 replies; 11+ messages in thread
From: Priit Laes @ 2011-02-25  9:39 UTC (permalink / raw
  To: gentoo-commits

commit:     3427a8fed450601d6edfce892c2de44166770c0a
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Fri Feb 25 09:34:38 2011 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Fri Feb 25 09:34:38 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3427a8fe

x11-libs/gtk+: Revbump to fix double free error in some applications

---
 x11-libs/gtk+/files/gtk+-3.0.1-double-free.patch   |   24 ++++++++++++++++++++
 .../{gtk+-3.0.1.ebuild => gtk+-3.0.1-r1.ebuild}    |    2 +
 2 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/x11-libs/gtk+/files/gtk+-3.0.1-double-free.patch b/x11-libs/gtk+/files/gtk+-3.0.1-double-free.patch
new file mode 100644
index 0000000..31c30d4
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-3.0.1-double-free.patch
@@ -0,0 +1,24 @@
+From 651410fa2a2c9c1e390ecbe384ea259f9bd319c8 Mon Sep 17 00:00:00 2001
+From: Carlos Garcia Campos <cgarcia@igalia.com>
+Date: Thu, 24 Feb 2011 16:38:40 +0000
+Subject: Copy event axes for double/triple click events in gdk_event_copy()
+
+Button event axes for double/triple click events are freed by
+gdk_event_free(), so copy them to avoid an invalid free when releasing a
+copied event.
+---
+diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c
+index 5188e1e..25853da 100644
+--- a/gdk/gdkevents.c
++++ b/gdk/gdkevents.c
+@@ -555,6 +555,8 @@ gdk_event_copy (const GdkEvent *event)
+       break;
+ 
+     case GDK_BUTTON_PRESS:
++    case GDK_2BUTTON_PRESS:
++    case GDK_3BUTTON_PRESS:
+     case GDK_BUTTON_RELEASE:
+       if (event->button.axes)
+         new_event->button.axes = g_memdup (event->button.axes,
+--
+cgit v0.8.3.4

diff --git a/x11-libs/gtk+/gtk+-3.0.1.ebuild b/x11-libs/gtk+/gtk+-3.0.1-r1.ebuild
similarity index 99%
rename from x11-libs/gtk+/gtk+-3.0.1.ebuild
rename to x11-libs/gtk+/gtk+-3.0.1-r1.ebuild
index 55473c2..17e0249 100644
--- a/x11-libs/gtk+/gtk+-3.0.1.ebuild
+++ b/x11-libs/gtk+/gtk+-3.0.1-r1.ebuild
@@ -91,6 +91,8 @@ src_prepare() {
 	replace-flags -O3 -O2
 	strip-flags
 
+	epatch "${FILESDIR}/${P}-double-free.patch"
+
 	# Non-working test in gentoo's env
 	sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \
 		-i gtk/tests/testing.c || die "sed 1 failed"



^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/files/, x11-libs/gtk+/
@ 2011-03-09 11:34 Nirbheek Chauhan
  0 siblings, 0 replies; 11+ messages in thread
From: Nirbheek Chauhan @ 2011-03-09 11:34 UTC (permalink / raw
  To: gentoo-commits

commit:     dd7856b1d4a7b3de932cc33ae3d844d9dd684002
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  8 11:30:07 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue Mar  8 11:30:39 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=dd7856b1

x11-libs/gtk+: 3.0.1 → 3.0.2, don't use -j1 with introspection

---
 x11-libs/gtk+/files/gtk+-3.0.1-double-free.patch   |   24 --------------------
 .../{gtk+-3.0.1-r1.ebuild => gtk+-3.0.2.ebuild}    |   10 +-------
 x11-libs/gtk+/gtk+-9999.ebuild                     |    8 +-----
 3 files changed, 2 insertions(+), 40 deletions(-)

diff --git a/x11-libs/gtk+/files/gtk+-3.0.1-double-free.patch b/x11-libs/gtk+/files/gtk+-3.0.1-double-free.patch
deleted file mode 100644
index 31c30d4..0000000
--- a/x11-libs/gtk+/files/gtk+-3.0.1-double-free.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 651410fa2a2c9c1e390ecbe384ea259f9bd319c8 Mon Sep 17 00:00:00 2001
-From: Carlos Garcia Campos <cgarcia@igalia.com>
-Date: Thu, 24 Feb 2011 16:38:40 +0000
-Subject: Copy event axes for double/triple click events in gdk_event_copy()
-
-Button event axes for double/triple click events are freed by
-gdk_event_free(), so copy them to avoid an invalid free when releasing a
-copied event.
----
-diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c
-index 5188e1e..25853da 100644
---- a/gdk/gdkevents.c
-+++ b/gdk/gdkevents.c
-@@ -555,6 +555,8 @@ gdk_event_copy (const GdkEvent *event)
-       break;
- 
-     case GDK_BUTTON_PRESS:
-+    case GDK_2BUTTON_PRESS:
-+    case GDK_3BUTTON_PRESS:
-     case GDK_BUTTON_RELEASE:
-       if (event->button.axes)
-         new_event->button.axes = g_memdup (event->button.axes,
---
-cgit v0.8.3.4

diff --git a/x11-libs/gtk+/gtk+-3.0.1-r1.ebuild b/x11-libs/gtk+/gtk+-3.0.2.ebuild
similarity index 96%
rename from x11-libs/gtk+/gtk+-3.0.1-r1.ebuild
rename to x11-libs/gtk+/gtk+-3.0.2.ebuild
index 17e0249..7090c8e 100644
--- a/x11-libs/gtk+/gtk+-3.0.1-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-3.0.2.ebuild
@@ -48,7 +48,7 @@ RDEPEND="!aqua? (
 	)
 	xinerama? ( x11-libs/libXinerama )
 	>=dev-libs/glib-2.28.0
-	>=x11-libs/pango-1.20[introspection?]
+	>=x11-libs/pango-1.24.0[introspection?]
 	>=dev-libs/atk-1.30[introspection?]
 	media-libs/fontconfig
 	x11-libs/gtk+:2
@@ -91,8 +91,6 @@ src_prepare() {
 	replace-flags -O3 -O2
 	strip-flags
 
-	epatch "${FILESDIR}/${P}-double-free.patch"
-
 	# Non-working test in gentoo's env
 	sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \
 		-i gtk/tests/testing.c || die "sed 1 failed"
@@ -146,12 +144,6 @@ src_configure() {
 	econf --libdir="${EPREFIX}/usr/$(get_libdir)" ${myconf}
 }
 
-src_compile() {
-	# Unfortunately, the parellel make breaks if USE=introspection
-	use introspection && export MAKEOPTS="${MAKEOPTS} -j1"
-	default
-}
-
 src_test() {
 	unset DBUS_SESSION_BUS_ADDRESS
 	# Exporting HOME fixes tests using XDG directories spec since all defaults

diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild
index 55473c2..7090c8e 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-9999.ebuild
@@ -48,7 +48,7 @@ RDEPEND="!aqua? (
 	)
 	xinerama? ( x11-libs/libXinerama )
 	>=dev-libs/glib-2.28.0
-	>=x11-libs/pango-1.20[introspection?]
+	>=x11-libs/pango-1.24.0[introspection?]
 	>=dev-libs/atk-1.30[introspection?]
 	media-libs/fontconfig
 	x11-libs/gtk+:2
@@ -144,12 +144,6 @@ src_configure() {
 	econf --libdir="${EPREFIX}/usr/$(get_libdir)" ${myconf}
 }
 
-src_compile() {
-	# Unfortunately, the parellel make breaks if USE=introspection
-	use introspection && export MAKEOPTS="${MAKEOPTS} -j1"
-	default
-}
-
 src_test() {
 	unset DBUS_SESSION_BUS_ADDRESS
 	# Exporting HOME fixes tests using XDG directories spec since all defaults



^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/files/, x11-libs/gtk+/
@ 2011-03-29  8:35 Nirbheek Chauhan
  0 siblings, 0 replies; 11+ messages in thread
From: Nirbheek Chauhan @ 2011-03-29  8:35 UTC (permalink / raw
  To: gentoo-commits

commit:     dd8b6b5580610d77672fc6a1e8f26cef390f9490
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 29 07:08:02 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue Mar 29 08:35:24 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=dd8b6b55

x11-libs/gtk+: moved to the tree

---
 .../gtk+-2.14.3-limit-gtksignal-includes.patch     |   17 --
 x11-libs/gtk+/files/gtk+-2.21.3-multilib.patch     |   21 --
 x11-libs/gtk+/gtk+-3.0.6.ebuild                    |  196 --------------------
 3 files changed, 0 insertions(+), 234 deletions(-)

diff --git a/x11-libs/gtk+/files/gtk+-2.14.3-limit-gtksignal-includes.patch b/x11-libs/gtk+/files/gtk+-2.14.3-limit-gtksignal-includes.patch
deleted file mode 100644
index 3fe8cff..0000000
--- a/x11-libs/gtk+/files/gtk+-2.14.3-limit-gtksignal-includes.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-http://bugzilla.gnome.org/show_bug.cgi?id=536767
-
-Makes inkscape and claws-mail buildable again. Basically all packages still using
-GtkCList and single included headers.
---- gtk/gtksignal.h.orig	2008-06-12 01:40:59.000000000 -0400
-+++ gtk/gtksignal.h	2008-06-11 18:21:47.000000000 -0400
-@@ -29,7 +29,9 @@
- #ifndef __GTK_SIGNAL_H__
- #define __GTK_SIGNAL_H__
- 
--#include <gtk/gtk.h>
-+#include <gtk/gtkenums.h>
-+#include <gtk/gtktypeutils.h>
-+#include <gtk/gtkobject.h>
- #include <gtk/gtkmarshal.h>
- 
- G_BEGIN_DECLS

diff --git a/x11-libs/gtk+/files/gtk+-2.21.3-multilib.patch b/x11-libs/gtk+/files/gtk+-2.21.3-multilib.patch
deleted file mode 100644
index 3cf777d..0000000
--- a/x11-libs/gtk+/files/gtk+-2.21.3-multilib.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Same as the 2.8 version, except removed gdk-pixbuf parts
-
---- gtk+-2.21.3.orig/gtk/gtkrc.c
-+++ gtk+-2.21.3/gtk/gtkrc.c
-@@ -364,7 +364,15 @@
-       if (im_module_file)
- 	result = g_strdup (im_module_file);
-       else
--	result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
-+	{
-+	  result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", GTK_HOST, "gtk.immodules", NULL);
-+	  if (!g_file_test (result, G_FILE_TEST_EXISTS))
-+	    {
-+	      g_free (result);
-+	      
-+	      result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
-+	    }
-+	}
-     }
- 
-   return result;

diff --git a/x11-libs/gtk+/gtk+-3.0.6.ebuild b/x11-libs/gtk+/gtk+-3.0.6.ebuild
deleted file mode 100644
index 18ef65d..0000000
--- a/x11-libs/gtk+/gtk+-3.0.6.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.4"
-
-inherit eutils flag-o-matic gnome.org gnome2-utils libtool virtualx
-
-DESCRIPTION="Gimp ToolKit +"
-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
-IUSE="aqua cups debug doc examples +introspection jpeg jpeg2k tiff test vim-syntax xinerama"
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-# FIXME: introspection data is built against system installation of gtk+:3
-# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
-# Use gtk+:2 for gtk-update-icon-cache and gtk-builder-convert
-# >=x11-libs/gtk+-2.24:2 is needed for bug 359555
-COMMON_DEPEND="!aqua? (
-		x11-libs/libXrender
-		x11-libs/libX11
-		x11-libs/libXi
-		x11-libs/libXt
-		x11-libs/libXext
-		>=x11-libs/libXrandr-1.3
-		x11-libs/libXcursor
-		x11-libs/libXfixes
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		>=x11-libs/cairo-1.10.0[X,svg]
-		>=x11-libs/gdk-pixbuf-2.22.0:2[X,introspection?,jpeg?,jpeg2k?,tiff?]
-	)
-	aqua? (
-		>=x11-libs/cairo-1.10.0[aqua,svg]
-		>=x11-libs/gdk-pixbuf-2.22.0:2[introspection?,jpeg?,jpeg2k?,tiff?]
-	)
-	xinerama? ( x11-libs/libXinerama )
-	>=dev-libs/glib-2.28.0
-	>=x11-libs/pango-1.24.0[introspection?]
-	>=dev-libs/atk-1.30[introspection?]
-	>=x11-libs/gtk+-2.24:2
-	media-libs/fontconfig
-	x11-misc/shared-mime-info
-	cups? ( net-print/cups )
-	introspection? ( >=dev-libs/gobject-introspection-0.10.1 )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/pkgconfig-0.9
-	!aqua? (
-		x11-proto/xextproto
-		x11-proto/xproto
-		x11-proto/inputproto
-		x11-proto/damageproto
-	)
-	x86-interix? (
-		sys-libs/itx-bind
-	)
-	xinerama? ( x11-proto/xineramaproto )
-	>=dev-util/gtk-doc-am-1.11
-	doc? (
-		>=dev-util/gtk-doc-1.11
-		~app-text/docbook-xml-dtd-4.1.2 )
-	test? (
-		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc )"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gail-1000"
-PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
-
-strip_builddir() {
-	local rule=$1
-	shift
-	local directory=$1
-	shift
-	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
-		|| die "Could not strip director ${directory} from build."
-}
-
-src_prepare() {
-	# -O3 and company cause random crashes in applications. Bug #133469
-	replace-flags -O3 -O2
-	strip-flags
-
-	# Non-working test in gentoo's env
-	sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \
-		-i gtk/tests/testing.c || die "sed 1 failed"
-	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
-		[[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS tests Makefile.in
-	fi
-
-	if ! use examples; then
-		# don't waste time building demos
-		strip_builddir SRC_SUBDIRS demos Makefile.am
-		[[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS demos Makefile.in
-	fi
-
-	[[ ${PV} = 9999 ]] && gnome2-live_src_prepare
-}
-
-src_configure() {
-	# FIXME: PackageKit support
-	# png always on to display icons (foser)
-	local myconf="$(use_enable doc gtk-doc)
-		$(use_enable xinerama)
-		$(use_enable cups cups auto)
-		$(use_enable introspection)
-		--disable-packagekit
-		--disable-papi
-		--enable-gtk2-dependency"
-
-	# XXX: Maybe with multi-backend we should enable x11 all the time?
-	if use aqua; then
-		myconf="${myconf} --enable-quartz-backend --disable-xinput"
-	else
-		myconf="${myconf} --enable-x11-backend --enable-xinput"
-	fi
-
-	# Passing --disable-debug is not recommended for production use
-	use debug && myconf="${myconf} --enable-debug=yes"
-
-	# need libdir here to avoid a double slash in a path that libtool doesn't
-	# grok so well during install (// between $EPREFIX and usr ...)
-	econf --libdir="${EPREFIX}/usr/$(get_libdir)" ${myconf}
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	# Exporting HOME fixes tests using XDG directories spec since all defaults
-	# are based on $HOME. It is also backward compatible with functions not
-	# yet ported to this spec.
-	XDG_DATA_HOME="${T}" HOME="${T}" Xemake check || die "tests failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Installation failed"
-
-	# see bug #133241
-	echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc"
-	insinto /etc/gtk-3.0
-	doins "${T}"/gtkrc || die "doins gtkrc failed"
-
-	dodoc AUTHORS ChangeLog* HACKING NEWS* README* || die "dodoc failed"
-
-	# Remove unneeded *.la files
-	find "${ED}" -name "*.la" -delete
-
-	# add -framework Carbon to the .pc files
-	use aqua && for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
-		sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${ED}"usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
-	done
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-
-	local GTK3_MODDIR="${EROOT}usr/$(get_libdir)/gtk-3.0/3.0.0"
-	gtk-query-immodules-3.0  > "${GTK3_MODDIR}/immodules.cache" \
-		|| ewarn "Failed to run gtk-query-immodules-3.0"
-
-	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."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_schemas_update --uninstall
-}



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

commit:     32b0eb364f75bb849c3902f6a44df8f9d3f14eab
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Mon Oct 17 16:59:56 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Mon Oct 17 19:07:05 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=32b0eb36

x11-libs/gtk+: 3.2.0 → 3.2.1

Bump with numerous accessibility- and osx-related fixes.

Disable /TreeView/scrolling/after-realize/constant-height/path-995
and bug-111500 tests; see bug #384855 and
https://bugzilla.gnome.org/show_bug.cgi?id=660931)

Add missing selectors.errors file (needed for the css parser test).

Disable reftests (many of them fail when building from portage, but
strangely enough succeed when building from my home directory; need to
investigate why).

Disable a11y picker test (result depends on the look of
GtkFileChooserButton, which in turn depends on the list of mounted
filesystems).

---
 x11-libs/gtk+/files/gtk+-3.2.1-failing-tests.patch |   25 ++++++++++++++++++++
 x11-libs/gtk+/files/gtk+-3.2.1-selector.errors     |    1 +
 .../gtk+/{gtk+-3.2.0.ebuild => gtk+-3.2.1.ebuild}  |   16 ++++++++++++
 x11-libs/gtk+/gtk+-9999.ebuild                     |   16 ++++++++++++
 4 files changed, 58 insertions(+), 0 deletions(-)

diff --git a/x11-libs/gtk+/files/gtk+-3.2.1-failing-tests.patch b/x11-libs/gtk+/files/gtk+-3.2.1-failing-tests.patch
new file mode 100644
index 0000000..ca7c896
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-3.2.1-failing-tests.patch
@@ -0,0 +1,25 @@
+Skip failing tests. See bug #384855 and https://bugzilla.gnome.org/show_bug.cgi?id=660931
+
+diff --git a/gtk/tests/treeview-scrolling.c b/gtk/tests/treeview-scrolling.c
+index 63bf429..0f8bafd 100644
+--- a/gtk/tests/treeview-scrolling.c
++++ b/gtk/tests/treeview-scrolling.c
+@@ -1300,7 +1300,6 @@ add_tests (gboolean mixed,
+ 	add_test ("750", mixed, test_type, use_align, row_align, setup, scroll_func);
+ 	add_test ("990", mixed, test_type, use_align, row_align, setup, scroll_func);
+ 	add_test ("991", mixed, test_type, use_align, row_align, setup, scroll_func);
+-	add_test ("995", mixed, test_type, use_align, row_align, setup, scroll_func);
+ 	add_test ("997", mixed, test_type, use_align, row_align, setup, scroll_func);
+ 	add_test ("999", mixed, test_type, use_align, row_align, setup, scroll_func);
+ }
+@@ -1491,10 +1490,6 @@ main (int argc, char **argv)
+ 		    ScrollFixture, NULL,
+ 		    scroll_fixture_tree_setup, test_bug93584,
+ 		    scroll_fixture_teardown);
+-	g_test_add ("/TreeView/scrolling/specific/bug-111500",
+-		    ScrollFixture, NULL,
+-		    scroll_fixture_tree_setup, test_bug111500,
+-		    scroll_fixture_teardown);
+ 	g_test_add ("/TreeView/scrolling/specific/bug-111500-mixed",
+ 		    ScrollFixture, NULL,
+ 		    scroll_fixture_mixed_tree_setup, test_bug111500_mixed,

diff --git a/x11-libs/gtk+/files/gtk+-3.2.1-selector.errors b/x11-libs/gtk+/files/gtk+-3.2.1-selector.errors
new file mode 100644
index 0000000..42cc16e
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-3.2.1-selector.errors
@@ -0,0 +1 @@
+selector.css:201: error: GTK_CSS_PROVIDER_ERROR_SYNTAX

diff --git a/x11-libs/gtk+/gtk+-3.2.0.ebuild b/x11-libs/gtk+/gtk+-3.2.1.ebuild
similarity index 89%
rename from x11-libs/gtk+/gtk+-3.2.0.ebuild
rename to x11-libs/gtk+/gtk+-3.2.1.ebuild
index 0cfe730..d2495e8 100644
--- a/x11-libs/gtk+/gtk+-3.2.0.ebuild
+++ b/x11-libs/gtk+/gtk+-3.2.1.ebuild
@@ -99,6 +99,22 @@ src_prepare() {
 	sed '\%/recent-manager/add%,/recent_manager_purge/ d' \
 		-i gtk/tests/recentmanager.c || die "sed 2 failed"
 
+	# Missing file, required for tests; https://bugzilla.gnome.org/show_bug.cgi?id=662024
+	cp "${FILESDIR}/${PN}-3.2.1-selector.errors" \
+		tests/css/parser/selector.errors || die "cp failed"
+
+	# FIXME: multiple reftests fail when run from portage (but succeed when
+	# run from a manual compile in a temp directory)
+	sed -e 's:\(SUBDIRS.*\)reftests:\1:' \
+		-i tests/Makefile.* || die "sed 3 failed"
+
+	# Test results depend on the list of mounted filesystems!
+	rm tests/a11y/pickers.{ui,txt} || die "rm failed"
+
+	# Failing treeview scrolling tests; bug #384855,
+	# https://bugzilla.gnome.org/show_bug.cgi?id=660931
+	epatch "${FILESDIR}/${PN}-3.2.1-failing-tests.patch"
+
 	if ! use test; then
 		# don't waste time building tests
 		strip_builddir SRC_SUBDIRS tests Makefile.am

diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild
index 0cfe730..d2495e8 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-9999.ebuild
@@ -99,6 +99,22 @@ src_prepare() {
 	sed '\%/recent-manager/add%,/recent_manager_purge/ d' \
 		-i gtk/tests/recentmanager.c || die "sed 2 failed"
 
+	# Missing file, required for tests; https://bugzilla.gnome.org/show_bug.cgi?id=662024
+	cp "${FILESDIR}/${PN}-3.2.1-selector.errors" \
+		tests/css/parser/selector.errors || die "cp failed"
+
+	# FIXME: multiple reftests fail when run from portage (but succeed when
+	# run from a manual compile in a temp directory)
+	sed -e 's:\(SUBDIRS.*\)reftests:\1:' \
+		-i tests/Makefile.* || die "sed 3 failed"
+
+	# Test results depend on the list of mounted filesystems!
+	rm tests/a11y/pickers.{ui,txt} || die "rm failed"
+
+	# Failing treeview scrolling tests; bug #384855,
+	# https://bugzilla.gnome.org/show_bug.cgi?id=660931
+	epatch "${FILESDIR}/${PN}-3.2.1-failing-tests.patch"
+
 	if ! use test; then
 		# don't waste time building tests
 		strip_builddir SRC_SUBDIRS tests Makefile.am



^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/files/, x11-libs/gtk+/
@ 2012-02-26 21:19 Alexandre Restovtsev
  0 siblings, 0 replies; 11+ messages in thread
From: Alexandre Restovtsev @ 2012-02-26 21:19 UTC (permalink / raw
  To: gentoo-commits

commit:     db005457476b85432ddbe41503b823578aecc7f9
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 26 20:44:22 2012 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sun Feb 26 21:12:40 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=db005457

x11-libs/gtk+: 3.3.14 → 3.3.16

Drop unneeded patch, fix gnome2_src_prepare usage.

---
 x11-libs/gtk+/files/gtk+-3.2.1-failing-tests.patch |   25 --------------------
 x11-libs/gtk+/files/gtk+-3.2.1-selector.errors     |    1 -
 .../{gtk+-3.3.14.ebuild => gtk+-3.3.16.ebuild}     |   10 ++-----
 x11-libs/gtk+/gtk+-9999.ebuild                     |   14 +++++-----
 4 files changed, 10 insertions(+), 40 deletions(-)

diff --git a/x11-libs/gtk+/files/gtk+-3.2.1-failing-tests.patch b/x11-libs/gtk+/files/gtk+-3.2.1-failing-tests.patch
deleted file mode 100644
index ca7c896..0000000
--- a/x11-libs/gtk+/files/gtk+-3.2.1-failing-tests.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Skip failing tests. See bug #384855 and https://bugzilla.gnome.org/show_bug.cgi?id=660931
-
-diff --git a/gtk/tests/treeview-scrolling.c b/gtk/tests/treeview-scrolling.c
-index 63bf429..0f8bafd 100644
---- a/gtk/tests/treeview-scrolling.c
-+++ b/gtk/tests/treeview-scrolling.c
-@@ -1300,7 +1300,6 @@ add_tests (gboolean mixed,
- 	add_test ("750", mixed, test_type, use_align, row_align, setup, scroll_func);
- 	add_test ("990", mixed, test_type, use_align, row_align, setup, scroll_func);
- 	add_test ("991", mixed, test_type, use_align, row_align, setup, scroll_func);
--	add_test ("995", mixed, test_type, use_align, row_align, setup, scroll_func);
- 	add_test ("997", mixed, test_type, use_align, row_align, setup, scroll_func);
- 	add_test ("999", mixed, test_type, use_align, row_align, setup, scroll_func);
- }
-@@ -1491,10 +1490,6 @@ main (int argc, char **argv)
- 		    ScrollFixture, NULL,
- 		    scroll_fixture_tree_setup, test_bug93584,
- 		    scroll_fixture_teardown);
--	g_test_add ("/TreeView/scrolling/specific/bug-111500",
--		    ScrollFixture, NULL,
--		    scroll_fixture_tree_setup, test_bug111500,
--		    scroll_fixture_teardown);
- 	g_test_add ("/TreeView/scrolling/specific/bug-111500-mixed",
- 		    ScrollFixture, NULL,
- 		    scroll_fixture_mixed_tree_setup, test_bug111500_mixed,

diff --git a/x11-libs/gtk+/files/gtk+-3.2.1-selector.errors b/x11-libs/gtk+/files/gtk+-3.2.1-selector.errors
deleted file mode 100644
index 42cc16e..0000000
--- a/x11-libs/gtk+/files/gtk+-3.2.1-selector.errors
+++ /dev/null
@@ -1 +0,0 @@
-selector.css:201: error: GTK_CSS_PROVIDER_ERROR_SYNTAX

diff --git a/x11-libs/gtk+/gtk+-3.3.14.ebuild b/x11-libs/gtk+/gtk+-3.3.16.ebuild
similarity index 95%
rename from x11-libs/gtk+/gtk+-3.3.14.ebuild
rename to x11-libs/gtk+/gtk+-3.3.16.ebuild
index b2bdac9..10fe626 100644
--- a/x11-libs/gtk+/gtk+-3.3.14.ebuild
+++ b/x11-libs/gtk+/gtk+-3.3.16.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 
-inherit eutils flag-o-matic gnome.org gnome2 libtool virtualx
+inherit eutils flag-o-matic gnome.org gnome2-utils libtool virtualx
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -53,7 +53,7 @@ COMMON_DEPEND="!aqua? (
 		>=x11-libs/gdk-pixbuf-2.25.2:2[introspection?]
 	)
 	xinerama? ( x11-libs/libXinerama )
-	>=dev-libs/glib-2.31.14
+	>=dev-libs/glib-2.31.18
 	>=x11-libs/pango-1.29.0[introspection?]
 	>=dev-libs/atk-2.1.5[introspection?]
 	>=x11-libs/gtk+-2.24:2
@@ -113,10 +113,6 @@ src_prepare() {
 	# Test results depend on the list of mounted filesystems!
 	rm -v tests/a11y/pickers.{ui,txt} || die "rm failed"
 
-	# Failing treeview scrolling tests; bug #384855,
-	# https://bugzilla.gnome.org/show_bug.cgi?id=660931
-	epatch "${FILESDIR}/${PN}-3.2.1-failing-tests.patch"
-
 	if ! use test; then
 		# don't waste time building tests
 		strip_builddir SRC_SUBDIRS tests Makefile.am
@@ -129,7 +125,7 @@ src_prepare() {
 		[[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS demos Makefile.in
 	fi
 
-	gnome2_src_prepare
+	[[ ${PV} = 9999 ]] && gnome2_src_prepare
 }
 
 src_configure() {

diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild
index d73c294..10fe626 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 
-inherit eutils flag-o-matic gnome.org gnome2 libtool virtualx
+inherit eutils flag-o-matic gnome.org gnome2-utils libtool virtualx
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -26,6 +26,10 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
+# Testing is broken badly:
+# https://bugzilla.gnome.org/show_bug.cgi?id=669562
+RESTRICT="test"
+
 # FIXME: introspection data is built against system installation of gtk+:3
 # NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
 # Use gtk+:2 for gtk-update-icon-cache and gtk-builder-convert
@@ -49,7 +53,7 @@ COMMON_DEPEND="!aqua? (
 		>=x11-libs/gdk-pixbuf-2.25.2:2[introspection?]
 	)
 	xinerama? ( x11-libs/libXinerama )
-	>=dev-libs/glib-2.31.14
+	>=dev-libs/glib-2.31.18
 	>=x11-libs/pango-1.29.0[introspection?]
 	>=dev-libs/atk-2.1.5[introspection?]
 	>=x11-libs/gtk+-2.24:2
@@ -109,10 +113,6 @@ src_prepare() {
 	# Test results depend on the list of mounted filesystems!
 	rm -v tests/a11y/pickers.{ui,txt} || die "rm failed"
 
-	# Failing treeview scrolling tests; bug #384855,
-	# https://bugzilla.gnome.org/show_bug.cgi?id=660931
-	epatch "${FILESDIR}/${PN}-3.2.1-failing-tests.patch"
-
 	if ! use test; then
 		# don't waste time building tests
 		strip_builddir SRC_SUBDIRS tests Makefile.am
@@ -125,7 +125,7 @@ src_prepare() {
 		[[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS demos Makefile.in
 	fi
 
-	gnome2_src_prepare
+	[[ ${PV} = 9999 ]] && gnome2_src_prepare
 }
 
 src_configure() {



^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/files/, x11-libs/gtk+/
@ 2012-03-15 15:55 Alexandre Restovtsev
  0 siblings, 0 replies; 11+ messages in thread
From: Alexandre Restovtsev @ 2012-03-15 15:55 UTC (permalink / raw
  To: gentoo-commits

commit:     55a9cc0a2099135b112bb3a0adaeaf581d60ea6c
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 15 15:50:56 2012 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Thu Mar 15 15:54:51 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=55a9cc0a

x11-libs/gtk+: use theme in /etc/gtk-3.0/settings.ini as fallback

Fall back to theme in /etc/gtk-3.0/settings.ini if the theme specified
by gnome-settings-daemon does not support gtk3 (provides a better gtk3
experience for gnome2 users).

---
 .../gtk+/files/gtk+-3.3.18-fallback-theme.patch    |   81 ++++++++++++++++++++
 .../{gtk+-3.3.18.ebuild => gtk+-3.3.18-r1.ebuild}  |    3 +
 2 files changed, 84 insertions(+), 0 deletions(-)

diff --git a/x11-libs/gtk+/files/gtk+-3.3.18-fallback-theme.patch b/x11-libs/gtk+/files/gtk+-3.3.18-fallback-theme.patch
new file mode 100644
index 0000000..7f5d0a1
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-3.3.18-fallback-theme.patch
@@ -0,0 +1,81 @@
+From 1a3f790830c2db70eb3369e684c3cd8ac3b8051b Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Wed, 14 Mar 2012 23:08:53 -0400
+Subject: [PATCH] settings: fall back to settings.ini gtk theme if requested
+ theme fails
+
+If a gtk3 application is run in gnome2 and the settings daemon uses
+xsettings to request a gtk2 theme with no gtk3 version (which is the
+case by default), then instead of failing to load any theme, we should
+attempt to fall back to the theme specified in settings.ini files.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=654108
+---
+ gtk/gtksettings.c |   23 +++++++++++++++++++++++
+ 1 files changed, 23 insertions(+), 0 deletions(-)
+
+diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
+index 2e17430..354ba34 100644
+--- a/gtk/gtksettings.c
++++ b/gtk/gtksettings.c
+@@ -115,6 +115,7 @@ struct _GtkSettingsPrivate
+   GtkCssProvider *theme_provider;
+   GtkCssProvider *key_theme_provider;
+   GtkStyleProperties *style;
++  gchar *fallback_gtk_theme_name;
+ };
+ 
+ typedef enum
+@@ -1528,6 +1529,8 @@ gtk_settings_finalize (GObject *object)
+   if (priv->style)
+     g_object_unref (priv->style);
+ 
++  g_free (priv->fallback_gtk_theme_name);
++
+   G_OBJECT_CLASS (gtk_settings_parent_class)->finalize (object);
+ }
+ 
+@@ -1889,6 +1892,12 @@ apply_queued_setting (GtkSettings             *settings,
+       if (pspec->param_id == PROP_COLOR_SCHEME)
+         merge_color_scheme (settings, &tmp_value, qvalue->source);
+ 
++      if (!g_strcmp0 (pspec->name, "gtk-theme-name") && qvalue->source == GTK_SETTINGS_SOURCE_DEFAULT)
++        {
++          g_free (priv->fallback_gtk_theme_name);
++          priv->fallback_gtk_theme_name = g_value_dup_string (&tmp_value);
++        }
++
+       if (priv->property_values[pspec->param_id - 1].source <= qvalue->source)
+         {
+           g_value_copy (&tmp_value, &priv->property_values[pspec->param_id - 1].value);
+@@ -2594,6 +2603,10 @@ _gtk_settings_reset_rc_values (GtkSettings *settings)
+         }
+       i++;
+     }
++
++  g_free (priv->fallback_gtk_theme_name);
++  priv->fallback_gtk_theme_name = NULL;
++
+   g_object_thaw_notify (G_OBJECT (settings));
+   g_free (pspecs);
+ }
+@@ -2881,6 +2894,16 @@ settings_update_theme (GtkSettings *settings)
+ 
+       if (!provider)
+         provider = gtk_css_provider_get_named (theme_name, NULL);
++
++      /* If we failed, fall back to the theme from settings.ini */
++      if (!provider && priv->fallback_gtk_theme_name && *priv->fallback_gtk_theme_name
++          && g_strcmp0 (theme_name, priv->fallback_gtk_theme_name))
++        {
++          provider = gtk_css_provider_get_named (priv->fallback_gtk_theme_name, NULL);
++
++          if (!provider)
++            provider = gtk_css_provider_get_named (priv->fallback_gtk_theme_name, NULL);
++        }
+     }
+ 
+   /* If we didn't find the named theme, fall back */
+-- 
+1.7.8.5
+

diff --git a/x11-libs/gtk+/gtk+-3.3.18.ebuild b/x11-libs/gtk+/gtk+-3.3.18-r1.ebuild
similarity index 98%
rename from x11-libs/gtk+/gtk+-3.3.18.ebuild
rename to x11-libs/gtk+/gtk+-3.3.18-r1.ebuild
index 4d353a9..592807e 100644
--- a/x11-libs/gtk+/gtk+-3.3.18.ebuild
+++ b/x11-libs/gtk+/gtk+-3.3.18-r1.ebuild
@@ -96,6 +96,9 @@ src_prepare() {
 	replace-flags -O3 -O2
 	strip-flags
 
+	# https://bugzilla.gnome.org/show_bug.cgi?id=65410
+	epatch "${FILESDIR}/${PN}-3.3.18-fallback-theme.patch"
+
 	# Non-working test in gentoo's env
 	sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \
 		-i gtk/tests/testing.c || die "sed 1 failed"



^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/files/, x11-libs/gtk+/
@ 2012-08-05 13:34 Priit Laes
  0 siblings, 0 replies; 11+ messages in thread
From: Priit Laes @ 2012-08-05 13:34 UTC (permalink / raw
  To: gentoo-commits

commit:     1ea2733e10c732768ce17693547d8565b86c9c0f
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Sun Aug  5 13:33:04 2012 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Sun Aug  5 13:33:04 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1ea2733e

x11-libs/gtk+: Fix build with USE=cups and >=cups-1.6

---
 x11-libs/gtk+/files/gtk+-3.5.8-cups-1-6-fix.patch |   24 +++++++++++++++++++++
 x11-libs/gtk+/gtk+-3.5.8.ebuild                   |    2 +
 2 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/x11-libs/gtk+/files/gtk+-3.5.8-cups-1-6-fix.patch b/x11-libs/gtk+/files/gtk+-3.5.8-cups-1-6-fix.patch
new file mode 100644
index 0000000..3106179
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-3.5.8-cups-1-6-fix.patch
@@ -0,0 +1,24 @@
+From e8dcfad441aad7e03a8a459f3818018bd6ff63c7 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@t-online.de>
+Date: Sun, 05 Aug 2012 07:56:58 +0000
+Subject: cups: Use IPP api when necessary with CUPS 1.6
+
+---
+diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c
+index d9110be..c79fe9d 100644
+--- a/modules/printbackends/cups/gtkprintbackendcups.c
++++ b/modules/printbackends/cups/gtkprintbackendcups.c
+@@ -1835,9 +1835,9 @@ cups_printer_handle_attribute (GtkPrintBackendCups *cups_backend,
+ 	    info->auth_info_required[i] = g_strdup (ippGetString (attr, i, NULL));
+ 	}
+     }
+-  else if (strcmp (attr->name, "number-up-default") == 0)
++  else if (strcmp (ippGetName (attr), "number-up-default") == 0)
+     {
+-      info->default_number_up = attr->values[0].integer;
++      info->default_number_up = ippGetInteger (attr, 0);
+     }
+   else
+     {
+--
+cgit v0.9.0.2

diff --git a/x11-libs/gtk+/gtk+-3.5.8.ebuild b/x11-libs/gtk+/gtk+-3.5.8.ebuild
index 972753c..9cd9dab 100644
--- a/x11-libs/gtk+/gtk+-3.5.8.ebuild
+++ b/x11-libs/gtk+/gtk+-3.5.8.ebuild
@@ -108,6 +108,8 @@ src_prepare() {
 	# https://bugzilla.gnome.org/show_bug.cgi?id=65410
 	epatch "${FILESDIR}/${PN}-3.3.18-fallback-theme.patch"
 
+	epatch "${FILESDIR}/${P}-cups-1-6-fix.patch"
+
 	# Work around https://bugzilla.gnome.org/show_bug.cgi?id=663991
 	if [[ ${CHOST} == *-solaris* ]]; then
 		sed -i -e '/_XOPEN_SOURCE/s/500/600/' gtk/gtksearchenginesimple.c || die


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/files/, x11-libs/gtk+/
@ 2012-08-10  5:31 Priit Laes
  0 siblings, 0 replies; 11+ messages in thread
From: Priit Laes @ 2012-08-10  5:31 UTC (permalink / raw
  To: gentoo-commits

commit:     ead355662b47f205ef5e05b953a1b66537276e97
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Fri Aug 10 05:30:18 2012 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Fri Aug 10 05:30:18 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ead35566

x11-libs/gtk+: 3.5.8 → 3.5.10

---
 x11-libs/gtk+/files/gtk+-3.5.8-cups-1-6-fix.patch  |   24 --------------------
 .../gtk+/{gtk+-3.5.8.ebuild => gtk+-3.5.10.ebuild} |    2 -
 2 files changed, 0 insertions(+), 26 deletions(-)

diff --git a/x11-libs/gtk+/files/gtk+-3.5.8-cups-1-6-fix.patch b/x11-libs/gtk+/files/gtk+-3.5.8-cups-1-6-fix.patch
deleted file mode 100644
index 3106179..0000000
--- a/x11-libs/gtk+/files/gtk+-3.5.8-cups-1-6-fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From e8dcfad441aad7e03a8a459f3818018bd6ff63c7 Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz@t-online.de>
-Date: Sun, 05 Aug 2012 07:56:58 +0000
-Subject: cups: Use IPP api when necessary with CUPS 1.6
-
----
-diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c
-index d9110be..c79fe9d 100644
---- a/modules/printbackends/cups/gtkprintbackendcups.c
-+++ b/modules/printbackends/cups/gtkprintbackendcups.c
-@@ -1835,9 +1835,9 @@ cups_printer_handle_attribute (GtkPrintBackendCups *cups_backend,
- 	    info->auth_info_required[i] = g_strdup (ippGetString (attr, i, NULL));
- 	}
-     }
--  else if (strcmp (attr->name, "number-up-default") == 0)
-+  else if (strcmp (ippGetName (attr), "number-up-default") == 0)
-     {
--      info->default_number_up = attr->values[0].integer;
-+      info->default_number_up = ippGetInteger (attr, 0);
-     }
-   else
-     {
---
-cgit v0.9.0.2

diff --git a/x11-libs/gtk+/gtk+-3.5.8.ebuild b/x11-libs/gtk+/gtk+-3.5.10.ebuild
similarity index 99%
rename from x11-libs/gtk+/gtk+-3.5.8.ebuild
rename to x11-libs/gtk+/gtk+-3.5.10.ebuild
index 9cd9dab..972753c 100644
--- a/x11-libs/gtk+/gtk+-3.5.8.ebuild
+++ b/x11-libs/gtk+/gtk+-3.5.10.ebuild
@@ -108,8 +108,6 @@ src_prepare() {
 	# https://bugzilla.gnome.org/show_bug.cgi?id=65410
 	epatch "${FILESDIR}/${PN}-3.3.18-fallback-theme.patch"
 
-	epatch "${FILESDIR}/${P}-cups-1-6-fix.patch"
-
 	# Work around https://bugzilla.gnome.org/show_bug.cgi?id=663991
 	if [[ ${CHOST} == *-solaris* ]]; then
 		sed -i -e '/_XOPEN_SOURCE/s/500/600/' gtk/gtksearchenginesimple.c || die


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/files/, x11-libs/gtk+/
@ 2014-04-20 18:17 Gilles Dartiguelongue
  0 siblings, 0 replies; 11+ messages in thread
From: Gilles Dartiguelongue @ 2014-04-20 18:17 UTC (permalink / raw
  To: gentoo-commits

commit:     ce681553520b9ea3372eb3d7c9aa360a2f2b8c94
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 20 15:38:08 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Apr 20 15:48:30 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ce681553

x11-libs/gtk+: QAed

* Packagekit support was dropped.
* Cosmetic changes to dependencies.
* Fix keywords.
* Sync live ebuild.

---
 .../gtk+/files/gtk+-3.3.18-fallback-theme.patch    | 81 ----------------------
 x11-libs/gtk+/gtk+-3.12.0.ebuild                   | 17 +++--
 x11-libs/gtk+/gtk+-9999.ebuild                     | 41 ++++++-----
 3 files changed, 28 insertions(+), 111 deletions(-)

diff --git a/x11-libs/gtk+/files/gtk+-3.3.18-fallback-theme.patch b/x11-libs/gtk+/files/gtk+-3.3.18-fallback-theme.patch
deleted file mode 100644
index 7f5d0a1..0000000
--- a/x11-libs/gtk+/files/gtk+-3.3.18-fallback-theme.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 1a3f790830c2db70eb3369e684c3cd8ac3b8051b Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Wed, 14 Mar 2012 23:08:53 -0400
-Subject: [PATCH] settings: fall back to settings.ini gtk theme if requested
- theme fails
-
-If a gtk3 application is run in gnome2 and the settings daemon uses
-xsettings to request a gtk2 theme with no gtk3 version (which is the
-case by default), then instead of failing to load any theme, we should
-attempt to fall back to the theme specified in settings.ini files.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=654108
----
- gtk/gtksettings.c |   23 +++++++++++++++++++++++
- 1 files changed, 23 insertions(+), 0 deletions(-)
-
-diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
-index 2e17430..354ba34 100644
---- a/gtk/gtksettings.c
-+++ b/gtk/gtksettings.c
-@@ -115,6 +115,7 @@ struct _GtkSettingsPrivate
-   GtkCssProvider *theme_provider;
-   GtkCssProvider *key_theme_provider;
-   GtkStyleProperties *style;
-+  gchar *fallback_gtk_theme_name;
- };
- 
- typedef enum
-@@ -1528,6 +1529,8 @@ gtk_settings_finalize (GObject *object)
-   if (priv->style)
-     g_object_unref (priv->style);
- 
-+  g_free (priv->fallback_gtk_theme_name);
-+
-   G_OBJECT_CLASS (gtk_settings_parent_class)->finalize (object);
- }
- 
-@@ -1889,6 +1892,12 @@ apply_queued_setting (GtkSettings             *settings,
-       if (pspec->param_id == PROP_COLOR_SCHEME)
-         merge_color_scheme (settings, &tmp_value, qvalue->source);
- 
-+      if (!g_strcmp0 (pspec->name, "gtk-theme-name") && qvalue->source == GTK_SETTINGS_SOURCE_DEFAULT)
-+        {
-+          g_free (priv->fallback_gtk_theme_name);
-+          priv->fallback_gtk_theme_name = g_value_dup_string (&tmp_value);
-+        }
-+
-       if (priv->property_values[pspec->param_id - 1].source <= qvalue->source)
-         {
-           g_value_copy (&tmp_value, &priv->property_values[pspec->param_id - 1].value);
-@@ -2594,6 +2603,10 @@ _gtk_settings_reset_rc_values (GtkSettings *settings)
-         }
-       i++;
-     }
-+
-+  g_free (priv->fallback_gtk_theme_name);
-+  priv->fallback_gtk_theme_name = NULL;
-+
-   g_object_thaw_notify (G_OBJECT (settings));
-   g_free (pspecs);
- }
-@@ -2881,6 +2894,16 @@ settings_update_theme (GtkSettings *settings)
- 
-       if (!provider)
-         provider = gtk_css_provider_get_named (theme_name, NULL);
-+
-+      /* If we failed, fall back to the theme from settings.ini */
-+      if (!provider && priv->fallback_gtk_theme_name && *priv->fallback_gtk_theme_name
-+          && g_strcmp0 (theme_name, priv->fallback_gtk_theme_name))
-+        {
-+          provider = gtk_css_provider_get_named (priv->fallback_gtk_theme_name, NULL);
-+
-+          if (!provider)
-+            provider = gtk_css_provider_get_named (priv->fallback_gtk_theme_name, NULL);
-+        }
-     }
- 
-   /* If we didn't find the named theme, fall back */
--- 
-1.7.8.5
-

diff --git a/x11-libs/gtk+/gtk+-3.12.0.ebuild b/x11-libs/gtk+/gtk+-3.12.0.ebuild
index d891bcc..ee97028 100644
--- a/x11-libs/gtk+/gtk+-3.12.0.ebuild
+++ b/x11-libs/gtk+/gtk+-3.12.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.10.8.ebuild,v 1.4 2014/04/16 07:49:22 ago Exp $
+# $Header: $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -18,12 +18,12 @@ SLOT="3"
 #  * http://mail.gnome.org/archives/gtk-devel-list/2010-November/msg00099.html
 # I tried this and got it all compiling, but the end result is unusable as it
 # horribly mixes up the backends -- grobian
-IUSE="aqua cloudprint colord cups debug examples +introspection packagekit test vim-syntax wayland X xinerama"
+IUSE="aqua cloudprint colord cups debug examples +introspection test vim-syntax wayland X xinerama"
 REQUIRED_USE="
 	|| ( aqua wayland X )
 	xinerama? ( X )"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # FIXME: introspection data is built against system installation of gtk+:3
 # NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
@@ -38,10 +38,11 @@ COMMON_DEPEND="
 	>=x11-libs/pango-1.32.4[introspection?]
 	x11-misc/shared-mime-info
 
+	cloudprint? (
+		>=net-libs/rest-0.7
+		>=dev-libs/json-glib-1.0 )
 	colord? ( >=x11-misc/colord-0.1.9 )
 	cups? ( >=net-print/cups-1.2 )
-	cloudprint? ( >=net-libs/rest-0.7 
-				  >=dev-libs/json-glib-1.0 )
 	introspection? ( >=dev-libs/gobject-introspection-1.39 )
 	wayland? (
 		>=dev-libs/wayland-1.3.90
@@ -87,7 +88,6 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	!<gnome-base/gail-1000
 	!<x11-libs/vte-0.31.0:2.90
-	packagekit? ( app-admin/packagekit-base )
 	X? ( !<x11-base/xorg-server-1.11.4 )
 "
 PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
@@ -131,11 +131,11 @@ src_configure() {
 	# grok so well during install (// between $EPREFIX and usr ...)
 	gnome2_src_configure \
 		$(use_enable aqua quartz-backend) \
+		$(use_enable cloudprint) \
 		$(use_enable colord) \
 		$(use_enable cups cups auto) \
 		$(usex debug --enable-debug=yes "") \
 		$(use_enable introspection) \
-		$(use_enable packagekit) \
 		$(use_enable wayland wayland-backend) \
 		$(use_enable X x11-backend) \
 		$(use_enable X xcomposite) \
@@ -144,12 +144,11 @@ src_configure() {
 		$(use_enable X xkb) \
 		$(use_enable X xrandr) \
 		$(use_enable xinerama) \
-		$(use_enable cloudprint) \
 		--disable-papi \
 		--enable-man \
 		--enable-gtk2-dependency \
 		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
-		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
 }
 
 src_test() {

diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild
index f755462..9c81c07 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-9999.ebuild
@@ -3,8 +3,10 @@
 # $Header: $
 
 EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 
-inherit eutils flag-o-matic gnome.org gnome2-utils multilib virtualx
+inherit flag-o-matic gnome2 multilib virtualx
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -19,7 +21,7 @@ SLOT="3"
 #  * http://mail.gnome.org/archives/gtk-devel-list/2010-November/msg00099.html
 # 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 examples +introspection packagekit test vim-syntax wayland X xinerama"
+IUSE="aqua cloudprint colord cups debug examples +introspection test vim-syntax wayland X xinerama"
 REQUIRED_USE="
 	|| ( aqua wayland X )
 	xinerama? ( X )"
@@ -28,7 +30,7 @@ if [[ ${PV} = 9999 ]]; then
 	IUSE="${IUSE} doc"
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 # FIXME: introspection data is built against system installation of gtk+:3
@@ -36,7 +38,7 @@ fi
 # Use gtk+:2 for gtk-update-icon-cache
 COMMON_DEPEND="
 	>=dev-libs/atk-2.7.5[introspection?]
-	>=dev-libs/glib-2.37.5:2
+	>=dev-libs/glib-2.39.5:2
 	media-libs/fontconfig
 	>=x11-libs/cairo-1.12[aqua?,glib,svg,X?]
 	>=x11-libs/gdk-pixbuf-2.27.1:2[introspection?,X?]
@@ -44,11 +46,14 @@ COMMON_DEPEND="
 	>=x11-libs/pango-1.32.4[introspection?]
 	x11-misc/shared-mime-info
 
+	cloudprint? (
+		>=net-libs/rest-0.7
+		>=dev-libs/json-glib-1.0 )
 	colord? ( >=x11-misc/colord-0.1.9 )
 	cups? ( >=net-print/cups-1.2 )
-	introspection? ( >=dev-libs/gobject-introspection-1.32 )
+	introspection? ( >=dev-libs/gobject-introspection-1.39 )
 	wayland? (
-		>=dev-libs/wayland-1.2
+		>=dev-libs/wayland-1.3.90
 		media-libs/mesa[wayland]
 		>=x11-libs/libxkbcommon-0.2
 	)
@@ -71,7 +76,7 @@ DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xml-dtd:4.1.2
 	dev-libs/libxslt
 	dev-util/gdbus-codegen
-	>=dev-util/gtk-doc-am-1.11
+	>=dev-util/gtk-doc-am-1.20
 	virtual/pkgconfig
 	X? (
 		x11-proto/xextproto
@@ -87,7 +92,7 @@ DEPEND="${COMMON_DEPEND}
 
 if [[ ${PV} = 9999 ]]; then
 	DEPEND="${DEPEND}
-		doc? ( >=dev-util/gtk-doc-1.11 )"
+		doc? ( >=dev-util/gtk-doc-1.20 )"
 fi
 
 # gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
@@ -97,7 +102,6 @@ fi
 RDEPEND="${COMMON_DEPEND}
 	!<gnome-base/gail-1000
 	!<x11-libs/vte-0.31.0:2.90
-	packagekit? ( app-admin/packagekit-base )
 	X? ( !<x11-base/xorg-server-1.11.4 )
 "
 PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
@@ -112,8 +116,6 @@ strip_builddir() {
 }
 
 src_prepare() {
-	gnome2_environment_reset
-
 	# -O3 and company cause random crashes in applications. Bug #133469
 	replace-flags -O3 -O2
 	strip-flags
@@ -145,13 +147,13 @@ src_configure() {
 	# Passing --disable-debug is not recommended for production use
 	# need libdir here to avoid a double slash in a path that libtool doesn't
 	# grok so well during install (// between $EPREFIX and usr ...)
-	econf \
+	gnome2_src_configure \
 		$(use_enable aqua quartz-backend) \
+		$(use_enable cloudprint) \
 		$(use_enable colord) \
 		$(use_enable cups cups auto) \
 		$(usex debug --enable-debug=yes "") \
 		$(use_enable introspection) \
-		$(use_enable packagekit) \
 		$(use_enable wayland wayland-backend) \
 		$(use_enable X x11-backend) \
 		$(use_enable X xcomposite) \
@@ -160,12 +162,11 @@ src_configure() {
 		$(use_enable X xkb) \
 		$(use_enable X xrandr) \
 		$(use_enable xinerama) \
-		--disable-gtk-doc \
 		--disable-papi \
 		--enable-man \
 		--enable-gtk2-dependency \
 		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
 		${myconf}
 }
 
@@ -188,15 +189,13 @@ src_test() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	gnome2_src_install
 
 	insinto /etc/gtk-3.0
 	doins "${FILESDIR}"/settings.ini
 
 	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
 
-	prune_libtool_files --modules
-
 	# add -framework Carbon to the .pc files
 	if use aqua ; then
 		for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
@@ -207,7 +206,7 @@ src_install() {
 }
 
 pkg_preinst() {
-	gnome2_schemas_savelist
+	gnome2_pkg_preinst
 
 	# Make sure loaders.cache belongs to gdk-pixbuf alone
 	local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
@@ -220,7 +219,7 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	gnome2_schemas_update
+	gnome2_pkg_postinst
 	gnome2_query_immodules_gtk3
 
 	if ! has_version "app-text/evince"; then
@@ -231,7 +230,7 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	gnome2_schemas_update
+	gnome2_pkg_postrm
 
 	if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
 		rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/files/, x11-libs/gtk+/
@ 2014-11-30 15:52 Remi Cardona
  0 siblings, 0 replies; 11+ messages in thread
From: Remi Cardona @ 2014-11-30 15:52 UTC (permalink / raw
  To: gentoo-commits

commit:     e8432718a163db9e0c2389815e034678413b247e
Author:     Rémi Cardona <remi <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 30 15:51:35 2014 +0000
Commit:     Remi Cardona <remi <AT> gentoo <DOT> org>
CommitDate: Sun Nov 30 15:52:17 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e8432718

x11-libs/gtk+: Fix build with dash as /bin/sh

See bug #525928.

---
 x11-libs/gtk+/files/gtk+-non-bash-support.patch | 29 +++++++++++++++++++++++++
 x11-libs/gtk+/gtk+-3.14.5.ebuild                |  6 ++++-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/x11-libs/gtk+/files/gtk+-non-bash-support.patch b/x11-libs/gtk+/files/gtk+-non-bash-support.patch
new file mode 100644
index 0000000..efd13e6
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-non-bash-support.patch
@@ -0,0 +1,29 @@
+From c8ef010024db794e25ca58ef3c02663de685f1bb Mon Sep 17 00:00:00 2001
+From: Alexander Tsoy <alexander@tsoy.me>
+Date: Sun, 26 Oct 2014 01:59:33 +0400
+Subject: [PATCH] gtk/Makefile.am: improve portability of ECHO
+
+---
+ gtk/Makefile.am | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/gtk/Makefile.am b/gtk/Makefile.am
+index f60bec8..e923940 100644
+--- a/gtk/Makefile.am
++++ b/gtk/Makefile.am
+@@ -19,11 +19,7 @@ GTK_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview --print-settings %
+ endif
+ 
+ SUBDIRS = inspector native .
+-if OS_DARWIN
+-  ECHO="echo"
+-else
+-  ECHO=echo -e
+-endif
++ECHO=printf '%b\n'
+ 
+ if HAVE_CLOUDPRINT
+ if HAVE_PAPI_CUPS
+-- 
+2.0.4
+

diff --git a/x11-libs/gtk+/gtk+-3.14.5.ebuild b/x11-libs/gtk+/gtk+-3.14.5.ebuild
index 122f8e6..98e6e47 100644
--- a/x11-libs/gtk+/gtk+-3.14.5.ebuild
+++ b/x11-libs/gtk+/gtk+-3.14.5.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit eutils flag-o-matic gnome2 multilib virtualx multilib-minimal
+inherit eutils flag-o-matic autotools gnome2 multilib virtualx multilib-minimal
 
 DESCRIPTION="Gimp ToolKit +"
 HOMEPAGE="http://www.gtk.org/"
@@ -108,6 +108,9 @@ strip_builddir() {
 }
 
 src_prepare() {
+	# see bug #525928
+	epatch "${FILESDIR}/${PN}-non-bash-support.patch"
+
 	# -O3 and company cause random crashes in applications. Bug #133469
 	replace-flags -O3 -O2
 	strip-flags
@@ -128,6 +131,7 @@ src_prepare() {
 		strip_builddir SRC_SUBDIRS examples Makefile.in
 	fi
 
+	eautoreconf
 	gnome2_src_prepare
 }
 


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/files/, x11-libs/gtk+/
@ 2019-01-18 21:07 Mart Raudsepp
  0 siblings, 0 replies; 11+ messages in thread
From: Mart Raudsepp @ 2019-01-18 21:07 UTC (permalink / raw
  To: gentoo-commits

commit:     7a029594c850603a417d3575fd43132377f541f3
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 18 21:05:54 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Fri Jan 18 21:05:54 2019 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=7a029594

x11-libs/gtk+: Remove very outdated live ebuild

It's gtk4 into SLOT=3, tries to build with autotools (isn't a thing
for gtk4 git), and hasn't been synced with other changes for over
3 years, it seems. On top of that, later blind fixes broke the
dependency string.

Closes: https://bugs.gentoo.org/674514
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 .../gtk+-3.16.2-remove_update-icon-cache.patch     |  24 --
 x11-libs/gtk+/files/gtk+-non-bash-support.patch    |  56 -----
 x11-libs/gtk+/files/settings.ini                   |   4 -
 x11-libs/gtk+/gtk+-9999.ebuild                     | 265 ---------------------
 x11-libs/gtk+/metadata.xml                         |  23 --
 5 files changed, 372 deletions(-)

diff --git a/x11-libs/gtk+/files/gtk+-3.16.2-remove_update-icon-cache.patch b/x11-libs/gtk+/files/gtk+-3.16.2-remove_update-icon-cache.patch
deleted file mode 100644
index b121dd57..00000000
--- a/x11-libs/gtk+/files/gtk+-3.16.2-remove_update-icon-cache.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From d83443d10381a53637226b937094454951de44c1 Mon Sep 17 00:00:00 2001
-From: Ole Reifschneider <tranquility@gentoo.org>
-Date: Thu, 16 Apr 2015 23:51:51 +0200
-Subject: [PATCH] Remove update-icon-cache from bin_PROGRAMS
-
----
- gtk/Makefile.am | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/gtk/Makefile.am b/gtk/Makefile.am
-index 83dfe31..a5afc03 100644
---- a/gtk/Makefile.am
-+++ b/gtk/Makefile.am
-@@ -1380,7 +1380,6 @@ endif
- #
- bin_PROGRAMS = \
- 	gtk-query-immodules-3.0	\
--	gtk-update-icon-cache \
- 	gtk-encode-symbolic-svg \
- 	gtk-launch
-
---
-2.0.5
-

diff --git a/x11-libs/gtk+/files/gtk+-non-bash-support.patch b/x11-libs/gtk+/files/gtk+-non-bash-support.patch
deleted file mode 100644
index a1aac42c..00000000
--- a/x11-libs/gtk+/files/gtk+-non-bash-support.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 43a4a28cdc60ac7347bb89f84cf049cb3401621d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org>
-Date: Sun, 26 Oct 2014 01:59:33 +0400
-Subject: [PATCH] gtk/Makefile.am: Remove bashisms
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-- improve portability of ECHO
-- remove use of shopt
-
-https://bugzilla.gnome.org/show_bug.cgi?id=738835
-
-From: Alexander Tsoy <alexander@tsoy.me>
-Signed-off-by: Rémi Cardona <remi@gentoo.org>
----
- gtk/Makefile.am | 13 +++++--------
- 1 file changed, 5 insertions(+), 8 deletions(-)
-
-diff --git a/gtk/Makefile.am b/gtk/Makefile.am
-index 96c651a..b1478ce 100644
---- a/gtk/Makefile.am
-+++ b/gtk/Makefile.am
-@@ -19,11 +19,7 @@ GTK_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview --print-settings %
- endif
- 
- SUBDIRS = inspector native .
--if OS_DARWIN
--  ECHO="echo"
--else
--  ECHO=echo -e
--endif
-+ECHO=printf '%b\n'
- 
- if HAVE_CLOUDPRINT
- if HAVE_PAPI_CUPS
-@@ -1405,12 +1401,13 @@ gtk.gresource.xml: Makefile.am
- 	  n=`basename $$f`; \
- 	  $(ECHO) "    <file compressed=\"true\">ui/$$n</file>" >> $@; \
- 	done; \
--	shopt -s nullglob; \
- 	for s in 16x16 22x22 24x24 32x32 48x48; do \
- 	  for c in actions status; do \
- 	    for f in $(srcdir)/resources/icons/$$s/$$c/*.png; do \
--	      n=`basename $$f`; \
--	      $(ECHO) "    <file>icons/$$s/$$c/$$n</file>" >> $@; \
-+	      if [ -e "$$f" ] ; then \
-+	        n=`basename $$f`; \
-+	        $(ECHO) "    <file>icons/$$s/$$c/$$n</file>" >> $@; \
-+	      fi; \
- 	    done; \
- 	  done; \
- 	done; \
--- 
-2.3.0
-

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

diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild
deleted file mode 100644
index b6b62d7d..00000000
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils flag-o-matic gnome2 multilib virtualx multilib-minimal
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="3"
-IUSE="aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland X xinerama"
-REQUIRED_USE="
-	|| ( aqua wayland X )
-	xinerama? ( X )
-"
-
-if [[ ${PV} = 9999 ]]; then
-	IUSE="${IUSE} doc"
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-# FIXME: introspection data is built against system installation of gtk+:3
-# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
-COMMON_DEPEND="
-	>=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.45.8:2[${MULTILIB_USEDEP}]
-	media-libs/fontconfig[${MULTILIB_USEDEP}]
-	>=media-libs/libepoxy-1.0[${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
-	>=x11-libs/gdk-pixbuf-2.30:2[introspection?,X?,${MULTILIB_USEDEP}]
-	>=x11-libs/pango-1.37.3[introspection?,${MULTILIB_USEDEP}]
-	x11-misc/shared-mime-info
-
-	cloudprint? (
-		>=net-libs/rest-0.7[${MULTILIB_USEDEP}]
-		>=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] )
-	colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
-	cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
-	wayland? (
-		>=dev-libs/wayland-1.9.91[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.0.0[${MULTILIB_USEDEP}]
-		media-libs/mesa[wayland,${MULTILIB_USEDEP}]
-		>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
-	)
-	X? (
-		>=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
-		x11-libs/libXrender[${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXcomposite[${MULTILIB_USEDEP}]
-		x11-libs/libXdamage[${MULTILIB_USEDEP}]
-		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.1.2
-	dev-libs/libxslt
-	dev-libs/gobject-introspection-common
-	>=dev-util/gdbus-codegen-2.38.2
-	>=dev-util/gtk-doc-am-1.20
-	>=sys-devel/gettext-0.18.3[${MULTILIB_USEDEP}]
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	X? ( x11-base/xorg-proto )
-	)
-	test? (
-		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc )
-"
-
-if [[ ${PV} = 9999 ]]; then
-	DEPEND="${DEPEND}
-		doc? ( >=dev-util/gtk-doc-1.20 )"
-fi
-
-# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
-# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
-# >=xorg-server-1.11.4 needed for
-#  https://mail.gnome.org/archives/desktop-devel-list/2012-March/msg00024.html
-RDEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-update-icon-cache-3
-	!<gnome-base/gail-1000
-	!<x11-libs/vte-0.31.0:2.90
-	>=x11-themes/adwaita-icon-theme-3.14
-	X? ( !<x11-base/xorg-server-1.11.4 )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-gtklibs-20140508-r3
-		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
-	)
-"
-# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
-PDEPEND="
-	gnome-base/librsvg[${MULTILIB_USEDEP}]
-	vim-syntax? ( app-vim/gtk-syntax )
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gtk-query-immodules-3.0
-)
-
-strip_builddir() {
-	local rule=$1
-	shift
-	local directory=$1
-	shift
-	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
-		|| die "Could not strip director ${directory} from build."
-}
-
-src_prepare() {
-	# -O3 and company cause random crashes in applications. Bug #133469
-	replace-flags -O3 -O2
-	strip-flags
-
-	if ! use test ; then
-		# don't waste time building tests
-		strip_builddir SRC_SUBDIRS testsuite Makefile.am
-		[[ ${PV} != 9999 ]] &&  strip_builddir SRC_SUBDIRS testsuite Makefile.in
-		strip_builddir SRC_SUBDIRS tests Makefile.am
-		[[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS tests Makefile.in
-	fi
-
-	if ! use examples; then
-		# don't waste time building demos
-		strip_builddir SRC_SUBDIRS demos Makefile.am
-		[[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS demos Makefile.in
-		strip_builddir SRC_SUBDIRS examples Makefile.am
-		[[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS examples Makefile.in
-	fi
-
-	# Do no build and install gtk-update-icon-cache which is done by gtk+:2
-	epatch "${FILESDIR}"/${PN}-3.16.2-remove_update-icon-cache.patch
-
-	epatch_user
-
-	eautoreconf
-	[[ ${PV} = 9999 ]] && gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	local myconf=""
-
-	[[ ${PV} = 9999 ]] && myconf="${myconf} $(use_enable doc gtk-doc)"
-
-	# Passing --disable-debug is not recommended for production use
-	# need libdir here to avoid a double slash in a path that libtool doesn't
-	# grok so well during install (// between $EPREFIX and usr ...)
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		$(use_enable aqua quartz-backend) \
-		$(use_enable broadway broadway-backend) \
-		$(use_enable cloudprint) \
-		$(use_enable colord) \
-		$(use_enable cups cups auto) \
-		$(multilib_native_use_enable introspection) \
-		$(use_enable wayland wayland-backend) \
-		$(use_enable X x11-backend) \
-		$(use_enable X xcomposite) \
-		$(use_enable X xdamage) \
-		$(use_enable X xfixes) \
-		$(use_enable X xkb) \
-		$(use_enable X xrandr) \
-		$(use_enable xinerama) \
-		--disable-papi \
-		--disable-mir-backend \
-		--enable-man \
-		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config" \
-		${myconf}
-
-	# work-around gtk-doc out-of-source brokedness
-	if multilib_is_native_abi; then
-		local d
-		for d in gdk gtk libgail-util; do
-			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
-		done
-	fi
-}
-
-multilib_src_test() {
-	# FIXME: this should be handled at eclass level
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
-
-	unset DBUS_SESSION_BUS_ADDRESS
-	unset DISPLAY #527682
-	GSETTINGS_SCHEMA_DIR="${S}/gtk" Xemake check
-}
-
-multilib_src_install() {
-	gnome2_src_install
-
-	# add -framework Carbon to the .pc files, bug #???
-	if use aqua ; then
-		for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
-			sed -e "s:Libs\: :Libs\: -framework Carbon :" \
-				-i "${ED%/}"/usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
-		done
-	fi
-}
-
-multilib_src_install_all() {
-	insinto /etc/gtk-3.0
-	doins "${FILESDIR}"/settings.ini
-
-	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-
-	multilib_pkg_preinst() {
-		# Make immodules.cache belongs to gtk+ alone
-		local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
-
-		if [[ -e ${EROOT}${cache} ]]; then
-			cp "${EROOT}"${cache} "${ED}"/${cache} || die
-		else
-			touch "${ED}"/${cache} || die
-		fi
-	}
-	multilib_parallel_foreach_abi multilib_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	multilib_pkg_postinst() {
-		gnome2_query_immodules_gtk3 \
-			|| die "Update immodules cache failed (for ${ABI})"
-	}
-	multilib_parallel_foreach_abi multilib_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 settings.ini file."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
-		multilib_pkg_postrm() {
-			rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
-		}
-		multilib_foreach_abi multilib_pkg_postrm
-	fi
-}

diff --git a/x11-libs/gtk+/metadata.xml b/x11-libs/gtk+/metadata.xml
deleted file mode 100644
index efa1edaa..00000000
--- a/x11-libs/gtk+/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>gnome@gentoo.org</email>
-    <name>Gentoo GNOME Desktop</name>
-  </maintainer>
-  <longdescription>
-    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.
-  </longdescription>
-  <use>
-    <flag name="broadway">Enable the GDK Broadway backend.</flag>
-    <flag name="cloudprint">Enable printing via Google Cloud Print.</flag>
-    <flag name="colord">Use <pkg>x11-misc/colord</pkg> for color management
-	  in printing</flag>
-  </use>
-  <upstream>
-    <remote-id type="cpe">cpe:/a:gtk:gtk%2B</remote-id>
-  </upstream>
-</pkgmetadata>


^ permalink raw reply related	[flat|nested] 11+ messages in thread
end of thread, other threads:[~2019-01-18 21:07 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-09 11:34 [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/files/, x11-libs/gtk+/ Nirbheek Chauhan
  -- strict thread matches above, loose matches on Subject: below --
2019-01-18 21:07 Mart Raudsepp
2014-11-30 15:52 Remi Cardona
2014-04-20 18:17 Gilles Dartiguelongue
2012-08-10  5:31 Priit Laes
2012-08-05 13:34 Priit Laes
2012-03-15 15:55 Alexandre Restovtsev
2012-02-26 21:19 Alexandre Restovtsev
2011-10-17 19:10 Alexandre Restovtsev
2011-03-29  8:35 Nirbheek Chauhan
2011-02-25  9:39 Priit Laes

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