diff options
author | 2010-08-31 11:58:48 +0000 | |
---|---|---|
committer | 2010-08-31 11:58:48 +0000 | |
commit | d30f52c7f174629ef5f88e285f2122701226564e (patch) | |
tree | dce3c9c2f98a08bca98d7c40fbcb2d5be9a76ce2 /xfce-base/xfce4-settings | |
parent | old (diff) | |
download | gentoo-2-d30f52c7f174629ef5f88e285f2122701226564e.tar.gz gentoo-2-d30f52c7f174629ef5f88e285f2122701226564e.tar.bz2 gentoo-2-d30f52c7f174629ef5f88e285f2122701226564e.zip |
old
(Portage version: 2.2_rc69/cvs/Linux x86_64)
Diffstat (limited to 'xfce-base/xfce4-settings')
-rw-r--r-- | xfce-base/xfce4-settings/Manifest | 3 | ||||
-rw-r--r-- | xfce-base/xfce4-settings/files/xfce4-settings-4.6.3-Xi.patch | 106 | ||||
-rw-r--r-- | xfce-base/xfce4-settings/xfce4-settings-4.6.3-r1.ebuild | 52 |
3 files changed, 0 insertions, 161 deletions
diff --git a/xfce-base/xfce4-settings/Manifest b/xfce-base/xfce4-settings/Manifest index bc143433f644..9207db602b4b 100644 --- a/xfce-base/xfce4-settings/Manifest +++ b/xfce-base/xfce4-settings/Manifest @@ -1,10 +1,7 @@ -AUX xfce4-settings-4.6.3-Xi.patch 3446 RMD160 7ac843fc0939fa5c26ea00d9e073824e3e27a088 SHA1 3b9cd3623e9d4a9830075d54e49d7d5e63ea67cf SHA256 b28e940ae81087ea9cc7d15584b6a0ce4d329436dc513652b4fa81807d53160c AUX xfce4-settings-4.6.3-exo.patch 677 RMD160 cfd4cd31df25e62babea9d197c9bfbfd02d0df41 SHA1 27dc3571bdb8a6f63de8c4e0d24be17b5f000c3b SHA256 06be2fa459411bb42a03b49fb27bc8ae07d084e85995f6671f721aa750e4e4ae AUX xfce4-settings-4.7.1-libxklavier.patch 1448 RMD160 ef016d0f3d916bf571c19aa02d2bfa3f98493aa7 SHA1 a96be6f9e08ef3a559290e62d3bdc1232a4119c8 SHA256 5185c02b05542796828a3bf39a2b6d5acb005e164822c2acd460ce9ad67f64e6 -DIST xfce4-settings-4.6.3.tar.bz2 534204 RMD160 732c19f0e6258a9ea2583eddd57d4953817a206d SHA1 8a7f114ae5cab071668937351a0b3b4be1b9b51c SHA256 f34b896960f7c30c3601b9946b145076a215778da6ab8399d268cd1f2b2b9d34 DIST xfce4-settings-4.6.5.tar.bz2 522389 RMD160 a8155346285921f3087795598989df287be8abb4 SHA1 c036cc2f3100a46b2649e678dff7c0106b219263 SHA256 1601b8d2cac5d931c39bed7e331c5bd91018d0e56663295e7a083a2c78fe168b DIST xfce4-settings-4.7.1.tar.bz2 557670 RMD160 30d72e732068342ed4ec575d7bb538aae67a827e SHA1 d213664f358ff41693006cd17d3941551317084b SHA256 1f1ea56985b9207f44ae9c7922344edcfd51cba8f2db6861306affa937039500 -EBUILD xfce4-settings-4.6.3-r1.ebuild 1550 RMD160 4ab11fe7a8e1be41813c49fe0116f51ec0826dcd SHA1 4c82020cbc566a9663a643cea80d57d1924cde16 SHA256 9d058b4200493854b4385158c32e0ad9e9c9b9f7d86180285c8384e776e8d82c EBUILD xfce4-settings-4.6.5.ebuild 1477 RMD160 8e18781f1c5c7a5f64001137eb49739cad5491e1 SHA1 8a2240bfb9955cb7fdd9d129ad7c2225c5c2b747 SHA256 6000b16cbecd9cc4c649fda4d29fa204fc8ff5a7dd80d46b762a6da37385be2a EBUILD xfce4-settings-4.7.1.ebuild 1499 RMD160 b3d86c266a093f9ed96df87b72b507ebfbaf5490 SHA1 03d581bf16fe27e72ac54205282df9d0c269e2d9 SHA256 8e14fbe1d5845ff4147b79379a6cb4116c63b5735b6e04fc31fd0eb096a97af2 MISC ChangeLog 7178 RMD160 3b761b245905f50c3162f6f65d702f84e922a13f SHA1 8fdb33dcfe01ad3214651860dc3c4831d3e395ed SHA256 4d744e9e10d88a4d20e663208d71b48b2938328aa4387cb1473a0c5584a83757 diff --git a/xfce-base/xfce4-settings/files/xfce4-settings-4.6.3-Xi.patch b/xfce-base/xfce4-settings/files/xfce4-settings-4.6.3-Xi.patch deleted file mode 100644 index 1a625cf14ae7..000000000000 --- a/xfce-base/xfce4-settings/files/xfce4-settings-4.6.3-Xi.patch +++ /dev/null @@ -1,106 +0,0 @@ -From 041cb4450d1d7c525c3fde20c38e293665619bd3 Mon Sep 17 00:00:00 2001 -From: Nick Schermer <nick@xfce.org> -Date: Sun, 11 Oct 2009 12:02:05 +0000 -Subject: Fix the check for Xi so it does not fail with Xi2 (bug #4929). - ---- -diff --git a/dialogs/mouse-settings/main.c b/dialogs/mouse-settings/main.c -index dc5604d..6edddac 100644 ---- a/dialogs/mouse-settings/main.c -+++ b/dialogs/mouse-settings/main.c -@@ -60,6 +60,10 @@ - #define IsXExtensionPointer 4 - #endif - -+/* Xi 1.4 is required */ -+#define MIN_XI_VERS_MAJOR 1 -+#define MIN_XI_VERS_MINOR 4 -+ - /* settings */ - #ifdef HAVE_XCURSOR - #define PREVIEW_ROWS (3) -@@ -1221,13 +1225,21 @@ main (gint argc, gchar **argv) - - return EXIT_FAILURE; - } -- -- /* check for Xi 1.4 */ -+ -+ /* check for Xi */ - version = XGetExtensionVersion (GDK_DISPLAY (), INAME); -- if (!version || !version->present || version->major_version < 1 || version->minor_version < 4) -+ if (version == NULL || !version->present) -+ { -+ g_critical ("XI is not present."); -+ return EXIT_FAILURE; -+ } -+ else if (version->major_version < MIN_XI_VERS_MAJOR -+ || (version->major_version == MIN_XI_VERS_MAJOR -+ && version->minor_version < MIN_XI_VERS_MINOR)) - { -- g_critical ("XI is not present or too old."); -- -+ g_critical ("Your XI is too old (%d.%d) version %d.%d is required.", -+ version->major_version, version->minor_version, -+ MIN_XI_VERS_MAJOR, MIN_XI_VERS_MINOR); - return EXIT_FAILURE; - } - -diff --git a/xfce4-settings-helper/pointers.c b/xfce4-settings-helper/pointers.c -index 6dd2cd4..b8718ba 100644 ---- a/xfce4-settings-helper/pointers.c -+++ b/xfce4-settings-helper/pointers.c -@@ -42,6 +42,10 @@ - - #define MAX_DENOMINATOR (100.00) - -+/* Xi 1.4 is required */ -+#define MIN_XI_VERS_MAJOR 1 -+#define MIN_XI_VERS_MINOR 4 -+ - /* test if the required version of inputproto (1.4.2) is available */ - #if XI_Add_DevicePresenceNotify_Major >= 1 && defined (DeviceRemoved) - #define HAS_DEVICE_HOTPLUGGING -@@ -133,18 +137,22 @@ xfce_pointers_helper_init (XfcePointersHelper *helper) - - /* get the default display */ - xdisplay = gdk_x11_display_get_xdisplay (gdk_display_get_default ()); -- -+ - /* query the extension version */ - version = XGetExtensionVersion (xdisplay, INAME); -- -- /* check for Xi 1.4 */ -- if (!version || !version->present || version->major_version < 1 || version->minor_version < 4) -- { -- /* print error */ -- g_critical ("XI is not present or too old."); - -- /* no channel */ -- helper->channel = NULL; -+ /* check for Xi */ -+ if (version == NULL || !version->present) -+ { -+ g_critical ("XI is not present."); -+ } -+ else if (version->major_version < MIN_XI_VERS_MAJOR -+ || (version->major_version == MIN_XI_VERS_MAJOR -+ && version->minor_version < MIN_XI_VERS_MINOR)) -+ { -+ g_critical ("Your XI is too old (%d.%d) version %d.%d is required.", -+ version->major_version, version->minor_version, -+ MIN_XI_VERS_MAJOR, MIN_XI_VERS_MINOR); - } - else - { -@@ -162,7 +170,7 @@ xfce_pointers_helper_init (XfcePointersHelper *helper) - gdk_flush (); - gdk_error_trap_push (); - -- -+ - if (G_LIKELY (xdisplay)) - { - /* monitor device changes */ --- -cgit v0.8.2.1 diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.6.3-r1.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.6.3-r1.ebuild deleted file mode 100644 index 020a1e9f01b0..000000000000 --- a/xfce-base/xfce4-settings/xfce4-settings-4.6.3-r1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2010 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.3-r1.ebuild,v 1.11 2010/08/02 18:42:36 armin76 Exp $ - -EAPI=2 -EAUTORECONF=yes -inherit xfconf - -DESCRIPTION="Settings daemon for Xfce4" -HOMEPAGE="http://www.xfce.org" -SRC_URI="mirror://xfce/src/xfce/${PN}/4.6/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux" -IUSE="debug +keyboard libnotify sound" - -RDEPEND=">=dev-libs/glib-2.12:2 - >=dev-libs/dbus-glib-0.34 - >=gnome-base/libglade-2 - >=x11-libs/gtk+-2.10:2 - >=x11-libs/libX11-1 - >=x11-libs/libXcursor-1.1 - >=x11-libs/libXi-1.3 - >=x11-libs/libXrandr-1.1 - >=x11-libs/libwnck-2.12 - >=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-0.1.3 ) - keyboard? ( >=x11-libs/libxklavier-0.3 ) - sound? ( media-libs/libcanberra ) - !<x11-base/xorg-server-1.5.3" -DEPEND="${RDEPEND} - dev-util/intltool - sys-devel/gettext - dev-util/pkgconfig - x11-proto/inputproto - x11-proto/xf86vidmodeproto" - -pkg_setup() { - XFCONF="--disable-dependency-tracking - $(use_enable libnotify) - $(use_enable keyboard libxklavier) - $(use_enable sound sound-settings) - $(use_enable debug)" - DOCS="AUTHORS ChangeLog NEWS TODO" - PATCHES=( "${FILESDIR}/${P}-exo.patch" - "${FILESDIR}/${P}-Xi.patch" - "${FILESDIR}/${PN}-4.7.1-libxklavier.patch" ) -} |