Update GDL to 3.10.0 for the Gnome 3 version.

5 files changed, 140 insertions, 119 deletions

diff --git a/devel/gdl/Makefile b/devel/gdl/Makefile
index 612fd2aecc6..949bf66c32e 100644
--- a/devel/gdl/Makefile
+++ b/devel/gdl/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.44 2013/09/02 19:50:43 adam Exp $
+# $NetBSD: Makefile,v 1.45 2013/10/06 19:59:42 joerg Exp $
 
-DISTNAME=	gdl-2.26.2
-PKGREVISION=	27
+DISTNAME=	gdl-3.10.0
 CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gdl/2.26/}
-EXTRACT_SUFX=	.tar.bz2
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gdl/3.10/}
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
@@ -15,7 +14,7 @@ GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config perl intltool msgfmt gmake
 
-PKGCONFIG_OVERRIDE+=	gdl-1.0.pc.in
+PKGCONFIG_OVERRIDE+=	gdl-3.0.pc.in
 
 .include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
diff --git a/devel/gdl/PLIST b/devel/gdl/PLIST
index c603661bcf8..cb088427f5b 100644
--- a/devel/gdl/PLIST
+++ b/devel/gdl/PLIST
@@ -1,106 +1,115 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 17:48:44 joerg Exp $
-include/libgdl-1.0/gdl/gdl-combo-button.h
-include/libgdl-1.0/gdl/gdl-dock-bar.h
-include/libgdl-1.0/gdl/gdl-dock-item.h
-include/libgdl-1.0/gdl/gdl-dock-layout.h
-include/libgdl-1.0/gdl/gdl-dock-master.h
-include/libgdl-1.0/gdl/gdl-dock-notebook.h
-include/libgdl-1.0/gdl/gdl-dock-object.h
-include/libgdl-1.0/gdl/gdl-dock-paned.h
-include/libgdl-1.0/gdl/gdl-dock-placeholder.h
-include/libgdl-1.0/gdl/gdl-dock-tablabel.h
-include/libgdl-1.0/gdl/gdl-dock.h
-include/libgdl-1.0/gdl/gdl-stock-icons.h
-include/libgdl-1.0/gdl/gdl-stock.h
-include/libgdl-1.0/gdl/gdl-switcher.h
-include/libgdl-1.0/gdl/gdl-tools.h
-include/libgdl-1.0/gdl/gdl.h
-include/libgdl-1.0/gdl/libgdltypebuiltins.h
-lib/libgdl-1.la
-lib/pkgconfig/gdl-1.0.pc
-share/gdl/glade/layout.glade
-share/gtk-doc/html/gdl/GdlDock.html
-share/gtk-doc/html/gdl/GdlDockBar.html
-share/gtk-doc/html/gdl/GdlDockItem.html
-share/gtk-doc/html/gdl/GdlDockLayout.html
-share/gtk-doc/html/gdl/GdlDockMaster.html
-share/gtk-doc/html/gdl/GdlDockNotebook.html
-share/gtk-doc/html/gdl/GdlDockObject.html
-share/gtk-doc/html/gdl/GdlDockPaned.html
-share/gtk-doc/html/gdl/GdlDockPlaceholder.html
-share/gtk-doc/html/gdl/GdlDockTablabel.html
-share/gtk-doc/html/gdl/GdlSwitcher.html
-share/gtk-doc/html/gdl/gdl-gdl-tools.html
-share/gtk-doc/html/gdl/gdl-main.html
-share/gtk-doc/html/gdl/gdl.devhelp
-share/gtk-doc/html/gdl/gdl.devhelp2
-share/gtk-doc/html/gdl/home.png
-share/gtk-doc/html/gdl/index.html
-share/gtk-doc/html/gdl/index.sgml
-share/gtk-doc/html/gdl/left.png
-share/gtk-doc/html/gdl/right.png
-share/gtk-doc/html/gdl/style.css
-share/gtk-doc/html/gdl/up.png
-share/locale/am/LC_MESSAGES/gdl-1.mo
-share/locale/ar/LC_MESSAGES/gdl-1.mo
-share/locale/ast/LC_MESSAGES/gdl-1.mo
-share/locale/az/LC_MESSAGES/gdl-1.mo
-share/locale/be/LC_MESSAGES/gdl-1.mo
-share/locale/bg/LC_MESSAGES/gdl-1.mo
-share/locale/ca/LC_MESSAGES/gdl-1.mo
-share/locale/ca@valencia/LC_MESSAGES/gdl-1.mo
-share/locale/cs/LC_MESSAGES/gdl-1.mo
-share/locale/da/LC_MESSAGES/gdl-1.mo
-share/locale/de/LC_MESSAGES/gdl-1.mo
-share/locale/dz/LC_MESSAGES/gdl-1.mo
-share/locale/el/LC_MESSAGES/gdl-1.mo
-share/locale/en_CA/LC_MESSAGES/gdl-1.mo
-share/locale/en_GB/LC_MESSAGES/gdl-1.mo
-share/locale/es/LC_MESSAGES/gdl-1.mo
-share/locale/et/LC_MESSAGES/gdl-1.mo
-share/locale/eu/LC_MESSAGES/gdl-1.mo
-share/locale/fi/LC_MESSAGES/gdl-1.mo
-share/locale/fr/LC_MESSAGES/gdl-1.mo
-share/locale/ga/LC_MESSAGES/gdl-1.mo
-share/locale/gl/LC_MESSAGES/gdl-1.mo
-share/locale/gu/LC_MESSAGES/gdl-1.mo
-share/locale/he/LC_MESSAGES/gdl-1.mo
-share/locale/hi/LC_MESSAGES/gdl-1.mo
-share/locale/hr/LC_MESSAGES/gdl-1.mo
-share/locale/hu/LC_MESSAGES/gdl-1.mo
-share/locale/it/LC_MESSAGES/gdl-1.mo
-share/locale/ja/LC_MESSAGES/gdl-1.mo
-share/locale/ko/LC_MESSAGES/gdl-1.mo
-share/locale/lt/LC_MESSAGES/gdl-1.mo
-share/locale/lv/LC_MESSAGES/gdl-1.mo
-share/locale/mk/LC_MESSAGES/gdl-1.mo
-share/locale/ml/LC_MESSAGES/gdl-1.mo
-share/locale/mr/LC_MESSAGES/gdl-1.mo
-share/locale/nb/LC_MESSAGES/gdl-1.mo
-share/locale/ne/LC_MESSAGES/gdl-1.mo
-share/locale/nl/LC_MESSAGES/gdl-1.mo
-share/locale/oc/LC_MESSAGES/gdl-1.mo
-share/locale/or/LC_MESSAGES/gdl-1.mo
-share/locale/pa/LC_MESSAGES/gdl-1.mo
-share/locale/pl/LC_MESSAGES/gdl-1.mo
-share/locale/ps/LC_MESSAGES/gdl-1.mo
-share/locale/pt/LC_MESSAGES/gdl-1.mo
-share/locale/pt_BR/LC_MESSAGES/gdl-1.mo
-share/locale/ro/LC_MESSAGES/gdl-1.mo
-share/locale/ru/LC_MESSAGES/gdl-1.mo
-share/locale/rw/LC_MESSAGES/gdl-1.mo
-share/locale/si/LC_MESSAGES/gdl-1.mo
-share/locale/sk/LC_MESSAGES/gdl-1.mo
-share/locale/sl/LC_MESSAGES/gdl-1.mo
-share/locale/sq/LC_MESSAGES/gdl-1.mo
-share/locale/sr/LC_MESSAGES/gdl-1.mo
-share/locale/sr@latin/LC_MESSAGES/gdl-1.mo
-share/locale/sv/LC_MESSAGES/gdl-1.mo
-share/locale/te/LC_MESSAGES/gdl-1.mo
-share/locale/th/LC_MESSAGES/gdl-1.mo
-share/locale/tr/LC_MESSAGES/gdl-1.mo
-share/locale/uk/LC_MESSAGES/gdl-1.mo
-share/locale/vi/LC_MESSAGES/gdl-1.mo
-share/locale/zh_CN/LC_MESSAGES/gdl-1.mo
-share/locale/zh_HK/LC_MESSAGES/gdl-1.mo
-share/locale/zh_TW/LC_MESSAGES/gdl-1.mo
+@comment $NetBSD: PLIST,v 1.8 2013/10/06 19:59:42 joerg Exp $
+include/libgdl-3.0/gdl/gdl-dock-bar.h
+include/libgdl-3.0/gdl/gdl-dock-item-grip.h
+include/libgdl-3.0/gdl/gdl-dock-item.h
+include/libgdl-3.0/gdl/gdl-dock-layout.h
+include/libgdl-3.0/gdl/gdl-dock-master.h
+include/libgdl-3.0/gdl/gdl-dock-object.h
+include/libgdl-3.0/gdl/gdl-dock-placeholder.h
+include/libgdl-3.0/gdl/gdl-dock.h
+include/libgdl-3.0/gdl/gdl.h
+include/libgdl-3.0/gdl/libgdltypebuiltins.h
+lib/libgdl-3.la
+lib/locale/am/LC_MESSAGES/gdl-3.mo
+lib/locale/ar/LC_MESSAGES/gdl-3.mo
+lib/locale/as/LC_MESSAGES/gdl-3.mo
+lib/locale/ast/LC_MESSAGES/gdl-3.mo
+lib/locale/az/LC_MESSAGES/gdl-3.mo
+lib/locale/be/LC_MESSAGES/gdl-3.mo
+lib/locale/bg/LC_MESSAGES/gdl-3.mo
+lib/locale/bn/LC_MESSAGES/gdl-3.mo
+lib/locale/ca/LC_MESSAGES/gdl-3.mo
+lib/locale/ca@valencia/LC_MESSAGES/gdl-3.mo
+lib/locale/cs/LC_MESSAGES/gdl-3.mo
+lib/locale/da/LC_MESSAGES/gdl-3.mo
+lib/locale/de/LC_MESSAGES/gdl-3.mo
+lib/locale/dz/LC_MESSAGES/gdl-3.mo
+lib/locale/el/LC_MESSAGES/gdl-3.mo
+lib/locale/en@shaw/LC_MESSAGES/gdl-3.mo
+lib/locale/en_CA/LC_MESSAGES/gdl-3.mo
+lib/locale/en_GB/LC_MESSAGES/gdl-3.mo
+lib/locale/eo/LC_MESSAGES/gdl-3.mo
+lib/locale/es/LC_MESSAGES/gdl-3.mo
+lib/locale/et/LC_MESSAGES/gdl-3.mo
+lib/locale/eu/LC_MESSAGES/gdl-3.mo
+lib/locale/fi/LC_MESSAGES/gdl-3.mo
+lib/locale/fr/LC_MESSAGES/gdl-3.mo
+lib/locale/ga/LC_MESSAGES/gdl-3.mo
+lib/locale/gl/LC_MESSAGES/gdl-3.mo
+lib/locale/gu/LC_MESSAGES/gdl-3.mo
+lib/locale/he/LC_MESSAGES/gdl-3.mo
+lib/locale/hi/LC_MESSAGES/gdl-3.mo
+lib/locale/hr/LC_MESSAGES/gdl-3.mo
+lib/locale/hu/LC_MESSAGES/gdl-3.mo
+lib/locale/hy/LC_MESSAGES/gdl-3.mo
+lib/locale/id/LC_MESSAGES/gdl-3.mo
+lib/locale/it/LC_MESSAGES/gdl-3.mo
+lib/locale/ja/LC_MESSAGES/gdl-3.mo
+lib/locale/km/LC_MESSAGES/gdl-3.mo
+lib/locale/ko/LC_MESSAGES/gdl-3.mo
+lib/locale/lt/LC_MESSAGES/gdl-3.mo
+lib/locale/lv/LC_MESSAGES/gdl-3.mo
+lib/locale/mai/LC_MESSAGES/gdl-3.mo
+lib/locale/mk/LC_MESSAGES/gdl-3.mo
+lib/locale/ml/LC_MESSAGES/gdl-3.mo
+lib/locale/mr/LC_MESSAGES/gdl-3.mo
+lib/locale/nb/LC_MESSAGES/gdl-3.mo
+lib/locale/ne/LC_MESSAGES/gdl-3.mo
+lib/locale/nl/LC_MESSAGES/gdl-3.mo
+lib/locale/oc/LC_MESSAGES/gdl-3.mo
+lib/locale/or/LC_MESSAGES/gdl-3.mo
+lib/locale/pa/LC_MESSAGES/gdl-3.mo
+lib/locale/pl/LC_MESSAGES/gdl-3.mo
+lib/locale/ps/LC_MESSAGES/gdl-3.mo
+lib/locale/pt/LC_MESSAGES/gdl-3.mo
+lib/locale/pt_BR/LC_MESSAGES/gdl-3.mo
+lib/locale/ro/LC_MESSAGES/gdl-3.mo
+lib/locale/ru/LC_MESSAGES/gdl-3.mo
+lib/locale/rw/LC_MESSAGES/gdl-3.mo
+lib/locale/si/LC_MESSAGES/gdl-3.mo
+lib/locale/sk/LC_MESSAGES/gdl-3.mo
+lib/locale/sl/LC_MESSAGES/gdl-3.mo
+lib/locale/sq/LC_MESSAGES/gdl-3.mo
+lib/locale/sr/LC_MESSAGES/gdl-3.mo
+lib/locale/sr@latin/LC_MESSAGES/gdl-3.mo
+lib/locale/sv/LC_MESSAGES/gdl-3.mo
+lib/locale/te/LC_MESSAGES/gdl-3.mo
+lib/locale/tg/LC_MESSAGES/gdl-3.mo
+lib/locale/th/LC_MESSAGES/gdl-3.mo
+lib/locale/tr/LC_MESSAGES/gdl-3.mo
+lib/locale/ug/LC_MESSAGES/gdl-3.mo
+lib/locale/uk/LC_MESSAGES/gdl-3.mo
+lib/locale/vi/LC_MESSAGES/gdl-3.mo
+lib/locale/zh_CN/LC_MESSAGES/gdl-3.mo
+lib/locale/zh_HK/LC_MESSAGES/gdl-3.mo
+lib/locale/zh_TW/LC_MESSAGES/gdl-3.mo
+lib/pkgconfig/gdl-3.0.pc
+share/gtk-doc/html/gdl-3.0/GdlDock.html
+share/gtk-doc/html/gdl-3.0/GdlDockBar.html
+share/gtk-doc/html/gdl-3.0/GdlDockItem.html
+share/gtk-doc/html/gdl-3.0/GdlDockItemButtonImage.html
+share/gtk-doc/html/gdl-3.0/GdlDockItemGrip.html
+share/gtk-doc/html/gdl-3.0/GdlDockLayout.html
+share/gtk-doc/html/gdl-3.0/GdlDockMaster.html
+share/gtk-doc/html/gdl-3.0/GdlDockNotebook.html
+share/gtk-doc/html/gdl-3.0/GdlDockObject.html
+share/gtk-doc/html/gdl-3.0/GdlDockPaned.html
+share/gtk-doc/html/gdl-3.0/GdlDockPlaceholder.html
+share/gtk-doc/html/gdl-3.0/GdlDockTablabel.html
+share/gtk-doc/html/gdl-3.0/GdlPreviewWindow.html
+share/gtk-doc/html/gdl-3.0/GdlSwitcher.html
+share/gtk-doc/html/gdl-3.0/annotation-glossary.html
+share/gtk-doc/html/gdl-3.0/api-index-full.html
+share/gtk-doc/html/gdl-3.0/api.html
+share/gtk-doc/html/gdl-3.0/core.html
+share/gtk-doc/html/gdl-3.0/deprecated.html
+share/gtk-doc/html/gdl-3.0/gdl-3.0.devhelp2
+share/gtk-doc/html/gdl-3.0/home.png
+share/gtk-doc/html/gdl-3.0/index.html
+share/gtk-doc/html/gdl-3.0/index.sgml
+share/gtk-doc/html/gdl-3.0/left.png
+share/gtk-doc/html/gdl-3.0/private.html
+share/gtk-doc/html/gdl-3.0/right.png
+share/gtk-doc/html/gdl-3.0/style.css
+share/gtk-doc/html/gdl-3.0/up.png
+share/gtk-doc/html/gdl-3.0/widget.html
diff --git a/devel/gdl/buildlink3.mk b/devel/gdl/buildlink3.mk
index eeb8cf4d6dc..4fe8aad589f 100644
--- a/devel/gdl/buildlink3.mk
+++ b/devel/gdl/buildlink3.mk
@@ -1,12 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.30 2013/09/02 19:50:43 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.31 2013/10/06 19:59:42 joerg Exp $
 
 BUILDLINK_TREE+=	gdl
 
 .if !defined(GDL_BUILDLINK3_MK)
 GDL_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gdl+=	gdl>=0.6.1
-BUILDLINK_ABI_DEPENDS.gdl+=	gdl>=2.26.2nb27
+BUILDLINK_API_DEPENDS.gdl+=	gdl>=3.10
 BUILDLINK_PKGSRCDIR.gdl?=	../../devel/gdl
 
 .include "../../devel/libglade/buildlink3.mk"
diff --git a/devel/gdl/distinfo b/devel/gdl/distinfo
index f0a13ece6d6..0c0774f5e3e 100644
--- a/devel/gdl/distinfo
+++ b/devel/gdl/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.6 2009/05/19 21:23:45 wiz Exp $
+$NetBSD: distinfo,v 1.7 2013/10/06 19:59:42 joerg Exp $
 
-SHA1 (gdl-2.26.2.tar.bz2) = 29402c29c42fef5dc37748d4ff52e1f96e94f2b4
-RMD160 (gdl-2.26.2.tar.bz2) = c4a2dee8355f6b005490eda2cd0ef2399e2e5179
-Size (gdl-2.26.2.tar.bz2) = 552658 bytes
+SHA1 (gdl-3.10.0.tar.xz) = 7342f127c64e298cd33d90e661d34ecab842e92f
+RMD160 (gdl-3.10.0.tar.xz) = 3e08cbe532d54de26d5d2b9091db51e5878cc92d
+Size (gdl-3.10.0.tar.xz) = 526704 bytes
+SHA1 (patch-gdl_gdl-dock-bar.c) = e6fbdb23731529ad6871a2230325da9c5cd273b9
diff --git a/devel/gdl/patches/patch-gdl_gdl-dock-bar.c b/devel/gdl/patches/patch-gdl_gdl-dock-bar.c
new file mode 100644
index 00000000000..6456c8e7f0c
--- /dev/null
+++ b/devel/gdl/patches/patch-gdl_gdl-dock-bar.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-gdl_gdl-dock-bar.c,v 1.1 2013/10/06 19:59:42 joerg Exp $
+
+--- gdl/gdl-dock-bar.c.orig	2013-09-29 14:01:31.000000000 +0000
++++ gdl/gdl-dock-bar.c
+@@ -484,7 +484,7 @@ GdlDockBarStyle gdl_dock_bar_get_style(G
+ {
+     GdlDockBarStyle style;
+ 
+-    g_return_if_fail (GDL_IS_DOCK_BAR (dockbar));
++    g_return_val_if_fail (GDL_IS_DOCK_BAR (dockbar), GDL_DOCK_BAR_AUTO);
+ 
+     g_object_get(G_OBJECT(dockbar), "dockbar-style", &style, NULL);
+