Add patch for bug #231044

Package-Manager: portage-2.1.4.4

4 files changed, 83 insertions, 12 deletions

diff --git a/x11-misc/dmenu/ChangeLog b/x11-misc/dmenu/ChangeLog
index 020800e1a21a..06865c0a4127 100644
--- a/x11-misc/dmenu/ChangeLog
+++ b/x11-misc/dmenu/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/dmenu
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/dmenu/ChangeLog,v 1.32 2008/07/18 11:05:51 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/dmenu/ChangeLog,v 1.33 2008/07/20 14:34:14 cedk Exp $
+
+*dmenu-3.7-r1 (20 Jul 2008)
+
+  20 Jul 2008; Cédric Krier <cedk@gentoo.org> +files/dmenu-3.7.patch,
+  +dmenu-3.7-r1.ebuild:
+  Add patch for bug #231044
 
   16 Jul 2008; Alexis Ballier <aballier@gentoo.org> dmenu-3.7.ebuild:
   keyword ~x86-fbsd, thanks to Davide Italiano <dav_it@gentoo.org>, bug
diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest
index d8e52f6c3a32..b723d4897ac0 100644
--- a/x11-misc/dmenu/Manifest
+++ b/x11-misc/dmenu/Manifest
@@ -1,6 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX dmenu-3.7.patch 502 RMD160 d6d93fcb8b06792a8e7dabab14fe2769f352664b SHA1 4b6281a75b89436c130b3bc701c9bca534065f5b SHA256 84bc16d1f272b2089ab88d413c1f44f995a6f5c1beac466fecadfc93ffdede8c
 DIST dmenu-3.2.tar.gz 7901 RMD160 d30a4a729699b9290c26fd452303fff15c5cffbf SHA1 26c9161821c805a93513100eca3ed37c947dcd4b SHA256 287e5593ac4f62add280f849228c5943034288716c77bdc72d7dcfad5de6274e
 DIST dmenu-3.3.tar.gz 7910 RMD160 03e6ae73ddbd50c4aa909f8ba9522669b4c1d84d SHA1 8c6d5a401eaeeab33ad24f823094fdc36a331f24 SHA256 2971ccd505a5fc24581b38f30f1c1452b416878dc3159b11128418ee836fdb19
 DIST dmenu-3.4.tar.gz 8131 RMD160 b5be8aa3bc0babc2f89092da0e89dfedb0d96da9 SHA1 f9defb210da9fcce35982ba5a2ff5ad8fe8d6a63 SHA256 4216a80019b89224966ed4bd8b11149ec71a8ce706c551ac0cf2cd489e120091
@@ -12,13 +10,7 @@ EBUILD dmenu-3.3.ebuild 1312 RMD160 300b20677e6d7d829e805e3865a3c4eee22ac170 SHA
 EBUILD dmenu-3.4.ebuild 1312 RMD160 21bf2b73355f47badeb4faceef1336217d4aeca1 SHA1 5b6bf086af021fa37676a612aa405d262f51c89b SHA256 5cb4525c44a071d0741e2f926f1c0a445b13ddb609b9a65b179c7898ee510374
 EBUILD dmenu-3.5.ebuild 1312 RMD160 efe0a054a2475759cfb1823e4dd18ad0e3e50ec8 SHA1 e18bddfcad14c3f44bdd0a62037ab333f3330581 SHA256 602e571308ab834c12fc8f76e78ee8dbe2d317a4a59251ecf464c2a0c3481945
 EBUILD dmenu-3.6.ebuild 1312 RMD160 631e1333e9fdd867351ce08e7b1059adb498da09 SHA1 4abd29b06038a09824eece54b599212117f00bd5 SHA256 135638ba6132a113c9a70254ccc5775f58a111e9cf45952ec1ecef70f79a7471
+EBUILD dmenu-3.7-r1.ebuild 1368 RMD160 21005aa80a758629214b8fc045175b0975962af5 SHA1 71b55ea92ee6180023c4867bd36a7b4fcfff0bd7 SHA256 ae813f15bbcc209b8c458f90f9f5b00b7a01bef190107d295f07d22066e7ffbe
 EBUILD dmenu-3.7.ebuild 1326 RMD160 de8764f571be387749f64444f859f351b51ec799 SHA1 29fcef50c38ace41cbbbb07af87feb8718b5cbac SHA256 066a117538b539bb21b630ad1b85cdde68907d70fbed9b1ee26f225cdff774ad
-MISC ChangeLog 3675 RMD160 284f4e2374328f59ed3d3ad87f3db33c96c5422d SHA1 31b246119f578a03a79727148d855335de0128d7 SHA256 6e8e8364f678142d47adb2a8456b1fd635ebc6f51ccb110c6bb2881569bef09a
+MISC ChangeLog 3824 RMD160 4e0e7edce1d88f664d4e19aaaa246074da37b34c SHA1 b9822699a2a71ebcaf3fd049390485472530f6d8 SHA256 31e439c4adbbc896338742671bec3cd0a4da165b63e3796617df389d4ea94b09
 MISC metadata.xml 362 RMD160 5f550b91126dc9e09be2d8bbdc20eaca796bbc0f SHA1 ef592e4169ca16e31a24d264c480722112b740e2 SHA256 341ef52d92764d360158c96773c3d73939970d958b8dd066204741f43ee7dd92
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkiAeRYACgkQvFcC4BYPU0q6AACcCX25FhalFJLfQyW47Z9KA0cX
-uFQAoJ4N7LpLAA/0jUTzwHNwIcb5v0qf
-=D5Fo
------END PGP SIGNATURE-----
diff --git a/x11-misc/dmenu/dmenu-3.7-r1.ebuild b/x11-misc/dmenu/dmenu-3.7-r1.ebuild
new file mode 100644
index 000000000000..944145dfcf3d
--- /dev/null
+++ b/x11-misc/dmenu/dmenu-3.7-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/dmenu/dmenu-3.7-r1.ebuild,v 1.1 2008/07/20 14:34:14 cedk Exp $
+
+inherit toolchain-funcs savedconfig eutils
+
+DESCRIPTION="a generic, highly customizable, and efficient menu for the X Window System"
+HOMEPAGE="http://www.suckless.org/programs/dmenu.html"
+SRC_URI="http://suckless.org/download/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="x11-libs/libX11"
+RDEPEND=${DEPEND}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	sed -i \
+		-e "s/CFLAGS = -Os/CFLAGS += -g/" \
+		-e "s/LDFLAGS = -s/LDFLAGS += -g/" \
+		config.mk || die "sed failed"
+
+	epatch "${FILESDIR}/${P}.patch"
+
+	if use savedconfig; then
+		restore_config config.h
+	fi
+}
+
+src_compile() {
+	local msg
+	use savedconfig && msg=", please check the configfile"
+	emake CC=$(tc-getCC) || die "emake failed${msg}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" install || die "emake install failed"
+
+	insinto /usr/share/${PN}
+	newins config.h ${PF}.config.h
+
+	dodoc README
+
+	save_config config.h
+}
+
+pkg_postinst() {
+	einfo "This ebuild has support for user defined configs"
+	einfo "Please read this ebuild for more details and re-emerge as needed"
+	einfo "if you want to add or remove functionality for ${PN}"
+}
diff --git a/x11-misc/dmenu/files/dmenu-3.7.patch b/x11-misc/dmenu/files/dmenu-3.7.patch
new file mode 100644
index 000000000000..44bb70154846
--- /dev/null
+++ b/x11-misc/dmenu/files/dmenu-3.7.patch
@@ -0,0 +1,17 @@
+diff -ru dmenu-3.7~/dmenu.c dmenu-3.7/dmenu.c
+--- dmenu-3.7~/dmenu.c	2008-07-20 16:26:14.000000000 +0200
++++ dmenu-3.7/dmenu.c	2008-07-20 16:27:01.000000000 +0200
+@@ -477,11 +477,11 @@
+ 		calcoffsets();
+ 		break;
+ 	case XK_Return:
+-		if((e->state & ShiftMask) && text)
++		if((e->state & ShiftMask) && *text)
+ 			fprintf(stdout, "%s", text);
+ 		else if(sel)
+ 			fprintf(stdout, "%s", sel->text);
+-		else if(text)
++		else if(*text)
+ 			fprintf(stdout, "%s", text);
+ 		fflush(stdout);
+ 		running = False;