diff options
Diffstat (limited to 'gnome-base')
8 files changed, 11 insertions, 459 deletions
diff --git a/gnome-base/gnome-control-center/ChangeLog b/gnome-base/gnome-control-center/ChangeLog index e3ed456955ea..33a26cff7732 100644 --- a/gnome-base/gnome-control-center/ChangeLog +++ b/gnome-base/gnome-control-center/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for gnome-base/gnome-control-center # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.52 2010/03/16 18:59:48 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.53 2010/03/22 22:03:15 eva Exp $ + + 22 Mar 2010; Gilles Dartiguelongue <eva@gentoo.org> + -gnome-control-center-2.24.0.1.ebuild, + -gnome-control-center-2.24.0.1-r1.ebuild, + -gnome-control-center-2.24.0.1-r10.ebuild, + -files/gnome-control-center-2.24.0.1-capplet-help.patch, + -files/gnome-control-center-2.24.0.1-gnome-desktop-api.patch, + -files/gnome-control-center-2.24.0.1-hv-max.patch, + -files/gnome-control-center-2.24.0.1-libgnomeui.patch: + Clean up old revisions. 16 Mar 2010; Christian Faulhammer <fauli@gentoo.org> gnome-control-center-2.26.0-r1.ebuild: diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-2.24.0.1-capplet-help.patch b/gnome-base/gnome-control-center/files/gnome-control-center-2.24.0.1-capplet-help.patch deleted file mode 100644 index 3ad6403c0daa..000000000000 --- a/gnome-base/gnome-control-center/files/gnome-control-center-2.24.0.1-capplet-help.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -up gnome-control-center-2.24.0.1/capplets/appearance/appearance-main.c.capplet-help gnome-control-center-2.24.0.1/capplets/appearance/appearance-main.c ---- gnome-control-center-2.24.0.1/capplets/appearance/appearance-main.c.capplet-help 2008-10-04 01:40:15.000000000 -0400 -+++ gnome-control-center-2.24.0.1/capplets/appearance/appearance-main.c 2008-10-04 01:40:34.000000000 -0400 -@@ -85,6 +85,38 @@ main_window_response (GtkWidget *widget, - g_object_unref (data->client); - g_object_unref (data->xml); - } -+ else if (response_id == GTK_RESPONSE_HELP) -+ { -+ GtkNotebook *nb; -+ gint pindex; -+ -+ nb = GTK_NOTEBOOK (glade_xml_get_widget (data->xml, "main_notebook")); -+ pindex = gtk_notebook_get_current_page (nb); -+ -+ switch (pindex) -+ { -+ case 0: /* theme */ -+ capplet_help (GTK_WINDOW (widget), "user-guide.xml", -+ "goscustdesk-12"); -+ break; -+ case 1: /* background */ -+ capplet_help (GTK_WINDOW (widget), "user-guide.xml", -+ "goscustdesk-7"); -+ break; -+ case 2: /* fonts */ -+ capplet_help (GTK_WINDOW (widget), "user-guide.xml", -+ "goscustdesk-38"); -+ break; -+ case 3: /* interface */ -+ capplet_help (GTK_WINDOW (widget), "user-guide.xml", -+ "goscustuserinter-2"); -+ break; -+ default: -+ capplet_help (GTK_WINDOW (widget), "user-guide.xml", -+ "prefs-look-and-feel"); -+ break; -+ } -+ } - } - - int -diff -up gnome-control-center-2.24.0.1/capplets/appearance/appearance-style.c.capplet-help gnome-control-center-2.24.0.1/capplets/appearance/appearance-style.c ---- gnome-control-center-2.24.0.1/capplets/appearance/appearance-style.c.capplet-help 2008-10-04 01:40:24.000000000 -0400 -+++ gnome-control-center-2.24.0.1/capplets/appearance/appearance-style.c 2008-10-04 01:40:34.000000000 -0400 -@@ -392,7 +392,7 @@ static void - style_response_cb (GtkDialog *dialog, gint response_id) - { - if (response_id == GTK_RESPONSE_HELP) { -- /* FIXME: help */ -+ capplet_help (GTK_WINDOW (dialog), "user-guide.xml", "goscustdesk-61"); - } else { - gtk_widget_hide (GTK_WIDGET (dialog)); - } diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-2.24.0.1-gnome-desktop-api.patch b/gnome-base/gnome-control-center/files/gnome-control-center-2.24.0.1-gnome-desktop-api.patch deleted file mode 100644 index af58d0d65703..000000000000 --- a/gnome-base/gnome-control-center/files/gnome-control-center-2.24.0.1-gnome-desktop-api.patch +++ /dev/null @@ -1,31 +0,0 @@ -Index: gnome-control-center-2.24.0.1/capplets/display/xrandr-capplet.c -=================================================================== ---- gnome-control-center-2.24.0.1.orig/capplets/display/xrandr-capplet.c 2009-04-16 10:36:37.412850259 +0200 -+++ gnome-control-center-2.24.0.1/capplets/display/xrandr-capplet.c 2009-04-16 10:37:37.653350312 +0200 -@@ -435,7 +435,7 @@ rebuild_rotation_combo (App *app) - - app->current_output->rotation = info->rotation; - -- if (gnome_rr_config_applicable (app->current_configuration, app->screen)) -+ if (gnome_rr_config_applicable (app->current_configuration, app->screen, NULL)) - { - add_key (app->rotation_combo, info->name, 0, 0, 0, info->rotation); - -@@ -1689,7 +1689,7 @@ on_detect_displays (GtkWidget *widget, g - { - App *app = data; - -- gnome_rr_screen_refresh (app->screen); -+ gnome_rr_screen_refresh (app->screen, NULL); - } - - #define SHOW_ICON_KEY "/apps/gnome_settings_daemon/xrandr/show_notification_icon" -@@ -1723,7 +1723,7 @@ run_application (App *app) - } - - app->screen = gnome_rr_screen_new (gdk_screen_get_default (), -- on_screen_changed, app); -+ on_screen_changed, app, NULL); - if (!app->screen) - { - g_error ("Could not get screen info"); diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-2.24.0.1-hv-max.patch b/gnome-base/gnome-control-center/files/gnome-control-center-2.24.0.1-hv-max.patch deleted file mode 100644 index 5cd18f64691e..000000000000 --- a/gnome-base/gnome-control-center/files/gnome-control-center-2.24.0.1-hv-max.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -up gnome-control-center-2.24.0.1/libwindow-settings/metacity-window-manager.c.hv-max gnome-control-center-2.24.0.1/libwindow-settings/metacity-window-manager.c ---- gnome-control-center-2.24.0.1/libwindow-settings/metacity-window-manager.c.hv-max 2008-10-04 02:01:24.000000000 -0400 -+++ gnome-control-center-2.24.0.1/libwindow-settings/metacity-window-manager.c 2008-10-04 02:02:53.000000000 -0400 -@@ -214,10 +214,10 @@ metacity_change_settings (GnomeWindowMan - action = "toggle_maximize"; - break; - case DOUBLE_CLICK_MAXIMIZE_VERTICALLY: -- action = "toggle_maximize_vert"; -+ action = "toggle_maximize_vertically"; - break; - case DOUBLE_CLICK_MAXIMIZE_HORIZONTALLY: -- action = "toggle_maximize_horiz"; -+ action = "toggle_maximize_horizontally"; - break; - case DOUBLE_CLICK_MINIMIZE: - action = "minimize"; -@@ -370,9 +370,11 @@ metacity_get_settings (GnomeWindowManage - settings->double_click_action = DOUBLE_CLICK_SHADE; - else if (strcmp (str, "toggle_maximize") == 0) - settings->double_click_action = DOUBLE_CLICK_MAXIMIZE; -- else if (strcmp (str, "toggle_maximize_horiz") == 0) -+ else if (strcmp (str, "toggle_maximize_horizontally") == 0 || -+ strcmp (str, "toggle_maximize_horiz") == 0) - settings->double_click_action = DOUBLE_CLICK_MAXIMIZE_HORIZONTALLY; -- else if (strcmp (str, "toggle_maximize_vert") == 0) -+ else if (strcmp (str, "toggle_maximize_vertically") == 0 || -+ strcmp (str, "toggle_maximize_vert") == 0) - settings->double_click_action = DOUBLE_CLICK_MAXIMIZE_VERTICALLY; - else if (strcmp (str, "minimize") == 0) - settings->double_click_action = DOUBLE_CLICK_MINIMIZE; diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-2.24.0.1-libgnomeui.patch b/gnome-base/gnome-control-center/files/gnome-control-center-2.24.0.1-libgnomeui.patch deleted file mode 100644 index 58c428440935..000000000000 --- a/gnome-base/gnome-control-center/files/gnome-control-center-2.24.0.1-libgnomeui.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: gnome-control-center-2.24.0.1/configure.in -=================================================================== ---- gnome-control-center-2.24.0.1.orig/configure.in 2009-04-16 10:31:56.309352617 +0200 -+++ gnome-control-center-2.24.0.1/configure.in 2009-04-16 10:32:14.016853698 +0200 -@@ -98,7 +98,7 @@ PKG_CHECK_MODULES(CAPPLET, $COMMON_MODUL - PKG_CHECK_MODULES(GNOMECC, $COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0) - PKG_CHECK_MODULES(GNOME, libgnomeui-2.0) - PKG_CHECK_MODULES(DBUS, dbus-1 dbus-glib-1) --PKG_CHECK_MODULES(GNOME_DESKTOP, gnome-desktop-2.0) -+PKG_CHECK_MODULES(GNOME_DESKTOP, gnome-desktop-2.0 libgnomeui-2.0) - PKG_CHECK_MODULES(DEFAULT_APPLICATIONS_CAPPLET, libxml-2.0) - PKG_CHECK_MODULES(METACITY, libmetacity-private >= 2.23.1) - PKG_CHECK_MODULES(SLAB, libslab) diff --git a/gnome-base/gnome-control-center/gnome-control-center-2.24.0.1-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-2.24.0.1-r1.ebuild deleted file mode 100644 index 9970364e7dee..000000000000 --- a/gnome-base/gnome-control-center/gnome-control-center-2.24.0.1-r1.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-2.24.0.1-r1.ebuild,v 1.3 2009/07/27 00:03:27 eva Exp $ - -EAPI="1" - -inherit eutils gnome2 - -DESCRIPTION="The gnome2 Desktop configuration tool" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="GPL-2" -SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="eds hal +sound" - -# FIXME: eel is still needed for libslab -RDEPEND="x11-libs/libXft - >=x11-libs/gtk+-2.11.6 - >=dev-libs/glib-2.17.4 - >=gnome-base/gconf-2.0 - >=gnome-base/libglade-2 - >=gnome-base/librsvg-2.0 - >=gnome-base/nautilus-2.6 - >=media-libs/fontconfig-1 - >=dev-libs/dbus-glib-0.73 - >=x11-libs/libxklavier-3.6 - >=x11-wm/metacity-2.23.1 - >=gnome-base/gnome-panel-2.0 - >=gnome-base/libgnomekbd-2.21.4.1 - >=gnome-base/gnome-desktop-2.26 - >=gnome-base/gnome-menus-2.11.1 - gnome-base/eel - gnome-base/gnome-settings-daemon - - >=media-libs/gstreamer-0.10.1.2 - >=media-libs/gst-plugins-base-0.10.1.2 - >=media-plugins/gst-plugins-gconf-0.10 - media-plugins/gst-plugins-meta:0.10 - - x11-libs/pango - dev-libs/libxml2 - media-libs/freetype - - eds? ( >=gnome-extra/evolution-data-server-1.7.90 ) - hal? ( >=sys-apps/hal-0.5.6 ) - sound? ( - >=media-libs/libcanberra-0.4 - x11-themes/sound-theme-freedesktop ) - - >=gnome-base/libbonobo-2 - >=gnome-base/libgnome-2.2 - >=gnome-base/libbonoboui-2 - >=gnome-base/libgnomeui-2.2 - - x11-apps/xmodmap - x11-libs/libXScrnSaver - x11-libs/libXext - x11-libs/libX11 - x11-libs/libXxf86misc - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXcursor" -DEPEND="${RDEPEND} - x11-proto/scrnsaverproto - x11-proto/xextproto - x11-proto/xproto - x11-proto/xf86miscproto - x11-proto/kbproto - x11-proto/randrproto - x11-proto/renderproto - - sys-devel/gettext - >=dev-util/intltool-0.40 - >=dev-util/pkgconfig-0.19 - dev-util/desktop-file-utils - - app-text/scrollkeeper - >=app-text/gnome-doc-utils-0.10.1" -# Needed for autoreconf -# gnome-base/gnome-common - -DOCS="AUTHORS ChangeLog NEWS README TODO" - -pkg_setup() { - if use sound && ! built_with_use media-libs/libcanberra gtk; then - eerror "You need to rebuild media-libs/libcanberra with gtk support." - die "Rebuild media-libs/libcanberra with USE='gtk'" - fi - - G2CONF="${G2CONF} - --disable-update-mimedb - --enable-gstreamer=0.10 - $(use_enable eds aboutme) - $(use_enable hal) - $(use_with sound libcanberra)" -} - -src_unpack() { - gnome2_src_unpack - - # Fix compilation on fbsd, bug #256958 - epatch "${FILESDIR}/${P}-fbsd.patch" - - # Upstream patch for Hor and Vert Maximise, bug #263166 - epatch "${FILESDIR}/${P}-hv-max.patch" - - # Upstream patch for fixing capplet help buttons, bug #263168 - epatch "${FILESDIR}/${P}-capplet-help.patch" -} diff --git a/gnome-base/gnome-control-center/gnome-control-center-2.24.0.1-r10.ebuild b/gnome-base/gnome-control-center/gnome-control-center-2.24.0.1-r10.ebuild deleted file mode 100644 index 4b84fd9d5f72..000000000000 --- a/gnome-base/gnome-control-center/gnome-control-center-2.24.0.1-r10.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-2.24.0.1-r10.ebuild,v 1.1 2009/07/27 00:03:27 eva Exp $ - -EAPI="2" - -inherit autotools eutils gnome2 - -DESCRIPTION="The gnome2 Desktop configuration tool" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="GPL-2" -SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="eds hal +sound" - -# FIXME: eel is still needed for libslab -RDEPEND="x11-libs/libXft - >=x11-libs/gtk+-2.11.6 - >=dev-libs/glib-2.17.4 - >=gnome-base/gconf-2.0 - >=gnome-base/libglade-2 - >=gnome-base/librsvg-2.0 - >=gnome-base/nautilus-2.6 - >=media-libs/fontconfig-1 - >=dev-libs/dbus-glib-0.73 - >=x11-libs/libxklavier-3.6 - >=x11-wm/metacity-2.23.1 - >=gnome-base/gnome-panel-2.0 - >=gnome-base/libgnomekbd-2.21.4.1 - >=gnome-base/gnome-desktop-2.23.90 - >=gnome-base/gnome-menus-2.11.1 - gnome-base/eel - gnome-base/gnome-settings-daemon - - >=media-libs/gstreamer-0.10.1.2 - >=media-libs/gst-plugins-base-0.10.1.2 - >=media-plugins/gst-plugins-gconf-0.10 - media-plugins/gst-plugins-meta:0.10 - - x11-libs/pango - dev-libs/libxml2 - media-libs/freetype - - eds? ( >=gnome-extra/evolution-data-server-1.7.90 ) - hal? ( >=sys-apps/hal-0.5.6 ) - sound? ( - >=media-libs/libcanberra-0.4[gtk] - x11-themes/sound-theme-freedesktop ) - - >=gnome-base/libbonobo-2 - >=gnome-base/libgnome-2.2 - >=gnome-base/libbonoboui-2 - >=gnome-base/libgnomeui-2.2 - - x11-apps/xmodmap - x11-libs/libXScrnSaver - x11-libs/libXext - x11-libs/libX11 - x11-libs/libXxf86misc - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXcursor" -DEPEND="${RDEPEND} - x11-proto/scrnsaverproto - x11-proto/xextproto - x11-proto/xproto - x11-proto/xf86miscproto - x11-proto/kbproto - x11-proto/randrproto - x11-proto/renderproto - - sys-devel/gettext - >=dev-util/intltool-0.40 - >=dev-util/pkgconfig-0.19 - dev-util/desktop-file-utils - - app-text/scrollkeeper - gnome-base/gnome-common - >=app-text/gnome-doc-utils-0.10.1" - -DOCS="AUTHORS ChangeLog NEWS README TODO" - -pkg_setup() { - G2CONF="${G2CONF} - --disable-update-mimedb - --enable-gstreamer=0.10 - $(use_enable eds aboutme) - $(use_enable hal) - $(use_with sound libcanberra)" -} - -src_prepare() { - gnome2_src_prepare - - # Fix compilation on fbsd, bug #256958 - epatch "${FILESDIR}/${P}-fbsd.patch" - - # Upstream patch for Hor and Vert Maximise, bug #263166 - epatch "${FILESDIR}/${P}-hv-max.patch" - - # Upstream patch for fixing capplet help buttons, bug #263168 - epatch "${FILESDIR}/${P}-capplet-help.patch" - - # Add missing libgnomeui check, bug #269383 - epatch "${FILESDIR}/${P}-libgnomeui.patch" - - # Add fixes for gnome-desktop-2.26 API changes, bug #269383 - epatch "${FILESDIR}/${P}-gnome-desktop-api.patch" - - # Fix build with libxklavier-4 - epatch "${FILESDIR}/${PN}-2.26.0-libxklavier4.patch" - - intltoolize --force --copy --automake || die "intltoolize failed" - eautoreconf -} diff --git a/gnome-base/gnome-control-center/gnome-control-center-2.24.0.1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-2.24.0.1.ebuild deleted file mode 100644 index 48a8dec93511..000000000000 --- a/gnome-base/gnome-control-center/gnome-control-center-2.24.0.1.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-2.24.0.1.ebuild,v 1.15 2009/04/28 11:18:35 armin76 Exp $ - -EAPI="1" - -inherit eutils gnome2 - -DESCRIPTION="The gnome2 Desktop configuration tool" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="GPL-2" -SLOT="2" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd" -IUSE="eds hal +sound" - -# FIXME: eel is still needed for libslab -RDEPEND="x11-libs/libXft - >=x11-libs/gtk+-2.11.6 - >=dev-libs/glib-2.17.4 - >=gnome-base/gconf-2.0 - >=gnome-base/libglade-2 - >=gnome-base/librsvg-2.0 - >=gnome-base/nautilus-2.6 - >=media-libs/fontconfig-1 - >=dev-libs/dbus-glib-0.73 - >=x11-libs/libxklavier-3.6 - >=x11-wm/metacity-2.23.1 - >=gnome-base/gnome-panel-2.0 - >=gnome-base/libgnomekbd-2.21.4.1 - >=gnome-base/gnome-desktop-2.23.90 - >=gnome-base/gnome-menus-2.11.1 - gnome-base/eel - gnome-base/gnome-settings-daemon - - >=media-libs/gstreamer-0.10.1.2 - >=media-libs/gst-plugins-base-0.10.1.2 - >=media-plugins/gst-plugins-gconf-0.10 - media-plugins/gst-plugins-meta:0.10 - - x11-libs/pango - dev-libs/libxml2 - media-libs/freetype - - eds? ( >=gnome-extra/evolution-data-server-1.7.90 ) - hal? ( >=sys-apps/hal-0.5.6 ) - sound? ( - >=media-libs/libcanberra-0.4 - x11-themes/sound-theme-freedesktop ) - - >=gnome-base/libbonobo-2 - >=gnome-base/libgnome-2.2 - >=gnome-base/libbonoboui-2 - >=gnome-base/libgnomeui-2.2 - - x11-apps/xmodmap - x11-libs/libXScrnSaver - x11-libs/libXext - x11-libs/libX11 - x11-libs/libXxf86misc - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXcursor" -DEPEND="${RDEPEND} - x11-proto/scrnsaverproto - x11-proto/xextproto - x11-proto/xproto - x11-proto/xf86miscproto - x11-proto/kbproto - x11-proto/randrproto - x11-proto/renderproto - - sys-devel/gettext - >=dev-util/intltool-0.40 - >=dev-util/pkgconfig-0.19 - dev-util/desktop-file-utils - - app-text/scrollkeeper - >=app-text/gnome-doc-utils-0.10.1" -# Needed for autoreconf -# gnome-base/gnome-common - -DOCS="AUTHORS ChangeLog NEWS README TODO" - -pkg_setup() { - if use sound && ! built_with_use media-libs/libcanberra gtk; then - eerror "You need to rebuild media-libs/libcanberra with gtk support." - die "Rebuild media-libs/libcanberra with USE='gtk'" - fi - - G2CONF="${G2CONF} - --disable-update-mimedb - --enable-gstreamer=0.10 - $(use_enable eds aboutme) - $(use_enable hal) - $(use_with sound libcanberra)" -} - -src_unpack() { - gnome2_src_unpack - - # Fix compilation on fbsd, bug #256958 - epatch "${FILESDIR}/${P}-fbsd.patch" -} |