Hello community, here is the log from the commit of package gdlmm for openSUSE:Factory checked in at 2012-12-05 13:51:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gdlmm (Old) and /work/SRC/openSUSE:Factory/.gdlmm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gdlmm", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/gdlmm/gdlmm.changes 2012-10-04 18:39:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gdlmm.new/gdlmm.changes 2012-12-05 13:51:49.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Nov 26 20:44:59 UTC 2012 - [email protected] + +- Add gdlmm-gdl-3_6.patch: Fix build with gdl 3.6.0. + +------------------------------------------------------------------- New: ---- gdlmm-gdl-3_6.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gdlmm.spec ++++++ --- /var/tmp/diff_new_pack.r7q8lT/_old 2012-12-05 13:51:49.000000000 +0100 +++ /var/tmp/diff_new_pack.r7q8lT/_new 2012-12-05 13:51:49.000000000 +0100 @@ -26,6 +26,8 @@ Source0: http://download.gnome.org/sources/gdlmm/3.3/%{name}-%{version}.tar.xz # PATCH-FIX-UPSTREAM gdlmm-gdl-3_4.patch [email protected] -- Fix build with gdl 3.4.0. Taken from git. Patch0: gdlmm-gdl-3_4.patch +# PATCH-FIX-UPSTREAM gdlmm-gdl-3_6.patch bgo#688095 bgo#688141 [email protected] -- Fix build with gdl 3.6.0 +Patch1: gdlmm-gdl-3_6.patch # Needed for patch0 BuildRequires: doxygen BuildRequires: gcc-c++ @@ -60,6 +62,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build # --enable-maintainer-mode and --enable-documentation are needed fro patch0. ++++++ gdlmm-gdl-3_6.patch ++++++ >From 109d5057309be10a7d7b481082348e8054e060a1 Mon Sep 17 00:00:00 2001 From: Alban Browaeys <[email protected]> Date: Mon, 12 Nov 2012 06:38:39 +0100 Subject: [PATCH] Upgrade to gdl 3.6. --- gdl/src/dockbar.ccg | 2 +- gdl/src/dockitem.ccg | 8 ++------ gdl/src/docklayout.ccg | 2 +- gdl/src/dockobject.ccg | 5 ----- gdl/src/dockobject.hg | 3 ++- gdl/src/gdl_enum.defs | 11 ----------- gdl/src/gdl_method.defs | 24 ++++++++++++------------ 7 files changed, 18 insertions(+), 37 deletions(-) diff --git a/gdl/src/dockbar.ccg b/gdl/src/dockbar.ccg index 2b41af2..a11018c 100644 --- a/gdl/src/dockbar.ccg +++ b/gdl/src/dockbar.ccg @@ -23,7 +23,7 @@ namespace Gdl DockBar::DockBar(Dock& dock) : - _CONSTRUCT("master", GDL_DOCK_OBJECT_GET_MASTER(dock.gobj())) + _CONSTRUCT("master", gdl_dock_object_get_master(GDL_DOCK_OBJECT(dock.gobj()))) { } diff --git a/gdl/src/dockitem.ccg b/gdl/src/dockitem.ccg index 8ad987e..b671522 100644 --- a/gdl/src/dockitem.ccg +++ b/gdl/src/dockitem.ccg @@ -26,9 +26,7 @@ DockItem::DockItem(const Glib::ustring& name, const Glib::ustring& long_name, Do _CONSTRUCT("name", name.c_str(), "long-name", long_name.c_str(), "behavior", static_cast<GdlDockItemBehavior>(behavior)) { GdlDockItem* item = this->gobj(); - int flags = GDL_DOCK_OBJECT(item)->flags; - flags &= ~GDL_DOCK_AUTOMATIC; - GDL_DOCK_OBJECT(item)->flags = static_cast<GdlDockObjectFlags>(flags); + gdl_dock_object_set_manual(GDL_DOCK_OBJECT(item)); gdl_dock_item_set_tablabel(item, gtk_label_new(long_name.c_str())); } @@ -37,9 +35,7 @@ DockItem::DockItem(const Glib::ustring& name, const Glib::ustring& long_name, co _CONSTRUCT("name", name.c_str(), "long-name", long_name.c_str(), "stock-id", stock_id.get_c_str(), "behavior", static_cast<GdlDockItemBehavior>(behavior)) { GdlDockItem* item = this->gobj(); - int flags = GDL_DOCK_OBJECT(item)->flags; - flags &= ~GDL_DOCK_AUTOMATIC; - GDL_DOCK_OBJECT(item)->flags = static_cast<GdlDockObjectFlags>(flags); + gdl_dock_object_set_manual(GDL_DOCK_OBJECT(item)); gdl_dock_item_set_tablabel(item, gtk_label_new(long_name.c_str())); } diff --git a/gdl/src/docklayout.ccg b/gdl/src/docklayout.ccg index 6938833..69b4c95 100644 --- a/gdl/src/docklayout.ccg +++ b/gdl/src/docklayout.ccg @@ -21,7 +21,7 @@ namespace Gdl DockLayout::DockLayout(Dock& dock) : - _CONSTRUCT("master", GDL_DOCK_OBJECT_GET_MASTER(dock.gobj())) + _CONSTRUCT("master", gdl_dock_object_get_master(GDL_DOCK_OBJECT(dock.gobj()))) { } diff --git a/gdl/src/dockobject.ccg b/gdl/src/dockobject.ccg index 118a494..48e0003 100644 --- a/gdl/src/dockobject.ccg +++ b/gdl/src/dockobject.ccg @@ -44,9 +44,4 @@ bool DockObject::reorder(DockObject& child, const Glib::ValueBase& other_data, D return gdl_dock_object_reorder(gobj(), child.gobj(), static_cast<GdlDockPlacement>(new_position), const_cast<GValue*>(other_data.gobj())); } -Glib::RefPtr<DockMaster> DockObject::get_master() -{ - return Glib::wrap(GDL_DOCK_OBJECT_GET_MASTER(gobj()), true); -} - } // namespace Gdl diff --git a/gdl/src/dockobject.hg b/gdl/src/dockobject.hg index d3524ff..017b482 100644 --- a/gdl/src/dockobject.hg +++ b/gdl/src/dockobject.hg @@ -30,7 +30,6 @@ _CC_INCLUDE(gdl/gdl-dock-object.h) class DockMaster; _WRAP_ENUM(DockParamFlags, GdlDockParamFlags) -_WRAP_ENUM(DockObjectFlags, GdlDockObjectFlags, NO_GTYPE) _WRAP_ENUM(DockPlacement, GdlDockPlacement, NO_GTYPE) class DockObject : public Gtk::Container @@ -74,6 +73,8 @@ public: _WRAP_METHOD(void present(DockObject& child), gdl_dock_object_present) _WRAP_METHOD(bool child_placement(DockObject& child, DockPlacement placement = static_cast<DockPlacement>(DOCK_NONE)), gdl_dock_object_child_placement) + _WRAP_METHOD(bool is_automatic(), gdl_dock_object_is_automatic) + _WRAP_METHOD(void set_manual(), gdl_dock_object_set_manual) Glib::RefPtr<DockMaster> get_master(); diff --git a/gdl/src/gdl_enum.defs b/gdl/src/gdl_enum.defs index c5077d5..ffa32db 100644 --- a/gdl/src/gdl_enum.defs +++ b/gdl/src/gdl_enum.defs @@ -70,17 +70,6 @@ ) ) -(define-flags-extended DockObjectFlags - (in-module "Gdl") - (c-name "GdlDockObjectFlags") - (values - '("automatic" "GDL_DOCK_AUTOMATIC" "1 << 0") - '("attached" "GDL_DOCK_ATTACHED" "1 << 1") - '("in-reflow" "GDL_DOCK_IN_REFLOW" "1 << 2") - '("in-detach" "GDL_DOCK_IN_DETACH" "1 << 3") - ) -) - (define-enum-extended DockPlacement (in-module "Gdl") (c-name "GdlDockPlacement") diff --git a/gdl/src/gdl_method.defs b/gdl/src/gdl_method.defs index a7f84bb..2ffc86d 100644 --- a/gdl/src/gdl_method.defs +++ b/gdl/src/gdl_method.defs @@ -120,18 +120,6 @@ ) ) -(define-flags DockObjectFlags - (in-module "Gdl") - (c-name "GdlDockObjectFlags") - (gtype-id "GDL_TYPE_DOCK_OBJECT_FLAGS") - (values - '("automatic" "GDL_DOCK_AUTOMATIC") - '("attached" "GDL_DOCK_ATTACHED") - '("in-reflow" "GDL_DOCK_IN_REFLOW") - '("in-detach" "GDL_DOCK_IN_DETACH") - ) -) - (define-enum DockPlacement (in-module "Gdl") (c-name "GdlDockPlacement") @@ -755,6 +743,18 @@ ) ) +(define-method is_automatic + (of-object "GdlDockObject") + (c-name "gdl_dock_object_is_automatic") + (return-type "gboolean") +) + +(define-method set_manual + (of-object "GdlDockObject") + (c-name "gdl_dock_object_set_manual") + (return-type "none") +) + (define-function gdl_dock_param_get_type (c-name "gdl_dock_param_get_type") (return-type "GType") -- 1.8.0 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
