diff options
author | Koop Mast <kwm@FreeBSD.org> | 2010-11-20 15:37:08 +0000 |
---|---|---|
committer | Koop Mast <kwm@FreeBSD.org> | 2010-11-20 15:37:08 +0000 |
commit | 3680f27ebff58ece429c4e032f9ad84fb1372114 (patch) | |
tree | 6c5ff4664c1a779ddad350ac887e5706dbfdd4eb /x11/gnome-shell | |
parent | - Upgrade 1.2000. (diff) |
Presenting GNOME 2.32.1 for FreeBSD. The offical release notes for this
release can be found at http://library.gnome.org/misc/release-notes/2.32/
This will be the last release of the GNOME 2.x series, mainly a bugfix and
bridge release to the first release of the GNOME 3.x series.
This release features commits by avl, marcus, mezz and myself.
The FreeBSD GNOME Team would like to thank the following contributors and
testers for there help with this release:
Zane C.B. <vvelox@vvelox.net>
romain@
Olaf Seibert <O.Seibert@cs.ru.nl>
DomiX
Bapt <baptiste.daroussin@gmail.com>
jsa@
miwi@
Sergio de Almeida Lenzi <lenzi.sergio@gmail.com>
Maxim Samsonov <xors@mne.ru>
Kris Moore
And pav@ for 2 exp-runs
PR: ports/152255
ports/143260
ports/141033
ports/149629
ports/150350
ports/151523
With hat: gnome@
Notes
Notes:
svn path=/head/; revision=264837
Diffstat (limited to 'x11/gnome-shell')
-rw-r--r-- | x11/gnome-shell/Makefile | 8 | ||||
-rw-r--r-- | x11/gnome-shell/distinfo | 6 | ||||
-rw-r--r-- | x11/gnome-shell/files/patch-src_Makefile.in | 18 | ||||
-rw-r--r-- | x11/gnome-shell/files/patch-src_gnome-shell-plugin.c | 26 | ||||
-rw-r--r-- | x11/gnome-shell/pkg-plist | 19 |
5 files changed, 49 insertions, 28 deletions
diff --git a/x11/gnome-shell/Makefile b/x11/gnome-shell/Makefile index 5537d50e4303..7ecc0b0985bd 100644 --- a/x11/gnome-shell/Makefile +++ b/x11/gnome-shell/Makefile @@ -3,13 +3,13 @@ # Whom: Pawel Worach <pawel.worach@gmail.com> # # $FreeBSD$ -# $MCom: ports/x11/gnome-shell/Makefile,v 1.11 2010/03/29 11:42:11 kwm Exp $ +# $MCom: ports/x11/gnome-shell/Makefile,v 1.16 2010/11/20 15:05:25 kwm Exp $ # PORTNAME= gnome-shell -PORTVERSION= 2.29.1 +PORTVERSION= 2.31.2 PORTREVISION= 1 -CATEGORIES= x11 +CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -23,6 +23,8 @@ LIB_DEPENDS= startup-notification-1.0:${PORTSDIR}/x11/startup-notification \ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-dbus \ glxinfo:${PORTSDIR}/graphics/mesa-demos +BROKEN= Doesn't build + USE_BZIP2= yes USE_XORG= x11 xfixes sm USE_GETTEXT= yes diff --git a/x11/gnome-shell/distinfo b/x11/gnome-shell/distinfo index 088b45374d71..f32fae96ea7f 100644 --- a/x11/gnome-shell/distinfo +++ b/x11/gnome-shell/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-shell-2.29.1.tar.bz2) = dc98591ba7fe8acb92292bc0b2f9d246 -SHA256 (gnome2/gnome-shell-2.29.1.tar.bz2) = 710b863c0beea45543f8057d31b028ec85e19efeedda2b964d784d6fc1729c0b -SIZE (gnome2/gnome-shell-2.29.1.tar.bz2) = 669050 +MD5 (gnome2/gnome-shell-2.31.2.tar.bz2) = 42f593eddbe3dcc2552f8ac2ca3748b6 +SHA256 (gnome2/gnome-shell-2.31.2.tar.bz2) = cf16167cf2354f57431125b38a7b3de424c3c9d3d44627c52ee4596694ee80f2 +SIZE (gnome2/gnome-shell-2.31.2.tar.bz2) = 692948 diff --git a/x11/gnome-shell/files/patch-src_Makefile.in b/x11/gnome-shell/files/patch-src_Makefile.in deleted file mode 100644 index 592ea873a8f7..000000000000 --- a/x11/gnome-shell/files/patch-src_Makefile.in +++ /dev/null @@ -1,18 +0,0 @@ ---- src/Makefile.in.orig 2009-08-29 12:13:13.000000000 +0200 -+++ src/Makefile.in 2009-08-29 12:13:25.000000000 +0200 -@@ -492,7 +492,6 @@ libtray_la_CPPFLAGS = $(tray_cflags) - libtray_la_LDFLAGS = $(LDADD) - gnome_shell_cflags = \ - $(MUTTER_PLUGIN_CFLAGS) \ -- $(LIBGNOMEUI_CFLAGS) \ - -I$(srcdir)/tray \ - -DGETTEXT_PACKAGE=\"gnome-shell\" \ - -DLOCALEDIR=\"$(datadir)/locale\" \ -@@ -548,7 +547,6 @@ libgnome_shell_la_gir_sources = \ - libgnome_shell_la_LDFLAGS = -avoid-version -module - libgnome_shell_la_LIBADD = \ - $(MUTTER_PLUGIN_LIBS) \ -- $(LIBGNOMEUI_LIBS) \ - libbig-1.0.la \ - libgdmuser-1.0.la \ - libtray.la diff --git a/x11/gnome-shell/files/patch-src_gnome-shell-plugin.c b/x11/gnome-shell/files/patch-src_gnome-shell-plugin.c new file mode 100644 index 000000000000..90359fa33e6d --- /dev/null +++ b/x11/gnome-shell/files/patch-src_gnome-shell-plugin.c @@ -0,0 +1,26 @@ +--- src/gnome-shell-plugin.c.orig 2010-06-06 22:53:13.000000000 +0200 ++++ src/gnome-shell-plugin.c 2010-06-06 22:56:03.000000000 +0200 +@@ -38,7 +38,6 @@ + #include <gjs/gjs.h> + #include <girepository.h> + #include <gmodule.h> +-#include <malloc.h> + #include <stdlib.h> + #include <string.h> + +@@ -238,6 +237,7 @@ + malloc_statistics_callback (ShellPerfLog *perf_log, + gpointer data) + { ++#if defined(__linux__) + struct mallinfo info = mallinfo (); + + shell_perf_log_update_statistic_i (perf_log, +@@ -249,6 +249,7 @@ + shell_perf_log_update_statistic_i (perf_log, + "malloc.usedSize", + info.uordblks); ++#endif + } + + static void diff --git a/x11/gnome-shell/pkg-plist b/x11/gnome-shell/pkg-plist index 32918573d672..4d53b86016de 100644 --- a/x11/gnome-shell/pkg-plist +++ b/x11/gnome-shell/pkg-plist @@ -1,5 +1,5 @@ bin/gnome-shell -lib/gnome-shell/Big-1.0.typelib +bin/gnome-shell-clock-preferences lib/gnome-shell/Gdm-1.0.typelib lib/gnome-shell/Shell-0.1.typelib lib/gnome-shell/St-1.0.typelib @@ -7,14 +7,21 @@ lib/mutter/plugins/libgnome-shell.a lib/mutter/plugins/libgnome-shell.la lib/mutter/plugins/libgnome-shell.so share/applications/gnome-shell.desktop +share/applications/gnome-shell-clock-preferences.desktop +%%DATADIR%%/clock-preferences.ui %%DATADIR%%/images/close-black.svg %%DATADIR%%/images/magnifier.svg %%DATADIR%%/js/misc/docInfo.js %%DATADIR%%/js/misc/format.js +%%DATADIR%%/js/misc/gnomeSession.js %%DATADIR%%/js/misc/params.js +%%DATADIR%%/js/misc/telepathy.js +%%DATADIR%%/js/perf/core.js +%%DATADIR%%/js/prefs/clockPreferences.js %%DATADIR%%/js/ui/altTab.js %%DATADIR%%/js/ui/appDisplay.js %%DATADIR%%/js/ui/appFavorites.js +%%DATADIR%%/js/ui/boxpointer.js %%DATADIR%%/js/ui/calendar.js %%DATADIR%%/js/ui/chrome.js %%DATADIR%%/js/ui/dash.js @@ -26,6 +33,8 @@ share/applications/gnome-shell.desktop %%DATADIR%%/js/ui/lightbox.js %%DATADIR%%/js/ui/link.js %%DATADIR%%/js/ui/lookingGlass.js +%%DATADIR%%/js/ui/magnifier.js +%%DATADIR%%/js/ui/magnifierDBus.js %%DATADIR%%/js/ui/main.js %%DATADIR%%/js/ui/messageTray.js %%DATADIR%%/js/ui/notificationDaemon.js @@ -33,13 +42,12 @@ share/applications/gnome-shell.desktop %%DATADIR%%/js/ui/placeDisplay.js %%DATADIR%%/js/ui/panel.js %%DATADIR%%/js/ui/runDialog.js +%%DATADIR%%/js/ui/scripting.js %%DATADIR%%/js/ui/search.js %%DATADIR%%/js/ui/shellDBus.js %%DATADIR%%/js/ui/statusMenu.js -%%DATADIR%%/js/ui/sidebar.js +%%DATADIR%%/js/ui/telepathyClient.js %%DATADIR%%/js/ui/tweener.js -%%DATADIR%%/js/ui/widget.js -%%DATADIR%%/js/ui/widgetBox.js %%DATADIR%%/js/ui/windowAttentionHandler.js %%DATADIR%%/js/ui/windowManager.js %%DATADIR%%/js/ui/workspace.js @@ -97,10 +105,13 @@ share/locale/sr/LC_MESSAGES/gnome-shell.mo share/locale/sr@latin/LC_MESSAGES/gnome-shell.mo share/locale/sv/LC_MESSAGES/gnome-shell.mo share/locale/tr/LC_MESSAGES/gnome-shell.mo +share/locale/uk/LC_MESSAGES/gnome-shell.mo share/locale/vi/LC_MESSAGES/gnome-shell.mo share/locale/zh_CN/LC_MESSAGES/gnome-shell.mo @dirrm %%DATADIR%%/theme @dirrm %%DATADIR%%/js/ui +@dirrm %%DATADIR%%/js/prefs +@dirrm %%DATADIR%%/js/perf @dirrm %%DATADIR%%/js/misc @dirrm %%DATADIR%%/js @dirrm %%DATADIR%%/images |