Date: 8 Jan 2010 16:28:16 -0200 From: Renato Botelho <garga@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: ntarmos@cs.uoi.gr Subject: ports/142474: [PATCH] x11-wm/awesome: Use correct patch for FS#664 Message-ID: <20100108182816.60182.qmail@botelhor.bplab.local> Resent-Message-ID: <201001081830.o08IU3p1011224@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 142474 >Category: ports >Synopsis: [PATCH] x11-wm/awesome: Use correct patch for FS#664 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Jan 08 18:30:03 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Renato Botelho >Release: FreeBSD 9.0-CURRENT amd64 >Organization: FreeBSD.org >Environment: System: FreeBSD botelhor.bplab.local 9.0-CURRENT FreeBSD 9.0-CURRENT #1 r201734: Thu Jan 7 10:58:05 >Description: The patch was committed to fix a regression in 3.4 version as described in FS#664 is not correct, a new one was made that doesn't create problems for shifty users. Port maintainer (ntarmos@cs.uoi.gr) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- awesome-3.4.3_1.patch begins here --- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/x11-wm/awesome/Makefile,v retrieving revision 1.39 diff -u -u -r1.39 Makefile --- Makefile 7 Jan 2010 10:18:16 -0000 1.39 +++ Makefile 8 Jan 2010 18:26:21 -0000 @@ -7,6 +7,7 @@ PORTNAME= awesome PORTVERSION= 3.4.3 +PORTREVISION= 1 CATEGORIES= x11-wm MASTER_SITES= http://awesome.naquadah.org/download/ \ http://redundancy.redundancy.org/mirror/ Index: files/patch-lib__awful__rules.lua.in =================================================================== RCS file: /home/pcvs/ports/x11-wm/awesome/files/patch-lib__awful__rules.lua.in,v retrieving revision 1.1 diff -u -u -r1.1 patch-lib__awful__rules.lua.in --- files/patch-lib__awful__rules.lua.in 21 Dec 2009 10:36:53 -0000 1.1 +++ files/patch-lib__awful__rules.lua.in 8 Jan 2010 18:26:21 -0000 @@ -1,23 +1,30 @@ --- lib/awful/rules.lua.in +++ lib/awful/rules.lua.in -@@ -89,7 +89,9 @@ end - - --- Apply rules to a client. - -- @param c The client. --function apply(c) -+-- @param startup Executed at startup ? (optional, default is false) -+function apply(c, startup) -+ startup = startup or false - local props = {} - local callbacks = {} - for _, entry in ipairs(rules) do -@@ -129,6 +131,9 @@ function apply(c) - callback(c) +@@ -112,7 +112,7 @@ function apply(c) + if property == "floating" then + aclient.floating.set(c, value) + elseif property == "tag" then +- aclient.movetotag(value, c) ++ c:tags({ value }) + elseif property == "switchtotag" and value and props.tag then + atag.viewonly(props.tag) + elseif property == "height" or property == "width" or +@@ -127,6 +127,11 @@ function apply(c) + end end -+ -- Apply tags. -+ atag.withcurrent(c, startup) ++ -- If untagged, stick the client on the current one. ++ if #c:tags() == 0 then ++ atag.withcurrent(c, startup) ++ end + - -- Do this at last so we do not erase things done by the focus - -- signal. - if props.focus then + -- Apply all callbacks from matched rules. + for i, callback in pairs(callbacks) do + callback(c) +@@ -140,5 +145,6 @@ function apply(c) + end + + client.add_signal("manage", apply) ++client.remove_signal("manage", atag.withcurrent) + + -- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80 Index: files/patch-lib__awful__tag.lua.in =================================================================== RCS file: /home/pcvs/ports/x11-wm/awesome/files/patch-lib__awful__tag.lua.in,v retrieving revision 1.1 diff -u -u -r1.1 patch-lib__awful__tag.lua.in --- files/patch-lib__awful__tag.lua.in 21 Dec 2009 10:36:53 -0000 1.1 +++ files/patch-lib__awful__tag.lua.in 8 Jan 2010 18:26:21 -0000 @@ -1,6 +1,6 @@ --- lib/awful/tag.lua.in +++ lib/awful/tag.lua.in -@@ -374,7 +374,6 @@ capi.client.add_signal("manage", function(c, startup) +@@ -374,10 +374,11 @@ capi.client.add_signal("manage", function(c, startup) c.screen = capi.mouse.screen end end @@ -8,3 +8,8 @@ c:add_signal("property::screen", withcurrent) end) ++capi.client.add_signal("manage", withcurrent) ++ + for s = 1, capi.screen.count() do + capi.screen[s]:add_signal("tag::history::update", history.update) + end --- awesome-3.4.3_1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100108182816.60182.qmail>