Remove G_DISABLE_DEPRECATED so this builds with new glib.

16 files changed, 208 insertions, 1 deletions

diff --git a/www/kazehakase/distinfo b/www/kazehakase/distinfo
index 3b4571ec99f..5583a6ed8ea 100644
--- a/www/kazehakase/distinfo
+++ b/www/kazehakase/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2011/12/12 19:10:37 joerg Exp $
+$NetBSD: distinfo,v 1.12 2012/02/03 02:46:39 sbd Exp $
 
 SHA1 (kazehakase-0.5.8.tar.gz) = a64fdfa1b772239ae236d398e3b840577cf27148
 RMD160 (kazehakase-0.5.8.tar.gz) = 52a6e1d85a43d5f2350fc58166675c31901b5794
@@ -7,4 +7,19 @@ SHA1 (patch-aa) = 97ae79bfe947c6182c0c3b08ef20970a390e4b82
 SHA1 (patch-ab) = 98b87e58dede6ce214a64ff4ac87b006da78b84e
 SHA1 (patch-ac) = bc590d79fc8290d6ba9052d2b78d1c13add45e95
 SHA1 (patch-ad) = a411b2919162ff4b6af72ee2ecdffca54ec25f58
+SHA1 (patch-configure.ac) = 1033e221a5b6d9cd382d38eb76ac806c2a4b13a2
+SHA1 (patch-ext_ruby_Makefile.am) = b003abb402d2ff9f075fd3ae46561429ffe9e5a3
+SHA1 (patch-ext_ruby_Makefile.in) = 6319469c2571dca7ac761969d32feebc53df6db1
+SHA1 (patch-module_embed_gecko_Makefile.am) = ca4282d4996919f1c8e519df57338935b8d75095
+SHA1 (patch-module_embed_gecko_Makefile.in) = 6932bcf3ca976024517e37eccd97d2362b9706f3
+SHA1 (patch-module_embed_ie_Makefile.am) = bdccaf74c494b716c88aeda4d15f49552eec34a1
+SHA1 (patch-module_embed_ie_Makefile.in) = 41c0897ca8b4a1001e328d217fbff90da414cf7b
+SHA1 (patch-module_embed_moz-web-view_Makefile.am) = 8e6a177292b3c3239b8cdea7152863544aadbbf3
+SHA1 (patch-module_embed_moz-web-view_Makefile.in) = 18bafccbee69fd10a5b97cfbb15224e2f6e9ddb8
+SHA1 (patch-module_embed_per-process_Makefile.am) = 23606aad02d80b055364cb0af2554c618e7b003c
+SHA1 (patch-module_embed_per-process_Makefile.in) = a330e7012771acd89e9a4783e67a2061824d8328
+SHA1 (patch-module_embed_webkit-gtk_Makefile.am) = 17a2be7baa41e48f8c785a55ede597a1729ae190
+SHA1 (patch-module_embed_webkit-gtk_Makefile.in) = 8c4c6b3350d080c7715d6fda76279542329ec338
+SHA1 (patch-module_search_Makefile.am) = a2d7aa066c3da6d10c332136af020e415a687291
+SHA1 (patch-module_search_Makefile.in) = a7592a36fcf828f274294ac34dca92ffb19fa048
 SHA1 (patch-src_kz-app.c) = a6147dba1882cd8743a51390498ec80e0576e272
diff --git a/www/kazehakase/patches/patch-configure.ac b/www/kazehakase/patches/patch-configure.ac
new file mode 100644
index 00000000000..8511d3bbf65
--- /dev/null
+++ b/www/kazehakase/patches/patch-configure.ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-configure.ac,v 1.1 2012/02/03 02:46:39 sbd Exp $
+
+--- configure.ac.orig	2009-09-29 03:41:32.000000000 +0000
++++ configure.ac
+@@ -602,7 +602,6 @@ GENHTML_OPTIONS="--title 'Kazehakase Cod
+ 
+ KAZEHAKASE_CFLAGS="$GTK_CFLAGS $LIBGNUTLS_CFLAGS $GIO_CFLAGS $DBUS_GLIB_CFLAGS"
+ KAZEHAKASE_CFLAGS="$KAZEHAKASE_CFLAGS -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
+-KAZEHAKASE_CFLAGS="$KAZEHAKASE_CFLAGS -DG_DISABLE_DEPRECATED"
+ KAZEHAKASE_CFLAGS="$KAZEHAKASE_CFLAGS -DSYSDATADIR=\\\"\"\$(datadir)\"\\\""
+ KAZEHAKASE_CFLAGS="$KAZEHAKASE_CFLAGS -DLOCALEDIR=\\\"\"\$(localedir)\"\\\""
+ KAZEHAKASE_CFLAGS="$KAZEHAKASE_CFLAGS -DKZ_DATADIR=\\\"\"\$(datadir)/\$(PACKAGE)\"\\\""
diff --git a/www/kazehakase/patches/patch-ext_ruby_Makefile.am b/www/kazehakase/patches/patch-ext_ruby_Makefile.am
new file mode 100644
index 00000000000..4750e247cd9
--- /dev/null
+++ b/www/kazehakase/patches/patch-ext_ruby_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD: patch-ext_ruby_Makefile.am,v 1.1 2012/02/03 02:46:39 sbd Exp $
+
+--- ext/ruby/Makefile.am.orig	2009-09-29 03:38:20.000000000 +0000
++++ ext/ruby/Makefile.am
+@@ -4,8 +4,7 @@ ext_LTLIBRARIES = ruby.la
+ 
+ AM_CPPFLAGS =						\
+ 	-DGTK_DISABLE_DEPRECATED=1			\
+-	-DGDK_DISABLE_DEPRECATED=1			\
+-	-DG_DISABLE_DEPRECATED=1
++	-DGDK_DISABLE_DEPRECATED=1
+ 
+ INCLUDES =						\
+ 	$(MOZILLA_COMPONENT_CFLAGS)			\
diff --git a/www/kazehakase/patches/patch-ext_ruby_Makefile.in b/www/kazehakase/patches/patch-ext_ruby_Makefile.in
new file mode 100644
index 00000000000..f855b31105c
--- /dev/null
+++ b/www/kazehakase/patches/patch-ext_ruby_Makefile.in
@@ -0,0 +1,14 @@
+$NetBSD: patch-ext_ruby_Makefile.in,v 1.1 2012/02/03 02:46:39 sbd Exp $
+
+--- ext/ruby/Makefile.in.orig	2009-09-29 03:43:57.000000000 +0000
++++ ext/ruby/Makefile.in
+@@ -109,8 +109,7 @@ AMTAR = @AMTAR@
+ AM_CFLAGS = @AM_CFLAGS@
+ AM_CPPFLAGS = \
+ 	-DGTK_DISABLE_DEPRECATED=1			\
+-	-DGDK_DISABLE_DEPRECATED=1			\
+-	-DG_DISABLE_DEPRECATED=1
++	-DGDK_DISABLE_DEPRECATED=1
+ 
+ AM_CXXFLAGS = @AM_CXXFLAGS@
+ AM_LDFLAGS = @AM_LDFLAGS@
diff --git a/www/kazehakase/patches/patch-module_embed_gecko_Makefile.am b/www/kazehakase/patches/patch-module_embed_gecko_Makefile.am
new file mode 100644
index 00000000000..7641546d03d
--- /dev/null
+++ b/www/kazehakase/patches/patch-module_embed_gecko_Makefile.am
@@ -0,0 +1,12 @@
+$NetBSD: patch-module_embed_gecko_Makefile.am,v 1.1 2012/02/03 02:46:39 sbd Exp $
+
+--- module/embed/gecko/Makefile.am.orig	2009-09-29 03:38:19.000000000 +0000
++++ module/embed/gecko/Makefile.am
+@@ -112,7 +112,6 @@ AM_CXXFLAGS =				\
+ 	-DMOZILLA_PREFIX=\"$(MOZILLA_PREFIX)\"	\
+ 	-DGECKO_VERSION=\"$(GECKO_VERSION)\"	\
+ 	-DG_LOG_DOMAIN=\"Kazehakase-Gecko\"	\
+-	-DG_DISABLE_DEPRECATED=1		\
+ 	$(GTK_CFLAGS)				\
+ 	$(COVERAGE_CFLAGS)
+ 
diff --git a/www/kazehakase/patches/patch-module_embed_gecko_Makefile.in b/www/kazehakase/patches/patch-module_embed_gecko_Makefile.in
new file mode 100644
index 00000000000..ee55ba1ac0a
--- /dev/null
+++ b/www/kazehakase/patches/patch-module_embed_gecko_Makefile.in
@@ -0,0 +1,12 @@
+$NetBSD: patch-module_embed_gecko_Makefile.in,v 1.1 2012/02/03 02:46:39 sbd Exp $
+
+--- module/embed/gecko/Makefile.in.orig	2009-09-29 03:43:57.000000000 +0000
++++ module/embed/gecko/Makefile.in
+@@ -175,7 +175,6 @@ AM_CPPFLAGS = \
+ 	-DMOZILLA_PREFIX=\"$(MOZILLA_PREFIX)\"	\
+ 	-DGECKO_VERSION=\"$(GECKO_VERSION)\"	\
+ 	-DG_LOG_DOMAIN=\"Kazehakase-Gecko\"	\
+-	-DG_DISABLE_DEPRECATED=1		\
+ 	$(GTK_CFLAGS)				\
+ 	$(COVERAGE_CFLAGS)
+ 
diff --git a/www/kazehakase/patches/patch-module_embed_ie_Makefile.am b/www/kazehakase/patches/patch-module_embed_ie_Makefile.am
new file mode 100644
index 00000000000..6cebbfb8e1e
--- /dev/null
+++ b/www/kazehakase/patches/patch-module_embed_ie_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD: patch-module_embed_ie_Makefile.am,v 1.1 2012/02/03 02:46:39 sbd Exp $
+
+--- module/embed/ie/Makefile.am.orig	2009-09-29 03:38:19.000000000 +0000
++++ module/embed/ie/Makefile.am
+@@ -18,8 +18,7 @@ INCLUDES =						\
+ ie_la_CPPFLAGS=						\
+ 	-DG_LOG_DOMAIN=\"Kazehakase-IE\"		\
+ 	-DGTK_DISABLE_DEPRECATED=1			\
+-	-DGDK_DISABLE_DEPRECATED=1			\
+-	-DG_DISABLE_DEPRECATED=1
++	-DGDK_DISABLE_DEPRECATED=1
+ 
+ ie_la_LDFLAGS =					\
+ 	-avoid-version				\
diff --git a/www/kazehakase/patches/patch-module_embed_ie_Makefile.in b/www/kazehakase/patches/patch-module_embed_ie_Makefile.in
new file mode 100644
index 00000000000..1faa6dab14d
--- /dev/null
+++ b/www/kazehakase/patches/patch-module_embed_ie_Makefile.in
@@ -0,0 +1,14 @@
+$NetBSD: patch-module_embed_ie_Makefile.in,v 1.1 2012/02/03 02:46:39 sbd Exp $
+
+--- module/embed/ie/Makefile.in.orig	2009-09-29 03:43:57.000000000 +0000
++++ module/embed/ie/Makefile.in
+@@ -343,8 +343,7 @@ INCLUDES = \
+ ie_la_CPPFLAGS = \
+ 	-DG_LOG_DOMAIN=\"Kazehakase-IE\"		\
+ 	-DGTK_DISABLE_DEPRECATED=1			\
+-	-DGDK_DISABLE_DEPRECATED=1			\
+-	-DG_DISABLE_DEPRECATED=1
++	-DGDK_DISABLE_DEPRECATED=1
+ 
+ ie_la_LDFLAGS = \
+ 	-avoid-version				\
diff --git a/www/kazehakase/patches/patch-module_embed_moz-web-view_Makefile.am b/www/kazehakase/patches/patch-module_embed_moz-web-view_Makefile.am
new file mode 100644
index 00000000000..289e316db5b
--- /dev/null
+++ b/www/kazehakase/patches/patch-module_embed_moz-web-view_Makefile.am
@@ -0,0 +1,12 @@
+$NetBSD: patch-module_embed_moz-web-view_Makefile.am,v 1.1 2012/02/03 02:46:39 sbd Exp $
+
+--- module/embed/moz-web-view/Makefile.am.orig	2009-09-29 03:38:19.000000000 +0000
++++ module/embed/moz-web-view/Makefile.am
+@@ -16,7 +16,6 @@ INCLUDES =						\
+ moz_web_view_la_CPPFLAGS=			\
+ 	-DGTK_DISABLE_DEPRECATED=1		\
+ 	-DGDK_DISABLE_DEPRECATED=1		\
+-	-DG_DISABLE_DEPRECATED=1		\
+ 	-DG_LOG_DOMAIN=\"Kazehakase-MozWebView\"
+ 
+ moz_web_view_la_LDFLAGS =		\
diff --git a/www/kazehakase/patches/patch-module_embed_moz-web-view_Makefile.in b/www/kazehakase/patches/patch-module_embed_moz-web-view_Makefile.in
new file mode 100644
index 00000000000..c9e50e59460
--- /dev/null
+++ b/www/kazehakase/patches/patch-module_embed_moz-web-view_Makefile.in
@@ -0,0 +1,12 @@
+$NetBSD: patch-module_embed_moz-web-view_Makefile.in,v 1.1 2012/02/03 02:46:39 sbd Exp $
+
+--- module/embed/moz-web-view/Makefile.in.orig	2009-09-29 03:43:58.000000000 +0000
++++ module/embed/moz-web-view/Makefile.in
+@@ -342,7 +342,6 @@ INCLUDES = \
+ moz_web_view_la_CPPFLAGS = \
+ 	-DGTK_DISABLE_DEPRECATED=1		\
+ 	-DGDK_DISABLE_DEPRECATED=1		\
+-	-DG_DISABLE_DEPRECATED=1		\
+ 	-DG_LOG_DOMAIN=\"Kazehakase-MozWebView\"
+ 
+ moz_web_view_la_LDFLAGS = \
diff --git a/www/kazehakase/patches/patch-module_embed_per-process_Makefile.am b/www/kazehakase/patches/patch-module_embed_per-process_Makefile.am
new file mode 100644
index 00000000000..9ab1ea4e16d
--- /dev/null
+++ b/www/kazehakase/patches/patch-module_embed_per-process_Makefile.am
@@ -0,0 +1,12 @@
+$NetBSD: patch-module_embed_per-process_Makefile.am,v 1.1 2012/02/03 02:46:39 sbd Exp $
+
+--- module/embed/per-process/Makefile.am.orig	2009-09-29 03:40:53.000000000 +0000
++++ module/embed/per-process/Makefile.am
+@@ -33,7 +33,6 @@ INCLUDES =						\
+ per_process_la_CPPFLAGS=			\
+ 	-DGTK_DISABLE_DEPRECATED=1		\
+ 	-DGDK_DISABLE_DEPRECATED=1		\
+-	-DG_DISABLE_DEPRECATED=1		\
+ 	-DG_LOG_DOMAIN=\"Kazehakase-PerProcess\"
+ 
+ per_process_la_LDFLAGS =		\
diff --git a/www/kazehakase/patches/patch-module_embed_per-process_Makefile.in b/www/kazehakase/patches/patch-module_embed_per-process_Makefile.in
new file mode 100644
index 00000000000..6734fc5457e
--- /dev/null
+++ b/www/kazehakase/patches/patch-module_embed_per-process_Makefile.in
@@ -0,0 +1,12 @@
+$NetBSD: patch-module_embed_per-process_Makefile.in,v 1.1 2012/02/03 02:46:39 sbd Exp $
+
+--- module/embed/per-process/Makefile.in.orig	2009-09-29 03:43:58.000000000 +0000
++++ module/embed/per-process/Makefile.in
+@@ -360,7 +360,6 @@ INCLUDES = \
+ per_process_la_CPPFLAGS = \
+ 	-DGTK_DISABLE_DEPRECATED=1		\
+ 	-DGDK_DISABLE_DEPRECATED=1		\
+-	-DG_DISABLE_DEPRECATED=1		\
+ 	-DG_LOG_DOMAIN=\"Kazehakase-PerProcess\"
+ 
+ per_process_la_LDFLAGS = \
diff --git a/www/kazehakase/patches/patch-module_embed_webkit-gtk_Makefile.am b/www/kazehakase/patches/patch-module_embed_webkit-gtk_Makefile.am
new file mode 100644
index 00000000000..5ab85805845
--- /dev/null
+++ b/www/kazehakase/patches/patch-module_embed_webkit-gtk_Makefile.am
@@ -0,0 +1,12 @@
+$NetBSD: patch-module_embed_webkit-gtk_Makefile.am,v 1.1 2012/02/03 02:46:39 sbd Exp $
+
+--- module/embed/webkit-gtk/Makefile.am.orig	2009-09-29 03:38:19.000000000 +0000
++++ module/embed/webkit-gtk/Makefile.am
+@@ -16,7 +16,6 @@ INCLUDES =						\
+ webkit_gtk_la_CPPFLAGS=				\
+ 	-DGTK_DISABLE_DEPRECATED=1		\
+ 	-DGDK_DISABLE_DEPRECATED=1		\
+-	-DG_DISABLE_DEPRECATED=1		\
+ 	-DG_LOG_DOMAIN=\"Kazehakase-WebKit/GTK+\"
+ 
+ webkit_gtk_la_LDFLAGS =			\
diff --git a/www/kazehakase/patches/patch-module_embed_webkit-gtk_Makefile.in b/www/kazehakase/patches/patch-module_embed_webkit-gtk_Makefile.in
new file mode 100644
index 00000000000..4690f25354b
--- /dev/null
+++ b/www/kazehakase/patches/patch-module_embed_webkit-gtk_Makefile.in
@@ -0,0 +1,12 @@
+$NetBSD: patch-module_embed_webkit-gtk_Makefile.in,v 1.1 2012/02/03 02:46:39 sbd Exp $
+
+--- module/embed/webkit-gtk/Makefile.in.orig	2009-09-29 03:43:58.000000000 +0000
++++ module/embed/webkit-gtk/Makefile.in
+@@ -341,7 +341,6 @@ INCLUDES = \
+ webkit_gtk_la_CPPFLAGS = \
+ 	-DGTK_DISABLE_DEPRECATED=1		\
+ 	-DGDK_DISABLE_DEPRECATED=1		\
+-	-DG_DISABLE_DEPRECATED=1		\
+ 	-DG_LOG_DOMAIN=\"Kazehakase-WebKit/GTK+\"
+ 
+ webkit_gtk_la_LDFLAGS = \
diff --git a/www/kazehakase/patches/patch-module_search_Makefile.am b/www/kazehakase/patches/patch-module_search_Makefile.am
new file mode 100644
index 00000000000..0445a24719f
--- /dev/null
+++ b/www/kazehakase/patches/patch-module_search_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD: patch-module_search_Makefile.am,v 1.1 2012/02/03 02:46:39 sbd Exp $
+
+--- module/search/Makefile.am.orig	2009-09-29 03:38:19.000000000 +0000
++++ module/search/Makefile.am
+@@ -2,8 +2,7 @@ CLEANFILES = *~ *.bak
+ 
+ AM_CPPFLAGS =					\
+ 	-DGTK_DISABLE_DEPRECATED=1		\
+-	-DGDK_DISABLE_DEPRECATED=1		\
+-	-DG_DISABLE_DEPRECATED=1
++	-DGDK_DISABLE_DEPRECATED=1
+ 
+ INCLUDES = $(GLIB_CFLAGS)			\
+ 	$(GTK_CFLAGS)				\
diff --git a/www/kazehakase/patches/patch-module_search_Makefile.in b/www/kazehakase/patches/patch-module_search_Makefile.in
new file mode 100644
index 00000000000..85af23a21ec
--- /dev/null
+++ b/www/kazehakase/patches/patch-module_search_Makefile.in
@@ -0,0 +1,14 @@
+$NetBSD: patch-module_search_Makefile.in,v 1.1 2012/02/03 02:46:39 sbd Exp $
+
+--- module/search/Makefile.in.orig	2009-09-29 03:43:58.000000000 +0000
++++ module/search/Makefile.in
+@@ -116,8 +116,7 @@ AMTAR = @AMTAR@
+ AM_CFLAGS = @AM_CFLAGS@
+ AM_CPPFLAGS = \
+ 	-DGTK_DISABLE_DEPRECATED=1		\
+-	-DGDK_DISABLE_DEPRECATED=1		\
+-	-DG_DISABLE_DEPRECATED=1
++	-DGDK_DISABLE_DEPRECATED=1
+ 
+ AM_CXXFLAGS = @AM_CXXFLAGS@
+ AM_LDFLAGS = @AM_LDFLAGS@