diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-12-11 07:15:59 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-12-11 07:15:59 +0000 |
| commit | 4f2bc4d1dd4e1873d7b753833f92c675c43c8a18 (patch) | |
| tree | b9122900f2bdefa70af5048dc1fd2d4f67c4aeec /xfce-base | |
| parent | Version bump for security bug 389317. Use pypi tarballs, and drop examples su... (diff) | |
| download | historical-4f2bc4d1dd4e1873d7b753833f92c675c43c8a18.tar.gz historical-4f2bc4d1dd4e1873d7b753833f92c675c43c8a18.tar.bz2 historical-4f2bc4d1dd4e1873d7b753833f92c675c43c8a18.zip | |
Introduce Fedora patch for extra keyboard shortcuts wrt #392001 by "Rion"
Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64
Diffstat (limited to 'xfce-base')
| -rw-r--r-- | xfce-base/libxfce4ui/ChangeLog | 9 | ||||
| -rw-r--r-- | xfce-base/libxfce4ui/Manifest | 18 | ||||
| -rw-r--r-- | xfce-base/libxfce4ui/files/libxfce4ui-4.8.0-keyboard-shortcuts.patch | 27 | ||||
| -rw-r--r-- | xfce-base/libxfce4ui/libxfce4ui-4.8.0-r1.ebuild | 46 | ||||
| -rw-r--r-- | xfce-base/libxfce4ui/metadata.xml | 3 |
5 files changed, 95 insertions, 8 deletions
diff --git a/xfce-base/libxfce4ui/ChangeLog b/xfce-base/libxfce4ui/ChangeLog index 6169fcfb0d42..490cf891657b 100644 --- a/xfce-base/libxfce4ui/ChangeLog +++ b/xfce-base/libxfce4ui/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for xfce-base/libxfce4ui # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfce4ui/ChangeLog,v 1.24 2011/05/20 17:50:26 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfce4ui/ChangeLog,v 1.25 2011/12/11 07:15:59 ssuominen Exp $ + +*libxfce4ui-4.8.0-r1 (11 Dec 2011) + + 11 Dec 2011; Samuli Suominen <ssuominen@gentoo.org> + +libxfce4ui-4.8.0-r1.ebuild, + +files/libxfce4ui-4.8.0-keyboard-shortcuts.patch, metadata.xml: + Introduce Fedora patch for extra keyboard shortcuts wrt #392001 by "Rion" 20 May 2011; Fabian Groffen <grobian@gentoo.org> libxfce4ui-4.8.0.ebuild: Add --disable-visibility on Darwin, bug #366857 diff --git a/xfce-base/libxfce4ui/Manifest b/xfce-base/libxfce4ui/Manifest index 63c26d0ea348..dff81035162c 100644 --- a/xfce-base/libxfce4ui/Manifest +++ b/xfce-base/libxfce4ui/Manifest @@ -1,14 +1,20 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX libxfce4ui-4.8.0-keyboard-shortcuts.patch 1745 RMD160 bd4bb7cf123c3455dd2915c72553b2f4318ab313 SHA1 f1d2deff2e0a45f3f22df63b3069c2348507814e SHA256 c6ab3e3525eeebf12dda22621ce13376f7867ef32f77b075f71688244dcef59c DIST libxfce4ui-4.8.0.tar.bz2 434180 RMD160 60ab88a663b1f1a41967837ecc6630fd0fb2a3a8 SHA1 107f9d8e3e583f3cf5330074e89ea72eb2a82888 SHA256 21f67fd004653440bfdb44874ed69c9806b4784978ec068d0b1c7012864ba339 +EBUILD libxfce4ui-4.8.0-r1.ebuild 1380 RMD160 0da17e74f63fc30adb1ae6e04fb3bdeb8b520657 SHA1 601587e0101c50591fe3447f8412c1aeb8b62834 SHA256 3dc4f6489d3feb073367a2c4b5dd4e84021a7fee8c41dcdce254af890d54fdbe EBUILD libxfce4ui-4.8.0.ebuild 1279 RMD160 50b2a27dc0d65ea7f8dace0238cce7d9f18b6fa1 SHA1 a274f96c223e23be8f5054ffa5c8d7977fb70aa3 SHA256 7cb7fcc5a5faca97d1f8cc80fc6a93e8f6797ccea49be1580d96d5abaa4d7402 -MISC ChangeLog 3307 RMD160 76826fa9f5cef8b81fca6d6f29d1528c78554d54 SHA1 316e949aebae205ba0a275277955f036a96a1034 SHA256 74a0a7685c971a04ee6386f20119da4e7dfa0a7e80937d8ba5a9a6b8126cf817 -MISC metadata.xml 260 RMD160 e4efc39d9ffa2691501d30ea9de716acd332f9d6 SHA1 4bbbd9481ced7a04fd9470c0627dfff9be9d8a31 SHA256 96c5725a10ebc95fd3cfc84a2566152354229350a27d79a42648ca2b051fd028 +MISC ChangeLog 3573 RMD160 aaaa6b805d49cc3949c93a935fe107d95d78f53e SHA1 7db380152882ccce42cd41aa1bbd712328b3e803 SHA256 6a2b620611b7db26b1f8d4e8570d2ed0614e8ddfbd294deaeafe355218b5d8f7 +MISC metadata.xml 347 RMD160 35d10ae9eb7101ede48732ea05625d0017cea655 SHA1 95a61f64efd22364f593996eb6f4f142fbea1a6f SHA256 6c130594d794cfd1cc332d87bc30253651002805479b8563ff108c6ec15cb044 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (Darwin) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk3WqdMACgkQX3X2B8XHTolZMQCfeniIRd3HOMmckInVFcM/pGrc -gH8AnjOEMNROgMrMANUTGc9BMW/lczqs -=38aS +iQEcBAEBAgAGBQJO5FizAAoJEEdUh39IaPFN+ogH/iPmv6J37WHgvbfJGW07/9dR +J2gRtPdCtYdSqfrGuq3jLZJ0tX4hCQpZ1E/GkhtL7giGnj1NjThgegdLHLYSKQBr +P1dCcKzpEWnISa077ubWCOo79tgLXulBa992do1P1cD5gfu7Pe5+OoNKP7rsE0UB +DyD3gtaGfhK7reNQwwD3GKHKkQ1pz85vEAdyxfPNM+ekIXjCxDhWTlRYyijO+jxF +S/gZ0Lv9H4ReU/TPjuV2zhKbJX6PFEdcW1rvrV/C/CIsGOg5ffCfyNrzUvm1FkXf +I1Kccgena9hBwwy5cSz89YDXk6Ck+LYh4K2/f9cLoOhFStlcdFx0fHF9eSRtoPQ= +=/HNT -----END PGP SIGNATURE----- diff --git a/xfce-base/libxfce4ui/files/libxfce4ui-4.8.0-keyboard-shortcuts.patch b/xfce-base/libxfce4ui/files/libxfce4ui-4.8.0-keyboard-shortcuts.patch new file mode 100644 index 000000000000..e09c75a9d4dd --- /dev/null +++ b/xfce-base/libxfce4ui/files/libxfce4ui-4.8.0-keyboard-shortcuts.patch @@ -0,0 +1,27 @@ +http://bugs.gentoo.org/392001 + +This is http://pkgs.fedoraproject.org/gitweb/?p=libxfce4ui.git;a=blob_plain;f=libxfce4ui-4.7.6-keyboard-shortcuts.patch;hb=HEAD +BUT without the xfhelp4 keyboard shortcut. + +--- libxfce4kbd-private/xfce4-keyboard-shortcuts.xml ++++ libxfce4kbd-private/xfce4-keyboard-shortcuts.xml +@@ -5,9 +5,19 @@ + <property name="default" type="empty"> + <property name="<Alt>F2" type="string" value="xfrun4"/> + <property name="<Control><Alt>Delete" type="string" value="xflock4"/> ++ <property name="<Control><Alt>Escape" type="string" value="xkill"/> ++ <property name="<Control>Escape" type="string" value="xfce4-popup-menu"/> ++ <property name="<Control><Alt>L" type="string" value="xfce4-session-logout"/> ++ <property name="XF86WWW" type="string" value="xfbrowser4"/> ++ <property name="XF86Mail" type="string" value="exo-open --launch MailReader"/> + <property name="XF86Display" type="string" value="xfce4-display-settings --minimal"/> + <property name="<Super>p" type="string" value="xfce4-display-settings --minimal"/> + <property name="<Control>Escape" type="string" value="xfdesktop --menu"/> ++ <property name="XF86AudioRaiseVolume" type="string" value="amixer set Master 10%+ -q"/> ++ <property name="XF86AudioLowerVolume" type="string" value="amixer set Master 10%- -q"/> ++ <property name="XF86AudioMute" type="string" value="amixer set Master toggle -q"/> ++ <property name="Print" type="string" value="xfce4-screenshooter -f"/> ++ <property name="<Alt>Print" type="string" value="xfce4-screenshooter -w"/> + </property> + </property> + <property name="xfwm4" type="empty"> diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.8.0-r1.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.8.0-r1.ebuild new file mode 100644 index 000000000000..cddc802364ee --- /dev/null +++ b/xfce-base/libxfce4ui/libxfce4ui-4.8.0-r1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfce4ui/libxfce4ui-4.8.0-r1.ebuild,v 1.1 2011/12/11 07:15:59 ssuominen Exp $ + +EAPI=4 +inherit xfconf + +DESCRIPTION="Xfce's unified widgets library" +HOMEPAGE="http://www.xfce.org/projects/libraries/" +SRC_URI="mirror://xfce/src/xfce/${PN}/4.8/${P}.tar.bz2" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris" +IUSE="debug glade startup-notification vanilla" + +RDEPEND="x11-libs/libX11 + x11-libs/libICE + x11-libs/libSM + >=dev-libs/glib-2.16:2 + >=x11-libs/gtk+-2.14:2 + >=xfce-base/libxfce4util-4.8 + >=xfce-base/xfconf-4.8 + glade? ( dev-util/glade:3 ) + startup-notification? ( x11-libs/startup-notification )" +DEPEND="${RDEPEND} + !<xfce-base/libxfcegui4-4.8 + dev-util/pkgconfig + dev-util/intltool + sys-devel/gettext + dev-lang/perl" + +pkg_setup() { + use vanilla || PATCHES=( "${FILESDIR}"/${P}-keyboard-shortcuts.patch ) #392001 + + XFCONF=( + $(use_enable startup-notification) + $(use_enable glade gladeui) + $(xfconf_use_debug) + --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html + ) + + [[ ${CHOST} == *-darwin* ]] && XFCONF+=( --disable-visibility ) #366857 + + DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) +} diff --git a/xfce-base/libxfce4ui/metadata.xml b/xfce-base/libxfce4ui/metadata.xml index 2391a7012c18..c9349c23134c 100644 --- a/xfce-base/libxfce4ui/metadata.xml +++ b/xfce-base/libxfce4ui/metadata.xml @@ -3,6 +3,7 @@ <pkgmetadata> <herd>xfce</herd> <use> - <flag name="glade">Build support for Glade 3's GtkBuilder implementation</flag> + <flag name='glade'>Build support for Glade 3's GtkBuilder implementation</flag> + <flag name='vanilla'>Don't apply extra keyboard shortcuts patch from Fedora</flag> </use> </pkgmetadata> |