pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/gtk3 x11/gtk3: Fix dependency / Fix DragonFly
details: https://anonhg.NetBSD.org/pkgsrc/rev/9684b45d853b
branches: trunk
changeset: 603948:9684b45d853b
user: marino <marino%pkgsrc.org@localhost>
date: Thu May 17 21:10:37 2012 +0000
description:
x11/gtk3: Fix dependency / Fix DragonFly
In order to accomplish the given PLIST, gobject-introspection must be
at version 1.32 at least (rather than the specified version 0.10.1).
Revbump for the dependency change.
Also, two conftests were failing on DragonFly that should have passed
so these were overridden as successes to fix the 3.4.3 build on DragonFly.
diffstat:
x11/gtk3/Makefile | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diffs (35 lines):
diff -r 65c22ff7c640 -r 9684b45d853b x11/gtk3/Makefile
--- a/x11/gtk3/Makefile Thu May 17 20:29:13 2012 +0000
+++ b/x11/gtk3/Makefile Thu May 17 21:10:37 2012 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2012/05/15 15:39:40 adam Exp $
+# $NetBSD: Makefile,v 1.21 2012/05/17 21:10:37 marino Exp $
DISTNAME= gtk+-3.4.3
PKGNAME= ${DISTNAME:S/gtk/gtk3/}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/${PKGVERSION_NOREV:R}/ \
${MASTER_SITE_GNOME:=sources/gtk+/${PKGVERSION_NOREV:R}/}
@@ -55,6 +56,12 @@
BUILD_DEPENDS+= grep-[0-9]*:../../textproc/grep
TOOLS_PATH.grep= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}grep
.endif
+# isnan and isinf are part of libc, not libm on DragonFly
+# conf tests fail detection due to conflicting definitions, just skip them
+.if ${OPSYS} == "DragonFly"
+CONFIGURE_ENV+= ac_cv_func_isnan=yes
+CONFIGURE_ENV+= ac_cv_func_isinf=yes
+.endif
CFLAGS.SunOS+= -std=gnu99 -D_XOPEN_SOURCE=600
@@ -77,7 +84,7 @@
.include "../../devel/glib2/buildlink3.mk"
BUILDLINK_API_DEPENDS.gdk-pixbuf2+= gdk-pixbuf2>=2.24.1nb2
.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gobject-introspection+= gobject-introspection>=0.10.1
+BUILDLINK_API_DEPENDS.gobject-introspection+= gobject-introspection>=1.32
.include "../../devel/gobject-introspection/buildlink3.mk"
.include "options.mk"
Home |
Main Index |
Thread Index |
Old Index