remove G_DISABLE_DEPRECATED from Makefile to fix build with recent glib2,

addresses PR pkg/45912 by Joern Clausen

9 files changed, 69 insertions, 4 deletions

diff --git a/geography/libchamplain06/distinfo b/geography/libchamplain06/distinfo
index 7bd753c8790..f23d4ca6b14 100644
--- a/geography/libchamplain06/distinfo
+++ b/geography/libchamplain06/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/07/26 11:07:18 drochner Exp $
+$NetBSD: distinfo,v 1.2 2012/02/02 17:27:18 drochner Exp $
 
 SHA1 (libchamplain-0.6.1.tar.bz2) = f365597312f4e8b0dcc080eb7720d631d6425e4c
 RMD160 (libchamplain-0.6.1.tar.bz2) = 7726a6991316ef9e46d0ae24cb6d22a91c759910
 Size (libchamplain-0.6.1.tar.bz2) = 694348 bytes
 SHA1 (patch-aa) = dc6f2c9cecbcc55831d64f042210ff23f0e44940
+SHA1 (patch-ab) = 3f7a4089a36e6de7ec37ee8eb84314383eb241e4
diff --git a/geography/libchamplain06/patches/patch-ab b/geography/libchamplain06/patches/patch-ab
new file mode 100644
index 00000000000..3efc21e6780
--- /dev/null
+++ b/geography/libchamplain06/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.1 2012/02/02 17:27:19 drochner Exp $
+
+--- tidy/Makefile.in.orig	2010-06-26 22:01:29.000000000 +0000
++++ tidy/Makefile.in
+@@ -273,7 +273,6 @@ INCLUDES = \
+ 	-I$(top_srcdir) 		\
+ 	-DPREFIX=\""$(prefix)"\" 	\
+ 	-DLIBDIR=\""$(libdir)"\" 	\
+-	-DG_DISABLE_DEPRECATED 		\
+ 	-DG_LOG_DOMAIN=\"Tidy\" 	\
+ 	$(DEPS_CFLAGS) 			\
+ 	$(TIDY_DEBUG_CFLAGS) 		\
diff --git a/geography/libchamplain08/distinfo b/geography/libchamplain08/distinfo
index 005ccbdeb4b..dcfd30ddcf3 100644
--- a/geography/libchamplain08/distinfo
+++ b/geography/libchamplain08/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2011/04/14 15:52:51 drochner Exp $
+$NetBSD: distinfo,v 1.2 2012/02/02 17:27:19 drochner Exp $
 
 SHA1 (libchamplain-0.8.3.tar.bz2) = da7b335db417574c3d407873c3e86f1263002d3d
 RMD160 (libchamplain-0.8.3.tar.bz2) = e5670e2698e0951f60a4168bbc9b2e788461e2a7
 Size (libchamplain-0.8.3.tar.bz2) = 667873 bytes
 SHA1 (patch-aa) = cb409caf3babea890beadba6e787eefaf148bcbd
 SHA1 (patch-ab) = ccdd82dbffe2ba4313579984f96a1b5b0fb7efbe
+SHA1 (patch-ac) = 3a2c8d3690f25908485dc11bfb64b573657349f7
diff --git a/geography/libchamplain08/patches/patch-ac b/geography/libchamplain08/patches/patch-ac
new file mode 100644
index 00000000000..26979135357
--- /dev/null
+++ b/geography/libchamplain08/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.1 2012/02/02 17:27:19 drochner Exp $
+
+--- tidy/Makefile.in.orig	2011-03-30 22:13:37.000000000 +0000
++++ tidy/Makefile.in
+@@ -343,7 +343,6 @@ AM_CPPFLAGS = \
+ 	-I$(top_srcdir) \
+ 	-DPREFIX=\""$(prefix)"\" 	\
+ 	-DLIBDIR=\""$(libdir)"\" 	\
+-	-DG_DISABLE_DEPRECATED 		\
+ 	-DG_LOG_DOMAIN=\"Tidy\" 	\
+ 	$(DEPS_CFLAGS) 			\
+ 	$(TIDY_DEBUG_CFLAGS)
diff --git a/graphics/clutter-gtk/distinfo b/graphics/clutter-gtk/distinfo
index f1de9778552..e1abb99fd3b 100644
--- a/graphics/clutter-gtk/distinfo
+++ b/graphics/clutter-gtk/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.6 2010/10/17 01:35:08 obache Exp $
+$NetBSD: distinfo,v 1.7 2012/02/02 17:27:19 drochner Exp $
 
 SHA1 (clutter-gtk-0.10.8.tar.gz) = 91dc92c06ab6feff4d99d3bf5cce374c48a2f14b
 RMD160 (clutter-gtk-0.10.8.tar.gz) = 6c24adcd11029d8d5172af28a9429238d009b9b4
 Size (clutter-gtk-0.10.8.tar.gz) = 391461 bytes
+SHA1 (patch-aa) = c7caf95a3a361370193f3810904a62de2d1d7048
diff --git a/graphics/clutter-gtk/patches/patch-aa b/graphics/clutter-gtk/patches/patch-aa
new file mode 100644
index 00000000000..d58a364dbb5
--- /dev/null
+++ b/graphics/clutter-gtk/patches/patch-aa
@@ -0,0 +1,12 @@
+$NetBSD: patch-aa,v 1.1 2012/02/02 17:27:19 drochner Exp $
+
+--- clutter-gtk/Makefile.in.orig	2010-09-16 13:50:05.000000000 +0000
++++ clutter-gtk/Makefile.in
+@@ -281,7 +281,6 @@ AM_CPPFLAGS = \
+ 	-DPREFIX=\""$(prefix)"\" 		\
+ 	-DLIBDIR=\""$(libdir)"\" 		\
+         -DCLUTTER_GTK_COMPILATION               \
+-        -DG_DISABLE_DEPRECATED                  \
+         -DGDK_PIXBUF_DISABLE_DEPRECATED         \
+         -DGDK_DISABLE_DEPRECATED                \
+         -DGTK_DISABLE_DEPRECATED                \
diff --git a/graphics/clutter/distinfo b/graphics/clutter/distinfo
index f7283781df5..55fee4a226b 100644
--- a/graphics/clutter/distinfo
+++ b/graphics/clutter/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.16 2010/12/03 07:30:17 obache Exp $
+$NetBSD: distinfo,v 1.17 2012/02/02 17:27:19 drochner Exp $
 
 SHA1 (clutter-1.2.14.tar.gz) = 2fcc0a053424a33f98cbab51477cec2518c4bba6
 RMD160 (clutter-1.2.14.tar.gz) = 9f54c29e17b5595b964f3345729d001189df40f1
 Size (clutter-1.2.14.tar.gz) = 3201417 bytes
+SHA1 (patch-aa) = b1c1df2dd6806ad9c4626b29b0fa16db67527507
+SHA1 (patch-ab) = 1031517c2a9ee5716a8cf5cf9188a53861d1f9a9
diff --git a/graphics/clutter/patches/patch-aa b/graphics/clutter/patches/patch-aa
new file mode 100644
index 00000000000..7007097bf4a
--- /dev/null
+++ b/graphics/clutter/patches/patch-aa
@@ -0,0 +1,12 @@
+$NetBSD: patch-aa,v 1.3 2012/02/02 17:27:19 drochner Exp $
+
+--- clutter/cogl/cogl/Makefile.in.orig	2010-09-24 15:28:53.000000000 +0000
++++ clutter/cogl/cogl/Makefile.in
+@@ -418,7 +418,6 @@ INCLUDES = \
+ 
+ AM_CPPFLAGS = \
+ 	-DG_DISABLE_SINGLE_INCLUDES 		\
+-	-DG_DISABLE_DEPRECATED			\
+ 	-DG_LOG_DOMAIN=\"Cogl-$(COGL_WINSYS)\" 	\
+ 	-DCLUTTER_COMPILATION			\
+ 	$(COGL_DEBUG_CFLAGS) 			\
diff --git a/graphics/clutter/patches/patch-ab b/graphics/clutter/patches/patch-ab
new file mode 100644
index 00000000000..317f7fe40fc
--- /dev/null
+++ b/graphics/clutter/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.4 2012/02/02 17:27:19 drochner Exp $
+
+--- clutter/Makefile.in.orig	2010-09-24 15:28:52.000000000 +0000
++++ clutter/Makefile.in
+@@ -472,7 +472,6 @@ AM_CPPFLAGS = \
+ 	-DCLUTTER_COMPILATION=1			\
+ 	-DCOGL_DISABLE_DEPRECATED		\
+ 	-DCOGL_ENABLE_EXPERIMENTAL_API		\
+-	-DG_DISABLE_DEPRECATED 			\
+ 	-DG_DISABLE_SINGLE_INCLUDES		\
+ 	-DG_LOG_DOMAIN=\"Clutter\" 		\
+ 	$(CLUTTER_DEBUG_CFLAGS)			\