From: David Shakaryan Date: Tue, 30 Jan 2007 23:08:01 +0000 (+0000) Subject: Apply xprop/gtk d'n'd patch; thanks to Roland Kammerer. (bug #164429) X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=55b4c59a6446a4fd766749573980954081f7716d;p=gentoo.git Apply xprop/gtk d'n'd patch; thanks to Roland Kammerer. (bug #164429) Package-Manager: portage-2.1.2-r4 --- diff --git a/x11-wm/wmii/ChangeLog b/x11-wm/wmii/ChangeLog index 5502ac9167b2..e2d64c1d0a51 100644 --- a/x11-wm/wmii/ChangeLog +++ b/x11-wm/wmii/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-wm/wmii # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmii/ChangeLog,v 1.16 2007/01/30 07:11:45 omp Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmii/ChangeLog,v 1.17 2007/01/30 23:08:01 omp Exp $ + +*wmii-20070116-r1 (30 Jan 2007) + + 30 Jan 2007; David Shakaryan + +files/wmii-20070116-WMState.patch, +wmii-20070116-r1.ebuild: + Apply xprop/gtk d'n'd patch; thanks to Roland Kammerer. (bug #164429) *wmii-20070116 (30 Jan 2007) diff --git a/x11-wm/wmii/Manifest b/x11-wm/wmii/Manifest index ddb8dd213e51..064b4f036db9 100644 --- a/x11-wm/wmii/Manifest +++ b/x11-wm/wmii/Manifest @@ -1,6 +1,10 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX wmii-20070116-WMState.patch 1979 RMD160 2918806a19a29f68b6a49d69d950820b1b0516a6 SHA1 b7b71453abf7600e04eaa1d23f4114ebe16251af SHA256 71a8021c45278cc62e74224499b813a7107c0d68af39bcb5323aa94ac23e3502 +MD5 2f2b597b5bd06628a050b0aa02b10fd1 files/wmii-20070116-WMState.patch 1979 +RMD160 2918806a19a29f68b6a49d69d950820b1b0516a6 files/wmii-20070116-WMState.patch 1979 +SHA256 71a8021c45278cc62e74224499b813a7107c0d68af39bcb5323aa94ac23e3502 files/wmii-20070116-WMState.patch 1979 AUX wmii-2_050802.patch 1015 RMD160 1733e59413d375b385de912d8f48f3a1f7d5776d SHA1 a72bc43b0a40dda12d74f5050f94a0ff63e76b1e SHA256 4b514fbee6e9042017cc5259ef3c4d100ee9040cb55b5dddda26d3c97ff749a7 MD5 ee68e1c5bc21e7124f02324bda993263 files/wmii-2_050802.patch 1015 RMD160 1733e59413d375b385de912d8f48f3a1f7d5776d files/wmii-2_050802.patch 1015 @@ -16,6 +20,10 @@ EBUILD wmii-2.ebuild 1729 RMD160 c0181af8f49a636997faf82c39f9fed860b13283 SHA1 3 MD5 c709bc63ce0487e857beba3a73b63a68 wmii-2.ebuild 1729 RMD160 c0181af8f49a636997faf82c39f9fed860b13283 wmii-2.ebuild 1729 SHA256 dc3f1ef6b93ca809360cbef086cb81a44e20f1f877bb3dca2e566d305065be75 wmii-2.ebuild 1729 +EBUILD wmii-20070116-r1.ebuild 1168 RMD160 d20fe0ce86c50f6d3db40ec87f5fd3154465e0dc SHA1 28e30a97cca3ae1c499a26bc327bb43f4f453453 SHA256 28a42bf005da9760324616e8119d4aeb091af0494d8ee53bf2b5ad6382b3e553 +MD5 3ed380afe4371acc4e448f003efbdcc4 wmii-20070116-r1.ebuild 1168 +RMD160 d20fe0ce86c50f6d3db40ec87f5fd3154465e0dc wmii-20070116-r1.ebuild 1168 +SHA256 28a42bf005da9760324616e8119d4aeb091af0494d8ee53bf2b5ad6382b3e553 wmii-20070116-r1.ebuild 1168 EBUILD wmii-20070116.ebuild 1116 RMD160 ea2ca4082f06abc3338c8fea731d63aa9b0cef35 SHA1 1370d59ff0fd1a4a9840981de6eb76f8906dc812 SHA256 eb979495959199cc012ca351e268afb6afebe2c94634cef35440645f9ca487b9 MD5 5c1984806e99832ece9ea2480cd12fd6 wmii-20070116.ebuild 1116 RMD160 ea2ca4082f06abc3338c8fea731d63aa9b0cef35 wmii-20070116.ebuild 1116 @@ -24,10 +32,10 @@ EBUILD wmii-3.5.1.ebuild 1094 RMD160 7286fe3f56b06e8a1beb90b0157c8c52f5aae7f2 SH MD5 e3884ecee6f3b6b5a6c225af47856475 wmii-3.5.1.ebuild 1094 RMD160 7286fe3f56b06e8a1beb90b0157c8c52f5aae7f2 wmii-3.5.1.ebuild 1094 SHA256 8164bcfe55392af509cbf2471b32b8c31c6dc55c8c4419723ec4f494090d4cab wmii-3.5.1.ebuild 1094 -MISC ChangeLog 2552 RMD160 2da61a0c7ea68f4d8bd871a2982a6eabee5d2cd2 SHA1 cc27fdb445c6fae2c441fa035a85ad95be3d1c3a SHA256 09a6ef142c8e625d43ef88b08436d390831c85b66154fca97914bb6e24cec062 -MD5 7c4310a921956c49e386ae48ab57dc9b ChangeLog 2552 -RMD160 2da61a0c7ea68f4d8bd871a2982a6eabee5d2cd2 ChangeLog 2552 -SHA256 09a6ef142c8e625d43ef88b08436d390831c85b66154fca97914bb6e24cec062 ChangeLog 2552 +MISC ChangeLog 2770 RMD160 6bfcb16388d64aa767f2b4582df3424b25a7c2e4 SHA1 db7ea0ce5a6b967be613464f32e405e0eb708535 SHA256 d721b1be5160fa14a478f4c779b48faa79393d378978e56028fea4166d032dbc +MD5 019d8d43e5256884cc9e532e971cbce2 ChangeLog 2770 +RMD160 6bfcb16388d64aa767f2b4582df3424b25a7c2e4 ChangeLog 2770 +SHA256 d721b1be5160fa14a478f4c779b48faa79393d378978e56028fea4166d032dbc ChangeLog 2770 MISC metadata.xml 694 RMD160 e87d8b4bc25a7a7f90bd31f56b7f3276b2449bd0 SHA1 7b97d946a5538f2ba73e652dc60a2994714c5382 SHA256 5a59ed4f579bee8cf8973150ec17e51a44dc3013a00d7846d5a6d0b570e95689 MD5 a707a751ad8e47a1e4651414f9f64c54 metadata.xml 694 RMD160 e87d8b4bc25a7a7f90bd31f56b7f3276b2449bd0 metadata.xml 694 @@ -38,13 +46,16 @@ SHA256 886a1da58613bcdf0877695776f59fa5cece12d820c130ab4fca80e45a1c4d22 files/di MD5 89365f3b6f96c4713085b4e2ac93d772 files/digest-wmii-20070116 238 RMD160 ff1e09daf3552ee796c91dbd0d1b283578b11989 files/digest-wmii-20070116 238 SHA256 f02541b68b69164d69b891f75dd513a9ae88fc099e3b16d9feaa6dd648a13275 files/digest-wmii-20070116 238 +MD5 89365f3b6f96c4713085b4e2ac93d772 files/digest-wmii-20070116-r1 238 +RMD160 ff1e09daf3552ee796c91dbd0d1b283578b11989 files/digest-wmii-20070116-r1 238 +SHA256 f02541b68b69164d69b891f75dd513a9ae88fc099e3b16d9feaa6dd648a13275 files/digest-wmii-20070116-r1 238 MD5 0d077a459dc376a0a8b4327bb7466fa2 files/digest-wmii-3.5.1 229 RMD160 64e376cc2b40fa92d03665eeb6c1a4bea5d57e7c files/digest-wmii-3.5.1 229 SHA256 31f6d725c2af8c6fda7d56cc6b7318baf80bc4cadf52711eb15e325e753ac438 files/digest-wmii-3.5.1 229 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFvu+7vSApE0uP4UsRAmwGAJ9Ji5e9oh8MkRLvkt5t7QcWXRUjnwCeO7mm -XvvuFkiKPNw14GxVcIQRz30= -=PX0/ +iD8DBQFFv9ALvSApE0uP4UsRAkD/AKCPFcoxSh/ewoxrUY8ItWSlsLGqFwCfZWvQ +Mk1ApaaHG1FlYXhGz6dTMpg= +=wrOe -----END PGP SIGNATURE----- diff --git a/x11-wm/wmii/files/digest-wmii-20070116-r1 b/x11-wm/wmii/files/digest-wmii-20070116-r1 new file mode 100644 index 000000000000..254c5338efbd --- /dev/null +++ b/x11-wm/wmii/files/digest-wmii-20070116-r1 @@ -0,0 +1,3 @@ +MD5 47ee52f434bb2921124da2773deabc7a wmii-20070116.tar.gz 41957 +RMD160 f7d1607e66ff9d8a6de4f93638a724331d772f9e wmii-20070116.tar.gz 41957 +SHA256 5f28c93b7dc3cc4bdecc4fe3f180b00da8739ac65fd1f1c9ec560f43c7cfbe14 wmii-20070116.tar.gz 41957 diff --git a/x11-wm/wmii/files/wmii-20070116-WMState.patch b/x11-wm/wmii/files/wmii-20070116-WMState.patch new file mode 100644 index 000000000000..48def7cdcc03 --- /dev/null +++ b/x11-wm/wmii/files/wmii-20070116-WMState.patch @@ -0,0 +1,60 @@ +diff -uN wmii-3.5.1.old/client.c wmii-3.5.1/client.c +--- wmii-3.5.1.old/client.c 2007-01-30 14:49:04.000000000 -0800 ++++ wmii-3.5.1/client.c 2007-01-30 14:54:05.000000000 -0800 +@@ -125,6 +125,14 @@ + } + + void ++set_client_state(Client * c, int state) ++{ ++ long data[] = { state, None }; ++ XChangeProperty(blz.dpy, c->win, wm_atom[WMState], wm_atom[WMState], 32, ++ PropModeReplace, (unsigned char *) data, 2); ++} ++ ++void + update_client_grab(Client *c, Bool is_sel) { + if(is_sel) { + ungrab_mouse(c->framewin, AnyModifier, AnyButton); +@@ -187,7 +195,8 @@ + map_client(Client *c) { + XSelectInput(blz.dpy, c->win, CLIENT_MASK & ~StructureNotifyMask); + XMapWindow(blz.dpy, c->win); +- XSelectInput(blz.dpy, c->win, CLIENT_MASK); ++ XSelectInput(blz.dpy, c->win, CLIENT_MASK); ++ set_client_state(c, NormalState); + } + + void +@@ -195,6 +204,7 @@ + XSelectInput(blz.dpy, c->win, CLIENT_MASK & ~StructureNotifyMask); + XUnmapWindow(blz.dpy, c->win); + XSelectInput(blz.dpy, c->win, CLIENT_MASK); ++ set_client_state(c, WithdrawnState); + } + + void +diff -uN wmii-3.5.1.old/main.c wmii-3.5.1/main.c +--- wmii-3.5.1.old/main.c 2007-01-30 14:49:04.000000000 -0800 ++++ wmii-3.5.1/main.c 2007-01-30 14:54:05.000000000 -0800 +@@ -91,6 +91,7 @@ + + static void + init_atoms() { ++ wm_atom[WMState] = XInternAtom(blz.dpy, "WM_STATE", False); + wm_atom[WMProtocols] = XInternAtom(blz.dpy, "WM_PROTOCOLS", False); + wm_atom[WMDelete] = XInternAtom(blz.dpy, "WM_DELETE_WINDOW", False); + net_atom[NetSupported] = XInternAtom(blz.dpy, "_NET_SUPPORTED", False); +Common subdirectories: wmii-3.5.1.old/rc and wmii-3.5.1/rc +diff -uN wmii-3.5.1.old/wmii.h wmii-3.5.1/wmii.h +--- wmii-3.5.1.old/wmii.h 2007-01-30 14:49:04.000000000 -0800 ++++ wmii-3.5.1/wmii.h 2007-01-30 14:54:05.000000000 -0800 +@@ -67,7 +67,7 @@ + }; + + /* WM atoms */ +-enum { WMProtocols, WMDelete, WMLast }; ++enum { WMState, WMProtocols, WMDelete, WMLast }; + + /* NET atoms */ + enum { NetSupported, NetWMName, NetLast }; diff --git a/x11-wm/wmii/wmii-20070116-r1.ebuild b/x11-wm/wmii/wmii-20070116-r1.ebuild new file mode 100644 index 000000000000..f5a1fff89a4b --- /dev/null +++ b/x11-wm/wmii/wmii-20070116-r1.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmii/wmii-20070116-r1.ebuild,v 1.1 2007/01/30 23:08:01 omp Exp $ + +inherit eutils toolchain-funcs + +DESCRIPTION="A dynamic window manager for X11" +HOMEPAGE="http://wmii.suckless.org/" +SRC_URI="http://suckless.org/snaps/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~ppc64 ~x86" +IUSE="" + +DEPEND="sys-libs/libixp + x11-libs/libX11" +RDEPEND="${DEPEND} + x11-misc/dmenu" + +S=${WORKDIR}/${PN}-3.5.1 + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}/${P}-WMState.patch" + + sed -i \ + -e "/^PREFIX/s|=.*|= /usr|" \ + -e "/^CONFPREFIX/s|=.*|= /etc|" \ + -e "/^X11INC/s|=.*|= /usr/include|" \ + -e "/^X11LIB/s|=.*|= /usr/lib|" \ + -e "/^CFLAGS/s|= -Os|+=|" \ + -e "/^LDFLAGS/s|=|+=|" \ + -e "/^CC/s|=.*|= $(tc-getCC)|" \ + config.mk || die "sed failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc LICENSE + + echo -e "#!/bin/sh\n/usr/bin/wmii" > "${T}/${PN}" + exeinto /etc/X11/Sessions + doexe "${T}/${PN}" + + insinto /usr/share/xsessions + doins "${FILESDIR}/${PN}.desktop" +}