diff options
| author | dholland <dholland> | 2013-12-08 00:18:21 +0000 |
|---|---|---|
| committer | dholland <dholland> | 2013-12-08 00:18:21 +0000 |
| commit | deb8a74d6fc5ec51375ac6d2effa0d68ecb8f7fc (patch) | |
| tree | 3ea8c8c26e73abe55dc5a0c37e38f57e7abb967a /wm | |
| parent | 30f7d1b22fb3fe22d33c19e21b4923384c4b0fca (diff) | |
| download | pkgsrc-deb8a74d6fc5ec51375ac6d2effa0d68ecb8f7fc.tar.gz | |
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.
Diffstat (limited to 'wm')
| -rw-r--r-- | wm/awesome/Makefile | 5 | ||||
| -rw-r--r-- | wm/awesome/distinfo | 3 | ||||
| -rw-r--r-- | wm/awesome/patches/patch-build-utils_lgi-check.sh | 17 |
3 files changed, 22 insertions, 3 deletions
diff --git a/wm/awesome/Makefile b/wm/awesome/Makefile index 5bf7e94d93c..d564a211b72 100644 --- a/wm/awesome/Makefile +++ b/wm/awesome/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.45 2013/10/30 06:49:55 dholland Exp $ +# $NetBSD: Makefile,v 1.46 2013/12/08 00:18:21 dholland Exp $ # DISTNAME= awesome-3.5.1 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 wm MASTER_SITES= http://awesome.naquadah.org/download/ EXTRACT_SUFX= .tar.xz @@ -53,6 +53,7 @@ LDFLAGS.SunOS+= -liconv .include "../../devel/glib2/buildlink3.mk" .include "../../devel/libev/buildlink3.mk" .include "../../graphics/cairo/buildlink3.mk" +.include "../../graphics/cairo-gobject/buildlink3.mk" .include "../../graphics/gdk-pixbuf2/buildlink3.mk" .include "../../graphics/imlib2/buildlink3.mk" .include "../../lang/lua/buildlink3.mk" diff --git a/wm/awesome/distinfo b/wm/awesome/distinfo index 8ba38aaec72..04635aafc23 100644 --- a/wm/awesome/distinfo +++ b/wm/awesome/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.12 2013/07/22 19:47:18 degroote Exp $ +$NetBSD: distinfo,v 1.13 2013/12/08 00:18:21 dholland Exp $ 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 +SHA1 (patch-build-utils_lgi-check.sh) = a3562f570e58d9596feb632ed5313a23d709ef8c diff --git a/wm/awesome/patches/patch-build-utils_lgi-check.sh b/wm/awesome/patches/patch-build-utils_lgi-check.sh new file mode 100644 index 00000000000..39d78be1ec8 --- /dev/null +++ b/wm/awesome/patches/patch-build-utils_lgi-check.sh @@ -0,0 +1,17 @@ +$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 |