diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2009-04-10 05:56:28 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2009-04-10 05:56:28 +0000 |
| commit | ae52bc80895a23ddbe33b86e75a9cf331ae32ba9 (patch) | |
| tree | 5538a7d3541f6d56e4bbab9c6329f5b9db64dafb /x11-toolkits | |
| parent | 7934df773e0cc2a9924de75dd7cad9cc3d79d4ee (diff) | |
| download | ports-ae52bc80895a23ddbe33b86e75a9cf331ae32ba9.tar.gz ports-ae52bc80895a23ddbe33b86e75a9cf331ae32ba9.zip | |
Notes
Diffstat (limited to 'x11-toolkits')
62 files changed, 1122 insertions, 370 deletions
diff --git a/x11-toolkits/eel/Makefile b/x11-toolkits/eel/Makefile index fb6e22c418a5..7a1169fab370 100644 --- a/x11-toolkits/eel/Makefile +++ b/x11-toolkits/eel/Makefile @@ -3,11 +3,11 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/eel/Makefile,v 1.80 2008/10/20 21:37:09 mezz Exp $ +# $MCom: ports/x11-toolkits/eel/Makefile,v 1.84 2009/03/17 13:40:09 kwm Exp $ # PORTNAME= eel -PORTVERSION= 2.24.1 +PORTVERSION= 2.26.0 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11-toolkits/eel/distinfo b/x11-toolkits/eel/distinfo index aa469fcbd173..524cb219e365 100644 --- a/x11-toolkits/eel/distinfo +++ b/x11-toolkits/eel/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/eel-2.24.1.tar.bz2) = b591df36af8f1b23dd175be33b5de073 -SHA256 (gnome2/eel-2.24.1.tar.bz2) = 32cde7b589b49f439d82f76b6456983d36de7d20688f7c6ac2fdae4ce354e629 -SIZE (gnome2/eel-2.24.1.tar.bz2) = 596529 +MD5 (gnome2/eel-2.26.0.tar.bz2) = dfa105ccabd53efe4166dcfac75e2393 +SHA256 (gnome2/eel-2.26.0.tar.bz2) = 11ad07d8d371f9165fab6cc5462f59cd253f9cc835d77a54330fecafe9c0a555 +SIZE (gnome2/eel-2.26.0.tar.bz2) = 596217 diff --git a/x11-toolkits/eel/files/patch-eel_eel-gnome-extensions.c b/x11-toolkits/eel/files/patch-eel_eel-gnome-extensions.c deleted file mode 100644 index 3d6922deda5e..000000000000 --- a/x11-toolkits/eel/files/patch-eel_eel-gnome-extensions.c +++ /dev/null @@ -1,12 +0,0 @@ ---- eel/eel-gnome-extensions.c.orig Mon Mar 21 06:20:58 2005 -+++ eel/eel-gnome-extensions.c Mon Mar 21 06:21:00 2005 -@@ -246,7 +246,9 @@ - IconSelectionData *selection_data; - - selection_data = (IconSelectionData *) callback_data; -+ GDK_THREADS_ENTER (); - gtk_widget_destroy (selection_data->dialog); -+ GDK_THREADS_LEAVE (); - g_free (selection_data); - return FALSE; - } diff --git a/x11-toolkits/eel/files/patch-eel_eel-stock-dialogs.c b/x11-toolkits/eel/files/patch-eel_eel-stock-dialogs.c index f1389b939964..4a0ce9c74ecc 100644 --- a/x11-toolkits/eel/files/patch-eel_eel-stock-dialogs.c +++ b/x11-toolkits/eel/files/patch-eel_eel-stock-dialogs.c @@ -1,6 +1,6 @@ ---- eel/eel-stock-dialogs.c.orig Mon Mar 21 06:35:10 2005 -+++ eel/eel-stock-dialogs.c Mon Mar 21 06:36:23 2005 -@@ -104,6 +104,8 @@ +--- eel/eel-stock-dialogs.c.orig 2008-10-07 11:34:27.000000000 +0200 ++++ eel/eel-stock-dialogs.c 2009-02-22 16:33:40.000000000 +0100 +@@ -96,6 +96,8 @@ timed_wait_delayed_close_timeout_callbac { guint handler_id; @@ -9,7 +9,7 @@ handler_id = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (callback_data), "eel-stock-dialogs/delayed_close_handler_timeout_id")); -@@ -113,6 +115,8 @@ +@@ -105,6 +107,8 @@ timed_wait_delayed_close_timeout_callbac gtk_object_destroy (GTK_OBJECT (callback_data)); @@ -18,23 +18,3 @@ return FALSE; } -@@ -202,7 +206,10 @@ - - wait = callback_data; - -+ GDK_THREADS_ENTER (); -+ - if (gnome_authentication_manager_dialog_is_visible ()) { -+ GDK_THREADS_LEAVE (); - return TRUE; - } - -@@ -249,6 +256,8 @@ - - wait->timeout_handler_id = 0; - wait->dialog = dialog; -+ -+ GDK_THREADS_LEAVE (); - - return FALSE; - } diff --git a/x11-toolkits/eel/pkg-plist b/x11-toolkits/eel/pkg-plist index 628987f36aab..0f0359203909 100644 --- a/x11-toolkits/eel/pkg-plist +++ b/x11-toolkits/eel/pkg-plist @@ -25,9 +25,7 @@ include/eel-2/eel/eel-i18n.h include/eel-2/eel/eel-image-table.h include/eel-2/eel/eel-labeled-image.h include/eel-2/eel/eel-marshal.h -include/eel-2/eel/eel-mount-operation.h include/eel-2/eel/eel-pango-extensions.h -include/eel-2/eel/eel-preferences-glade.h include/eel-2/eel/eel-preferences.h include/eel-2/eel/eel-self-checks.h include/eel-2/eel/eel-stock-dialogs.h diff --git a/x11-toolkits/gai/Makefile b/x11-toolkits/gai/Makefile index 9f1a26991742..06c4e6f38667 100644 --- a/x11-toolkits/gai/Makefile +++ b/x11-toolkits/gai/Makefile @@ -22,7 +22,8 @@ USE_GL= gl USE_SDL= sdl USE_GNOME= gnomepanel GNU_CONFIGURE= yes -CONFIGURE_ENV= SDLCONF=${SDL_CONFIG} +CONFIGURE_ENV= SDLCONF=${SDL_CONFIG} \ + CPPFLAGS="`pkg-config --cflags libgnomeui-2.0`" PLIST_FILES= include/gai/gai.h lib/libgai.so.${PORTVERSION} \ lib/libgai.so.0 lib/libgai.so libdata/pkgconfig/gai.pc \ diff --git a/x11-toolkits/gai/files/patch-gai_Makefile.in b/x11-toolkits/gai/files/patch-gai_Makefile.in index 11088b83c594..047c61c98d80 100644 --- a/x11-toolkits/gai/files/patch-gai_Makefile.in +++ b/x11-toolkits/gai/files/patch-gai_Makefile.in @@ -5,7 +5,7 @@ # Makefile for the General Applet Interface Library -CFLAGS += -Wall -O2 -I.. @GTK_CFLAGS@ @SDL_CFLAGS@ @GNOME_CFLAGS@ @GL_CFLAGS@ -+CFLAGS += -Wall -fPIC -I.. @GTK_CFLAGS@ @SDL_CFLAGS@ @GNOME_CFLAGS@ @GL_CFLAGS@ ++CFLAGS += -Wall -fPIC -I.. @GTK_CFLAGS@ @SDL_CFLAGS@ @GNOME_CFLAGS@ @GL_CFLAGS@ @CPPFLAGS@ -LDFLAGS += -g -fPIC -L/usr/X11R6/lib -lX11 @SYSTEM_SPECIFIC_LIBS@ @GTK_LIBS@ @GTHREAD_CFLAGS@ @PANGO_CFLAGS@ +LDFLAGS += -fPIC -L$(LOCALBASE)/lib -lX11 @SYSTEM_SPECIFIC_LIBS@ @GTK_LIBS@ @GTHREAD_CFLAGS@ @PANGO_CFLAGS@ diff --git a/x11-toolkits/gdl/Makefile b/x11-toolkits/gdl/Makefile index 70aed9a09a6d..d4f7b154dbd3 100644 --- a/x11-toolkits/gdl/Makefile +++ b/x11-toolkits/gdl/Makefile @@ -3,11 +3,11 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/gdl/Makefile,v 1.18 2008/09/22 18:02:25 marcus Exp $ +# $MCom: ports/x11-toolkits/gdl/Makefile,v 1.22 2009/03/17 18:08:56 kwm Exp $ # PORTNAME= gdl -PORTVERSION= 2.24.0 +PORTVERSION= 2.26.0 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME diff --git a/x11-toolkits/gdl/distinfo b/x11-toolkits/gdl/distinfo index 482befef9a78..3a73d7506861 100644 --- a/x11-toolkits/gdl/distinfo +++ b/x11-toolkits/gdl/distinfo @@ -1,3 +1,3 @@ -MD5 (gdl-2.24.0.tar.bz2) = 1d5cd4af1f4041394169d643316646bf -SHA256 (gdl-2.24.0.tar.bz2) = c175ac5faa1c3e27464f71f80c632bb3a960aa03ccd748736aead20adc31a112 -SIZE (gdl-2.24.0.tar.bz2) = 551420 +MD5 (gdl-2.26.0.tar.bz2) = 8915b8808d88e12c1bb53e84f50e6707 +SHA256 (gdl-2.26.0.tar.bz2) = ed69d46a1eb490b28812c2cc28769d74e8664ed7617c579806c6146ff9addb54 +SIZE (gdl-2.26.0.tar.bz2) = 541006 diff --git a/x11-toolkits/gdl/pkg-plist b/x11-toolkits/gdl/pkg-plist index 4411d89a5de2..62b61374997e 100644 --- a/x11-toolkits/gdl/pkg-plist +++ b/x11-toolkits/gdl/pkg-plist @@ -31,7 +31,6 @@ libdata/pkgconfig/gdl-1.0.pc %%DOCSDIR%%/GdlDockPlaceholder.html %%DOCSDIR%%/GdlDockTablabel.html %%DOCSDIR%%/GdlSwitcher.html -%%DOCSDIR%%/gdl-gdl-stock.html %%DOCSDIR%%/gdl-gdl-tools.html %%DOCSDIR%%/gdl-main.html %%DOCSDIR%%/gdl.devhelp @@ -46,6 +45,7 @@ libdata/pkgconfig/gdl-1.0.pc share/gdl/glade/layout.glade share/locale/am/LC_MESSAGES/gdl-1.mo share/locale/ar/LC_MESSAGES/gdl-1.mo +share/locale/ast/LC_MESSAGES/gdl-1.mo share/locale/az/LC_MESSAGES/gdl-1.mo share/locale/bg/LC_MESSAGES/gdl-1.mo share/locale/ca/LC_MESSAGES/gdl-1.mo @@ -63,6 +63,7 @@ share/locale/fi/LC_MESSAGES/gdl-1.mo share/locale/fr/LC_MESSAGES/gdl-1.mo share/locale/ga/LC_MESSAGES/gdl-1.mo share/locale/gl/LC_MESSAGES/gdl-1.mo +share/locale/gu/LC_MESSAGES/gdl-1.mo share/locale/he/LC_MESSAGES/gdl-1.mo share/locale/hi/LC_MESSAGES/gdl-1.mo share/locale/hr/LC_MESSAGES/gdl-1.mo @@ -79,11 +80,13 @@ share/locale/nb/LC_MESSAGES/gdl-1.mo share/locale/ne/LC_MESSAGES/gdl-1.mo share/locale/nl/LC_MESSAGES/gdl-1.mo share/locale/oc/LC_MESSAGES/gdl-1.mo +share/locale/or/LC_MESSAGES/gdl-1.mo share/locale/pa/LC_MESSAGES/gdl-1.mo share/locale/pl/LC_MESSAGES/gdl-1.mo share/locale/ps/LC_MESSAGES/gdl-1.mo share/locale/pt/LC_MESSAGES/gdl-1.mo share/locale/pt_BR/LC_MESSAGES/gdl-1.mo +share/locale/ro/LC_MESSAGES/gdl-1.mo share/locale/ru/LC_MESSAGES/gdl-1.mo share/locale/rw/LC_MESSAGES/gdl-1.mo share/locale/si/LC_MESSAGES/gdl-1.mo @@ -93,6 +96,7 @@ share/locale/sq/LC_MESSAGES/gdl-1.mo share/locale/sr/LC_MESSAGES/gdl-1.mo share/locale/sr@latin/LC_MESSAGES/gdl-1.mo share/locale/sv/LC_MESSAGES/gdl-1.mo +share/locale/te/LC_MESSAGES/gdl-1.mo share/locale/th/LC_MESSAGES/gdl-1.mo share/locale/tr/LC_MESSAGES/gdl-1.mo share/locale/uk/LC_MESSAGES/gdl-1.mo @@ -107,6 +111,8 @@ share/locale/zh_TW/LC_MESSAGES/gdl-1.mo @dirrm include/libgdl-1.0 @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK +@dirrmtry share/locale/te/LC_MESSAGES +@dirrmtry share/locale/te @dirrmtry share/locale/sr@latin/LC_MESSAGES @dirrmtry share/locale/sr@latin @dirrmtry share/locale/si/LC_MESSAGES @@ -121,3 +127,5 @@ share/locale/zh_TW/LC_MESSAGES/gdl-1.mo @dirrmtry share/locale/mr @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast 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 <vanilla@MinJe.com.TW> # # $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 diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile index a50209f21134..559629b4721d 100644 --- a/x11-toolkits/gtk30/Makefile +++ b/x11-toolkits/gtk30/Makefile @@ -3,12 +3,12 @@ # Whom: Vanilla I. Shu <vanilla@MinJe.com.TW> # # $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/gtk30/distinfo b/x11-toolkits/gtk30/distinfo index a7d8aa722018..837351c54a8f 100644 --- a/x11-toolkits/gtk30/distinfo +++ b/x11-toolkits/gtk30/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/gtk30/files/patch-gtk-561583 b/x11-toolkits/gtk30/files/patch-gtk-561583 deleted file mode 100644 index f9a547805fcf..000000000000 --- a/x11-toolkits/gtk30/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/gtk30/files/patch-gtk_gtkscalebutton.c b/x11-toolkits/gtk30/files/patch-gtk_gtkscalebutton.c new file mode 100644 index 000000000000..eb85ae27856e --- /dev/null +++ b/x11-toolkits/gtk30/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/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist index f916fc6fda4f..830f0e739210 100644 --- a/x11-toolkits/gtk30/pkg-plist +++ b/x11-toolkits/gtk30/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 diff --git a/x11-toolkits/gtkmm24/Makefile b/x11-toolkits/gtkmm24/Makefile index ef71ec3fbd37..a8662cc45902 100644 --- a/x11-toolkits/gtkmm24/Makefile +++ b/x11-toolkits/gtkmm24/Makefile @@ -3,11 +3,11 @@ # Whom: Martin Klaffenboeck <martin.klaffenboeck@gmx.at> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/gtkmm24/Makefile,v 1.42 2008/11/18 06:51:19 marcus Exp $ +# $MCom: ports/x11-toolkits/gtkmm24/Makefile,v 1.46 2009/03/17 15:18:15 kwm Exp $ # PORTNAME= gtkmm -PORTVERSION= 2.14.3 +PORTVERSION= 2.16.0 PORTREVISION?= 0 CATEGORIES= x11-toolkits MASTER_SITES= GNOME diff --git a/x11-toolkits/gtkmm24/distinfo b/x11-toolkits/gtkmm24/distinfo index 5c77592fc96f..98ae79afc752 100644 --- a/x11-toolkits/gtkmm24/distinfo +++ b/x11-toolkits/gtkmm24/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gtkmm-2.14.3.tar.bz2) = 10039f35d7f815d47f926a13cefe65d6 -SHA256 (gnome2/gtkmm-2.14.3.tar.bz2) = 24b18105636cea1033658a0a5f7e86783d0e620590aa359a005ba64d055559a2 -SIZE (gnome2/gtkmm-2.14.3.tar.bz2) = 8667875 +MD5 (gnome2/gtkmm-2.16.0.tar.bz2) = a82e3b5b93008421ff67df16d1e51ec2 +SHA256 (gnome2/gtkmm-2.16.0.tar.bz2) = 9994e6a92f7086adb58aba0431f29a766218f806b9db95359dad59a0615f95bf +SIZE (gnome2/gtkmm-2.16.0.tar.bz2) = 9313258 diff --git a/x11-toolkits/gtkmm24/pkg-plist b/x11-toolkits/gtkmm24/pkg-plist index fea6c20e19d0..acf9e6def421 100644 --- a/x11-toolkits/gtkmm24/pkg-plist +++ b/x11-toolkits/gtkmm24/pkg-plist @@ -102,6 +102,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/accellabel.h include/gtkmm-%%API_VERSION%%/gtkmm/accelmap.h include/gtkmm-%%API_VERSION%%/gtkmm/action.h include/gtkmm-%%API_VERSION%%/gtkmm/actiongroup.h +include/gtkmm-%%API_VERSION%%/gtkmm/activatable.h include/gtkmm-%%API_VERSION%%/gtkmm/adjustment.h include/gtkmm-%%API_VERSION%%/gtkmm/alignment.h include/gtkmm-%%API_VERSION%%/gtkmm/arrow.h @@ -185,6 +186,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/misc.h include/gtkmm-%%API_VERSION%%/gtkmm/notebook.h include/gtkmm-%%API_VERSION%%/gtkmm/object.h include/gtkmm-%%API_VERSION%%/gtkmm/optionmenu.h +include/gtkmm-%%API_VERSION%%/gtkmm/orientable.h include/gtkmm-%%API_VERSION%%/gtkmm/pagesetup.h include/gtkmm-%%API_VERSION%%/gtkmm/pagesetupunixdialog.h include/gtkmm-%%API_VERSION%%/gtkmm/paned.h @@ -202,6 +204,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/accelgroup_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/accellabel_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/action_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/actiongroup_p.h +include/gtkmm-%%API_VERSION%%/gtkmm/private/activatable_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/adjustment_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/alignment_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/arrow_p.h @@ -279,6 +282,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/misc_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/notebook_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/object_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/optionmenu_p.h +include/gtkmm-%%API_VERSION%%/gtkmm/private/orientable_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/pagesetup_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/pagesetupunixdialog_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/paned_p.h diff --git a/x11-toolkits/gtksourceview2/Makefile b/x11-toolkits/gtksourceview2/Makefile index 728749e891c7..707deec3ad3d 100644 --- a/x11-toolkits/gtksourceview2/Makefile +++ b/x11-toolkits/gtksourceview2/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/gtksourceview2/Makefile,v 1.67 2008/11/02 18:21:19 marcus Exp $ +# $MCom: ports/x11-toolkits/gtksourceview2/Makefile,v 1.72 2009/04/09 03:24:10 mezz Exp $ # PORTNAME= gtksourceview2 -PORTVERSION= 2.4.2 +PORTVERSION= 2.6.0 PORTREVISION?= 0 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME diff --git a/x11-toolkits/gtksourceview2/distinfo b/x11-toolkits/gtksourceview2/distinfo index 7d9895cb9c68..04fd78d2715d 100644 --- a/x11-toolkits/gtksourceview2/distinfo +++ b/x11-toolkits/gtksourceview2/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gtksourceview-2.4.2.tar.bz2) = aece5dcb1e2e7ca1855f95eb48f30443 -SHA256 (gnome2/gtksourceview-2.4.2.tar.bz2) = 49cd6b1bc4b3aa20dee0445d5b1a7d4bf4329414a9025a84681db01390172cbf -SIZE (gnome2/gtksourceview-2.4.2.tar.bz2) = 923948 +MD5 (gnome2/gtksourceview-2.6.0.tar.bz2) = dd065ab2e96e51aade949249c5556439 +SHA256 (gnome2/gtksourceview-2.6.0.tar.bz2) = 92ddd976721e26377eaa59fea07707a0caa85eb874500868c1e6fdd9a21fe0dd +SIZE (gnome2/gtksourceview-2.6.0.tar.bz2) = 976669 diff --git a/x11-toolkits/gtksourceview2/pkg-plist b/x11-toolkits/gtksourceview2/pkg-plist index 9a0140320448..012ade348b60 100644 --- a/x11-toolkits/gtksourceview2/pkg-plist +++ b/x11-toolkits/gtksourceview2/pkg-plist @@ -16,12 +16,14 @@ lib/libgtksourceview-2.0.so.0 libdata/pkgconfig/gtksourceview-2.0.pc share/gtksourceview-2.0/language-specs/R.lang share/gtksourceview-2.0/language-specs/ada.lang +share/gtksourceview-2.0/language-specs/asp.lang share/gtksourceview-2.0/language-specs/awk.lang share/gtksourceview-2.0/language-specs/boo.lang share/gtksourceview-2.0/language-specs/c.lang share/gtksourceview-2.0/language-specs/changelog.lang share/gtksourceview-2.0/language-specs/chdr.lang share/gtksourceview-2.0/language-specs/check.sh +share/gtksourceview-2.0/language-specs/cmake.lang share/gtksourceview-2.0/language-specs/convert.py share/gtksourceview-2.0/language-specs/cpp.lang share/gtksourceview-2.0/language-specs/csharp.lang @@ -31,6 +33,7 @@ share/gtksourceview-2.0/language-specs/def.lang share/gtksourceview-2.0/language-specs/desktop.lang share/gtksourceview-2.0/language-specs/diff.lang share/gtksourceview-2.0/language-specs/docbook.lang +share/gtksourceview-2.0/language-specs/dosbatch.lang share/gtksourceview-2.0/language-specs/dot.lang share/gtksourceview-2.0/language-specs/dpatch.lang share/gtksourceview-2.0/language-specs/dtd.lang @@ -59,6 +62,7 @@ share/gtksourceview-2.0/language-specs/m4.lang share/gtksourceview-2.0/language-specs/makefile.lang share/gtksourceview-2.0/language-specs/msil.lang share/gtksourceview-2.0/language-specs/nemerle.lang +share/gtksourceview-2.0/language-specs/nsis.lang share/gtksourceview-2.0/language-specs/objc.lang share/gtksourceview-2.0/language-specs/ocaml.lang share/gtksourceview-2.0/language-specs/ocl.lang @@ -68,6 +72,7 @@ share/gtksourceview-2.0/language-specs/perl.lang share/gtksourceview-2.0/language-specs/php.lang share/gtksourceview-2.0/language-specs/pkgconfig.lang share/gtksourceview-2.0/language-specs/po.lang +share/gtksourceview-2.0/language-specs/prolog.lang share/gtksourceview-2.0/language-specs/python.lang share/gtksourceview-2.0/language-specs/rpmspec.lang share/gtksourceview-2.0/language-specs/ruby.lang @@ -75,6 +80,7 @@ share/gtksourceview-2.0/language-specs/scheme.lang share/gtksourceview-2.0/language-specs/sh.lang share/gtksourceview-2.0/language-specs/sql.lang share/gtksourceview-2.0/language-specs/styles.rng +share/gtksourceview-2.0/language-specs/t2t.lang share/gtksourceview-2.0/language-specs/tcl.lang share/gtksourceview-2.0/language-specs/texinfo.lang share/gtksourceview-2.0/language-specs/vala.lang @@ -85,6 +91,7 @@ share/gtksourceview-2.0/language-specs/xml.lang share/gtksourceview-2.0/language-specs/xslt.lang share/gtksourceview-2.0/language-specs/yacc.lang share/gtksourceview-2.0/styles/classic.xml +share/gtksourceview-2.0/styles/cobalt.xml share/gtksourceview-2.0/styles/kate.xml share/gtksourceview-2.0/styles/oblivion.xml share/gtksourceview-2.0/styles/styles.rng diff --git a/x11-toolkits/libgnomeuimm26/Makefile b/x11-toolkits/libgnomeuimm26/Makefile index 2bbc2d76bc11..0f09f9b1f7b1 100644 --- a/x11-toolkits/libgnomeuimm26/Makefile +++ b/x11-toolkits/libgnomeuimm26/Makefile @@ -3,11 +3,11 @@ # Whom: Alexander Nedotsukov <bland@mail.ru> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/libgnomeuimm26/Makefile,v 1.16 2008/09/22 11:36:49 kwm Exp $ +# $MCom: ports/x11-toolkits/libgnomeuimm26/Makefile,v 1.18 2009/03/17 16:02:12 kwm Exp $ # PORTNAME= libgnomeuimm -PORTVERSION= 2.24.0 +PORTVERSION= 2.26.0 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11-toolkits/libgnomeuimm26/distinfo b/x11-toolkits/libgnomeuimm26/distinfo index 2c1080fc7656..12ed4522cfb6 100644 --- a/x11-toolkits/libgnomeuimm26/distinfo +++ b/x11-toolkits/libgnomeuimm26/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgnomeuimm-2.24.0.tar.bz2) = e4caf43ee829200bef9ad87415ae39a5 -SHA256 (gnome2/libgnomeuimm-2.24.0.tar.bz2) = 7715ce5648ef7cdf231077fd4e9d8953b30ab70d31dec2efdaa6accd98a2e732 -SIZE (gnome2/libgnomeuimm-2.24.0.tar.bz2) = 381746 +MD5 (gnome2/libgnomeuimm-2.26.0.tar.bz2) = 7a9c8426a227a80ca70f2c976fcb1ae3 +SHA256 (gnome2/libgnomeuimm-2.26.0.tar.bz2) = d2993a6c70e5049971bf1163765c459ce1c3b0999c8e686267e3e544442322a3 +SIZE (gnome2/libgnomeuimm-2.26.0.tar.bz2) = 337722 diff --git a/x11-toolkits/libpanelappletmm/Makefile b/x11-toolkits/libpanelappletmm/Makefile index 11c74ea588e4..d677ca7f5b38 100644 --- a/x11-toolkits/libpanelappletmm/Makefile +++ b/x11-toolkits/libpanelappletmm/Makefile @@ -26,6 +26,8 @@ USE_GNOME= gnomehack lthack gnomepanel USE_AUTOTOOLS= libtool:15 USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-static +CONFIGURE_ENV= CPPFLAGS="`pkg-config --cflags libgnomeui-2.0`" \ + LIBS="`pkg-config --libs libgnomeui-2.0`" PLIST_SUB= VERSION="2.6" API_VERSION="2.6" diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile index dd74382215a3..bad736de1e33 100644 --- a/x11-toolkits/libwnck/Makefile +++ b/x11-toolkits/libwnck/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/libwnck/Makefile,v 1.114 2008/11/25 17:24:09 mezz Exp $ +# $MCom: ports/x11-toolkits/libwnck/Makefile,v 1.117 2009/03/17 22:51:24 kwm Exp $ # PORTNAME= libwnck -PORTVERSION= 2.24.2 +PORTVERSION= 2.26.0 PORTREVISION?= 0 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME diff --git a/x11-toolkits/libwnck/distinfo b/x11-toolkits/libwnck/distinfo index 6306502f25d3..4299aded9bbe 100644 --- a/x11-toolkits/libwnck/distinfo +++ b/x11-toolkits/libwnck/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libwnck-2.24.2.tar.bz2) = 1c939b1722579e5b7adc37068e77d72a -SHA256 (gnome2/libwnck-2.24.2.tar.bz2) = 35c12f983e64c88c37c261eb6b55b7c59a5ef4dbb04525162f0753ea8e9127f2 -SIZE (gnome2/libwnck-2.24.2.tar.bz2) = 693227 +MD5 (gnome2/libwnck-2.26.0.tar.bz2) = 73873bf666fc18dff04d66c48400b0c5 +SHA256 (gnome2/libwnck-2.26.0.tar.bz2) = b47a9252da2f5a32e171a8ecfc4fe74a9fa241fdc68a6bc063935573be8939dc +SIZE (gnome2/libwnck-2.26.0.tar.bz2) = 707479 diff --git a/x11-toolkits/libwnck/pkg-plist b/x11-toolkits/libwnck/pkg-plist index bcc92275f72a..168881d9e0c3 100644 --- a/x11-toolkits/libwnck/pkg-plist +++ b/x11-toolkits/libwnck/pkg-plist @@ -18,6 +18,7 @@ lib/libwnck-1.so.22 libdata/pkgconfig/libwnck-1.0.pc share/locale/am/LC_MESSAGES/libwnck.mo share/locale/ar/LC_MESSAGES/libwnck.mo +share/locale/as/LC_MESSAGES/libwnck.mo share/locale/az/LC_MESSAGES/libwnck.mo share/locale/be/LC_MESSAGES/libwnck.mo share/locale/be@latin/LC_MESSAGES/libwnck.mo @@ -130,3 +131,5 @@ share/locale/zh_TW/LC_MESSAGES/libwnck.mo @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin +@dirrmtry share/locale/as/LC_MESSAGES +@dirrmtry share/locale/as diff --git a/x11-toolkits/ocaml-lablgtk2/Makefile b/x11-toolkits/ocaml-lablgtk2/Makefile index e8f62c1d7de5..5686ae6981d6 100644 --- a/x11-toolkits/ocaml-lablgtk2/Makefile +++ b/x11-toolkits/ocaml-lablgtk2/Makefile @@ -22,6 +22,8 @@ USE_GMAKE= yes USE_GNOME= gtk20 USE_OCAML= yes +BROKEN= does not build with GNOME 2.26 + OPTIONS= GLADE "With glade support" ON \ GNOMECANVAS "With gnomecanvas support" ON \ GNOMEPANEL "With gnomepanel support" ON \ diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile index 8cf3b149f472..6fd6e3c0f364 100644 --- a/x11-toolkits/pango/Makefile +++ b/x11-toolkits/pango/Makefile @@ -3,12 +3,12 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/pango/Makefile,v 1.133 2008/12/18 02:44:05 mezz Exp $ +# $MCom: ports/x11-toolkits/pango/Makefile,v 1.139 2009/03/27 18:56:24 marcus Exp $ # PORTNAME= pango -PORTVERSION= 1.22.4 -PORTREVISION?= 0 +PORTVERSION= 1.24.0 +PORTREVISION?= 2 CATEGORIES= x11-toolkits MASTER_SITES= GNOME \ ftp://ftp.gtk.org/pub/pango/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ @@ -28,6 +28,7 @@ RUN_DEPENDS= ${FONTSCALE}:${X_FONTS_TTF_PORT} \ USE_GETTEXT= yes USE_GMAKE= yes +MAKE_JOBS_SAFE= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 USE_GNOME= gnomehack glib20 ltverhack referencehack @@ -44,7 +45,7 @@ PLIST_SUB= VERSION="1.6.0" FONTSCALE= ${LOCALBASE}/lib/X11/fonts/TTF/luximb.ttf FONTENCOD= ${LOCALBASE}/lib/X11/fonts/encodings/encodings.dir -MAN1= pango-querymodules.1 +MAN1= pango-view.1 pango-querymodules.1 preload.1 .if defined(WITHOUT_X11) CONFIGURE_ARGS+= --with-x=no diff --git a/x11-toolkits/pango/distinfo b/x11-toolkits/pango/distinfo index 45e017171aff..3ea90a967301 100644 --- a/x11-toolkits/pango/distinfo +++ b/x11-toolkits/pango/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/pango-1.22.4.tar.bz2) = 7c3f3748052799746d73c6d3a0cc1205 -SHA256 (gnome2/pango-1.22.4.tar.bz2) = ff47d7ed8360ebef5fa4b8d3ccf45e014bc8793743bca2a96635a3c34eeaa534 -SIZE (gnome2/pango-1.22.4.tar.bz2) = 1496168 +MD5 (gnome2/pango-1.24.0.tar.bz2) = d209f41079833cd2ef2c5e580ab9c5ee +SHA256 (gnome2/pango-1.24.0.tar.bz2) = 7a0af222b8f07defbf492246b7f7ba386025ab504f2ec4abc408d3d6fa4d4b95 +SIZE (gnome2/pango-1.24.0.tar.bz2) = 1520527 diff --git a/x11-toolkits/pango/files/patch-pango-view_Makefile.in b/x11-toolkits/pango/files/patch-pango-view_Makefile.in new file mode 100644 index 000000000000..1a865c134f35 --- /dev/null +++ b/x11-toolkits/pango/files/patch-pango-view_Makefile.in @@ -0,0 +1,11 @@ +--- pango-view/Makefile.in.orig 2009-03-20 23:09:47.000000000 -0400 ++++ pango-view/Makefile.in 2009-03-20 23:10:27.000000000 -0400 +@@ -727,7 +727,7 @@ $(srcdir)/pango-view.1: ../configure.in + (test -f "$@" || echo help2man is required to generate this file. >> "$@")); + + install-data-hook: +- @cd "$(DESTDIR)$(man1dir)" && gzip -c pango-view.1 > preload.1.gz && $(RM) preload.1 ++ @cd "$(DESTDIR)$(man1dir)" && cp -p pango-view.1 preload.1 + + uninstall-hook: + $(RM) "$(DESTDIR)$(man1dir)/pango-view.1.gz" diff --git a/x11-toolkits/pangomm/Makefile b/x11-toolkits/pangomm/Makefile index e8c61109ead6..782570ccf582 100644 --- a/x11-toolkits/pangomm/Makefile +++ b/x11-toolkits/pangomm/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/pangomm/Makefile,v 1.7 2008/11/10 19:57:21 kwm Exp $ +# $MCom: ports/x11-toolkits/pangomm/Makefile,v 1.9 2009/03/13 14:42:38 kwm Exp $ # PORTNAME= pangomm -PORTVERSION= 2.14.1 +PORTVERSION= 2.24.0 PORTREVISION?= 0 CATEGORIES= x11-toolkits MASTER_SITES= GNOME diff --git a/x11-toolkits/pangomm/distinfo b/x11-toolkits/pangomm/distinfo index 650cc75a9861..5e4dcdf249cc 100644 --- a/x11-toolkits/pangomm/distinfo +++ b/x11-toolkits/pangomm/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/pangomm-2.14.1.tar.bz2) = c67228ea93dd977394d2872b61754b53 -SHA256 (gnome2/pangomm-2.14.1.tar.bz2) = d7724d878242f7313086e23f774f5ae021f6ff8d0bd393d6c704ad89362c3557 -SIZE (gnome2/pangomm-2.14.1.tar.bz2) = 984848 +MD5 (gnome2/pangomm-2.24.0.tar.bz2) = fa0f44c37499433455857becad4bbcda +SHA256 (gnome2/pangomm-2.24.0.tar.bz2) = 0f0a45644bd11a3e354b52c3823a635cf0ebf2123fe7fa48e728e6aa5699039e +SIZE (gnome2/pangomm-2.24.0.tar.bz2) = 996057 diff --git a/x11-toolkits/py-gnome-desktop/Makefile b/x11-toolkits/py-gnome-desktop/Makefile index 51ddec0080ba..e5e6a44ebceb 100644 --- a/x11-toolkits/py-gnome-desktop/Makefile +++ b/x11-toolkits/py-gnome-desktop/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/py-gnome-desktop/Makefile,v 1.79 2008/12/20 05:39:21 marcus Exp $ +# $MCom: ports/x11-toolkits/py-gnome-desktop/Makefile,v 1.86 2009/03/15 00:39:36 marcus Exp $ # PORTNAME= gnome -PORTVERSION= 2.24.1 +PORTVERSION= 2.26.0 CATEGORIES= x11-toolkits python gnome MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/gnome-python-desktop/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -23,17 +23,18 @@ BUILD_DEPENDS= bug-buddy:${PORTSDIR}/devel/bug-buddy LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop \ totem-plparser.12:${PORTSDIR}/multimedia/totem-pl-parser \ gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media \ - gnome-keyring:${PORTSDIR}/security/gnome-keyring + gnome-keyring:${PORTSDIR}/security/gnome-keyring \ + evdocument.1:${PORTSDIR}/graphics/evince RUN_DEPENDS= bug-buddy:${PORTSDIR}/devel/bug-buddy USE_BZIP2= yes USE_GMAKE= yes USE_PYTHON= yes USE_GNOME= gnomehack libgnomeprintui gnomepanel gnomedesktop \ - gtksourceview libwnck nautiluscdburner pygnome2 metacity \ + gtksourceview libwnck nautilus2 pygnome2 metacity \ evolutiondataserver GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-metacity +CONFIGURE_ARGS= --enable-metacity --disable-nautilusburn CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" @@ -54,7 +55,7 @@ post-patch: .if !defined(NOPORTDOCS) post-install: ${MKDIR} ${EG_DST_DIR} - ${TAR} -C ${EG_SRC_DIR} -cf - . | ${TAR} -C ${EG_DST_DIR} -xf - + ${TAR} -C ${EG_SRC_DIR} --exclude *nautilusburn* -cf - . | ${TAR} -C ${EG_DST_DIR} -xf - ${CHOWN} -R ${BINOWN}:${BINGRP} ${EG_DST_DIR} ${CHMOD} -R go-w ${EG_DST_DIR} .endif diff --git a/x11-toolkits/py-gnome-desktop/distinfo b/x11-toolkits/py-gnome-desktop/distinfo index 42b6dc6c2fea..7c842b1e4979 100644 --- a/x11-toolkits/py-gnome-desktop/distinfo +++ b/x11-toolkits/py-gnome-desktop/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-python-desktop-2.24.1.tar.bz2) = 3eac6b859bff98148b021c9d11224ca5 -SHA256 (gnome2/gnome-python-desktop-2.24.1.tar.bz2) = 2f10ec51126493b88f5c2e3336a9cacca740bc25fc9b8b2d871a21b21b5e8748 -SIZE (gnome2/gnome-python-desktop-2.24.1.tar.bz2) = 621325 +MD5 (gnome2/gnome-python-desktop-2.26.0.tar.bz2) = fbcf4ef5ec4a8c4eec4d390c5889c80f +SHA256 (gnome2/gnome-python-desktop-2.26.0.tar.bz2) = 400a5401a591e271c3357d0a8cb05a7927b4c218130497d06f75df9763d4efd8 +SIZE (gnome2/gnome-python-desktop-2.26.0.tar.bz2) = 571939 diff --git a/x11-toolkits/py-gnome-desktop/files/patch-gtop_gtop.c b/x11-toolkits/py-gnome-desktop/files/patch-gtop_gtop.c deleted file mode 100644 index de4572f7febf..000000000000 --- a/x11-toolkits/py-gnome-desktop/files/patch-gtop_gtop.c +++ /dev/null @@ -1,10 +0,0 @@ ---- gtop/gtop.c.orig Wed May 18 00:54:59 2005 -+++ gtop/gtop.c Wed May 18 00:54:12 2005 -@@ -44,6 +44,7 @@ - - #include <sys/types.h> - #include <sys/socket.h> -+#include <netinet/in.h> - #include <arpa/inet.h> - - diff --git a/x11-toolkits/py-gnome-desktop/pkg-plist b/x11-toolkits/py-gnome-desktop/pkg-plist index cdc0b502be3b..2d7723f572f5 100644 --- a/x11-toolkits/py-gnome-desktop/pkg-plist +++ b/x11-toolkits/py-gnome-desktop/pkg-plist @@ -1,6 +1,8 @@ %%PYTHON_SITELIBDIR%%/gtk-2.0/bugbuddy.py %%PYTHON_SITELIBDIR%%/gtk-2.0/bugbuddy.pyc %%PYTHON_SITELIBDIR%%/gtk-2.0/bugbuddy.pyo +%%PYTHON_SITELIBDIR%%/gtk-2.0/evince.la +%%PYTHON_SITELIBDIR%%/gtk-2.0/evince.so %%PYTHON_SITELIBDIR%%/gtk-2.0/evolution/__init__.py %%PYTHON_SITELIBDIR%%/gtk-2.0/evolution/ebook.la %%PYTHON_SITELIBDIR%%/gtk-2.0/evolution/ebook.so @@ -33,8 +35,6 @@ %%PYTHON_SITELIBDIR%%/gtk-2.0/mediaprofiles.so %%PYTHON_SITELIBDIR%%/gtk-2.0/metacity.la %%PYTHON_SITELIBDIR%%/gtk-2.0/metacity.so -%%PYTHON_SITELIBDIR%%/gtk-2.0/nautilusburn.la -%%PYTHON_SITELIBDIR%%/gtk-2.0/nautilusburn.so %%PYTHON_SITELIBDIR%%/gtk-2.0/rsvg.la %%PYTHON_SITELIBDIR%%/gtk-2.0/rsvg.so %%PYTHON_SITELIBDIR%%/gtk-2.0/totem/__init__.py @@ -101,25 +101,21 @@ libdata/pkgconfig/gnome-python-desktop-2.0.pc %%PORTDOCS%%share/examples/py-gnome/keyring-async.py %%PORTDOCS%%share/examples/py-gnome/keyring.py %%PORTDOCS%%share/examples/py-gnome/mediaprofiles/profiles.py -%%PORTDOCS%%share/examples/py-gnome/nautilusburn/blank_disc.py -%%PORTDOCS%%share/examples/py-gnome/nautilusburn/drive_selection.py -%%PORTDOCS%%share/examples/py-gnome/nautilusburn/write_iso.py %%PORTDOCS%%share/examples/py-gnome/rsvg/rsvg-cairo.py %%PORTDOCS%%share/examples/py-gnome/wnck_example.py share/pygtk/2.0/defs/_gnomedesktop.defs share/pygtk/2.0/defs/applet.defs share/pygtk/2.0/defs/art.defs share/pygtk/2.0/defs/ebook.defs +share/pygtk/2.0/defs/evince.defs share/pygtk/2.0/defs/gnomekeyring.defs share/pygtk/2.0/defs/gtksourceview.defs share/pygtk/2.0/defs/mediaprofiles.defs share/pygtk/2.0/defs/metacity.defs -share/pygtk/2.0/defs/nautilus_burn.defs share/pygtk/2.0/defs/print.defs share/pygtk/2.0/defs/printui.defs share/pygtk/2.0/defs/wnck.defs %%PORTDOCS%%@dirrm share/examples/py-gnome/rsvg -%%PORTDOCS%%@dirrm share/examples/py-gnome/nautilusburn %%PORTDOCS%%@dirrm share/examples/py-gnome/mediaprofiles %%PORTDOCS%%@dirrm share/examples/py-gnome/gtksourceview %%PORTDOCS%%@dirrm share/examples/py-gnome/gnomeprint diff --git a/x11-toolkits/py-gnome-extras/Makefile b/x11-toolkits/py-gnome-extras/Makefile index e494fff56031..8acb4662d2a2 100644 --- a/x11-toolkits/py-gnome-extras/Makefile +++ b/x11-toolkits/py-gnome-extras/Makefile @@ -3,12 +3,12 @@ # Whom: Koop Mast <kwm@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/py-gnome-extras/Makefile,v 1.45 2008/10/21 14:16:43 kwm Exp $ +# $MCom: ports/x11-toolkits/py-gnome-extras/Makefile,v 1.48 2009/04/07 03:08:53 marcus Exp $ # PORTNAME= gnome -PORTVERSION= 2.19.1 -PORTREVISION= 5 +PORTVERSION= 2.25.3 +PORTREVISION= 1 CATEGORIES= x11-toolkits python gnome MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/gnome-python-extras/${PORTVERSION:C/..$//} @@ -29,7 +29,7 @@ USE_GECKO= firefox seamonkey xulrunner mozilla USE_BZIP2= yes USE_GMAKE= yes USE_PYTHON= yes -USE_GNOME= gnomehack libgtkhtml pygnome2 libgda3 +USE_GNOME= gnomehack libgtkhtml pygnome2 libgda4 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-gtkmozembed=${GECKO} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/x11-toolkits/py-gnome-extras/distinfo b/x11-toolkits/py-gnome-extras/distinfo index c16b77d8ddb3..71fc1395ff05 100644 --- a/x11-toolkits/py-gnome-extras/distinfo +++ b/x11-toolkits/py-gnome-extras/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-python-extras-2.19.1.tar.bz2) = 08896c63d71ce44d20fafbaf9c0edc78 -SHA256 (gnome2/gnome-python-extras-2.19.1.tar.bz2) = c5f74f4c46dbb379d119d6f74ca4a47653af251bea176dc7a0ecacccb88339f0 -SIZE (gnome2/gnome-python-extras-2.19.1.tar.bz2) = 361721 +MD5 (gnome2/gnome-python-extras-2.25.3.tar.bz2) = 9f3b7ec5c57130b96061cb486b79c076 +SHA256 (gnome2/gnome-python-extras-2.25.3.tar.bz2) = ca346264e00e193f0866cabd8801d3b7ce70dae7b8b296e41e5b3a45c9b0275c +SIZE (gnome2/gnome-python-extras-2.25.3.tar.bz2) = 370489 diff --git a/x11-toolkits/py-gnome-extras/files/patch-configure b/x11-toolkits/py-gnome-extras/files/patch-configure index 407ce7f1767c..04f5b256944c 100644 --- a/x11-toolkits/py-gnome-extras/files/patch-configure +++ b/x11-toolkits/py-gnome-extras/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Sun Feb 25 16:31:03 2007 -+++ configure Sat Jul 21 20:04:43 2007 -@@ -1550,7 +1550,7 @@ +--- configure.orig 2009-02-28 16:14:05.000000000 -0500 ++++ configure 2009-02-28 16:21:48.000000000 -0500 +@@ -1721,7 +1721,7 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-tags[=TAGS] include additional configurations [automatic] @@ -9,14 +9,667 @@ package that provides libgtkmozembed Some influential environment variables: -@@ -22072,8 +22072,9 @@ - xulrunner) mozpackage_required_version=1.8 ;; - firefox) mozpackage_required_version=1.0 ;; - mozilla) mozpackage_required_version=1.2b ;; -+ seamonkey) mozpackage_required_version=1.1.3 ;; - *) { { echo "$as_me:$LINENO: error: --with-gtkmozembed argument must be either 'mozilla', 'firefox', or 'xulrunner'" >&5 --echo "$as_me: error: --with-gtkmozembed argument must be either 'mozilla', 'firefox', or 'xulrunner'" >&2;} -+echo "$as_me: error: --with-gtkmozembed argument must be either 'mozilla', 'firefox', 'seamonkey' or 'xulrunner'" >&2;} - { (exit 1); exit 1; }; } - esac +@@ -22428,6 +22428,150 @@ fi + + { $as_echo "$as_me:$LINENO: result: no" >&5 + $as_echo "no" >&6; } ++ ++ ++pkg_failed=no ++{ $as_echo "$as_me:$LINENO: checking for GTKMOZEMBED" >&5 ++$as_echo_n "checking for GTKMOZEMBED... " >&6; } ++ ++if test -n "$GTKMOZEMBED_CFLAGS"; then ++ pkg_cv_GTKMOZEMBED_CFLAGS="$GTKMOZEMBED_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_GTKMOZEMBED_CFLAGS=`$PKG_CONFIG --cflags "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++if test -n "$GTKMOZEMBED_LIBS"; then ++ pkg_cv_GTKMOZEMBED_LIBS="$GTKMOZEMBED_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_GTKMOZEMBED_LIBS=`$PKG_CONFIG --libs "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>&1` ++ else ++ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>&1` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$GTKMOZEMBED_PKG_ERRORS" >&5 ++ ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } ++ build_gtkmozembed=false ++elif test $pkg_failed = untried; then ++ build_gtkmozembed=false ++else ++ GTKMOZEMBED_CFLAGS=$pkg_cv_GTKMOZEMBED_CFLAGS ++ GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } ++ build_gtkmozembed=true; mozpackage=seamonkey ++fi ++ ++elif test $pkg_failed = untried; then ++ ++ ++pkg_failed=no ++{ $as_echo "$as_me:$LINENO: checking for GTKMOZEMBED" >&5 ++$as_echo_n "checking for GTKMOZEMBED... " >&6; } ++ ++if test -n "$GTKMOZEMBED_CFLAGS"; then ++ pkg_cv_GTKMOZEMBED_CFLAGS="$GTKMOZEMBED_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_GTKMOZEMBED_CFLAGS=`$PKG_CONFIG --cflags "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++if test -n "$GTKMOZEMBED_LIBS"; then ++ pkg_cv_GTKMOZEMBED_LIBS="$GTKMOZEMBED_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_GTKMOZEMBED_LIBS=`$PKG_CONFIG --libs "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>&1` ++ else ++ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>&1` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$GTKMOZEMBED_PKG_ERRORS" >&5 ++ ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + build_gtkmozembed=false + elif test $pkg_failed = untried; then + build_gtkmozembed=false +@@ -22436,6 +22580,14 @@ else + GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS + { $as_echo "$as_me:$LINENO: result: yes" >&5 + $as_echo "yes" >&6; } ++ build_gtkmozembed=true; mozpackage=seamonkey ++fi ++ ++else ++ GTKMOZEMBED_CFLAGS=$pkg_cv_GTKMOZEMBED_CFLAGS ++ GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + build_gtkmozembed=true; mozpackage=mozilla + fi + +@@ -22506,6 +22658,150 @@ fi + + { $as_echo "$as_me:$LINENO: result: no" >&5 + $as_echo "no" >&6; } ++ ++ ++pkg_failed=no ++{ $as_echo "$as_me:$LINENO: checking for GTKMOZEMBED" >&5 ++$as_echo_n "checking for GTKMOZEMBED... " >&6; } ++ ++if test -n "$GTKMOZEMBED_CFLAGS"; then ++ pkg_cv_GTKMOZEMBED_CFLAGS="$GTKMOZEMBED_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_GTKMOZEMBED_CFLAGS=`$PKG_CONFIG --cflags "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++if test -n "$GTKMOZEMBED_LIBS"; then ++ pkg_cv_GTKMOZEMBED_LIBS="$GTKMOZEMBED_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_GTKMOZEMBED_LIBS=`$PKG_CONFIG --libs "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>&1` ++ else ++ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>&1` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$GTKMOZEMBED_PKG_ERRORS" >&5 ++ ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } ++ build_gtkmozembed=false ++elif test $pkg_failed = untried; then ++ build_gtkmozembed=false ++else ++ GTKMOZEMBED_CFLAGS=$pkg_cv_GTKMOZEMBED_CFLAGS ++ GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } ++ build_gtkmozembed=true; mozpackage=seamonkey ++fi ++ ++elif test $pkg_failed = untried; then ++ ++ ++pkg_failed=no ++{ $as_echo "$as_me:$LINENO: checking for GTKMOZEMBED" >&5 ++$as_echo_n "checking for GTKMOZEMBED... " >&6; } ++ ++if test -n "$GTKMOZEMBED_CFLAGS"; then ++ pkg_cv_GTKMOZEMBED_CFLAGS="$GTKMOZEMBED_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_GTKMOZEMBED_CFLAGS=`$PKG_CONFIG --cflags "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++if test -n "$GTKMOZEMBED_LIBS"; then ++ pkg_cv_GTKMOZEMBED_LIBS="$GTKMOZEMBED_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_GTKMOZEMBED_LIBS=`$PKG_CONFIG --libs "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>&1` ++ else ++ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>&1` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$GTKMOZEMBED_PKG_ERRORS" >&5 ++ ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + build_gtkmozembed=false + elif test $pkg_failed = untried; then + build_gtkmozembed=false +@@ -22514,6 +22810,14 @@ else + GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS + { $as_echo "$as_me:$LINENO: result: yes" >&5 + $as_echo "yes" >&6; } ++ build_gtkmozembed=true; mozpackage=seamonkey ++fi ++ ++else ++ GTKMOZEMBED_CFLAGS=$pkg_cv_GTKMOZEMBED_CFLAGS ++ GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + build_gtkmozembed=true; mozpackage=mozilla + fi + +@@ -22658,6 +22962,150 @@ fi + + { $as_echo "$as_me:$LINENO: result: no" >&5 + $as_echo "no" >&6; } ++ ++ ++pkg_failed=no ++{ $as_echo "$as_me:$LINENO: checking for GTKMOZEMBED" >&5 ++$as_echo_n "checking for GTKMOZEMBED... " >&6; } ++ ++if test -n "$GTKMOZEMBED_CFLAGS"; then ++ pkg_cv_GTKMOZEMBED_CFLAGS="$GTKMOZEMBED_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_GTKMOZEMBED_CFLAGS=`$PKG_CONFIG --cflags "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++if test -n "$GTKMOZEMBED_LIBS"; then ++ pkg_cv_GTKMOZEMBED_LIBS="$GTKMOZEMBED_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_GTKMOZEMBED_LIBS=`$PKG_CONFIG --libs "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>&1` ++ else ++ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>&1` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$GTKMOZEMBED_PKG_ERRORS" >&5 ++ ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } ++ build_gtkmozembed=false ++elif test $pkg_failed = untried; then ++ build_gtkmozembed=false ++else ++ GTKMOZEMBED_CFLAGS=$pkg_cv_GTKMOZEMBED_CFLAGS ++ GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } ++ build_gtkmozembed=true; mozpackage=seamonkey ++fi ++ ++elif test $pkg_failed = untried; then ++ ++ ++pkg_failed=no ++{ $as_echo "$as_me:$LINENO: checking for GTKMOZEMBED" >&5 ++$as_echo_n "checking for GTKMOZEMBED... " >&6; } ++ ++if test -n "$GTKMOZEMBED_CFLAGS"; then ++ pkg_cv_GTKMOZEMBED_CFLAGS="$GTKMOZEMBED_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_GTKMOZEMBED_CFLAGS=`$PKG_CONFIG --cflags "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++if test -n "$GTKMOZEMBED_LIBS"; then ++ pkg_cv_GTKMOZEMBED_LIBS="$GTKMOZEMBED_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_GTKMOZEMBED_LIBS=`$PKG_CONFIG --libs "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>&1` ++ else ++ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>&1` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$GTKMOZEMBED_PKG_ERRORS" >&5 ++ ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + build_gtkmozembed=false + elif test $pkg_failed = untried; then + build_gtkmozembed=false +@@ -22666,6 +23114,14 @@ else + GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS + { $as_echo "$as_me:$LINENO: result: yes" >&5 + $as_echo "yes" >&6; } ++ build_gtkmozembed=true; mozpackage=seamonkey ++fi ++ ++else ++ GTKMOZEMBED_CFLAGS=$pkg_cv_GTKMOZEMBED_CFLAGS ++ GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + build_gtkmozembed=true; mozpackage=mozilla + fi + +@@ -22736,6 +23192,150 @@ fi + + { $as_echo "$as_me:$LINENO: result: no" >&5 + $as_echo "no" >&6; } ++ ++ ++pkg_failed=no ++{ $as_echo "$as_me:$LINENO: checking for GTKMOZEMBED" >&5 ++$as_echo_n "checking for GTKMOZEMBED... " >&6; } ++ ++if test -n "$GTKMOZEMBED_CFLAGS"; then ++ pkg_cv_GTKMOZEMBED_CFLAGS="$GTKMOZEMBED_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_GTKMOZEMBED_CFLAGS=`$PKG_CONFIG --cflags "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++if test -n "$GTKMOZEMBED_LIBS"; then ++ pkg_cv_GTKMOZEMBED_LIBS="$GTKMOZEMBED_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_GTKMOZEMBED_LIBS=`$PKG_CONFIG --libs "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>&1` ++ else ++ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>&1` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$GTKMOZEMBED_PKG_ERRORS" >&5 ++ ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } ++ build_gtkmozembed=false ++elif test $pkg_failed = untried; then ++ build_gtkmozembed=false ++else ++ GTKMOZEMBED_CFLAGS=$pkg_cv_GTKMOZEMBED_CFLAGS ++ GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } ++ build_gtkmozembed=true; mozpackage=seamonkey ++fi ++ ++elif test $pkg_failed = untried; then ++ ++ ++pkg_failed=no ++{ $as_echo "$as_me:$LINENO: checking for GTKMOZEMBED" >&5 ++$as_echo_n "checking for GTKMOZEMBED... " >&6; } ++ ++if test -n "$GTKMOZEMBED_CFLAGS"; then ++ pkg_cv_GTKMOZEMBED_CFLAGS="$GTKMOZEMBED_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_GTKMOZEMBED_CFLAGS=`$PKG_CONFIG --cflags "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++if test -n "$GTKMOZEMBED_LIBS"; then ++ pkg_cv_GTKMOZEMBED_LIBS="$GTKMOZEMBED_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_GTKMOZEMBED_LIBS=`$PKG_CONFIG --libs "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>&1` ++ else ++ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>&1` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$GTKMOZEMBED_PKG_ERRORS" >&5 ++ ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + build_gtkmozembed=false + elif test $pkg_failed = untried; then + build_gtkmozembed=false +@@ -22744,6 +23344,14 @@ else + GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS + { $as_echo "$as_me:$LINENO: result: yes" >&5 + $as_echo "yes" >&6; } ++ build_gtkmozembed=true; mozpackage=seamonkey ++fi ++ ++else ++ GTKMOZEMBED_CFLAGS=$pkg_cv_GTKMOZEMBED_CFLAGS ++ GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + build_gtkmozembed=true; mozpackage=mozilla + fi diff --git a/x11-toolkits/py-gnome-extras/files/patch-gdl_gdl.defs b/x11-toolkits/py-gnome-extras/files/patch-gdl_gdl.defs deleted file mode 100644 index b0b5dae6237e..000000000000 --- a/x11-toolkits/py-gnome-extras/files/patch-gdl_gdl.defs +++ /dev/null @@ -1,67 +0,0 @@ ---- gdl/gdl.defs.orig 2007-06-05 14:52:30.000000000 +0000 -+++ gdl/gdl.defs 2008-10-21 15:47:07.000000000 +0000 -@@ -81,17 +81,6 @@ - (gtype-id "GDL_TYPE_DOCK_TABLABEL") - ) - --(ifdef HAVE_GDL_0_7 -- --(define-object Icons -- (in-module "Gdl") -- (parent "GObject") -- (c-name "GdlIcons") -- (gtype-id "GDL_TYPE_ICONS") --) -- --) ; ifdef HAVE_GDL_0_7 -- - ;; Enumerations and flags ... - - (ifdef HAVE_GDL_0_7 -@@ -924,46 +913,3 @@ - (return-type "none") - ) - --;; From gdl-icons.h -- --(ifdef HAVE_GDL_0_7 -- --(define-function gdl_icons_new -- (is-constructor-of "GdlIcons") -- (c-name "gdl_icons_new") -- (return-type "GdlIcons*") -- (parameters -- '("int" "icon_size") -- ) --) -- --(define-function gdl_icons_get_type -- (c-name "gdl_icons_get_type") -- (return-type "GType") --) -- --(define-method get_folder_icon -- (of-object "GdlIcons") -- (c-name "gdl_icons_get_folder_icon") -- (return-type "GdkPixbuf*") --) -- --(define-method get_uri_icon -- (of-object "GdlIcons") -- (c-name "gdl_icons_get_uri_icon") -- (return-type "GdkPixbuf*") -- (parameters -- '("const-char*" "uri") -- ) --) -- --(define-method get_mime_icon -- (of-object "GdlIcons") -- (c-name "gdl_icons_get_mime_icon") -- (return-type "GdkPixbuf*") -- (parameters -- '("const-char*" "mime_type") -- ) --) -- --) ; ifdef HAVE_GDL_0_7 diff --git a/x11-toolkits/py-gnome-extras/files/patch-gdl_gdl.override b/x11-toolkits/py-gnome-extras/files/patch-gdl_gdl.override deleted file mode 100644 index 16e67fe1efc5..000000000000 --- a/x11-toolkits/py-gnome-extras/files/patch-gdl_gdl.override +++ /dev/null @@ -1,10 +0,0 @@ ---- gdl/gdl.override.orig 2007-06-05 14:52:30.000000000 +0000 -+++ gdl/gdl.override 2008-10-21 15:47:07.000000000 +0000 -@@ -6,7 +6,6 @@ headers - #include <pygtk/pygtk.h> - #include <gdl/gdl-dock.h> - #include <gdl/libgdltypebuiltins.h> --#include <gdl/gdl-icons.h> - #ifndef HAVE_GDL_0_7 - # include <gdl/gdl-dock-bar.h> - #endif diff --git a/x11-toolkits/py-gnome-extras/pkg-plist b/x11-toolkits/py-gnome-extras/pkg-plist index 012275817bae..8564adea3250 100644 --- a/x11-toolkits/py-gnome-extras/pkg-plist +++ b/x11-toolkits/py-gnome-extras/pkg-plist @@ -1,4 +1,4 @@ -include/pygda-3.0/pygdavalue_conversions.h +include/pygda-4.0/pygdavalue_conversions.h %%PYTHON_SITELIBDIR%%/gtk-2.0/egg/__init__.py %%PYTHON_SITELIBDIR%%/gtk-2.0/egg/__init__.pyc %%PYTHON_SITELIBDIR%%/gtk-2.0/egg/__init__.pyo @@ -24,17 +24,7 @@ include/pygda-3.0/pygdavalue_conversions.h %%PYTHON_SITELIBDIR%%/gtk-2.0/gtkspell.la %%PYTHON_SITELIBDIR%%/gtk-2.0/gtkspell.so libdata/pkgconfig/gnome-python-extras-2.0.pc -libdata/pkgconfig/pygda-3.0.pc -%%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/class-gtkmozembed.html -%%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/gtkmozembed-class-reference.html -%%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/index.html -%%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/index.sgml -%%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/pygtkmozembed.devhelp -%%PORTDOCS%%%%DOCSDIR%%/pygtkspell/class-gtkspell.html -%%PORTDOCS%%%%DOCSDIR%%/pygtkspell/gtkspell-class-reference.html -%%PORTDOCS%%%%DOCSDIR%%/pygtkspell/index.html -%%PORTDOCS%%%%DOCSDIR%%/pygtkspell/index.sgml -%%PORTDOCS%%%%DOCSDIR%%/pygtkspell/pygtkspell.devhelp +libdata/pkgconfig/pygda-4.0.pc %%PORTDOCS%%share/examples/py-gnome/egg/recent/Bonobo_Sample_Hello.xml %%PORTDOCS%%share/examples/py-gnome/egg/recent/bonobo-view.py %%PORTDOCS%%share/examples/py-gnome/egg/recent/gtk-view.py @@ -45,7 +35,7 @@ libdata/pkgconfig/pygda-3.0.pc %%PORTDOCS%%share/examples/py-gnome/gdl/gdl_test.py %%PORTDOCS%%share/examples/py-gnome/gksu2/simple.py %%PORTDOCS%%share/examples/py-gnome/gtkhtml2/simple-browser.py -%%PORTDOCS%%share/examples/py-gnome/gtkspell/gtkspell.py +%%PORTDOCS%%share/examples/py-gnome/gtkspell/spell.py %%PORTDOCS%%share/examples/py-gnome/gtkspell/test.py share/pygtk/2.0/argtypes/gda-arg-types.py share/pygtk/2.0/argtypes/gda-arg-types.pyc @@ -60,9 +50,6 @@ share/pygtk/2.0/defs/trayicon.defs %%PORTDOCS%%@dirrm share/examples/py-gnome/gdl %%PORTDOCS%%@dirrm share/examples/py-gnome/egg/recent %%PORTDOCS%%@dirrm share/examples/py-gnome/egg -%%PORTDOCS%%@dirrm %%DOCSDIR%%/pygtkspell -%%PORTDOCS%%@dirrm %%DOCSDIR%%/pygtkmozembed -%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gksu @dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/egg -@dirrm include/pygda-3.0 +@dirrm include/pygda-4.0 diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile index 1b9cd91b4e0c..ae7de1b6e1bb 100644 --- a/x11-toolkits/py-gnome2/Makefile +++ b/x11-toolkits/py-gnome2/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/py-gnome2/Makefile,v 1.52 2008/09/22 12:16:45 kwm Exp $ +# $MCom: ports/x11-toolkits/py-gnome2/Makefile,v 1.55 2009/03/15 00:16:38 marcus Exp $ # PORTNAME= gnome -PORTVERSION= 2.22.3 +PORTVERSION= 2.26.0 CATEGORIES= x11-toolkits python gnome MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/gnome-python/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/x11-toolkits/py-gnome2/distinfo b/x11-toolkits/py-gnome2/distinfo index f93a875bb83a..82938c9822e2 100644 --- a/x11-toolkits/py-gnome2/distinfo +++ b/x11-toolkits/py-gnome2/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-python-2.22.3.tar.bz2) = ab12d94954a57de39b25eb7903d8429c -SHA256 (gnome2/gnome-python-2.22.3.tar.bz2) = a1763ef40aa0fc152e1afe6be6b01d69ba305273bd4bd44cad018da42d1bb559 -SIZE (gnome2/gnome-python-2.22.3.tar.bz2) = 588459 +MD5 (gnome2/gnome-python-2.26.0.tar.bz2) = 452b8489eed892d09c506c17efd597f1 +SHA256 (gnome2/gnome-python-2.26.0.tar.bz2) = 7b15e68979afe72224e4e2928c1656f2e4d3c8c3ba3d69487e6179bb46947e04 +SIZE (gnome2/gnome-python-2.26.0.tar.bz2) = 523096 diff --git a/x11-toolkits/py-gtksourceview/Makefile b/x11-toolkits/py-gtksourceview/Makefile index 837371f7d625..6bbca5f5dd3e 100644 --- a/x11-toolkits/py-gtksourceview/Makefile +++ b/x11-toolkits/py-gtksourceview/Makefile @@ -3,11 +3,11 @@ # Whom: Mezz <mezz@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/py-gtksourceview/Makefile,v 1.14 2008/09/21 06:34:35 kwm Exp $ +# $MCom: ports/x11-toolkits/py-gtksourceview/Makefile,v 1.17 2009/03/24 13:38:04 kwm Exp $ # PORTNAME= gtksourceview -PORTVERSION= 2.4.0 +PORTVERSION= 2.6.0 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/pygtksourceview/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/x11-toolkits/py-gtksourceview/distinfo b/x11-toolkits/py-gtksourceview/distinfo index daf8d55238f3..e07fe304f190 100644 --- a/x11-toolkits/py-gtksourceview/distinfo +++ b/x11-toolkits/py-gtksourceview/distinfo @@ -1,3 +1,3 @@ -MD5 (pygtksourceview-2.4.0.tar.bz2) = 436e2ec467035a8cd174b794932e4cdc -SHA256 (pygtksourceview-2.4.0.tar.bz2) = 437fb779bc0bd9a43806ee7b3a406a1329800e54489cd9579ea0a101870df791 -SIZE (pygtksourceview-2.4.0.tar.bz2) = 271360 +MD5 (pygtksourceview-2.6.0.tar.bz2) = 5587a1865bd5c785c6f34095c57cc96b +SHA256 (pygtksourceview-2.6.0.tar.bz2) = 77acb735fee997a1638c79256b9dcf592566d066b54a72eb4321909f98f66178 +SIZE (pygtksourceview-2.6.0.tar.bz2) = 271314 diff --git a/x11-toolkits/py-vte/Makefile b/x11-toolkits/py-vte/Makefile index 5710557fc6c3..73993810c4bb 100644 --- a/x11-toolkits/py-vte/Makefile +++ b/x11-toolkits/py-vte/Makefile @@ -3,10 +3,10 @@ # Whom: Alexander Nedotsukov <bland@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/py-vte/Makefile,v 1.1 2007/02/18 19:12:57 mezz Exp $ +# $MCom: ports/x11-toolkits/py-vte/Makefile,v 1.3 2009/02/24 19:42:18 kwm Exp $ # -PORTREVISION= 2 +PORTREVISION= 0 CATEGORIES= x11-toolkits gnome python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/x11-toolkits/py-vte/pkg-plist b/x11-toolkits/py-vte/pkg-plist index d67a8a180e60..d726d02a6075 100644 --- a/x11-toolkits/py-vte/pkg-plist +++ b/x11-toolkits/py-vte/pkg-plist @@ -1,3 +1,5 @@ %%PYTHON_SITELIBDIR%%/gtk-2.0/vtemodule.a %%PYTHON_SITELIBDIR%%/gtk-2.0/vtemodule.la %%PYTHON_SITELIBDIR%%/gtk-2.0/vtemodule.so +libdata/pkgconfig/pyvte.pc +share/pygtk/2.0/defs/vte.defs diff --git a/x11-toolkits/ruby-panelapplet/Makefile b/x11-toolkits/ruby-panelapplet/Makefile index fba7f469e111..4721c3c1af11 100644 --- a/x11-toolkits/ruby-panelapplet/Makefile +++ b/x11-toolkits/ruby-panelapplet/Makefile @@ -3,7 +3,7 @@ # Whom: Mezz <mezz@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/ruby-panelapplet/Makefile,v 1.2 2005/10/17 07:05:43 mezz Exp $ +# $MCom: ports/x11-toolkits/ruby-panelapplet/Makefile,v 1.4 2009/04/07 04:06:54 marcus Exp $ # PORTNAME= panelapplet @@ -24,6 +24,8 @@ USE_RUBY= yes USE_GNOME= gnomepanel USE_RUBY_EXTCONF= yes +BROKEN= does not build with GNOME 2.26. + .include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common" WRKSRC= ${RUBY_GNOME_WRKSRC}/panel-applet diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile index 3eb38350af11..277b44db6328 100644 --- a/x11-toolkits/vte/Makefile +++ b/x11-toolkits/vte/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/vte/Makefile,v 1.91 2008/09/22 23:42:39 kwm Exp $ +# $MCom: ports/x11-toolkits/vte/Makefile,v 1.94 2009/03/16 07:57:41 kwm Exp $ # PORTNAME= vte -PORTVERSION= 0.17.4 +PORTVERSION= 0.20.0 PORTREVISION?= 0 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME @@ -27,8 +27,8 @@ USE_AUTOTOOLS= libtool:15 USE_GETTEXT= yes USE_GNOME?= gnomeprefix gnomehack gtk20 ltverhack referencehack CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" \ - BSD_PTHREAD_LIBS="${PTHREAD_LIBS}" + LDFLAGS="-L${LOCALBASE}/lib" +# BSD_PTHREAD_LIBS="${PTHREAD_LIBS}" CONFIGURE_ARGS?=--disable-python \ --disable-freetypetest diff --git a/x11-toolkits/vte/distinfo b/x11-toolkits/vte/distinfo index f703509a9b03..f716a7305113 100644 --- a/x11-toolkits/vte/distinfo +++ b/x11-toolkits/vte/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/vte-0.17.4.tar.bz2) = ec6cb2668db7146eae7cfc48af98f3ed -SHA256 (gnome2/vte-0.17.4.tar.bz2) = 50ae10aea7fa99c9ae296031782c18ac15663e84eb6ecd94cd0a18c7843987d2 -SIZE (gnome2/vte-0.17.4.tar.bz2) = 1084847 +MD5 (gnome2/vte-0.20.0.tar.bz2) = 12dde859bc98e039336baff6e9e6b15b +SHA256 (gnome2/vte-0.20.0.tar.bz2) = 6612c72fe73279a23e296a70e19b3f5dd270c6d16cf0cc6a191475c1a16846f7 +SIZE (gnome2/vte-0.20.0.tar.bz2) = 1089171 diff --git a/x11-toolkits/vte/files/patch-gnome-pty-helper_Makefile.in b/x11-toolkits/vte/files/patch-gnome-pty-helper_Makefile.in index 8f838a9b007f..5534225003e7 100644 --- a/x11-toolkits/vte/files/patch-gnome-pty-helper_Makefile.in +++ b/x11-toolkits/vte/files/patch-gnome-pty-helper_Makefile.in @@ -1,22 +1,5 @@ --- gnome-pty-helper/Makefile.in.orig 2007-07-29 17:20:13.000000000 -0400 +++ gnome-pty-helper/Makefile.in 2007-07-29 17:25:47.000000000 -0400 -@@ -107,6 +107,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_P - LDFLAGS = @LDFLAGS@ - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ -+BSD_PTHREAD_LIBS = @BSD_PTHREAD_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ - MAKEINFO = @MAKEINFO@ -@@ -271,7 +272,7 @@ clean-libexecPROGRAMS: - -test -z "$(libexec_PROGRAMS)" || rm -f $(libexec_PROGRAMS) - gnome-pty-helper$(EXEEXT): $(gnome_pty_helper_OBJECTS) $(gnome_pty_helper_DEPENDENCIES) - @rm -f gnome-pty-helper$(EXEEXT) -- $(LINK) $(gnome_pty_helper_OBJECTS) $(gnome_pty_helper_LDADD) $(LIBS) -+ $(LINK) $(gnome_pty_helper_OBJECTS) $(gnome_pty_helper_LDADD) $(LIBS) $(BSD_PTHREAD_LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) @@ -584,8 +585,8 @@ uninstall-am: uninstall-libexecPROGRAMS diff --git a/x11-toolkits/vte/files/patch-gnome-pty-helper_configure b/x11-toolkits/vte/files/patch-gnome-pty-helper_configure deleted file mode 100644 index 70091c3aa2f7..000000000000 --- a/x11-toolkits/vte/files/patch-gnome-pty-helper_configure +++ /dev/null @@ -1,27 +0,0 @@ ---- gnome-pty-helper/configure.orig 2008-09-08 19:30:02.000000000 -0400 -+++ gnome-pty-helper/configure 2008-09-08 19:31:21.000000000 -0400 -@@ -673,6 +673,7 @@ AMTAR - am__tar - am__untar - CC -+BSD_PTHREAD_LIBS - CFLAGS - LDFLAGS - CPPFLAGS -@@ -8434,6 +8435,7 @@ AMTAR!$AMTAR$ac_delim - am__tar!$am__tar$ac_delim - am__untar!$am__untar$ac_delim - CC!$CC$ac_delim -+BSD_PTHREAD_LIBS!$BSD_PTHREAD_LIBS$ac_delim - CFLAGS!$CFLAGS$ac_delim - LDFLAGS!$LDFLAGS$ac_delim - CPPFLAGS!$CPPFLAGS$ac_delim -@@ -8470,7 +8472,7 @@ LIBOBJS!$LIBOBJS$ac_delim - LTLIBOBJS!$LTLIBOBJS$ac_delim - _ACEOF - -- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 94; then -+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 95; then - break - elif $ac_last_try; then - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/x11-toolkits/vte/files/patch-gnome-pty-helper_gnome-pty-helper.c b/x11-toolkits/vte/files/patch-gnome-pty-helper_gnome-pty-helper.c deleted file mode 100644 index 6be543a31e05..000000000000 --- a/x11-toolkits/vte/files/patch-gnome-pty-helper_gnome-pty-helper.c +++ /dev/null @@ -1,26 +0,0 @@ ---- gnome-pty-helper/gnome-pty-helper.c.orig Tue Feb 14 03:58:10 2006 -+++ gnome-pty-helper/gnome-pty-helper.c Sat Feb 25 16:38:04 2006 -@@ -95,12 +95,12 @@ static pty_info *pty_list; - #endif /* CMSG_DATA */ - - static struct cmsghdr *cmptr; --static int CONTROLLEN; -+static socklen_t CONTROLLEN; - - static int - init_msg_pass (void) - { -- CONTROLLEN = (CMSG_DATA (cmptr) - (unsigned char *)cmptr) + sizeof(int); -+ CONTROLLEN = CMSG_SPACE (sizeof (int)); - cmptr = malloc (CONTROLLEN); - - if (cmptr) -@@ -128,7 +128,7 @@ pass_fd (int client_fd, int fd) - - cmptr->cmsg_level = SOL_SOCKET; - cmptr->cmsg_type = SCM_RIGHTS; -- cmptr->cmsg_len = CONTROLLEN; -+ cmptr->cmsg_len = CMSG_LEN (sizeof (fd)); - *(int *)CMSG_DATA (cmptr) = fd; - - if (sendmsg (client_fd, &msg, 0) != 1) diff --git a/x11-toolkits/vte/files/patch-python_Makefile.in b/x11-toolkits/vte/files/patch-python_Makefile.in index 10ee93b1347b..d8c01a7483df 100644 --- a/x11-toolkits/vte/files/patch-python_Makefile.in +++ b/x11-toolkits/vte/files/patch-python_Makefile.in @@ -1,19 +1,36 @@ ---- python/Makefile.in.orig Tue Feb 27 12:46:42 2007 -+++ python/Makefile.in Tue Feb 27 12:47:11 2007 -@@ -61,7 +61,6 @@ +--- python/Makefile.in.orig 2009-03-16 08:49:19.000000000 +0100 ++++ python/Makefile.in 2009-03-16 08:51:17.000000000 +0100 +@@ -56,7 +56,6 @@ LTLIBRARIES = $(pythonsiteexec_LTLIBRARIES) am__DEPENDENCIES_1 = @BUILD_PYTHON_MODULES_TRUE@vtemodule_la_DEPENDENCIES = \ -@BUILD_PYTHON_MODULES_TRUE@ $(top_builddir)/src/libvte.la \ @BUILD_PYTHON_MODULES_TRUE@ $(am__DEPENDENCIES_1) \ @BUILD_PYTHON_MODULES_TRUE@ $(am__DEPENDENCIES_1) \ - @BUILD_PYTHON_MODULES_TRUE@ $(am__DEPENDENCIES_1) \ -@@ -303,7 +302,7 @@ + @BUILD_PYTHON_MODULES_TRUE@ $(am__DEPENDENCIES_1) +@@ -290,11 +289,11 @@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + EXTRA_DIST = vte.defs pyvte.pc.in vte.override cat.py unrealize.py vte-demo.py +-defsdir = $(datadir)/pygtk/2.0/defs +-defs_DATA = vte.defs +-pkgconfigdir = $(prefix)/libdata/pkgconfig +-pkgconfig_DATA = pyvte.pc +-PYTHON_MODULES = vtemodule.la ++@BUILD_PYTHON_MODULES_TRUE@defsdir = $(datadir)/pygtk/2.0/defs ++@BUILD_PYTHON_MODULES_TRUE@defs_DATA = vte.defs ++@BUILD_PYTHON_MODULES_TRUE@pkgconfigdir = $(prefix)/libdata/pkgconfig ++@BUILD_PYTHON_MODULES_TRUE@pkgconfig_DATA = pyvte.pc ++@BUILD_PYTHON_MODULES_TRUE@PYTHON_MODULES = vtemodule.la + @BUILD_PYTHON_MODULES_TRUE@pythonsiteexecdir = $(pyexecdir)/gtk-2.0 + @BUILD_PYTHON_MODULES_TRUE@pythonsiteexec_LTLIBRARIES = $(PYTHON_MODULES) @BUILD_PYTHON_MODULES_TRUE@CLEANFILES = vte.c - @BUILD_PYTHON_MODULES_TRUE@vtemodule_la_CFLAGS = $(VTE_CFLAGS) $(X_CFLAGS) $(PYTHON_INCLUDES) $(PYGTK_CFLAGS) - @BUILD_PYTHON_MODULES_TRUE@vtemodule_la_SOURCES = vtemodule.c +@@ -305,7 +304,7 @@ + # we do this to suport building with -Wl,-z,defs which errors on + # vtemodule.so as we cannot include $(PYTHON_LIBS) due to bug 410986. + @BUILD_PYTHON_MODULES_TRUE@vtemodule_la_LDFLAGS = -module -avoid-version -export-symbols-regex initvte $(PYTHON_LDFLAGS) $(AM_LDFLAGS) -@BUILD_PYTHON_MODULES_TRUE@vtemodule_la_LIBADD = $(top_builddir)/src/libvte.la $(LIBS) $(PYGTK_LIBS) $(VTE_LIBS) $(X_LIBS) +@BUILD_PYTHON_MODULES_TRUE@vtemodule_la_LIBADD = -lvte $(LIBS) $(PYGTK_LIBS) $(VTE_LIBS) $(X_LIBS) - @BUILD_PYTHON_MODULES_TRUE@vtemodule_la_LDFLAGS = -module -avoid-version -export-symbols-regex initvte @BUILD_PYTHON_MODULES_TRUE@nodist_vtemodule_la_SOURCES = vte.c all: all-am + diff --git a/x11-toolkits/vte/pkg-plist b/x11-toolkits/vte/pkg-plist index 15cb7dfbb283..d4337b16529b 100644 --- a/x11-toolkits/vte/pkg-plist +++ b/x11-toolkits/vte/pkg-plist @@ -11,19 +11,15 @@ lib/libvte.so lib/libvte.so.9 lib/vte/decset lib/vte/interpret -lib/vte/iso8859mode -lib/vte/nativeecho lib/vte/osc lib/vte/slowcat -lib/vte/utf8echo -lib/vte/utf8mode -lib/vte/vterdb lib/vte/window libdata/pkgconfig/vte.pc libexec/gnome-pty-helper share/locale/am/LC_MESSAGES/vte.mo share/locale/ang/LC_MESSAGES/vte.mo share/locale/ar/LC_MESSAGES/vte.mo +share/locale/as/LC_MESSAGES/vte.mo share/locale/az/LC_MESSAGES/vte.mo share/locale/be/LC_MESSAGES/vte.mo share/locale/be@latin/LC_MESSAGES/vte.mo @@ -138,5 +134,7 @@ share/locale/zh_TW/LC_MESSAGES/vte.mo @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin +@dirrmtry share/locale/as/LC_MESSAGES +@dirrmtry share/locale/as @dirrmtry share/locale/ang/LC_MESSAGES @dirrmtry share/locale/ang |