cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

re-add "--skip-validation" to xmlto command line, erroneously removed

Browse Source 
in previous commit.

fix a bug where untagging causes the client to lose the input focus
(from upstream git).
This commit is contained in:
dcoppa 2011-01-19 12:41:08 +00:00
parent a9cbc0fcd2
commit 689d47fb90
4 changed files with 76 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
x11/awesome/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.29 2011/01/17 13:23:06 dcoppa Exp $ # $OpenBSD: Makefile,v 1.30 2011/01/19 12:41:08 dcoppa Exp $
COMMENT= fast, small, dynamic and awesome window manager COMMENT= fast, small, dynamic and awesome window manager
DISTNAME= awesome-3.4.9 DISTNAME= awesome-3.4.9
REVISION= 0
EXTRACT_SUFX= .tar.bz2 EXTRACT_SUFX= .tar.bz2
CATEGORIES= x11 CATEGORIES= x11

12
x11/awesome/patches/patch-CMakeLists_txt Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-CMakeLists_txt,v 1.6 2011/01/19 12:41:08 dcoppa Exp $
--- CMakeLists.txt.orig Wed Jan 19 13:24:14 2011
+++ CMakeLists.txt Wed Jan 19 13:24:42 2011
@@ -215,7 +215,7 @@ if(GENERATE_MANPAGES)
DEPENDS ${txtfile}
VERBATIM)
add_custom_command(
- COMMAND ${XMLTO_EXECUTABLE} man ${xmlfile}
+ COMMAND ${XMLTO_EXECUTABLE} --skip-validation man ${xmlfile}
OUTPUT ${manfile}
WORKING_DIRECTORY ${BUILD_DIR}/${relpath2}
DEPENDS ${xmlfile})

31
x11/awesome/patches/patch-client_c Normal file
View File

@ -0,0 +1,31 @@
$OpenBSD: patch-client_c,v 1.1 2011/01/19 12:41:08 dcoppa Exp $
--- client.c.orig Mon Jan 17 12:38:13 2011
+++ client.c Wed Jan 19 13:11:47 2011
@@ -1551,7 +1551,26 @@ luaA_client_tags(lua_State *L)
{
luaA_checktable(L, 2);
for(int i = 0; i < tags->len; i++)
- untag_client(c, tags->tab[i]);
+ {
+ /* Only untag if we aren't going to add this tag again */
+ bool found = false;
+ lua_pushnil(L);
+ while(lua_next(L, 2))
+ {
+ tag_t *t = lua_touserdata(L, -1);
+ /* Pop the value from lua_next */
+ lua_pop(L, 1);
+ if (t != tags->tab[i])
+ continue;
+
+ /* Pop the key from lua_next */
+ lua_pop(L, 1);
+ found = true;
+ break;
+ }
+ if(!found)
+ untag_client(c, tags->tab[i]);
+ }
lua_pushnil(L);
while(lua_next(L, 2))
tag_client(c);

31
x11/awesome/patches/patch-tag_c Normal file
View File

@ -0,0 +1,31 @@
$OpenBSD: patch-tag_c,v 1.1 2011/01/19 12:41:08 dcoppa Exp $
--- tag.c.orig Mon Jan 17 12:38:13 2011
+++ tag.c Wed Jan 19 13:11:52 2011
@@ -363,7 +363,26 @@ luaA_tag_clients(lua_State *L)
{
luaA_checktable(L, 2);
foreach(c, tag->clients)
- untag_client(*c, tag);
+ {
+ /* Only untag if we aren't going to add this tag again */
+ bool found = false;
+ lua_pushnil(L);
+ while(lua_next(L, 2))
+ {
+ client_t *tc = luaA_checkudata(L, -1, &client_class);
+ /* Pop the value from lua_next */
+ lua_pop(L, 1);
+ if (tc != *c)
+ continue;
+
+ /* Pop the key from lua_next */
+ lua_pop(L, 1);
+ found = true;
+ break;
+ }
+ if(!found)
+ untag_client(*c, tag);
+ }
lua_pushnil(L);
while(lua_next(L, 2))
{