From 4f3cc89f961ec72d5c60e6fe6bbff47b054597f2 Mon Sep 17 00:00:00 2001 From: degroote Date: Mon, 22 Jul 2013 19:47:18 +0000 Subject: Update awesome to 3.5.1 Lots of change since 3.4.13, in particular support for lua 5.2. For details changelot, see http://awesome.naquadah.org/changelogs/short/v3.5 --- wm/awesome/Makefile | 17 ++++++----- wm/awesome/PLIST | 45 ++++++++++++++++++---------- wm/awesome/distinfo | 11 ++++--- wm/awesome/patches/patch-awesomeConfig.cmake | 18 +++++------ wm/awesome/patches/patch-common_util.h | 18 ----------- 5 files changed, 54 insertions(+), 55 deletions(-) delete mode 100644 wm/awesome/patches/patch-common_util.h (limited to 'wm') diff --git a/wm/awesome/Makefile b/wm/awesome/Makefile index afa728c847d..49bb6d62760 100644 --- a/wm/awesome/Makefile +++ b/wm/awesome/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.42 2013/07/05 15:10:00 jperkin Exp $ +# $NetBSD: Makefile,v 1.43 2013/07/22 19:47:18 degroote Exp $ # -DISTNAME= awesome-3.4.13 -PKGREVISION= 11 +DISTNAME= awesome-3.5.1 CATEGORIES= x11 wm MASTER_SITES= http://awesome.naquadah.org/download/ EXTRACT_SUFX= .tar.xz @@ -25,8 +24,6 @@ CMAKE_ARGS+= -DSYSCONFDIR=${PKG_SYSCONFDIR:C/\/xdg\/awesome//} CMAKE_ARGS+= -DCOMPRESS_MANPAGES=${MANZ:Q} CMAKE_ARGS+= -DAWESOME_MAN_PATH=${PREFIX}/${PKGMANDIR} -REPLACE_BASH+= build-utils/gperf.sh - EGDIR= ${PREFIX}/share/examples/awesome CONF_FILES= ${EGDIR}/rc.lua ${PKG_SYSCONFDIR}/rc.lua @@ -47,15 +44,21 @@ BUILD_DEPENDS+= asciidoc>=8.3.0:../../textproc/asciidoc BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto BUILD_DEPENDS+= docbook-xml-[0-9]*:../../textproc/docbook-xml +DEPENDS+= lua-gi-[0-9]*:../../devel/lua-gi + LDFLAGS.SunOS+= -liconv .include "../../converters/libiconv/buildlink3.mk" -.include "../../devel/gperf/buildlink3.mk" +.include "../../devel/glib2/buildlink3.mk" .include "../../devel/libev/buildlink3.mk" +.include "../../graphics/cairo/buildlink3.mk" +.include "../../graphics/gdk-pixbuf2/buildlink3.mk" .include "../../graphics/imlib2/buildlink3.mk" .include "../../lang/lua/buildlink3.mk" -.include "../../devel/pango/buildlink3.mk" +.include "../../x11/libX11/buildlink3.mk" +.include "../../x11/libxcb/buildlink3.mk" .include "../../x11/libxdg-basedir/buildlink3.mk" +.include "../../x11/libXcursor/buildlink3.mk" .include "../../x11/xcb-util/buildlink3.mk" .include "../../x11/xcb-util-image/buildlink3.mk" .include "../../x11/xcb-util-keysyms/buildlink3.mk" diff --git a/wm/awesome/PLIST b/wm/awesome/PLIST index 904b32481fc..c9561bc447d 100644 --- a/wm/awesome/PLIST +++ b/wm/awesome/PLIST @@ -1,30 +1,23 @@ -@comment $NetBSD: PLIST,v 1.6 2012/08/27 10:12:30 wiz Exp $ +@comment $NetBSD: PLIST,v 1.7 2013/07/22 19:47:18 degroote Exp $ bin/awesome bin/awesome-client -bin/awsetbg man/de/man1/awesome-client.1 man/de/man1/awesome.1 -man/de/man1/awsetbg.1 man/de/man5/awesomerc.5 man/es/man1/awesome-client.1 man/es/man1/awesome.1 -man/es/man1/awsetbg.1 man/es/man5/awesomerc.5 man/fr/man1/awesome-client.1 man/fr/man1/awesome.1 -man/fr/man1/awsetbg.1 man/fr/man5/awesomerc.5 man/it/man1/awesome-client.1 man/it/man1/awesome.1 -man/it/man1/awsetbg.1 man/it/man5/awesomerc.5 man/man1/awesome-client.1 man/man1/awesome.1 -man/man1/awsetbg.1 man/man5/awesomerc.5 man/ru/man1/awesome-client.1 man/ru/man1/awesome.1 -man/ru/man1/awsetbg.1 man/ru/man5/awesomerc.5 share/awesome/icons/awesome16.png share/awesome/icons/awesome32.png @@ -35,9 +28,10 @@ share/awesome/lib/awful/button.lua share/awesome/lib/awful/client.lua share/awesome/lib/awful/completion.lua share/awesome/lib/awful/dbus.lua -share/awesome/lib/awful/hooks.lua +share/awesome/lib/awful/ewmh.lua share/awesome/lib/awful/init.lua share/awesome/lib/awful/key.lua +share/awesome/lib/awful/keygrabber.lua share/awesome/lib/awful/layout/init.lua share/awesome/lib/awful/layout/suit/fair.lua share/awesome/lib/awful/layout/suit/floating.lua @@ -65,10 +59,6 @@ share/awesome/lib/awful/widget/common.lua share/awesome/lib/awful/widget/graph.lua share/awesome/lib/awful/widget/init.lua share/awesome/lib/awful/widget/launcher.lua -share/awesome/lib/awful/widget/layout/default.lua -share/awesome/lib/awful/widget/layout/horizontal.lua -share/awesome/lib/awful/widget/layout/init.lua -share/awesome/lib/awful/widget/layout/vertical.lua share/awesome/lib/awful/widget/layoutbox.lua share/awesome/lib/awful/widget/progressbar.lua share/awesome/lib/awful/widget/prompt.lua @@ -76,7 +66,34 @@ share/awesome/lib/awful/widget/taglist.lua share/awesome/lib/awful/widget/tasklist.lua share/awesome/lib/awful/widget/textclock.lua share/awesome/lib/beautiful.lua +share/awesome/lib/gears/color.lua +share/awesome/lib/gears/debug.lua +share/awesome/lib/gears/init.lua +share/awesome/lib/gears/object.lua +share/awesome/lib/gears/sort.lua +share/awesome/lib/gears/surface.lua +share/awesome/lib/gears/wallpaper.lua +share/awesome/lib/menubar/init.lua +share/awesome/lib/menubar/menu_gen.lua +share/awesome/lib/menubar/utils.lua share/awesome/lib/naughty.lua +share/awesome/lib/wibox/drawable.lua +share/awesome/lib/wibox/init.lua +share/awesome/lib/wibox/layout/align.lua +share/awesome/lib/wibox/layout/base.lua +share/awesome/lib/wibox/layout/constraint.lua +share/awesome/lib/wibox/layout/fixed.lua +share/awesome/lib/wibox/layout/flex.lua +share/awesome/lib/wibox/layout/init.lua +share/awesome/lib/wibox/layout/margin.lua +share/awesome/lib/wibox/layout/mirror.lua +share/awesome/lib/wibox/layout/rotate.lua +share/awesome/lib/wibox/widget/background.lua +share/awesome/lib/wibox/widget/base.lua +share/awesome/lib/wibox/widget/imagebox.lua +share/awesome/lib/wibox/widget/init.lua +share/awesome/lib/wibox/widget/systray.lua +share/awesome/lib/wibox/widget/textbox.lua share/awesome/themes/default/README share/awesome/themes/default/background.png share/awesome/themes/default/background_white.png @@ -107,8 +124,6 @@ share/awesome/themes/default/layouts/tilew.png share/awesome/themes/default/submenu.png share/awesome/themes/default/taglist/squarefw.png share/awesome/themes/default/taglist/squarew.png -share/awesome/themes/default/tasklist/floating.png -share/awesome/themes/default/tasklist/floatingw.png share/awesome/themes/default/theme.lua share/awesome/themes/default/titlebar/close_focus.png share/awesome/themes/default/titlebar/close_normal.png diff --git a/wm/awesome/distinfo b/wm/awesome/distinfo index 16daf399c6f..8ba38aaec72 100644 --- a/wm/awesome/distinfo +++ b/wm/awesome/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.11 2012/08/31 09:26:28 marino Exp $ +$NetBSD: distinfo,v 1.12 2013/07/22 19:47:18 degroote Exp $ -SHA1 (awesome-3.4.13.tar.xz) = 6127ba6048cb538b6c318d1f5d9926fa067492c1 -RMD160 (awesome-3.4.13.tar.xz) = 2cb4545c91d2310bd82a293cbc5b3e5b13868b58 -Size (awesome-3.4.13.tar.xz) = 722876 bytes -SHA1 (patch-awesomeConfig.cmake) = ce48651d804fb8b277c33aed94861219acc1bc73 -SHA1 (patch-common_util.h) = 28af19f75c3e688f86742ee5cdeda4fe93973319 +SHA1 (awesome-3.5.1.tar.xz) = 8bca01550298905b975ccaadcc8de5a5c333b271 +RMD160 (awesome-3.5.1.tar.xz) = 480f6d56a192d5ea6e72d6576d47f5805182c725 +Size (awesome-3.5.1.tar.xz) = 714320 bytes +SHA1 (patch-awesomeConfig.cmake) = fed6a47e127b6a2d688deadaabb7805730e08ed8 diff --git a/wm/awesome/patches/patch-awesomeConfig.cmake b/wm/awesome/patches/patch-awesomeConfig.cmake index 77c8e47204b..7fb86913c5c 100644 --- a/wm/awesome/patches/patch-awesomeConfig.cmake +++ b/wm/awesome/patches/patch-awesomeConfig.cmake @@ -1,17 +1,17 @@ -$NetBSD: patch-awesomeConfig.cmake,v 1.1 2012/08/26 20:28:17 is Exp $ +$NetBSD: patch-awesomeConfig.cmake,v 1.2 2013/07/22 19:47:18 degroote Exp $ ---- awesomeConfig.cmake.orig 2011-01-17 11:38:13.000000000 +0000 -+++ awesomeConfig.cmake -@@ -16,7 +16,7 @@ option(COMPRESS_MANPAGES "compress manpa - option(GENERATE_LUADOC "generate luadoc" ON) +--- awesomeConfig.cmake.orig 2013-04-01 11:44:46.000000000 +0000 ++++ awesomeConfig.cmake 2013-07-21 21:05:57.000000000 +0000 +@@ -16,7 +16,7 @@ + option(GENERATE_DOC "generate API documentation" ON) # {{{ CFLAGS --add_definitions(-std=gnu99 -ggdb3 -fno-strict-aliasing -Wall -Wextra -+add_definitions(-std=gnu99 -fno-strict-aliasing -Wall -Wextra +-add_definitions(-O1 -std=gnu99 -ggdb3 -rdynamic -fno-strict-aliasing -Wall -Wextra ++add_definitions(-O1 -std=gnu99 -rdynamic -fno-strict-aliasing -Wall -Wextra -Wchar-subscripts -Wundef -Wshadow -Wcast-align -Wwrite-strings -Wsign-compare -Wunused -Wno-unused-parameter -Wuninitialized -Winit-self - -Wpointer-arith -Wredundant-decls -Wformat-nonliteral -@@ -155,7 +155,7 @@ if(NOT AWESOME_REQUIRED_FOUND OR NOT AWE + -Wpointer-arith -Wformat-nonliteral +@@ -153,7 +153,7 @@ endif() macro(a_find_library variable library) diff --git a/wm/awesome/patches/patch-common_util.h b/wm/awesome/patches/patch-common_util.h deleted file mode 100644 index aee6da03bfa..00000000000 --- a/wm/awesome/patches/patch-common_util.h +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-common_util.h,v 1.1 2012/08/31 09:26:29 marino Exp $ - -DragonFly needs alloca.h too. - ---- common/util.h.orig 2012-07-15 10:12:21.000000000 +0000 -+++ common/util.h -@@ -32,7 +32,10 @@ - #include - #include - --#if !(defined (__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)) -+#if !(defined (__FreeBSD__) \ -+ || defined(__DragonFly__) \ -+ || defined(__OpenBSD__) \ -+ || defined(__NetBSD__)) - #include - #endif - -- cgit v1.2.3