old

(Portage version: 2.2_rc42/cvs/Linux x86_64)

5 files changed, 0 insertions, 295 deletions

diff --git a/xfce-base/xfce4-settings/Manifest b/xfce-base/xfce4-settings/Manifest
index 12fccc032a3d..26fdecc0a25a 100644
--- a/xfce-base/xfce4-settings/Manifest
+++ b/xfce-base/xfce4-settings/Manifest
@@ -1,9 +1,5 @@
-AUX xfce4-settings-4.6.1-fix-keyrepeat-typo.patch 1062 RMD160 476c1675e519b778726ef4be89e01b421efa3ef0 SHA1 df3f32e107d6481138d07e86b37dbf5816e0ce99 SHA256 9ee45e43583acbc707fb46b235c1cd1b3c43efbfab6f4ad059a3b9660d4518ab
-AUX xfce4-settings-4.6.1-fix-timeout-startup.patch 8100 RMD160 cbd395bfba04a1ac40b03ad871c66d143312ac97 SHA1 f1a7b17d86f3de280465ad009d13858b43ef7a53 SHA256 f382ec0e6da414b2623f5ed1123774fe54634f280c6522d518d653f1e1d1d2d1
-AUX xfce4-settings-4.6.1-libxklavier.patch 842 RMD160 6f06a4383ea63a95de248ac6406f753bd8110503 SHA1 e762581dce3d5f16b759805cfb03ff072f695d00 SHA256 f58fb5a0b0d5c228f27c3040a80fd30666263d921ca97e859bd983e029c255ac
 DIST xfce4-settings-4.6.1.tar.bz2 501587 RMD160 6ecfa08d6ad528d43988c5fe128b2fcd6db6f0d3 SHA1 ab117c3923571e2437095fd165ac4bf392e658e0 SHA256 36dda4d43366fad47ee95ea5d4fa336d0b14f79c524b4f29a2ac1b9ada4abf8d
 DIST xfce4-settings-4.6.3.tar.bz2 534204 RMD160 732c19f0e6258a9ea2583eddd57d4953817a206d SHA1 8a7f114ae5cab071668937351a0b3b4be1b9b51c SHA256 f34b896960f7c30c3601b9946b145076a215778da6ab8399d268cd1f2b2b9d34
-EBUILD xfce4-settings-4.6.1-r2.ebuild 1478 RMD160 0a7d419d4b9de9c68dc1a46c7faa883e2fe2c5e6 SHA1 bdab1c98c17818db9f69129294e9be19b76ff0de SHA256 488c8fd7fa5d21dc99dcfbafb83d1e3e971c3bddbf32865404d45c381ddf19bc
 EBUILD xfce4-settings-4.6.1.ebuild 1323 RMD160 b7e3aad99af7194b5227f8deb19390e54370f24c SHA1 749566c367cae3ee2d676694dd36b6b8dab50124 SHA256 f0b159bb6169a6c92179d82a92bed71705b018c71dae0fd39c8669477fc1b5ee
 EBUILD xfce4-settings-4.6.3.ebuild 1359 RMD160 1c182883d97648cb7c3706ee1bf602520d600f95 SHA1 d03f015e524c11081ecce69c54552d78316a8f49 SHA256 79447a821c0fe1515d3f82dc1d23cf8d462aa93c7c4344e19294691e75ded9ae
 MISC ChangeLog 2963 RMD160 bfa7c90db3a71d93982fac9b5e5bd2f2d0a043e3 SHA1 29e2c23b531fffe0c9d9c4bdcc92fba3c6f84636 SHA256 e73920a0e2e84569219db4e8f12b16a0fafe97a01fea8b1d1ce871d431f5d9ba
diff --git a/xfce-base/xfce4-settings/files/xfce4-settings-4.6.1-fix-keyrepeat-typo.patch b/xfce-base/xfce4-settings/files/xfce4-settings-4.6.1-fix-keyrepeat-typo.patch
deleted file mode 100644
index bda6f5392b94..000000000000
--- a/xfce-base/xfce4-settings/files/xfce4-settings-4.6.1-fix-keyrepeat-typo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/dialogs/keyboard-settings/xfce-keyboard-settings.c b/dialogs/keyboard-settings/xfce-keyboard-settings.c
-index d372ee9..d1cb69c 100644
---- a/dialogs/keyboard-settings/xfce-keyboard-settings.c
-+++ b/dialogs/keyboard-settings/xfce-keyboard-settings.c
-@@ -322,7 +322,7 @@ xfce_keyboard_settings_constructed (GObject *object)
-   xfconf_g_property_bind (settings->priv->keyboards_channel, "/Default/KeyRepeat/Rate", G_TYPE_INT, G_OBJECT (xkb_key_repeat_rate_scale), "value");
- 
-   xkb_key_repeat_delay_scale = gtk_range_get_adjustment (GTK_RANGE (glade_xml_get_widget (settings->priv->glade_xml, "xkb_key_repeat_delay_scale")));
--  xfconf_g_property_bind (settings->priv->keyboards_channel, "/DefaultKeyRepeat/Delay", G_TYPE_INT, G_OBJECT (xkb_key_repeat_delay_scale), "value");
-+  xfconf_g_property_bind (settings->priv->keyboards_channel, "/Default/KeyRepeat/Delay", G_TYPE_INT, G_OBJECT (xkb_key_repeat_delay_scale), "value");
- 
-   /* XSETTINGS */
-   net_cursor_blink_check = glade_xml_get_widget (settings->priv->glade_xml, "net_cursor_blink_check");
diff --git a/xfce-base/xfce4-settings/files/xfce4-settings-4.6.1-fix-timeout-startup.patch b/xfce-base/xfce4-settings/files/xfce4-settings-4.6.1-fix-timeout-startup.patch
deleted file mode 100644
index c65722b1e67b..000000000000
--- a/xfce-base/xfce4-settings/files/xfce4-settings-4.6.1-fix-timeout-startup.patch
+++ /dev/null
@@ -1,213 +0,0 @@
-commit fa550da4a52172b4074922a2962c44613e96e3f0
-Author: kelnos <kelnos@a0aa69c2-05f4-0310-b83c-d5d913b14636>
-Date:   Thu Jun 4 09:19:51 2009 +0000
-
-    avoid timing out xfce4-session on startup (bug 5040)
-    
-    xfce4-settings-helper was trying to be clever to migrate itself from
-    autostart to the actual session.  it was doing a poor job.  this should
-    keep the cleverness, but make sure it always connects to the session
-    manager and makes sure the SM can continue.  it also allows the copy of
-    x-s-h that was started via the session (and not autostart) to force
-    itself to start, even if it's already running.  the other instance will
-    lose its hold on the selection, notice, and quit.
-    
-    git-svn-id: http://svn.xfce.org/svn/xfce/xfce4-settings/trunk@29991 a0aa69c2-05f4-0310-b83c-d5d913b14636
-
-diff --git a/xfce4-settings-helper/main.c b/xfce4-settings-helper/main.c
-index c0e7712..1553c58 100644
---- a/xfce4-settings-helper/main.c
-+++ b/xfce4-settings-helper/main.c
-@@ -60,7 +60,14 @@
- #include "displays.h"
- #endif
- 
-+#define SELECTION_NAME  "_XFCE_SETTINGS_HELPER"
- 
-+static GdkFilterReturn xfce_settings_helper_selection_watcher (GdkXEvent *xevt,
-+                                                               GdkEvent *evt,
-+                                                               gpointer user_data);
-+
-+
-+static SessionClient *sm_client = NULL;
- 
- static gboolean opt_version = FALSE;
- static gboolean opt_debug = FALSE;
-@@ -124,15 +131,14 @@ xfce_settings_helper_set_autostart_enabled (gboolean enabled)
- }
- 
- 
--/* returns TRUE if we're now connected to the SM, FALSE otherwise */
-+/* returns TRUE if we got started by the SM and our client ID was
-+ * valid, FALSE otherwise */
- static gboolean
- xfce_settings_helper_connect_session (int argc,
-                                       char **argv,
-                                       const gchar *sm_client_id,
-                                       gboolean debug_mode)
- {
--    SessionClient *sm_client;
--
-     /* we can't be sure that the SM will save the session later, so we only
-      * disable the autostart item if we're launching because we got *resumed*
-      * from a previous session. */
-@@ -148,69 +154,96 @@ xfce_settings_helper_connect_session (int argc,
-     {
-         g_warning ("Failed to connect to session manager");
-         client_session_free (sm_client);
--        xfce_settings_helper_set_autostart_enabled (TRUE);
-+        sm_client = NULL;
-         return FALSE;
-     }
- 
-     if (sm_client_id && !g_ascii_strcasecmp (sm_client_id, sm_client->given_client_id))
-     {
-         /* we passed a client id, and got the same one back, which means
--         * we were definitely restarted as a part of the session.  so
--         * it's safe to disable the autostart item. */
--        xfce_settings_helper_set_autostart_enabled (FALSE);
-+         * we were definitely restarted as a part of the session. */
-         return TRUE;
-     }
- 
--    /* otherwise, let's just ensure the autostart item is enabled. */
--    xfce_settings_helper_set_autostart_enabled (TRUE);
--
--    return TRUE;
-+    return FALSE;
- }
- 
- 
-+#ifdef GDK_WINDOWING_X11
-+static GdkFilterReturn
-+xfce_settings_helper_selection_watcher (GdkXEvent *xevt,
-+                                        GdkEvent *evt,
-+                                        gpointer user_data)
-+{
-+    Window xwin = GPOINTER_TO_UINT(user_data);
-+    XEvent *xe = (XEvent *)xevt;
-+
-+    if (xe->type == SelectionClear && xe->xclient.window == xwin)
-+    {
-+        if (sm_client)
-+            client_session_set_restart_style (sm_client, SESSION_RESTART_IF_RUNNING);
-+        signal_handler (SIGINT, NULL);
-+    }
-+
-+    return GDK_FILTER_CONTINUE;
-+}
-+#endif
-+
- static gboolean
--xfce_settings_helper_acquire_selection ()
-+xfce_settings_helper_acquire_selection (gboolean force)
- {
- #ifdef GDK_WINDOWING_X11
-     GdkDisplay *gdpy = gdk_display_get_default ();
-+    GtkWidget *invisible;
-     Display *dpy = GDK_DISPLAY_XDISPLAY (gdpy);
-     GdkWindow *rootwin = gdk_screen_get_root_window (gdk_display_get_screen (gdpy, 0));
-     Window xroot = GDK_WINDOW_XID (rootwin);
--    Window xwin;
--    Atom selection_atom, manager_atom;
-+    GdkAtom selection_atom;
-+    Atom selection_atom_x11;
-     XClientMessageEvent xev;
- 
--    xwin = XCreateSimpleWindow (dpy, xroot, -100, -100, 1, 1, 0, 0,
--                                XBlackPixel (GDK_DISPLAY (), 0));
--    XSelectInput (dpy, xwin, PropertyChangeMask | StructureNotifyMask);
-+    selection_atom = gdk_atom_intern (SELECTION_NAME, FALSE);
-+    selection_atom_x11 = gdk_x11_atom_to_xatom_for_display (gdpy, selection_atom);
-+
-+    /* can't use gdk for the selection owner here because it returns NULL
-+     * if the selection owner is in another process */
-+    if (!force && XGetSelectionOwner (dpy, selection_atom_x11) != None)
-+        return FALSE;
- 
--    selection_atom = XInternAtom (dpy, "_XFCE_SETTINGS_HELPER", False);
--    manager_atom = XInternAtom (dpy, "MANAGER", False);
-+    invisible = gtk_invisible_new ();
-+    gtk_widget_realize (invisible);
-+    gtk_widget_add_events (invisible, GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK);
- 
--    if (XGetSelectionOwner (dpy, selection_atom) != None)
-+    if (!gdk_selection_owner_set_for_display (gdpy, invisible->window,
-+                                              selection_atom, GDK_CURRENT_TIME,
-+                                              TRUE))
-     {
--        XDestroyWindow (dpy, xwin);
-+        g_critical ("Unable to get selection " SELECTION_NAME);
-+        gtk_widget_destroy (invisible);
-         return FALSE;
-     }
- 
--    XSetSelectionOwner (dpy, selection_atom, xwin, CurrentTime);
--
--    if (XGetSelectionOwner (dpy, selection_atom) != xwin)
-+    /* but we can use gdk here since we only care if it's our window */
-+    if (gdk_selection_owner_get_for_display (gdpy, selection_atom) != invisible->window)
-     {
--        XDestroyWindow (dpy, xwin);
-+        gtk_widget_destroy (invisible);
-         return FALSE;
-     }
- 
-     xev.type = ClientMessage;
-     xev.window = xroot;
--    xev.message_type = manager_atom;
-+    xev.message_type = gdk_x11_get_xatom_by_name_for_display (gdpy, "MANAGER");
-     xev.format = 32;
-     xev.data.l[0] = CurrentTime;
--    xev.data.l[1] = selection_atom;
--    xev.data.l[2] = xwin;
-+    xev.data.l[1] = selection_atom_x11;
-+    xev.data.l[2] = GDK_WINDOW_XID (invisible->window);
-     xev.data.l[3] = xev.data.l[4] = 0;
- 
-     XSendEvent (dpy, xroot, False, StructureNotifyMask, (XEvent *)&xev);
-+
-+    gdk_window_add_filter (invisible->window,
-+                           xfce_settings_helper_selection_watcher,
-+                           GUINT_TO_POINTER (GDK_WINDOW_XID (invisible->window)));
- #endif
- 
-     return TRUE;
-@@ -221,6 +254,7 @@ gint
- main (gint argc, gchar **argv)
- {
-     GError     *error = NULL;
-+    gboolean    in_session;
-     GObject    *pointer_helper;
-     GObject    *keyboards_helper;
-     GObject    *accessibility_helper;
-@@ -284,12 +318,19 @@ main (gint argc, gchar **argv)
-         return EXIT_FAILURE;
-     }
- 
--    if (!xfce_settings_helper_acquire_selection ())
-+    /* connect to session always, even if we quit below.  this way the
-+     * session manager won't wait for us to time out. */
-+    in_session = xfce_settings_helper_connect_session (argc, argv, opt_sm_client_id, opt_debug);
-+
-+    if (!xfce_settings_helper_acquire_selection (in_session))
-     {
-         g_printerr ("%s is already running\n", G_LOG_DOMAIN);
-         return EXIT_FAILURE;
-     }
- 
-+    /* if we were restarted as part of the session, remove us from autostart */
-+    xfce_settings_helper_set_autostart_enabled (!in_session);
-+
-     /* daemonize the process when not running in debug mode */
-     if (!opt_debug)
-     {
-@@ -308,8 +349,6 @@ main (gint argc, gchar **argv)
-         }
-     }
- 
--    xfce_settings_helper_connect_session (argc, argv, opt_sm_client_id, opt_debug);
--
-     /* create the sub daemons */
-     pointer_helper = g_object_new (XFCE_TYPE_POINTERS_HELPER, NULL);
-     keyboards_helper = g_object_new (XFCE_TYPE_KEYBOARDS_HELPER, NULL);
diff --git a/xfce-base/xfce4-settings/files/xfce4-settings-4.6.1-libxklavier.patch b/xfce-base/xfce4-settings/files/xfce4-settings-4.6.1-libxklavier.patch
deleted file mode 100644
index 3268ecad26e4..000000000000
--- a/xfce-base/xfce4-settings/files/xfce4-settings-4.6.1-libxklavier.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur xfce4-settings-4.6.1.orig/dialogs/keyboard-settings/xfce-keyboard-settings.c xfce4-settings-4.6.1/dialogs/keyboard-settings/xfce-keyboard-settings.c
---- xfce4-settings-4.6.1.orig/dialogs/keyboard-settings/xfce-keyboard-settings.c	2009-03-02 19:48:00.000000000 +0200
-+++ xfce4-settings-4.6.1/dialogs/keyboard-settings/xfce-keyboard-settings.c	2009-07-20 12:08:28.000000000 +0300
-@@ -378,7 +378,7 @@
-   xkl_config_rec_get_from_server (settings->priv->xkl_rec_config, settings->priv->xkl_engine);
- 
-   settings->priv->xkl_registry = xkl_config_registry_get_instance (settings->priv->xkl_engine);
--  xkl_config_registry_load (settings->priv->xkl_registry);
-+  xkl_config_registry_load (settings->priv->xkl_registry, FALSE);
- 
-   /* Tab */
-   xkb_tab_layout_vbox = glade_xml_get_widget (settings->priv->glade_xml, "xkb_tab_layout_vbox");
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.6.1-r2.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.6.1-r2.ebuild
deleted file mode 100644
index fa537ec1fbb1..000000000000
--- a/xfce-base/xfce4-settings/xfce4-settings-4.6.1-r2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.6.1-r2.ebuild,v 1.1 2009/09/23 10:12:32 ssuominen Exp $
-
-EAPI=2
-inherit xfconf
-
-DESCRIPTION="Settings daemon for Xfce4"
-HOMEPAGE="http://www.xfce.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="debug +keyboard libnotify sound"
-
-RDEPEND=">=dev-libs/glib-2.12:2
-	dev-libs/dbus-glib
-	gnome-base/libglade
-	>=x11-libs/gtk+-2.10:2
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libwnck
-	>=x11-base/xorg-server-1.5.3
-	>=xfce-base/libxfce4util-4.6
-	>=xfce-base/libxfcegui4-4.6
-	>=xfce-base/xfconf-4.6
-	>=xfce-base/exo-0.3.100
-	libnotify? ( x11-libs/libnotify )
-	keyboard? ( >=x11-libs/libxklavier-4 )
-	sound? ( media-libs/libcanberra )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	dev-util/pkgconfig
-	x11-proto/inputproto
-	x11-proto/xf86vidmodeproto
-	!xfce-base/xfce-mcs-manager
-	!xfce-base/xfce-mcs-plugins"
-
-pkg_setup() {
-	XFCONF="--disable-dependency-tracking
-		$(use_enable libnotify)
-		--enable-xcursor
-		$(use_enable keyboard libxklavier)
-		$(use_enable sound sound-settings)
-		$(use_enable debug)"
-	DOCS="AUTHORS ChangeLog NEWS TODO"
-	PATCHES=( "${FILESDIR}/${P}-libxklavier.patch"
-		"${FILESDIR}/${P}-fix-timeout-startup.patch"
-		"${FILESDIR}/${P}-fix-keyrepeat-typo.patch" )
-}