From 48e62d9a379cd45a15f6ae89d564f81b3c13d16e Mon Sep 17 00:00:00 2001 From: Koop Mast Date: Mon, 10 May 2010 21:19:08 +0000 Subject: Presenting GNOME 2.30.1 for FreeBSD. The offical release notes for this release can be found at http://library.gnome.org/misc/release-notes/2.30/ . This release brings initial PackageKit support, Upower (replaces power management part of hal), cuse4bsd integration with HAL and cheese, and a faster Evolution. Sadly GNOME 2.30.x will be the last release with FreeBSD 6.X support. This will also be the last of the 2.x releases. The next release will be the highly-anticipated GNOME 3.0 which will bring with it a new UI experience. Currently, there are a few bugs with GNOME 2.30 that may be of note for our users. Be sure to consult the UPGRADING note or the 2.30 upgrade FAQ at http://www.freebsd.org/gnome/docs/faq230.html for specific upgrading instructions, and the up-to-date list of known issues. This release features commits by avl, ahze, bland, marcus, mezz, and myself. The FreeBSD GNOME Team would like to thank Anders F Bjorklund for doing the initual packagekit porting. And the following contributors & testers for there help with this release: Eric L. Chen Vladimir Grebenschikov Sergio de Almeida Lenzi DomiX walder crsd Kevin Oberman Michal Varga Pavel Plesov Bapt kevin and ITetcu for two exp-run PR: ports/143852 ports/145347 ports/144980 ports/145830 ports/145511 --- x11-toolkits/gtk20/Makefile | 9 +++++---- x11-toolkits/gtk20/distinfo | 6 +++--- x11-toolkits/gtk20/files/patch-ah | 6 +++--- x11-toolkits/gtk20/files/patch-configure | 14 ++++++++++++++ x11-toolkits/gtk20/files/patch-gtk_Makefile.in | 9 ++++----- x11-toolkits/gtk20/pkg-plist | 16 ++++++++++++++++ 6 files changed, 45 insertions(+), 15 deletions(-) create mode 100644 x11-toolkits/gtk20/files/patch-configure (limited to 'x11-toolkits/gtk20') diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index 2ced9e9b8555..5c3b740e994a 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -3,12 +3,12 @@ # Whom: Vanilla I. Shu # # $FreeBSD$ -# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.174 2009/10/17 09:40:33 kwm Exp $ +# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.191 2010/05/04 10:29:49 kwm Exp $ # PORTNAME= gtk -PORTVERSION= 2.18.7 -PORTREVISION?= 1 +PORTVERSION= 2.20.1 +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%/ \ @@ -29,6 +29,7 @@ LATEST_LINK= gtk20 .if !defined(REFERENCE_PORT) +BUILD_DEPENDS+= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ jpeg.11:${PORTSDIR}/graphics/jpeg \ @@ -37,7 +38,7 @@ RUN_DEPENDS+= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \ ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme USE_GMAKE= yes -USE_PERL5= yes +USE_PERL5_BUILD=yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:22 USE_GNOME= gnomehack atk pango ltverhack diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo index b449668e45d2..cc3c94a0d656 100644 --- a/x11-toolkits/gtk20/distinfo +++ b/x11-toolkits/gtk20/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gtk+-2.18.7.tar.bz2) = e38d0b6801789b5b4c598e84b28fb215 -SHA256 (gnome2/gtk+-2.18.7.tar.bz2) = 602d4f8098e1620231788770e1d9b520d5824da3f01d86e3b4fb59f1d67e1464 -SIZE (gnome2/gtk+-2.18.7.tar.bz2) = 18304767 +MD5 (gnome2/gtk+-2.20.1.tar.bz2) = 53e6f3a93bd22934878fc4a4a34c68aa +SHA256 (gnome2/gtk+-2.20.1.tar.bz2) = 0e081731d21e34ff45c82199490c2889504fa8b3c7e117c043e82ababaec0f65 +SIZE (gnome2/gtk+-2.20.1.tar.bz2) = 19089076 diff --git a/x11-toolkits/gtk20/files/patch-ah b/x11-toolkits/gtk20/files/patch-ah index 4d2c63f0d2e2..b6a6a71721f5 100644 --- a/x11-toolkits/gtk20/files/patch-ah +++ b/x11-toolkits/gtk20/files/patch-ah @@ -1,6 +1,6 @@ ---- docs/Makefile.in.orig 2010-01-18 01:13:15.000000000 -0500 -+++ docs/Makefile.in 2010-01-18 01:14:29.000000000 -0500 -@@ -230,7 +230,7 @@ LTLIBOBJS = @LTLIBOBJS@ +--- docs/Makefile.in.orig 2009-12-25 20:26:59.000000000 +0100 ++++ docs/Makefile.in 2009-12-25 20:27:35.000000000 +0100 +@@ -241,7 +241,7 @@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ diff --git a/x11-toolkits/gtk20/files/patch-configure b/x11-toolkits/gtk20/files/patch-configure new file mode 100644 index 000000000000..06a6f7b9fa22 --- /dev/null +++ b/x11-toolkits/gtk20/files/patch-configure @@ -0,0 +1,14 @@ +--- configure.orig 2009-12-26 21:41:27.000000000 +0100 ++++ configure 2009-12-26 21:51:04.000000000 +0100 +@@ -33884,9 +33884,9 @@ + INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` + INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` + INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` +- INTROSPECTION_GIRDIR=${INTROSPECTION_GIRDIR/$datadir/\$(datadir)} ++ INTROSPECTION_GIRDIR=`echo ${INTROSPECTION_GIRDIR} | sed -e "s|${datadir}|\\\$(datadir)|"` + INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" +- INTROSPECTION_TYPELIBDIR=${INTROSPECTION_TYPELIBDIR/$libdir/\$(libdir)} ++ INTROSPECTION_TYPELIBDIR=`echo ${INTROSPECTION_TYPELIBDIR} | sed -e "s|${libdir}|\\\$(libdir)|"` + INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` + INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` + INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection diff --git a/x11-toolkits/gtk20/files/patch-gtk_Makefile.in b/x11-toolkits/gtk20/files/patch-gtk_Makefile.in index 348bb57b8fdb..25056ecf7e03 100644 --- a/x11-toolkits/gtk20/files/patch-gtk_Makefile.in +++ b/x11-toolkits/gtk20/files/patch-gtk_Makefile.in @@ -1,6 +1,6 @@ ---- gtk/Makefile.in.orig 2010-01-18 01:17:13.000000000 -0500 -+++ gtk/Makefile.in 2010-01-18 01:18:40.000000000 -0500 -@@ -1324,11 +1324,12 @@ bin_SCRIPTS = gtk-builder-convert $(am__ +--- gtk/Makefile.in.orig 2009-12-25 20:27:57.000000000 +0100 ++++ gtk/Makefile.in 2009-12-25 20:29:14.000000000 +0100 +@@ -1377,11 +1377,11 @@ bin_SCRIPTS = gtk-builder-convert $(am__ # gtk-update-icon-cache.exe doesn't require any special privileges. @OS_WIN32_TRUE@GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache.exe.manifest gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS) @@ -10,8 +10,7 @@ gtk_update_icon_cache_LDADD = \ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ - $(GDK_PIXBUF_DEP_LIBS) -+ $(GDK_PIXBUF_DEP_LIBS) \ -+ $(GLIB_LIBS) ++ $(GDK_PIXBUF_DEP_LIBS) $(GLIB_LIBS) gtk_update_icon_cache_SOURCES = \ updateiconcache.c diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist index 9e9533c6e0f9..28d34b3b06ac 100644 --- a/x11-toolkits/gtk20/pkg-plist +++ b/x11-toolkits/gtk20/pkg-plist @@ -88,6 +88,7 @@ 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/gtkcellrendererspin.h +include/gtk-2.0/gtk/gtkcellrendererspinner.h include/gtk-2.0/gtk/gtkcellrenderertext.h include/gtk-2.0/gtk/gtkcellrenderertoggle.h include/gtk-2.0/gtk/gtkcellview.h @@ -169,6 +170,7 @@ include/gtk-2.0/gtk/gtkmodules.h include/gtk-2.0/gtk/gtkmountoperation.h include/gtk-2.0/gtk/gtknotebook.h include/gtk-2.0/gtk/gtkobject.h +include/gtk-2.0/gtk/gtkoffscreenwindow.h include/gtk-2.0/gtk/gtkoldeditable.h include/gtk-2.0/gtk/gtkoptionmenu.h include/gtk-2.0/gtk/gtkorientable.h @@ -213,6 +215,7 @@ include/gtk-2.0/gtk/gtksignal.h include/gtk-2.0/gtk/gtksizegroup.h include/gtk-2.0/gtk/gtksocket.h include/gtk-2.0/gtk/gtkspinbutton.h +include/gtk-2.0/gtk/gtkspinner.h include/gtk-2.0/gtk/gtkstatusbar.h include/gtk-2.0/gtk/gtkstatusicon.h include/gtk-2.0/gtk/gtkstock.h @@ -238,6 +241,8 @@ include/gtk-2.0/gtk/gtktoggletoolbutton.h include/gtk-2.0/gtk/gtktoolbar.h include/gtk-2.0/gtk/gtktoolbutton.h include/gtk-2.0/gtk/gtktoolitem.h +include/gtk-2.0/gtk/gtktoolitemgroup.h +include/gtk-2.0/gtk/gtktoolpalette.h include/gtk-2.0/gtk/gtktoolshell.h include/gtk-2.0/gtk/gtktooltip.h include/gtk-2.0/gtk/gtktooltips.h @@ -272,6 +277,9 @@ include/gtk-unix-print-2.0/gtk/gtkprinter.h include/gtk-unix-print-2.0/gtk/gtkprintjob.h include/gtk-unix-print-2.0/gtk/gtkprintunixdialog.h include/gtk-unix-print-2.0/gtk/gtkunixprint.h +lib/girepository-1.0/Gdk-2.0.typelib +lib/girepository-1.0/GdkPixbuf-2.0.typelib +lib/girepository-1.0/Gtk-2.0.typelib lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.a lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.la lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.so @@ -317,6 +325,9 @@ lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.a lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.la lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.so +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-qtif.a +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-qtif.la +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-qtif.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-icns.a lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-icns.la lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-icns.so @@ -400,6 +411,9 @@ libdata/pkgconfig/gtk+-2.0.pc libdata/pkgconfig/gtk+-unix-print-2.0.pc libdata/pkgconfig/gtk+-x11-2.0.pc share/aclocal/gtk-2.0.m4 +share/gir-1.0/Gdk-2.0.gir +share/gir-1.0/GdkPixbuf-2.0.gir +share/gir-1.0/Gtk-2.0.gir share/gtk-2.0/demo/alphatest.png share/gtk-2.0/demo/apple-red.png share/gtk-2.0/demo/appwindow.c @@ -446,9 +460,11 @@ 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/spinner.c share/gtk-2.0/demo/stock_browser.c share/gtk-2.0/demo/textscroll.c share/gtk-2.0/demo/textview.c +share/gtk-2.0/demo/toolpalette.c share/gtk-2.0/demo/tree_store.c share/gtk-2.0/demo/ui_manager.c share/locale/af/LC_MESSAGES/gtk20-properties.mo -- cgit v1.2.3