diff --git a/x11/gnome/gdlmm/Makefile b/x11/gnome/gdlmm/Makefile index 03dd02da09b..ba06fa97eb8 100644 --- a/x11/gnome/gdlmm/Makefile +++ b/x11/gnome/gdlmm/Makefile @@ -1,12 +1,10 @@ -# $OpenBSD: Makefile,v 1.4 2012/11/11 19:00:02 ajacoutot Exp $ - -BROKEN= https://bugzilla.gnome.org/show_bug.cgi?id=688095 +# $OpenBSD: Makefile,v 1.5 2012/12/07 08:13:52 ajacoutot Exp $ COMMENT= C++ binding for gdl GNOME_PROJECT= gdlmm GNOME_VERSION= 3.3.2 -REVISION= 0 +REVISION= 1 SHARED_LIBS += gdlmm-3.0 0.0 # 1.0 @@ -36,4 +34,13 @@ LIB_DEPENDS= x11/gnome/gdl \ CONFIGURE_ENV= ac_cv_path_DOT= \ ac_cv_path_DOXYGEN= +### XXX remove at next release ### +BUILD_DEPENDS+= devel/m4 +CONFIGURE_ENV+= ac_cv_path_DOXYGEN=doxygen +CONFIGURE_ARGS= --enable-maintainer-mode + +pre-configure: + ln -s /usr/local/bin/gm4 ${WRKDIR}/bin/m4 +################################## + .include diff --git a/x11/gnome/gdlmm/patches/patch-codegen_m4_convert_gdl_m4 b/x11/gnome/gdlmm/patches/patch-codegen_m4_convert_gdl_m4 new file mode 100644 index 00000000000..cd3a272a06f --- /dev/null +++ b/x11/gnome/gdlmm/patches/patch-codegen_m4_convert_gdl_m4 @@ -0,0 +1,17 @@ +$OpenBSD: patch-codegen_m4_convert_gdl_m4,v 1.1 2012/12/07 08:13:52 ajacoutot Exp $ + +From 64fc453594aa87a95cf449d7fbd76b067e994a4f Mon Sep 17 00:00:00 2001 +From: Alban Browaeys +Date: Mon, 12 Nov 2012 05:38:39 +0000 +Subject: Upgrade to gdl 3.6. + +--- codegen/m4/convert_gdl.m4.orig Wed Nov 23 18:40:16 2011 ++++ codegen/m4/convert_gdl.m4 Fri Dec 7 08:48:30 2012 +@@ -7,6 +7,7 @@ _CONVERSION(`DockItem&', `GdlDockItem*', $3.gobj()) + _CONVERSION(`Gtk::Requisition&', `GtkRequisition*', &$3) + _CONVERSION(`const DockObject&', `GdlDockObject*', $3.gobj()) + _CONVERSION(`GdlDockObject*', `DockObject&', `*Glib::wrap($3)') ++_CONVERSION(`GObject*', `Glib::RefPtr', Glib::wrap(GDL_DOCK_MASTER($3), true)) + + _CONVERSION(`GList*',`Glib::ListHandle',__FL2H_SHALLOW) + _CONVERSION(`GList*',`Glib::ListHandle',__FL2H_SHALLOW) diff --git a/x11/gnome/gdlmm/patches/patch-gdl_gdlmm_docklayout_cc b/x11/gnome/gdlmm/patches/patch-gdl_gdlmm_docklayout_cc deleted file mode 100644 index 196dda7e3bb..00000000000 --- a/x11/gnome/gdlmm/patches/patch-gdl_gdlmm_docklayout_cc +++ /dev/null @@ -1,18 +0,0 @@ -$OpenBSD: patch-gdl_gdlmm_docklayout_cc,v 1.1 2012/09/30 06:16:27 ajacoutot Exp $ - -Fix build with gdl >=3.6.0 (Fedora) - ---- gdl/gdlmm/docklayout.cc.orig Wed Nov 23 18:47:10 2011 -+++ gdl/gdlmm/docklayout.cc Sun Sep 30 08:10:13 2012 -@@ -180,11 +180,6 @@ bool DockLayout::is_dirty() const - return gdl_dock_layout_is_dirty(const_cast(gobj())); - } - --Gtk::Widget* DockLayout::get_layouts_ui() --{ -- return Glib::wrap(gdl_dock_layout_get_layouts_ui(gobj())); --} -- - - #ifdef GLIBMM_PROPERTIES_ENABLED - Glib::PropertyProxy_ReadOnly DockLayout::property_dirty() const diff --git a/x11/gnome/gdlmm/patches/patch-gdl_src_dockbar_ccg b/x11/gnome/gdlmm/patches/patch-gdl_src_dockbar_ccg new file mode 100644 index 00000000000..3c4b2d1f907 --- /dev/null +++ b/x11/gnome/gdlmm/patches/patch-gdl_src_dockbar_ccg @@ -0,0 +1,18 @@ +$OpenBSD: patch-gdl_src_dockbar_ccg,v 1.1 2012/12/07 08:13:52 ajacoutot Exp $ + +From 64fc453594aa87a95cf449d7fbd76b067e994a4f Mon Sep 17 00:00:00 2001 +From: Alban Browaeys +Date: Mon, 12 Nov 2012 05:38:39 +0000 +Subject: Upgrade to gdl 3.6. + +--- gdl/src/dockbar.ccg.orig Wed Nov 23 18:40:16 2011 ++++ gdl/src/dockbar.ccg Fri Dec 7 08:48:30 2012 +@@ -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/x11/gnome/gdlmm/patches/patch-gdl_src_dockitem_ccg b/x11/gnome/gdlmm/patches/patch-gdl_src_dockitem_ccg new file mode 100644 index 00000000000..96c0354400c --- /dev/null +++ b/x11/gnome/gdlmm/patches/patch-gdl_src_dockitem_ccg @@ -0,0 +1,31 @@ +$OpenBSD: patch-gdl_src_dockitem_ccg,v 1.1 2012/12/07 08:13:52 ajacoutot Exp $ + +From 64fc453594aa87a95cf449d7fbd76b067e994a4f Mon Sep 17 00:00:00 2001 +From: Alban Browaeys +Date: Mon, 12 Nov 2012 05:38:39 +0000 +Subject: Upgrade to gdl 3.6. + +--- gdl/src/dockitem.ccg.orig Wed Nov 23 18:40:16 2011 ++++ gdl/src/dockitem.ccg Fri Dec 7 08:48:30 2012 +@@ -26,9 +26,7 @@ DockItem::DockItem(const Glib::ustring& name, const Gl + _CONSTRUCT("name", name.c_str(), "long-name", long_name.c_str(), "behavior", static_cast(behavior)) + { + GdlDockItem* item = this->gobj(); +- int flags = GDL_DOCK_OBJECT(item)->flags; +- flags &= ~GDL_DOCK_AUTOMATIC; +- GDL_DOCK_OBJECT(item)->flags = static_cast(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 Gl + _CONSTRUCT("name", name.c_str(), "long-name", long_name.c_str(), "stock-id", stock_id.get_c_str(), "behavior", static_cast(behavior)) + { + GdlDockItem* item = this->gobj(); +- int flags = GDL_DOCK_OBJECT(item)->flags; +- flags &= ~GDL_DOCK_AUTOMATIC; +- GDL_DOCK_OBJECT(item)->flags = static_cast(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/x11/gnome/gdlmm/patches/patch-gdl_src_docklayout_ccg b/x11/gnome/gdlmm/patches/patch-gdl_src_docklayout_ccg new file mode 100644 index 00000000000..4d0976b4cfe --- /dev/null +++ b/x11/gnome/gdlmm/patches/patch-gdl_src_docklayout_ccg @@ -0,0 +1,18 @@ +$OpenBSD: patch-gdl_src_docklayout_ccg,v 1.1 2012/12/07 08:13:52 ajacoutot Exp $ + +From 64fc453594aa87a95cf449d7fbd76b067e994a4f Mon Sep 17 00:00:00 2001 +From: Alban Browaeys +Date: Mon, 12 Nov 2012 05:38:39 +0000 +Subject: Upgrade to gdl 3.6. + +--- gdl/src/docklayout.ccg.orig Wed Nov 23 18:40:16 2011 ++++ gdl/src/docklayout.ccg Fri Dec 7 08:48:30 2012 +@@ -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/x11/gnome/gdlmm/patches/patch-gdl_src_dockobject_ccg b/x11/gnome/gdlmm/patches/patch-gdl_src_dockobject_ccg new file mode 100644 index 00000000000..a80c92497f5 --- /dev/null +++ b/x11/gnome/gdlmm/patches/patch-gdl_src_dockobject_ccg @@ -0,0 +1,19 @@ +$OpenBSD: patch-gdl_src_dockobject_ccg,v 1.1 2012/12/07 08:13:52 ajacoutot Exp $ + +From 64fc453594aa87a95cf449d7fbd76b067e994a4f Mon Sep 17 00:00:00 2001 +From: Alban Browaeys +Date: Mon, 12 Nov 2012 05:38:39 +0000 +Subject: Upgrade to gdl 3.6. + +--- gdl/src/dockobject.ccg.orig Wed Nov 23 18:40:16 2011 ++++ gdl/src/dockobject.ccg Fri Dec 7 08:48:30 2012 +@@ -44,9 +44,4 @@ bool DockObject::reorder(DockObject& child, const Glib + return gdl_dock_object_reorder(gobj(), child.gobj(), static_cast(new_position), const_cast(other_data.gobj())); + } + +-Glib::RefPtr DockObject::get_master() +-{ +- return Glib::wrap(GDL_DOCK_OBJECT_GET_MASTER(gobj()), true); +-} +- + } // namespace Gdl diff --git a/x11/gnome/gdlmm/patches/patch-gdl_src_dockobject_hg b/x11/gnome/gdlmm/patches/patch-gdl_src_dockobject_hg new file mode 100644 index 00000000000..7a521df2596 --- /dev/null +++ b/x11/gnome/gdlmm/patches/patch-gdl_src_dockobject_hg @@ -0,0 +1,29 @@ +$OpenBSD: patch-gdl_src_dockobject_hg,v 1.1 2012/12/07 08:13:52 ajacoutot Exp $ + +From 64fc453594aa87a95cf449d7fbd76b067e994a4f Mon Sep 17 00:00:00 2001 +From: Alban Browaeys +Date: Mon, 12 Nov 2012 05:38:39 +0000 +Subject: Upgrade to gdl 3.6. + +--- gdl/src/dockobject.hg.orig Wed Nov 23 18:40:16 2011 ++++ gdl/src/dockobject.hg Fri Dec 7 08:48:30 2012 +@@ -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,8 +73,10 @@ class DockObject : public Gtk::Container (public) + _WRAP_METHOD(void present(DockObject& child), gdl_dock_object_present) + + _WRAP_METHOD(bool child_placement(DockObject& child, DockPlacement placement = static_cast(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 get_master(); ++ _WRAP_METHOD(Glib::RefPtr get_master(), gdl_dock_object_get_master) + + + _WRAP_PROPERTY("long-name", Glib::ustring) diff --git a/x11/gnome/gdlmm/patches/patch-gdl_src_gdl_enum_defs b/x11/gnome/gdlmm/patches/patch-gdl_src_gdl_enum_defs new file mode 100644 index 00000000000..14706cdbdc1 --- /dev/null +++ b/x11/gnome/gdlmm/patches/patch-gdl_src_gdl_enum_defs @@ -0,0 +1,27 @@ +$OpenBSD: patch-gdl_src_gdl_enum_defs,v 1.1 2012/12/07 08:13:52 ajacoutot Exp $ + +From 64fc453594aa87a95cf449d7fbd76b067e994a4f Mon Sep 17 00:00:00 2001 +From: Alban Browaeys +Date: Mon, 12 Nov 2012 05:38:39 +0000 +Subject: Upgrade to gdl 3.6. + +--- gdl/src/gdl_enum.defs.orig Wed Nov 23 18:40:16 2011 ++++ gdl/src/gdl_enum.defs Fri Dec 7 08:48:30 2012 +@@ -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/x11/gnome/gdlmm/patches/patch-gdl_src_gdl_method_defs b/x11/gnome/gdlmm/patches/patch-gdl_src_gdl_method_defs index 43939a0a64d..11100bd2e2d 100644 --- a/x11/gnome/gdlmm/patches/patch-gdl_src_gdl_method_defs +++ b/x11/gnome/gdlmm/patches/patch-gdl_src_gdl_method_defs @@ -1,19 +1,504 @@ -$OpenBSD: patch-gdl_src_gdl_method_defs,v 1.1 2012/09/30 06:16:27 ajacoutot Exp $ +$OpenBSD: patch-gdl_src_gdl_method_defs,v 1.2 2012/12/07 08:13:52 ajacoutot Exp $ -Fix build with gdl >=3.6.0 (Fedora) +From 64fc453594aa87a95cf449d7fbd76b067e994a4f Mon Sep 17 00:00:00 2001 +From: Alban Browaeys +Date: Mon, 12 Nov 2012 05:38:39 +0000 +Subject: Upgrade to gdl 3.6. --- gdl/src/gdl_method.defs.orig Wed Nov 23 18:40:16 2011 -+++ gdl/src/gdl_method.defs Sun Sep 30 08:10:13 2012 -@@ -556,12 +556,6 @@ ++++ gdl/src/gdl_method.defs Fri Dec 7 08:48:30 2012 +@@ -1,5 +1,12 @@ + ;; -*- scheme -*- + ; object definitions ... ++(define-object DockBar ++ (in-module "Gdl") ++ (parent "GtkBox") ++ (c-name "GdlDockBar") ++ (gtype-id "GDL_TYPE_DOCK_BAR") ++) ++ + (define-object DockItemGrip + (in-module "Gdl") + (parent "GtkContainer") +@@ -155,24 +162,12 @@ + (return-type "GType") + ) + +-(define-method bar_new +- (of-object "GdlDock") ++(define-function gdl_dock_bar_new + (c-name "gdl_dock_bar_new") ++ (is-constructor-of "GdlDockBar") + (return-type "GtkWidget*") +-) +- +-(define-method get_orientation +- (of-object "GdlDockBar") +- (c-name "gdl_dock_bar_get_orientation") +- (return-type "GtkOrientation") +-) +- +-(define-method set_orientation +- (of-object "GdlDockBar") +- (c-name "gdl_dock_bar_set_orientation") +- (return-type "none") + (parameters +- '("GtkOrientation" "orientation") ++ '("GObject*" "master") + ) + ) + +@@ -191,8 +186,14 @@ + (return-type "GdlDockBarStyle") + ) + ++(define-method get_orientation ++ (of-object "GdlDockBar") ++ (c-name "gdl_dock_bar_get_orientation") ++ (return-type "GtkOrientation") ++) + + ++ + ;; From gdl-dock.h + + (define-function gdl_dock_new +@@ -221,7 +222,7 @@ + (return-type "none") + (parameters + '("GdlDockItem*" "item") +- '("GdlDockPlacement" "place") ++ '("GdlDockPlacement" "placement") + ) + ) + +@@ -247,15 +248,6 @@ + ) + ) + +-(define-method get_placeholder_by_name +- (of-object "GdlDock") +- (c-name "gdl_dock_get_placeholder_by_name") +- (return-type "GdlDockPlaceholder*") +- (parameters +- '("const-gchar*" "name") +- ) +-) +- + (define-method get_named_items + (of-object "GdlDock") + (c-name "gdl_dock_get_named_items") +@@ -268,23 +260,56 @@ + (return-type "GdlDock*") + ) + +-(define-method xor_rect ++(define-method get_root + (of-object "GdlDock") +- (c-name "gdl_dock_xor_rect") ++ (c-name "gdl_dock_get_root") ++ (return-type "GdlDockObject*") ++) ++ ++(define-method show_preview ++ (of-object "GdlDock") ++ (c-name "gdl_dock_show_preview") + (return-type "none") + (parameters + '("GdkRectangle*" "rect") + ) + ) + +-(define-method xor_rect_hide ++(define-method hide_preview + (of-object "GdlDock") +- (c-name "gdl_dock_xor_rect_hide") ++ (c-name "gdl_dock_hide_preview") + (return-type "none") + ) + ++(define-method set_skip_taskbar ++ (of-object "GdlDock") ++ (c-name "gdl_dock_set_skip_taskbar") ++ (return-type "none") ++ (parameters ++ '("gboolean" "skip") ++ ) ++) + ++(define-method get_placeholder_by_name ++ (of-object "GdlDock") ++ (c-name "gdl_dock_get_placeholder_by_name") ++ (return-type "GdlDockPlaceholder*") ++ (parameters ++ '("const-gchar*" "name") ++ ) ++) + ++(define-method xor_rect ++ (of-object "GdlDock") ++ (c-name "gdl_dock_xor_rect") ++ (return-type "none") ++ (parameters ++ '("GdkRectangle*" "rect") ++ ) ++) ++ ++ ++ + ;; From gdl-dock-item-grip.h + + (define-function gdl_dock_item_grip_get_type +@@ -319,8 +344,26 @@ + (return-type "none") + ) + ++(define-method set_cursor ++ (of-object "GdlDockItemGrip") ++ (c-name "gdl_dock_item_grip_set_cursor") ++ (return-type "none") ++ (parameters ++ '("gboolean" "in_drag") ++ ) ++) + ++(define-method has_event ++ (of-object "GdlDockItemGrip") ++ (c-name "gdl_dock_item_grip_has_event") ++ (return-type "gboolean") ++ (parameters ++ '("GdkEvent*" "event") ++ ) ++) + ++ ++ + ;; From gdl-dock-item.h + + (define-function gdl_dock_item_new +@@ -345,6 +388,17 @@ + ) + ) + ++(define-function gdl_dock_item_new_with_pixbuf_icon ++ (c-name "gdl_dock_item_new_with_pixbuf_icon") ++ (return-type "GtkWidget*") ++ (parameters ++ '("const-gchar*" "name") ++ '("const-gchar*" "long_name") ++ '("const-GdkPixbuf*" "pixbuf_icon") ++ '("GdlDockItemBehavior" "behavior") ++ ) ++) ++ + (define-function gdl_dock_item_get_type + (c-name "gdl_dock_item_get_type") + (return-type "GType") +@@ -370,6 +424,37 @@ + ) + ) + ++(define-method get_orientation ++ (of-object "GdlDockItem") ++ (c-name "gdl_dock_item_get_orientation") ++ (return-type "GtkOrientation") ++) ++ ++(define-method set_behavior_flags ++ (of-object "GdlDockItem") ++ (c-name "gdl_dock_item_set_behavior_flags") ++ (return-type "none") ++ (parameters ++ '("GdlDockItemBehavior" "behavior") ++ '("gboolean" "clear") ++ ) ++) ++ ++(define-method unset_behavior_flags ++ (of-object "GdlDockItem") ++ (c-name "gdl_dock_item_unset_behavior_flags") ++ (return-type "none") ++ (parameters ++ '("GdlDockItemBehavior" "behavior") ++ ) ++) ++ ++(define-method get_behavior_flags ++ (of-object "GdlDockItem") ++ (c-name "gdl_dock_item_get_behavior_flags") ++ (return-type "GdlDockItemBehavior") ++) ++ + (define-method get_tablabel + (of-object "GdlDockItem") + (c-name "gdl_dock_item_get_tablabel") +@@ -409,6 +494,12 @@ + (return-type "none") + ) + ++(define-method notify_deselected ++ (of-object "GdlDockItem") ++ (c-name "gdl_dock_item_notify_deselected") ++ (return-type "none") ++) ++ + (define-method bind + (of-object "GdlDockItem") + (c-name "gdl_dock_item_bind") +@@ -472,8 +563,65 @@ + ) + ) + ++(define-method get_drag_area ++ (of-object "GdlDockItem") ++ (c-name "gdl_dock_item_get_drag_area") ++ (return-type "none") ++ (parameters ++ '("GdkRectangle*" "rect") ++ ) ++) + ++(define-method or_child_has_focus ++ (of-object "GdlDockItem") ++ (c-name "gdl_dock_item_or_child_has_focus") ++ (return-type "gboolean") ++) + ++(define-method is_placeholder ++ (of-object "GdlDockItem") ++ (c-name "gdl_dock_item_is_placeholder") ++ (return-type "gboolean") ++) ++ ++(define-method is_closed ++ (of-object "GdlDockItem") ++ (c-name "gdl_dock_item_is_closed") ++ (return-type "gboolean") ++) ++ ++(define-method is_iconified ++ (of-object "GdlDockItem") ++ (c-name "gdl_dock_item_is_iconified") ++ (return-type "gboolean") ++) ++ ++(define-method set_child ++ (of-object "GdlDockItem") ++ (c-name "gdl_dock_item_set_child") ++ (return-type "none") ++ (parameters ++ '("GtkWidget*" "child") ++ ) ++) ++ ++(define-method get_child ++ (of-object "GdlDockItem") ++ (c-name "gdl_dock_item_get_child") ++ (return-type "GtkWidget*") ++) ++ ++(define-method set_has_grip ++ (of-object "GdlDockItemClass") ++ (c-name "gdl_dock_item_class_set_has_grip") ++ (return-type "none") ++ (parameters ++ '("gboolean" "has_grip") ++ ) ++) ++ ++ ++ + ;; From gdl-dock-layout.h + + (define-function gdl_dock_layout_get_type +@@ -481,21 +629,30 @@ + (return-type "GType") + ) + +-(define-method layout_new +- (of-object "GdlDock") ++(define-function gdl_dock_layout_new + (c-name "gdl_dock_layout_new") ++ (is-constructor-of "GdlDockLayout") + (return-type "GdlDockLayout*") ++ (parameters ++ '("GObject*" "master") ++ ) + ) + +-(define-method attach ++(define-method set_master + (of-object "GdlDockLayout") +- (c-name "gdl_dock_layout_attach") ++ (c-name "gdl_dock_layout_set_master") + (return-type "none") + (parameters +- '("GdlDockMaster*" "master") ++ '("GObject*" "master") + ) + ) + ++(define-method get_master ++ (of-object "GdlDockLayout") ++ (c-name "gdl_dock_layout_get_master") ++ (return-type "GObject*") ++) ++ + (define-method load_layout + (of-object "GdlDockLayout") + (c-name "gdl_dock_layout_load_layout") +@@ -556,10 +713,13 @@ (return-type "gboolean") ) -(define-method get_layouts_ui -- (of-object "GdlDockLayout") ++(define-method attach + (of-object "GdlDockLayout") - (c-name "gdl_dock_layout_get_layouts_ui") - (return-type "GtkWidget*") --) -- ++ (c-name "gdl_dock_layout_attach") ++ (return-type "none") ++ (parameters ++ '("GdlDockMaster*" "master") ++ ) + ) - ;; From gdl-dock-master.h +@@ -634,8 +794,14 @@ + ) + ) + ++(define-method get_dock_name ++ (of-object "GdlDockMaster") ++ (c-name "gdl_dock_master_get_dock_name") ++ (return-type "gchar*") ++) + + ++ + ;; From gdl-dock-object.h + + (define-function gdl_dock_object_get_type +@@ -676,6 +842,12 @@ + (return-type "none") + ) + ++(define-method is_frozen ++ (of-object "GdlDockObject") ++ (c-name "gdl_dock_object_is_frozen") ++ (return-type "gboolean") ++) ++ + (define-method reduce + (of-object "GdlDockObject") + (c-name "gdl_dock_object_reduce") +@@ -725,6 +897,24 @@ + (return-type "gboolean") + ) + ++(define-method get_master ++ (of-object "GdlDockObject") ++ (c-name "gdl_dock_object_get_master") ++ (return-type "GObject*") ++) ++ ++(define-method get_controller ++ (of-object "GdlDockObject") ++ (c-name "gdl_dock_object_get_controller") ++ (return-type "GdlDockObject*") ++) ++ ++(define-method layout_changed_notify ++ (of-object "GdlDockObject") ++ (c-name "gdl_dock_object_layout_changed_notify") ++ (return-type "none") ++) ++ + (define-method reorder + (of-object "GdlDockObject") + (c-name "gdl_dock_object_reorder") +@@ -752,6 +942,84 @@ + (parameters + '("GdlDockObject*" "child") + '("GdlDockPlacement*" "placement") ++ ) ++) ++ ++(define-method is_closed ++ (of-object "GdlDockObject") ++ (c-name "gdl_dock_object_is_closed") ++ (return-type "gboolean") ++) ++ ++(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-method get_name ++ (of-object "GdlDockObject") ++ (c-name "gdl_dock_object_get_name") ++ (return-type "const-gchar*") ++) ++ ++(define-method set_name ++ (of-object "GdlDockObject") ++ (c-name "gdl_dock_object_set_name") ++ (return-type "none") ++ (parameters ++ '("const-gchar*" "name") ++ ) ++) ++ ++(define-method get_long_name ++ (of-object "GdlDockObject") ++ (c-name "gdl_dock_object_get_long_name") ++ (return-type "const-gchar*") ++) ++ ++(define-method set_long_name ++ (of-object "GdlDockObject") ++ (c-name "gdl_dock_object_set_long_name") ++ (return-type "none") ++ (parameters ++ '("const-gchar*" "name") ++ ) ++) ++ ++(define-method get_stock_id ++ (of-object "GdlDockObject") ++ (c-name "gdl_dock_object_get_stock_id") ++ (return-type "const-gchar*") ++) ++ ++(define-method set_stock_id ++ (of-object "GdlDockObject") ++ (c-name "gdl_dock_object_set_stock_id") ++ (return-type "none") ++ (parameters ++ '("const-gchar*" "stock_id") ++ ) ++) ++ ++(define-method get_pixbuf ++ (of-object "GdlDockObject") ++ (c-name "gdl_dock_object_get_pixbuf") ++ (return-type "GdkPixbuf*") ++) ++ ++(define-method set_pixbuf ++ (of-object "GdlDockObject") ++ (c-name "gdl_dock_object_set_pixbuf") ++ (return-type "none") ++ (parameters ++ '("GdkPixbuf*" "icon") + ) + ) + diff --git a/x11/gnome/gdlmm/pkg/PLIST b/x11/gnome/gdlmm/pkg/PLIST index 170856f001b..114219bcb39 100644 --- a/x11/gnome/gdlmm/pkg/PLIST +++ b/x11/gnome/gdlmm/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2012/04/13 15:18:07 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.2 2012/12/07 08:13:52 ajacoutot Exp $ %%SHARED%% include/gdlmm-3.0/ include/gdlmm-3.0/gdlmm/ @@ -29,82 +29,3 @@ lib/libgdlmm-3.0.a lib/libgdlmm-3.0.la lib/pkgconfig/ lib/pkgconfig/gdlmm-3.0.pc -share/devhelp/ -share/devhelp/books/ -share/devhelp/books/gdlmm-3.0/ -share/devhelp/books/gdlmm-3.0/gdlmm-3.0.devhelp2 -share/doc/gdlmm-3.0/ -share/doc/gdlmm-3.0/reference/ -share/doc/gdlmm-3.0/reference/gdlmm-3.0.tag -share/doc/gdlmm-3.0/reference/html/ -share/doc/gdlmm-3.0/reference/html/annotated.html -share/doc/gdlmm-3.0/reference/html/bc_s.png -share/doc/gdlmm-3.0/reference/html/classGdl_1_1Dock-members.html -share/doc/gdlmm-3.0/reference/html/classGdl_1_1Dock.html -share/doc/gdlmm-3.0/reference/html/classGdl_1_1DockBar-members.html -share/doc/gdlmm-3.0/reference/html/classGdl_1_1DockBar.html -share/doc/gdlmm-3.0/reference/html/classGdl_1_1DockBar__coll__graph.png -share/doc/gdlmm-3.0/reference/html/classGdl_1_1DockBar__inherit__graph.png -share/doc/gdlmm-3.0/reference/html/classGdl_1_1DockItem-members.html -share/doc/gdlmm-3.0/reference/html/classGdl_1_1DockItem.html -share/doc/gdlmm-3.0/reference/html/classGdl_1_1DockItemGrip-members.html -share/doc/gdlmm-3.0/reference/html/classGdl_1_1DockItemGrip.html -share/doc/gdlmm-3.0/reference/html/classGdl_1_1DockItemGrip__coll__graph.png -share/doc/gdlmm-3.0/reference/html/classGdl_1_1DockItemGrip__inherit__graph.png -share/doc/gdlmm-3.0/reference/html/classGdl_1_1DockItem__coll__graph.png -share/doc/gdlmm-3.0/reference/html/classGdl_1_1DockItem__inherit__graph.png -share/doc/gdlmm-3.0/reference/html/classGdl_1_1DockLayout-members.html -share/doc/gdlmm-3.0/reference/html/classGdl_1_1DockLayout.html -share/doc/gdlmm-3.0/reference/html/classGdl_1_1DockLayout__coll__graph.png -share/doc/gdlmm-3.0/reference/html/classGdl_1_1DockLayout__inherit__graph.png -share/doc/gdlmm-3.0/reference/html/classGdl_1_1DockMaster-members.html -share/doc/gdlmm-3.0/reference/html/classGdl_1_1DockMaster.html -share/doc/gdlmm-3.0/reference/html/classGdl_1_1DockMaster__coll__graph.png -share/doc/gdlmm-3.0/reference/html/classGdl_1_1DockMaster__inherit__graph.png -share/doc/gdlmm-3.0/reference/html/classGdl_1_1DockObject-members.html -share/doc/gdlmm-3.0/reference/html/classGdl_1_1DockObject.html -share/doc/gdlmm-3.0/reference/html/classGdl_1_1DockObject__coll__graph.png -share/doc/gdlmm-3.0/reference/html/classGdl_1_1DockObject__inherit__graph.png -share/doc/gdlmm-3.0/reference/html/classGdl_1_1DockPlaceholder-members.html -share/doc/gdlmm-3.0/reference/html/classGdl_1_1DockPlaceholder.html -share/doc/gdlmm-3.0/reference/html/classGdl_1_1DockPlaceholder__coll__graph.png -share/doc/gdlmm-3.0/reference/html/classGdl_1_1DockPlaceholder__inherit__graph.png -share/doc/gdlmm-3.0/reference/html/classGdl_1_1Dock__coll__graph.png -share/doc/gdlmm-3.0/reference/html/classGdl_1_1Dock__inherit__graph.png -share/doc/gdlmm-3.0/reference/html/classGlib_1_1Object.html -share/doc/gdlmm-3.0/reference/html/classGlib_1_1Object__inherit__graph.png -share/doc/gdlmm-3.0/reference/html/classGtk_1_1Box.html -share/doc/gdlmm-3.0/reference/html/classGtk_1_1Box__inherit__graph.png -share/doc/gdlmm-3.0/reference/html/classGtk_1_1Container.html -share/doc/gdlmm-3.0/reference/html/classGtk_1_1Container__inherit__graph.png -share/doc/gdlmm-3.0/reference/html/classes.html -share/doc/gdlmm-3.0/reference/html/closed.png -share/doc/gdlmm-3.0/reference/html/doxygen.css -share/doc/gdlmm-3.0/reference/html/doxygen.png -share/doc/gdlmm-3.0/reference/html/functions.html -share/doc/gdlmm-3.0/reference/html/functions_func.html -share/doc/gdlmm-3.0/reference/html/graph_legend.html -share/doc/gdlmm-3.0/reference/html/graph_legend.png -share/doc/gdlmm-3.0/reference/html/group__gdlmmEnums.html -share/doc/gdlmm-3.0/reference/html/hierarchy.html -share/doc/gdlmm-3.0/reference/html/index.html -share/doc/gdlmm-3.0/reference/html/inherit_graph_0.png -share/doc/gdlmm-3.0/reference/html/inherit_graph_1.png -share/doc/gdlmm-3.0/reference/html/inherit_graph_2.png -share/doc/gdlmm-3.0/reference/html/inherits.html -share/doc/gdlmm-3.0/reference/html/modules.html -share/doc/gdlmm-3.0/reference/html/namespaceGdl.html -share/doc/gdlmm-3.0/reference/html/namespaceGlib.html -share/doc/gdlmm-3.0/reference/html/namespacemembers.html -share/doc/gdlmm-3.0/reference/html/namespacemembers_enum.html -share/doc/gdlmm-3.0/reference/html/namespacemembers_eval.html -share/doc/gdlmm-3.0/reference/html/namespacemembers_func.html -share/doc/gdlmm-3.0/reference/html/namespaces.html -share/doc/gdlmm-3.0/reference/html/nav_f.png -share/doc/gdlmm-3.0/reference/html/nav_h.png -share/doc/gdlmm-3.0/reference/html/open.png -share/doc/gdlmm-3.0/reference/html/tab_a.png -share/doc/gdlmm-3.0/reference/html/tab_b.png -share/doc/gdlmm-3.0/reference/html/tab_h.png -share/doc/gdlmm-3.0/reference/html/tab_s.png -share/doc/gdlmm-3.0/reference/html/tabs.css