diff options
Diffstat (limited to 'x11-wm/musca')
| -rw-r--r-- | x11-wm/musca/ChangeLog | 10 | ||||
| -rw-r--r-- | x11-wm/musca/Manifest | 26 | ||||
| -rw-r--r-- | x11-wm/musca/files/musca-0.9.24_p20100226-null.patch | 151 | ||||
| -rw-r--r-- | x11-wm/musca/musca-0.9.24_p20100226-r3.ebuild | 66 |
4 files changed, 239 insertions, 14 deletions
diff --git a/x11-wm/musca/ChangeLog b/x11-wm/musca/ChangeLog index afe04c97ca22..3128cafbc231 100644 --- a/x11-wm/musca/ChangeLog +++ b/x11-wm/musca/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-wm/musca -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/musca/ChangeLog,v 1.22 2012/03/06 21:44:23 jer Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/musca/ChangeLog,v 1.23 2014/01/07 18:20:04 jer Exp $ + +*musca-0.9.24_p20100226-r3 (07 Jan 2014) + + 07 Jan 2014; Jeroen Roovers <jer@gentoo.org> + +musca-0.9.24_p20100226-r3.ebuild, +files/musca-0.9.24_p20100226-null.patch: + Fix some coding issues. 06 Mar 2012; Jeroen Roovers <jer@gentoo.org> musca-0.9.24_p20100226-r2.ebuild: diff --git a/x11-wm/musca/Manifest b/x11-wm/musca/Manifest index 78ee5d8f9fd3..ec95b21ee056 100644 --- a/x11-wm/musca/Manifest +++ b/x11-wm/musca/Manifest @@ -1,17 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 -AUX musca-0.9.24-make.patch 711 RMD160 b12498b12db93fee1297f13824dcd4eab010980d SHA1 239fd253cb59b46215305f6c72ed1d00b4aad959 SHA256 114b44eb6cc3584fb079faadc85d3ebf170d6c1f790a6f55c78ce7f95583cadb -AUX musca-0.9.24_p20100226-dmenu-4.4.patch 1421 RMD160 fcd016fb649e1b75549cd0fbffda19e8b1091622 SHA1 91232891b706ce344756a1e304032e913f186e45 SHA256 d88c845edaa58a73bc4d2c331bfbd15cbbb0db50df6ab74e351eb35d92e77e6d -AUX musca.xsession 16 RMD160 b7465701e85c59cc8099accf39786f712262a92e SHA1 2d3dd698b35fe9f3fbb333103117a6f19a15eb63 SHA256 b9497cce444e83c33c62c124cb73fa3a7ee5b2ab24a9679b3c6d89a5957a9c47 -DIST musca-0.9.24_p20100226.tgz 81490 RMD160 e84696457e83831d4f5bb98a7b77770a214d35b6 SHA1 76744f1b24e5eb5adcf1546e593d9b633a2dfdc5 SHA256 63167c76fa5ea9381685d209e12b795001d8d0d183b22a6578f255b56ca87676 -EBUILD musca-0.9.24_p20100226-r2.ebuild 1258 RMD160 4c1e644d667ec9638907661fca75f43aca10c13d SHA1 39695f002fdd80d438bec8fce378fd7132b47b93 SHA256 fb80a58739f78b9b4c93d614311e90a6b2bb54e586af67ed5fb8f0f414fa8669 -MISC ChangeLog 3195 RMD160 5eff92b65657722f42246a3ebfa65c1b946501e8 SHA1 6a638a37a62c308934c723bfc80ccdd29b8a0e7b SHA256 09904b87ba113d6670cf593d14d09c17ebe4a9ef9478f86368fca7c01da81a79 -MISC metadata.xml 393 RMD160 e2da0b5e7c7353df5b12153def271d8f4acc5a61 SHA1 ec6334bd0bc315fe3c5b750bf0d7661956b2f691 SHA256 dd8215a2bee91775b10d55416da1e78dfcc5ede014c6c07990409386fd21a076 +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-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-r2.ebuild 1258 SHA256 fb80a58739f78b9b4c93d614311e90a6b2bb54e586af67ed5fb8f0f414fa8669 SHA512 e84f6262386d5d5002676c5df7518065261b50a7634a479bc3b333dbbc3a0b7e00fa3825d40ffbde1d49c9c65de6b78a5f216235919badf36fac8d77d438dfd8 WHIRLPOOL 7ee6ca45fec287703f9d001242c08ad982c405da03ebdc9ca89b18a4e6c7b299a19d46502cb5e9feb4d9203b69cfe78cf3f26f5de2db3aca7fbdf34496c30881 +EBUILD musca-0.9.24_p20100226-r3.ebuild 1310 SHA256 7c10a285efdce1bb5706ac8ac740377c411eca9b6292b25276ade116547924ef SHA512 552480615311022a39037f3c2891404b47894a8357087d3796f4bcf745ae94a6f5c44fa86624aa118ba64bb7ed0b1f52172e5e7fd47453c2d01ad8859e1ddd3f WHIRLPOOL 32c4171093fd6e59569177e8d378bc700edea38ad6f263e7ecdb815aea5edcca67e61c5f37e7ae81359675bdd71805d53db50be14c00c10e87be7204d4395d95 +MISC ChangeLog 3390 SHA256 79704d11f2678f9ff61a0f75232bd8e6ca228dee83624bd40c5eb408c4fc9161 SHA512 a30befe88be463cc36613da900b5e66f486bd62c44fe35067586bfe04d09a8420c928ac816e62ed1d57330b67f9ed76cb32fc6bb3c6ab8c2ecd393625e4f3c21 WHIRLPOOL 80b67e98f2ccfc05aeec40a496833039efd36b91bb5f59ef141e24e63d4214f532807499a29b6f5f6079a4cea08bb66fe73baa021f095c9a865021df44db9577 +MISC metadata.xml 393 SHA256 dd8215a2bee91775b10d55416da1e78dfcc5ede014c6c07990409386fd21a076 SHA512 ab2173fddfe75a5167c9a6c149fed0162b3bbaf078998ffb988b27fe9e25dc7ead2e1d9aa91606bbcb99a1e998174a08893dddda47ec98f39574dc43ac168d54 WHIRLPOOL afddbde28102a3d328759b905854d062fabb3872f770ec24389263a5fcfab79de5c5e7e3fc2ab6e296e091a4bf25e97f9dfb6b5706ef1d651180a337f7b17e61 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.22 (GNU/Linux) -iEYEARECAAYFAk9WhTwACgkQVWmRsqeSphM7YwCfRaaoS5NPuk86pzjSmg0Yt28u -VcQAn2miByUd8y0sAq7FhbtrnBd6/FNO -=/cSk +iEYEAREIAAYFAlLMRVYACgkQVWmRsqeSphMrpwCcCJEc8dNEhKImWzzFX4ilmoaB +NigAnAtnqhxDXyBVveXnz4/aVS2wUUO2 +=IlgI -----END PGP SIGNATURE----- diff --git a/x11-wm/musca/files/musca-0.9.24_p20100226-null.patch b/x11-wm/musca/files/musca-0.9.24_p20100226-null.patch new file mode 100644 index 000000000000..6efb77ff0b35 --- /dev/null +++ b/x11-wm/musca/files/musca-0.9.24_p20100226-null.patch @@ -0,0 +1,151 @@ +https://bugs.launchpad.net/musca/+bug/1236500 + + +--- a/musca.c ++++ b/musca.c +@@ -421,7 +421,7 @@ + if (s->depth) + { + int *indexes = allocate(sizeof(int) * s->depth); +- int count = 0, i; Window *w; ++ int count = 0, i; Window *w = NULL; + FOR_STACK (w, s, Window*, i) + { + note("%d", i); +@@ -1673,7 +1673,6 @@ + frame *f = t->frames; + frame **group = NULL; + int i = 0, x, y, w, h; +- ubyte changes = 0; + if (direction == HORIZONTAL) + { + if (f->x + f->w >= t->head->screen->width - t->r) +@@ -1684,7 +1683,6 @@ + group = frame_siblings(f, LEFT); + if (frame_siblings_growable(group, LEFT, size)) + { +- changes = 1; + x = f->x - size; w = size; y = f->y; h = 0; + for (i = 0; group[i]; i++) + y = MIN(y, group[i]->y), h += group[i]->h; +@@ -1702,7 +1700,6 @@ + group = frame_siblings(f, RIGHT); + if (frame_siblings_growable(group, RIGHT, size)) + { +- changes = 1; + x = f->x + f->w; w = size; y = f->y; h = 0; + for (i = 0; group[i]; i++) + y = MIN(y, group[i]->y), h += group[i]->h; +@@ -1725,7 +1722,6 @@ + group = frame_siblings(f, TOP); + if (frame_siblings_growable(group, TOP, size)) + { +- changes = 1; + y = f->y - size; h = size; x = f->x; w = 0; + for (i = 0; group[i]; i++) + x = MIN(x, group[i]->x), w += group[i]->w; +@@ -1743,7 +1739,6 @@ + group = frame_siblings(f, BOTTOM); + if (frame_siblings_growable(group, BOTTOM, size)) + { +- changes = 1; + y = f->y + f->h; h = size; x = f->x; w = 0; + for (i = 0; group[i]; i++) + x = MIN(x, group[i]->x), w += group[i]->w; +@@ -2205,11 +2200,9 @@ + char* com_frame_split(char *cmd, regmatch_t *subs) + { + group *g = heads->groups; frame *f = g->frames; +- int sw = heads->screen->width - g->l - g->r, +- sh = heads->screen->height - g->t - g->b; + char *mode = regsubstr(cmd, subs, 1); +- ucell fs = f->h, ss = sh; ubyte dir = VERTICAL; +- if (*mode == 'h') { fs = f->w; ss = sw; dir = HORIZONTAL; } ++ ucell fs = f->h; ubyte dir = VERTICAL; ++ if (*mode == 'h') { fs = f->w; dir = HORIZONTAL; } + dcell size = parse_size(cmd, subs, 2, fs); + frame_split(dir, size / fs); + free(mode); +@@ -2630,7 +2623,7 @@ + } + char* com_command(char *cmd, regmatch_t *subs) + { +- int i; alias *a; autostr s; str_create(&s); ++ int i; alias *a = NULL; autostr s; str_create(&s); + str_print(&s, strlen(command_hints)+NOTE, "%s \n", command_hints); + FOR_STACK (a, aliases, alias*, i) str_print(&s, NOTE, "%s \n", a->name); + menu_wrapper(s.pad, settings[ms_run_musca_command].s); +@@ -2747,7 +2740,7 @@ + char* show_aliases() + { + autostr s; str_create(&s); +- alias *a; int i; ++ alias *a = NULL; int i; + FOR_STACK (a, aliases, alias*, i) + str_print(&s, strlen(a->name)+strlen(a->command)+10, "alias %s %s\n", + a->name, a->command); +@@ -2849,7 +2842,7 @@ + } + char* com_place(char *cmd, regmatch_t *subs) + { +- placement *p; int i; ++ placement *p = NULL; int i; + char *class = regsubstr(cmd, subs, 1); + ubyte flag = parse_flag(cmd, subs, 2, 0); + char *group = regsubstr(cmd, subs, 3); +@@ -3441,7 +3434,7 @@ + autostr s; str_create(&s); + for (;;) + { +- char c = getchar(); ++ int c = getchar(); + if (c == EOF) break; + str_push(&s, c); + } +@@ -3530,7 +3523,7 @@ + } + void grab_stuff() + { +- int i, j, k; head *h; binding *b; ucell *m; ++ int i, j, k; head *h; binding *b; ucell *m = NULL; + refresh_bindings(); + ungrab_stuff(); + ucell modifiers[] = { 0, LockMask, NumlockMask, LockMask|NumlockMask }; +@@ -3550,7 +3543,7 @@ + { + int i; + command_hash = hash_create(); +- command *c; autostr str; str_create(&str); ++ command *c = NULL; autostr str; str_create(&str); + FOR_ARRAY (c, commands, command, i) + { + char *keys = c->keys; +@@ -3566,7 +3559,7 @@ + strtrim(command_hints); + // compile setting regex + setting_hash = hash_create(); +- setting *s; ++ setting *s = NULL; + FOR_ARRAY (s, settings, setting, i) + hash_set(setting_hash, s->name, s); + // compile modmask regex +@@ -3597,7 +3590,7 @@ + } + void setup_bindings() + { +- int i; keymap *k; ++ int i; keymap *k = NULL; + // prepare key bindings + bindings = stack_create(); + FOR_ARRAY (k, keymaps, keymap, i) +--- a/tools.c ++++ b/tools.c +@@ -227,7 +227,7 @@ + ucell ptr = 0; + for (;;) + { +- byte c = fgetc(src); ++ int c = fgetc(src); + if (c == EOF) + break; + diff --git a/x11-wm/musca/musca-0.9.24_p20100226-r3.ebuild b/x11-wm/musca/musca-0.9.24_p20100226-r3.ebuild new file mode 100644 index 000000000000..37e52d2d458c --- /dev/null +++ b/x11-wm/musca/musca-0.9.24_p20100226-r3.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2014 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-r3.ebuild,v 1.1 2014/01/07 18:20:04 jer Exp $ + +EAPI="4" + +inherit eutils savedconfig toolchain-funcs + +DESCRIPTION="A simple dynamic window manager for X, with features nicked from +ratpoison and dwm" +HOMEPAGE="http://aerosuidae.net/musca.html" +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 + + 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 +} |