summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorwiz <wiz>2007-09-22 22:56:43 +0000
committerwiz <wiz>2007-09-22 22:56:43 +0000
commit98c83fd74772b257c88ee4e86c7c03ffb6aa946f (patch)
treebc611eef0d7ba3021800c32e784da9057e4ebe59 /x11
parent6d08056ddf22f0485d487719e65792ee85c77e1f (diff)
downloadpkgsrc-98c83fd74772b257c88ee4e86c7c03ffb6aa946f.tar.gz
Add three patches based on files in gtkmm-2.12.0 to fix the build
with gtk2+-2.12.0. Bump PKGREVISION. In case this doesn't build with gtk2+<2.12 any longer, please add an appropriate BUILDLINK_API_DEPENDS.gtk2 line.
Diffstat (limited to 'x11')
-rw-r--r--x11/gtkmm/Makefile4
-rw-r--r--x11/gtkmm/distinfo5
-rw-r--r--x11/gtkmm/patches/patch-aa48
-rw-r--r--x11/gtkmm/patches/patch-ab42
-rw-r--r--x11/gtkmm/patches/patch-ac124
5 files changed, 220 insertions, 3 deletions
diff --git a/x11/gtkmm/Makefile b/x11/gtkmm/Makefile
index 743c4535224..67d986226b7 100644
--- a/x11/gtkmm/Makefile
+++ b/x11/gtkmm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.52 2007/09/21 13:04:31 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2007/09/22 22:56:43 wiz Exp $
DISTNAME= gtkmm-2.10.11
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtkmm/2.10/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/gtkmm/distinfo b/x11/gtkmm/distinfo
index 97a4cedb1d0..56179bfc07a 100644
--- a/x11/gtkmm/distinfo
+++ b/x11/gtkmm/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.27 2007/08/12 12:24:20 adam Exp $
+$NetBSD: distinfo,v 1.28 2007/09/22 22:56:43 wiz Exp $
SHA1 (gtkmm-2.10.11.tar.bz2) = 1622ac1cf960227d72191349811aa84c1d5f657d
RMD160 (gtkmm-2.10.11.tar.bz2) = 324a1f176b9b3dcf75061615e19884e8701547dd
Size (gtkmm-2.10.11.tar.bz2) = 8173151 bytes
+SHA1 (patch-aa) = 02a326a4b1a374e0dfe7a36e1bf412a4f2353889
+SHA1 (patch-ab) = 62f067b89821fa672ef60c5811860fc525faf3fe
+SHA1 (patch-ac) = 87b28464392ac9d3de93ccf8e018608e7b2ebc23
diff --git a/x11/gtkmm/patches/patch-aa b/x11/gtkmm/patches/patch-aa
new file mode 100644
index 00000000000..5fcc9a594aa
--- /dev/null
+++ b/x11/gtkmm/patches/patch-aa
@@ -0,0 +1,48 @@
+$NetBSD: patch-aa,v 1.10 2007/09/22 22:56:43 wiz Exp $
+
+--- gtk/gtkmm/toolbar.cc.orig 2007-05-03 14:51:49.000000000 +0000
++++ gtk/gtkmm/toolbar.cc
+@@ -98,6 +98,14 @@ void Toolbar::unset_drop_highlight_item(
+ gtk_toolbar_set_drop_highlight_item(gobj(), 0, 0);
+ }
+
++#ifndef GTKMM_DISABLE_DEPRECATED
++Tooltips* Toolbar::get_tooltips_object() const
++{
++ //Note that the _tooltips field is deprecated and broken since GTK+ 2.12:
++ return Glib::wrap((GtkTooltips*)gobj()->_tooltips);
++}
++#endif //GTKMM_DISABLE_DEPRECATED
++
+ } // namespace Gtk
+
+
+@@ -544,6 +552,16 @@ void Toolbar::unset_toolbar_style()
+ gtk_toolbar_unset_style(gobj());
+ }
+
++void Toolbar::set_icon_size(IconSize icon_size)
++{
++gtk_toolbar_set_icon_size(gobj(), static_cast<GtkIconSize>(int(icon_size)));
++}
++
++void Toolbar::unset_icon_size()
++{
++gtk_toolbar_unset_icon_size(gobj());
++}
++
+ IconSize Toolbar::get_icon_size() const
+ {
+ return IconSize(static_cast<int>(gtk_toolbar_get_icon_size(const_cast<GtkToolbar*>(gobj()))));
+@@ -564,11 +582,6 @@ void Toolbar::set_drop_highlight_item(To
+ gtk_toolbar_set_drop_highlight_item(gobj(), (tool_item).gobj(), index);
+ }
+
+- Tooltips* Toolbar::get_tooltips_object() const
+-{
+- return Glib::wrap(gobj()->tooltips);
+-}
+-
+
+ Glib::SignalProxy1< void,Orientation > Toolbar::signal_orientation_changed()
+ {
diff --git a/x11/gtkmm/patches/patch-ab b/x11/gtkmm/patches/patch-ab
new file mode 100644
index 00000000000..433ef3440d6
--- /dev/null
+++ b/x11/gtkmm/patches/patch-ab
@@ -0,0 +1,42 @@
+$NetBSD: patch-ab,v 1.7 2007/09/22 22:56:43 wiz Exp $
+
+--- gtk/src/toolbar.hg.orig 2007-05-04 07:31:27.000000000 +0000
++++ gtk/src/toolbar.hg
+@@ -74,7 +74,11 @@ public:
+
+ _WRAP_METHOD(void unset_toolbar_style(), gtk_toolbar_unset_style)
+
+- //Note that gtk_toolbar_set_icon_size() is deprecated, but gtk_toolbar_get_icon_size() is not.
++ //Note that gtk_toolbar_set_icon_size() and gtk_toolbar_unset_icon_size() were
++ //deprecated sometime before GTK+ 2.4, but were undeprecated in GTK+ 2.12.
++ _WRAP_METHOD(void set_icon_size(IconSize icon_size), gtk_toolbar_set_icon_size)
++ _WRAP_METHOD(void unset_icon_size(), gtk_toolbar_unset_icon_size)
++
+ _WRAP_METHOD(IconSize get_icon_size() const, gtk_toolbar_get_icon_size)
+
+ _WRAP_METHOD(ReliefStyle get_relief_style() const, gtk_toolbar_get_relief_style)
+@@ -113,9 +117,11 @@ public:
+ _IGNORE_SIGNAL("move_focus")
+ _IGNORE_SIGNAL("focus_home_or_end")
+
+- //This is called get_tooltips_object() to avoid a clash with get_tooltips(), which just says whether they are enabled.
+-
+- _MEMBER_GET(tooltips_object, tooltips, Tooltips*, GtkTooltips*)
++ #ifndef GTKMM_DISABLE_DEPRECATED
++ //This was called get_tooltips_object() to avoid a clash with get_tooltips(), which just says whether they are enabled.
++ ///@deprecated Use the Gtk::Tooltip API instead.
++ Tooltips* get_tooltips_object() const;
++ #endif //GTKMM_DISABLE_DEPRECATED
+
+ //This is probably the same as Container::children().size(), which is deprecated anyway?
+ //_MEMBER_GET(num_children, num_children, int, gint)
+@@ -132,8 +138,7 @@ public:
+ //Ignore deprecated GtkToolbarAPI:
+ //Normally we just deprecate it in gtkmm too,
+ //but the GtkToolbar compatibility system is particularly unpleasant, so we just removed it in gtkmm 2.4. murrayc.
+- _IGNORE(gtk_toolbar_set_icon_size, gtk_toolbar_unset_icon_size,
+- gtk_toolbar_append_item, gtk_toolbar_prepend_item, gtk_toolbar_insert_item, gtk_toolbar_insert_stock
++ _IGNORE(gtk_toolbar_append_item, gtk_toolbar_prepend_item, gtk_toolbar_insert_item, gtk_toolbar_insert_stock
+ gtk_toolbar_append_space, gtk_toolbar_prepend_space, gtk_toolbar_insert_space, gtk_toolbar_remove_space
+ gtk_toolbar_append_element, gtk_toolbar_prepend_element, gtk_toolbar_insert_element,
+ gtk_toolbar_append_widget, gtk_toolbar_prepend_widget, gtk_toolbar_insert_widget)
diff --git a/x11/gtkmm/patches/patch-ac b/x11/gtkmm/patches/patch-ac
new file mode 100644
index 00000000000..622bcfe1a86
--- /dev/null
+++ b/x11/gtkmm/patches/patch-ac
@@ -0,0 +1,124 @@
+$NetBSD: patch-ac,v 1.7 2007/09/22 22:56:44 wiz Exp $
+
+--- gtk/gtkmm/toolbar.h.orig 2007-07-30 12:25:19.000000000 +0000
++++ gtk/gtkmm/toolbar.h
+@@ -136,8 +136,7 @@ public:
+ void prepend(ToggleToolButton& item, const sigc::slot<void>& toggled_slot);
+
+
+- /** Returns the position of @a item on the toolbar, starting from 0.
+- * It is an error if @a item is not a child of the toolbar.
++ /** Return value: the position of item on the toolbar.
+ * @param item A Gtk::ToolItem that is a child of @a toolbar .
+ * @return The position of item on the toolbar.
+ *
+@@ -145,15 +144,14 @@ public:
+ */
+ int get_item_index(const ToolItem& item) const;
+
+- /** Returns the number of items on the toolbar.
++ /** Return value: the number of items on the toolbar
+ * @return The number of items on the toolbar
+ *
+ * @newin2p4.
+ */
+ int get_n_items() const;
+
+- /** Returns the @a n &lt;!-- --&gt;'th item on @a toolbar , or <tt>0</tt> if the
+- * toolbar does not contain an @a n &lt;!-- --&gt;'th item.
++ /** Return value: The @a n &lt;!-- --&gt;'th Gtk::ToolItem on @a toolbar , or <tt>0</tt> if there
+ * @param n A position on the toolbar.
+ * @return The @a n &lt;!-- --&gt;'th Gtk::ToolItem on @a toolbar , or <tt>0</tt> if there
+ * isn't an @a n &lt;!-- --&gt;'th item.
+@@ -162,8 +160,7 @@ public:
+ */
+ ToolItem* get_nth_item(int n);
+
+- /** Returns the @a n &lt;!-- --&gt;'th item on @a toolbar , or <tt>0</tt> if the
+- * toolbar does not contain an @a n &lt;!-- --&gt;'th item.
++ /** Return value: The @a n &lt;!-- --&gt;'th Gtk::ToolItem on @a toolbar , or <tt>0</tt> if there
+ * @param n A position on the toolbar.
+ * @return The @a n &lt;!-- --&gt;'th Gtk::ToolItem on @a toolbar , or <tt>0</tt> if there
+ * isn't an @a n &lt;!-- --&gt;'th item.
+@@ -172,8 +169,7 @@ public:
+ */
+ const ToolItem* get_nth_item(int n) const;
+
+- /** Returns whether the toolbar has an overflow menu.
+- * See set_show_arrow().
++ /** Return value: <tt>true</tt> if the toolbar has an overflow menu.
+ * @return <tt>true</tt> if the toolbar has an overflow menu.
+ *
+ * @newin2p4.
+@@ -234,28 +230,45 @@ public:
+ */
+ void unset_toolbar_style();
+
+- //Note that gtk_toolbar_set_icon_size() is deprecated, but gtk_toolbar_get_icon_size() is not.
++ //Note that gtk_toolbar_set_icon_size() and gtk_toolbar_unset_icon_size() were
++ //deprecated sometime before GTK+ 2.4, but were undeprecated in GTK+ 2.12.
+
+- /** Retrieves the icon size fo the toolbar. See set_icon_size().
++ /** This function sets the size of stock icons in the toolbar. You
++ * can call it both before you add the icons and after they've been
++ * added. The size you set will override user preferences for the default
++ * icon size.
++ *
++ * This should only be used for special-purpose toolbars, normal
++ * application toolbars should respect the user preferences for the
++ * size of icons.
++ *
++ * @newin2p12
++ * @param icon_size The Gtk::IconSize that stock icons in the toolbar shall have.
++ */
++ void set_icon_size(IconSize icon_size);
++
++ /** Unsets toolbar icon size set with set_icon_size(), so that
++ * user preferences will be used to determine the icon size.
++ *
++ * @newin2p12
++ */
++ void unset_icon_size();
++
++
++ /** Retrieves the icon size for the toolbar. See set_icon_size().
+ * @return The current icon size for the icons on the toolbar.
+ */
+ IconSize get_icon_size() const;
+
+
+- /** Returns the relief style of buttons on @a toolbar . See
+- * Gtk::Button::set_relief().
++ /** Return value: The relief style of buttons on @a toolbar .
+ * @return The relief style of buttons on @a toolbar .
+ *
+ * @newin2p4.
+ */
+ ReliefStyle get_relief_style() const;
+
+- /** Returns the position corresponding to the indicated point on
+- * @a toolbar . This is useful when dragging items to the toolbar:
+- * this function returns the position a new item should be
+- * inserted.
+- *
+- * @a x and @a y are in @a toolbar coordinates.
++ /** Return value: The position corresponding to the point ( @a x , @a y ) on the toolbar.
+ * @param x X coordinate of a point on the toolbar.
+ * @param y Y coordinate of a point on the toolbar.
+ * @return The position corresponding to the point ( @a x , @a y ) on the toolbar.
+@@ -324,10 +337,12 @@ public:
+ Glib::SignalProxy3< bool,int,int,int > signal_popup_context_menu();
+
+
+- //This is called get_tooltips_object() to avoid a clash with get_tooltips(), which just says whether they are enabled.
++ #ifndef GTKMM_DISABLE_DEPRECATED
++ //This was called get_tooltips_object() to avoid a clash with get_tooltips(), which just says whether they are enabled.
++ ///@deprecated Use the Gtk::Tooltip API instead.
++ Tooltips* get_tooltips_object() const;
++ #endif //GTKMM_DISABLE_DEPRECATED
+
+- Tooltips* get_tooltips_object() const;
+-
+ //This is probably the same as Container::children().size(), which is deprecated anyway?
+ //_MEMBER_GET(num_children, num_children, int, gint)
+