From b4a80a3a144203e9e25700774ca78445431d0bbc Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Fri, 18 Jun 2010 15:02:37 +0000 Subject: [PATCH] Fix workspace switching w/ openbox wrt #324509 by "Longpoke". Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- x11-misc/fspanel/ChangeLog | 10 ++++-- x11-misc/fspanel/Manifest | 15 ++------- .../files/fspanel-0.8_beta1-workspace.patch | 31 +++++++++++++++++++ ...-r3.ebuild => fspanel-0.8_beta1-r4.ebuild} | 27 ++++++++-------- 4 files changed, 56 insertions(+), 27 deletions(-) create mode 100644 x11-misc/fspanel/files/fspanel-0.8_beta1-workspace.patch rename x11-misc/fspanel/{fspanel-0.8_beta1-r3.ebuild => fspanel-0.8_beta1-r4.ebuild} (67%) diff --git a/x11-misc/fspanel/ChangeLog b/x11-misc/fspanel/ChangeLog index 76c7f28d3591..2cf22fb803da 100644 --- a/x11-misc/fspanel/ChangeLog +++ b/x11-misc/fspanel/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-misc/fspanel -# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/fspanel/ChangeLog,v 1.18 2009/01/05 21:57:02 maekke Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/fspanel/ChangeLog,v 1.19 2010/06/18 15:02:37 ssuominen Exp $ + +*fspanel-0.8_beta1-r4 (18 Jun 2010) + + 18 Jun 2010; Samuli Suominen + +fspanel-0.8_beta1-r4.ebuild, +files/fspanel-0.8_beta1-workspace.patch: + Fix workspace switching w/ openbox wrt #324509 by "Longpoke". 05 Jan 2009; Markus Meier metadata.xml: drop local xft USE-flag description, as it's global now diff --git a/x11-misc/fspanel/Manifest b/x11-misc/fspanel/Manifest index bcd7c9f296ef..ea0ad8a1fff0 100644 --- a/x11-misc/fspanel/Manifest +++ b/x11-misc/fspanel/Manifest @@ -1,16 +1,7 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX fspanel-0.8_beta1-configure.patch 2725 RMD160 68922a012935fba029a864908e8198836fd65785 SHA1 7989a1a1274c0bde6a04d50a8f4c95266ff338df SHA256 1350358d3eabccd379f308faec93b6ee4d531e91f879a637afd96c1199806b16 +AUX fspanel-0.8_beta1-workspace.patch 892 RMD160 f83ccfe973a404e5bff0e44dd0e44fcf3a37e3c5 SHA1 537cca052ef827a8b86cd759e1781b0329a1e893 SHA256 dbe16c8c34fc9f329eba2e13c9a357b337c09a21f08d0870012bace5cde770c9 DIST fspanel-0.8beta1.tar.gz 9703 RMD160 e892f182375e8a8541a01e6f3015f7fa4900c009 SHA1 80225c1cd6984b458e487db3cbc04d8e3a4173d8 SHA256 02ec44100395ebf6d59e03f1f4febb754650a1dd12b9dc13bf6e5afbaf277621 EBUILD fspanel-0.8_beta1-r2.ebuild 982 RMD160 bb1d53f45cf824c89ce5580324094c6deeeda484 SHA1 746c034908bcc0d9b390cf88f9ab6fab1202d787 SHA256 a54d79ab3a47b6a709e63f9ed389ae10d2b28bf4c9a68924b18597872304efbf -EBUILD fspanel-0.8_beta1-r3.ebuild 1024 RMD160 816039d2b59f0c87404f9b83a728bc4b2d3f22a3 SHA1 46ac3f7da563bbfcf8e537bc408108db647d4e08 SHA256 d656b936939635baa247fddcd4347fc054b06bd2d7caced73145f93de25b2cfb -MISC ChangeLog 2242 RMD160 c26fbfa3e1d11f6c9a15ae955b4c7add2acc0104 SHA1 923cfe0ecd726c9ad3d2f18c32f0dff6e17e9d70 SHA256 e5be28ae833df4d2b1e5699bf0d5975da5d5d8f3f84e460caede4d8386ba9a39 +EBUILD fspanel-0.8_beta1-r4.ebuild 1028 RMD160 4bbb59a797076a2e445bc6f1736fd799718cff68 SHA1 135c19741010f03c98b27e06eefaf54e323a6da5 SHA256 4587ac7c3c181d29540f8216858ab5b85f0149e028c067779dcdc4d23eca93d3 +MISC ChangeLog 2475 RMD160 f20f37989800d3ac5f9ac729a48e19b82979c9ee SHA1 373e274efbcb41a92cbabedcc085c127420b3b34 SHA256 914c94f4541ce71130c38908cf885a28304b879d7f372b4cdde02ce3dc755d50 MISC metadata.xml 231 RMD160 edee523a81eb20b171a5dd298e8507ecd49230f6 SHA1 f78294e25f7fd11c0954f753892ece303fc491b3 SHA256 f9af69429b315694d8f6094781bf242d6235450fc58aba6e9e35e28099cc334a ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.9 (GNU/Linux) - -iEYEARECAAYFAkligjUACgkQkKaRLQcq0GKB4gCfeCLsWORXcUjO2z8FK4SdqbeC -XW4AoKzdNhIehAM2iHwBnH+24AK+W69Q -=IINz ------END PGP SIGNATURE----- diff --git a/x11-misc/fspanel/files/fspanel-0.8_beta1-workspace.patch b/x11-misc/fspanel/files/fspanel-0.8_beta1-workspace.patch new file mode 100644 index 000000000000..ed9d862a2405 --- /dev/null +++ b/x11-misc/fspanel/files/fspanel-0.8_beta1-workspace.patch @@ -0,0 +1,31 @@ +http://cvsweb.se.netbsd.org/cgi-bin/bsdweb.cgi/pkgsrc/x11/fspanel/patches/patch-ab?rev=1.2;content-type=text/plain +http://bugs.gentoo.org/show_bug.cgi?id=324509 + +--- fspanel.c ++++ fspanel.c +@@ -559,10 +559,10 @@ + + /* check how many chars can fit */ + len = strlen (tk->name); +- while (1) ++ while (len > 0) + { + XftTextExtents8 (dd, xfs, tk->name, len, &ext); +- if (ext.width < taskw - (text_x - x) - 2 && len > 0) ++ if (ext.width < taskw - (text_x - x) - 2) + break; + len--; + } +@@ -678,7 +678,11 @@ + xev.message_type = atom__NET_CURRENT_DESKTOP; + xev.format = 32; + xev.data.l[0] = new_desk; +- XSendEvent (dd, root_win, False, SubstructureNotifyMask, (XEvent *) &xev); ++ xev.data.l[1] = 0; ++ xev.data.l[2] = 0; ++ xev.data.l[3] = 0; ++ xev.data.l[4] = 0; ++ XSendEvent (dd, root_win, False, SubstructureRedirectMask | SubstructureNotifyMask, (XEvent *) &xev); + } + + void diff --git a/x11-misc/fspanel/fspanel-0.8_beta1-r3.ebuild b/x11-misc/fspanel/fspanel-0.8_beta1-r4.ebuild similarity index 67% rename from x11-misc/fspanel/fspanel-0.8_beta1-r3.ebuild rename to x11-misc/fspanel/fspanel-0.8_beta1-r4.ebuild index 39c9c0fb451b..02ca8c1c2923 100644 --- a/x11-misc/fspanel/fspanel-0.8_beta1-r3.ebuild +++ b/x11-misc/fspanel/fspanel-0.8_beta1-r4.ebuild @@ -1,10 +1,11 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/fspanel/fspanel-0.8_beta1-r3.ebuild,v 1.1 2008/12/07 13:04:53 coldwind Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/fspanel/fspanel-0.8_beta1-r4.ebuild,v 1.1 2010/06/18 15:02:37 ssuominen Exp $ -inherit eutils +EAPI=2 +inherit eutils toolchain-funcs -MY_P=${P/_beta/beta} +MY_P=${P/_} DESCRIPTION="F***ing Small Panel. Good (and small) replacement for gnome-panel" HOMEPAGE="http://www.chatjunkies.org/fspanel" @@ -24,25 +25,25 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${MY_P} -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}-configure.patch +src_prepare() { + epatch "${FILESDIR}"/${P}-configure.patch \ + "${FILESDIR}"/${P}-workspace.patch } myuse() { use $1 && echo yes || echo no } -src_compile() { +src_configure() { + tc-export CC + export USE_XFT=$(myuse xft) export USE_XPM=$(myuse xpm) - ./configure || die "./configure failed" - emake || die "emake failed" + ./configure || die } -src_install () { - dobin fspanel +src_install() { + dobin fspanel || die dodoc README } -- 2.26.2