From ae52bc80895a23ddbe33b86e75a9cf331ae32ba9 Mon Sep 17 00:00:00 2001 From: Joe Marcus Clarke Date: Fri, 10 Apr 2009 05:56:28 +0000 Subject: Presenting GNOME 2.26 for FreeBSD. See http://library.gnome.org/misc/release-notes/2.26/ for a list of what's new. On the FreeBSD front, we introduced a port of libxul 1.9 as an alternative for Firefox 2.0 as a Gecko provider. Almost all of the Gecko consumers can make use of this provider by setting: WITH_GECKO=libxul The GNOME 2.26 port was done by ahze, kwm, marcus, and mezz with contributions by Joseph S. Atkinson, Peter Wemm, Eric L. Chen, Martin Matuska, Craig Butler, and Pawel Worach. --- x11-toolkits/gtk20/Makefile | 6 +- x11-toolkits/gtk20/distinfo | 6 +- x11-toolkits/gtk20/files/patch-gtk-561583 | 16 --- .../gtk20/files/patch-gtk_gtkscalebutton.c | 133 +++++++++++++++++++++ x11-toolkits/gtk20/pkg-plist | 7 ++ 5 files changed, 146 insertions(+), 22 deletions(-) delete mode 100644 x11-toolkits/gtk20/files/patch-gtk-561583 create mode 100644 x11-toolkits/gtk20/files/patch-gtk_gtkscalebutton.c (limited to 'x11-toolkits/gtk20') diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index a50209f21134..559629b4721d 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -3,12 +3,12 @@ # Whom: Vanilla I. Shu # # $FreeBSD$ -# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.147 2009/01/08 17:38:06 kwm Exp $ +# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.152 2009/03/13 16:20:57 kwm Exp $ # PORTNAME= gtk -PORTVERSION= 2.14.7 -PORTREVISION?= 1 +PORTVERSION= 2.16.0 +PORTREVISION?= 0 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \ ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \ diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo index a7d8aa722018..837351c54a8f 100644 --- a/x11-toolkits/gtk20/distinfo +++ b/x11-toolkits/gtk20/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gtk+-2.14.7.tar.bz2) = fb1614d4b2adba7b078e2e799b5db604 -SHA256 (gnome2/gtk+-2.14.7.tar.bz2) = e82f4728e52dbafc35713b755eb863a47dc155334912dda0240dc3de9cb07e14 -SIZE (gnome2/gtk+-2.14.7.tar.bz2) = 17475873 +MD5 (gnome2/gtk+-2.16.0.tar.bz2) = 139528802794287427fd4d18875b5cf5 +SHA256 (gnome2/gtk+-2.16.0.tar.bz2) = ff25cbf43dd5c5f8cddc1b2094505c1d079a576b873a6d3d6b62d95da1bdd1d7 +SIZE (gnome2/gtk+-2.16.0.tar.bz2) = 17978429 diff --git a/x11-toolkits/gtk20/files/patch-gtk-561583 b/x11-toolkits/gtk20/files/patch-gtk-561583 deleted file mode 100644 index f9a547805fcf..000000000000 --- a/x11-toolkits/gtk20/files/patch-gtk-561583 +++ /dev/null @@ -1,16 +0,0 @@ ---- gdk/x11/gdkscreen-x11.orig 2009-02-18 15:29:15.000000000 -0500 -+++ gdk/x11/gdkscreen-x11.c 2009-02-18 15:30:03.000000000 -0500 -@@ -915,11 +915,12 @@ - return; - #endif - -+ _gdk_x11_screen_process_monitors_change (screen); -+ - if (width == gdk_screen_get_width (screen) && - height == gdk_screen_get_height (screen)) - return; - -- _gdk_x11_screen_process_monitors_change (screen); - g_signal_emit_by_name (screen, "size_changed"); - } - diff --git a/x11-toolkits/gtk20/files/patch-gtk_gtkscalebutton.c b/x11-toolkits/gtk20/files/patch-gtk_gtkscalebutton.c new file mode 100644 index 000000000000..eb85ae27856e --- /dev/null +++ b/x11-toolkits/gtk20/files/patch-gtk_gtkscalebutton.c @@ -0,0 +1,133 @@ +--- gtk/gtkscalebutton.c 2009/03/06 14:06:46 22478 ++++ gtk/gtkscalebutton.c 2009/03/18 21:19:07 22574 +@@ -119,6 +119,8 @@ + guint prop_id, + GValue *value, + GParamSpec *pspec); ++static void gtk_scale_button_set_orientation_private (GtkScaleButton *button, ++ GtkOrientation orientation); + static gboolean gtk_scale_button_scroll (GtkWidget *widget, + GdkEventScroll *event); + static void gtk_scale_button_screen_changed (GtkWidget *widget, +@@ -434,7 +436,7 @@ + switch (prop_id) + { + case PROP_ORIENTATION: +- gtk_scale_button_set_orientation (button, g_value_get_enum (value)); ++ gtk_scale_button_set_orientation_private (button, g_value_get_enum (value)); + break; + case PROP_VALUE: + gtk_scale_button_set_value (button, g_value_get_double (value)); +@@ -739,54 +741,9 @@ + gtk_scale_button_set_orientation (GtkScaleButton *button, + GtkOrientation orientation) + { +- GtkScaleButtonPrivate *priv; +- + g_return_if_fail (GTK_IS_SCALE_BUTTON (button)); + +- priv = button->priv; +- +- if (orientation != priv->orientation) +- { +- priv->orientation = orientation; +- +- gtk_orientable_set_orientation (GTK_ORIENTABLE (priv->box), +- orientation); +- gtk_container_child_set (GTK_CONTAINER (priv->box), +- button->plus_button, +- "pack-type", +- orientation == GTK_ORIENTATION_VERTICAL ? +- GTK_PACK_START : GTK_PACK_END, +- NULL); +- gtk_container_child_set (GTK_CONTAINER (priv->box), +- button->minus_button, +- "pack-type", +- orientation == GTK_ORIENTATION_VERTICAL ? +- GTK_PACK_END : GTK_PACK_START, +- NULL); +- +- gtk_orientable_set_orientation (GTK_ORIENTABLE (priv->scale), +- orientation); +- +- if (orientation == GTK_ORIENTATION_VERTICAL) +- { +- gtk_widget_set_size_request (GTK_WIDGET (priv->scale), +- -1, SCALE_SIZE); +- gtk_range_set_inverted (GTK_RANGE (priv->scale), TRUE); +- } +- else +- { +- gtk_widget_set_size_request (GTK_WIDGET (priv->scale), +- SCALE_SIZE, -1); +- gtk_range_set_inverted (GTK_RANGE (priv->scale), FALSE); +- } +- +- /* FIXME: without this, the popup window appears as a square +- * after changing the orientation +- */ +- gtk_window_resize (GTK_WINDOW (priv->dock), 1, 1); +- +- g_object_notify (G_OBJECT (button), "orientation"); +- } ++ gtk_scale_button_set_orientation_private (button, orientation); + } + + /** +@@ -843,6 +800,56 @@ + return button->priv->dock; + } + ++static void ++gtk_scale_button_set_orientation_private (GtkScaleButton *button, ++ GtkOrientation orientation) ++{ ++ GtkScaleButtonPrivate *priv = button->priv; ++ ++ if (orientation != priv->orientation) ++ { ++ priv->orientation = orientation; ++ ++ gtk_orientable_set_orientation (GTK_ORIENTABLE (priv->box), ++ orientation); ++ gtk_container_child_set (GTK_CONTAINER (priv->box), ++ button->plus_button, ++ "pack-type", ++ orientation == GTK_ORIENTATION_VERTICAL ? ++ GTK_PACK_START : GTK_PACK_END, ++ NULL); ++ gtk_container_child_set (GTK_CONTAINER (priv->box), ++ button->minus_button, ++ "pack-type", ++ orientation == GTK_ORIENTATION_VERTICAL ? ++ GTK_PACK_END : GTK_PACK_START, ++ NULL); ++ ++ gtk_orientable_set_orientation (GTK_ORIENTABLE (priv->scale), ++ orientation); ++ ++ if (orientation == GTK_ORIENTATION_VERTICAL) ++ { ++ gtk_widget_set_size_request (GTK_WIDGET (priv->scale), ++ -1, SCALE_SIZE); ++ gtk_range_set_inverted (GTK_RANGE (priv->scale), TRUE); ++ } ++ else ++ { ++ gtk_widget_set_size_request (GTK_WIDGET (priv->scale), ++ SCALE_SIZE, -1); ++ gtk_range_set_inverted (GTK_RANGE (priv->scale), FALSE); ++ } ++ ++ /* FIXME: without this, the popup window appears as a square ++ * after changing the orientation ++ */ ++ gtk_window_resize (GTK_WINDOW (priv->dock), 1, 1); ++ ++ g_object_notify (G_OBJECT (button), "orientation"); ++ } ++} ++ + /* + * button callbacks. + */ diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist index f916fc6fda4f..830f0e739210 100644 --- a/x11-toolkits/gtk20/pkg-plist +++ b/x11-toolkits/gtk20/pkg-plist @@ -66,6 +66,7 @@ include/gtk-2.0/gtk/gtkaccelmap.h include/gtk-2.0/gtk/gtkaccessible.h include/gtk-2.0/gtk/gtkaction.h include/gtk-2.0/gtk/gtkactiongroup.h +include/gtk-2.0/gtk/gtkactivatable.h include/gtk-2.0/gtk/gtkadjustment.h include/gtk-2.0/gtk/gtkalignment.h include/gtk-2.0/gtk/gtkarrow.h @@ -168,6 +169,7 @@ include/gtk-2.0/gtk/gtknotebook.h include/gtk-2.0/gtk/gtkobject.h include/gtk-2.0/gtk/gtkoldeditable.h include/gtk-2.0/gtk/gtkoptionmenu.h +include/gtk-2.0/gtk/gtkorientable.h include/gtk-2.0/gtk/gtkpagesetup.h include/gtk-2.0/gtk/gtkpaned.h include/gtk-2.0/gtk/gtkpapersize.h @@ -435,6 +437,7 @@ share/gtk-2.0/demo/pickers.c share/gtk-2.0/demo/pixbufs.c share/gtk-2.0/demo/printing.c share/gtk-2.0/demo/rotated_text.c +share/gtk-2.0/demo/search_entry.c share/gtk-2.0/demo/sizegroup.c share/gtk-2.0/demo/stock_browser.c share/gtk-2.0/demo/textscroll.c @@ -475,6 +478,8 @@ share/locale/ca/LC_MESSAGES/gtk20-properties.mo share/locale/ca/LC_MESSAGES/gtk20.mo share/locale/ca@valencia/LC_MESSAGES/gtk20-properties.mo share/locale/ca@valencia/LC_MESSAGES/gtk20.mo +share/locale/crh/LC_MESSAGES/gtk20-properties.mo +share/locale/crh/LC_MESSAGES/gtk20.mo share/locale/cs/LC_MESSAGES/gtk20-properties.mo share/locale/cs/LC_MESSAGES/gtk20.mo share/locale/cy/LC_MESSAGES/gtk20-properties.mo @@ -722,6 +727,8 @@ share/themes/Raleigh/gtk-2.0/gtkrc @dirrmtry share/locale/hy @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz +@dirrmtry share/locale/crh/LC_MESSAGES +@dirrmtry share/locale/crh @dirrmtry share/locale/ca@valencia/LC_MESSAGES @dirrmtry share/locale/ca@valencia @dirrmtry share/locale/bn_IN/LC_MESSAGES -- cgit v1.2.3