summaryrefslogtreecommitdiff
path: root/x11/gtk3
diff options
context:
space:
mode:
authorhans <hans>2012-03-21 19:58:47 +0000
committerhans <hans>2012-03-21 19:58:47 +0000
commit799d665e617d57ca5b1857424a7311366194492c (patch)
tree5e522da2f07105adfecefeeebc2eb56add51419c /x11/gtk3
parent0ef191c3dfab2ddd8967807510f23e730be8c660 (diff)
downloadpkgsrc-799d665e617d57ca5b1857424a7311366194492c.tar.gz
Don't override an existing _XOPEN_SOURCE definition. Define it on SunOS
to make this build with std=gnu99.
Diffstat (limited to 'x11/gtk3')
-rw-r--r--x11/gtk3/Makefile4
-rw-r--r--x11/gtk3/distinfo3
-rw-r--r--x11/gtk3/patches/patch-gtk_gtksearchenginesimple.c14
3 files changed, 19 insertions, 2 deletions
diff --git a/x11/gtk3/Makefile b/x11/gtk3/Makefile
index 6b0ed47cf67..c55ad9b743c 100644
--- a/x11/gtk3/Makefile
+++ b/x11/gtk3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2012/03/21 12:21:56 drochner Exp $
+# $NetBSD: Makefile,v 1.18 2012/03/21 19:58:47 hans Exp $
DISTNAME= gtk+-3.2.4
PKGNAME= ${DISTNAME:S/gtk/gtk3/}
@@ -56,6 +56,8 @@ BUILD_DEPENDS+= grep-[0-9]*:../../textproc/grep
TOOLS_PATH.grep= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}grep
.endif
+CFLAGS.SunOS+= -std=gnu99 -D_XOPEN_SOURCE=600
+
CPPFLAGS+= -DPREFIX="\"${PREFIX}\""
# We remove the module databases during post-install since we create them
diff --git a/x11/gtk3/distinfo b/x11/gtk3/distinfo
index 1bdab83b5a4..291b1b37446 100644
--- a/x11/gtk3/distinfo
+++ b/x11/gtk3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2012/03/21 12:21:56 drochner Exp $
+$NetBSD: distinfo,v 1.9 2012/03/21 19:58:47 hans Exp $
SHA1 (gtk+-3.2.4.tar.xz) = 3d0b6413750bc0cb51e98a387abbd606a1aa021e
RMD160 (gtk+-3.2.4.tar.xz) = bbf0922f53a2acc2cb0337c08583208b39255768
@@ -6,3 +6,4 @@ Size (gtk+-3.2.4.tar.xz) = 12261004 bytes
SHA1 (patch-ab) = 9c82cc60f3825d377a197c876fcc6faa379cbde3
SHA1 (patch-af) = f1c8d7929ea84a3b92f0bfc76f32f8e79e1d4352
SHA1 (patch-aj) = 88d5a5c25bcc005bce8597d1262e68a9e67b5f93
+SHA1 (patch-gtk_gtksearchenginesimple.c) = c41e529c1cafcd8152684d74971601eac4845a5a
diff --git a/x11/gtk3/patches/patch-gtk_gtksearchenginesimple.c b/x11/gtk3/patches/patch-gtk_gtksearchenginesimple.c
new file mode 100644
index 00000000000..9d9b52ff811
--- /dev/null
+++ b/x11/gtk3/patches/patch-gtk_gtksearchenginesimple.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-gtk_gtksearchenginesimple.c,v 1.1 2012/03/21 19:58:47 hans Exp $
+
+--- gtk/gtksearchenginesimple.c.orig 2011-12-19 14:58:28.000000000 +0100
++++ gtk/gtksearchenginesimple.c 2012-03-21 20:36:33.118910490 +0100
+@@ -27,7 +27,9 @@
+ * export ftw() and friends only if _XOPEN_SOURCE and _GNU_SOURCE
+ * are defined. see bug #444097.
+ */
++#ifndef _XOPEN_SOURCE
+ #define _XOPEN_SOURCE 500
++#endif
+ #define _GNU_SOURCE
+
+ #ifdef HAVE_FTW_H