correct fix for solaris-i386 redefinition warnings in gdk-pixbuf2

5 files changed, 49 insertions, 8 deletions

diff --git a/graphics/gdk-pixbuf2/Makefile b/graphics/gdk-pixbuf2/Makefile
index 9d47144913a..3ad0a246c93 100644
--- a/graphics/gdk-pixbuf2/Makefile
+++ b/graphics/gdk-pixbuf2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2013/08/25 11:50:28 richard Exp $
+# $NetBSD: Makefile,v 1.27 2013/08/26 14:38:56 richard Exp $
 
 DISTNAME=	gdk-pixbuf-${PIXBUF2_VERSION}
 PKGNAME=	${DISTNAME:S/pixbuf/pixbuf2/}
@@ -23,12 +23,6 @@ USE_PKGLOCALEDIR=	yes
 PKGCONFIG_OVERRIDE+=	contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in
 PKGCONFIG_OVERRIDE+=	gdk-pixbuf-2.0.pc.in
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ENV+=	ac_cv_sys_file_offset_bits=no
-.endif
-
 _BUILDING_GTK2= yes
 .include "loaders.mk"
 
diff --git a/graphics/gdk-pixbuf2/distinfo b/graphics/gdk-pixbuf2/distinfo
index a365610141d..5441c3340c1 100644
--- a/graphics/gdk-pixbuf2/distinfo
+++ b/graphics/gdk-pixbuf2/distinfo
@@ -1,7 +1,10 @@
-$NetBSD: distinfo,v 1.18 2013/07/24 10:58:01 drochner Exp $
+$NetBSD: distinfo,v 1.19 2013/08/26 14:38:56 richard Exp $
 
 SHA1 (gdk-pixbuf-2.28.2.tar.xz) = 9876d0a20f592f8fb2a52d4a86ec43d607661beb
 RMD160 (gdk-pixbuf-2.28.2.tar.xz) = d6472e7a289d4b04feb99b387339ade558835b71
 Size (gdk-pixbuf-2.28.2.tar.xz) = 1192936 bytes
 SHA1 (patch-ab) = a64a1c9a4dd4c51d918e3409d40d76fd63146150
 SHA1 (patch-ac) = c55b59e380cf58ae7e94c760dc0dbb32b6b5fb69
+SHA1 (patch-gdk-pixbuf_gdk-pixbuf-scaled-anim.c) = 9656d695b2567a1f743885964949e32634cde577
+SHA1 (patch-gdk-pixbuf_gdk-pixbuf.h) = 727ba1cf32aa9251a73542b99fe4f883b7e29f22
+SHA1 (patch-gdk-pixbuf_io-icns.c) = 74faaca7f60f09077777cf77005699c5411164e2
diff --git a/graphics/gdk-pixbuf2/patches/patch-gdk-pixbuf_gdk-pixbuf-scaled-anim.c b/graphics/gdk-pixbuf2/patches/patch-gdk-pixbuf_gdk-pixbuf-scaled-anim.c
new file mode 100644
index 00000000000..ca4e06e587a
--- /dev/null
+++ b/graphics/gdk-pixbuf2/patches/patch-gdk-pixbuf_gdk-pixbuf-scaled-anim.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-gdk-pixbuf_gdk-pixbuf-scaled-anim.c,v 1.1 2013/08/26 14:38:56 richard Exp $
+
+* include config.h early to avoid redefinition warnings on solaris
+*
+--- gdk-pixbuf/gdk-pixbuf-scaled-anim.c.orig	2012-07-31 23:45:20.000000000 +0000
++++ gdk-pixbuf/gdk-pixbuf-scaled-anim.c
+@@ -21,7 +21,7 @@
+  * Boston, MA 02111-1307, USA.
+  *
+  */
+-
++#include "config.h"
+ #include <glib.h>
+ 
+ #include "gdk-pixbuf.h"
diff --git a/graphics/gdk-pixbuf2/patches/patch-gdk-pixbuf_gdk-pixbuf.h b/graphics/gdk-pixbuf2/patches/patch-gdk-pixbuf_gdk-pixbuf.h
new file mode 100644
index 00000000000..747e546badb
--- /dev/null
+++ b/graphics/gdk-pixbuf2/patches/patch-gdk-pixbuf_gdk-pixbuf.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-gdk-pixbuf_gdk-pixbuf.h,v 1.1 2013/08/26 14:38:56 richard Exp $
+
+* include config.h early to avoid redefinition warnings on solaris
+* 
+--- gdk-pixbuf/gdk-pixbuf.h.orig	2011-08-16 01:45:14.000000000 +0000
++++ gdk-pixbuf/gdk-pixbuf.h
+@@ -27,7 +27,7 @@
+ #define GDK_PIXBUF_H
+ 
+ #define GDK_PIXBUF_H_INSIDE
+-
++#include "config.h"
+ #include <glib.h>
+ #include <gdk-pixbuf/gdk-pixbuf-features.h>
+ #include <glib-object.h>
diff --git a/graphics/gdk-pixbuf2/patches/patch-gdk-pixbuf_io-icns.c b/graphics/gdk-pixbuf2/patches/patch-gdk-pixbuf_io-icns.c
new file mode 100644
index 00000000000..a9950141498
--- /dev/null
+++ b/graphics/gdk-pixbuf2/patches/patch-gdk-pixbuf_io-icns.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-gdk-pixbuf_io-icns.c,v 1.1 2013/08/26 14:38:56 richard Exp $
+
+* include config.h early to avoid redefinition warnings on solaris
+* 
+--- gdk-pixbuf/io-icns.c.orig	2011-08-16 01:45:14.000000000 +0000
++++ gdk-pixbuf/io-icns.c
+@@ -22,6 +22,7 @@
+ #ifndef _WIN32
+ #define _GNU_SOURCE
+ #endif
++#include "config.h"
+ #include <stdlib.h>
+ #include <string.h>
+ #include <errno.h>