Sun Dec 8 00:18:21 2013 UTC ()
Requires cairo-gobject. PKGREVISION -> 2.

This package uses lua-gi at build time to see if it can load
cairo-gobject; this does not (AFAICT) work without buildlinking
lua-gi, and possibly not even then, and I don't want to get into that
unless necessary. So make the failure non-fatal as the package build
system suggests. (Except that the way they suggest isn't working for
some other reason, so do it forcibly.)

I am not really in a position to test it at runtime right now, so if
it doesn't work let me know. At least now the package builds.


(dholland)
diff -r1.45 -r1.46 pkgsrc/wm/awesome/Makefile
diff -r1.12 -r1.13 pkgsrc/wm/awesome/distinfo
diff -r0 -r1.1 pkgsrc/wm/awesome/patches/patch-build-utils_lgi-check.sh
cvs diff -r1.45 -r1.46 pkgsrc/wm/awesome/Makefile (expand / switch to unified diff)

--- pkgsrc/wm/awesome/Makefile 2013/10/30 06:49:55 1.45
+++ pkgsrc/wm/awesome/Makefile 2013/12/08 00:18:21 1.46
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.45 2013/10/30 06:49:55 dholland Exp $ 1# $NetBSD: Makefile,v 1.46 2013/12/08 00:18:21 dholland Exp $
2# 2#
3 3
4DISTNAME= awesome-3.5.1 4DISTNAME= awesome-3.5.1
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= x11 wm 6CATEGORIES= x11 wm
7MASTER_SITES= http://awesome.naquadah.org/download/ 7MASTER_SITES= http://awesome.naquadah.org/download/
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9 9
10MAINTAINER= pallegra@gmail.com 10MAINTAINER= pallegra@gmail.com
11HOMEPAGE= http://awesome.naquadah.org/ 11HOMEPAGE= http://awesome.naquadah.org/
12COMMENT= Tiling window manager based on dwm 12COMMENT= Tiling window manager based on dwm
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
15CONFLICTS+= awesome<3.0 15CONFLICTS+= awesome<3.0
16 16
17USE_TOOLS+= bash gmake pkg-config 17USE_TOOLS+= bash gmake pkg-config
18USE_CMAKE= yes 18USE_CMAKE= yes
@@ -43,26 +43,27 @@ SUBST_SED.ev= -e "s,PKGPREFIX,${PREFIX} @@ -43,26 +43,27 @@ SUBST_SED.ev= -e "s,PKGPREFIX,${PREFIX}
43BUILD_DEPENDS+= ImageMagick-[0-9]*:../../graphics/ImageMagick 43BUILD_DEPENDS+= ImageMagick-[0-9]*:../../graphics/ImageMagick
44BUILD_DEPENDS+= asciidoc>=8.3.0:../../textproc/asciidoc 44BUILD_DEPENDS+= asciidoc>=8.3.0:../../textproc/asciidoc
45BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto 45BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto
46BUILD_DEPENDS+= docbook-xml-[0-9]*:../../textproc/docbook-xml 46BUILD_DEPENDS+= docbook-xml-[0-9]*:../../textproc/docbook-xml
47 47
48DEPENDS+= ${LUA_PKGPREFIX}-gi-[0-9]*:../../devel/lua-gi 48DEPENDS+= ${LUA_PKGPREFIX}-gi-[0-9]*:../../devel/lua-gi
49 49
50LDFLAGS.SunOS+= -liconv 50LDFLAGS.SunOS+= -liconv
51 51
52.include "../../converters/libiconv/buildlink3.mk" 52.include "../../converters/libiconv/buildlink3.mk"
53.include "../../devel/glib2/buildlink3.mk" 53.include "../../devel/glib2/buildlink3.mk"
54.include "../../devel/libev/buildlink3.mk" 54.include "../../devel/libev/buildlink3.mk"
55.include "../../graphics/cairo/buildlink3.mk" 55.include "../../graphics/cairo/buildlink3.mk"
 56.include "../../graphics/cairo-gobject/buildlink3.mk"
56.include "../../graphics/gdk-pixbuf2/buildlink3.mk" 57.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
57.include "../../graphics/imlib2/buildlink3.mk" 58.include "../../graphics/imlib2/buildlink3.mk"
58.include "../../lang/lua/buildlink3.mk" 59.include "../../lang/lua/buildlink3.mk"
59.include "../../x11/libX11/buildlink3.mk" 60.include "../../x11/libX11/buildlink3.mk"
60.include "../../x11/libxcb/buildlink3.mk" 61.include "../../x11/libxcb/buildlink3.mk"
61.include "../../x11/libxdg-basedir/buildlink3.mk" 62.include "../../x11/libxdg-basedir/buildlink3.mk"
62.include "../../x11/libXcursor/buildlink3.mk" 63.include "../../x11/libXcursor/buildlink3.mk"
63.include "../../x11/xcb-util/buildlink3.mk" 64.include "../../x11/xcb-util/buildlink3.mk"
64.include "../../x11/xcb-util-image/buildlink3.mk" 65.include "../../x11/xcb-util-image/buildlink3.mk"
65.include "../../x11/xcb-util-keysyms/buildlink3.mk" 66.include "../../x11/xcb-util-keysyms/buildlink3.mk"
66.include "../../x11/xcb-util-wm/buildlink3.mk" 67.include "../../x11/xcb-util-wm/buildlink3.mk"
67.include "../../x11/startup-notification/buildlink3.mk" 68.include "../../x11/startup-notification/buildlink3.mk"
68 69
cvs diff -r1.12 -r1.13 pkgsrc/wm/awesome/distinfo (expand / switch to unified diff)

--- pkgsrc/wm/awesome/distinfo 2013/07/22 19:47:18 1.12
+++ pkgsrc/wm/awesome/distinfo 2013/12/08 00:18:21 1.13
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.12 2013/07/22 19:47:18 degroote Exp $ 1$NetBSD: distinfo,v 1.13 2013/12/08 00:18:21 dholland Exp $
2 2
3SHA1 (awesome-3.5.1.tar.xz) = 8bca01550298905b975ccaadcc8de5a5c333b271 3SHA1 (awesome-3.5.1.tar.xz) = 8bca01550298905b975ccaadcc8de5a5c333b271
4RMD160 (awesome-3.5.1.tar.xz) = 480f6d56a192d5ea6e72d6576d47f5805182c725 4RMD160 (awesome-3.5.1.tar.xz) = 480f6d56a192d5ea6e72d6576d47f5805182c725
5Size (awesome-3.5.1.tar.xz) = 714320 bytes 5Size (awesome-3.5.1.tar.xz) = 714320 bytes
6SHA1 (patch-awesomeConfig.cmake) = fed6a47e127b6a2d688deadaabb7805730e08ed8 6SHA1 (patch-awesomeConfig.cmake) = fed6a47e127b6a2d688deadaabb7805730e08ed8
 7SHA1 (patch-build-utils_lgi-check.sh) = a3562f570e58d9596feb632ed5313a23d709ef8c
File Added: pkgsrc/wm/awesome/patches/Attic/patch-build-utils_lgi-check.sh
$NetBSD: patch-build-utils_lgi-check.sh,v 1.1 2013/12/08 00:18:21 dholland Exp $

For some reason (probably cmake's doing) setting AWESOME_IGNORE_LGI=1
from pkgsrc does not prevent this from failing the build, so do it
forcibly.

--- build-utils/lgi-check.sh~	2013-04-01 11:44:46.000000000 +0000
+++ build-utils/lgi-check.sh
@@ -14,7 +14,7 @@ die()
 	echo " Add AWESOME_IGNORE_LGI=1 to your environment to continue."
 	echo
 	echo
-	if [ "x$AWESOME_IGNORE_LGI" = "x1" ]
+	if true;
 	then
 		exit 0
 	fi