diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2009-07-20 09:11:01 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-07-20 09:11:01 +0000 |
commit | 607f686f362ecb0d2d2f26fe7200934c579963fb (patch) | |
tree | 33e7e45ca56d976f97615a6004cae28fd0e005c7 /xfce-base | |
parent | Fix magic libuuid deps. (diff) | |
download | historical-607f686f362ecb0d2d2f26fe7200934c579963fb.tar.gz historical-607f686f362ecb0d2d2f26fe7200934c579963fb.tar.bz2 historical-607f686f362ecb0d2d2f26fe7200934c579963fb.zip |
Fix compability with libxklavier 4.0 wrt #278379, thanks to Gef Lebster.
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
Diffstat (limited to 'xfce-base')
-rw-r--r-- | xfce-base/xfce4-settings/ChangeLog | 9 | ||||
-rw-r--r-- | xfce-base/xfce4-settings/Manifest | 4 | ||||
-rw-r--r-- | xfce-base/xfce4-settings/files/xfce4-settings-4.6.1-libxklavier.patch | 12 | ||||
-rw-r--r-- | xfce-base/xfce4-settings/xfce4-settings-4.6.1-r1.ebuild | 48 |
4 files changed, 71 insertions, 2 deletions
diff --git a/xfce-base/xfce4-settings/ChangeLog b/xfce-base/xfce4-settings/ChangeLog index 5dba97935fc6..2bd1d6862881 100644 --- a/xfce-base/xfce4-settings/ChangeLog +++ b/xfce-base/xfce4-settings/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for xfce-base/xfce4-settings # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/ChangeLog,v 1.13 2009/06/30 19:21:26 klausman Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/ChangeLog,v 1.14 2009/07/20 09:11:01 ssuominen Exp $ + +*xfce4-settings-4.6.1-r1 (20 Jul 2009) + + 20 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> + +xfce4-settings-4.6.1-r1.ebuild, + +files/xfce4-settings-4.6.1-libxklavier.patch: + Fix compability with libxklavier 4.0 wrt #278379, thanks to Gef Lebster. 30 Jun 2009; Tobias Klausmann <klausman@gentoo.org> xfce4-settings-4.6.1.ebuild: diff --git a/xfce-base/xfce4-settings/Manifest b/xfce-base/xfce4-settings/Manifest index 632959fac860..0910d63728e8 100644 --- a/xfce-base/xfce4-settings/Manifest +++ b/xfce-base/xfce4-settings/Manifest @@ -1,4 +1,6 @@ +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 +EBUILD xfce4-settings-4.6.1-r1.ebuild 1325 RMD160 b703812dbf698a0a9c8b0103639c0bd9bed55c6d SHA1 4d2cebfb61cb2e3c1ee059657b443c6e1bf1a188 SHA256 e0dd251f235cd86a55e654bf653caf7c66b9b28671b9a801afd4453bbbf31f80 EBUILD xfce4-settings-4.6.1.ebuild 1219 RMD160 9c03402968401527b561103539109dadec7c2156 SHA1 2d85343b085ffd6264ee0988b74ba1969fc1283d SHA256 8e6734c567c4c14e2db78be73eeb88ab5de0cb768150b34b0ba907ef6bb78c15 -MISC ChangeLog 1862 RMD160 c5f80dcf02a223ee80b873c4a19210fb94725602 SHA1 444991c4ff642096e92162499986fc9fdbda3d8f SHA256 fe58727294568f38cf972956b7cf37447216145bf02c7394c6f9ad6fffcf356d +MISC ChangeLog 2117 RMD160 78cf5ad3eb206e2ee763193e533ae1563cbcbae3 SHA1 89a4529d76958b1b672e2f086f326e57f0444d80 SHA256 721504a9bcbc59329897f245cda5451bc0426c37d64725ba98abf46ba8fa38e1 MISC metadata.xml 363 RMD160 2f66508d394f9cc14654775f3a0b117bc10d3ef5 SHA1 8a3e6715e41535ea04377624a621c9ada60fd5ff SHA256 2442135d806e37420f1904d5b32e8b7afe94ed212307d25667f363db06c558e3 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 new file mode 100644 index 000000000000..3268ecad26e4 --- /dev/null +++ b/xfce-base/xfce4-settings/files/xfce4-settings-4.6.1-libxklavier.patch @@ -0,0 +1,12 @@ +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-r1.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.6.1-r1.ebuild new file mode 100644 index 000000000000..2b07dccf4e22 --- /dev/null +++ b/xfce-base/xfce4-settings/xfce4-settings-4.6.1-r1.ebuild @@ -0,0 +1,48 @@ +# 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-r1.ebuild,v 1.1 2009/07/20 09:11:01 ssuominen Exp $ + +EAPI=1 +inherit eutils xfce4 + +xfce4_core + +DESCRIPTION="Xfce4 settings" +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-${XFCE_VERSION} + >=xfce-base/libxfcegui4-${XFCE_VERSION} + >=xfce-base/xfconf-${XFCE_VERSION} + !xfce-base/xfce-mcs-manager + !xfce-base/xfce-mcs-plugins + >=xfce-extra/exo-0.3.100 + libnotify? ( x11-libs/libnotify ) + keyboard? ( >=x11-libs/libxklavier-4 ) + sound? ( media-libs/libcanberra )" +DEPEND="${RDEPEND} + dev-util/intltool + x11-proto/inputproto + x11-proto/xf86vidmodeproto" + +pkg_setup() { + XFCE_CONFIG+=" $(use_enable libnotify) $(use_enable keyboard libxklavier) + $(use_enable sound sound-settings) --enable-xcursor" + DOCS="AUTHORS ChangeLog NEWS README TODO" +} + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-libxklavier.patch +} |