From 36d215719de1a9d6274e2c44ca0134cbb13dea32 Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Sun, 18 Nov 2012 17:50:32 +0000
Subject: [PATCH] Fix bgo#688585 - Unused docks don't disappear; from upstream.

---
 x11/gnome/gdl/Makefile                         |  3 ++-
 .../gdl/patches/patch-gdl_gdl-dock-item_c      | 17 +++++++++++++++++
 .../gdl/patches/patch-gdl_gdl-dock-notebook_c  | 18 ++++++++++++++++++
 3 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 x11/gnome/gdl/patches/patch-gdl_gdl-dock-item_c
 create mode 100644 x11/gnome/gdl/patches/patch-gdl_gdl-dock-notebook_c

diff --git a/x11/gnome/gdl/Makefile b/x11/gnome/gdl/Makefile
index 0ede2f2a658..cfc2ef7c047 100644
--- a/x11/gnome/gdl/Makefile
+++ b/x11/gnome/gdl/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.36 2012/11/10 11:06:38 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.37 2012/11/18 17:50:32 ajacoutot Exp $
 
 COMMENT=		GNOME Docking Library
 
 GNOME_PROJECT=		gdl
 GNOME_VERSION=		3.6.2
+REVISION=		0
 
 SHARED_LIBS +=  gdl-3                3.0      # 5.1
 
diff --git a/x11/gnome/gdl/patches/patch-gdl_gdl-dock-item_c b/x11/gnome/gdl/patches/patch-gdl_gdl-dock-item_c
new file mode 100644
index 00000000000..feb8c7f736b
--- /dev/null
+++ b/x11/gnome/gdl/patches/patch-gdl_gdl-dock-item_c
@@ -0,0 +1,17 @@
+$OpenBSD: patch-gdl_gdl-dock-item_c,v 1.1 2012/11/18 17:50:32 ajacoutot Exp $
+
+From 3db93576f0dfb4ef52871eb32b25f9a3b6488a18 Mon Sep 17 00:00:00 2001
+From: Sébastien Granjoux <seb.sfo@free.fr>
+Date: Sun, 18 Nov 2012 15:56:24 +0000
+Subject: Fix bgo#688585 - Unused docks don't disappear
+
+--- gdl/gdl-dock-item.c.orig	Sun Nov 18 18:45:32 2012
++++ gdl/gdl-dock-item.c	Sun Nov 18 18:45:43 2012
+@@ -467,7 +467,6 @@ gdl_dock_item_class_init (GdlDockItemClass *klass)
+                               _("Whether the widget is closed."),
+                               FALSE,
+                               G_PARAM_READWRITE |
+-                              GDL_DOCK_PARAM_AFTER |
+                               GDL_DOCK_PARAM_EXPORT));
+     
+     /**
diff --git a/x11/gnome/gdl/patches/patch-gdl_gdl-dock-notebook_c b/x11/gnome/gdl/patches/patch-gdl_gdl-dock-notebook_c
new file mode 100644
index 00000000000..89ab56805bf
--- /dev/null
+++ b/x11/gnome/gdl/patches/patch-gdl_gdl-dock-notebook_c
@@ -0,0 +1,18 @@
+$OpenBSD: patch-gdl_gdl-dock-notebook_c,v 1.1 2012/11/18 17:50:32 ajacoutot Exp $
+
+From b3695140112b02c6be3e0e356ae7d939cd1c85a2 Mon Sep 17 00:00:00 2001
+From: Carl-Anton Ingmarsson <ca.ingmarsson@gmail.com>
+Date: Thu, 15 Nov 2012 22:54:27 +0000
+Subject: gdl-dock-notebook: Fix gtk theme warning.
+
+--- gdl/gdl-dock-notebook.c.orig	Sun Aug  5 21:04:16 2012
++++ gdl/gdl-dock-notebook.c	Sun Nov 18 18:43:49 2012
+@@ -124,7 +124,7 @@ gdl_dock_notebook_class_init (GdlDockNotebookClass *kl
+     GdlDockItemClass   *item_class;
+     static const gchar notebook_style[] =
+        "* {\n"
+-           "padding: 2;\n"
++           "padding: 2px;\n"
+        "}";
+ 
+     g_object_class = G_OBJECT_CLASS (klass);