diff options
| author | kwm <kwm@FreeBSD.org> | 2010-05-11 05:19:08 +0800 |
|---|---|---|
| committer | kwm <kwm@FreeBSD.org> | 2010-05-11 05:19:08 +0800 |
| commit | 6a2a890c5cd397f9f0287409c2aa0244d50f3573 (patch) | |
| tree | fc02bcba8bfa155b5cf452d6bafe1cb06aca4848 /x11 | |
| parent | 0e415a93a0424a4b284c88c39b19d93d80b66c8a (diff) | |
| download | freebsd-ports-gnome-6a2a890c5cd397f9f0287409c2aa0244d50f3573.tar.gz freebsd-ports-gnome-6a2a890c5cd397f9f0287409c2aa0244d50f3573.tar.zst freebsd-ports-gnome-6a2a890c5cd397f9f0287409c2aa0244d50f3573.zip | |
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
Diffstat (limited to 'x11')
81 files changed, 346 insertions, 1922 deletions
diff --git a/x11/Makefile b/x11/Makefile index eeb67e93d4ee..b16e49c84cde 100644 --- a/x11/Makefile +++ b/x11/Makefile @@ -99,7 +99,6 @@ SUBDIR += gdm SUBDIR += ggiterm SUBDIR += gir-repository-babl - SUBDIR += gir-repository-gnome-menus SUBDIR += glproto SUBDIR += gmessage SUBDIR += gmrun diff --git a/x11/avant-window-navigator-gnome/Makefile b/x11/avant-window-navigator-gnome/Makefile index 6a23d18e5864..089fd097a945 100644 --- a/x11/avant-window-navigator-gnome/Makefile +++ b/x11/avant-window-navigator-gnome/Makefile @@ -5,6 +5,7 @@ # $FreeBSD$ # +PORTREVISION= 6 AWN_DESKTOP= gnome MASTERDIR= ${.CURDIR}/../avant-window-navigator diff --git a/x11/avant-window-navigator/Makefile b/x11/avant-window-navigator/Makefile index d6cbbc34b911..e343bc6efaee 100644 --- a/x11/avant-window-navigator/Makefile +++ b/x11/avant-window-navigator/Makefile @@ -7,7 +7,7 @@ PORTNAME= avant-window-navigator PORTVERSION= 0.3.2.1 -PORTREVISION= 5 +PORTREVISION?= 5 CATEGORIES= x11 MASTER_SITES= http://launchpadlibrarian.net/26374006/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index 09a31ce38e12..1a0ccc3e8baa 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gdm/Makefile,v 1.164 2009/11/28 05:59:03 mezz Exp $ +# $MCom: ports/x11/gdm/Makefile,v 1.174 2010/04/27 14:58:59 kwm Exp $ # PORTNAME= gdm -PORTVERSION= 2.28.2 -PORTREVISION= 3 +PORTVERSION= 2.30.2 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -21,7 +20,8 @@ BUILD_DEPENDS= zenity:${PORTSDIR}/x11/zenity \ LIB_DEPENDS= ck-connector.0:${PORTSDIR}/sysutils/consolekit \ polkit-gtk-1.0:${PORTSDIR}/sysutils/polkit-gnome \ execinfo:${PORTSDIR}/devel/libexecinfo \ - hal.1:${PORTSDIR}/sysutils/hal \ + upower-glib.1:${PORTSDIR}/sysutils/upower \ + xklavier.12:${PORTSDIR}/x11/libxklavier \ canberra-gtk.0:${PORTSDIR}/audio/libcanberra RUN_DEPENDS= zenity:${PORTSDIR}/x11/zenity \ ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon \ @@ -39,7 +39,7 @@ INSTALLS_ICONS= yes USE_RC_SUBR= gdm USE_GNOME_SUBR= yes USE_GMAKE= yes -USE_GNOME= gnomehack intlhack gnomehier gconf2 libglade2 librsvg2 \ +USE_GNOME= gnomehack intlhack gnomehier gconf2 librsvg2 \ gnomedocutils gnomeprefix gnomepanel GCONF_SCHEMAS= gdm-simple-greeter.schemas GNU_CONFIGURE= yes diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo index 7a19015ef0f2..0081bb351e9f 100644 --- a/x11/gdm/distinfo +++ b/x11/gdm/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gdm-2.28.2.tar.bz2) = 9607c6bac31c9d8bd3446e66a4576c2e -SHA256 (gnome2/gdm-2.28.2.tar.bz2) = 0165b4bf70e4a6d41d9e42877840805890c438bd655805b961e51adccbd9602a -SIZE (gnome2/gdm-2.28.2.tar.bz2) = 2283246 +MD5 (gnome2/gdm-2.30.2.tar.bz2) = ba35f9f750b50be572952195989df2c5 +SHA256 (gnome2/gdm-2.30.2.tar.bz2) = 884f4816a78f8f1eece8f1468f19dc01c5350d4a3513d3c0e854f45f870c1ec5 +SIZE (gnome2/gdm-2.30.2.tar.bz2) = 2381359 diff --git a/x11/gdm/files/gdm.in b/x11/gdm/files/gdm.in index 8c1de22a8dd9..d4f41552daa5 100644 --- a/x11/gdm/files/gdm.in +++ b/x11/gdm/files/gdm.in @@ -1,9 +1,9 @@ #!/bin/sh # $FreeBSD$ -# $MCom: ports/x11/gdm/files/gdm.in,v 1.38 2009/09/26 13:42:01 marcus Exp $ +# $MCom: ports/x11/gdm/files/gdm.in,v 1.43 2010/04/17 19:06:00 marcus Exp $ # PROVIDE: gdm -# REQUIRE: LOGIN cleanvar moused syscons dbus hald +# REQUIRE: LOGIN cleanvar moused syscons dbus # # Add the following to /etc/rc.conf to start GDM at boot time: # diff --git a/x11/gdm/files/gdm.pam.in b/x11/gdm/files/gdm.pam.in index 1f16ea8e8ca2..3f9ebd29b37a 100644 --- a/x11/gdm/files/gdm.pam.in +++ b/x11/gdm/files/gdm.pam.in @@ -1,6 +1,6 @@ # # $FreeBSD$ -# $MCom: ports/x11/gdm/files/gdm.pam.in,v 1.8 2009/09/26 13:42:01 marcus Exp $ +# $MCom: ports/x11/gdm/files/gdm.pam.in,v 1.11 2010/03/16 19:33:11 mezz Exp $ # # PAM configuration for the "gdm" service # diff --git a/x11/gdm/files/patch-common_gdm-address.c b/x11/gdm/files/patch-common_gdm-address.c index a827d4b6d1b6..9a4e620ba8d3 100644 --- a/x11/gdm/files/patch-common_gdm-address.c +++ b/x11/gdm/files/patch-common_gdm-address.c @@ -1,5 +1,5 @@ ---- common/gdm-address.c.orig 2009-02-19 21:45:13.000000000 -0500 -+++ common/gdm-address.c 2009-05-11 02:38:17.000000000 -0400 +--- common/gdm-address.c.orig 2010-01-13 17:32:59.000000000 +0000 ++++ common/gdm-address.c 2010-01-17 12:55:48.000000000 +0000 @@ -29,6 +29,8 @@ #include <stropts.h> #endif @@ -25,21 +25,3 @@ #include <glib-object.h> -@@ -206,7 +208,7 @@ gdm_address_get_hostname (GdmAddress *ad - - host [0] = '\0'; - res = getnameinfo ((const struct sockaddr *)address->ss, -- sizeof (struct sockaddr_storage), -+ gdm_sockaddr_len (address->ss), - host, sizeof (host), - NULL, 0, - 0); -@@ -245,7 +247,7 @@ gdm_address_get_numeric_info (GdmAddress - host [0] = '\0'; - serv [0] = '\0'; - res = getnameinfo ((const struct sockaddr *)address->ss, -- sizeof (struct sockaddr_storage), -+ gdm_sockaddr_len (address->ss), - host, sizeof (host), - serv, sizeof (serv), - NI_NUMERICHOST | NI_NUMERICSERV); diff --git a/x11/gdm/files/patch-configure b/x11/gdm/files/patch-configure deleted file mode 100644 index 220aa1cb6ac2..000000000000 --- a/x11/gdm/files/patch-configure +++ /dev/null @@ -1,138 +0,0 @@ ---- configure.orig 2009-09-22 12:26:34.000000000 +0200 -+++ configure 2009-09-22 12:29:51.000000000 +0200 -@@ -22494,10 +22494,12 @@ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION - gobject-2.0 >= \$GLIB_REQUIRED_VERSION - gio-2.0 >= \$GLIB_REQUIRED_VERSION -+ hal - \"") >&5 - ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gobject-2.0 >= $GLIB_REQUIRED_VERSION - gio-2.0 >= $GLIB_REQUIRED_VERSION -+ hal - ") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -@@ -22519,10 +22521,12 @@ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION - gobject-2.0 >= \$GLIB_REQUIRED_VERSION - gio-2.0 >= \$GLIB_REQUIRED_VERSION -+ hal - \"") >&5 - ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gobject-2.0 >= $GLIB_REQUIRED_VERSION - gio-2.0 >= $GLIB_REQUIRED_VERSION -+ hal - ") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -@@ -22530,6 +22534,7 @@ - pkg_cv_COMMON_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gobject-2.0 >= $GLIB_REQUIRED_VERSION - gio-2.0 >= $GLIB_REQUIRED_VERSION -+ hal - " 2>/dev/null` - else - pkg_failed=yes -@@ -22551,11 +22556,13 @@ - COMMON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gobject-2.0 >= $GLIB_REQUIRED_VERSION - gio-2.0 >= $GLIB_REQUIRED_VERSION -+ hal - " 2>&1` - else - COMMON_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gobject-2.0 >= $GLIB_REQUIRED_VERSION - gio-2.0 >= $GLIB_REQUIRED_VERSION -+ hal - " 2>&1` - fi - # Put the nasty error message in config.log where it belongs -@@ -22564,6 +22571,7 @@ - { { echo "$as_me:$LINENO: error: Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gobject-2.0 >= $GLIB_REQUIRED_VERSION - gio-2.0 >= $GLIB_REQUIRED_VERSION -+ hal - ) were not met: - - $COMMON_PKG_ERRORS -@@ -22578,6 +22586,7 @@ - echo "$as_me: error: Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gobject-2.0 >= $GLIB_REQUIRED_VERSION - gio-2.0 >= $GLIB_REQUIRED_VERSION -+ hal - ) were not met: - - $COMMON_PKG_ERRORS -@@ -22634,10 +22643,12 @@ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION - gobject-2.0 >= \$GLIB_REQUIRED_VERSION - gio-2.0 >= \$GLIB_REQUIRED_VERSION -+ hal - \"") >&5 - ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gobject-2.0 >= $GLIB_REQUIRED_VERSION - gio-2.0 >= $GLIB_REQUIRED_VERSION -+ hal - ") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -@@ -22645,6 +22656,7 @@ - pkg_cv_DAEMON_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gobject-2.0 >= $GLIB_REQUIRED_VERSION - gio-2.0 >= $GLIB_REQUIRED_VERSION -+ hal - " 2>/dev/null` - else - pkg_failed=yes -@@ -22659,10 +22671,12 @@ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION - gobject-2.0 >= \$GLIB_REQUIRED_VERSION - gio-2.0 >= \$GLIB_REQUIRED_VERSION -+ hal - \"") >&5 - ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gobject-2.0 >= $GLIB_REQUIRED_VERSION - gio-2.0 >= $GLIB_REQUIRED_VERSION -+ hal - ") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -@@ -22670,6 +22684,7 @@ - pkg_cv_DAEMON_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gobject-2.0 >= $GLIB_REQUIRED_VERSION - gio-2.0 >= $GLIB_REQUIRED_VERSION -+ hal - " 2>/dev/null` - else - pkg_failed=yes -@@ -22691,11 +22706,13 @@ - DAEMON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gobject-2.0 >= $GLIB_REQUIRED_VERSION - gio-2.0 >= $GLIB_REQUIRED_VERSION -+ hal - " 2>&1` - else - DAEMON_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gobject-2.0 >= $GLIB_REQUIRED_VERSION - gio-2.0 >= $GLIB_REQUIRED_VERSION -+ hal - " 2>&1` - fi - # Put the nasty error message in config.log where it belongs -@@ -22704,6 +22721,7 @@ - { { echo "$as_me:$LINENO: error: Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gobject-2.0 >= $GLIB_REQUIRED_VERSION - gio-2.0 >= $GLIB_REQUIRED_VERSION -+ hal - ) were not met: - - $DAEMON_PKG_ERRORS -@@ -22718,6 +22736,7 @@ - echo "$as_me: error: Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gobject-2.0 >= $GLIB_REQUIRED_VERSION - gio-2.0 >= $GLIB_REQUIRED_VERSION -+ hal - ) were not met: - - $DAEMON_PKG_ERRORS diff --git a/x11/gdm/files/patch-daemon-gdm-xdmcp-display-factory.c b/x11/gdm/files/patch-daemon-gdm-xdmcp-display-factory.c index 692c275167b8..ede7f2c2f8b6 100644 --- a/x11/gdm/files/patch-daemon-gdm-xdmcp-display-factory.c +++ b/x11/gdm/files/patch-daemon-gdm-xdmcp-display-factory.c @@ -1,5 +1,5 @@ ---- daemon/gdm-xdmcp-display-factory.c.orig 2009-07-20 03:09:09.000000000 +0200 -+++ daemon/gdm-xdmcp-display-factory.c 2009-07-20 09:54:25.000000000 +0200 +--- daemon/gdm-xdmcp-display-factory.c.orig 2009-12-21 17:36:30.000000000 +0100 ++++ daemon/gdm-xdmcp-display-factory.c 2009-12-26 23:26:24.000000000 +0100 @@ -35,6 +35,7 @@ #include <netdb.h> #include <arpa/inet.h> @@ -8,7 +8,7 @@ #ifdef HAVE_SYS_SOCKIO_H #include <sys/sockio.h> #endif -@@ -76,7 +77,7 @@ int deny_severity = LOG_WARNING; +@@ -76,7 +77,7 @@ #define DEFAULT_USE_MULTICAST FALSE #define DEFAULT_MULTICAST_ADDRESS "ff02::1" #define DEFAULT_HONOR_INDIRECT TRUE @@ -17,7 +17,7 @@ #define DEFAULT_MAX_DISPLAYS 16 #define DEFAULT_MAX_PENDING_DISPLAYS 4 #define DEFAULT_MAX_WAIT 30 -@@ -404,6 +405,11 @@ static int +@@ -404,6 +405,11 @@ create_socket (struct addrinfo *ai) { int sock; @@ -29,7 +29,7 @@ sock = socket (ai->ai_family, ai->ai_socktype, ai->ai_protocol); if (sock < 0) { -@@ -411,6 +417,16 @@ create_socket (struct addrinfo *ai) +@@ -411,6 +417,16 @@ return sock; } @@ -46,93 +46,3 @@ if (bind (sock, ai->ai_addr, ai->ai_addrlen) < 0) { g_warning ("bind: %s", g_strerror (errno)); close (sock); -@@ -835,7 +851,7 @@ gdm_xdmcp_send_willing (GdmXdmcpDisplayF - XdmcpFlush (factory->priv->socket_fd, - &factory->priv->buf, - (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address), -- (int)sizeof (struct sockaddr_storage)); -+ (int)gdm_sockaddr_len (gdm_address_peek_sockaddr_storage (address))); - - g_free (status.data); - } -@@ -879,7 +895,7 @@ gdm_xdmcp_send_unwilling (GdmXdmcpDispla - XdmcpFlush (factory->priv->socket_fd, - &factory->priv->buf, - (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address), -- (int)sizeof (struct sockaddr_storage)); -+ (int)gdm_sockaddr_len (gdm_address_peek_sockaddr_storage (address))); - - last_time = time (NULL); - } -@@ -988,7 +1004,7 @@ gdm_xdmcp_send_forward_query (GdmXdmcpDi - XdmcpFlush (factory->priv->socket_fd, - &factory->priv->buf, - (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (ic->chosen_address), -- (int)sizeof (struct sockaddr_storage)); -+ (int)gdm_sockaddr_len (gdm_address_peek_sockaddr_storage (ic->chosen_address))); - - g_free (port.data); - g_free (addr.data); -@@ -1691,7 +1707,7 @@ gdm_xdmcp_really_send_managed_forward (G - XdmcpFlush (factory->priv->socket_fd, - &factory->priv->buf, - (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address), -- (int)sizeof (struct sockaddr_storage)); -+ (int)gdm_sockaddr_len (gdm_address_peek_sockaddr_storage (address))); - - g_free (addr.data); - } -@@ -1772,7 +1788,7 @@ gdm_xdmcp_send_got_managed_forward (GdmX - XdmcpFlush (factory->priv->socket_fd, - &factory->priv->buf, - (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address), -- (int)sizeof (struct sockaddr_storage)); -+ (int)gdm_sockaddr_len (gdm_address_peek_sockaddr_storage (address))); - } - - static gboolean -@@ -1945,7 +1961,7 @@ gdm_xdmcp_send_decline (GdmXdmcpDisplayF - XdmcpFlush (factory->priv->socket_fd, - &factory->priv->buf, - (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address), -- (int)sizeof (struct sockaddr_storage)); -+ (int)gdm_sockaddr_len (gdm_address_peek_sockaddr_storage (address))); - - /* Send MANAGED_FORWARD to indicate that the connection - * reached some sort of resolution */ -@@ -2093,7 +2109,7 @@ gdm_xdmcp_send_accept (GdmXdmcpDisplayFa - XdmcpFlush (factory->priv->socket_fd, - &factory->priv->buf, - (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address), -- (int)sizeof (struct sockaddr_storage)); -+ (int)gdm_sockaddr_len (gdm_address_peek_sockaddr_storage (address))); - - host = NULL; - gdm_address_get_numeric_info (address, &host, NULL); -@@ -2424,7 +2440,7 @@ gdm_xdmcp_send_failed (GdmXdmcpDisplayFa - XdmcpFlush (factory->priv->socket_fd, - &factory->priv->buf, - (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address), -- (int)sizeof (struct sockaddr_storage)); -+ (int)gdm_sockaddr_len (gdm_address_peek_sockaddr_storage (address))); - } - - static void -@@ -2448,7 +2464,7 @@ gdm_xdmcp_send_refuse (GdmXdmcpDisplayFa - XdmcpFlush (factory->priv->socket_fd, - &factory->priv->buf, - (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address), -- (int)sizeof (struct sockaddr_storage)); -+ (int)gdm_sockaddr_len (gdm_address_peek_sockaddr_storage (address))); - - /* - * This was from a forwarded query quite apparently so -@@ -2719,7 +2735,7 @@ gdm_xdmcp_send_alive (GdmXdmcpDisplayFac - XdmcpFlush (factory->priv->socket_fd, - &factory->priv->buf, - (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address), -- (int)sizeof (struct sockaddr_storage)); -+ (int)gdm_sockaddr_len (gdm_address_peek_sockaddr_storage (address))); - } - - static void diff --git a/x11/gdm/files/patch-gui_simple-chooser_gdm-host-chooser-widget.c b/x11/gdm/files/patch-gui_simple-chooser_gdm-host-chooser-widget.c index 340e955b3832..b7ed323184f3 100644 --- a/x11/gdm/files/patch-gui_simple-chooser_gdm-host-chooser-widget.c +++ b/x11/gdm/files/patch-gui_simple-chooser_gdm-host-chooser-widget.c @@ -1,38 +1,11 @@ ---- gui/simple-chooser/gdm-host-chooser-widget.c.orig 2009-02-19 21:45:09.000000000 -0500 -+++ gui/simple-chooser/gdm-host-chooser-widget.c 2009-05-11 02:34:20.000000000 -0400 -@@ -311,7 +311,7 @@ do_ping (GdmHostChooserWidget *widget, - res = XdmcpFlush (widget->priv->socket_fd, - &widget->priv->broadcast_buf, - (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address), -- (int)sizeof (struct sockaddr_storage)); -+ (int)gdm_sockaddr_len (gdm_address_peek_sockaddr_storage (address))); - if (! res) { - g_warning ("Unable to flush the XDMCP broadcast packet: %s", g_strerror (errno)); - } -@@ -328,7 +328,7 @@ do_ping (GdmHostChooserWidget *widget, - res = XdmcpFlush (widget->priv->socket_fd, - &widget->priv->query_buf, - (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address), -- (int)sizeof (struct sockaddr_storage)); -+ (int)gdm_sockaddr_len (gdm_address_peek_sockaddr_storage (address))); - if (! res) { - g_warning ("Unable to flush the XDMCP query packet"); - } -@@ -442,7 +442,7 @@ find_broadcast_addresses (GdmHostChooser - /* paranoia */ - ifreq.ifr_name[sizeof (ifreq.ifr_name) - 1] = '\0'; - -- if (ioctl (sock, SIOCGIFFLAGS, &ifreq) < 0) { -+ if ((ioctl (sock, SIOCGIFFLAGS, &ifreq) < 0) && (errno != ENXIO)) { - g_warning ("Could not get SIOCGIFFLAGS for %s", ifr[i].ifr_name); - } - -@@ -542,6 +542,8 @@ xdmcp_init (GdmHostChooserWidget *widget +--- gui/simple-chooser/gdm-host-chooser-widget.c.orig 2010-01-13 14:29:00.000000000 +0000 ++++ gui/simple-chooser/gdm-host-chooser-widget.c 2010-01-17 13:04:14.000000000 +0000 +@@ -543,6 +543,8 @@ xdmcp_init (GdmHostChooserWidget *widget #ifdef ENABLE_IPV6 widget->priv->socket_fd = socket (AF_INET6, SOCK_DGRAM, 0); if (widget->priv->socket_fd != -1) { -+ int off = 0; -+ setsockopt(widget->priv->socket_fd, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&off, sizeof (off)); ++ int off = 0; ++ setsockopt(widget->priv->socket_fd, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&off, sizeof (off)); widget->priv->have_ipv6 = TRUE; } #endif diff --git a/x11/gdm/files/patch-gui_simple-greeter_gdm-greeter-login-window.c b/x11/gdm/files/patch-gui_simple-greeter_gdm-greeter-login-window.c deleted file mode 100644 index 55f6d7ec8bd2..000000000000 --- a/x11/gdm/files/patch-gui_simple-greeter_gdm-greeter-login-window.c +++ /dev/null @@ -1,155 +0,0 @@ ---- gui/simple-greeter/gdm-greeter-login-window.c.orig 2009-10-24 20:05:24.000000000 -0400 -+++ gui/simple-greeter/gdm-greeter-login-window.c 2009-10-24 20:11:02.000000000 -0400 -@@ -56,10 +56,6 @@ - #include <dbus/dbus-glib.h> - #include <dbus/dbus-glib-lowlevel.h> - --#ifdef HAVE_DEVICEKIT_POWER --#include <devkit-power-gobject/devicekit-power.h> --#endif -- - #include "gdm-settings-client.h" - #include "gdm-settings-keys.h" - #include "gdm-profile.h" -@@ -83,6 +79,10 @@ - #define CK_SEAT_INTERFACE "org.freedesktop.ConsoleKit.Seat" - #define CK_SESSION_INTERFACE "org.freedesktop.ConsoleKit.Session" - -+#define GPM_DBUS_NAME "org.freedesktop.PowerManagement" -+#define GPM_DBUS_PATH "/org/freedesktop/PowerManagement" -+#define GPM_DBUS_INTERFACE "org.freedesktop.PowerManagement" -+ - #define GLADE_XML_FILE "gdm-greeter-login-window.glade" - - #define KEY_GREETER_DIR "/apps/gdm/simple-greeter" -@@ -477,22 +477,46 @@ adjust_other_login_visibility(GdmGreeter - } - } - --#ifdef HAVE_DEVICEKIT_POWER - static gboolean - can_suspend (GdmGreeterLoginWindow *login_window) - { -- gboolean ret; -- DkpClient *dkp_client; -+ DBusGConnection *connection; -+ DBusGProxy *proxy; -+ GError *error; -+ gboolean ret; -+ gboolean res; -+ -+ error = NULL; -+ connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error); -+ if (error != NULL) { -+ g_warning ("Couldn't connect to power manager: %s", error->message); -+ g_error_free (error); -+ return FALSE; -+ } -+ proxy = dbus_g_proxy_new_for_name (connection, -+ GPM_DBUS_NAME, -+ GPM_DBUS_PATH, -+ GPM_DBUS_INTERFACE); -+ -+ ret = FALSE; -+ -+ res = dbus_g_proxy_call (proxy, "CanSuspend", -+ &error, -+ G_TYPE_INVALID, -+ G_TYPE_BOOLEAN, -+ &ret, -+ G_TYPE_INVALID); -+ if (!res) { -+ if (error != NULL) { -+ g_warning ("Could not ask power manager if user can suspend: %s", -+ error->message); -+ g_error_free (error); -+ } -+ ret = FALSE; -+ } - -- /* use DeviceKit-power to get data */ -- dkp_client = dkp_client_new (); -- g_object_get (dkp_client, -- "can-suspend", &ret, -- NULL); -- g_object_unref (dkp_client); -- return ret; -+ return ret; - } --#endif - - static void - remove_sensitize_power_buttons_timeout (GdmGreeterLoginWindow *login_window) -@@ -544,11 +568,7 @@ switch_mode (GdmGreeterLoginWindow *logi - - show_restart_buttons = get_show_restart_buttons (login_window); - --#ifdef HAVE_DEVICEKIT_POWER - show_suspend_button = can_suspend (login_window); --#else -- show_suspend_button = FALSE; --#endif - - /* we want to run this even if we're supposed to - be in the mode already so that we reset everything -@@ -634,25 +654,39 @@ do_disconnect (GdmGreeterLoginWindow *lo - gtk_main_quit (); - } - --#ifdef HAVE_DEVICEKIT_POWER - static void - do_suspend (GdmGreeterLoginWindow *login_window) - { -- gboolean ret; -- DkpClient *dkp_client; -- GError *error = NULL; -- -- /* use DeviceKit-power to get data */ -- dkp_client = dkp_client_new (); -- ret = dkp_client_suspend (dkp_client, &error); -- if (!ret) { -+ GError *error; -+ DBusGConnection *connection; -+ DBusGProxy *proxy; -+ -+ g_debug ("GdmGreeterLoginWindow: Suspend button clicked"); -+ -+ error = NULL; -+ connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error); -+ if (error != NULL) { - g_warning ("Couldn't suspend: %s", error->message); - g_error_free (error); - return; - } -- g_object_unref (dkp_client); -+ proxy = dbus_g_proxy_new_for_name (connection, -+ GPM_DBUS_NAME, -+ GPM_DBUS_PATH, -+ GPM_DBUS_INTERFACE); -+ error = NULL; -+ dbus_g_proxy_call (proxy, -+ "Suspend", -+ &error, -+ G_TYPE_INVALID, -+ G_TYPE_INVALID); -+ if (error != NULL) { -+ g_warning ("Couldn't suspend: %s", error->message); -+ g_error_free (error); -+ return; -+ } -+ g_object_unref (proxy); - } --#endif - - static void - delete_entry_text (GtkWidget *entry) -@@ -971,9 +1005,7 @@ static void - suspend_button_clicked (GtkButton *button, - GdmGreeterLoginWindow *login_window) - { --#ifdef HAVE_DEVICEKIT_POWER - do_suspend (login_window); --#endif - } - - diff --git a/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c b/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c index 83a029a19632..cd8a0f496b5d 100644 --- a/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c +++ b/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c @@ -1,27 +1,11 @@ ---- gui/simple-greeter/gdm-languages.c.orig 2009-07-20 03:09:09.000000000 +0200 -+++ gui/simple-greeter/gdm-languages.c 2009-07-20 10:02:41.000000000 +0200 -@@ -168,13 +168,13 @@ gdm_parse_language_name (const char *nam - *codesetp = NULL; - } - -- if (*codesetp != NULL) { -+/* if (*codesetp != NULL) { - char *codeset; - - codeset = normalize_codeset (*codesetp); - g_free (*codesetp); - *codesetp = codeset; -- } -+ }*/ - } - - if (modifierp != NULL) { -@@ -352,7 +352,7 @@ add_locale (const char *language_name) - if (language_name_is_utf8 (language_name)) { +--- gui/simple-greeter/gdm-languages.c.orig 2010-01-13 16:20:08.000000000 +0000 ++++ gui/simple-greeter/gdm-languages.c 2010-01-17 13:10:50.000000000 +0000 +@@ -365,7 +365,7 @@ add_locale (const char *language_name, + if (is_utf8) { name = g_strdup (language_name); - } else { + } else if (utf8_only) { - name = g_strdup_printf ("%s.utf8", language_name); + name = g_strdup_printf ("%s.UTF-8", language_name); - if (!language_name_is_utf8 (name)) { - g_free (name); + language_name_get_codeset_details (name, NULL, &is_utf8); + if (is_utf8) { diff --git a/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c b/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c index d0a5d73f5e47..b0b8ed37d060 100644 --- a/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c +++ b/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c @@ -1,6 +1,6 @@ ---- gui/simple-greeter/gdm-user-manager.c.orig 2009-09-21 16:05:27.000000000 -0400 -+++ gui/simple-greeter/gdm-user-manager.c 2009-10-14 12:58:37.000000000 -0400 -@@ -65,6 +65,8 @@ +--- gui/simple-greeter/gdm-user-manager.c.orig 2009-12-21 17:36:30.000000000 +0100 ++++ gui/simple-greeter/gdm-user-manager.c 2009-12-27 22:34:26.000000000 +0100 +@@ -66,6 +66,8 @@ #ifdef __sun #define DEFAULT_MINIMAL_UID 100 @@ -9,7 +9,7 @@ #else #define DEFAULT_MINIMAL_UID 500 #endif -@@ -1366,17 +1368,24 @@ reload_passwd (GdmUserManager *manager) +@@ -1414,17 +1416,24 @@ reload_passwd (GdmUserManager *manager) GSList *new_users; GSList *list; GSList *dup; @@ -34,19 +34,23 @@ g_hash_table_foreach (manager->priv->users, listify_hash_values_hfunc, &old_users); g_slist_foreach (old_users, (GFunc) g_object_ref, NULL); -@@ -1390,7 +1399,11 @@ reload_passwd (GdmUserManager *manager) - } - } +@@ -1443,9 +1452,15 @@ reload_passwd (GdmUserManager *manager) + } else { + g_debug ("GdmUserManager: include_all is TRUE"); +#ifdef __FreeBSD__ -+ for (pwent = getpwent (); pwent != NULL; pwent = getpwent ()) { ++ for (pwent = getpwent (); ++ pwent != NULL; ++ pwent = getpwent()) { +#else - for (pwent = fgetpwent (fp); pwent != NULL; pwent = fgetpwent (fp)) { + for (pwent = fgetpwent (fp); + pwent != NULL; + pwent = fgetpwent (fp)) { +#endif - GdmUser *user; + GdmUser *user; - user = NULL; -@@ -1461,7 +1474,11 @@ reload_passwd (GdmUserManager *manager) + user = NULL; +@@ -1521,7 +1536,11 @@ reload_passwd (GdmUserManager *manager) out: /* Cleanup */ diff --git a/x11/gdm/files/patch-gui_user-switch-applet_Makefile.in b/x11/gdm/files/patch-gui_user-switch-applet_Makefile.in new file mode 100644 index 000000000000..d14791f00d06 --- /dev/null +++ b/x11/gdm/files/patch-gui_user-switch-applet_Makefile.in @@ -0,0 +1,11 @@ +--- gui/user-switch-applet/Makefile.in.orig 2010-03-20 15:19:16.000000000 -0500 ++++ gui/user-switch-applet/Makefile.in 2010-03-20 15:20:28.000000000 -0500 +@@ -324,7 +324,7 @@ + -DLIBDIR=\""$(libdir)"\" \ + -DDATADIR=\""$(datadir)"\" \ + -DSYSCONFDIR=\""$(sysconfdir)"\" \ +- -DLIBLOCALEDIR=\""$(prefix)/lib/locale"\" \ ++ -DLIBLOCALEDIR=\""/usr/share/locale"\" \ + -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DGLADEDIR=\""$(pkgdatadir)"\" \ + -DLIBEXECDIR=\""$(libexecdir)"\" \ diff --git a/x11/gdm/files/patch-hal-keyboard b/x11/gdm/files/patch-hal-keyboard deleted file mode 100644 index 904f1cdaccaa..000000000000 --- a/x11/gdm/files/patch-hal-keyboard +++ /dev/null @@ -1,104 +0,0 @@ ---- daemon/gdm-session-direct.c.orig 2009-07-20 03:09:09.000000000 +0200 -+++ daemon/gdm-session-direct.c 2009-07-20 10:14:45.000000000 +0200 -@@ -45,6 +45,8 @@ - #include <dbus/dbus-glib.h> - #include <dbus/dbus-glib-lowlevel.h> - -+#include <libhal.h> -+ - #include "gdm-session-direct.h" - #include "gdm-session.h" - #include "gdm-session-private.h" -@@ -597,14 +599,66 @@ get_default_language_name (GdmSessionDir - return setlocale (LC_MESSAGES, NULL); - } - -+static char * -+get_system_default_layout (GdmSessionDirect *session) -+{ -+ DBusConnection *connection; -+ LibHalContext *ctx; -+ char **devices; -+ int n_devices; -+ char *layout; -+ char *result; -+ -+ result = NULL; -+ -+ connection = dbus_g_connection_get_connection (session->priv->connection); -+ ctx = libhal_ctx_new (); -+ libhal_ctx_set_dbus_connection (ctx, connection); -+ -+ if (!libhal_ctx_init (ctx, NULL)) { -+ goto out; -+ } -+ -+ devices = libhal_find_device_by_capability (ctx, -+ "input.keyboard", -+ &n_devices, -+ NULL); -+ if (n_devices > 0) { -+ layout = libhal_device_get_property_string (ctx, -+ devices[0], -+ "input.x11_options.XkbLayout", -+ NULL); -+ if (!layout) { -+ layout = libhal_device_get_property_string (ctx, -+ devices[0], -+ "input.xkb.layout", -+ NULL); -+ } -+ result = g_strdup (layout); -+ libhal_free_string (layout); -+ } -+ -+ libhal_free_string_array (devices); -+ -+ libhal_ctx_shutdown (ctx, NULL); -+ libhal_ctx_free (ctx); -+ -+out: -+ if (!result) { -+ result = g_strdup ("us"); -+ } -+ -+ return result; -+} -+ - static const char * - get_default_layout_name (GdmSessionDirect *session) - { -- if (session->priv->saved_layout != NULL) { -- return session->priv->saved_layout; -+ if (!session->priv->saved_layout) { -+ session->priv->saved_layout = get_system_default_layout (session); - } - -- return "us"; -+ return session->priv->saved_layout; - } - - static char * -@@ -1953,8 +2007,8 @@ setup_session_environment (GdmSessionDir - "GDM_LANG", - get_language_name (session)); - -- if (strcmp (get_layout_name (session), -- get_default_layout_name (session)) == 0) { -+ if (g_strcmp0 (get_layout_name (session), -+ get_default_layout_name (session)) != 0) { - gdm_session_direct_set_environment_variable (session, - "GDM_KEYBOARD_LAYOUT", - get_layout_name (session)); ---- daemon/gdm-session-settings.c.orig 2009-05-19 17:18:12.000000000 +0200 -+++ daemon/gdm-session-settings.c 2009-07-20 10:10:15.000000000 +0200 -@@ -149,8 +149,7 @@ gdm_session_settings_set_layout_name (Gd - { - g_return_if_fail (GDM_IS_SESSION_SETTINGS (settings)); - -- if (settings->priv->layout_name == NULL || -- strcmp (settings->priv->layout_name, layout_name) != 0) { -+ if (g_strcmp0 (settings->priv->layout_name, layout_name) != 0) { - settings->priv->layout_name = g_strdup (layout_name); - g_object_notify (G_OBJECT (settings), "layout-name"); - } diff --git a/x11/gdm/files/patch-hal-keyboard.2 b/x11/gdm/files/patch-hal-keyboard.2 deleted file mode 100644 index a0a84216cc29..000000000000 --- a/x11/gdm/files/patch-hal-keyboard.2 +++ /dev/null @@ -1,40 +0,0 @@ ---- daemon/gdm-session-direct.c.orig 2009-12-02 15:15:33.000000000 +0100 -+++ daemon/gdm-session-direct.c 2009-12-02 15:15:41.000000000 +0100 -@@ -608,6 +608,7 @@ - char **devices; - int n_devices; - char *layout; -+ char *variant; - char *result; - - result = NULL; -@@ -635,8 +636,26 @@ - "input.xkb.layout", - NULL); - } -- result = g_strdup (layout); -+ -+ variant = libhal_device_get_property_string (ctx, -+ devices[0], -+ "input.x11_options.XkbVariant", -+ NULL); -+ -+ if (!variant) { -+ variant = libhal_device_get_property_string (ctx, -+ devices[0], -+ "input.xkb.variant", -+ NULL); -+ } -+ -+ if(layout && variant) -+ result = g_strdup_printf("%s\t%s", layout, variant); -+ else -+ result = g_strdup (layout); -+ - libhal_free_string (layout); -+ libhal_free_string (variant); - } - - libhal_free_string_array (devices); - - diff --git a/x11/gdm/pkg-install b/x11/gdm/pkg-install index 97ae6b4832be..376987eda0e9 100644 --- a/x11/gdm/pkg-install +++ b/x11/gdm/pkg-install @@ -3,15 +3,15 @@ case $2 in POST-INSTALL) USER=gdm - GROUP=${USER} + GROUP=gdm CHMOD=/bin/chmod CHOWN=/usr/sbin/chown MKDIR=/bin/mkdir ${MKDIR} -p /var/gdm ${MKDIR} -p /var/log/gdm - ${CHMOD} 0755 /var/log/gdm - ${CHOWN} root:wheel /var/log/gdm + ${CHMOD} 1770 /var/log/gdm + ${CHOWN} ${USER}:${GROUP} /var/log/gdm ${CHOWN} -R root:${GROUP} /var/gdm ${CHMOD} 1770 /var/gdm ${MKDIR} -p /var/run/gdm diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist index a10f0b9db4ab..97705242ebaf 100644 --- a/x11/gdm/pkg-plist +++ b/x11/gdm/pkg-plist @@ -38,7 +38,8 @@ sbin/gdm-stop %%DATADIR%%/autostart/LoginWindow/polkit-gnome-authentication-agent-1.desktop %%DATADIR%%/gconf.path %%DATADIR%%/gdb-cmd -%%DATADIR%%/gdm-greeter-login-window.glade +%%DATADIR%%/gdm-greeter-login-window.ui +%%DATADIR%%/locale.alias %%DATADIR%%/session-setup.entries share/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml share/gnome/help/gdm/C/gdm.xml @@ -82,6 +83,7 @@ share/locale/dz/LC_MESSAGES/gdm.mo share/locale/el/LC_MESSAGES/gdm.mo share/locale/en_CA/LC_MESSAGES/gdm.mo share/locale/en_GB/LC_MESSAGES/gdm.mo +share/locale/en@shaw/LC_MESSAGES/gdm.mo share/locale/eo/LC_MESSAGES/gdm.mo share/locale/es/LC_MESSAGES/gdm.mo share/locale/et/LC_MESSAGES/gdm.mo @@ -228,7 +230,6 @@ share/pixmaps/nohost.png @dirrmtry etc/gdm @dirrmtry etc/dm/Sessions @dirrmtry etc/dm -@dirrmtry sbin @dirrmtry share/log/gdm @dirrmtry share/log @unexec /bin/rm -rf /var/gdm 2>/dev/null || /usr/bin/true @@ -244,8 +245,6 @@ share/pixmaps/nohost.png @dirrmtry share/locale/xh @dirrmtry share/locale/uz@cyrillic/LC_MESSAGES @dirrmtry share/locale/uz@cyrillic -@dirrmtry share/locale/uz/LC_MESSAGES -@dirrmtry share/locale/uz @dirrmtry share/locale/te/LC_MESSAGES @dirrmtry share/locale/te @dirrmtry share/locale/sr@latin/LC_MESSAGES @@ -278,6 +277,8 @@ share/pixmaps/nohost.png @dirrmtry share/locale/hy @dirrmtry share/locale/fur/LC_MESSAGES @dirrmtry share/locale/fur +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/crh/LC_MESSAGES diff --git a/x11/gir-repository-gnome-menus/Makefile b/x11/gir-repository-gnome-menus/Makefile deleted file mode 100644 index 5ec5a76ea3c7..000000000000 --- a/x11/gir-repository-gnome-menus/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# New ports collection makefile for: gir-repository-gnome-menus -# Date created: 12 September 2009 -# Whom: Alexander Logvinov <avl@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports/x11/gir-repository-gnome-menus/Makefile,v 1.1 2009/09/16 02:05:13 avl Exp $ -# - -CATEGORIES= x11 - -MASTERDIR= ${.CURDIR}/../../devel/gir-repository - -PKGNAMESUFFIX= -gnome-menus - -.include "${MASTERDIR}/bsd.gir.mk" diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile index c639d06587fa..b4ef495ae345 100644 --- a/x11/gnome-applets/Makefile +++ b/x11/gnome-applets/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-applets/Makefile,v 1.208 2009/11/13 06:07:53 avl Exp $ +# $MCom: ports/x11/gnome-applets/Makefile,v 1.211 2010/03/28 17:55:31 marcus Exp $ # PORTNAME= gnome-applets -PORTVERSION= 2.28.0 -PORTREVISION= 3 +PORTVERSION= 2.30.0 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo index f01328d71b07..01f4c787073b 100644 --- a/x11/gnome-applets/distinfo +++ b/x11/gnome-applets/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-applets-2.28.0.tar.bz2) = 9eb00e9dc468d2c5c71b70c9fb2b751c -SHA256 (gnome2/gnome-applets-2.28.0.tar.bz2) = 73aa1d5b9636ea3293d206986115473f30581dd4a937267873573880eb1bec7b -SIZE (gnome2/gnome-applets-2.28.0.tar.bz2) = 9599635 +MD5 (gnome2/gnome-applets-2.30.0.tar.bz2) = 2afcbedc10b1a0e8072ac4eefdc8d770 +SHA256 (gnome2/gnome-applets-2.30.0.tar.bz2) = 41489fbb1f8352a306cde6676dfaf1e497bfbca960454f7251c4fd92920bba5d +SIZE (gnome2/gnome-applets-2.30.0.tar.bz2) = 9919459 diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist index 137dd52e013c..c5a575959073 100644 --- a/x11/gnome-applets/pkg-plist +++ b/x11/gnome-applets/pkg-plist @@ -17,6 +17,9 @@ %%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/defs.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/defs.pyc %%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/defs.pyo +%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/networkmanager.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/networkmanager.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/networkmanager.pyo %%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/preferences.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/preferences.pyc %%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/preferences.pyo @@ -52,7 +55,6 @@ libexec/charpick_applet2 libexec/drivemount_applet2 libexec/geyes_applet2 %%COMMANDER%%libexec/gnome-applets/mc-install-default-macros -libexec/gnome-keyboard-applet libexec/gweather-applet-2 %%PYTHON%%libexec/invest-applet %%COMMANDER%%libexec/mini_commander_applet @@ -67,7 +69,6 @@ share/gnome-2.0/ui/GNOME_AccessxApplet.xml %%CPUFREQ%%share/gnome-2.0/ui/GNOME_CPUFreqApplet.xml share/gnome-2.0/ui/GNOME_CharpickerApplet.xml share/gnome-2.0/ui/GNOME_DriveMountApplet.xml -share/gnome-2.0/ui/GNOME_GSwitchItApplet.xml share/gnome-2.0/ui/GNOME_GWeatherApplet.xml share/gnome-2.0/ui/GNOME_GeyesApplet.xml %%COMMANDER%%share/gnome-2.0/ui/GNOME_MiniCommanderApplet.xml @@ -79,7 +80,6 @@ share/gnome-2.0/ui/GNOME_StickyNotesApplet.xml %%BATTERY%%%%DATADIR%%/builder/battstat_applet.ui %%CPUFREQ%%%%DATADIR%%/builder/cpufreq-preferences.ui %%PYTHON%%%%DATADIR%%/builder/financialchart.ui -%%DATADIR%%/builder/gswitchit.ui %%COMMANDER%%%%DATADIR%%/builder/mini-commander.ui %%PYTHON%%%%DATADIR%%/builder/prefs-dialog.ui %%DATADIR%%/builder/stickynotes.ui @@ -351,6 +351,12 @@ share/gnome/help/accessx-status/zh_CN/figures/accessx_sticky-windows-key.png %%BATTERY%%share/gnome/help/battstat/cs/figures/battstat-credits-hal.png %%BATTERY%%share/gnome/help/battstat/cs/figures/battstat-preferences.png %%BATTERY%%share/gnome/help/battstat/cs/figures/context-menu.png +%%BATTERY%%share/gnome/help/battstat/da/battstat.xml +%%BATTERY%%share/gnome/help/battstat/da/figures/battstat-applet-expanded.png +%%BATTERY%%share/gnome/help/battstat/da/figures/battstat-applet.png +%%BATTERY%%share/gnome/help/battstat/da/figures/battstat-credits-hal.png +%%BATTERY%%share/gnome/help/battstat/da/figures/battstat-preferences.png +%%BATTERY%%share/gnome/help/battstat/da/figures/context-menu.png %%BATTERY%%share/gnome/help/battstat/de/battstat.xml %%BATTERY%%share/gnome/help/battstat/de/figures/battstat-applet-expanded.png %%BATTERY%%share/gnome/help/battstat/de/figures/battstat-applet.png @@ -906,6 +912,8 @@ share/gnome/help/drivemount/zh_CN/figures/drivemount-applet_status.png share/gnome/help/geyes/C/figures/geyes_applet.png share/gnome/help/geyes/C/geyes.xml share/gnome/help/geyes/C/legal.xml +share/gnome/help/geyes/ast/figures/geyes_applet.png +share/gnome/help/geyes/ast/geyes.xml share/gnome/help/geyes/bg/figures/geyes_applet.png share/gnome/help/geyes/bg/geyes.xml share/gnome/help/geyes/ca/figures/geyes_applet.png @@ -942,22 +950,10 @@ share/gnome/help/geyes/uk/figures/geyes_applet.png share/gnome/help/geyes/uk/geyes.xml share/gnome/help/geyes/zh_CN/figures/geyes_applet.png share/gnome/help/geyes/zh_CN/geyes.xml -share/gnome/help/gswitchit/C/gswitchit.xml -share/gnome/help/gswitchit/C/legal.xml -share/gnome/help/gswitchit/ca/gswitchit.xml -share/gnome/help/gswitchit/cs/gswitchit.xml -share/gnome/help/gswitchit/de/gswitchit.xml -share/gnome/help/gswitchit/el/gswitchit.xml -share/gnome/help/gswitchit/en_GB/gswitchit.xml -share/gnome/help/gswitchit/es/gswitchit.xml -share/gnome/help/gswitchit/eu/gswitchit.xml -share/gnome/help/gswitchit/fi/gswitchit.xml -share/gnome/help/gswitchit/fr/gswitchit.xml -share/gnome/help/gswitchit/oc/gswitchit.xml -share/gnome/help/gswitchit/ru/gswitchit.xml -share/gnome/help/gswitchit/sv/gswitchit.xml -share/gnome/help/gswitchit/uk/gswitchit.xml -share/gnome/help/gswitchit/zh_CN/gswitchit.xml +share/gnome/help/geyes/zh_HK/figures/geyes_applet.png +share/gnome/help/geyes/zh_HK/geyes.xml +share/gnome/help/geyes/zh_TW/figures/geyes_applet.png +share/gnome/help/geyes/zh_TW/geyes.xml share/gnome/help/gweather/C/figures/gweather-details.png share/gnome/help/gweather/C/figures/gweather-menu-prefs.png share/gnome/help/gweather/C/figures/gweather-prefs-general.png @@ -1277,6 +1273,8 @@ share/gnome/help/mixer_applet2/ca/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/ca/mixer_applet2.xml share/gnome/help/mixer_applet2/cs/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/cs/mixer_applet2.xml +share/gnome/help/mixer_applet2/da/figures/volumecontrol_applet.png +share/gnome/help/mixer_applet2/da/mixer_applet2.xml share/gnome/help/mixer_applet2/de/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/de/mixer_applet2.xml share/gnome/help/mixer_applet2/el/figures/volumecontrol_applet.png @@ -1493,6 +1491,18 @@ share/gnome/help/stickynotes_applet/zh_CN/figures/stickynotes-note-prefs.png share/gnome/help/stickynotes_applet/zh_CN/figures/stickynotes-prefs.png share/gnome/help/stickynotes_applet/zh_CN/figures/stickynotes_applet.png share/gnome/help/stickynotes_applet/zh_CN/stickynotes_applet.xml +share/gnome/help/stickynotes_applet/zh_HK/figures/stickynote-right-menu-lock.png +share/gnome/help/stickynotes_applet/zh_HK/figures/stickynote-right-menu-new.png +share/gnome/help/stickynotes_applet/zh_HK/figures/stickynotes-note-prefs.png +share/gnome/help/stickynotes_applet/zh_HK/figures/stickynotes-prefs.png +share/gnome/help/stickynotes_applet/zh_HK/figures/stickynotes_applet.png +share/gnome/help/stickynotes_applet/zh_HK/stickynotes_applet.xml +share/gnome/help/stickynotes_applet/zh_TW/figures/stickynote-right-menu-lock.png +share/gnome/help/stickynotes_applet/zh_TW/figures/stickynote-right-menu-new.png +share/gnome/help/stickynotes_applet/zh_TW/figures/stickynotes-note-prefs.png +share/gnome/help/stickynotes_applet/zh_TW/figures/stickynotes-prefs.png +share/gnome/help/stickynotes_applet/zh_TW/figures/stickynotes_applet.png +share/gnome/help/stickynotes_applet/zh_TW/stickynotes_applet.xml share/gnome/help/trashapplet/C/figures/trash-applet.png share/gnome/help/trashapplet/C/legal.xml share/gnome/help/trashapplet/C/trashapplet.xml @@ -1585,6 +1595,7 @@ share/locale/dz/LC_MESSAGES/gnome-applets-2.0.mo share/locale/el/LC_MESSAGES/gnome-applets-2.0.mo share/locale/en_CA/LC_MESSAGES/gnome-applets-2.0.mo share/locale/en_GB/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/en@shaw/LC_MESSAGES/gnome-applets-2.0.mo share/locale/es/LC_MESSAGES/gnome-applets-2.0.mo share/locale/es_AR/LC_MESSAGES/gnome-applets-2.0.mo share/locale/es_CL/LC_MESSAGES/gnome-applets-2.0.mo @@ -1688,6 +1699,7 @@ share/omf/accessx-status/accessx-status-zh_CN.omf %%BATTERY%%share/omf/battstat/battstat-bg.omf %%BATTERY%%share/omf/battstat/battstat-ca.omf %%BATTERY%%share/omf/battstat/battstat-cs.omf +%%BATTERY%%share/omf/battstat/battstat-da.omf %%BATTERY%%share/omf/battstat/battstat-de.omf %%BATTERY%%share/omf/battstat/battstat-el.omf %%BATTERY%%share/omf/battstat/battstat-en_GB.omf @@ -1775,6 +1787,7 @@ share/omf/drivemount/drivemount-sv.omf share/omf/drivemount/drivemount-uk.omf share/omf/drivemount/drivemount-zh_CN.omf share/omf/geyes/geyes-C.omf +share/omf/geyes/geyes-ast.omf share/omf/geyes/geyes-bg.omf share/omf/geyes/geyes-ca.omf share/omf/geyes/geyes-cs.omf @@ -1793,21 +1806,8 @@ share/omf/geyes/geyes-ru.omf share/omf/geyes/geyes-sv.omf share/omf/geyes/geyes-uk.omf share/omf/geyes/geyes-zh_CN.omf -share/omf/gswitchit/gswitchit-C.omf -share/omf/gswitchit/gswitchit-ca.omf -share/omf/gswitchit/gswitchit-cs.omf -share/omf/gswitchit/gswitchit-de.omf -share/omf/gswitchit/gswitchit-el.omf -share/omf/gswitchit/gswitchit-en_GB.omf -share/omf/gswitchit/gswitchit-es.omf -share/omf/gswitchit/gswitchit-eu.omf -share/omf/gswitchit/gswitchit-fi.omf -share/omf/gswitchit/gswitchit-fr.omf -share/omf/gswitchit/gswitchit-oc.omf -share/omf/gswitchit/gswitchit-ru.omf -share/omf/gswitchit/gswitchit-sv.omf -share/omf/gswitchit/gswitchit-uk.omf -share/omf/gswitchit/gswitchit-zh_CN.omf +share/omf/geyes/geyes-zh_HK.omf +share/omf/geyes/geyes-zh_TW.omf share/omf/gweather/gweather-C.omf share/omf/gweather/gweather-ar.omf share/omf/gweather/gweather-ca.omf @@ -1841,6 +1841,7 @@ share/omf/gweather/gweather-zh_CN.omf share/omf/mixer_applet2/mixer_applet2-C.omf share/omf/mixer_applet2/mixer_applet2-ca.omf share/omf/mixer_applet2/mixer_applet2-cs.omf +share/omf/mixer_applet2/mixer_applet2-da.omf share/omf/mixer_applet2/mixer_applet2-de.omf share/omf/mixer_applet2/mixer_applet2-el.omf share/omf/mixer_applet2/mixer_applet2-en_GB.omf @@ -1894,6 +1895,8 @@ share/omf/stickynotes_applet/stickynotes_applet-ru.omf share/omf/stickynotes_applet/stickynotes_applet-sv.omf share/omf/stickynotes_applet/stickynotes_applet-uk.omf share/omf/stickynotes_applet/stickynotes_applet-zh_CN.omf +share/omf/stickynotes_applet/stickynotes_applet-zh_HK.omf +share/omf/stickynotes_applet/stickynotes_applet-zh_TW.omf share/omf/trashapplet/trashapplet-C.omf share/omf/trashapplet/trashapplet-ca.omf share/omf/trashapplet/trashapplet-cs.omf @@ -2059,7 +2062,6 @@ share/xmodmap/xmodmap.yu @dirrm share/omf/mixer_applet2 %%PYTHON%%@dirrm share/omf/invest-applet @dirrm share/omf/gweather -@dirrm share/omf/gswitchit @dirrm share/omf/geyes @dirrm share/omf/drivemount %%CPUFREQ%%@dirrm share/omf/cpufreq-applet @@ -2114,6 +2116,10 @@ share/xmodmap/xmodmap.yu @dirrm share/gnome/help/trashapplet/C/figures @dirrm share/gnome/help/trashapplet/C @dirrm share/gnome/help/trashapplet +@dirrm share/gnome/help/stickynotes_applet/zh_TW/figures +@dirrm share/gnome/help/stickynotes_applet/zh_TW +@dirrm share/gnome/help/stickynotes_applet/zh_HK/figures +@dirrm share/gnome/help/stickynotes_applet/zh_HK @dirrm share/gnome/help/stickynotes_applet/zh_CN/figures @dirrm share/gnome/help/stickynotes_applet/zh_CN @dirrm share/gnome/help/stickynotes_applet/uk/figures @@ -2222,6 +2228,8 @@ share/xmodmap/xmodmap.yu @dirrm share/gnome/help/mixer_applet2/el @dirrm share/gnome/help/mixer_applet2/de/figures @dirrm share/gnome/help/mixer_applet2/de +@dirrm share/gnome/help/mixer_applet2/da/figures +@dirrm share/gnome/help/mixer_applet2/da @dirrm share/gnome/help/mixer_applet2/cs/figures @dirrm share/gnome/help/mixer_applet2/cs @dirrm share/gnome/help/mixer_applet2/ca/figures @@ -2281,22 +2289,10 @@ share/xmodmap/xmodmap.yu @dirrm share/gnome/help/gweather/C/figures @dirrm share/gnome/help/gweather/C @dirrm share/gnome/help/gweather -@dirrm share/gnome/help/gswitchit/zh_CN -@dirrm share/gnome/help/gswitchit/uk -@dirrm share/gnome/help/gswitchit/sv -@dirrm share/gnome/help/gswitchit/ru -@dirrm share/gnome/help/gswitchit/oc -@dirrm share/gnome/help/gswitchit/fr -@dirrm share/gnome/help/gswitchit/fi -@dirrm share/gnome/help/gswitchit/eu -@dirrm share/gnome/help/gswitchit/es -@dirrm share/gnome/help/gswitchit/en_GB -@dirrm share/gnome/help/gswitchit/el -@dirrm share/gnome/help/gswitchit/de -@dirrm share/gnome/help/gswitchit/cs -@dirrm share/gnome/help/gswitchit/ca -@dirrm share/gnome/help/gswitchit/C -@dirrm share/gnome/help/gswitchit +@dirrm share/gnome/help/geyes/zh_TW/figures +@dirrm share/gnome/help/geyes/zh_TW +@dirrm share/gnome/help/geyes/zh_HK/figures +@dirrm share/gnome/help/geyes/zh_HK @dirrm share/gnome/help/geyes/zh_CN/figures @dirrm share/gnome/help/geyes/zh_CN @dirrm share/gnome/help/geyes/uk/figures @@ -2333,6 +2329,8 @@ share/xmodmap/xmodmap.yu @dirrm share/gnome/help/geyes/ca @dirrm share/gnome/help/geyes/bg/figures @dirrm share/gnome/help/geyes/bg +@dirrm share/gnome/help/geyes/ast/figures +@dirrm share/gnome/help/geyes/ast @dirrm share/gnome/help/geyes/C/figures @dirrm share/gnome/help/geyes/C @dirrm share/gnome/help/geyes @@ -2512,6 +2510,8 @@ share/xmodmap/xmodmap.yu %%BATTERY%%@dirrm share/gnome/help/battstat/el %%BATTERY%%@dirrm share/gnome/help/battstat/de/figures %%BATTERY%%@dirrm share/gnome/help/battstat/de +%%BATTERY%%@dirrm share/gnome/help/battstat/da/figures +%%BATTERY%%@dirrm share/gnome/help/battstat/da %%BATTERY%%@dirrm share/gnome/help/battstat/bg/figures %%BATTERY%%@dirrm share/gnome/help/battstat/bg %%BATTERY%%@dirrm share/gnome/help/battstat/cs/figures @@ -2628,8 +2628,12 @@ share/xmodmap/xmodmap.yu @dirrmtry share/locale/es_CL @dirrmtry share/locale/es_AR/LC_MESSAGES @dirrmtry share/locale/es_AR +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @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/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile index dd2360e021f7..5ee4c4b082c7 100644 --- a/x11/gnome-desktop/Makefile +++ b/x11/gnome-desktop/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-desktop/Makefile,v 1.171 2009/10/22 14:31:14 kwm Exp $ +# $MCom: ports/x11/gnome-desktop/Makefile,v 1.180 2010/04/01 12:13:55 kwm Exp $ # PORTNAME= gnome-desktop -PORTVERSION= 2.28.2 -PORTREVISION?= 2 +PORTVERSION= 2.30.0 +PORTREVISION?= 0 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo index af67c1bd620d..325c42dd908f 100644 --- a/x11/gnome-desktop/distinfo +++ b/x11/gnome-desktop/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-desktop-2.28.2.tar.bz2) = 036423159a3240a258cc3892573f0e0f -SHA256 (gnome2/gnome-desktop-2.28.2.tar.bz2) = 0d1d51d8aa04d148bfa673496061a675473fac3a9d21d2046fd93b05475dec11 -SIZE (gnome2/gnome-desktop-2.28.2.tar.bz2) = 1611325 +MD5 (gnome2/gnome-desktop-2.30.0.tar.bz2) = 211818d93cd1b5b54b880520fe5444c4 +SHA256 (gnome2/gnome-desktop-2.30.0.tar.bz2) = cb80b676966127d8ee1a9b5ebbed1c23646d62ecdfccbb46d40f59633b4b127f +SIZE (gnome2/gnome-desktop-2.30.0.tar.bz2) = 1632686 diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist index dc66aec69018..75ca3939c16f 100644 --- a/x11/gnome-desktop/pkg-plist +++ b/x11/gnome-desktop/pkg-plist @@ -10,7 +10,7 @@ include/gnome-desktop-2.0/libgnomeui/gnome-rr.h lib/libgnome-desktop-2.a lib/libgnome-desktop-2.la lib/libgnome-desktop-2.so -lib/libgnome-desktop-2.so.11 +lib/libgnome-desktop-2.so.17 libdata/pkgconfig/gnome-desktop-2.0.pc share/applications/gnome-about.desktop share/gnome-about/contributors.list @@ -53,6 +53,7 @@ share/gnome/help/gpl/fi/gpl.xml share/gnome/help/gpl/fr/gpl.xml share/gnome/help/gpl/hu/gpl.xml share/gnome/help/gpl/ko/gpl.xml +share/gnome/help/gpl/nds/gpl.xml share/gnome/help/gpl/oc/gpl.xml share/gnome/help/gpl/pa/gpl.xml share/gnome/help/gpl/sv/gpl.xml @@ -209,6 +210,7 @@ share/omf/gpl/gpl-fi.omf share/omf/gpl/gpl-fr.omf share/omf/gpl/gpl-hu.omf share/omf/gpl/gpl-ko.omf +share/omf/gpl/gpl-nds.omf share/omf/gpl/gpl-oc.omf share/omf/gpl/gpl-pa.omf share/omf/gpl/gpl-sv.omf @@ -327,6 +329,7 @@ share/pixmaps/vnterm.xpm @dirrm share/gnome/help/gpl/sv @dirrm share/gnome/help/gpl/pa @dirrm share/gnome/help/gpl/oc +@dirrm share/gnome/help/gpl/nds @dirrm share/gnome/help/gpl/ko @dirrm share/gnome/help/gpl/hu @dirrm share/gnome/help/gpl/fr diff --git a/x11/gnome-launch-box/Makefile b/x11/gnome-launch-box/Makefile index 0e2b18efe860..72d4cf887b91 100644 --- a/x11/gnome-launch-box/Makefile +++ b/x11/gnome-launch-box/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnome-launch-box PORTVERSION= 20060112 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= jylefort diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile index 787e14aaedc9..a2b18cc32a63 100644 --- a/x11/gnome-menus/Makefile +++ b/x11/gnome-menus/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-menus/Makefile,v 1.100 2009/10/18 23:13:39 marcus Exp $ +# $MCom: ports/x11/gnome-menus/Makefile,v 1.105 2010/04/02 01:36:17 avl Exp $ # PORTNAME= gnome-menus -PORTVERSION= 2.28.0.1 +PORTVERSION= 2.30.0 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -15,6 +15,8 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Implementation of the FreeDesktop Desktop Menu Spec +BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection + USE_GETTEXT= yes USE_BZIP2= yes USE_GMAKE= yes diff --git a/x11/gnome-menus/distinfo b/x11/gnome-menus/distinfo index 6061681685d2..e2d254ba7912 100644 --- a/x11/gnome-menus/distinfo +++ b/x11/gnome-menus/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-menus-2.28.0.1.tar.bz2) = 279316228fd84917acb9405476f74b53 -SHA256 (gnome2/gnome-menus-2.28.0.1.tar.bz2) = 75e73554cd0b0a8356956e76ccb517def5382eafa7bdb14336499cd271570dbc -SIZE (gnome2/gnome-menus-2.28.0.1.tar.bz2) = 461356 +MD5 (gnome2/gnome-menus-2.30.0.tar.bz2) = 423040cfaf099d65406c405cffd9e409 +SHA256 (gnome2/gnome-menus-2.30.0.tar.bz2) = 6c390f88914712e1de425b9a2579f34b0cf27917521e9eb363b0c7cf120fe976 +SIZE (gnome2/gnome-menus-2.30.0.tar.bz2) = 469065 diff --git a/x11/gnome-menus/pkg-plist b/x11/gnome-menus/pkg-plist index b801284aaa12..a89f299b7ae3 100644 --- a/x11/gnome-menus/pkg-plist +++ b/x11/gnome-menus/pkg-plist @@ -1,6 +1,7 @@ etc/xdg/menus/gnome-applications.menu etc/xdg/menus/settings.menu include/gnome-menus/gmenu-tree.h +lib/girepository-1.0/GMenu-2.0.typelib lib/libgnome-menu.a lib/libgnome-menu.la lib/libgnome-menu.so @@ -30,6 +31,7 @@ share/desktop-directories/Utility.directory share/desktop-directories/X-GNOME-Menu-Applications.directory share/desktop-directories/X-GNOME-Menu-System.directory share/desktop-directories/X-GNOME-Other.directory +share/gir-1.0/GMenu-2.0.gir share/gnome-menus/examples/gnome-menus-ls.py share/locale/af/LC_MESSAGES/gnome-menus.mo share/locale/ar/LC_MESSAGES/gnome-menus.mo @@ -51,6 +53,7 @@ share/locale/de/LC_MESSAGES/gnome-menus.mo share/locale/dv/LC_MESSAGES/gnome-menus.mo share/locale/dz/LC_MESSAGES/gnome-menus.mo share/locale/el/LC_MESSAGES/gnome-menus.mo +share/locale/en@shaw/LC_MESSAGES/gnome-menus.mo share/locale/en_CA/LC_MESSAGES/gnome-menus.mo share/locale/en_GB/LC_MESSAGES/gnome-menus.mo share/locale/eo/LC_MESSAGES/gnome-menus.mo @@ -131,6 +134,9 @@ share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo @dirrm share/gnome-menus @dirrmtry share/desktop-directories @dirrm include/gnome-menus +@dirrmtry share/gir-1.0 +@dirrmtry lib/girepository-1.0 +@dirrmtry etc/xdg/menus @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/yo/LC_MESSAGES @@ -179,6 +185,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo @dirrmtry share/locale/gn @dirrmtry share/locale/fur/LC_MESSAGES @dirrmtry share/locale/fur +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/dv/LC_MESSAGES @@ -195,4 +203,3 @@ share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo @dirrmtry share/locale/ast @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as -@dirrmtry etc/xdg/menus diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile index c9707d5caa43..0d631f51f36f 100644 --- a/x11/gnome-panel/Makefile +++ b/x11/gnome-panel/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-panel/Makefile,v 1.208 2009/10/12 13:36:46 avl Exp $ +# $MCom: ports/x11/gnome-panel/Makefile,v 1.217 2010/04/02 05:35:38 avl Exp $ # PORTNAME= gnome-panel -PORTVERSION= 2.28.0 -PORTREVISION?= 3 +PORTVERSION= 2.30.0 +PORTREVISION?= 0 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -21,6 +21,7 @@ USE_BZIP2= yes .if !defined(REFERENCE_PORT) LIB_DEPENDS= gweather.1:${PORTSDIR}/net/libgweather \ + canberra-gtk.0:${PORTSDIR}/audio/libcanberra \ polkit-gnome.0:${PORTSDIR}/sysutils/policykit-gnome USE_GETTEXT= yes @@ -29,7 +30,7 @@ USE_LDCONFIG= yes INSTALLS_ICONS= yes USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop librsvg2 \ libwnck gnomemenus gnomedocutils ltverhack referencehack \ - libgnomeui + libbonoboui WANT_GNOME= yes GNOME_DESKTOP_VERSION=2 USE_GMAKE= yes diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo index 74972b3b2ea9..e1b1501633f3 100644 --- a/x11/gnome-panel/distinfo +++ b/x11/gnome-panel/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-panel-2.28.0.tar.bz2) = 9f0ea283d44bbcce67dc2e8a02fe9fad -SHA256 (gnome2/gnome-panel-2.28.0.tar.bz2) = c1168c0c8f84692002557d60870c782f4831635080d2c52cd2a3665fb7718465 -SIZE (gnome2/gnome-panel-2.28.0.tar.bz2) = 2976766 +MD5 (gnome2/gnome-panel-2.30.0.tar.bz2) = e17f25417b2c9011ed1c3ebd75706de6 +SHA256 (gnome2/gnome-panel-2.30.0.tar.bz2) = 7e8f99d3105bc0dda038b5859ab56d0a9740e244d7853786f1deb2df0a692220 +SIZE (gnome2/gnome-panel-2.30.0.tar.bz2) = 3072146 diff --git a/x11/gnome-panel/files/patch-configure b/x11/gnome-panel/files/patch-configure index dc6445b93f13..785c7f0f6176 100644 --- a/x11/gnome-panel/files/patch-configure +++ b/x11/gnome-panel/files/patch-configure @@ -9,62 +9,3 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -@@ -14954,12 +14954,12 @@ - pkg_cv_CLOCK_CFLAGS="$CLOCK_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pango >= \$PANGO_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED \$LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= \$GWEATHER_REQUIRED\"") >&5 -- ($PKG_CONFIG --exists --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED") 2>&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pango >= \$PANGO_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED \$LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= \$GWEATHER_REQUIRED gnome-desktop-2.0 >= \$LIBGNOME_DESKTOP_REQUIRED\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- pkg_cv_CLOCK_CFLAGS=`$PKG_CONFIG --cflags "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED" 2>/dev/null` -+ pkg_cv_CLOCK_CFLAGS=`$PKG_CONFIG --cflags "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -14970,12 +14970,12 @@ - pkg_cv_CLOCK_LIBS="$CLOCK_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pango >= \$PANGO_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED \$LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= \$GWEATHER_REQUIRED\"") >&5 -- ($PKG_CONFIG --exists --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED") 2>&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pango >= \$PANGO_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED \$LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= \$GWEATHER_REQUIRED gnome-desktop-2.0 >= \$LIBGNOME_DESKTOP_REQUIRED\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- pkg_cv_CLOCK_LIBS=`$PKG_CONFIG --libs "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED" 2>/dev/null` -+ pkg_cv_CLOCK_LIBS=`$PKG_CONFIG --libs "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -14993,14 +14993,14 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- CLOCK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED" 2>&1` -+ CLOCK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED" 2>&1` - else -- CLOCK_PKG_ERRORS=`$PKG_CONFIG --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED" 2>&1` -+ CLOCK_PKG_ERRORS=`$PKG_CONFIG --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$CLOCK_PKG_ERRORS" >&5 - -- { { $as_echo "$as_me:$LINENO: error: Package requirements (pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED) were not met: -+ { { $as_echo "$as_me:$LINENO: error: Package requirements (pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED) were not met: - - $CLOCK_PKG_ERRORS - -@@ -15011,7 +15011,7 @@ - and CLOCK_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - " >&5 --$as_echo "$as_me: error: Package requirements (pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED) were not met: -+$as_echo "$as_me: error: Package requirements (pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED) were not met: - - $CLOCK_PKG_ERRORS - diff --git a/x11/gnome-panel/files/patch-gnome-panel_panel-multiscreen.c b/x11/gnome-panel/files/patch-gnome-panel_panel-multiscreen.c deleted file mode 100644 index 50ef12367570..000000000000 --- a/x11/gnome-panel/files/patch-gnome-panel_panel-multiscreen.c +++ /dev/null @@ -1,59 +0,0 @@ ---- gnome-panel/panel-multiscreen.c.orig 2009-10-12 22:57:08.000000000 +1000 -+++ gnome-panel/panel-multiscreen.c 2009-10-12 22:57:08.000000000 +1000 -@@ -136,9 +136,17 @@ - xroot = GDK_WINDOW_XWINDOW (gdk_screen_get_root_window (screen)); - - #if (RANDR_MAJOR > 1 || (RANDR_MAJOR == 1 && RANDR_MINOR >= 3)) -- if (have_randr_1_3) -+ if (have_randr_1_3) { - resources = XRRGetScreenResourcesCurrent (xdisplay, xroot); -- else -+ if (resources->noutput == 0) { -+ /* This might happen if nothing tried to get randr -+ * resources from the server before, so we need an -+ * active probe. See comment #27 in -+ * https://bugzilla.gnome.org/show_bug.cgi?id=597101 */ -+ XRRFreeScreenResources (resources); -+ resources = XRRGetScreenResources (xdisplay, xroot); -+ } -+ } else - resources = XRRGetScreenResources (xdisplay, xroot); - #else - resources = XRRGetScreenResources (xdisplay, xroot); -@@ -205,6 +213,17 @@ - return FALSE; - } - -+ if (geometries->len == 0) { -+ /* This can happen in at least one case: -+ * https://bugzilla.novell.com/show_bug.cgi?id=543876 where all -+ * monitors appear disconnected (possibly because the screen -+ * is behing a KVM switch) -- see comment #8. -+ * There might be other cases too, so we stay on the safe side. -+ */ -+ g_array_free (geometries, TRUE); -+ return FALSE; -+ } -+ - *monitors_ret = geometries->len; - *geometries_ret = (GdkRectangle *) g_array_free (geometries, FALSE); - -@@ -238,9 +257,15 @@ - int *monitors_ret, - GdkRectangle **geometries_ret) - { -- if (panel_multiscreen_get_randr_monitors_for_screen (screen, -- monitors_ret, -- geometries_ret)) -+ gboolean res; -+ -+ *monitors_ret = 0; -+ *geometries_ret = NULL; -+ -+ res = panel_multiscreen_get_randr_monitors_for_screen (screen, -+ monitors_ret, -+ geometries_ret); -+ if (res && *monitors_ret > 0) - return; - - panel_multiscreen_get_gdk_monitors_for_screen (screen, diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist index 72143630613a..1d349e92627e 100644 --- a/x11/gnome-panel/pkg-plist +++ b/x11/gnome-panel/pkg-plist @@ -75,6 +75,9 @@ share/gnome/help/clock/ca/legal.xml share/gnome/help/clock/cs/clock.xml share/gnome/help/clock/cs/figures/clock_applet.png share/gnome/help/clock/cs/legal.xml +share/gnome/help/clock/da/clock.xml +share/gnome/help/clock/da/figures/clock_applet.png +share/gnome/help/clock/da/legal.xml share/gnome/help/clock/de/clock.xml share/gnome/help/clock/de/figures/clock_applet.png share/gnome/help/clock/de/legal.xml @@ -114,6 +117,9 @@ share/gnome/help/clock/oc/legal.xml share/gnome/help/clock/pa/clock.xml share/gnome/help/clock/pa/figures/clock_applet.png share/gnome/help/clock/pa/legal.xml +share/gnome/help/clock/pt/clock.xml +share/gnome/help/clock/pt/figures/clock_applet.png +share/gnome/help/clock/pt/legal.xml share/gnome/help/clock/pt_BR/clock.xml share/gnome/help/clock/pt_BR/figures/clock_applet.png share/gnome/help/clock/pt_BR/legal.xml @@ -135,6 +141,9 @@ share/gnome/help/clock/uk/legal.xml share/gnome/help/clock/zh_CN/clock.xml share/gnome/help/clock/zh_CN/figures/clock_applet.png share/gnome/help/clock/zh_CN/legal.xml +share/gnome/help/clock/zh_HK/clock.xml +share/gnome/help/clock/zh_HK/figures/clock_applet.png +share/gnome/help/clock/zh_HK/legal.xml share/gnome/help/clock/zh_TW/clock.xml share/gnome/help/clock/zh_TW/figures/clock_applet.png share/gnome/help/clock/zh_TW/legal.xml @@ -271,6 +280,7 @@ share/locale/da/LC_MESSAGES/gnome-panel-2.0.mo share/locale/de/LC_MESSAGES/gnome-panel-2.0.mo share/locale/dz/LC_MESSAGES/gnome-panel-2.0.mo share/locale/el/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/en@shaw/LC_MESSAGES/gnome-panel-2.0.mo share/locale/en_CA/LC_MESSAGES/gnome-panel-2.0.mo share/locale/en_GB/LC_MESSAGES/gnome-panel-2.0.mo share/locale/eo/LC_MESSAGES/gnome-panel-2.0.mo @@ -313,6 +323,7 @@ share/locale/mn/LC_MESSAGES/gnome-panel-2.0.mo share/locale/mr/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ms/LC_MESSAGES/gnome-panel-2.0.mo share/locale/nb/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/nds/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ne/LC_MESSAGES/gnome-panel-2.0.mo share/locale/nl/LC_MESSAGES/gnome-panel-2.0.mo share/locale/nn/LC_MESSAGES/gnome-panel-2.0.mo @@ -355,6 +366,7 @@ share/omf/clock/clock-C.omf share/omf/clock/clock-ar.omf share/omf/clock/clock-ca.omf share/omf/clock/clock-cs.omf +share/omf/clock/clock-da.omf share/omf/clock/clock-de.omf share/omf/clock/clock-el.omf share/omf/clock/clock-en_GB.omf @@ -368,6 +380,7 @@ share/omf/clock/clock-ko.omf share/omf/clock/clock-nl.omf share/omf/clock/clock-oc.omf share/omf/clock/clock-pa.omf +share/omf/clock/clock-pt.omf share/omf/clock/clock-pt_BR.omf share/omf/clock/clock-ru.omf share/omf/clock/clock-sr.omf @@ -375,6 +388,7 @@ share/omf/clock/clock-sv.omf share/omf/clock/clock-th.omf share/omf/clock/clock-uk.omf share/omf/clock/clock-zh_CN.omf +share/omf/clock/clock-zh_HK.omf share/omf/clock/clock-zh_TW.omf share/omf/fish/fish-C.omf share/omf/fish/fish-ca.omf @@ -437,6 +451,8 @@ share/polkit-1/actions/org.gnome.clockapplet.mechanism.policy @dirrm share/gnome/help/fish @dirrm share/gnome/help/clock/zh_TW/figures @dirrm share/gnome/help/clock/zh_TW +@dirrm share/gnome/help/clock/zh_HK/figures +@dirrm share/gnome/help/clock/zh_HK @dirrm share/gnome/help/clock/zh_CN/figures @dirrm share/gnome/help/clock/zh_CN @dirrm share/gnome/help/clock/uk/figures @@ -451,6 +467,8 @@ share/polkit-1/actions/org.gnome.clockapplet.mechanism.policy @dirrm share/gnome/help/clock/ru @dirrm share/gnome/help/clock/pt_BR/figures @dirrm share/gnome/help/clock/pt_BR +@dirrm share/gnome/help/clock/pt/figures +@dirrm share/gnome/help/clock/pt @dirrm share/gnome/help/clock/pa/figures @dirrm share/gnome/help/clock/pa @dirrm share/gnome/help/clock/oc/figures @@ -477,6 +495,8 @@ share/polkit-1/actions/org.gnome.clockapplet.mechanism.policy @dirrm share/gnome/help/clock/el @dirrm share/gnome/help/clock/de/figures @dirrm share/gnome/help/clock/de +@dirrm share/gnome/help/clock/da/figures +@dirrm share/gnome/help/clock/da @dirrm share/gnome/help/clock/cs/figures @dirrm share/gnome/help/clock/cs @dirrm share/gnome/help/clock/ca/figures @@ -519,6 +539,8 @@ share/polkit-1/actions/org.gnome.clockapplet.mechanism.policy @dirrmtry share/locale/oc @dirrmtry share/locale/nso/LC_MESSAGES @dirrmtry share/locale/nso +@dirrmtry share/locale/nds/LC_MESSAGES +@dirrmtry share/locale/nds @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr @dirrmtry share/locale/mi/LC_MESSAGES @@ -541,6 +563,8 @@ share/polkit-1/actions/org.gnome.clockapplet.mechanism.policy @dirrmtry share/locale/ha @dirrmtry share/locale/fur/LC_MESSAGES @dirrmtry share/locale/fur +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/crh/LC_MESSAGES diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile index 96496cf28c53..377fefc8da13 100644 --- a/x11/gnome-screensaver/Makefile +++ b/x11/gnome-screensaver/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.112 2009/09/23 11:36:58 kwm Exp $ +# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.118 2010/04/01 13:10:41 kwm Exp $ # PORTNAME= gnome-screensaver -PORTVERSION= 2.28.3 -PORTREVISION= 1 +PORTVERSION= 2.30.0 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11/gnome-screensaver/distinfo b/x11/gnome-screensaver/distinfo index f952fcc3c10b..5cf7179b9bdf 100644 --- a/x11/gnome-screensaver/distinfo +++ b/x11/gnome-screensaver/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-screensaver-2.28.3.tar.bz2) = e6fb9b206f3470c04e21474ee6d69687 -SHA256 (gnome2/gnome-screensaver-2.28.3.tar.bz2) = f2ffec4f637883c7db15fb94c3f85a7d59ade3cf1f0107ecebc01df13f0ad5c3 -SIZE (gnome2/gnome-screensaver-2.28.3.tar.bz2) = 4787224 +MD5 (gnome2/gnome-screensaver-2.30.0.tar.bz2) = a18086bf2191795d87b7ea80b7b66daa +SHA256 (gnome2/gnome-screensaver-2.30.0.tar.bz2) = f653d3e4a872d435bce9d74ea8d14e54090c4c803521d5fe940e948c1dccc060 +SIZE (gnome2/gnome-screensaver-2.30.0.tar.bz2) = 4803639 diff --git a/x11/gnome-screensaver/pkg-plist b/x11/gnome-screensaver/pkg-plist index 9e1e7c8d57f7..8922fb86e9be 100644 --- a/x11/gnome-screensaver/pkg-plist +++ b/x11/gnome-screensaver/pkg-plist @@ -36,6 +36,7 @@ share/locale/da/LC_MESSAGES/gnome-screensaver.mo share/locale/de/LC_MESSAGES/gnome-screensaver.mo share/locale/dz/LC_MESSAGES/gnome-screensaver.mo share/locale/el/LC_MESSAGES/gnome-screensaver.mo +share/locale/en@shaw/LC_MESSAGES/gnome-screensaver.mo share/locale/en_CA/LC_MESSAGES/gnome-screensaver.mo share/locale/en_GB/LC_MESSAGES/gnome-screensaver.mo share/locale/es/LC_MESSAGES/gnome-screensaver.mo @@ -137,6 +138,8 @@ share/pixmaps/gnome-logo-white.svg @dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/crh/LC_MESSAGES diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile index 38046cdee6fc..4c39a2d95ccb 100644 --- a/x11/gnome-session/Makefile +++ b/x11/gnome-session/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-session/Makefile,v 1.175 2009/09/22 09:18:35 kwm Exp $ +# $MCom: ports/x11/gnome-session/Makefile,v 1.181 2010/04/02 17:25:12 kwm Exp $ # PORTNAME= gnome-session -PORTVERSION= 2.28.0 -PORTREVISION= 2 +PORTVERSION= 2.30.0 CATEGORIES= x11 gnome MASTER_SITES= GNOME \ http://www.marcuscom.com/downloads/:local @@ -24,7 +23,8 @@ BUILD_DEPENDS= ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/g LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ gnome-keyring.0:${PORTSDIR}/security/gnome-keyring \ notify.1:${PORTSDIR}/devel/libnotify \ - execinfo:${PORTSDIR}/devel/libexecinfo + execinfo:${PORTSDIR}/devel/libexecinfo \ + upower-glib.1:${PORTSDIR}/sysutils/upower RUN_DEPENDS= ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon \ ${LOCALBASE}/sbin/console-kit-daemon:${PORTSDIR}/sysutils/consolekit \ ${LOCALBASE}/bin/xdpyinfo:${PORTSDIR}/x11/xdpyinfo diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo index 7870703d67b6..8d32bec92179 100644 --- a/x11/gnome-session/distinfo +++ b/x11/gnome-session/distinfo @@ -1,6 +1,6 @@ -MD5 (gnome2/gnome-session-2.28.0.tar.bz2) = b1a2307b02e833010d6c5312b9ff9048 -SHA256 (gnome2/gnome-session-2.28.0.tar.bz2) = 83e89a04fb090f1a1f6b609bdc39f1e69390269b885b7da6b32e980f4e765c0c -SIZE (gnome2/gnome-session-2.28.0.tar.bz2) = 822009 +MD5 (gnome2/gnome-session-2.30.0.tar.bz2) = d15fdd120f3c7d01e4a388a4a0e73932 +SHA256 (gnome2/gnome-session-2.30.0.tar.bz2) = efeb45319403546fa60e6cb035e4de5e87731ea672fd37635749af49d0fd4d84 +SIZE (gnome2/gnome-session-2.30.0.tar.bz2) = 827745 MD5 (gnome2/freebsd-splashes-gnome-2.18_1.tar) = 80eb8c52fcf9fe977e0bf8ed48b85fe5 SHA256 (gnome2/freebsd-splashes-gnome-2.18_1.tar) = fcca0f6eb759a4ef0211ecd61340f84ce8ad4d7493f725ac8613724faadbb508 SIZE (gnome2/freebsd-splashes-gnome-2.18_1.tar) = 1630720 diff --git a/x11/gnome-session/files/patch-configure b/x11/gnome-session/files/patch-configure deleted file mode 100644 index 6c8c58f69eac..000000000000 --- a/x11/gnome-session/files/patch-configure +++ /dev/null @@ -1,85 +0,0 @@ ---- configure.orig 2009-08-26 14:16:17.000000000 -0400 -+++ configure 2009-08-26 14:16:27.000000000 -0400 -@@ -13057,7 +13057,6 @@ GLIB_REQUIRED=2.16.0 - LIBGNOMEUI_REQUIRED=2.2.0 - GTK_REQUIRED=2.14.0 - DBUS_GLIB_REQUIRED=0.76 --DEVKIT_POWER_REQUIRED=008 - - - -@@ -13189,13 +13188,11 @@ if test -n "$GNOME_SESSION_CFLAGS"; then - gio-2.0 >= \$GLIB_REQUIRED - gtk+-2.0 >= \$GTK_REQUIRED - dbus-glib-1 >= \$DBUS_GLIB_REQUIRED -- devkit-power-gobject >= \$DEVKIT_POWER_REQUIRED - \"") >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED - gio-2.0 >= $GLIB_REQUIRED - gtk+-2.0 >= $GTK_REQUIRED - dbus-glib-1 >= $DBUS_GLIB_REQUIRED -- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED - ") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -@@ -13204,7 +13201,6 @@ if test -n "$GNOME_SESSION_CFLAGS"; then - gio-2.0 >= $GLIB_REQUIRED - gtk+-2.0 >= $GTK_REQUIRED - dbus-glib-1 >= $DBUS_GLIB_REQUIRED -- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED - " 2>/dev/null` - else - pkg_failed=yes -@@ -13220,13 +13216,11 @@ if test -n "$GNOME_SESSION_LIBS"; then - gio-2.0 >= \$GLIB_REQUIRED - gtk+-2.0 >= \$GTK_REQUIRED - dbus-glib-1 >= \$DBUS_GLIB_REQUIRED -- devkit-power-gobject >= \$DEVKIT_POWER_REQUIRED - \"") >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED - gio-2.0 >= $GLIB_REQUIRED - gtk+-2.0 >= $GTK_REQUIRED - dbus-glib-1 >= $DBUS_GLIB_REQUIRED -- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED - ") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -@@ -13235,7 +13229,6 @@ if test -n "$GNOME_SESSION_LIBS"; then - gio-2.0 >= $GLIB_REQUIRED - gtk+-2.0 >= $GTK_REQUIRED - dbus-glib-1 >= $DBUS_GLIB_REQUIRED -- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED - " 2>/dev/null` - else - pkg_failed=yes -@@ -13258,14 +13251,12 @@ fi - gio-2.0 >= $GLIB_REQUIRED - gtk+-2.0 >= $GTK_REQUIRED - dbus-glib-1 >= $DBUS_GLIB_REQUIRED -- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED - " 2>&1` - else - GNOME_SESSION_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= $GLIB_REQUIRED - gio-2.0 >= $GLIB_REQUIRED - gtk+-2.0 >= $GTK_REQUIRED - dbus-glib-1 >= $DBUS_GLIB_REQUIRED -- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED - " 2>&1` - fi - # Put the nasty error message in config.log where it belongs -@@ -13275,7 +13266,6 @@ fi - gio-2.0 >= $GLIB_REQUIRED - gtk+-2.0 >= $GTK_REQUIRED - dbus-glib-1 >= $DBUS_GLIB_REQUIRED -- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED - ) were not met: - - $GNOME_SESSION_PKG_ERRORS -@@ -13291,7 +13281,6 @@ $as_echo "$as_me: error: Package require - gio-2.0 >= $GLIB_REQUIRED - gtk+-2.0 >= $GTK_REQUIRED - dbus-glib-1 >= $DBUS_GLIB_REQUIRED -- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED - ) were not met: - - $GNOME_SESSION_PKG_ERRORS diff --git a/x11/gnome-session/files/patch-configure.in b/x11/gnome-session/files/patch-configure.in deleted file mode 100644 index 02a19373b902..000000000000 --- a/x11/gnome-session/files/patch-configure.in +++ /dev/null @@ -1,18 +0,0 @@ ---- configure.in.orig 2009-08-25 10:09:56.000000000 -0400 -+++ configure.in 2009-08-26 14:12:40.000000000 -0400 -@@ -49,7 +49,6 @@ GLIB_REQUIRED=2.16.0 - LIBGNOMEUI_REQUIRED=2.2.0 - GTK_REQUIRED=2.14.0 - DBUS_GLIB_REQUIRED=0.76 --DEVKIT_POWER_REQUIRED=008 - - dnl ==================================================================== - dnl Dependency Checks -@@ -61,7 +60,6 @@ PKG_CHECK_MODULES(GNOME_SESSION, - gio-2.0 >= $GLIB_REQUIRED - gtk+-2.0 >= $GTK_REQUIRED - dbus-glib-1 >= $DBUS_GLIB_REQUIRED -- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED - ) - - PKG_CHECK_MODULES(SESSION_PROPERTIES, diff --git a/x11/gnome-session/files/patch-gnome-session_Makefile.am b/x11/gnome-session/files/patch-gnome-session_Makefile.am deleted file mode 100644 index aff8ee55c44b..000000000000 --- a/x11/gnome-session/files/patch-gnome-session_Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ ---- gnome-session/Makefile.am.orig 2009-08-25 10:07:24.000000000 -0400 -+++ gnome-session/Makefile.am 2009-08-26 14:11:18.000000000 -0400 -@@ -23,8 +23,7 @@ INCLUDES = \ - -DLIBEXECDIR=\"$(libexecdir)\" \ - -DGTKBUILDER_DIR=\""$(pkgdatadir)"\" \ - -DGCONF_SANITY_CHECK=\""$(GCONF_SANITY_CHECK)"\" \ -- -DGCONFTOOL_CMD=\"$(GCONFTOOL)\" \ -- -DI_KNOW_THE_DEVICEKIT_POWER_API_IS_SUBJECT_TO_CHANGE -+ -DGCONFTOOL_CMD=\"$(GCONFTOOL)\" - - test_inhibit_SOURCES = \ - test-inhibit.c \ -@@ -73,6 +72,8 @@ gnome_session_SOURCES = \ - gsm-logout-dialog.c \ - gsm-inhibit-dialog.h \ - gsm-inhibit-dialog.c \ -+ gsm-power-manager.h \ -+ gsm-power-manager.c \ - gs-idle-monitor.h \ - gs-idle-monitor.c \ - gsm-presence.h \ diff --git a/x11/gnome-session/files/patch-gnome-session_Makefile.in b/x11/gnome-session/files/patch-gnome-session_Makefile.in index dcf1a21e9f09..48f55c540844 100644 --- a/x11/gnome-session/files/patch-gnome-session_Makefile.in +++ b/x11/gnome-session/files/patch-gnome-session_Makefile.in @@ -1,23 +1,5 @@ --- gnome-session/Makefile.in.orig 2009-08-26 14:18:15.000000000 -0400 +++ gnome-session/Makefile.in 2009-08-26 14:20:10.000000000 -0400 -@@ -73,6 +73,7 @@ am_gnome_session_OBJECTS = gsm-app.$(OBJ - gdm-log.$(OBJEXT) main.$(OBJEXT) gsm-store.$(OBJEXT) \ - gsm-inhibitor.$(OBJEXT) gsm-manager.$(OBJEXT) \ - gsm-session-save.$(OBJEXT) gsm-xsmp-server.$(OBJEXT) \ -+ gsm-power-manager.$(OBJEXT) \ - $(am__objects_1) - gnome_session_OBJECTS = $(am_gnome_session_OBJECTS) - gnome_session_DEPENDENCIES = libgsmutil.la \ -@@ -339,8 +340,7 @@ INCLUDES = \ - -DLIBEXECDIR=\"$(libexecdir)\" \ - -DGTKBUILDER_DIR=\""$(pkgdatadir)"\" \ - -DGCONF_SANITY_CHECK=\""$(GCONF_SANITY_CHECK)"\" \ -- -DGCONFTOOL_CMD=\"$(GCONFTOOL)\" \ -- -DI_KNOW_THE_DEVICEKIT_POWER_API_IS_SUBJECT_TO_CHANGE -+ -DGCONFTOOL_CMD=\"$(GCONFTOOL)\" - - test_inhibit_SOURCES = \ - test-inhibit.c \ @@ -360,6 +360,7 @@ test_client_dbus_LDADD = \ gnome_session_LDADD = \ @@ -26,20 +8,3 @@ $(top_builddir)/egg/libeggdesktopfile.la \ $(SM_LIBS) \ $(ICE_LIBS) \ -@@ -389,6 +390,8 @@ gnome_session_SOURCES = \ - gsm-logout-dialog.c \ - gsm-inhibit-dialog.h \ - gsm-inhibit-dialog.c \ -+ gsm-power-manager.c \ -+ gsm-power-manager.h \ - gs-idle-monitor.h \ - gs-idle-monitor.c \ - gsm-presence.h \ -@@ -574,6 +577,7 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-dbus-client.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-gconf.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-inhibit-dialog.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-power-manager.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-inhibitor.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-logout-dialog.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-manager.Po@am__quote@ diff --git a/x11/gnome-session/files/patch-gnome-session_gsm-logout-dialog.c b/x11/gnome-session/files/patch-gnome-session_gsm-logout-dialog.c deleted file mode 100644 index 1ca12557d678..000000000000 --- a/x11/gnome-session/files/patch-gnome-session_gsm-logout-dialog.c +++ /dev/null @@ -1,66 +0,0 @@ ---- gnome-session/gsm-logout-dialog.c.orig 2009-08-25 04:03:42.000000000 -0400 -+++ gnome-session/gsm-logout-dialog.c 2009-08-26 14:27:18.000000000 -0400 -@@ -27,9 +27,8 @@ - #include <glib/gi18n.h> - #include <gtk/gtk.h> - --#include <devkit-power-gobject/devicekit-power.h> -- - #include "gsm-logout-dialog.h" -+#include "gsm-power-manager.h" - #include "gsm-consolekit.h" - #include "gdm.h" - -@@ -50,7 +49,7 @@ struct _GsmLogoutDialogPrivate - { - GsmDialogLogoutType type; - -- DkpClient *dkp_client; -+ GsmPowerManager *power_manager; - GsmConsolekit *consolekit; - - int timeout; -@@ -142,7 +141,7 @@ gsm_logout_dialog_init (GsmLogoutDialog - gtk_window_set_keep_above (GTK_WINDOW (logout_dialog), TRUE); - gtk_window_stick (GTK_WINDOW (logout_dialog)); - -- logout_dialog->priv->dkp_client = dkp_client_new (); -+ logout_dialog->priv->power_manager = gsm_get_power_manager (); - - logout_dialog->priv->consolekit = gsm_get_consolekit (); - -@@ -166,9 +165,9 @@ gsm_logout_dialog_destroy (GsmLogoutDial - logout_dialog->priv->timeout_id = 0; - } - -- if (logout_dialog->priv->dkp_client) { -- g_object_unref (logout_dialog->priv->dkp_client); -- logout_dialog->priv->dkp_client = NULL; -+ if (logout_dialog->priv->power_manager) { -+ g_object_unref (logout_dialog->priv->power_manager); -+ logout_dialog->priv->power_manager = NULL; - } - - if (logout_dialog->priv->consolekit) { -@@ -183,9 +182,7 @@ static gboolean - gsm_logout_supports_system_suspend (GsmLogoutDialog *logout_dialog) - { - gboolean ret; -- g_object_get (logout_dialog->priv->dkp_client, -- "can-suspend", &ret, -- NULL); -+ ret = gsm_power_manager_can_suspend (logout_dialog->priv->power_manager); - return ret; - } - -@@ -193,9 +190,7 @@ static gboolean - gsm_logout_supports_system_hibernate (GsmLogoutDialog *logout_dialog) - { - gboolean ret; -- g_object_get (logout_dialog->priv->dkp_client, -- "can-hibernate", &ret, -- NULL); -+ ret = gsm_power_manager_can_hibernate (logout_dialog->priv->power_manager); - return ret; - } - diff --git a/x11/gnome-session/files/patch-gnome-session_gsm-manager.c b/x11/gnome-session/files/patch-gnome-session_gsm-manager.c deleted file mode 100644 index befa415d9c6e..000000000000 --- a/x11/gnome-session/files/patch-gnome-session_gsm-manager.c +++ /dev/null @@ -1,150 +0,0 @@ ---- gnome-session/gsm-manager.c.orig 2009-09-18 18:36:04.000000000 +0200 -+++ gnome-session/gsm-manager.c 2009-09-22 11:12:05.000000000 +0200 -@@ -38,8 +38,6 @@ - #include <dbus/dbus-glib.h> - #include <dbus/dbus-glib-lowlevel.h> - --#include <devkit-power-gobject/devicekit-power.h> -- - #include <gtk/gtk.h> /* for logout dialog */ - #include <gconf/gconf-client.h> - -@@ -60,6 +58,7 @@ - #include "gsm-logout-dialog.h" - #include "gsm-inhibit-dialog.h" - #include "gsm-consolekit.h" -+#include "gsm-power-manager.h" - #include "gsm-session-save.h" - - #define GSM_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSM_TYPE_MANAGER, GsmManagerPrivate)) -@@ -133,9 +132,6 @@ struct GsmManagerPrivate - - DBusGProxy *bus_proxy; - DBusGConnection *connection; -- -- /* Interface with other parts of the system */ -- DkpClient *dkp_client; - }; - - enum { -@@ -971,53 +967,29 @@ manager_perhaps_lock (GsmManager *manage - static void - manager_attempt_hibernate (GsmManager *manager) - { -- gboolean can_hibernate; -- GError *error; -- gboolean ret; -+ GsmPowerManager *power_manager; - -- g_object_get (manager->priv->dkp_client, -- "can-hibernate", &can_hibernate, -- NULL); -- -- if (can_hibernate) { -- -- /* lock the screen before we suspend */ -- manager_perhaps_lock (manager); -- -- error = NULL; -- ret = dkp_client_hibernate (manager->priv->dkp_client, &error); -- if (!ret) { -- g_warning ("Unexpected hibernate failure: %s", -- error->message); -- g_error_free (error); -- } -- } -+ power_manager = gsm_get_power_manager (); -+ -+ if (gsm_power_manager_can_hibernate (power_manager)) { -+ gsm_power_manager_attempt_hibernate (power_manager); -+ } -+ -+ g_object_unref (power_manager); - } - - static void - manager_attempt_suspend (GsmManager *manager) - { -- gboolean can_suspend; -- GError *error; -- gboolean ret; -+ GsmPowerManager *power_manager; - -- g_object_get (manager->priv->dkp_client, -- "can-suspend", &can_suspend, -- NULL); -- -- if (can_suspend) { -- -- /* lock the screen before we suspend */ -- manager_perhaps_lock (manager); -- -- error = NULL; -- ret = dkp_client_suspend (manager->priv->dkp_client, &error); -- if (!ret) { -- g_warning ("Unexpected suspend failure: %s", -- error->message); -- g_error_free (error); -- } -- } -+ power_manager = gsm_get_power_manager (); -+ -+ if (gsm_power_manager_can_suspend (power_manager)) { -+ gsm_power_manager_attempt_suspend (power_manager); -+ } -+ -+ g_object_unref (power_manager); - } - - static void -@@ -2190,11 +2162,6 @@ gsm_manager_dispose (GObject *object) - manager->priv->gconf_client = NULL; - } - -- if (manager->priv->dkp_client != NULL) { -- g_object_unref (manager->priv->dkp_client); -- manager->priv->dkp_client = NULL; -- } -- - G_OBJECT_CLASS (gsm_manager_parent_class)->dispose (object); - } - -@@ -2423,8 +2390,6 @@ gsm_manager_init (GsmManager *manager) - G_CALLBACK (on_presence_status_changed), - manager); - -- manager->priv->dkp_client = dkp_client_new (); -- - /* GConf setup */ - gconf_client_add_dir (manager->priv->gconf_client, - KEY_DESKTOP_DIR, -@@ -2944,24 +2909,20 @@ gsm_manager_can_shutdown (GsmManager *ma - GError **error) - { - GsmConsolekit *consolekit; -- gboolean can_suspend; -- gboolean can_hibernate; -- -- g_object_get (manager->priv->dkp_client, -- "can-suspend", &can_suspend, -- "can-hibernate", &can_hibernate, -- NULL); -+ GsmPowerManager *power_manager; - - g_debug ("GsmManager: CanShutdown called"); - - g_return_val_if_fail (GSM_IS_MANAGER (manager), FALSE); - - consolekit = gsm_get_consolekit (); -+ power_manager = gsm_get_power_manager (); - *shutdown_available = gsm_consolekit_can_stop (consolekit) - || gsm_consolekit_can_restart (consolekit) -- || can_suspend -- || can_hibernate; -+ || gsm_power_manager_can_suspend (power_manager) -+ || gsm_power_manager_can_hibernate (power_manager); - g_object_unref (consolekit); -+ g_object_unref (power_manager); - - return TRUE; - } diff --git a/x11/gnome-session/files/patch-gnome-session_gsm-power-manager.c b/x11/gnome-session/files/patch-gnome-session_gsm-power-manager.c deleted file mode 100644 index 05342ff0fbf1..000000000000 --- a/x11/gnome-session/files/patch-gnome-session_gsm-power-manager.c +++ /dev/null @@ -1,483 +0,0 @@ ---- gnome-session/gsm-power-manager.c.orig 2009-08-26 14:14:31.000000000 -0400 -+++ gnome-session/gsm-power-manager.c 2009-08-26 14:15:07.000000000 -0400 -@@ -0,0 +1,480 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- -+ * -+ * power-manager.h: functions for powering down, restarting, and -+ * suspending the computer -+ * Copyright (C) 2006 Ray Strode <rstrode@redhat.com> -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2, or (at your option) -+ * any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -+ * 02111-1307, USA. -+ */ -+ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ -+#include "gsm-power-manager.h" -+ -+#include <errno.h> -+#include <string.h> -+ -+#include <glib.h> -+#include <glib-object.h> -+#include <glib/gi18n.h> -+ -+#include <dbus/dbus-glib.h> -+ -+struct _GsmPowerManagerPrivate -+{ -+ DBusGConnection *dbus_connection; -+ DBusGProxy *bus_proxy; -+ DBusGProxy *gpm_proxy; -+ guint32 is_connected : 1; -+}; -+ -+static void gsm_power_manager_finalize (GObject *object); -+ -+static void gsm_power_manager_class_install_signals (GsmPowerManagerClass *manager_class); -+ -+static void gsm_power_manager_class_install_properties (GsmPowerManagerClass *manager_class); -+ -+static void gsm_power_manager_get_property (GObject *object, -+ guint prop_id, -+ GValue *value, -+ GParamSpec *pspec); -+ -+static gboolean ensure_gpm_connection (GsmPowerManager *manager, -+ GError **error); -+ -+enum { -+ PROP_0 = 0, -+ PROP_IS_CONNECTED -+}; -+ -+enum { -+ REQUEST_FAILED = 0, -+ LAST_SIGNAL -+}; -+ -+static guint signals[LAST_SIGNAL]; -+ -+G_DEFINE_TYPE (GsmPowerManager, gsm_power_manager, G_TYPE_OBJECT); -+ -+static void -+gsm_power_manager_class_init (GsmPowerManagerClass *manager_class) -+{ -+ GObjectClass *object_class; -+ -+ object_class = G_OBJECT_CLASS (manager_class); -+ -+ object_class->finalize = gsm_power_manager_finalize; -+ -+ gsm_power_manager_class_install_properties (manager_class); -+ gsm_power_manager_class_install_signals (manager_class); -+ -+ g_type_class_add_private (manager_class, -+ sizeof (GsmPowerManagerPrivate)); -+} -+ -+static void -+gsm_power_manager_class_install_signals (GsmPowerManagerClass *manager_class) -+{ -+ GObjectClass *object_class; -+ -+ object_class = G_OBJECT_CLASS (manager_class); -+ -+ signals[REQUEST_FAILED] = -+ g_signal_new ("request-failed", -+ G_OBJECT_CLASS_TYPE (object_class), -+ G_SIGNAL_RUN_LAST, -+ G_STRUCT_OFFSET (GsmPowerManagerClass, request_failed), -+ NULL, -+ NULL, -+ g_cclosure_marshal_VOID__POINTER, -+ G_TYPE_NONE, -+ 1, G_TYPE_POINTER); -+ -+ manager_class->request_failed = NULL; -+} -+ -+static void -+gsm_power_manager_class_install_properties (GsmPowerManagerClass *manager_class) -+{ -+ GObjectClass *object_class; -+ GParamSpec *param_spec; -+ -+ object_class = G_OBJECT_CLASS (manager_class); -+ object_class->get_property = gsm_power_manager_get_property; -+ -+ param_spec = g_param_spec_boolean ("is-connected", -+ "Is connected", -+ "Whether the session is connected to " -+ "the power manager", -+ FALSE, -+ G_PARAM_READABLE); -+ -+ g_object_class_install_property (object_class, PROP_IS_CONNECTED, -+ param_spec); -+} -+ -+static void -+on_name_owner_changed (DBusGProxy *bus_proxy, -+ const char *name, -+ const char *prev_owner, -+ const char *new_owner, -+ GsmPowerManager *manager) -+{ -+ if (strcmp (name, "org.freedesktop.PowerManagement") != 0) { -+ return; -+ } -+ -+ if (manager->priv->gpm_proxy != NULL) { -+ g_object_unref (manager->priv->gpm_proxy); -+ manager->priv->gpm_proxy = NULL; -+ } -+ -+ ensure_gpm_connection (manager, NULL); -+} -+ -+static gboolean -+ensure_gpm_connection (GsmPowerManager *manager, -+ GError **error) -+{ -+ GError *connection_error; -+ gboolean is_connected; -+ -+ connection_error = NULL; -+ if (manager->priv->dbus_connection == NULL) { -+ manager->priv->dbus_connection = dbus_g_bus_get (DBUS_BUS_SESSION, -+ &connection_error); -+ -+ if (manager->priv->dbus_connection == NULL) { -+ g_propagate_error (error, connection_error); -+ is_connected = FALSE; -+ goto out; -+ } -+ } -+ -+ if (manager->priv->bus_proxy == NULL) { -+ manager->priv->bus_proxy = -+ dbus_g_proxy_new_for_name_owner (manager->priv->dbus_connection, -+ DBUS_SERVICE_DBUS, -+ DBUS_PATH_DBUS, -+ DBUS_INTERFACE_DBUS, -+ &connection_error); -+ -+ if (manager->priv->bus_proxy == NULL) { -+ g_propagate_error (error, connection_error); -+ is_connected = FALSE; -+ goto out; -+ } -+ -+ dbus_g_proxy_add_signal (manager->priv->bus_proxy, -+ "NameOwnerChanged", -+ G_TYPE_STRING, -+ G_TYPE_STRING, -+ G_TYPE_STRING, -+ G_TYPE_INVALID); -+ -+ dbus_g_proxy_connect_signal (manager->priv->bus_proxy, -+ "NameOwnerChanged", -+ G_CALLBACK (on_name_owner_changed), -+ manager, NULL); -+ } -+ -+ if (manager->priv->gpm_proxy == NULL) { -+ manager->priv->gpm_proxy = -+ dbus_g_proxy_new_for_name_owner ( -+ manager->priv->dbus_connection, -+ "org.freedesktop.PowerManagement", -+ "/org/freedesktop/PowerManagement", -+ "org.freedesktop.PowerManagement", -+ &connection_error); -+ -+ if (manager->priv->gpm_proxy == NULL) { -+ g_propagate_error (error, connection_error); -+ is_connected = FALSE; -+ goto out; -+ } -+ } -+ -+ is_connected = TRUE; -+ -+ out: -+ if (manager->priv->is_connected != is_connected) { -+ manager->priv->is_connected = is_connected; -+ g_object_notify (G_OBJECT (manager), "is-connected"); -+ } -+ -+ if (!is_connected) { -+ if (manager->priv->dbus_connection == NULL) { -+ if (manager->priv->bus_proxy != NULL) { -+ g_object_unref (manager->priv->bus_proxy); -+ manager->priv->bus_proxy = NULL; -+ } -+ -+ if (manager->priv->gpm_proxy != NULL) { -+ g_object_unref (manager->priv->gpm_proxy); -+ manager->priv->gpm_proxy = NULL; -+ } -+ } else if (manager->priv->bus_proxy == NULL) { -+ if (manager->priv->gpm_proxy != NULL) { -+ g_object_unref (manager->priv->gpm_proxy); -+ manager->priv->gpm_proxy = NULL; -+ } -+ } -+ } -+ -+ return is_connected; -+} -+ -+static void -+gsm_power_manager_init (GsmPowerManager *manager) -+{ -+ GError *error; -+ -+ manager->priv = G_TYPE_INSTANCE_GET_PRIVATE (manager, -+ GSM_TYPE_POWER_MANAGER, -+ GsmPowerManagerPrivate); -+ -+ manager->priv->dbus_connection = NULL; -+ manager->priv->bus_proxy = NULL; -+ manager->priv->gpm_proxy = NULL; -+ manager->priv->is_connected = FALSE; -+ -+ error = NULL; -+ -+ if (!ensure_gpm_connection (manager, &error)) { -+ g_message ("Could not connect to power manager: %s", -+ error->message); -+ g_error_free (error); -+ } -+} -+ -+static void -+gsm_power_manager_finalize (GObject *object) -+{ -+ GsmPowerManager *manager; -+ GObjectClass *parent_class; -+ -+ manager = GSM_POWER_MANAGER (object); -+ -+ parent_class = G_OBJECT_CLASS (gsm_power_manager_parent_class); -+ -+ if (parent_class->finalize != NULL) { -+ parent_class->finalize (object); -+ } -+} -+ -+static void -+gsm_power_manager_get_property (GObject *object, -+ guint prop_id, -+ GValue *value, -+ GParamSpec *pspec) -+{ -+ GsmPowerManager *manager = GSM_POWER_MANAGER (object); -+ -+ switch (prop_id) { -+ case PROP_IS_CONNECTED: -+ g_value_set_boolean (value, -+ manager->priv->is_connected); -+ break; -+ -+ default: -+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, -+ prop_id, -+ pspec); -+ } -+} -+ -+GQuark -+gsm_power_manager_error_quark (void) -+{ -+ static GQuark error_quark = 0; -+ -+ if (error_quark == 0) -+ error_quark = g_quark_from_static_string ("gsm-power-manager-error"); -+ -+ return error_quark; -+} -+ -+GsmPowerManager * -+gsm_power_manager_new (void) -+{ -+ GsmPowerManager *manager; -+ -+ manager = g_object_new (GSM_TYPE_POWER_MANAGER, NULL); -+ -+ return manager; -+} -+ -+gboolean -+gsm_power_manager_can_suspend (GsmPowerManager *manager) -+{ -+ GError *error; -+ gboolean can_suspend; -+ -+ error = NULL; -+ -+ if (!ensure_gpm_connection (manager, &error)) { -+ g_message ("Could not connect to power manager: %s", -+ error->message); -+ -+ g_error_free (error); -+ -+ return FALSE; -+ } -+ -+ can_suspend = FALSE; -+ -+ if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "CanSuspend", -+ &error, -+ G_TYPE_INVALID, -+ G_TYPE_BOOLEAN, &can_suspend, G_TYPE_INVALID)) { -+ if (error != NULL) { -+ g_message ("Could not ask power manager if user can suspend: %s", -+ error->message); -+ -+ g_error_free (error); -+ } -+ -+ can_suspend = FALSE; -+ } -+ -+ return can_suspend; -+} -+ -+gboolean -+gsm_power_manager_can_hibernate (GsmPowerManager *manager) -+{ -+ GError *error; -+ gboolean can_hibernate; -+ -+ error = NULL; -+ -+ if (!ensure_gpm_connection (manager, &error)) { -+ g_message ("Could not connect to power manager: %s", -+ error->message); -+ -+ g_error_free (error); -+ -+ return FALSE; -+ } -+ -+ can_hibernate = FALSE; -+ -+ if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "CanHibernate", -+ &error, -+ G_TYPE_INVALID, -+ G_TYPE_BOOLEAN, &can_hibernate, G_TYPE_INVALID)) { -+ if (error != NULL) { -+ g_message ("Could not ask power manager if user can suspend: %s", -+ error->message); -+ -+ g_error_free (error); -+ } -+ -+ can_hibernate = FALSE; -+ } -+ -+ return can_hibernate; -+} -+ -+void -+gsm_power_manager_attempt_suspend (GsmPowerManager *manager) -+{ -+ GError *error; -+ -+ error = NULL; -+ -+ if (!ensure_gpm_connection (manager, &error)) { -+ g_warning ("Could not connect to power manager: %s", -+ error->message); -+ g_error_free (error); -+ return; -+ } -+ -+ if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "Suspend", -+ &error, -+ G_TYPE_INVALID, G_TYPE_INVALID) && -+ error != NULL) { -+ GError *call_error; -+ -+ g_warning ("Could not ask power manager to suspend: %s", -+ error->message); -+ -+ call_error = g_error_new_literal (GSM_POWER_MANAGER_ERROR, -+ GSM_POWER_MANAGER_ERROR_SUSPENDING, -+ error->message); -+ -+ g_error_free (error); -+ -+ g_signal_emit (G_OBJECT (manager), -+ signals[REQUEST_FAILED], -+ 0, call_error); -+ -+ g_error_free (call_error); -+ } -+} -+ -+void -+gsm_power_manager_attempt_hibernate (GsmPowerManager *manager) -+{ -+ GError *error; -+ -+ error = NULL; -+ if (!ensure_gpm_connection (manager, &error)) { -+ g_warning ("Could not connect to power manager: %s", -+ error->message); -+ -+ g_error_free (error); -+ -+ return; -+ } -+ -+ if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "Hibernate", -+ &error, -+ G_TYPE_INVALID, G_TYPE_INVALID) && -+ error != NULL) { -+ GError *call_error; -+ -+ g_warning ("Could not ask power manager to hibernate: %s", -+ error->message); -+ -+ call_error = g_error_new_literal (GSM_POWER_MANAGER_ERROR, -+ GSM_POWER_MANAGER_ERROR_HIBERNATING, -+ error->message); -+ -+ g_error_free (error); -+ -+ g_signal_emit (G_OBJECT (manager), -+ signals[REQUEST_FAILED], -+ 0, call_error); -+ -+ g_error_free (call_error); -+ } -+} -+ -+ -+GsmPowerManager * -+gsm_get_power_manager (void) -+{ -+ static GsmPowerManager *manager = NULL; -+ -+ if (manager == NULL) { -+ manager = gsm_power_manager_new (); -+ } -+ -+ return g_object_ref (manager); -+} diff --git a/x11/gnome-session/files/patch-gnome-session_gsm-power-manager.h b/x11/gnome-session/files/patch-gnome-session_gsm-power-manager.h deleted file mode 100644 index 2a27338b7dba..000000000000 --- a/x11/gnome-session/files/patch-gnome-session_gsm-power-manager.h +++ /dev/null @@ -1,90 +0,0 @@ ---- gnome-session/gsm-power-manager.h.orig 2009-08-26 14:14:35.000000000 -0400 -+++ gnome-session/gsm-power-manager.h 2009-08-26 14:15:07.000000000 -0400 -@@ -0,0 +1,87 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- -+ * -+ * power-manager.h: functions for powering down, restarting, and -+ * suspending the computer -+ * Copyright (C) 2006 Ray Strode <rstrode@redhat.com> -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2, or (at your option) -+ * any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -+ * 02111-1307, USA. -+ */ -+ -+#ifndef __GSM_POWER_MANAGER_H__ -+#define __GSM_POWER_MANAGER_H__ -+ -+#include <glib.h> -+#include <glib-object.h> -+ -+G_BEGIN_DECLS -+ -+#define GSM_TYPE_POWER_MANAGER (gsm_power_manager_get_type ()) -+#define GSM_POWER_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GSM_TYPE_POWER_MANAGER, GsmPowerManager)) -+#define GSM_POWER_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GSM_TYPE_POWER_MANAGER, GsmPowerManagerClass)) -+#define GSM_IS_POWER_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GSM_TYPE_POWER_MANAGER)) -+#define GSM_IS_POWER_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GSM_TYPE_POWER_MANAGER)) -+#define GSM_POWER_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GSM_TYPE_POWER_MANAGER, GsmPowerManagerClass)) -+#define GSM_POWER_MANAGER_ERROR (gsm_power_manager_error_quark ()) -+ -+typedef struct _GsmPowerManager GsmPowerManager; -+typedef struct _GsmPowerManagerClass GsmPowerManagerClass; -+typedef struct _GsmPowerManagerPrivate GsmPowerManagerPrivate; -+typedef enum _GsmPowerManagerError GsmPowerManagerError; -+ -+struct _GsmPowerManager -+{ -+ GObject parent; -+ -+ GsmPowerManagerPrivate *priv; -+}; -+ -+struct _GsmPowerManagerClass -+{ -+ GObjectClass parent_class; -+ -+ void (* request_failed) (GsmPowerManager *manager, -+ GError *error); -+}; -+ -+enum _GsmPowerManagerError -+{ -+ GSM_POWER_MANAGER_ERROR_SUSPENDING = 0, -+ GSM_POWER_MANAGER_ERROR_HIBERNATING -+}; -+ -+GType gsm_power_manager_get_type (void) G_GNUC_CONST; -+ -+GQuark gsm_power_manager_error_quark (void); -+ -+GsmPowerManager *gsm_power_manager_new (void) G_GNUC_MALLOC; -+ -+GsmPowerManager *gsm_get_power_manager (void); -+ -+gboolean gsm_power_manager_can_suspend (GsmPowerManager *manager); -+ -+gboolean gsm_power_manager_can_hibernate (GsmPowerManager *manager); -+ -+gboolean gsm_power_manager_can_power_down (GsmPowerManager *manager); -+ -+gboolean gsm_power_manager_can_restart (GsmPowerManager *manager); -+ -+void gsm_power_manager_attempt_suspend (GsmPowerManager *manager); -+ -+void gsm_power_manager_attempt_hibernate (GsmPowerManager *manager); -+ -+G_END_DECLS -+ -+#endif /* __GSM_POWER_MANAGER_H__ */ diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist index 306533fcb5ca..cff118134b1e 100644 --- a/x11/gnome-session/pkg-plist +++ b/x11/gnome-session/pkg-plist @@ -4,8 +4,8 @@ bin/gnome-session-save bin/gnome-wm etc/xdg/autostart/gnome-session-splash.desktop etc/xdg/autostart/gnome-settings-daemon-helper.desktop -lib/gnome-session/helpers/gnome-session-splash -lib/gnome-session/helpers/gnome-settings-daemon-helper +libexec/gnome-session/helpers/gnome-session-splash +libexec/gnome-session/helpers/gnome-settings-daemon-helper share/applications/session-properties.desktop %%DATADIR%%/gsm-inhibit-dialog.ui %%DATADIR%%/session-properties.ui @@ -37,6 +37,7 @@ share/locale/da/LC_MESSAGES/gnome-session-2.0.mo share/locale/de/LC_MESSAGES/gnome-session-2.0.mo share/locale/dz/LC_MESSAGES/gnome-session-2.0.mo share/locale/el/LC_MESSAGES/gnome-session-2.0.mo +share/locale/en@shaw/LC_MESSAGES/gnome-session-2.0.mo share/locale/en_CA/LC_MESSAGES/gnome-session-2.0.mo share/locale/en_GB/LC_MESSAGES/gnome-session-2.0.mo share/locale/eo/LC_MESSAGES/gnome-session-2.0.mo @@ -76,6 +77,7 @@ share/locale/mn/LC_MESSAGES/gnome-session-2.0.mo share/locale/mr/LC_MESSAGES/gnome-session-2.0.mo share/locale/ms/LC_MESSAGES/gnome-session-2.0.mo share/locale/nb/LC_MESSAGES/gnome-session-2.0.mo +share/locale/nds/LC_MESSAGES/gnome-session-2.0.mo share/locale/ne/LC_MESSAGES/gnome-session-2.0.mo share/locale/nl/LC_MESSAGES/gnome-session-2.0.mo share/locale/nn/LC_MESSAGES/gnome-session-2.0.mo @@ -138,8 +140,8 @@ share/xsessions/gnome.desktop @dirrmtry share/xsessions @dirrm %%DATADIR%% @dirrmtry share/applications -@dirrm lib/gnome-session/helpers -@dirrm lib/gnome-session +@dirrm libexec/gnome-session/helpers +@dirrm libexec/gnome-session @dirrmtry share/locale/zu/LC_MESSAGES @dirrmtry share/locale/zu @dirrmtry share/locale/zh_HK/LC_MESSAGES @@ -164,6 +166,8 @@ share/xsessions/gnome.desktop @dirrmtry share/locale/oc @dirrmtry share/locale/nso/LC_MESSAGES @dirrmtry share/locale/nso +@dirrmtry share/locale/nds/LC_MESSAGES +@dirrmtry share/locale/nds @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr @dirrmtry share/locale/mi/LC_MESSAGES @@ -182,6 +186,8 @@ share/xsessions/gnome.desktop @dirrmtry share/locale/ha @dirrmtry share/locale/fur/LC_MESSAGES @dirrmtry share/locale/fur +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/crh/LC_MESSAGES diff --git a/x11/gnome-shell/Makefile b/x11/gnome-shell/Makefile index 677d384b1680..3cb34868a3e1 100644 --- a/x11/gnome-shell/Makefile +++ b/x11/gnome-shell/Makefile @@ -3,12 +3,11 @@ # Whom: Pawel Worach <pawel.worach@gmail.com> # # $FreeBSD$ -# $MCom: ports/x11/gnome-shell/Makefile,v 1.6 2009/10/08 06:58:31 kwm Exp $ +# $MCom: ports/x11/gnome-shell/Makefile,v 1.11 2010/03/29 11:42:11 kwm Exp $ # PORTNAME= gnome-shell -PORTVERSION= 2.28.0 -PORTREVISION= 3 +PORTVERSION= 2.29.1 CATEGORIES= x11 MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -16,13 +15,12 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Next generation GNOME desktop shell -BUILD_DEPENDS= ${LOCALBASE}/share/gir-1.0/Gtk-2.0.gir:${PORTSDIR}/x11-toolkits/gir-repository-gtk20 LIB_DEPENDS= startup-notification-1.0:${PORTSDIR}/x11/startup-notification \ mutter-private.0:${PORTSDIR}/x11-wm/mutter \ clutter-glx-1.0:${PORTSDIR}/graphics/clutter \ gjs-gi:${PORTSDIR}/lang/gjs RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-dbus \ - ${LOCALBASE}/share/gir-1.0/Gtk-2.0.gir:${PORTSDIR}/x11-toolkits/gir-repository-gtk20 + glxinfo:${PORTSDIR}/graphics/mesa-demos USE_BZIP2= yes USE_XORG= x11 xfixes sm @@ -37,12 +35,17 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/js -I${LOCALBASE}/include/nspr" GCONF_SCHEMAS= gnome-shell.schemas +MAN1= gnome-shell.1 + post-patch: @${REINPLACE_CMD} -e 's|-Werror||g' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/usr/bin/python|/usr/bin/env python|g' \ -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/src/gnome-shell.in +# temp hack around configure failure in 2.29.90. Fixed upstream + @${REINPLACE_CMD} -e 's|@GETTEXT_PACKAGE@|gnome-shell|g' \ + ${WRKSRC}/po/Makefile.in.in post-install: @${CAT} ${PKGMESSAGE} diff --git a/x11/gnome-shell/distinfo b/x11/gnome-shell/distinfo index a96b0a90297d..088b45374d71 100644 --- a/x11/gnome-shell/distinfo +++ b/x11/gnome-shell/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-shell-2.28.0.tar.bz2) = a9f93a6f03da60f2f6e3fb82a9e7dc94 -SHA256 (gnome2/gnome-shell-2.28.0.tar.bz2) = 64d30bd2692af2047a3056545b8f549c713ee91877cee8742d4b02d606ef6bd4 -SIZE (gnome2/gnome-shell-2.28.0.tar.bz2) = 591376 +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 diff --git a/x11/gnome-shell/pkg-plist b/x11/gnome-shell/pkg-plist index 011206360815..32918573d672 100644 --- a/x11/gnome-shell/pkg-plist +++ b/x11/gnome-shell/pkg-plist @@ -1,63 +1,87 @@ bin/gnome-shell lib/gnome-shell/Big-1.0.typelib +lib/gnome-shell/Gdm-1.0.typelib lib/gnome-shell/Shell-0.1.typelib lib/gnome-shell/St-1.0.typelib lib/mutter/plugins/libgnome-shell.a lib/mutter/plugins/libgnome-shell.la lib/mutter/plugins/libgnome-shell.so share/applications/gnome-shell.desktop -%%DATADIR%%/images/app-well-glow.png -%%DATADIR%%/images/add-workspace.svg -%%DATADIR%%/images/back.svg %%DATADIR%%/images/close-black.svg -%%DATADIR%%/images/close.svg -%%DATADIR%%/images/info.svg %%DATADIR%%/images/magnifier.svg -%%DATADIR%%/images/remove-workspace.svg %%DATADIR%%/js/misc/docInfo.js %%DATADIR%%/js/misc/format.js -%%DATADIR%%/js/ui/appIcon.js +%%DATADIR%%/js/misc/params.js %%DATADIR%%/js/ui/altTab.js %%DATADIR%%/js/ui/appDisplay.js -%%DATADIR%%/js/ui/button.js +%%DATADIR%%/js/ui/appFavorites.js %%DATADIR%%/js/ui/calendar.js %%DATADIR%%/js/ui/chrome.js %%DATADIR%%/js/ui/dash.js %%DATADIR%%/js/ui/dnd.js %%DATADIR%%/js/ui/docDisplay.js %%DATADIR%%/js/ui/environment.js +%%DATADIR%%/js/ui/extensionSystem.js %%DATADIR%%/js/ui/genericDisplay.js %%DATADIR%%/js/ui/lightbox.js %%DATADIR%%/js/ui/link.js %%DATADIR%%/js/ui/lookingGlass.js %%DATADIR%%/js/ui/main.js +%%DATADIR%%/js/ui/messageTray.js +%%DATADIR%%/js/ui/notificationDaemon.js %%DATADIR%%/js/ui/overview.js +%%DATADIR%%/js/ui/placeDisplay.js %%DATADIR%%/js/ui/panel.js -%%DATADIR%%/js/ui/places.js %%DATADIR%%/js/ui/runDialog.js +%%DATADIR%%/js/ui/search.js %%DATADIR%%/js/ui/shellDBus.js +%%DATADIR%%/js/ui/statusMenu.js %%DATADIR%%/js/ui/sidebar.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/workspaces.js +%%DATADIR%%/js/ui/workspace.js +%%DATADIR%%/js/ui/workspaceSwitcherPopup.js +%%DATADIR%%/js/ui/workspacesView.js +%%DATADIR%%/theme/add-workspace.svg +%%DATADIR%%/theme/close-window.svg +%%DATADIR%%/theme/close.svg +%%DATADIR%%/theme/corner-ripple.png +%%DATADIR%%/theme/dialog-error.svg %%DATADIR%%/theme/gnome-shell.css +%%DATADIR%%/theme/mosaic-view-active.svg +%%DATADIR%%/theme/mosaic-view.svg +%%DATADIR%%/theme/move-window-on-new.svg +%%DATADIR%%/theme/remove-workspace.svg %%DATADIR%%/theme/scroll-button-down-hover.png %%DATADIR%%/theme/scroll-button-down.png %%DATADIR%%/theme/scroll-button-up-hover.png %%DATADIR%%/theme/scroll-button-up.png -%%DATADIR%%/theme/scroll-vhandle.png +%%DATADIR%%/theme/scroll-hhandle.svg +%%DATADIR%%/theme/scroll-vhandle.svg +%%DATADIR%%/theme/section-back.svg +%%DATADIR%%/theme/section-more-open.svg +%%DATADIR%%/theme/section-more.svg +%%DATADIR%%/theme/single-view-active.svg +%%DATADIR%%/theme/single-view.svg +%%DATADIR%%/theme/ws-switch-arrow-left.svg +%%DATADIR%%/theme/ws-switch-arrow-right.svg share/locale/ar/LC_MESSAGES/gnome-shell.mo +share/locale/bg/LC_MESSAGES/gnome-shell.mo share/locale/ca/LC_MESSAGES/gnome-shell.mo share/locale/cs/LC_MESSAGES/gnome-shell.mo share/locale/da/LC_MESSAGES/gnome-shell.mo share/locale/de/LC_MESSAGES/gnome-shell.mo +share/locale/el/LC_MESSAGES/gnome-shell.mo share/locale/en_GB/LC_MESSAGES/gnome-shell.mo share/locale/es/LC_MESSAGES/gnome-shell.mo +share/locale/fi/LC_MESSAGES/gnome-shell.mo share/locale/fr/LC_MESSAGES/gnome-shell.mo share/locale/ga/LC_MESSAGES/gnome-shell.mo share/locale/gl/LC_MESSAGES/gnome-shell.mo +share/locale/he/LC_MESSAGES/gnome-shell.mo share/locale/hu/LC_MESSAGES/gnome-shell.mo share/locale/it/LC_MESSAGES/gnome-shell.mo share/locale/ko/LC_MESSAGES/gnome-shell.mo @@ -66,9 +90,14 @@ share/locale/nl/LC_MESSAGES/gnome-shell.mo share/locale/pa/LC_MESSAGES/gnome-shell.mo share/locale/pl/LC_MESSAGES/gnome-shell.mo share/locale/pt_BR/LC_MESSAGES/gnome-shell.mo +share/locale/ro/LC_MESSAGES/gnome-shell.mo +share/locale/ru/LC_MESSAGES/gnome-shell.mo share/locale/sl/LC_MESSAGES/gnome-shell.mo +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/vi/LC_MESSAGES/gnome-shell.mo share/locale/zh_CN/LC_MESSAGES/gnome-shell.mo @dirrm %%DATADIR%%/theme @dirrm %%DATADIR%%/js/ui @@ -77,3 +106,5 @@ share/locale/zh_CN/LC_MESSAGES/gnome-shell.mo @dirrm %%DATADIR%%/images @dirrm %%DATADIR%% @dirrm lib/gnome-shell +@dirrmtry share/locale/sr@latin/LC_MESSAGES +@dirrmtry share/locale/sr@latin diff --git a/x11/gnome-swallow/Makefile b/x11/gnome-swallow/Makefile index 419e23e77bff..0d4896a2083b 100644 --- a/x11/gnome-swallow/Makefile +++ b/x11/gnome-swallow/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnome-swallow PORTVERSION= 1.2 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= x11 gnome MASTER_SITES= http://interreality.org/~tetron/technology/swallow/ @@ -16,7 +16,7 @@ COMMENT= Applet that swallows any X11 application into the GNOME 2 panel USE_XORG= x11 USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack gnomepanel +USE_GNOME= gnomeprefix gnomehack gnomepanel libgnomeui GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0`" \ LDFLAGS="-L${LOCALBASE}/lib" \ diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile index 936f8ad397db..9736b5708846 100644 --- a/x11/gnome-terminal/Makefile +++ b/x11/gnome-terminal/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-terminal/Makefile,v 1.125 2009/10/19 20:14:29 kwm Exp $ +# $MCom: ports/x11/gnome-terminal/Makefile,v 1.132 2010/04/28 02:58:55 mezz Exp $ # PORTNAME= gnome-terminal -PORTVERSION= 2.28.2 -PORTREVISION= 2 +PORTVERSION= 2.30.1 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -23,7 +22,8 @@ USE_BZIP2= yes INSTALLS_OMF= yes USE_GMAKE= yes USE_XORG= sm -USE_GNOME= gnomeprefix gnomehack intlhack gconf2 vte gnomedocutils +USE_GNOME= gnomeprefix gnomehack intlhack gconf2 vte gnomedocutils \ + libgnome GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11/gnome-terminal/distinfo b/x11/gnome-terminal/distinfo index 78716296d92a..5f3e251d1b1a 100644 --- a/x11/gnome-terminal/distinfo +++ b/x11/gnome-terminal/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-terminal-2.28.2.tar.bz2) = aa053ff38932cf032c70ab6522603053 -SHA256 (gnome2/gnome-terminal-2.28.2.tar.bz2) = ccf2547c579755ec9b6f727add6bb327bbda95ac621aa6e0738fbd37ab6c9c78 -SIZE (gnome2/gnome-terminal-2.28.2.tar.bz2) = 2194820 +MD5 (gnome2/gnome-terminal-2.30.1.tar.bz2) = fed3235a053ce34a16218bfe1c2202ca +SHA256 (gnome2/gnome-terminal-2.30.1.tar.bz2) = 6f30ff97c0798dbfdc8e0910427d88d1d210b8b63f3d0a238a3d48ef2a280cd7 +SIZE (gnome2/gnome-terminal-2.30.1.tar.bz2) = 2250757 diff --git a/x11/gnome-terminal/files/patch-src_terminal-screen.c b/x11/gnome-terminal/files/patch-src_terminal-screen.c index 52f80dd55eb3..3af16e2e363a 100644 --- a/x11/gnome-terminal/files/patch-src_terminal-screen.c +++ b/x11/gnome-terminal/files/patch-src_terminal-screen.c @@ -50,7 +50,7 @@ } } +#else -+ int fgpid; ++ int fgpid = pid; +#if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104) +#ifndef HAVE_KINFO_GETFILE + name[0] = CTL_KERN; diff --git a/x11/gnome-terminal/pkg-plist b/x11/gnome-terminal/pkg-plist index 1647061baee4..04dd19834a12 100644 --- a/x11/gnome-terminal/pkg-plist +++ b/x11/gnome-terminal/pkg-plist @@ -86,6 +86,7 @@ share/locale/be@latin/LC_MESSAGES/gnome-terminal.mo share/locale/bg/LC_MESSAGES/gnome-terminal.mo share/locale/bn/LC_MESSAGES/gnome-terminal.mo share/locale/bn_IN/LC_MESSAGES/gnome-terminal.mo +share/locale/br/LC_MESSAGES/gnome-terminal.mo share/locale/bs/LC_MESSAGES/gnome-terminal.mo share/locale/ca/LC_MESSAGES/gnome-terminal.mo share/locale/ca@valencia/LC_MESSAGES/gnome-terminal.mo @@ -99,6 +100,7 @@ share/locale/en_CA/LC_MESSAGES/gnome-terminal.mo share/locale/en_GB/LC_MESSAGES/gnome-terminal.mo share/locale/es/LC_MESSAGES/gnome-terminal.mo share/locale/et/LC_MESSAGES/gnome-terminal.mo +share/locale/en@shaw/LC_MESSAGES/gnome-terminal.mo share/locale/eu/LC_MESSAGES/gnome-terminal.mo share/locale/fa/LC_MESSAGES/gnome-terminal.mo share/locale/fi/LC_MESSAGES/gnome-terminal.mo @@ -258,6 +260,8 @@ share/omf/gnome-terminal/gnome-terminal-zh_TW.omf @dirrmtry share/locale/hy @dirrmtry share/locale/fur/LC_MESSAGES @dirrmtry share/locale/fur +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/ca@valencia/LC_MESSAGES diff --git a/x11/gnome2-fifth-toe/Makefile b/x11/gnome2-fifth-toe/Makefile index 8364130cf0c9..1b3bf6f0828d 100644 --- a/x11/gnome2-fifth-toe/Makefile +++ b/x11/gnome2-fifth-toe/Makefile @@ -6,7 +6,7 @@ # $MCom: ports/x11/gnome2-fifth-toe/Makefile,v 1.92 2007/10/18 23:45:20 marcus Exp $ # -PORTREVISION= 3 +PORTREVISION= 0 CATEGORIES= x11 gnome PKGNAMESUFFIX= -fifth-toe diff --git a/x11/gnome2-lite/Makefile b/x11/gnome2-lite/Makefile index e8f957a2d9b5..d61e332afa29 100644 --- a/x11/gnome2-lite/Makefile +++ b/x11/gnome2-lite/Makefile @@ -6,7 +6,7 @@ # $MCom: ports/x11/gnome2-lite/Makefile,v 1.62 2009/11/26 20:39:06 marcus Exp $ # -PORTREVISION= 3 +PORTREVISION= 0 CATEGORIES= x11 gnome PKGNAMESUFFIX= -lite diff --git a/x11/gnome2-power-tools/Makefile b/x11/gnome2-power-tools/Makefile index 92008917a3e7..7bd0179aedee 100644 --- a/x11/gnome2-power-tools/Makefile +++ b/x11/gnome2-power-tools/Makefile @@ -6,13 +6,13 @@ # $MCom: ports/x11/gnome2-power-tools/Makefile,v 1.84 2008/09/30 13:18:29 kwm Exp $ # -PORTREVISION= 4 +PORTREVISION= 0 CATEGORIES= x11 gnome PKGNAMESUFFIX= -power-tools COMMENT= The 'Geektoys' for the GNOME 2 power user -RUN_DEPENDS= ${LOCALBASE}/lib/epiphany/2.28/extensions/libgesturesextension.so:${PORTSDIR}/www/epiphany-extensions \ +RUN_DEPENDS= ${LOCALBASE}/share/epiphany-extensions/adblock-patterns:${PORTSDIR}/www/epiphany-extensions \ gnome-pkgview:${PORTSDIR}/sysutils/gnome-pkgview \ ${LOCALBASE}/libexec/netspeed_applet2:${PORTSDIR}/net/netspeed_applet \ ${LOCALBASE}/sbin/gkrellmd:${PORTSDIR}/sysutils/gkrellm2 \ diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile index ac9fa0d45049..94fd25faf804 100644 --- a/x11/gnome2/Makefile +++ b/x11/gnome2/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome2/Makefile,v 1.279 2009/10/22 15:15:40 kwm Exp $ +# $MCom: ports/x11/gnome2/Makefile,v 1.292 2010/04/30 13:38:35 kwm Exp $ # PORTNAME= gnome2 -PORTVERSION= 2.28.2 -PORTREVISION?= 3 +PORTVERSION= 2.30.1 +PORTREVISION?= 0 CATEGORIES?= x11 gnome MASTER_SITES= # empty DISTFILES= # empty @@ -44,7 +44,7 @@ RUN_DEPENDS?= ${LOCALBASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-apple ${LOCALBASE}/libexec/evolution-webcal:${PORTSDIR}/www/evolution-webcal \ network-admin:${PORTSDIR}/sysutils/gnome-system-tools \ vino-passwd:${PORTSDIR}/net/vino \ - exchange-connector-setup-2.28:${PORTSDIR}/mail/evolution-exchange \ + exchange-connector-setup-2.30:${PORTSDIR}/mail/evolution-exchange \ ${LOCALBASE}/lib/gstreamer-0.10/.gstreamer-plugins-core.keep:${PORTSDIR}/multimedia/gstreamer-plugins-core \ ${LOCALBASE}/lib/gstreamer-0.10/libgstgconfelements.so:${PORTSDIR}/devel/gstreamer-plugins-gconf \ totem:${PORTSDIR}/multimedia/totem \ @@ -93,12 +93,14 @@ RUN_DEPENDS+= empathy:${PORTSDIR}/net-im/empathy \ brasero:${PORTSDIR}/sysutils/brasero \ gnome-file-share-properties:${PORTSDIR}/www/gnome-user-share \ ${LOCALBASE}/libexec/deskbar-applet/deskbar-applet:${PORTSDIR}/deskutils/deskbar-applet \ - ${LOCALBASE}/lib/hamster-applet/hamster-applet:${PORTSDIR}/deskutils/hamster-applet + ${LOCALBASE}/lib/hamster-applet/hamster-applet:${PORTSDIR}/deskutils/hamster-applet \ + ${LOCALBASE}/lib/gtk-2.0/modules/at-spi-dbus/modules/libatk-bridge.so:${PORTSDIR}/accessibility/at-spi2-atk \ + gpk-application:${PORTSDIR}/ports-mgmt/gnome-packagekit .if ${ARCH} == "i386" #RUN_DEPENDS+= tomboy:${PORTSDIR}/deskutils/tomboy .endif .if ${OSVERSION}>=600000 -RUN_DEPENDS+= ekiga:${PORTSDIR}/net/ekiga +RUN_DEPENDS+= ekiga:${PORTSDIR}/net/ekiga3 .endif .if defined(WITH_MAPI) RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/libexchangemapi-1.0.pc:${PORTSDIR}/mail/evolution-mapi diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile index 6f319b804a93..f93e71890de6 100644 --- a/x11/libgnome/Makefile +++ b/x11/libgnome/Makefile @@ -3,12 +3,12 @@ # Whom: Yukihiro Nakai <Nakai@technologist.com> # # $FreeBSD$ -# $MCom: ports/x11/libgnome/Makefile,v 1.129 2009/09/23 00:32:50 avl Exp $ +# $MCom: ports/x11/libgnome/Makefile,v 1.131 2010/04/01 14:49:19 kwm Exp $ # PORTNAME= libgnome -PORTVERSION= 2.28.0 -PORTREVISION?= 2 +PORTVERSION= 2.30.0 +PORTREVISION?= 0 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo index a551c7d051ee..25b5f11516c0 100644 --- a/x11/libgnome/distinfo +++ b/x11/libgnome/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgnome-2.28.0.tar.bz2) = 5c7efe21dc28c137aa766a77a84c0c29 -SHA256 (gnome2/libgnome-2.28.0.tar.bz2) = 9b5b05085b814406f75abfaa1a85395bcf92c8f933248219e1bd738d500d0c0e -SIZE (gnome2/libgnome-2.28.0.tar.bz2) = 1407385 +MD5 (gnome2/libgnome-2.30.0.tar.bz2) = 1f85adc40b242b953c0e96ad017c2616 +SHA256 (gnome2/libgnome-2.30.0.tar.bz2) = 3ed932b94f16614cb03c7661f39b574845970c6ce3ca46e46338409283856f1f +SIZE (gnome2/libgnome-2.30.0.tar.bz2) = 1736034 diff --git a/x11/libgnome/files/pkg-deinstall.in b/x11/libgnome/files/pkg-deinstall.in index e52462b671dd..ef1c2e727f69 100644 --- a/x11/libgnome/files/pkg-deinstall.in +++ b/x11/libgnome/files/pkg-deinstall.in @@ -1,7 +1,7 @@ #!/bin/sh # # $FreeBSD$ -# $MCom: ports/x11/libgnome/files/pkg-deinstall.in,v 1.23 2009/09/26 13:42:02 marcus Exp $ +# $MCom: ports/x11/libgnome/files/pkg-deinstall.in,v 1.26 2010/04/02 21:50:07 kwm Exp $ # # Restore gconf keys of gnomevfs2. diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist index 1e3d9dc8fe7e..8acd7b31795d 100644 --- a/x11/libgnome/pkg-plist +++ b/x11/libgnome/pkg-plist @@ -46,6 +46,7 @@ share/locale/da/LC_MESSAGES/libgnome-2.0.mo share/locale/de/LC_MESSAGES/libgnome-2.0.mo share/locale/dz/LC_MESSAGES/libgnome-2.0.mo share/locale/el/LC_MESSAGES/libgnome-2.0.mo +share/locale/en@shaw/LC_MESSAGES/libgnome-2.0.mo share/locale/en_CA/LC_MESSAGES/libgnome-2.0.mo share/locale/en_GB/LC_MESSAGES/libgnome-2.0.mo share/locale/eo/LC_MESSAGES/libgnome-2.0.mo @@ -82,6 +83,7 @@ share/locale/mr/LC_MESSAGES/libgnome-2.0.mo share/locale/ms/LC_MESSAGES/libgnome-2.0.mo share/locale/nb/LC_MESSAGES/libgnome-2.0.mo share/locale/ne/LC_MESSAGES/libgnome-2.0.mo +share/locale/nds/LC_MESSAGES/libgnome-2.0.mo share/locale/nl/LC_MESSAGES/libgnome-2.0.mo share/locale/nn/LC_MESSAGES/libgnome-2.0.mo share/locale/oc/LC_MESSAGES/libgnome-2.0.mo @@ -140,6 +142,8 @@ share/pixmaps/backgrounds/gnome/background-default.jpg @dirrmtry share/locale/rw @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc +@dirrmtry share/locale/nds/LC_MESSAGES +@dirrmtry share/locale/nds @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr @dirrmtry share/locale/mg/LC_MESSAGES @@ -150,6 +154,8 @@ share/pixmaps/backgrounds/gnome/background-default.jpg @dirrmtry share/locale/ku @dirrmtry share/locale/fur/LC_MESSAGES @dirrmtry share/locale/fur +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/crh/LC_MESSAGES diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile index 82034973b1ae..e92505a9ac8a 100644 --- a/x11/libgnomekbd/Makefile +++ b/x11/libgnomekbd/Makefile @@ -3,12 +3,11 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/libgnomekbd/Makefile,v 1.37 2009/09/22 23:24:04 avl Exp $ +# $MCom: ports/x11/libgnomekbd/Makefile,v 1.42 2010/04/24 01:36:37 marcus Exp $ # PORTNAME= libgnomekbd -PORTVERSION= 2.28.2 -PORTREVISION= 2 +PORTVERSION= 2.30.1 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -16,8 +15,7 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME keyboard shared library -LIB_DEPENDS= xklavier.12:${PORTSDIR}/x11/libxklavier \ - dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib +LIB_DEPENDS= xklavier.12:${PORTSDIR}/x11/libxklavier USE_BZIP2= yes USE_GNOME= gnomeprefix gnomehack ltverhack gconf2 diff --git a/x11/libgnomekbd/distinfo b/x11/libgnomekbd/distinfo index b19acd23d3c0..20a1c01a0ae9 100644 --- a/x11/libgnomekbd/distinfo +++ b/x11/libgnomekbd/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgnomekbd-2.28.2.tar.bz2) = 28dce813a6c76439a2136fbd2394a058 -SHA256 (gnome2/libgnomekbd-2.28.2.tar.bz2) = c8503ba93e462cb87975adbad43d0f77273cca038d0b5885e66f679da1ff695a -SIZE (gnome2/libgnomekbd-2.28.2.tar.bz2) = 398401 +MD5 (gnome2/libgnomekbd-2.30.1.tar.bz2) = 9b828a4e35089d91b9ea16ddf981ff28 +SHA256 (gnome2/libgnomekbd-2.30.1.tar.bz2) = 828faade8ef36f89cc27ca4f71e83630aa611ccb4745cb6687cdedddd461b293 +SIZE (gnome2/libgnomekbd-2.30.1.tar.bz2) = 404828 diff --git a/x11/libgnomekbd/pkg-plist b/x11/libgnomekbd/pkg-plist index 4c1c54bb343a..0225e40bef24 100644 --- a/x11/libgnomekbd/pkg-plist +++ b/x11/libgnomekbd/pkg-plist @@ -5,6 +5,7 @@ include/libgnomekbd/gkbd-indicator-plugin.h include/libgnomekbd/gkbd-indicator.h include/libgnomekbd/gkbd-keyboard-config.h include/libgnomekbd/gkbd-keyboard-drawing.h +include/libgnomekbd/gkbd-status.h include/libgnomekbd/gkbd-util.h lib/libgnomekbd.a lib/libgnomekbd.la @@ -21,6 +22,7 @@ share/applications/gkbd-indicator-plugins-capplet.desktop %%DATADIR%%/ui/gkbd-indicator-plugins_add.ui share/locale/ar/LC_MESSAGES/libgnomekbd.mo share/locale/as/LC_MESSAGES/libgnomekbd.mo +share/locale/ast/LC_MESSAGES/libgnomekbd.mo share/locale/be@latin/LC_MESSAGES/libgnomekbd.mo share/locale/bg/LC_MESSAGES/libgnomekbd.mo share/locale/bn/LC_MESSAGES/libgnomekbd.mo @@ -68,6 +70,7 @@ share/locale/pt_BR/LC_MESSAGES/libgnomekbd.mo share/locale/ro/LC_MESSAGES/libgnomekbd.mo share/locale/ru/LC_MESSAGES/libgnomekbd.mo share/locale/si/LC_MESSAGES/libgnomekbd.mo +share/locale/sk/LC_MESSAGES/libgnomekbd.mo share/locale/sl/LC_MESSAGES/libgnomekbd.mo share/locale/sq/LC_MESSAGES/libgnomekbd.mo share/locale/sr/LC_MESSAGES/libgnomekbd.mo @@ -104,7 +107,13 @@ share/locale/zh_TW/LC_MESSAGES/libgnomekbd.mo @dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz +@dirrmtry share/locale/ca@valencia/LC_MESSAGES +@dirrmtry share/locale/ca@valencia @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast +@dirrmtry share/locale/as/LC_MESSAGES +@dirrmtry share/locale/as diff --git a/x11/libgnomemm26/Makefile b/x11/libgnomemm26/Makefile index 3f9af145490d..6f44f03afaf5 100644 --- a/x11/libgnomemm26/Makefile +++ b/x11/libgnomemm26/Makefile @@ -3,12 +3,11 @@ # Whom: Alexander Nedotsukov <bland@mail.ru> # # $FreeBSD$ -# $MCom: ports/x11/libgnomemm26/Makefile,v 1.22 2009/09/22 21:02:40 kwm Exp $ +# $MCom: ports/x11/libgnomemm26/Makefile,v 1.24 2010/03/30 13:34:10 avl Exp $ # PORTNAME= libgnomemm -PORTVERSION= 2.28.0 -PORTREVISION= 2 +PORTVERSION= 2.30.0 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11/libgnomemm26/distinfo b/x11/libgnomemm26/distinfo index 5ab76c039375..ec610e7c822b 100644 --- a/x11/libgnomemm26/distinfo +++ b/x11/libgnomemm26/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgnomemm-2.28.0.tar.bz2) = 7c583094a12159a0bab0134df5e90853 -SHA256 (gnome2/libgnomemm-2.28.0.tar.bz2) = 55ee731bce977ced2b2cd5661cf605b1eb9d0188aa4d46fba44052a94b500e6e -SIZE (gnome2/libgnomemm-2.28.0.tar.bz2) = 361769 +MD5 (gnome2/libgnomemm-2.30.0.tar.bz2) = 860f5e835cd4674393ffdd692b0c9147 +SHA256 (gnome2/libgnomemm-2.30.0.tar.bz2) = 2a01f068ff73a1985d050e75f899fec34ac13622e2ead43523a4e2b0875042cf +SIZE (gnome2/libgnomemm-2.30.0.tar.bz2) = 364011 diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile index 83f7314db54a..61f9233ad7c0 100644 --- a/x11/libxklavier/Makefile +++ b/x11/libxklavier/Makefile @@ -3,12 +3,11 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/libxklavier/Makefile,v 1.51 2009/07/21 22:14:28 marcus Exp $ +# $MCom: ports/x11/libxklavier/Makefile,v 1.53 2010/01/12 02:18:34 avl Exp $ # PORTNAME= libxklavier -PORTVERSION= 4.0 -PORTREVISION= 1 +PORTVERSION= 5.0 PORTEPOCH= 1 CATEGORIES= x11 gnome MASTER_SITES= GNOME diff --git a/x11/libxklavier/distinfo b/x11/libxklavier/distinfo index be4bcb007ebc..5118c04490de 100644 --- a/x11/libxklavier/distinfo +++ b/x11/libxklavier/distinfo @@ -1,3 +1,3 @@ -MD5 (libxklavier-4.0.tar.bz2) = 1b714ba04835fb49511f9e1444a5ea4c -SHA256 (libxklavier-4.0.tar.bz2) = 210ed5803109a8cef3b2ab1195bc73fe3385a97a8749d01673e020642d8e5a71 -SIZE (libxklavier-4.0.tar.bz2) = 354149 +MD5 (libxklavier-5.0.tar.bz2) = 134c7ea177ff901123b909de77394780 +SHA256 (libxklavier-5.0.tar.bz2) = dfd94b17a752b2839281764f0a16af2b338024c8867c10fba7015f276dec4db0 +SIZE (libxklavier-5.0.tar.bz2) = 357862 diff --git a/x11/libxklavier/files/patch-libxklavier_xkl-enum-types.c b/x11/libxklavier/files/patch-libxklavier_xkl-enum-types.c deleted file mode 100644 index f749303176a8..000000000000 --- a/x11/libxklavier/files/patch-libxklavier_xkl-enum-types.c +++ /dev/null @@ -1,27 +0,0 @@ ---- libxklavier/xkl-enum-types.c.orig 2009-07-21 18:10:01.000000000 -0400 -+++ libxklavier/xkl-enum-types.c 2009-07-21 18:10:04.000000000 -0400 -@@ -21,9 +21,9 @@ xkl_engine_state_change_get_type (void) - GType - xkl_engine_features_get_type (void) - { -- static GType etype = 0; -- if (etype == 0) { -- static const GEnumValue values[] = { -+ static GType ftype = 0; -+ if (ftype == 0) { -+ static const GFlagsValue values[] = { - { XKLF_CAN_TOGGLE_INDICATORS, "XKLF_CAN_TOGGLE_INDICATORS", "can-toggle-indicators" }, - { XKLF_CAN_OUTPUT_CONFIG_AS_ASCII, "XKLF_CAN_OUTPUT_CONFIG_AS_ASCII", "can-output-config-as-ascii" }, - { XKLF_CAN_OUTPUT_CONFIG_AS_BINARY, "XKLF_CAN_OUTPUT_CONFIG_AS_BINARY", "can-output-config-as-binary" }, -@@ -32,9 +32,9 @@ xkl_engine_features_get_type (void) - { XKLF_DEVICE_DISCOVERY, "XKLF_DEVICE_DISCOVERY", "device-discovery" }, - { 0, NULL, NULL } - }; -- etype = g_enum_register_static ("XklEngineFeatures", values); -+ ftype = g_flags_register_static ("XklEngineFeatures", values); - } -- return etype; -+ return ftype; - } - GType - xkl_engine_listen_modes_get_type (void) diff --git a/x11/lxpanel/Makefile b/x11/lxpanel/Makefile index 4ae83aedfe03..c215ffc7b587 100644 --- a/x11/lxpanel/Makefile +++ b/x11/lxpanel/Makefile @@ -7,7 +7,7 @@ PORTNAME= lxpanel PORTVERSION= 0.3.7 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11 MASTER_SITES= SF/lxde/LXPanel%20%28desktop%20panel%29/LXPanel%20${PORTVERSION} diff --git a/x11/workrave/Makefile b/x11/workrave/Makefile index 5bdbd1ab4584..5684b9e5ad26 100644 --- a/x11/workrave/Makefile +++ b/x11/workrave/Makefile @@ -7,7 +7,7 @@ PORTNAME= workrave PORTVERSION= 1.9.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 gnome MASTER_SITES= SF @@ -72,5 +72,7 @@ post-patch: s|SigC::slot|sigc::mem_fun|g' \ ${WRKSRC}/frontend/gtkmm/src/*.* \ ${WRKSRC}/frontend/plugin/*/gtkmm/src/*.* + @${REINPLACE_CMD} -e 's|Gtk::HButtonBox|Gtk::ButtonBox|g' \ + ${WRKSRC}/frontend/plugin/exercises/gtkmm/src/ExercisesPanel.* .include <bsd.port.post.mk> diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile index 3f8d9a061f89..d6e9bc0491d7 100644 --- a/x11/yelp/Makefile +++ b/x11/yelp/Makefile @@ -3,12 +3,11 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/yelp/Makefile,v 1.145 2009/11/20 10:58:38 kwm Exp $ +# $MCom: ports/x11/yelp/Makefile,v 1.154 2010/04/27 13:32:17 kwm Exp $ # PORTNAME= yelp -PORTVERSION= 2.28.1 -PORTREVISION= 3 +PORTVERSION= 2.30.1 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11/yelp/distinfo b/x11/yelp/distinfo index 32b4ef3962f2..ef7c6f151f27 100644 --- a/x11/yelp/distinfo +++ b/x11/yelp/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/yelp-2.28.1.tar.bz2) = faf7eac7abf4eded189566f9ffafc188 -SHA256 (gnome2/yelp-2.28.1.tar.bz2) = 860cfb348cbe199bca64203c82858d012fe505194573f8290be7a85de6c80a22 -SIZE (gnome2/yelp-2.28.1.tar.bz2) = 1136184 +MD5 (gnome2/yelp-2.30.1.tar.bz2) = afd638cdaea1fcb9821ece88b819a022 +SHA256 (gnome2/yelp-2.30.1.tar.bz2) = 4b453e994f8e57bc5c4637dba2c315536f30e90741b74b0bee218cbb436eb20c +SIZE (gnome2/yelp-2.30.1.tar.bz2) = 1139961 diff --git a/x11/yelp/pkg-plist b/x11/yelp/pkg-plist index 5e84fddacae2..903c7d3c5d98 100644 --- a/x11/yelp/pkg-plist +++ b/x11/yelp/pkg-plist @@ -17,6 +17,7 @@ share/locale/br/LC_MESSAGES/yelp.mo share/locale/bs/LC_MESSAGES/yelp.mo share/locale/ca/LC_MESSAGES/yelp.mo share/locale/ca@valencia/LC_MESSAGES/yelp.mo +share/locale/crh/LC_MESSAGES/yelp.mo share/locale/cs/LC_MESSAGES/yelp.mo share/locale/cy/LC_MESSAGES/yelp.mo share/locale/da/LC_MESSAGES/yelp.mo @@ -183,6 +184,8 @@ share/locale/zu/LC_MESSAGES/yelp.mo @dirrmtry share/locale/en@shaw @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/zenity/Makefile b/x11/zenity/Makefile index f7ead587fa25..996b83c66a85 100644 --- a/x11/zenity/Makefile +++ b/x11/zenity/Makefile @@ -3,12 +3,11 @@ # Whom: Franz Klammer <klammer@webonaut.com> # # $FreeBSD$ -# $MCom: ports/x11/zenity/Makefile,v 1.102 2009/09/21 22:23:34 kwm Exp $ +# $MCom: ports/x11/zenity/Makefile,v 1.104 2010/03/29 03:35:02 avl Exp $ # PORTNAME= zenity -PORTVERSION= 2.28.0 -PORTREVISION= 2 +PORTVERSION= 2.30.0 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11/zenity/distinfo b/x11/zenity/distinfo index 06a52221ec3f..c04f3737c50f 100644 --- a/x11/zenity/distinfo +++ b/x11/zenity/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/zenity-2.28.0.tar.bz2) = 262c476aebbf67a7043cd80c6a03add3 -SHA256 (gnome2/zenity-2.28.0.tar.bz2) = 3747a23ce46b0ee68e6261d669ae461f0f460d9c6ad19e04acbd518ddfcc8c63 -SIZE (gnome2/zenity-2.28.0.tar.bz2) = 3095956 +MD5 (gnome2/zenity-2.30.0.tar.bz2) = 15ba2f27d5e1a79c996e5e53e16f4380 +SHA256 (gnome2/zenity-2.30.0.tar.bz2) = d42a9be6f77eb018fb8c5967094db86604271f342dd15b6e6101338d82f923ff +SIZE (gnome2/zenity-2.30.0.tar.bz2) = 3095111 diff --git a/x11/zenity/pkg-plist b/x11/zenity/pkg-plist index de7746f1eed5..5678c826ec1c 100644 --- a/x11/zenity/pkg-plist +++ b/x11/zenity/pkg-plist @@ -196,6 +196,7 @@ share/gnome/help/zenity/uk/zenity.xml share/locale/am/LC_MESSAGES/zenity.mo share/locale/ar/LC_MESSAGES/zenity.mo share/locale/as/LC_MESSAGES/zenity.mo +share/locale/ast/LC_MESSAGES/zenity.mo share/locale/az/LC_MESSAGES/zenity.mo share/locale/be/LC_MESSAGES/zenity.mo share/locale/be@latin/LC_MESSAGES/zenity.mo @@ -211,6 +212,7 @@ share/locale/da/LC_MESSAGES/zenity.mo share/locale/de/LC_MESSAGES/zenity.mo share/locale/dz/LC_MESSAGES/zenity.mo share/locale/el/LC_MESSAGES/zenity.mo +share/locale/en@shaw/LC_MESSAGES/zenity.mo share/locale/en_CA/LC_MESSAGES/zenity.mo share/locale/en_GB/LC_MESSAGES/zenity.mo share/locale/es/LC_MESSAGES/zenity.mo |