diff options
author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2005-03-12 10:39:38 +0000 |
---|---|---|
committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2005-03-12 10:39:38 +0000 |
commit | 190418a078b1eb7ea3c5d38a08bdab3cbd422086 (patch) | |
tree | bb336ccecde7052d26d3d8d8c97238744a373aad /x11-toolkits | |
parent | Update to 6300d. (diff) |
Presenting GNOME 2.10 for FreeBSD!
The release notes can be found at
http://www.gnome.org/start/2.10/notes/rnwhatsnew.html, and will give you a
good idea of what has gone into this release overall. However, a lot of
FreeBSD specific additions and fixes have been made. For example, this
release offers fixed ACPI support as well as new CPU freqeuncy monitoring
support. See the FreeBSD GNOME 2.10 upgrade page at
http://www.FreeBSD.org/gnome/docs/faq210.html for the entire list as well
as a list of known issues and upgrade instructions.
GNOME 2.10, as well as all of our releases, would not be possible without
the great team that goes into porting and testign each and every component.
Thanks definitely goes out to ahze, adamw, bland, kwm, mezz, and pav for all
their work. We would also like to thank our adventurous users that chose to
ride the walrus. We'd especially like to thank the following users that
provided patches for GNOME 2.10:
ade
Yasuda Keisuke
Franz Klammer
Khairil Yusof
Radek Kozlowsk
And anyone else I may have accidentally omitted.
As with GNOME 2.8, 2.10 comes with a brand-spankin' new splashscreen
courtesy of Franz Klammer. However, unlike GNOME 2.8, we've included all
of the FreeBSD GNOME splashscreen entries with gnomesession. You can
use the deskutils/splashsetter port to choose the one you like best.
As always, GNOME users should _not_ use portupgrade alone to upgrade to
2.10. Instead, get the gnome_upgrade.sh script from
http://www.FreeBSD.org/gnome/gnome_upgrade.sh.
Enjoy!
Notes
Notes:
svn path=/head/; revision=130972
Diffstat (limited to 'x11-toolkits')
49 files changed, 452 insertions, 351 deletions
diff --git a/x11-toolkits/eel/Makefile b/x11-toolkits/eel/Makefile index c6650ed0abba..5a1d65aab4ff 100644 --- a/x11-toolkits/eel/Makefile +++ b/x11-toolkits/eel/Makefile @@ -6,10 +6,10 @@ # PORTNAME= eel -PORTVERSION= 2.8.2 +PORTVERSION= 2.10.0 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.8 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -18,7 +18,8 @@ COMMENT= Generally useful classes and extensions to GNOME USE_BZIP2= yes USE_GMAKE= yes USE_X_PREFIX= yes -USE_GNOME= gnomeprefix gnomehack gnomehier gnomevfs2 gail libgnomeui +GNOME_DESKTOP_VERSION=2 +USE_GNOME= gnomeprefix gnomehack gail gnomedesktop gnomemenus USE_LIBTOOL_VER=15 USE_REINPLACE= yes INSTALLS_SHLIB= yes diff --git a/x11-toolkits/eel/distinfo b/x11-toolkits/eel/distinfo index 43f56ccf9a21..07b79adb5b02 100644 --- a/x11-toolkits/eel/distinfo +++ b/x11-toolkits/eel/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/eel-2.8.2.tar.bz2) = 4d0beb2f0ad4c304b49c06b08d0a03e5 -SIZE (gnome2/eel-2.8.2.tar.bz2) = 620939 +MD5 (gnome2/eel-2.10.0.tar.bz2) = 465cd522fabfed5668e70d7eae5f99e0 +SIZE (gnome2/eel-2.10.0.tar.bz2) = 665666 diff --git a/x11-toolkits/eel/files/patch-eel::eel-vfs-extensions.c b/x11-toolkits/eel/files/patch-eel::eel-vfs-extensions.c deleted file mode 100644 index a71c0f102a7b..000000000000 --- a/x11-toolkits/eel/files/patch-eel::eel-vfs-extensions.c +++ /dev/null @@ -1,15 +0,0 @@ - -$FreeBSD$ - ---- eel/eel-vfs-extensions.c 2001/12/20 13:41:21 1.1 -+++ eel/eel-vfs-extensions.c 2001/12/20 13:47:36 -@@ -116,7 +116,8 @@ - - /* Return the file. */ - *file_size = total_bytes_read; -- *file_contents = g_realloc (buffer, total_bytes_read); -+ *file_contents = g_realloc (buffer, total_bytes_read + 1); -+ (*file_contents)[total_bytes_read] = '\0'; - return GNOME_VFS_OK; - } - diff --git a/x11-toolkits/eel/pkg-plist b/x11-toolkits/eel/pkg-plist index 6af5ffaa2fa3..1351ff956af1 100644 --- a/x11-toolkits/eel/pkg-plist +++ b/x11-toolkits/eel/pkg-plist @@ -46,7 +46,7 @@ include/eel-2/eel/eel-xml-extensions.h include/eel-2/eel/eel.h lib/libeel-2.a lib/libeel-2.so -lib/libeel-2.so.10 +lib/libeel-2.so.12 libdata/pkgconfig/eel-2.0.pc share/locale/am/LC_MESSAGES/eel-2.0.mo share/locale/ang/LC_MESSAGES/eel-2.0.mo @@ -118,5 +118,7 @@ share/locale/vi/LC_MESSAGES/eel-2.0.mo share/locale/wa/LC_MESSAGES/eel-2.0.mo share/locale/zh_CN/LC_MESSAGES/eel-2.0.mo share/locale/zh_TW/LC_MESSAGES/eel-2.0.mo +@unexec rmdir %D/share/locale/ang/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/ang 2> /dev/null || true @dirrm include/eel-2/eel @dirrm include/eel-2 diff --git a/x11-toolkits/gal2/Makefile b/x11-toolkits/gal2/Makefile index 725f935a6428..4a68461fcfce 100644 --- a/x11-toolkits/gal2/Makefile +++ b/x11-toolkits/gal2/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gal2 -PORTVERSION= 2.2.5 +PORTVERSION= 2.4.0 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.2 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.4 DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -18,16 +18,26 @@ COMMENT= A collection of widgets taken from GNOME 2 gnumeric USE_BZIP2= yes USE_X_PREFIX= yes +USE_REINPLACE= yes USE_PERL5= yes USE_GMAKE= yes -USE_GNOME= gnomehack gnomeprefix gnomehier intlhack \ - libgnomeui libgnomeprintui +USE_GNOME= gnomehack gnomeprefix intlhack libgnomeui libgnomeprintui INSTALLS_SHLIB= yes USE_LIBTOOL_VER=15 CONFIGURE_ARGS= --enable-static --with-libiconv CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -PLIST_SUB= VERSION="2.2" PORTVERSION=${PORTVERSION} +PLIST_SUB= VERSION="2.4" PORTVERSION=${PORTVERSION} -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +post-patch: +.if ( ${OSVERSION} > 600000 && ${OSVERSION} < 600006 ) || \ + ( ${OSVERSION} < 503101 ) +.for po in da.po it.po zh_CN.po + @${REINPLACE_CMD} -e 's|%-|%|g' ${WRKSRC}/po/${po} +.endfor +.endif + +.include <bsd.port.post.mk> diff --git a/x11-toolkits/gal2/distinfo b/x11-toolkits/gal2/distinfo index 21f4dd3ebea6..968e15ec11db 100644 --- a/x11-toolkits/gal2/distinfo +++ b/x11-toolkits/gal2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gal-2.2.5.tar.bz2) = a3face85eb306dffd773fe8812912882 -SIZE (gnome2/gal-2.2.5.tar.bz2) = 1160976 +MD5 (gnome2/gal-2.4.0.tar.bz2) = ce94075fa92400328ff02d7b8f3c7f3a +SIZE (gnome2/gal-2.4.0.tar.bz2) = 1195949 diff --git a/x11-toolkits/gal2/files/patch-ab b/x11-toolkits/gal2/files/patch-ab index 53fe2cc71565..6555fe4ac75a 100644 --- a/x11-toolkits/gal2/files/patch-ab +++ b/x11-toolkits/gal2/files/patch-ab @@ -1,11 +1,11 @@ ---- Makefile.in.orig Fri Jun 4 17:24:13 2004 -+++ Makefile.in Fri Jun 4 17:25:02 2004 -@@ -145,7 +145,7 @@ - am__quote = @am__quote@ - gnomelocaledir = @gnomelocaledir@ - install_sh = @install_sh@ +--- Makefile.in.orig Tue Nov 2 02:03:06 2004 ++++ Makefile.in Tue Nov 2 02:03:16 2004 +@@ -197,7 +197,7 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ -SUBDIRS = po gal tests docs art +SUBDIRS = po gal docs art - pkgconfigdir = $(prefix)/libdata/pkgconfig - pkgconfig_DATA = gal-2.2.pc + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = \ diff --git a/x11-toolkits/gal2/files/patch-gal_a11y_e-table_gal-a11y-e-cell-text.c b/x11-toolkits/gal2/files/patch-gal_a11y_e-table_gal-a11y-e-cell-text.c new file mode 100644 index 000000000000..f1ad3a4502de --- /dev/null +++ b/x11-toolkits/gal2/files/patch-gal_a11y_e-table_gal-a11y-e-cell-text.c @@ -0,0 +1,30 @@ +--- gal/a11y/e-table/gal-a11y-e-cell-text.c.orig Wed Feb 9 23:01:26 2005 ++++ gal/a11y/e-table/gal-a11y-e-cell-text.c Wed Feb 9 23:02:02 2005 +@@ -152,11 +152,12 @@ + GalA11yECell *gaec = GAL_A11Y_E_CELL (text); + gunichar ret_val; + gchar *at_offset; ++ gchar *full_text; + + if (!ect_check (text)) + return -1; + +- gchar *full_text = e_cell_text_get_text_by_view (gaec->cell_view, gaec->model_col, gaec->row); ++ full_text = e_cell_text_get_text_by_view (gaec->cell_view, gaec->model_col, gaec->row); + at_offset = g_utf8_offset_to_pointer (full_text, offset); + ret_val = g_utf8_get_char_validated (at_offset, -1); + g_free (full_text); +@@ -236,11 +237,12 @@ + { + GalA11yECell *gaec = GAL_A11Y_E_CELL (text); + gint ret_val; ++ gchar *full_text; + + if (!ect_check (text)) + return -1; + +- gchar *full_text = e_cell_text_get_text_by_view (gaec->cell_view, gaec->model_col, gaec->row); ++ full_text = e_cell_text_get_text_by_view (gaec->cell_view, gaec->model_col, gaec->row); + + ret_val = g_utf8_strlen (full_text, -1); + g_free (full_text); diff --git a/x11-toolkits/gal2/files/patch-gal_a11y_e-table_gal-a11y-e-cell-vbox.c b/x11-toolkits/gal2/files/patch-gal_a11y_e-table_gal-a11y-e-cell-vbox.c new file mode 100644 index 000000000000..cfde6c47c47b --- /dev/null +++ b/x11-toolkits/gal2/files/patch-gal_a11y_e-table_gal-a11y-e-cell-vbox.c @@ -0,0 +1,46 @@ +--- gal/a11y/e-table/gal-a11y-e-cell-vbox.c.orig Wed Feb 9 23:03:24 2005 ++++ gal/a11y/e-table/gal-a11y-e-cell-vbox.c Wed Feb 9 23:04:46 2005 +@@ -31,8 +31,9 @@ + static gint + ecv_get_n_children (AtkObject *a11y) + { ++ GalA11yECellVbox *gaev; + g_return_val_if_fail (GAL_A11Y_IS_E_CELL_VBOX (a11y), 0); +- GalA11yECellVbox *gaev = GAL_A11Y_E_CELL_VBOX (a11y); ++ gaev = GAL_A11Y_E_CELL_VBOX (a11y); + return (gaev->a11y_subcell_count); + } + +@@ -64,9 +65,10 @@ + if (i < gaev->a11y_subcell_count) { + if (gaev->a11y_subcells[i] == NULL) { + gint model_col, row; ++ ECellView *subcell_view; + row = gaec->row; + model_col = ecvv->model_cols[i]; +- ECellView *subcell_view = ecvv->subcell_views[i]; ++ subcell_view = ecvv->subcell_views[i]; + ret = gal_a11y_e_cell_registry_get_object (NULL, + gaec->item, + subcell_view, +@@ -200,14 +202,17 @@ + int row) + { + AtkObject *a11y; ++ GalA11yECell *gaec; ++ GalA11yECellVbox *gaev; ++ ECellVboxView *ecvv; + + a11y = g_object_new (gal_a11y_e_cell_vbox_get_type (), NULL); + + gal_a11y_e_cell_construct (a11y, item, cell_view, parent, model_col, view_col, row); + +- GalA11yECell *gaec = GAL_A11Y_E_CELL (a11y); +- GalA11yECellVbox *gaev = GAL_A11Y_E_CELL_VBOX (a11y); +- ECellVboxView *ecvv = (ECellVboxView *) (gaec->cell_view); ++ gaec = GAL_A11Y_E_CELL (a11y); ++ gaev = GAL_A11Y_E_CELL_VBOX (a11y); ++ ecvv = (ECellVboxView *) (gaec->cell_view); + gaev->a11y_subcell_count = ecvv->subcell_view_count; + gaev->a11y_subcells = g_malloc0 (sizeof(AtkObject *)*gaev->a11y_subcell_count); + return a11y; diff --git a/x11-toolkits/gal2/files/patch-po_da.po b/x11-toolkits/gal2/files/patch-po_da.po deleted file mode 100644 index bcd97ad6fff8..000000000000 --- a/x11-toolkits/gal2/files/patch-po_da.po +++ /dev/null @@ -1,16 +0,0 @@ ---- po/da.po.orig Sat Dec 27 21:03:49 2003 -+++ po/da.po Sat Dec 27 21:04:00 2003 -@@ -46,11 +46,11 @@ - - #: gal/e-table/e-cell-date.c:96 - msgid "%b %d %l:%M %p" --msgstr "%-d. %b. %H:%M" -+msgstr "%d. %b. %H:%M" - - #: gal/e-table/e-cell-date.c:98 - msgid "%b %d %Y" --msgstr "%-d. %b %Y" -+msgstr "%d. %b %Y" - - #: gal/e-table/e-cell-pixbuf.c:392 - msgid "Selected Column" diff --git a/x11-toolkits/gal2/files/patch-po_zh_CN.po b/x11-toolkits/gal2/files/patch-po_zh_CN.po deleted file mode 100644 index b3072e58b078..000000000000 --- a/x11-toolkits/gal2/files/patch-po_zh_CN.po +++ /dev/null @@ -1,17 +0,0 @@ ---- po/zh_CN.po.orig Fri Mar 5 12:17:59 2004 -+++ po/zh_CN.po Sat Mar 6 03:08:34 2004 -@@ -51,12 +51,12 @@ - # gal/e-table/e-cell-date.c:104 - #: gal/e-table/e-cell-date.c:96 - msgid "%b %d %l:%M %p" --msgstr "%-m月%-d日 %H:%M" -+msgstr "%m月%d日 %H:%M" - - # gal/e-table/e-cell-date.c:106 - #: gal/e-table/e-cell-date.c:98 - msgid "%b %d %Y" --msgstr "%Y年%-m月%-d日" -+msgstr "%Y年%m月%d日" - - #: gal/e-table/e-cell-pixbuf.c:392 - msgid "Selected Column" diff --git a/x11-toolkits/gal2/pkg-plist b/x11-toolkits/gal2/pkg-plist index ff1d616bfb3c..4715f0ed6751 100644 --- a/x11-toolkits/gal2/pkg-plist +++ b/x11-toolkits/gal2/pkg-plist @@ -3,6 +3,7 @@ include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-cell-registry.h include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-cell-text.h include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-cell-toggle.h include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-cell-tree.h +include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-cell-vbox.h include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-cell.h include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-table-click-to-add-factory.h include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-table-click-to-add.h @@ -149,10 +150,10 @@ include/gal-%%VERSION%%/gal/widgets/widget-color-combo.h include/gal-%%VERSION%%/gal/widgets/widget-pixmap-combo.h lib/libgal-%%VERSION%%.a lib/libgal-%%VERSION%%.so -lib/libgal-%%VERSION%%.so.1 +lib/libgal-%%VERSION%%.so.0 lib/libgal-a11y-%%VERSION%%.a lib/libgal-a11y-%%VERSION%%.so -lib/libgal-a11y-%%VERSION%%.so.1 +lib/libgal-a11y-%%VERSION%%.so.0 libdata/pkgconfig/gal-%%VERSION%%.pc share/doc/gal-%%VERSION%%/gal-api.html share/doc/gal-%%VERSION%%/gal-api.sgml @@ -196,6 +197,7 @@ share/locale/bn/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/bs/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/ca/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/cs/LC_MESSAGES/gal-%%VERSION%%.mo +share/locale/cy/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/da/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/de/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/el/LC_MESSAGES/gal-%%VERSION%%.mo @@ -209,10 +211,9 @@ share/locale/fr/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/ga/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/gl/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/gu/LC_MESSAGES/gal-%%VERSION%%.mo -share/locale/hr/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/hi/LC_MESSAGES/gal-%%VERSION%%.mo +share/locale/hr/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/hu/LC_MESSAGES/gal-%%VERSION%%.mo -share/locale/id/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/it/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/ja/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/ko/LC_MESSAGES/gal-%%VERSION%%.mo diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index 83c017845e56..71a27f969595 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -6,15 +6,15 @@ # PORTNAME= gtk -PORTVERSION= 2.4.14 -PORTREVISION= 2 +PORTVERSION= 2.6.4 +PORTREVISION= 1 CATEGORIES= x11-toolkits -MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.4,} \ - ftp://ftp.gtk.org/pub/gtk/v2.4/ \ +MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.6,} \ + ftp://ftp.gtk.org/pub/gtk/v2.6/ \ ftp://ftp.gimp.org/pub/%SUBDIR%/ \ ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \ http://www.ameth.org/gimp/%SUBDIR%/ \ - ftp://ftp.mirrorservice.org/sites/ftp.gimp.org/pub/%SUBDIR%/ \ + ftp://ftp.mirror.ac.uk/sites/ftp.gimp.org/pub/%SUBDIR%/ \ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,} MASTER_SITE_SUBDIR= gtk/v${PORTVERSION:R} DISTNAME= gtk+-${PORTVERSION} @@ -39,7 +39,6 @@ RUN_DEPENDS= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \ USE_BZIP2= yes LATEST_LINK= gtk20 USE_X_PREFIX= yes -USE_GMAKE= yes USE_XPM= yes USE_REINPLACE= yes USE_PERL5= yes diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo index e025356fddef..1e943cceaa24 100644 --- a/x11-toolkits/gtk20/distinfo +++ b/x11-toolkits/gtk20/distinfo @@ -1,4 +1,4 @@ -MD5 (gnome2/gtk+-2.4.14.tar.bz2) = 10470d574933460809e4ac488e579e26 -SIZE (gnome2/gtk+-2.4.14.tar.bz2) = 9641695 +MD5 (gnome2/gtk+-2.6.4.tar.bz2) = 4749fce7b082b784a71a076aa586dc25 +SIZE (gnome2/gtk+-2.6.4.tar.bz2) = 11222426 MD5 (gnome2/gtk+-2.4.0-menushadow.patch) = 5dde5c5af8f25d282c365663a7256b5c SIZE (gnome2/gtk+-2.4.0-menushadow.patch) = 15603 diff --git a/x11-toolkits/gtk20/files/patch-ad b/x11-toolkits/gtk20/files/patch-ad deleted file mode 100644 index 59fee01c4973..000000000000 --- a/x11-toolkits/gtk20/files/patch-ad +++ /dev/null @@ -1,23 +0,0 @@ - -$FreeBSD$ - ---- gtk/gtkrc.c.orig Thu Dec 13 21:51:18 2001 -+++ gtk/gtkrc.c Fri Jan 18 11:14:14 2002 -@@ -336,7 +336,7 @@ - if (im_module_file) - result = g_strdup (im_module_file); - else -- result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL); -+ result = g_build_filename (GTK_DATA_PREFIX, "etc", "gtk-2.0", "gtk.immodules", NULL); - } - - return result; -@@ -418,7 +418,7 @@ - } - else - { -- str = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtkrc", NULL); -+ str = g_build_filename (GTK_SYSCONFDIR, "gtk", NULL); - - gtk_rc_add_default_file (str); - g_free (str); diff --git a/x11-toolkits/gtk20/files/patch-ag b/x11-toolkits/gtk20/files/patch-ag deleted file mode 100644 index b34d2b3f24b6..000000000000 --- a/x11-toolkits/gtk20/files/patch-ag +++ /dev/null @@ -1,19 +0,0 @@ ---- gtk/Makefile.in.orig Fri Oct 24 21:45:12 2003 -+++ gtk/Makefile.in Fri Oct 24 21:46:49 2003 -@@ -301,7 +301,7 @@ - -DGTK_LIBDIR=\"$(libdir)\" \ - -DGTK_DATADIR=\"$(datadir)\" \ - -DGTK_DATA_PREFIX=\"$(prefix)\" \ -- -DGTK_SYSCONFDIR=\"$(sysconfdir)\" \ -+ -DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\" \ - -DGTK_VERSION=\"$(GTK_VERSION)\" \ - -DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\" \ - -DGTK_HOST=\"$(host)\" \ -@@ -856,6 +856,7 @@ - TEST_DEPS = $(DEPS) gtk.immodules - - LDADDS = \ -+ $(GLIB_LIBS) \ - $(gtktargetlib) \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ - $(top_builddir)/gdk/$(gdktargetlib) diff --git a/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in b/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in index c2cb10b5478c..1bedfdf55f2c 100644 --- a/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in +++ b/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in @@ -1,13 +1,15 @@ ---- gdk-pixbuf/Makefile.in.orig Thu Nov 20 15:39:55 2003 -+++ gdk-pixbuf/Makefile.in Thu Nov 20 15:40:17 2003 -@@ -517,7 +517,9 @@ +--- gdk-pixbuf/Makefile.in.orig Wed Mar 2 15:56:36 2005 ++++ gdk-pixbuf/Makefile.in Wed Mar 2 15:57:08 2005 +@@ -519,10 +519,10 @@ + bin_PROGRAMS = gdk-pixbuf-csource gdk-pixbuf-query-loaders + gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c +-gdk_pixbuf_csource_LDADD = $(LDADDS) ++gdk_pixbuf_csource_LDADD = $(LDADDS) $(GLIB_LIBS) - AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\"" --LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la -+LDADDS = \ -+ $(GLIB_LIBS) \ -+ libgdk_pixbuf-$(GTK_API_VERSION).la + gdk_pixbuf_query_loaders_DEPENDENCIES = $(DEPS) +-gdk_pixbuf_query_loaders_LDADD = $(LDADDS) ++gdk_pixbuf_query_loaders_LDADD = $(LDADDS) $(GLIB_LIBS) + + gdk_pixbuf_query_loaders_SOURCES = queryloaders.c - noinst_PROGRAMS = test-gdk-pixbuf - test_gdk_pixbuf_LDADD = $(LDADDS) diff --git a/x11-toolkits/gtk20/files/patch-gtk_Makefile.in b/x11-toolkits/gtk20/files/patch-gtk_Makefile.in new file mode 100644 index 000000000000..44589795f769 --- /dev/null +++ b/x11-toolkits/gtk20/files/patch-gtk_Makefile.in @@ -0,0 +1,17 @@ +--- gtk/Makefile.in.orig Wed Mar 2 15:57:44 2005 ++++ gtk/Makefile.in Wed Mar 2 15:58:22 2005 +@@ -887,12 +887,12 @@ + bin_PROGRAMS = gtk-query-immodules-2.0 gtk-update-icon-cache + + gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS) +-gtk_query_immodules_2_0_LDADD = $(LDADDS) ++gtk_query_immodules_2_0_LDADD = $(LDADDS) $(GLIB_LIBS) + + gtk_query_immodules_2_0_SOURCES = queryimmodules.c + + gtk_update_icon_cache_DEPENDENCIES = $(DEPS) +-gtk_update_icon_cache_LDADD = $(LDADDS) ++gtk_update_icon_cache_LDADD = $(LDADDS) $(GLIB_LIBS) + + gtk_update_icon_cache_SOURCES = updateiconcache.c + subdir = gtk diff --git a/x11-toolkits/gtk20/files/patch-gtk_gtkentry.c b/x11-toolkits/gtk20/files/patch-gtk_gtkentry.c new file mode 100644 index 000000000000..e725de399cff --- /dev/null +++ b/x11-toolkits/gtk20/files/patch-gtk_gtkentry.c @@ -0,0 +1,13 @@ +--- gtk/gtkentry.c.orig Wed Aug 25 12:44:23 2004 ++++ gtk/gtkentry.c Wed Aug 25 12:44:52 2004 +@@ -1670,8 +1670,9 @@ + event->x + entry->scroll_offset, event->y)) + { + GdkDragContext *context; ++ guint actions; + GtkTargetList *target_list = gtk_target_list_new (NULL, 0); +- guint actions = entry->editable ? GDK_ACTION_COPY | GDK_ACTION_MOVE : GDK_ACTION_COPY; ++ actions = entry->editable ? GDK_ACTION_COPY | GDK_ACTION_MOVE : GDK_ACTION_COPY; + + gtk_target_list_add_text_targets (target_list); + diff --git a/x11-toolkits/gtk20/files/patch-gtk_gtkiconcache.c b/x11-toolkits/gtk20/files/patch-gtk_gtkiconcache.c new file mode 100644 index 000000000000..d393bd3dfa8d --- /dev/null +++ b/x11-toolkits/gtk20/files/patch-gtk_gtkiconcache.c @@ -0,0 +1,20 @@ +--- gtk/gtkiconcache.c.orig Sun Dec 12 16:09:13 2004 ++++ gtk/gtkiconcache.c Thu Dec 16 17:09:23 2004 +@@ -21,6 +21,8 @@ + #include "gtkdebug.h" + #include "gtkiconcache.h" + #include <glib/gstdio.h> ++#include <sys/types.h> ++#include <sys/stat.h> + + #ifdef HAVE_MMAP + #include <sys/mman.h> +@@ -29,8 +31,6 @@ + #include <windows.h> + #include <io.h> + #endif +-#include <sys/types.h> +-#include <sys/stat.h> + #ifdef HAVE_UNISTD_H + #include <unistd.h> + #endif diff --git a/x11-toolkits/gtk20/files/patch-gtk_gtkicontheme.c b/x11-toolkits/gtk20/files/patch-gtk_gtkicontheme.c deleted file mode 100644 index 07bb57a6d022..000000000000 --- a/x11-toolkits/gtk20/files/patch-gtk_gtkicontheme.c +++ /dev/null @@ -1,26 +0,0 @@ ---- gtk/gtkicontheme.c.orig Thu Jan 29 16:53:42 2004 -+++ gtk/gtkicontheme.c Thu Jan 29 16:54:56 2004 -@@ -526,7 +526,7 @@ - - priv->custom_theme = FALSE; - priv->current_theme = g_strdup (DEFAULT_THEME_NAME); -- priv->search_path = g_new (char *, 5); -+ priv->search_path = g_new (char *, 7); - - - priv->search_path[0] = g_build_filename (g_get_home_dir (), -@@ -534,9 +534,11 @@ - NULL); - priv->search_path[1] = g_build_filename (GTK_DATADIR, "pixmaps", NULL); - priv->search_path[2] = g_build_filename (GTK_DATADIR, "icons", NULL); -- priv->search_path[3] = g_strdup ("/usr/share/icons"); -- priv->search_path[4] = g_strdup ("/usr/share/pixmaps"); -- priv->search_path_len = 5; -+ priv->search_path[3] = g_build_filename (GTK_DATADIR, "gnome", "pixmaps", NULL); -+ priv->search_path[4] = g_build_filename (GTK_DATADIR, "gnome", "icons", NULL); -+ priv->search_path[5] = g_strdup ("/usr/share/icons"); -+ priv->search_path[6] = g_strdup ("/usr/share/pixmaps"); -+ priv->search_path_len = 7; - - priv->themes_valid = FALSE; - priv->themes = NULL; diff --git a/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c b/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c index 76c5eea6c35b..b39aaedd07b5 100644 --- a/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c +++ b/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c @@ -1,11 +1,11 @@ ---- gtk/xdgmime/xdgmime.c.orig Wed Jun 23 20:19:43 2004 -+++ gtk/xdgmime/xdgmime.c Wed Jun 23 20:19:56 2004 -@@ -98,7 +98,7 @@ +--- gtk/xdgmime/xdgmime.c.orig Mon Nov 8 22:25:27 2004 ++++ gtk/xdgmime/xdgmime.c Sat Nov 13 10:27:22 2004 +@@ -204,7 +204,7 @@ - xdg_data_dirs = getenv ("XDG_DATA_DIRS"); - if (xdg_data_dirs == NULL) -- xdg_data_dirs = "/usr/local/share/:/usr/share/"; -+ xdg_data_dirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/"; + xdg_data_dirs = getenv ("XDG_DATA_DIRS"); + if (xdg_data_dirs == NULL) +- xdg_data_dirs = "/usr/local/share/:/usr/share/"; ++ xdg_data_dirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/"; - ptr = xdg_data_dirs; + ptr = xdg_data_dirs; diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist index 7e4a1740997d..77127e3a5c4b 100644 --- a/x11-toolkits/gtk20/pkg-plist +++ b/x11-toolkits/gtk20/pkg-plist @@ -2,19 +2,23 @@ bin/gdk-pixbuf-csource bin/gdk-pixbuf-query-loaders bin/gtk-demo bin/gtk-query-immodules-2.0 +bin/gtk-update-icon-cache etc/gtk-2.0/gdk-pixbuf.loaders etc/gtk-2.0/gtk.immodules include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-animation.h +include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-core.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-features.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-io.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-marshal.h +include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-transform.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h include/gtk-2.0/gdk-pixbuf/gdk-pixdata.h include/gtk-2.0/gdk/gdk.h +include/gtk-2.0/gdk/gdkalias.h include/gtk-2.0/gdk/gdkcolor.h include/gtk-2.0/gdk/gdkcursor.h include/gtk-2.0/gdk/gdkdisplay.h @@ -45,7 +49,10 @@ include/gtk-2.0/gdk/gdkvisual.h include/gtk-2.0/gdk/gdkwindow.h include/gtk-2.0/gdk/gdkx.h include/gtk-2.0/gdkconfig.h +include/gtk-2.0/gtk/gtkcellview.h +include/gtk-2.0/gtk/gtkiconview.h include/gtk-2.0/gtk/gtk.h +include/gtk-2.0/gtk/gtkaboutdialog.h include/gtk-2.0/gtk/gtkaccelgroup.h include/gtk-2.0/gtk/gtkaccellabel.h include/gtk-2.0/gtk/gtkaccelmap.h @@ -65,7 +72,9 @@ include/gtk-2.0/gtk/gtkcalendar.h include/gtk-2.0/gtk/gtkcelleditable.h include/gtk-2.0/gtk/gtkcelllayout.h include/gtk-2.0/gtk/gtkcellrenderer.h +include/gtk-2.0/gtk/gtkcellrenderercombo.h include/gtk-2.0/gtk/gtkcellrendererpixbuf.h +include/gtk-2.0/gtk/gtkcellrendererprogress.h include/gtk-2.0/gtk/gtkcellrenderertext.h include/gtk-2.0/gtk/gtkcellrenderertoggle.h include/gtk-2.0/gtk/gtkcheckbutton.h @@ -92,6 +101,7 @@ include/gtk-2.0/gtk/gtkenums.h include/gtk-2.0/gtk/gtkeventbox.h include/gtk-2.0/gtk/gtkexpander.h include/gtk-2.0/gtk/gtkfilechooser.h +include/gtk-2.0/gtk/gtkfilechooserbutton.h include/gtk-2.0/gtk/gtkfilechooserdialog.h include/gtk-2.0/gtk/gtkfilechooserwidget.h include/gtk-2.0/gtk/gtkfilefilter.h @@ -134,8 +144,10 @@ include/gtk-2.0/gtk/gtkmenu.h include/gtk-2.0/gtk/gtkmenubar.h include/gtk-2.0/gtk/gtkmenuitem.h include/gtk-2.0/gtk/gtkmenushell.h +include/gtk-2.0/gtk/gtkmenutoolbutton.h include/gtk-2.0/gtk/gtkmessagedialog.h include/gtk-2.0/gtk/gtkmisc.h +include/gtk-2.0/gtk/gtkmodules.h include/gtk-2.0/gtk/gtknotebook.h include/gtk-2.0/gtk/gtkobject.h include/gtk-2.0/gtk/gtkoldeditable.h @@ -214,6 +226,7 @@ include/gtk-2.0/gtk/gtkvscrollbar.h include/gtk-2.0/gtk/gtkvseparator.h include/gtk-2.0/gtk/gtkwidget.h include/gtk-2.0/gtk/gtkwindow.h +lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.so lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-am-et.so lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cedilla.so lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cyrillic-translit.so @@ -240,16 +253,16 @@ lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.so lib/libgdk-x11-2.0.a lib/libgdk-x11-2.0.so -lib/libgdk-x11-2.0.so.400 +lib/libgdk-x11-2.0.so.600 lib/libgdk_pixbuf-2.0.a lib/libgdk_pixbuf-2.0.so -lib/libgdk_pixbuf-2.0.so.400 +lib/libgdk_pixbuf-2.0.so.600 lib/libgdk_pixbuf_xlib-2.0.a lib/libgdk_pixbuf_xlib-2.0.so -lib/libgdk_pixbuf_xlib-2.0.so.400 +lib/libgdk_pixbuf_xlib-2.0.so.600 lib/libgtk-x11-2.0.a lib/libgtk-x11-2.0.so -lib/libgtk-x11-2.0.so.400 +lib/libgtk-x11-2.0.so.600 libdata/pkgconfig/gdk-2.0.pc libdata/pkgconfig/gdk-pixbuf-2.0.pc libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc @@ -263,6 +276,7 @@ share/gtk-2.0/demo/appwindow.c share/gtk-2.0/demo/background.jpg share/gtk-2.0/demo/button_box.c share/gtk-2.0/demo/changedisplay.c +share/gtk-2.0/demo/clipboard.c share/gtk-2.0/demo/colorsel.c share/gtk-2.0/demo/dialog.c share/gtk-2.0/demo/drawingarea.c @@ -273,12 +287,15 @@ share/gtk-2.0/demo/floppybuddy.gif share/gtk-2.0/demo/gnome-applets.png share/gtk-2.0/demo/gnome-calendar.png share/gtk-2.0/demo/gnome-foot.png +share/gtk-2.0/demo/gnome-fs-directory.png +share/gtk-2.0/demo/gnome-fs-regular.png share/gtk-2.0/demo/gnome-gimp.png share/gtk-2.0/demo/gnome-gmush.png share/gtk-2.0/demo/gnome-gsame.png share/gtk-2.0/demo/gnu-keys.png share/gtk-2.0/demo/gtk-logo-rgb.gif share/gtk-2.0/demo/hypertext.c +share/gtk-2.0/demo/iconview.c share/gtk-2.0/demo/images.c share/gtk-2.0/demo/list_store.c share/gtk-2.0/demo/menus.c @@ -286,6 +303,7 @@ share/gtk-2.0/demo/panes.c share/gtk-2.0/demo/pixbufs.c share/gtk-2.0/demo/sizegroup.c share/gtk-2.0/demo/stock_browser.c +share/gtk-2.0/demo/rotated_text.c share/gtk-2.0/demo/textview.c share/gtk-2.0/demo/tree_store.c share/gtk-2.0/demo/ui_manager.c @@ -293,8 +311,6 @@ share/locale/af/LC_MESSAGES/gtk20-properties.mo share/locale/af/LC_MESSAGES/gtk20.mo share/locale/am/LC_MESSAGES/gtk20-properties.mo share/locale/am/LC_MESSAGES/gtk20.mo -share/locale/ang/LC_MESSAGES/gtk20-properties.mo -share/locale/ang/LC_MESSAGES/gtk20.mo share/locale/ar/LC_MESSAGES/gtk20-properties.mo share/locale/ar/LC_MESSAGES/gtk20.mo share/locale/az/LC_MESSAGES/gtk20-properties.mo @@ -407,6 +423,8 @@ share/locale/ro/LC_MESSAGES/gtk20-properties.mo share/locale/ro/LC_MESSAGES/gtk20.mo share/locale/ru/LC_MESSAGES/gtk20-properties.mo share/locale/ru/LC_MESSAGES/gtk20.mo +share/locale/rw/LC_MESSAGES/gtk20-properties.mo +share/locale/rw/LC_MESSAGES/gtk20.mo share/locale/sk/LC_MESSAGES/gtk20-properties.mo share/locale/sk/LC_MESSAGES/gtk20.mo share/locale/sl/LC_MESSAGES/gtk20-properties.mo @@ -439,6 +457,8 @@ share/locale/vi/LC_MESSAGES/gtk20-properties.mo share/locale/vi/LC_MESSAGES/gtk20.mo share/locale/wa/LC_MESSAGES/gtk20-properties.mo share/locale/wa/LC_MESSAGES/gtk20.mo +share/locale/xh/LC_MESSAGES/gtk20-properties.mo +share/locale/xh/LC_MESSAGES/gtk20.mo share/locale/yi/LC_MESSAGES/gtk20-properties.mo share/locale/yi/LC_MESSAGES/gtk20.mo share/locale/zh_CN/LC_MESSAGES/gtk20-properties.mo @@ -470,8 +490,6 @@ share/themes/Emacs/gtk-2.0-key/gtkrc @exec /bin/mkdir -p %D/lib/gtk-2.0/%%GTK_VERSION%%/engines @unexec /bin/rmdir %D/share/themes/Default 2>/dev/null || /usr/bin/true @unexec /bin/rmdir %D/share/themes 2>/dev/null || /usr/bin/true -@unexec rmdir %D/share/locale/ang/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/ang 2> /dev/null || true @unexec rmdir %D/share/locale/az_IR/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/az_IR 2> /dev/null || true @unexec rmdir %D/share/locale/br/LC_MESSAGES 2> /dev/null || true @@ -484,9 +502,13 @@ share/themes/Emacs/gtk-2.0-key/gtkrc @unexec rmdir %D/share/locale/mr 2> /dev/null || true @unexec rmdir %D/share/locale/nso/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/nso 2> /dev/null || true +@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/rw 2> /dev/null || true @unexec rmdir %D/share/locale/sr@ije/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/sr@ije 2> /dev/null || true @unexec rmdir %D/share/locale/uz@Latn/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/uz@Latn 2> /dev/null || true @unexec rmdir %D/share/locale/yi/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/yi 2> /dev/null || true +@unexec rmdir %D/share/locale/xh/LC_MESSAGES/ 2> /dev/null || true +@unexec rmdir %D/share/locale/xh 2> /dev/null || true diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile index 83c017845e56..71a27f969595 100644 --- a/x11-toolkits/gtk30/Makefile +++ b/x11-toolkits/gtk30/Makefile @@ -6,15 +6,15 @@ # PORTNAME= gtk -PORTVERSION= 2.4.14 -PORTREVISION= 2 +PORTVERSION= 2.6.4 +PORTREVISION= 1 CATEGORIES= x11-toolkits -MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.4,} \ - ftp://ftp.gtk.org/pub/gtk/v2.4/ \ +MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.6,} \ + ftp://ftp.gtk.org/pub/gtk/v2.6/ \ ftp://ftp.gimp.org/pub/%SUBDIR%/ \ ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \ http://www.ameth.org/gimp/%SUBDIR%/ \ - ftp://ftp.mirrorservice.org/sites/ftp.gimp.org/pub/%SUBDIR%/ \ + ftp://ftp.mirror.ac.uk/sites/ftp.gimp.org/pub/%SUBDIR%/ \ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,} MASTER_SITE_SUBDIR= gtk/v${PORTVERSION:R} DISTNAME= gtk+-${PORTVERSION} @@ -39,7 +39,6 @@ RUN_DEPENDS= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \ USE_BZIP2= yes LATEST_LINK= gtk20 USE_X_PREFIX= yes -USE_GMAKE= yes USE_XPM= yes USE_REINPLACE= yes USE_PERL5= yes diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo index e025356fddef..1e943cceaa24 100644 --- a/x11-toolkits/gtk30/distinfo +++ b/x11-toolkits/gtk30/distinfo @@ -1,4 +1,4 @@ -MD5 (gnome2/gtk+-2.4.14.tar.bz2) = 10470d574933460809e4ac488e579e26 -SIZE (gnome2/gtk+-2.4.14.tar.bz2) = 9641695 +MD5 (gnome2/gtk+-2.6.4.tar.bz2) = 4749fce7b082b784a71a076aa586dc25 +SIZE (gnome2/gtk+-2.6.4.tar.bz2) = 11222426 MD5 (gnome2/gtk+-2.4.0-menushadow.patch) = 5dde5c5af8f25d282c365663a7256b5c SIZE (gnome2/gtk+-2.4.0-menushadow.patch) = 15603 diff --git a/x11-toolkits/gtk30/files/patch-ad b/x11-toolkits/gtk30/files/patch-ad deleted file mode 100644 index 59fee01c4973..000000000000 --- a/x11-toolkits/gtk30/files/patch-ad +++ /dev/null @@ -1,23 +0,0 @@ - -$FreeBSD$ - ---- gtk/gtkrc.c.orig Thu Dec 13 21:51:18 2001 -+++ gtk/gtkrc.c Fri Jan 18 11:14:14 2002 -@@ -336,7 +336,7 @@ - if (im_module_file) - result = g_strdup (im_module_file); - else -- result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL); -+ result = g_build_filename (GTK_DATA_PREFIX, "etc", "gtk-2.0", "gtk.immodules", NULL); - } - - return result; -@@ -418,7 +418,7 @@ - } - else - { -- str = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtkrc", NULL); -+ str = g_build_filename (GTK_SYSCONFDIR, "gtk", NULL); - - gtk_rc_add_default_file (str); - g_free (str); diff --git a/x11-toolkits/gtk30/files/patch-ag b/x11-toolkits/gtk30/files/patch-ag deleted file mode 100644 index b34d2b3f24b6..000000000000 --- a/x11-toolkits/gtk30/files/patch-ag +++ /dev/null @@ -1,19 +0,0 @@ ---- gtk/Makefile.in.orig Fri Oct 24 21:45:12 2003 -+++ gtk/Makefile.in Fri Oct 24 21:46:49 2003 -@@ -301,7 +301,7 @@ - -DGTK_LIBDIR=\"$(libdir)\" \ - -DGTK_DATADIR=\"$(datadir)\" \ - -DGTK_DATA_PREFIX=\"$(prefix)\" \ -- -DGTK_SYSCONFDIR=\"$(sysconfdir)\" \ -+ -DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\" \ - -DGTK_VERSION=\"$(GTK_VERSION)\" \ - -DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\" \ - -DGTK_HOST=\"$(host)\" \ -@@ -856,6 +856,7 @@ - TEST_DEPS = $(DEPS) gtk.immodules - - LDADDS = \ -+ $(GLIB_LIBS) \ - $(gtktargetlib) \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ - $(top_builddir)/gdk/$(gdktargetlib) diff --git a/x11-toolkits/gtk30/files/patch-gdk-pixbuf_Makefile.in b/x11-toolkits/gtk30/files/patch-gdk-pixbuf_Makefile.in index c2cb10b5478c..1bedfdf55f2c 100644 --- a/x11-toolkits/gtk30/files/patch-gdk-pixbuf_Makefile.in +++ b/x11-toolkits/gtk30/files/patch-gdk-pixbuf_Makefile.in @@ -1,13 +1,15 @@ ---- gdk-pixbuf/Makefile.in.orig Thu Nov 20 15:39:55 2003 -+++ gdk-pixbuf/Makefile.in Thu Nov 20 15:40:17 2003 -@@ -517,7 +517,9 @@ +--- gdk-pixbuf/Makefile.in.orig Wed Mar 2 15:56:36 2005 ++++ gdk-pixbuf/Makefile.in Wed Mar 2 15:57:08 2005 +@@ -519,10 +519,10 @@ + bin_PROGRAMS = gdk-pixbuf-csource gdk-pixbuf-query-loaders + gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c +-gdk_pixbuf_csource_LDADD = $(LDADDS) ++gdk_pixbuf_csource_LDADD = $(LDADDS) $(GLIB_LIBS) - AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\"" --LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la -+LDADDS = \ -+ $(GLIB_LIBS) \ -+ libgdk_pixbuf-$(GTK_API_VERSION).la + gdk_pixbuf_query_loaders_DEPENDENCIES = $(DEPS) +-gdk_pixbuf_query_loaders_LDADD = $(LDADDS) ++gdk_pixbuf_query_loaders_LDADD = $(LDADDS) $(GLIB_LIBS) + + gdk_pixbuf_query_loaders_SOURCES = queryloaders.c - noinst_PROGRAMS = test-gdk-pixbuf - test_gdk_pixbuf_LDADD = $(LDADDS) diff --git a/x11-toolkits/gtk30/files/patch-gtk_Makefile.in b/x11-toolkits/gtk30/files/patch-gtk_Makefile.in new file mode 100644 index 000000000000..44589795f769 --- /dev/null +++ b/x11-toolkits/gtk30/files/patch-gtk_Makefile.in @@ -0,0 +1,17 @@ +--- gtk/Makefile.in.orig Wed Mar 2 15:57:44 2005 ++++ gtk/Makefile.in Wed Mar 2 15:58:22 2005 +@@ -887,12 +887,12 @@ + bin_PROGRAMS = gtk-query-immodules-2.0 gtk-update-icon-cache + + gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS) +-gtk_query_immodules_2_0_LDADD = $(LDADDS) ++gtk_query_immodules_2_0_LDADD = $(LDADDS) $(GLIB_LIBS) + + gtk_query_immodules_2_0_SOURCES = queryimmodules.c + + gtk_update_icon_cache_DEPENDENCIES = $(DEPS) +-gtk_update_icon_cache_LDADD = $(LDADDS) ++gtk_update_icon_cache_LDADD = $(LDADDS) $(GLIB_LIBS) + + gtk_update_icon_cache_SOURCES = updateiconcache.c + subdir = gtk diff --git a/x11-toolkits/gtk30/files/patch-gtk_gtkentry.c b/x11-toolkits/gtk30/files/patch-gtk_gtkentry.c new file mode 100644 index 000000000000..e725de399cff --- /dev/null +++ b/x11-toolkits/gtk30/files/patch-gtk_gtkentry.c @@ -0,0 +1,13 @@ +--- gtk/gtkentry.c.orig Wed Aug 25 12:44:23 2004 ++++ gtk/gtkentry.c Wed Aug 25 12:44:52 2004 +@@ -1670,8 +1670,9 @@ + event->x + entry->scroll_offset, event->y)) + { + GdkDragContext *context; ++ guint actions; + GtkTargetList *target_list = gtk_target_list_new (NULL, 0); +- guint actions = entry->editable ? GDK_ACTION_COPY | GDK_ACTION_MOVE : GDK_ACTION_COPY; ++ actions = entry->editable ? GDK_ACTION_COPY | GDK_ACTION_MOVE : GDK_ACTION_COPY; + + gtk_target_list_add_text_targets (target_list); + diff --git a/x11-toolkits/gtk30/files/patch-gtk_gtkiconcache.c b/x11-toolkits/gtk30/files/patch-gtk_gtkiconcache.c new file mode 100644 index 000000000000..d393bd3dfa8d --- /dev/null +++ b/x11-toolkits/gtk30/files/patch-gtk_gtkiconcache.c @@ -0,0 +1,20 @@ +--- gtk/gtkiconcache.c.orig Sun Dec 12 16:09:13 2004 ++++ gtk/gtkiconcache.c Thu Dec 16 17:09:23 2004 +@@ -21,6 +21,8 @@ + #include "gtkdebug.h" + #include "gtkiconcache.h" + #include <glib/gstdio.h> ++#include <sys/types.h> ++#include <sys/stat.h> + + #ifdef HAVE_MMAP + #include <sys/mman.h> +@@ -29,8 +31,6 @@ + #include <windows.h> + #include <io.h> + #endif +-#include <sys/types.h> +-#include <sys/stat.h> + #ifdef HAVE_UNISTD_H + #include <unistd.h> + #endif diff --git a/x11-toolkits/gtk30/files/patch-gtk_gtkicontheme.c b/x11-toolkits/gtk30/files/patch-gtk_gtkicontheme.c deleted file mode 100644 index 07bb57a6d022..000000000000 --- a/x11-toolkits/gtk30/files/patch-gtk_gtkicontheme.c +++ /dev/null @@ -1,26 +0,0 @@ ---- gtk/gtkicontheme.c.orig Thu Jan 29 16:53:42 2004 -+++ gtk/gtkicontheme.c Thu Jan 29 16:54:56 2004 -@@ -526,7 +526,7 @@ - - priv->custom_theme = FALSE; - priv->current_theme = g_strdup (DEFAULT_THEME_NAME); -- priv->search_path = g_new (char *, 5); -+ priv->search_path = g_new (char *, 7); - - - priv->search_path[0] = g_build_filename (g_get_home_dir (), -@@ -534,9 +534,11 @@ - NULL); - priv->search_path[1] = g_build_filename (GTK_DATADIR, "pixmaps", NULL); - priv->search_path[2] = g_build_filename (GTK_DATADIR, "icons", NULL); -- priv->search_path[3] = g_strdup ("/usr/share/icons"); -- priv->search_path[4] = g_strdup ("/usr/share/pixmaps"); -- priv->search_path_len = 5; -+ priv->search_path[3] = g_build_filename (GTK_DATADIR, "gnome", "pixmaps", NULL); -+ priv->search_path[4] = g_build_filename (GTK_DATADIR, "gnome", "icons", NULL); -+ priv->search_path[5] = g_strdup ("/usr/share/icons"); -+ priv->search_path[6] = g_strdup ("/usr/share/pixmaps"); -+ priv->search_path_len = 7; - - priv->themes_valid = FALSE; - priv->themes = NULL; diff --git a/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmime.c b/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmime.c index 76c5eea6c35b..b39aaedd07b5 100644 --- a/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmime.c +++ b/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmime.c @@ -1,11 +1,11 @@ ---- gtk/xdgmime/xdgmime.c.orig Wed Jun 23 20:19:43 2004 -+++ gtk/xdgmime/xdgmime.c Wed Jun 23 20:19:56 2004 -@@ -98,7 +98,7 @@ +--- gtk/xdgmime/xdgmime.c.orig Mon Nov 8 22:25:27 2004 ++++ gtk/xdgmime/xdgmime.c Sat Nov 13 10:27:22 2004 +@@ -204,7 +204,7 @@ - xdg_data_dirs = getenv ("XDG_DATA_DIRS"); - if (xdg_data_dirs == NULL) -- xdg_data_dirs = "/usr/local/share/:/usr/share/"; -+ xdg_data_dirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/"; + xdg_data_dirs = getenv ("XDG_DATA_DIRS"); + if (xdg_data_dirs == NULL) +- xdg_data_dirs = "/usr/local/share/:/usr/share/"; ++ xdg_data_dirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/"; - ptr = xdg_data_dirs; + ptr = xdg_data_dirs; diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist index 7e4a1740997d..77127e3a5c4b 100644 --- a/x11-toolkits/gtk30/pkg-plist +++ b/x11-toolkits/gtk30/pkg-plist @@ -2,19 +2,23 @@ bin/gdk-pixbuf-csource bin/gdk-pixbuf-query-loaders bin/gtk-demo bin/gtk-query-immodules-2.0 +bin/gtk-update-icon-cache etc/gtk-2.0/gdk-pixbuf.loaders etc/gtk-2.0/gtk.immodules include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-animation.h +include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-core.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-features.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-io.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-marshal.h +include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-transform.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h include/gtk-2.0/gdk-pixbuf/gdk-pixdata.h include/gtk-2.0/gdk/gdk.h +include/gtk-2.0/gdk/gdkalias.h include/gtk-2.0/gdk/gdkcolor.h include/gtk-2.0/gdk/gdkcursor.h include/gtk-2.0/gdk/gdkdisplay.h @@ -45,7 +49,10 @@ include/gtk-2.0/gdk/gdkvisual.h include/gtk-2.0/gdk/gdkwindow.h include/gtk-2.0/gdk/gdkx.h include/gtk-2.0/gdkconfig.h +include/gtk-2.0/gtk/gtkcellview.h +include/gtk-2.0/gtk/gtkiconview.h include/gtk-2.0/gtk/gtk.h +include/gtk-2.0/gtk/gtkaboutdialog.h include/gtk-2.0/gtk/gtkaccelgroup.h include/gtk-2.0/gtk/gtkaccellabel.h include/gtk-2.0/gtk/gtkaccelmap.h @@ -65,7 +72,9 @@ include/gtk-2.0/gtk/gtkcalendar.h include/gtk-2.0/gtk/gtkcelleditable.h include/gtk-2.0/gtk/gtkcelllayout.h include/gtk-2.0/gtk/gtkcellrenderer.h +include/gtk-2.0/gtk/gtkcellrenderercombo.h include/gtk-2.0/gtk/gtkcellrendererpixbuf.h +include/gtk-2.0/gtk/gtkcellrendererprogress.h include/gtk-2.0/gtk/gtkcellrenderertext.h include/gtk-2.0/gtk/gtkcellrenderertoggle.h include/gtk-2.0/gtk/gtkcheckbutton.h @@ -92,6 +101,7 @@ include/gtk-2.0/gtk/gtkenums.h include/gtk-2.0/gtk/gtkeventbox.h include/gtk-2.0/gtk/gtkexpander.h include/gtk-2.0/gtk/gtkfilechooser.h +include/gtk-2.0/gtk/gtkfilechooserbutton.h include/gtk-2.0/gtk/gtkfilechooserdialog.h include/gtk-2.0/gtk/gtkfilechooserwidget.h include/gtk-2.0/gtk/gtkfilefilter.h @@ -134,8 +144,10 @@ include/gtk-2.0/gtk/gtkmenu.h include/gtk-2.0/gtk/gtkmenubar.h include/gtk-2.0/gtk/gtkmenuitem.h include/gtk-2.0/gtk/gtkmenushell.h +include/gtk-2.0/gtk/gtkmenutoolbutton.h include/gtk-2.0/gtk/gtkmessagedialog.h include/gtk-2.0/gtk/gtkmisc.h +include/gtk-2.0/gtk/gtkmodules.h include/gtk-2.0/gtk/gtknotebook.h include/gtk-2.0/gtk/gtkobject.h include/gtk-2.0/gtk/gtkoldeditable.h @@ -214,6 +226,7 @@ include/gtk-2.0/gtk/gtkvscrollbar.h include/gtk-2.0/gtk/gtkvseparator.h include/gtk-2.0/gtk/gtkwidget.h include/gtk-2.0/gtk/gtkwindow.h +lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.so lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-am-et.so lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cedilla.so lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cyrillic-translit.so @@ -240,16 +253,16 @@ lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.so lib/libgdk-x11-2.0.a lib/libgdk-x11-2.0.so -lib/libgdk-x11-2.0.so.400 +lib/libgdk-x11-2.0.so.600 lib/libgdk_pixbuf-2.0.a lib/libgdk_pixbuf-2.0.so -lib/libgdk_pixbuf-2.0.so.400 +lib/libgdk_pixbuf-2.0.so.600 lib/libgdk_pixbuf_xlib-2.0.a lib/libgdk_pixbuf_xlib-2.0.so -lib/libgdk_pixbuf_xlib-2.0.so.400 +lib/libgdk_pixbuf_xlib-2.0.so.600 lib/libgtk-x11-2.0.a lib/libgtk-x11-2.0.so -lib/libgtk-x11-2.0.so.400 +lib/libgtk-x11-2.0.so.600 libdata/pkgconfig/gdk-2.0.pc libdata/pkgconfig/gdk-pixbuf-2.0.pc libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc @@ -263,6 +276,7 @@ share/gtk-2.0/demo/appwindow.c share/gtk-2.0/demo/background.jpg share/gtk-2.0/demo/button_box.c share/gtk-2.0/demo/changedisplay.c +share/gtk-2.0/demo/clipboard.c share/gtk-2.0/demo/colorsel.c share/gtk-2.0/demo/dialog.c share/gtk-2.0/demo/drawingarea.c @@ -273,12 +287,15 @@ share/gtk-2.0/demo/floppybuddy.gif share/gtk-2.0/demo/gnome-applets.png share/gtk-2.0/demo/gnome-calendar.png share/gtk-2.0/demo/gnome-foot.png +share/gtk-2.0/demo/gnome-fs-directory.png +share/gtk-2.0/demo/gnome-fs-regular.png share/gtk-2.0/demo/gnome-gimp.png share/gtk-2.0/demo/gnome-gmush.png share/gtk-2.0/demo/gnome-gsame.png share/gtk-2.0/demo/gnu-keys.png share/gtk-2.0/demo/gtk-logo-rgb.gif share/gtk-2.0/demo/hypertext.c +share/gtk-2.0/demo/iconview.c share/gtk-2.0/demo/images.c share/gtk-2.0/demo/list_store.c share/gtk-2.0/demo/menus.c @@ -286,6 +303,7 @@ share/gtk-2.0/demo/panes.c share/gtk-2.0/demo/pixbufs.c share/gtk-2.0/demo/sizegroup.c share/gtk-2.0/demo/stock_browser.c +share/gtk-2.0/demo/rotated_text.c share/gtk-2.0/demo/textview.c share/gtk-2.0/demo/tree_store.c share/gtk-2.0/demo/ui_manager.c @@ -293,8 +311,6 @@ share/locale/af/LC_MESSAGES/gtk20-properties.mo share/locale/af/LC_MESSAGES/gtk20.mo share/locale/am/LC_MESSAGES/gtk20-properties.mo share/locale/am/LC_MESSAGES/gtk20.mo -share/locale/ang/LC_MESSAGES/gtk20-properties.mo -share/locale/ang/LC_MESSAGES/gtk20.mo share/locale/ar/LC_MESSAGES/gtk20-properties.mo share/locale/ar/LC_MESSAGES/gtk20.mo share/locale/az/LC_MESSAGES/gtk20-properties.mo @@ -407,6 +423,8 @@ share/locale/ro/LC_MESSAGES/gtk20-properties.mo share/locale/ro/LC_MESSAGES/gtk20.mo share/locale/ru/LC_MESSAGES/gtk20-properties.mo share/locale/ru/LC_MESSAGES/gtk20.mo +share/locale/rw/LC_MESSAGES/gtk20-properties.mo +share/locale/rw/LC_MESSAGES/gtk20.mo share/locale/sk/LC_MESSAGES/gtk20-properties.mo share/locale/sk/LC_MESSAGES/gtk20.mo share/locale/sl/LC_MESSAGES/gtk20-properties.mo @@ -439,6 +457,8 @@ share/locale/vi/LC_MESSAGES/gtk20-properties.mo share/locale/vi/LC_MESSAGES/gtk20.mo share/locale/wa/LC_MESSAGES/gtk20-properties.mo share/locale/wa/LC_MESSAGES/gtk20.mo +share/locale/xh/LC_MESSAGES/gtk20-properties.mo +share/locale/xh/LC_MESSAGES/gtk20.mo share/locale/yi/LC_MESSAGES/gtk20-properties.mo share/locale/yi/LC_MESSAGES/gtk20.mo share/locale/zh_CN/LC_MESSAGES/gtk20-properties.mo @@ -470,8 +490,6 @@ share/themes/Emacs/gtk-2.0-key/gtkrc @exec /bin/mkdir -p %D/lib/gtk-2.0/%%GTK_VERSION%%/engines @unexec /bin/rmdir %D/share/themes/Default 2>/dev/null || /usr/bin/true @unexec /bin/rmdir %D/share/themes 2>/dev/null || /usr/bin/true -@unexec rmdir %D/share/locale/ang/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/ang 2> /dev/null || true @unexec rmdir %D/share/locale/az_IR/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/az_IR 2> /dev/null || true @unexec rmdir %D/share/locale/br/LC_MESSAGES 2> /dev/null || true @@ -484,9 +502,13 @@ share/themes/Emacs/gtk-2.0-key/gtkrc @unexec rmdir %D/share/locale/mr 2> /dev/null || true @unexec rmdir %D/share/locale/nso/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/nso 2> /dev/null || true +@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/rw 2> /dev/null || true @unexec rmdir %D/share/locale/sr@ije/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/sr@ije 2> /dev/null || true @unexec rmdir %D/share/locale/uz@Latn/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/uz@Latn 2> /dev/null || true @unexec rmdir %D/share/locale/yi/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/yi 2> /dev/null || true +@unexec rmdir %D/share/locale/xh/LC_MESSAGES/ 2> /dev/null || true +@unexec rmdir %D/share/locale/xh 2> /dev/null || true diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile index 516a256d6939..94c8e882548c 100644 --- a/x11-toolkits/libgnomeprintui/Makefile +++ b/x11-toolkits/libgnomeprintui/Makefile @@ -6,10 +6,10 @@ # PORTNAME= libgnomeprintui -PORTVERSION= 2.8.2 +PORTVERSION= 2.10.0.1 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.8 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/x11-toolkits/libgnomeprintui/distinfo b/x11-toolkits/libgnomeprintui/distinfo index f0c00d24ad35..7842db915057 100644 --- a/x11-toolkits/libgnomeprintui/distinfo +++ b/x11-toolkits/libgnomeprintui/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libgnomeprintui-2.8.2.tar.bz2) = b38d1f6813dd52879ba4174ddc3f1b1c -SIZE (gnome2/libgnomeprintui-2.8.2.tar.bz2) = 583090 +MD5 (gnome2/libgnomeprintui-2.10.0.1.tar.bz2) = 36e2775878fb518d30dcf5c3d6438d89 +SIZE (gnome2/libgnomeprintui-2.10.0.1.tar.bz2) = 625431 diff --git a/x11-toolkits/libgnomeprintui/pkg-plist b/x11-toolkits/libgnomeprintui/pkg-plist index 546d1a8626e1..bd41a2e5cbd3 100644 --- a/x11-toolkits/libgnomeprintui/pkg-plist +++ b/x11-toolkits/libgnomeprintui/pkg-plist @@ -5,6 +5,7 @@ include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-job-preview.h include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-paper-selector.h include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-preview.h include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-unit-selector.h +include/libgnomeprintui-2.2/libgnomeprintui/libgnomeprintui-enum-types.h lib/libgnomeprintui-2-2.a lib/libgnomeprintui-2-2.so lib/libgnomeprintui-2-2.so.1 @@ -64,6 +65,7 @@ share/locale/ko/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/li/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/lt/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/lv/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/mk/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/ml/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/mn/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/ms/LC_MESSAGES/libgnomeprintui-2.2.mo @@ -87,8 +89,8 @@ share/locale/sv/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/ta/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/th/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/tr/LC_MESSAGES/libgnomeprintui-2.2.mo -share/locale/vi/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/uk/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/vi/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/wa/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/zh_CN/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/zh_TW/LC_MESSAGES/libgnomeprintui-2.2.mo diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile index 549943b07f98..12540b3a053c 100644 --- a/x11-toolkits/libgnomeui/Makefile +++ b/x11-toolkits/libgnomeui/Makefile @@ -6,10 +6,10 @@ # PORTNAME= libgnomeui -PORTVERSION= 2.8.1 +PORTVERSION= 2.10.0 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.8 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/x11-toolkits/libgnomeui/distinfo b/x11-toolkits/libgnomeui/distinfo index fa9a97112ccf..f12a6a3dc0f1 100644 --- a/x11-toolkits/libgnomeui/distinfo +++ b/x11-toolkits/libgnomeui/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libgnomeui-2.8.1.tar.bz2) = d46a2b34bdfbc1b36464176fa8bef03c -SIZE (gnome2/libgnomeui-2.8.1.tar.bz2) = 1456239 +MD5 (gnome2/libgnomeui-2.10.0.tar.bz2) = e17c0d97e5f240513ac2d36268d696ed +SIZE (gnome2/libgnomeui-2.10.0.tar.bz2) = 1652481 diff --git a/x11-toolkits/libgnomeui/files/patch-Makefile.in b/x11-toolkits/libgnomeui/files/patch-Makefile.in deleted file mode 100644 index 045ff7f723b0..000000000000 --- a/x11-toolkits/libgnomeui/files/patch-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig Mon Mar 22 00:31:40 2004 -+++ Makefile.in Mon Mar 22 00:32:06 2004 -@@ -139,7 +139,7 @@ - YACC = @YACC@ - gnomelocaledir = @gnomelocaledir@ - --SUBDIRS = libgnomeui file-chooser glade images demos test-gnome doc po #tests -+SUBDIRS = libgnomeui file-chooser glade images demos doc po #tests - - EXTRA_DIST = COPYING.LIB NEWS - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui_Makefile.in b/x11-toolkits/libgnomeui/files/patch-libgnomeui_Makefile.in deleted file mode 100644 index 938ac8dbe444..000000000000 --- a/x11-toolkits/libgnomeui/files/patch-libgnomeui_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- libgnomeui/Makefile.in.orig Wed Feb 25 01:08:42 2004 -+++ libgnomeui/Makefile.in Wed Feb 25 01:10:01 2004 -@@ -158,7 +158,7 @@ - -DGNOMEUILIBDIR=\""$(libdir)"\" \ - -DGNOMEUIDATADIR=\""$(datadir)"\" \ - -DGNOMEUIPIXMAPDIR=\""$(datadir)/pixmaps"\" \ -- -DGNOMEUIICONDIR=\""$(datadir)/icons"\" \ -+ -DGNOMEUIICONDIR=\""$(prefix)/share/icons"\" \ - -DGNOMEUISERVERDIR=\""$(libexecdir)"\" \ - -DGNOMEUILOCALSTATEDIR=\""$(localstatedir)"\" \ - -DGNOMEUILOCALEDIR=\""$(gnomelocaledir)"\" \ diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-ice.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-ice.c deleted file mode 100644 index 8c5bbd501398..000000000000 --- a/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-ice.c +++ /dev/null @@ -1,20 +0,0 @@ ---- libgnomeui/gnome-ice.c.orig Fri Oct 22 23:22:11 2004 -+++ libgnomeui/gnome-ice.c Fri Oct 22 23:22:38 2004 -@@ -54,6 +54,8 @@ - IceConn connection = (IceConn) data; - IceProcessMessagesStatus status; - -+ GDK_THREADS_ENTER(); -+ - status = IceProcessMessages (connection, NULL, NULL); - - if (status == IceProcessMessagesIOError) -@@ -73,6 +75,8 @@ - IceCloseConnection (connection); - } - } -+ -+ GDK_THREADS_LEAVE(); - - return TRUE; - } diff --git a/x11-toolkits/libgnomeui/pkg-plist b/x11-toolkits/libgnomeui/pkg-plist index d8556ce5b894..c11e1154680c 100644 --- a/x11-toolkits/libgnomeui/pkg-plist +++ b/x11-toolkits/libgnomeui/pkg-plist @@ -53,9 +53,97 @@ lib/gtk-2.0/%%GTK_VERSION%%/filesystems/libgnome-vfs.so lib/libglade/2.0/libgnome.so lib/libgnomeui-2.a lib/libgnomeui-2.so -lib/libgnomeui-2.so.800 +lib/libgnomeui-2.so.1000 libdata/pkgconfig/libgnomeui-2.0.pc libexec/gnome_segv2 +%%DOCSDIR%%/GnomeAbout.html +%%DOCSDIR%%/GnomeApp.html +%%DOCSDIR%%/GnomeAppBar.html +%%DOCSDIR%%/GnomeClient.html +%%DOCSDIR%%/GnomeColorPicker.html +%%DOCSDIR%%/GnomeDateEdit.html +%%DOCSDIR%%/GnomeDialog.html +%%DOCSDIR%%/GnomeDruid.html +%%DOCSDIR%%/GnomeDruidPage.html +%%DOCSDIR%%/GnomeDruidPageEdge.html +%%DOCSDIR%%/GnomeDruidPageStandard.html +%%DOCSDIR%%/GnomeEntry.html +%%DOCSDIR%%/GnomeFileEntry.html +%%DOCSDIR%%/GnomeFontPicker.html +%%DOCSDIR%%/GnomeHRef.html +%%DOCSDIR%%/GnomeIconEntry.html +%%DOCSDIR%%/GnomeIconList.html +%%DOCSDIR%%/GnomeIconSelection.html +%%DOCSDIR%%/GnomeMDI.html +%%DOCSDIR%%/GnomeMDIChild.html +%%DOCSDIR%%/GnomeMDIGenericChild.html +%%DOCSDIR%%/GnomeMessageBox.html +%%DOCSDIR%%/GnomePixmap.html +%%DOCSDIR%%/GnomePixmapEntry.html +%%DOCSDIR%%/GnomePropertyBox.html +%%DOCSDIR%%/GnomeScores.html +%%DOCSDIR%%/application-mgmt.html +%%DOCSDIR%%/ch01.html +%%DOCSDIR%%/deprecated.html +%%DOCSDIR%%/druids.html +%%DOCSDIR%%/fixme.html +%%DOCSDIR%%/home.png +%%DOCSDIR%%/index.html +%%DOCSDIR%%/index.sgml +%%DOCSDIR%%/left.png +%%DOCSDIR%%/libgnomeui-GnomeIconLookup.html +%%DOCSDIR%%/libgnomeui-GnomeIconTheme.html +%%DOCSDIR%%/libgnomeui-GnomeThemeFile.html +%%DOCSDIR%%/libgnomeui-GnomeThumbnail.html +%%DOCSDIR%%/libgnomeui-gnome-app-helper.html +%%DOCSDIR%%/libgnomeui-gnome-app-util.html +%%DOCSDIR%%/libgnomeui-gnome-dialog-util.html +%%DOCSDIR%%/libgnomeui-gnome-mdi-session.html +%%DOCSDIR%%/libgnomeui-gnome-popup-menu.html +%%DOCSDIR%%/libgnomeui-gnome-stock-icons.html +%%DOCSDIR%%/libgnomeui-gnome-types.html +%%DOCSDIR%%/libgnomeui-gnome-ui-init.html +%%DOCSDIR%%/libgnomeui-gnome-uidefs.html +%%DOCSDIR%%/libgnomeui-gnome-vfs-util.html +%%DOCSDIR%%/libgnomeui-gnome-window.html +%%DOCSDIR%%/libgnomeui-gnometypebuiltins.html +%%DOCSDIR%%/libgnomeui-objects.html +%%DOCSDIR%%/libgnomeui.devhelp +%%DOCSDIR%%/miscellaneous.html +%%DOCSDIR%%/right.png +%%DOCSDIR%%/stock_attach.png +%%DOCSDIR%%/stock_book_blue.png +%%DOCSDIR%%/stock_book_green.png +%%DOCSDIR%%/stock_book_open.png +%%DOCSDIR%%/stock_book_red.png +%%DOCSDIR%%/stock_book_yellow.png +%%DOCSDIR%%/stock_line_in.png +%%DOCSDIR%%/stock_mail.png +%%DOCSDIR%%/stock_mail_compose.png +%%DOCSDIR%%/stock_mail_forward.png +%%DOCSDIR%%/stock_mail_receive.png +%%DOCSDIR%%/stock_mail_reply.png +%%DOCSDIR%%/stock_mail_send.png +%%DOCSDIR%%/stock_menu_about.png +%%DOCSDIR%%/stock_menu_blank.png +%%DOCSDIR%%/stock_mic.png +%%DOCSDIR%%/stock_midi.png +%%DOCSDIR%%/stock_multiple_file.png +%%DOCSDIR%%/stock_not.png +%%DOCSDIR%%/stock_scores.png +%%DOCSDIR%%/stock_table_borders.png +%%DOCSDIR%%/stock_table_fill.png +%%DOCSDIR%%/stock_text_bulleted_list.png +%%DOCSDIR%%/stock_text_indent.png +%%DOCSDIR%%/stock_text_numbered_list.png +%%DOCSDIR%%/stock_text_unindent.png +%%DOCSDIR%%/stock_timer.png +%%DOCSDIR%%/stock_timer_stopped.png +%%DOCSDIR%%/stock_trash.png +%%DOCSDIR%%/stock_trash_full.png +%%DOCSDIR%%/stock_volume.png +%%DOCSDIR%%/style.css +%%DOCSDIR%%/up.png share/gnome/pixmaps/gnome-about-logo.png share/gnome/pixmaps/gnome-default-dlg.png share/gnome/pixmaps/gnome-error.png @@ -120,6 +208,7 @@ share/locale/pt/LC_MESSAGES/libgnomeui-2.0.mo share/locale/pt_BR/LC_MESSAGES/libgnomeui-2.0.mo share/locale/ro/LC_MESSAGES/libgnomeui-2.0.mo share/locale/ru/LC_MESSAGES/libgnomeui-2.0.mo +share/locale/rw/LC_MESSAGES/libgnomeui-2.0.mo share/locale/sk/LC_MESSAGES/libgnomeui-2.0.mo share/locale/sl/LC_MESSAGES/libgnomeui-2.0.mo share/locale/sq/LC_MESSAGES/libgnomeui-2.0.mo @@ -134,14 +223,12 @@ share/locale/tr/LC_MESSAGES/libgnomeui-2.0.mo share/locale/uk/LC_MESSAGES/libgnomeui-2.0.mo share/locale/vi/LC_MESSAGES/libgnomeui-2.0.mo share/locale/wa/LC_MESSAGES/libgnomeui-2.0.mo +share/locale/xh/LC_MESSAGES/libgnomeui-2.0.mo share/locale/yi/LC_MESSAGES/libgnomeui-2.0.mo share/locale/zh_CN/LC_MESSAGES/libgnomeui-2.0.mo share/locale/zh_TW/LC_MESSAGES/libgnomeui-2.0.mo share/locale/zu/LC_MESSAGES/libgnomeui-2.0.mo -@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/zu 2> /dev/null || true -@unexec rmdir %D/share/locale/nso/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/nso 2> /dev/null || true +@dirrm %%DOCSDIR%% @dirrm include/libgnomeui-2.0/libgnomeui @dirrm include/libgnomeui-2.0 @dirrm lib/gtk-2.0/%%GTK_VERSION%%/filesystems diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile index 385cfea32ece..b23c23cf021e 100644 --- a/x11-toolkits/libwnck/Makefile +++ b/x11-toolkits/libwnck/Makefile @@ -6,11 +6,10 @@ # PORTNAME= libwnck -PORTVERSION= 2.8.1 -PORTREVISION= 1 +PORTVERSION= 2.10.0 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.8 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/x11-toolkits/libwnck/distinfo b/x11-toolkits/libwnck/distinfo index c9c164c626a5..d14209cc8843 100644 --- a/x11-toolkits/libwnck/distinfo +++ b/x11-toolkits/libwnck/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libwnck-2.8.1.tar.bz2) = c0a5a8478064287e167c15e3ec0e82a1 -SIZE (gnome2/libwnck-2.8.1.tar.bz2) = 396274 +MD5 (gnome2/libwnck-2.10.0.tar.bz2) = c04c79f1e8576bc930c79d2e7bb8190a +SIZE (gnome2/libwnck-2.10.0.tar.bz2) = 419060 diff --git a/x11-toolkits/libwnck/pkg-plist b/x11-toolkits/libwnck/pkg-plist index 2a3d77846f2a..2411986d8acf 100644 --- a/x11-toolkits/libwnck/pkg-plist +++ b/x11-toolkits/libwnck/pkg-plist @@ -3,16 +3,16 @@ include/libwnck-1.0/libwnck/class-group.h include/libwnck-1.0/libwnck/libwnck.h include/libwnck-1.0/libwnck/pager.h include/libwnck-1.0/libwnck/screen.h +include/libwnck-1.0/libwnck/selector.h include/libwnck-1.0/libwnck/tasklist.h include/libwnck-1.0/libwnck/util.h include/libwnck-1.0/libwnck/window-action-menu.h -include/libwnck-1.0/libwnck/window-menu.h include/libwnck-1.0/libwnck/window.h include/libwnck-1.0/libwnck/wnck-enum-types.h include/libwnck-1.0/libwnck/workspace.h lib/libwnck-1.a lib/libwnck-1.so -lib/libwnck-1.so.13 +lib/libwnck-1.so.16 libdata/pkgconfig/libwnck-1.0.pc %%DOCSDIR%%/ch01.html %%DOCSDIR%%/home.png @@ -87,6 +87,7 @@ share/locale/mn/LC_MESSAGES/libwnck.mo share/locale/mr/LC_MESSAGES/libwnck.mo share/locale/ms/LC_MESSAGES/libwnck.mo share/locale/nb/LC_MESSAGES/libwnck.mo +share/locale/ne/LC_MESSAGES/libwnck.mo share/locale/nl/LC_MESSAGES/libwnck.mo share/locale/nn/LC_MESSAGES/libwnck.mo share/locale/no/LC_MESSAGES/libwnck.mo diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile index 000ba3dde7f1..382dba7757b9 100644 --- a/x11-toolkits/pango/Makefile +++ b/x11-toolkits/pango/Makefile @@ -6,9 +6,9 @@ # PORTNAME= pango -PORTVERSION= 1.6.0 +PORTVERSION= 1.8.1 CATEGORIES= x11-toolkits -MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/1.6,} \ +MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/1.8,} \ ftp://ftp.gtk.org/pub/gtk/v2.6/ DIST_SUBDIR= gnome2 diff --git a/x11-toolkits/pango/distinfo b/x11-toolkits/pango/distinfo index 8f3ef561d1b3..47ca2a28be2c 100644 --- a/x11-toolkits/pango/distinfo +++ b/x11-toolkits/pango/distinfo @@ -1,4 +1,2 @@ -MD5 (gnome2/pango-1.6.0.tar.bz2) = 6c732bbc5fba5a0f1f8086e8aa4f490d -SIZE (gnome2/pango-1.6.0.tar.bz2) = 951911 -MD5 (gnome2/cjk-patch-pango-20041115.diff.gz) = 76e545d0bda595aced674ecf397eab63 -SIZE (gnome2/cjk-patch-pango-20041115.diff.gz) = 1930 +MD5 (gnome2/pango-1.8.1.tar.bz2) = 88aa6bf1876766db6864f3b93577887c +SIZE (gnome2/pango-1.8.1.tar.bz2) = 996389 diff --git a/x11-toolkits/pango/pkg-plist b/x11-toolkits/pango/pkg-plist index 5ce33aa86604..14d2d704b680 100644 --- a/x11-toolkits/pango/pkg-plist +++ b/x11-toolkits/pango/pkg-plist @@ -16,6 +16,7 @@ include/pango-1.0/pango/pango-item.h include/pango-1.0/pango/pango-layout.h include/pango-1.0/pango/pango-modules.h include/pango-1.0/pango/pango-ot.h +include/pango-1.0/pango/pango-renderer.h include/pango-1.0/pango/pango-script.h include/pango-1.0/pango/pango-tabs.h include/pango-1.0/pango/pango-types.h @@ -26,26 +27,29 @@ include/pango-1.0/pango/pangofc-font.h include/pango-1.0/pango/pangofc-fontmap.h include/pango-1.0/pango/pangoft2.h include/pango-1.0/pango/pangox.h +include/pango-1.0/pango/pangoxft-render.h include/pango-1.0/pango/pangoxft.h lib/libpango-1.0.a lib/libpango-1.0.so -lib/libpango-1.0.so.600 +lib/libpango-1.0.so.800 lib/libpangoft2-1.0.a lib/libpangoft2-1.0.so -lib/libpangoft2-1.0.so.600 +lib/libpangoft2-1.0.so.800 lib/libpangox-1.0.a lib/libpangox-1.0.so -lib/libpangox-1.0.so.600 +lib/libpangox-1.0.so.800 lib/libpangoxft-1.0.a lib/libpangoxft-1.0.so -lib/libpangoxft-1.0.so.600 +lib/libpangoxft-1.0.so.800 lib/pango/%%VERSION%%/modules/pango-arabic-fc.so lib/pango/%%VERSION%%/modules/pango-basic-fc.so lib/pango/%%VERSION%%/modules/pango-basic-x.so lib/pango/%%VERSION%%/modules/pango-hangul-fc.so lib/pango/%%VERSION%%/modules/pango-hebrew-fc.so lib/pango/%%VERSION%%/modules/pango-indic-fc.so +lib/pango/%%VERSION%%/modules/pango-syriac-fc.so lib/pango/%%VERSION%%/modules/pango-thai-fc.so +lib/pango/%%VERSION%%/modules/pango-tibetan-fc.so libdata/pkgconfig/pango.pc libdata/pkgconfig/pangoft2.pc libdata/pkgconfig/pangox.pc |