Bugfixing update to awesome 3.4.12 (codename "Starlight")

x11/awesome/Makefile

@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.47 2012/05/28 14:14:05 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.48 2012/06/19 11:18:53 dcoppa Exp $
 
 COMMENT=		highly configurable framework window manager
 
-DISTNAME=		awesome-3.4.11
-REVISION=		3
+DISTNAME=		awesome-3.4.12
 EXTRACT_SUFX=		.tar.xz
 CATEGORIES=		x11
 

x11/awesome/distinfo

@@ -1,5 +1,5 @@
-MD5 (awesome-3.4.11.tar.xz) = 1qpxM0tc1O9jzmnWxhLs8g==
-RMD160 (awesome-3.4.11.tar.xz) = qe5UE/Cxh3ntYqP7astf+hRQGnw=
-SHA1 (awesome-3.4.11.tar.xz) = E0F4o87QZan+e7m4zCySVtHA8XI=
-SHA256 (awesome-3.4.11.tar.xz) = V2tPbSw/Vt++Uq2S8u7OzhEfDwWBbjISbNA9S0OHdh0=
-SIZE (awesome-3.4.11.tar.xz) = 717440
+MD5 (awesome-3.4.12.tar.xz) = LDSQuCChnARCkAJ+by62yA==
+RMD160 (awesome-3.4.12.tar.xz) = Y6bGX8QKZ31fkUkB/EYydBFYOIk=
+SHA1 (awesome-3.4.12.tar.xz) = MK3TFMxzzU0DJLVtnaYmpwygq5Q=
+SHA256 (awesome-3.4.12.tar.xz) = lN5gey1i4RpFtxxOfTrEPcrPut/b5LmmsaOqee0NfAM=
+SIZE (awesome-3.4.12.tar.xz) = 723780

x11/awesome/patches/patch-CMakeLists_txt

@@ -1,4 +1,4 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.12 2011/11/30 11:50:58 dcoppa Exp $
+$OpenBSD: patch-CMakeLists_txt,v 1.13 2012/06/19 11:18:53 dcoppa Exp $
 
 These auto-generated (db2man.xsl) manpages contain a mixture of ISO
 latin-1 characters and numerical HTML entities that neither mandoc
@@ -10,7 +10,7 @@ nor groff can fully understand: do not install them.
      ${SOURCE_DIR}/manpages/awsetbg.1.txt
      ${SOURCE_DIR}/manpages/awesome-client.1.txt
      ${SOURCE_DIR}/manpages/awesomerc.5.txt)
--set(AWE_MAN_LANGS es fr de ru)
+-set(AWE_MAN_LANGS it es fr de ru)
  
  add_executable(${PROJECT_AWE_NAME}
      ${AWE_SRCS}

x11/awesome/patches/patch-lib_beautiful_lua_in

@@ -1,38 +0,0 @@
-$OpenBSD: patch-lib_beautiful_lua_in,v 1.1 2011/12/05 16:12:01 dcoppa Exp $
-
-Beautiful: handle invalid wallpaper_cmd better (FS#941)
-(upstream git commit d3021e67729a01e891c8eb04a8afd696fb63b0ce)
-
---- lib/beautiful.lua.in.orig	Wed Nov 23 15:08:50 2011
-+++ lib/beautiful.lua.in	Mon Dec  5 16:59:39 2011
-@@ -29,11 +29,11 @@ module("beautiful")
- -- Local data
- local theme
- 
--local wallpaper = {}
- -- Checks the entries in the wallpaper_cmd are valid.
- -- @param tw A table with wallpaper commands.
---- @return False if tw length is zero or if any entries in tw are not strings.
--function wallpaper.is_valid(tw)
-+-- @return False if there is no way that this can be a valid wallpaper cmd.
-+local function wallpaper_is_valid(tw)
-+    if type(tw) ~= 'table' then return false end
-     for _, v in pairs(tw) do
-         if type(v) ~= 'string' then return false end
-     end
-@@ -60,9 +60,14 @@ function init(path)
-             end
- 
-             -- setup wallpaper
--            if wallpaper.is_valid(theme.wallpaper_cmd) then
-+            if wallpaper_is_valid(theme.wallpaper_cmd) then
-                 for s = 1, capi.screen.count() do
-                     util.spawn(theme.wallpaper_cmd[util.cycle(#theme.wallpaper_cmd, s)], false, s)
-+                end
-+            else
-+                if theme.wallpaper_cmd then
-+                    -- There is a wallpaper_cmd, but wallpaper_is_valid doesn't like it
-+                    print("W: beautiful: invalid wallpaper_cmd in theme file " .. path)
-                 end
-             end
-             if theme.font then capi.awesome.font = theme.font end

x11/awesome/patches/patch-spawn_c

@@ -1,15 +0,0 @@
-$OpenBSD: patch-spawn_c,v 1.1 2012/03/23 13:28:25 ajacoutot Exp $
-
-error: #error "Only <glib.h> can be included directly."
-
---- spawn.c.orig	Mon Mar 19 06:58:06 2012
-+++ spawn.c	Mon Mar 19 06:58:18 2012
-@@ -24,7 +24,7 @@
- #include <sys/types.h>
- #include <sys/wait.h>
- 
--#include <glib/gspawn.h>
-+#include <glib.h>
- 
- #include "spawn.h"
- #include "screen.h"

x11/awesome/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.12 2011/05/17 14:03:30 dcoppa Exp $
+@comment $OpenBSD: PLIST,v 1.13 2012/06/19 11:18:53 dcoppa Exp $
 @bin bin/awesome
 bin/awesome-client
 bin/awsetbg
@@ -126,12 +126,14 @@ share/awesome/themes/default/titlebar/sticky_normal_inactive.png
 share/awesome/themes/sky/
 share/awesome/themes/sky/awesome-icon.png
 share/awesome/themes/sky/layouts/
+share/awesome/themes/sky/layouts/dwindle.png
 share/awesome/themes/sky/layouts/fairh.png
 share/awesome/themes/sky/layouts/fairv.png
 share/awesome/themes/sky/layouts/floating.png
 share/awesome/themes/sky/layouts/fullscreen.png
 share/awesome/themes/sky/layouts/magnifier.png
 share/awesome/themes/sky/layouts/max.png
+share/awesome/themes/sky/layouts/spiral.png
 share/awesome/themes/sky/layouts/tile.png
 share/awesome/themes/sky/layouts/tilebottom.png
 share/awesome/themes/sky/layouts/tileleft.png