summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2013-03-29 19:39:21 +0000
committerGilles Dartiguelongue <eva@gentoo.org>2013-03-29 19:39:21 +0000
commitcd4886db4c485baa108f38a4f7ad5ce9997e8c6d (patch)
tree2b4a37c5011f1d9d51b7462ebe88f0fc5e81422b
parentClean up old revisions. (diff)
downloadgentoo-2-cd4886db4c485baa108f38a4f7ad5ce9997e8c6d.tar.gz
gentoo-2-cd4886db4c485baa108f38a4f7ad5ce9997e8c6d.tar.bz2
gentoo-2-cd4886db4c485baa108f38a4f7ad5ce9997e8c6d.zip
Clean up old revision.
(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key C6085806)
-rw-r--r--gnome-base/libgnomekbd/ChangeLog8
-rw-r--r--gnome-base/libgnomekbd/files/libgnomekbd-3.2.0-fg-color.patch39
-rw-r--r--gnome-base/libgnomekbd/libgnomekbd-3.4.0.2.ebuild35
3 files changed, 6 insertions, 76 deletions
diff --git a/gnome-base/libgnomekbd/ChangeLog b/gnome-base/libgnomekbd/ChangeLog
index 5d285ca47242..770a106943ba 100644
--- a/gnome-base/libgnomekbd/ChangeLog
+++ b/gnome-base/libgnomekbd/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for gnome-base/libgnomekbd
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/ChangeLog,v 1.102 2012/12/25 18:17:36 eva Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/ChangeLog,v 1.103 2013/03/29 19:39:21 eva Exp $
+
+ 29 Mar 2013; Gilles Dartiguelongue <eva@gentoo.org>
+ -files/libgnomekbd-3.2.0-fg-color.patch, -libgnomekbd-3.4.0.2.ebuild:
+ Clean up old revision.
*libgnomekbd-3.6.0 (25 Dec 2012)
diff --git a/gnome-base/libgnomekbd/files/libgnomekbd-3.2.0-fg-color.patch b/gnome-base/libgnomekbd/files/libgnomekbd-3.2.0-fg-color.patch
deleted file mode 100644
index a98e7e5774da..000000000000
--- a/gnome-base/libgnomekbd/files/libgnomekbd-3.2.0-fg-color.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 6709342d25629debcab15adbd16d7d08948e2c9e Mon Sep 17 00:00:00 2001
-From: Christian Persch <chpe@gnome.org>
-Date: Thu, 10 Nov 2011 23:57:03 +0100
-Subject: [PATCH] GtkTrayIcon:fg-color is a GdkRGBA
-
-... and not a GdkColor. So use the right variable, and the right free function.
-Fixes a crash on session startup in gnome-settings-daemon, when using the gnome3
-fallback session.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=663816
----
- libgnomekbd/gkbd-status.c | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libgnomekbd/gkbd-status.c b/libgnomekbd/gkbd-status.c
-index 2f5b41f..10c95bc 100644
---- a/libgnomekbd/gkbd-status.c
-+++ b/libgnomekbd/gkbd-status.c
-@@ -126,7 +126,7 @@ static void
- gkbd_status_render_cairo (GkbdStatusPrivHack * gkh, cairo_t * cr, int group)
- {
- double r, g, b;
-- GdkColor *fg_color;
-+ GdkRGBA *fg_color;
- gchar *font_family;
- int font_size;
- PangoFontDescription *pfd;
-@@ -155,7 +155,7 @@ gkbd_status_render_cairo (GkbdStatusPrivHack * gkh, cairo_t * cr, int group)
-
- g_object_get (gkh->tray_icon, "fg-color", &fg_color, NULL);
- cairo_set_source_rgb (cr, fg_color->red, fg_color->green, fg_color->blue);
-- gdk_color_free (fg_color);
-+ gdk_rgba_free (fg_color);
-
- gkbd_indicator_config_get_font_for_widget (ind_cfg,
- gkh->tray_icon,
---
-1.7.8
-
diff --git a/gnome-base/libgnomekbd/libgnomekbd-3.4.0.2.ebuild b/gnome-base/libgnomekbd/libgnomekbd-3.4.0.2.ebuild
deleted file mode 100644
index 77f8f0c44fb8..000000000000
--- a/gnome-base/libgnomekbd/libgnomekbd-3.4.0.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-3.4.0.2.ebuild,v 1.1 2012/05/14 06:05:55 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Gnome keyboard configuration library"
-HOMEPAGE="http://www.gnome.org"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="+introspection test"
-
-RDEPEND=">=dev-libs/glib-2.18:2
- >=x11-libs/gtk+-2.91.7:3[introspection?]
- >=x11-libs/libxklavier-5.2[introspection?]
-
- introspection? ( >=dev-libs/gobject-introspection-0.6.7 )"
-DEPEND="${RDEPEND}
- >=dev-util/intltool-0.35
- virtual/pkgconfig"
-
-pkg_setup() {
- G2CONF="${G2CONF}
- --disable-static
- --disable-schemas-compile
- $(use_enable introspection)
- $(use_enable test tests)"
- DOCS="AUTHORS ChangeLog NEWS README"
-}