[gdlmm/f17] Add a patch to fix build with libgdl 3.4.2
Kalev Lember
kalev at fedoraproject.org
Sun Apr 22 21:42:01 UTC 2012
commit 5fa9c5d6e24013080ec6be71c904c89211a0d0cf
Author: Kalev Lember <kalevlember at gmail.com>
Date: Mon Apr 23 00:26:53 2012 +0300
Add a patch to fix build with libgdl 3.4.2
...Don-t-wrap-gdl_dock_layout_get_layouts_ui.patch | 58 ++++++++++++++++++++
gdlmm.spec | 3 +
2 files changed, 61 insertions(+), 0 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 0000000..c8e3218
--- /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 at 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/gdlmm.spec b/gdlmm.spec
index de84dc6..e1f5666 100644
--- a/gdlmm.spec
+++ b/gdlmm.spec
@@ -10,6 +10,7 @@ Summary: C++ bindings for the gdl library
License: LGPLv2+
URL: http://www.gtkmm.org/
Source0: http://ftp.gnome.org/pub/GNOME/sources/gdlmm/%{release_version}/gdlmm-%{version}.tar.xz
+Patch0: 0001-Don-t-wrap-gdl_dock_layout_get_layouts_ui.patch
BuildRequires: glibmm24-devel
BuildRequires: gtkmm30-devel
@@ -40,6 +41,7 @@ This package contains the full API documentation for %{name}.
%prep
%setup -q
+%patch0 -p1 -b .get_layouts_ui
%build
@@ -79,6 +81,7 @@ make check
%changelog
* Mon Apr 23 2012 Kalev Lember <kalevlember at gmail.com> - 3.3.2-1
- Update to 3.3.2
+- Add a patch to fix build with libgdl 3.4.2
* Sun Apr 22 2012 Kalev Lember <kalevlember at gmail.com> - 3.2.1-4
- Rebuilt for libgdl 3.4.2 soname bump
More information about the scm-commits
mailing list