Add two more patches from Arch.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

5 files changed, 115 insertions, 5 deletions

diff --git a/x11-wm/musca/ChangeLog b/x11-wm/musca/ChangeLog
index 05d0b9b9af9b..f5036f09b0bd 100644
--- a/x11-wm/musca/ChangeLog
+++ b/x11-wm/musca/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-wm/musca
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/musca/ChangeLog,v 1.26 2015/01/19 11:03:01 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/musca/ChangeLog,v 1.27 2015/06/08 18:39:40 jer Exp $
+
+*musca-0.9.24_p20100226-r4 (08 Jun 2015)
+
+  08 Jun 2015; Jeroen Roovers <jer@gentoo.org>
+  +musca-0.9.24_p20100226-r4.ebuild,
+  +files/musca-0.9.24_p20100226-fix-cycle.patch,
+  +files/musca-0.9.24_p20100226-fix-pad.patch:
+  Add two more patches from Arch.
 
   19 Jan 2015; Jeroen Roovers <jer@gentoo.org>
   musca-0.9.24_p20100226-r3.ebuild:
diff --git a/x11-wm/musca/Manifest b/x11-wm/musca/Manifest
index e0e652da6f3b..22a17da6c063 100644
--- a/x11-wm/musca/Manifest
+++ b/x11-wm/musca/Manifest
@@ -3,16 +3,19 @@ Hash: SHA256
 
 AUX musca-0.9.24-make.patch 711 SHA256 114b44eb6cc3584fb079faadc85d3ebf170d6c1f790a6f55c78ce7f95583cadb SHA512 e31f4eb6b79e4137e366943c804aeaf7d571f005cf81332611126b94a82a3dd93651631670f7d0b6620e8f41047250c0c2c1955e86d9d48193ba3acd99e1c54c WHIRLPOOL 5f66c25a6a0309bf002223bf79097de6bc2b545b853cbee0a66f3a62d394a43e8a8002179245b56d3d51e22dbd283dc702ba64e3fe4e05ef14569bec61f200d9
 AUX musca-0.9.24_p20100226-dmenu-4.4.patch 1421 SHA256 d88c845edaa58a73bc4d2c331bfbd15cbbb0db50df6ab74e351eb35d92e77e6d SHA512 9aee1756cd0ff7094a26aa3ab0e2440728b973a72234c3532f733afc57763678cfcfb6a07ec2ae386f2b70d2313d62437cf889d561bbf321f96fe979181541b3 WHIRLPOOL 00682b04df0db076ac022dc2f18fb1d7dd9f7af6abfc195642815c3b298459de4c386e7442d56b9c056b0dc8359a0e208cb4aa359bccc1402245d71bddf4da42
+AUX musca-0.9.24_p20100226-fix-cycle.patch 408 SHA256 4683118c5149c1a299de55778a9e6c9891c9b68834bc02575f0366bde0322319 SHA512 873f3907bcc31aa29e8af92ec5a20996e6efa5e879eb2d1b6f5bccc562d3816b83475f650f07b7834e9392b32f15644b298056a03a570c6f768224d3bd5f4449 WHIRLPOOL 8ac8525633ac221159490cb6f838359f6f80b831fcbd70ed6e318ebbe6180d2569c99e1b87307d7be753d83a037b837d3bb8d6508ec20e9894d6ab5718f79cf3
+AUX musca-0.9.24_p20100226-fix-pad.patch 818 SHA256 79389a349c3ef4ea9d1041f2988f0955d994ce45f373b8e0f3e0ab28c3b64425 SHA512 9552c301a2f228fc4147bfc27ab28bd0d17c7cd308f20ff432c37a041b91fd62a166eca2085c36693249ac6d19225717c898c13e7ed176adb9000c37cd8bd0e5 WHIRLPOOL 7717f29deab12f83293fe77262a6e262d6005def7b5968c6ce1c6853ff077abcd4a154140f9282c7579a02f943470e6c88ada047b787bc9ce856b10ded9175f8
 AUX musca-0.9.24_p20100226-null.patch 4271 SHA256 426d5646ac1ac294c24426cb070957285e1f96d1d2b1479a43a6e0d4b4e0e9d0 SHA512 76bf5d67eee6a5045d1781b818333ef36bac87276bb6050b794502abc4aa77a930092f62ec07622ee18f6bb270924ec40813ee70d25ea8e5d3cf1458a39569a5 WHIRLPOOL cfa0efd4f44c8233306453ca803c79953e2f8fcad56f19c87d15666789fd798c5fd4153f07681adcc95a45cc835417949de7847b35487a64da253a72e0d79f90
 AUX musca.xsession 16 SHA256 b9497cce444e83c33c62c124cb73fa3a7ee5b2ab24a9679b3c6d89a5957a9c47 SHA512 f276046ab82ceeaebf5307ea9050d55767a55cbd1913854ef0f73bdf162d2d751537ad604fc2a99d8d9c9b89426b609f127451c7a3f6b36868c74842d28a8622 WHIRLPOOL a646ec627cd03b627ba7ed6814b72ade83f28f3c3835841a9e041304efc07d3fd8d5c8661bc0640809ba72d07cdfa69c504a96df99c5912a9b19153d029a3b18
 DIST musca-0.9.24_p20100226.tgz 81490 SHA256 63167c76fa5ea9381685d209e12b795001d8d0d183b22a6578f255b56ca87676 SHA512 9030931dbc332fce144edc6bea907d86aab1eef6b1384958a7889b533af5065a2f20b7233ea063648fff0eb468c2083a310e38586c2c4d83848c773fb1984f45 WHIRLPOOL 79b45f6c48fc1e263baddc4fa14dce737824b02ed4a0ccd2199d4ac968aae4044e0487f9350278c8e5674d14f7241bd676c4ab96cdec7f0a6f0c2b7b6f246829
 EBUILD musca-0.9.24_p20100226-r3.ebuild 1303 SHA256 c8ae718788f89f4adef3153c7508def81147efcee2a809388c5c38444d13bbc4 SHA512 2c9008d43c951557afc2ce5a5dc3fea294e7ccae692ec8cc76cad33356b27f80c1f738030f50d35e8831a71f64bc4ade37b213f8d91496c78c4dd782af9d434f WHIRLPOOL 946a741b5881f59adad48c5ead34a3419e3a69cfa23f1a08e14f05fb526ec44a5d4c09a73065dde84b1ed004154992b0e0dd073491ad769ff529615bcd7c8a1d
-MISC ChangeLog 3733 SHA256 9dd0a0a6d8ee8486b21a5757b0e805c26c1f235ca37ff0ab82e271dff8b64d41 SHA512 4446eba3be780b0a61f631ae3bb7860a11bc703aea1b065386af442e8a5e23044926b2a6f6a869a45f97ef62161c45f752c2c5d9d82daf23b0b1375fb946ee4f WHIRLPOOL 3e2c6482a3ac666fb5e6f040157312177baf870311ea6af511647d23f339609ab6b51201df2b8b47491ebce9ad131bcef4e8ff3c3545fd9332ef076b855b49c8
+EBUILD musca-0.9.24_p20100226-r4.ebuild 1414 SHA256 258d9558bb39c33b2cb1a102b5c858263f745560de661d7a1466f28c5ac8f2f8 SHA512 165f42895b300973d6f9b3aa2784020b183595e9450a87d6161791b793482dbdcb7fd93e2ecb283d2327f7cf57a1f9d308a80e6e9a654f9682471719a5d41348 WHIRLPOOL 7a6146b3a37935f0a78e622006f951a6a063173338b217d7e233a19cae232fe45435e4adecf92a4cd2ae8e6480071101bac1e73104db86060861d606218e5cc8
+MISC ChangeLog 3990 SHA256 e65b0be323d410dc7180e3621cf6b0765198c72f53589e5fcf856b77a9e21f0a SHA512 dda1a444b67ce5377ea9255cde01a62f8df712f49c76faa03e014ff36ec3100d867a084444e23775c9c8737a979383dff1654e61c83bdc73e490163970e9396e WHIRLPOOL 5385627721ed374c066420c9b3b29704dd807169d3d3a07cd0108a5de33134c73eec4223e4f0888a7165c395c0da78602c970d705d2293e7262ac617b912a7e0
 MISC metadata.xml 393 SHA256 dd8215a2bee91775b10d55416da1e78dfcc5ede014c6c07990409386fd21a076 SHA512 ab2173fddfe75a5167c9a6c149fed0162b3bbaf078998ffb988b27fe9e25dc7ead2e1d9aa91606bbcb99a1e998174a08893dddda47ec98f39574dc43ac168d54 WHIRLPOOL afddbde28102a3d328759b905854d062fabb3872f770ec24389263a5fcfab79de5c5e7e3fc2ab6e296e091a4bf25e97f9dfb6b5706ef1d651180a337f7b17e61
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlS85GcACgkQVWmRsqeSphMbWwCeN+MjTbO9Yw456WZlC/TQoQW4
-oQYAn1/BOnnB99bhav5GMqpfL3IBQUQj
-=zm8n
+iEYEAREIAAYFAlV14W0ACgkQVWmRsqeSphN6PACfavY5955OKJCYM3Lvl6U7+NWt
+1nQAnRYaRGx6RThAplv0L4f6qgl65lp0
+=2I4Z
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/musca/files/musca-0.9.24_p20100226-fix-cycle.patch b/x11-wm/musca/files/musca-0.9.24_p20100226-fix-cycle.patch
new file mode 100644
index 000000000000..6765ebcdcf7d
--- /dev/null
+++ b/x11-wm/musca/files/musca-0.9.24_p20100226-fix-cycle.patch
@@ -0,0 +1,11 @@
+--- a/musca.c
++++ b/musca.c
+@@ -3202,7 +3202,7 @@ void mapnotify(XEvent *ev)
+ 		handle_map(ws);
+ 		head *h = head_by_root(ws->attr.root);
+ 		if (is_netwmstate(ws->state, NetWMStateFullscreen))
+-			stack_push(h->fullscreen, (void*)ws);
++			stack_push(h->fullscreen, (void*)ws->w);
+ 		else
+ 		if (ws->attr.override_redirect || is_netwmstate(ws->state, NetWMStateAbove))
+ 			stack_push(h->above, (void*)ws->w);
diff --git a/x11-wm/musca/files/musca-0.9.24_p20100226-fix-pad.patch b/x11-wm/musca/files/musca-0.9.24_p20100226-fix-pad.patch
new file mode 100644
index 000000000000..23bd9283467a
--- /dev/null
+++ b/x11-wm/musca/files/musca-0.9.24_p20100226-fix-pad.patch
@@ -0,0 +1,21 @@
+--- a/musca.c
++++ b/musca.c
+@@ -1985,7 +1985,8 @@ void group_other()
+ // resize frames to match changes in the screen border padding
+ void group_resize(group *ta, int l, int r, int t, int b)
+ {
+-	frame *f = ta->frames; int i;
++	frame *f = ta->frames; int i, j;
++	client *c = ta->clients;
+ 	int sw = ta->head->screen->width;
+ 	int sh = ta->head->screen->height;
+ 	     if (l < ta->l) { frames_fill_gap(ta, l, ta->t, ta->l - l, sh - ta->b, FRAMES_ALL); ta->l = l; }
+@@ -1998,6 +1999,8 @@ void group_resize(group *ta, int l, int r, int t, int b)
+ 	else if (b > ta->b) { frames_make_gap(ta, ta->l, sh - b, sw - ta->l - ta->r, b - ta->b); ta->b = b; }
+ 	FOR_RING (NEXT, f, ta->frames, i)
+ 		frame_update(f);
++	FOR_RING (NEXT, c, ta->clients, j)
++		client_configure(c,NULL);
+ }
+ group* group_by_name(head *h, char *name)
+ {
diff --git a/x11-wm/musca/musca-0.9.24_p20100226-r4.ebuild b/x11-wm/musca/musca-0.9.24_p20100226-r4.ebuild
new file mode 100644
index 000000000000..b8304158c593
--- /dev/null
+++ b/x11-wm/musca/musca-0.9.24_p20100226-r4.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/musca/musca-0.9.24_p20100226-r4.ebuild,v 1.1 2015/06/08 18:39:40 jer Exp $
+
+EAPI=5
+inherit eutils savedconfig toolchain-funcs
+
+DESCRIPTION="A simple dynamic window manager for X, with features nicked from
+ratpoison and dwm"
+HOMEPAGE="https://launchpad.net/musca"
+SRC_URI="mirror://gentoo/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="apis xlisten"
+
+COMMON="x11-libs/libX11"
+DEPEND="${COMMON}
+	sys-apps/sed"
+RDEPEND="
+	${COMMON}
+	>=x11-misc/dmenu-4.4
+	apis? ( x11-misc/xbindkeys )
+"
+
+src_prepare() {
+	restore_config config.h
+
+	sed -i config.h \
+		-e 's:"sort | dmenu -i -b":"-i -b":g' \
+		-e 's:sed.*exec.*-i::g' \
+		|| die
+
+	epatch \
+		"${FILESDIR}"/${PN}-0.9.24-make.patch \
+		"${FILESDIR}"/${PN}-0.9.24_p20100226-dmenu-4.4.patch \
+		"${FILESDIR}"/${PN}-0.9.24_p20100226-null.patch \
+		"${FILESDIR}"/${PN}-0.9.24_p20100226-fix-cycle.patch \
+		"${FILESDIR}"/${PN}-0.9.24_p20100226-fix-pad.patch
+
+	local i
+	for i in apis xlisten; do
+		if ! use ${i}; then
+			sed -e "s|${i}||g" -i Makefile || die
+		fi
+	done
+
+	tc-export CC
+}
+
+src_install() {
+	dobin musca
+
+	local i
+	for i in xlisten apis; do
+		if use ${i}; then
+			dobin ${i}
+		fi
+	done
+	doman musca.1
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/${PN}.xsession musca
+
+	save_config config.h
+}