Rebuild for gdl 3.6, apply a build fix from Fedora

2 files changed, 66 insertions, 3 deletions

diff --git a/0001-Don-t-wrap-gdl_dock_layout_get_layouts_ui.patch b/0001-Don-t-wrap-gdl_dock_layout_get_layouts_ui.patch
new file mode 100644
index 000000000000..c8e3218a9e58
--- /dev/null
+++ b/0001-Don-t-wrap-gdl_dock_layout_get_layouts_ui.patch
@@ -0,0 +1,58 @@
+From ce395bc27cf08e5f40c4ee4142cbb4795397ddc6 Mon Sep 17 00:00:00 2001
+From: Kalev Lember <kalevlember@gmail.com>
+Date: Sun, 22 Apr 2012 21:23:58 +0300
+Subject: [PATCH] Don't wrap gdl_dock_layout_get_layouts_ui
+
+Removed from gdl in commit 2b3b292.
+---
+ gdl/src/docklayout.hg   |    2 --
+ gdl/src/gdl_method.defs |    6 ------
+ 2 files changed, 8 deletions(-)
+
+diff --git a/gdl/src/docklayout.hg b/gdl/src/docklayout.hg
+index 155d58b..bf532a7 100644
+--- a/gdl/src/docklayout.hg
++++ b/gdl/src/docklayout.hg
+@@ -58,8 +58,6 @@ public:
+   
+   _WRAP_METHOD(bool is_dirty() const, gdl_dock_layout_is_dirty)
+   
+-  _WRAP_METHOD(Gtk::Widget* get_layouts_ui(), gdl_dock_layout_get_layouts_ui)
+-  
+   
+   _WRAP_PROPERTY("dirty", bool)
+   
+diff --git a/gdl/src/gdl_method.defs b/gdl/src/gdl_method.defs
+index a7f84bb..8c80bc7 100644
+--- a/gdl/src/gdl_method.defs
++++ b/gdl/src/gdl_method.defs
+@@ -556,12 +556,6 @@
+   (return-type "gboolean")
+ )
+ 
+-(define-method get_layouts_ui
+-  (of-object "GdlDockLayout")
+-  (c-name "gdl_dock_layout_get_layouts_ui")
+-  (return-type "GtkWidget*")
+-)
+-
+ 
+ 
+ ;; From gdl-dock-master.h
+-- 
+1.7.10
+
+--- gdlmm-3.3.2/gdl/gdlmm/docklayout.cc.get_layouts_ui	2011-11-23 19:47:10.000000000 +0200
++++ gdlmm-3.3.2/gdl/gdlmm/docklayout.cc	2012-04-23 00:35:26.839494884 +0300
+@@ -180,11 +180,6 @@
+   return gdl_dock_layout_is_dirty(const_cast<GdlDockLayout*>(gobj()));
+ }
+ 
+-Gtk::Widget* DockLayout::get_layouts_ui()
+-{
+-  return Glib::wrap(gdl_dock_layout_get_layouts_ui(gobj()));
+-}
+-
+ 
+ #ifdef GLIBMM_PROPERTIES_ENABLED
+ Glib::PropertyProxy_ReadOnly<bool> DockLayout::property_dirty() const
diff --git a/PKGBUILD b/PKGBUILD
index 4330470e3828..2b4cf8cb50f1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,24 @@
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 pkgname=gdlmm
 pkgver=3.3.2
-pkgrel=2
+pkgrel=3
 pkgdesc="C++ bindings for the gdl library"
 arch=('x86_64' 'i686')
 url="http://git.gnome.org/browse/gdlmm/"
 depends=('gdl' 'gtkmm3')
 options=(!libtool !emptydirs)
 license=('LGPL')
-source=("http://ftp.gnome.org/pub/GNOME/sources/gdlmm/3.3/$pkgname-$pkgver.tar.xz")
-sha256sums=('cf3253be052737332b2b6e9dbd6f62d79cbc3f3398497158c0099dbc45741a46')
+source=("http://ftp.gnome.org/pub/GNOME/sources/gdlmm/3.3/$pkgname-$pkgver.tar.xz"
+        "0001-Don-t-wrap-gdl_dock_layout_get_layouts_ui.patch")
+sha256sums=('cf3253be052737332b2b6e9dbd6f62d79cbc3f3398497158c0099dbc45741a46'
+            '8fb0d920c5c3d4279738f048cbff65b5b4fa544c9f004f8e64d39e54f52653d5')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  # Fix build with gdl 3.6
+  patch -Np1 -i "$srcdir/0001-Don-t-wrap-gdl_dock_layout_get_layouts_ui.patch"
+
   ./configure --prefix=/usr --sysconfdir=/etc
   make
 }