diff options
author | rodent <rodent@pkgsrc.org> | 2013-06-30 22:13:40 +0000 |
---|---|---|
committer | rodent <rodent@pkgsrc.org> | 2013-06-30 22:13:40 +0000 |
commit | fa32428cb3b1427afc7ce8124580ee0c76cc4c21 (patch) | |
tree | dd3bbeb467933be2d5da1e2cc38921f208f4f00c | |
parent | 0578b78527fa6150604a25c498b2719ca780d6f4 (diff) | |
download | pkgsrc-fa32428cb3b1427afc7ce8124580ee0c76cc4c21.tar.gz |
Updated to latest stable (before rewrite). No NEWS/ChangeLog. Added patch
to pull in locally generated config from configure stage. USE_TOOLS+=perl
msgmerge xgettext; Remove disabling of libinotify. Buildlink gtk2, libxslt,
startup-notification, pango, cairo, libnotify07.
-rw-r--r-- | wm/compiz-fusion-plugins-extra/Makefile | 19 | ||||
-rw-r--r-- | wm/compiz-fusion-plugins-extra/distinfo | 9 | ||||
-rw-r--r-- | wm/compiz-fusion-plugins-extra/patches/patch-src_notification_notification.c | 15 |
3 files changed, 32 insertions, 11 deletions
diff --git a/wm/compiz-fusion-plugins-extra/Makefile b/wm/compiz-fusion-plugins-extra/Makefile index 190dfddaf30..76fa2a0a9c0 100644 --- a/wm/compiz-fusion-plugins-extra/Makefile +++ b/wm/compiz-fusion-plugins-extra/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.28 2013/06/06 12:55:08 wiz Exp $ +# $NetBSD: Makefile,v 1.29 2013/06/30 22:13:40 rodent Exp $ # -PKGVER= 0.8.4 +PKGVER= 0.8.8 PKGNAME= compiz-fusion-plugins-extra-${PKGVER} DISTNAME= compiz-plugins-extra-${PKGVER} -PKGREVISION= 19 CATEGORIES= wm x11 MASTER_SITES= http://releases.compiz.org/${PKGVER}/ @@ -14,14 +13,13 @@ COMMENT= Compositing window manager - extra plugins LICENSE= gnu-gpl-v2 GNU_CONFIGURE= yes -USE_TOOLS+= intltool pkg-config msgfmt gmake +USE_TOOLS+= gmake intltool msgfmt msgmerge perl pkg-config xgettext USE_PKGLOCALEDIR= yes USE_LANGUAGES= c c++ USE_LIBTOOL= yes -PKGCONFIG_OVERRIDE+= compiz-text.pc.in +PKGCONFIG_OVERRIDE+= compiz-animationaddon.pc.in -CONFIGURE_ARGS+= --disable-inotify CONFIGURE_ARGS+= --enable-schemas GCONF_SCHEMAS+= compiz-3d.schemas @@ -50,9 +48,16 @@ GCONF_SCHEMAS+= compiz-trailfocus.schemas GCONF_SCHEMAS+= compiz-wallpaper.schemas GCONF_SCHEMAS+= compiz-widget.schemas +.include "../../x11/gtk2/buildlink3.mk" +.include "../../textproc/libxslt/buildlink3.mk" +.include "../../x11/startup-notification/buildlink3.mk" +.include "../../devel/pango/buildlink3.mk" +.include "../../graphics/cairo/buildlink3.mk" .include "../../devel/GConf/schemas.mk" +BUILDLINK_API_DEPENDS.compiz-bcop+= compiz-bcop>=0.7.3 .include "../../devel/compiz-bcop/buildlink3.mk" -.include "../../sysutils/libnotify/buildlink3.mk" +BUILDLINK_API_DEPENDS.libnotify07+= libnotify07>=0.6.1 +.include "../../sysutils/libnotify07/buildlink3.mk" .include "../../wm/compiz-fusion-plugins-main/buildlink3.mk" .include "../../mk/jpeg.buildlink3.mk" .include "../../wm/compiz/buildlink3.mk" diff --git a/wm/compiz-fusion-plugins-extra/distinfo b/wm/compiz-fusion-plugins-extra/distinfo index 210e586d491..af7ba813ca1 100644 --- a/wm/compiz-fusion-plugins-extra/distinfo +++ b/wm/compiz-fusion-plugins-extra/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.2 2009/11/26 20:03:21 imil Exp $ +$NetBSD: distinfo,v 1.3 2013/06/30 22:13:40 rodent Exp $ -SHA1 (compiz-plugins-extra-0.8.4.tar.gz) = 98912b7c32fe6dd74dbc79f552443acc2e13db1f -RMD160 (compiz-plugins-extra-0.8.4.tar.gz) = d0252db983c08ef1a9b3dbdacbda8069a9458bc3 -Size (compiz-plugins-extra-0.8.4.tar.gz) = 3337436 bytes +SHA1 (compiz-plugins-extra-0.8.8.tar.gz) = 4ab88a4e533e4ccc73f917e6357f176ed07402f1 +RMD160 (compiz-plugins-extra-0.8.8.tar.gz) = 593ec9358ff2609231f96055534fddcb3a7a30db +Size (compiz-plugins-extra-0.8.8.tar.gz) = 3351016 bytes +SHA1 (patch-src_notification_notification.c) = d5cbe8e2fe4642d71e24eefa033d45b5b6809a97 diff --git a/wm/compiz-fusion-plugins-extra/patches/patch-src_notification_notification.c b/wm/compiz-fusion-plugins-extra/patches/patch-src_notification_notification.c new file mode 100644 index 00000000000..cabd2d2d781 --- /dev/null +++ b/wm/compiz-fusion-plugins-extra/patches/patch-src_notification_notification.c @@ -0,0 +1,15 @@ +$NetBSD: patch-src_notification_notification.c,v 1.1 2013/06/30 22:13:40 rodent Exp $ + +Needs HAVE_LIBNOTIFY_0_6_1 defined. + +--- src/notification/notification.c.orig 2011-04-21 11:51:08.000000000 +0000 ++++ src/notification/notification.c +@@ -27,6 +27,8 @@ + #include <unistd.h> + #include <compiz-core.h> + ++#include "config.h" ++ + #define NOTIFY_DISPLAY_OPTION_TIMEOUT 0 + #define NOTIFY_DISPLAY_OPTION_MAX_LEVEL 1 + #define NOTIFY_DISPLAY_OPTION_NUM 2 |