From upstream git:

- Various bugfixes to Lua code. - Fix a bug causing building with cmake 2.8.4 to fail (remove double slashes from icon path names).
2011-03-13 18:07:23 +00:00 · 2011-03-13 18:07:23 +00:00 · 4a237d064c
commit 4a237d064c
parent 85d68d9b20
8 changed files with 122 additions and 18 deletions
--- a/x11/awesome/Makefile
+++ b/x11/awesome/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.31 2011/01/20 21:17:15 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.32 2011/03/13 18:07:23 dcoppa Exp $

 COMMENT=		fast, small, dynamic and awesome window manager

 DISTNAME=		awesome-3.4.9
-REVISION=		1
+REVISION=		2
 EXTRACT_SUFX=		.tar.bz2
 CATEGORIES=		x11

@ -62,7 +62,9 @@ USE_GROFF =		Yes
 NO_REGRESS=		Yes

 pre-install:
-	@rm -f ${WRKDIST}/lib/awful/util.lua.in.orig
+	@rm -f ${WRKDIST}/lib/*.lua.in.orig \
+		${WRKDIST}/lib/awful/*.lua.in.orig \
+		${WRKDIST}/lib/awful/widget/*.lua.in.orig

 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/awesome
--- a/x11/awesome/patches/patch-CMakeLists_txt
+++ b/x11/awesome/patches/patch-CMakeLists_txt
@ -1,6 +1,6 @@
-$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
+$OpenBSD: patch-CMakeLists_txt,v 1.7 2011/03/13 18:07:23 dcoppa Exp $
+--- CMakeLists.txt.orig	Mon Jan 17 12:38:13 2011
+++ CMakeLists.txt	Wed Mar  9 13:44:50 2011
@@ -215,7 +215,7 @@ if(GENERATE_MANPAGES)
                 DEPENDS ${txtfile}
                 VERBATIM)
@ -10,3 +10,20 @@ $OpenBSD: patch-CMakeLists_txt,v 1.6 2011/01/19 12:41:08 dcoppa Exp $
                 OUTPUT  ${manfile}
                 WORKING_DIRECTORY ${BUILD_DIR}/${relpath2}
                 DEPENDS ${xmlfile})
+@@ -274,14 +274,15 @@ endif()
+ 
+ # {{{ Theme icons
+ file(GLOB icon_sources RELATIVE ${SOURCE_DIR} ${SOURCE_DIR}/themes/*/titlebar/*.png)
+-set(ALL_ICONS ${icon_sources})
+ 
+ foreach(icon ${icon_sources})
+     # Copy all icons to the build dir to simplify the following code.
+     # Source paths are interpreted relative to ${SOURCE_DIR}, target paths
+     # relative to ${BUILD_DIR}.
+     get_filename_component(icon_path ${icon} PATH)
+    get_filename_component(icon_name ${icon} NAME)
+     file(COPY ${icon} DESTINATION ${icon_path})
+    set(ALL_ICONS ${ALL_ICONS} "${icon_path}/${icon_name}")
+ endforeach()
+ 
+ macro(a_icon_convert match replacement input)
--- a/x11/awesome/patches/patch-awesome_c
+++ b/x11/awesome/patches/patch-awesome_c
@ -1,12 +0,0 @@
-$OpenBSD: patch-awesome_c,v 1.1 2011/01/20 21:17:15 dcoppa Exp $
--- awesome.c.orig	Thu Jan 20 19:35:55 2011
-+++ awesome.c	Thu Jan 20 19:36:44 2011
-@@ -339,7 +339,7 @@ main(int argc, char **argv)
-     luaA_init(&xdg);
- 
-     /* check args */
-    while((opt = getopt_long(argc, argv, "vhkc:",
-+    while((opt = getopt_long(argc, argv, "vhkc:a",
-                              long_options, NULL)) != -1)
-         switch(opt)
-         {
--- a/x11/awesome/patches/patch-lib_awful_autofocus_lua_in
+++ b/x11/awesome/patches/patch-lib_awful_autofocus_lua_in
@ -0,0 +1,36 @@
+$OpenBSD: patch-lib_awful_autofocus_lua_in,v 1.1 2011/03/13 18:07:23 dcoppa Exp $
+--- lib/awful/autofocus.lua.in.orig	Thu Mar 10 17:01:25 2011
+++ lib/awful/autofocus.lua.in	Thu Mar 10 17:08:21 2011
+@@ -13,19 +13,28 @@ local atag = require("awful.tag")
+ -- on event such as tag switching, client unmanaging, etc.
+ module("awful.autofocus")
+ 
+--- Give focus on tag selection change.
+-- Give focus when clients appear/disappear.
+ -- @param obj An object that should have a .screen property.
+ local function check_focus(obj)
+    -- When no visible client has the focus...
+     if not client.focus or not client.focus:isvisible() then
+         local c = aclient.focus.history.get(obj.screen, 0)
+         if c then client.focus = c end
+-    elseif client.focus and client.focus.screen ~= obj.screen then
+-        local c = aclient.focus.history.get(obj.screen, 0)
+    end
+end
+
+-- Give focus on tag selection change.
+-- @param obj An object that should have a .screen property.
+local function check_focus_screen(obj)
+    check_focus(obj)
+    if client.focus and client.focus.screen ~= obj.screen then
+        local c = nil
+        c = aclient.focus.history.get(obj.screen, 0)
+         if c then client.focus = c end
+     end
+ end
+ 
+-atag.attached_add_signal(nil, "property::selected", check_focus)
+atag.attached_add_signal(nil, "property::selected", check_focus_screen)
+ client.add_signal("unmanage", check_focus)
+ client.add_signal("new", function(c)
+     c:add_signal("untagged", check_focus)
--- a/x11/awesome/patches/patch-lib_awful_client_lua_in
+++ b/x11/awesome/patches/patch-lib_awful_client_lua_in
@ -0,0 +1,14 @@
+$OpenBSD: patch-lib_awful_client_lua_in,v 1.1 2011/03/13 18:07:23 dcoppa Exp $
+--- lib/awful/client.lua.in.orig	Thu Mar 10 17:14:47 2011
+++ lib/awful/client.lua.in	Thu Mar 10 17:16:29 2011
+@@ -627,8 +627,8 @@ end
+ function floating.toggle(c)
+     local c = c or capi.client.focus
+     -- If it has been set to floating
+-    if property.get(c, "floating") then
+-        floating.set(c, nil)
+    if floating.get(c) then
+        floating.set(c, false)
+     else
+         floating.set(c, true)
+     end
--- a/x11/awesome/patches/patch-lib_awful_placement_lua_in
+++ b/x11/awesome/patches/patch-lib_awful_placement_lua_in
@ -0,0 +1,24 @@
+$OpenBSD: patch-lib_awful_placement_lua_in,v 1.1 2011/03/13 18:07:23 dcoppa Exp $
+--- lib/awful/placement.lua.in.orig	Mon Jan 17 12:38:13 2011
+++ lib/awful/placement.lua.in	Thu Mar 10 17:23:35 2011
+@@ -145,10 +145,19 @@ function no_overlap(c)
+            and r.width * r.height > new.width * new.height then
+             found = true
+             new = r
+            -- Check if the client's current position is available
+            -- and prefer that one (why move it around pointlessly?)
+            if     geometry.x >= r.x
+               and geometry.y >= r.y
+               and geometry.x + geometry.width <= r.x + r.width
+               and geometry.y + geometry.height <= r.y + r.height then
+                new.x = geometry.x
+                new.y = geometry.y
+            end
+         end
+     end
+ 
+-    -- We did not foudn an area with enough space for our size:
+    -- We did not find an area with enough space for our size:
+     -- just take the biggest available one and go in
+     if not found then
+         for i, r in ipairs(areas) do
--- a/x11/awesome/patches/patch-lib_awful_widget_tasklist_lua_in
+++ b/x11/awesome/patches/patch-lib_awful_widget_tasklist_lua_in
@ -0,0 +1,11 @@
+$OpenBSD: patch-lib_awful_widget_tasklist_lua_in,v 1.1 2011/03/13 18:07:23 dcoppa Exp $
+--- lib/awful/widget/tasklist.lua.in.orig	Mon Jan 17 12:38:13 2011
+++ lib/awful/widget/tasklist.lua.in	Thu Mar 10 20:09:39 2011
+@@ -65,6 +65,7 @@ function new(label, buttons)
+         c:add_signal("property::floating", u)
+         c:add_signal("property::maximized_horizontal", u)
+         c:add_signal("property::maximized_vertical", u)
+        c:add_signal("property::minimized", u)
+         c:add_signal("property::name", u)
+         c:add_signal("property::icon_name", u)
+         c:add_signal("property::icon", u)
--- a/x11/awesome/patches/patch-lib_naughty_lua_in
+++ b/x11/awesome/patches/patch-lib_naughty_lua_in
@ -0,0 +1,12 @@
+$OpenBSD: patch-lib_naughty_lua_in,v 1.1 2011/03/13 18:07:23 dcoppa Exp $
+--- lib/naughty.lua.in.orig	Thu Mar 10 17:13:27 2011
+++ lib/naughty.lua.in	Thu Mar 10 17:14:36 2011
+@@ -462,7 +462,7 @@ end
+ -- Notify
+ if capi.dbus then
+     capi.dbus.add_signal("org.freedesktop.Notifications", function (data, appname, replaces_id, icon, title, text, actions, hints, expire)
+-    args = { preset = { } }
+    args = { preset = config.default_preset }
+     if data.member == "Notify" then
+         if text ~= "" then
+             args.text = text