diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2009-11-28 20:06:37 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2009-11-28 20:06:37 +0000 |
| commit | f76d32b8e89fed7c0e459c1a7fe7a4b57661b01c (patch) | |
| tree | ad29e6808ff698f84e08dab8e047f0ae72838df9 /x11 | |
| parent | - Update x11-tookits/py-kde to 3.16.6 (diff) | |
Presenting GNOME 2.28.1 for FreeBSD. The official release notes for this
release can be found at http://library.gnome.org/misc/release-notes/2.28/ .
Officially, this is mostly a polishing release in preparation for GNOME 3.0
due in about a year.
On the FreeBSD front, though, a lot went into this release. Major thanks
goes to kwm and avl who did a lot of the porting work for this release.
In particular, kwm brought in Evolution MAPI support for better Microsoft
Exchange integration. Avl made sure that the new gobject introspection
repository ports were nicely compartmentalized so that large dependencies
aren't brought in wholesale.
But, every GNOME team member (ahze, avl, bland, kwm, mezz, and myself)
contributed to this release.
Other major improvements include an updated HAL with better volume
probing code, ufsid integration, and support for volume names containing
spaces (big thanks to J.R. Oldroyd); a new WebKit; updated AbiWord;
an updated Gimp; and a preview of the new GNOME Shell project (thanks to
Pawel Worach).
The FreeBSD GNOME Team would like to that the following additional
contributors to this release whose patches and testing really helped
make it a success:
Andrius Morkunas
Dominique Goncalves
Eric L. Chen
J.R. Oldroyd
Joseph S. Atkinson
Li
Pawel Worach
Romain Tartière
Thomas Vogt
Yasuda Keisuke
Rui Paulo
Martin Wilke
(and an extra shout out to miwi and pav for pointyhat runs)
We would like to send this release out to Alexander Loginov (avl) in
hopes that he feels better soon.
PR: 136676
136967
138872 (obsolete with new epiphany-webkit)
139160
134737
139941
140097
140838
140929
Diffstat (limited to 'x11')
85 files changed, 2169 insertions, 496 deletions
diff --git a/x11/Makefile b/x11/Makefile index 0ce01c23b462..67bed4226b5c 100644 --- a/x11/Makefile +++ b/x11/Makefile @@ -97,6 +97,8 @@ SUBDIR += gdkxft SUBDIR += gdm SUBDIR += ggiterm + SUBDIR += gir-repository-babl + SUBDIR += gir-repository-gnome-menus SUBDIR += glproto SUBDIR += gmessage SUBDIR += gmrun @@ -111,6 +113,7 @@ SUBDIR += gnome-panel-reference SUBDIR += gnome-screensaver SUBDIR += gnome-session + SUBDIR += gnome-shell SUBDIR += gnome-swallow SUBDIR += gnome-terminal SUBDIR += gnome2 diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index 9a6e1a7baf58..0d362dad07d7 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/x11/gdm/Makefile,v 1.8 2009/04/15 23:39:01 kwm Exp $ +# $MCom: ports/x11/gdm/Makefile,v 1.164 2009/11/28 05:59:03 mezz Exp $ # PORTNAME= gdm -PORTVERSION= 2.26.1 -PORTREVISION= 7 +PORTVERSION= 2.28.1 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -18,8 +18,10 @@ COMMENT= GNOME 2 version of xdm display manager 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 + hal.1:${PORTSDIR}/sysutils/hal \ + canberra-gtk.0:${PORTSDIR}/audio/libcanberra RUN_DEPENDS= zenity:${PORTSDIR}/x11/zenity \ ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon \ gnome-session:${PORTSDIR}/x11/gnome-session @@ -35,8 +37,8 @@ INSTALLS_ICONS= yes USE_RC_SUBR= gdm USE_GNOME_SUBR= yes USE_GMAKE= yes -USE_GNOME= gnomehack intlhack gnomehier libgnomeui librsvg2 gnomedocutils \ - gnomeprefix gnomepanel +USE_GNOME= gnomehack intlhack gnomehier gconf2 libglade2 librsvg2 \ + gnomedocutils gnomeprefix gnomepanel GCONF_SCHEMAS= gdm-simple-greeter.schemas GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-working-directory=${PREFIX}/etc/gdm/home @@ -81,6 +83,8 @@ post-patch: ${WRKSRC}/data/session-setup.entries @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \ ${WRKSRC}/configure ${WRKSRC}/daemon/*.c ${WRKSRC}/po/*.po + @${REINPLACE_CMD} -e 's|/usr/lib|${LOCALBASE}/lib|g' \ + ${WRKSRC}/data/greeter-autostart/*.desktop.in* post-install: ${INSTALL_DATA} ${WRKSRC}/data/gconf.path \ @@ -94,7 +98,6 @@ post-install: ${PREFIX}/etc/gdm/custom.conf.default ${MKDIR} ${PREFIX}/share/xsessions ${INSTALL_DATA} ${WRKDIR}/gdm.pam ${PREFIX}/etc/pam.d/gdm - @${MKDIR} ${PREFIX}/etc/gdm/Sessions @${SED} -e 's|%%PREFIX%%|${PREFIX}|g' < ${PKGDIR}/pkg-message \ | /usr/bin/fmt 75 79 > ${PKGMESSAGE} @${CAT} ${PKGMESSAGE} diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo index e0eb9e84b26e..c2b797f0de19 100644 --- a/x11/gdm/distinfo +++ b/x11/gdm/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gdm-2.26.1.tar.bz2) = c2c15f8b741962f278fa7e790aaa9a2b -SHA256 (gnome2/gdm-2.26.1.tar.bz2) = 34abc69bdfd1b6bb6d1f64dd1e34652c61310dc69305712d7aeec6203678fa4c -SIZE (gnome2/gdm-2.26.1.tar.bz2) = 2526832 +MD5 (gnome2/gdm-2.28.1.tar.bz2) = 917dc80f5ef6adcdc15193de238476db +SHA256 (gnome2/gdm-2.28.1.tar.bz2) = da77a6fd9d4cc76b68dd4354839f953f8df5fb7921c7777b80256916533a3e7a +SIZE (gnome2/gdm-2.28.1.tar.bz2) = 2332716 diff --git a/x11/gdm/files/gdm.in b/x11/gdm/files/gdm.in index a6a0a8d70eec..7190a891e9ac 100644 --- a/x11/gdm/files/gdm.in +++ b/x11/gdm/files/gdm.in @@ -1,6 +1,6 @@ #!/bin/sh # $FreeBSD$ -# $MCom$ +# $MCom: ports/x11/gdm/files/gdm.in,v 1.38 2009/09/26 13:42:01 marcus Exp $ # PROVIDE: gdm # REQUIRE: LOGIN cleanvar moused syscons dbus hald diff --git a/x11/gdm/files/gdm.pam.in b/x11/gdm/files/gdm.pam.in index 014d6c8151e9..1f16ea8e8ca2 100644 --- a/x11/gdm/files/gdm.pam.in +++ b/x11/gdm/files/gdm.pam.in @@ -1,6 +1,6 @@ # # $FreeBSD$ -# $MCom$ +# $MCom: ports/x11/gdm/files/gdm.pam.in,v 1.8 2009/09/26 13:42:01 marcus Exp $ # # PAM configuration for the "gdm" service # diff --git a/x11/gdm/files/patch-configure b/x11/gdm/files/patch-configure index baa14aa863dd..220aa1cb6ac2 100644 --- a/x11/gdm/files/patch-configure +++ b/x11/gdm/files/patch-configure @@ -1,68 +1,137 @@ ---- configure.orig 2009-05-02 22:45:53.000000000 -0400 -+++ configure 2009-05-02 22:47:16.000000000 -0400 -@@ -19163,15 +19163,18 @@ if test -n "$DAEMON_CFLAGS"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION +--- 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=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + 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 -@@ -19185,15 +19188,18 @@ if test -n "$DAEMON_LIBS"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION +@@ -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=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + 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 -@@ -19214,10 +19220,12 @@ fi - if test $_pkg_short_errors_supported = yes; then +@@ -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 -@@ -19225,6 +19233,7 @@ fi - - { { $as_echo "$as_me:$LINENO: error: Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION +@@ -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 -@@ -19238,6 +19247,7 @@ See the pkg-config man page for more det - " >&5 - $as_echo "$as_me: error: Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION +@@ -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: 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 63fb5db1c176..692c275167b8 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-03-16 16:12:08.000000000 -0400 -+++ daemon/gdm-xdmcp-display-factory.c 2009-05-16 18:17:26.000000000 -0400 +--- 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 @@ -35,6 +35,7 @@ #include <netdb.h> #include <arpa/inet.h> @@ -46,7 +46,7 @@ if (bind (sock, ai->ai_addr, ai->ai_addrlen) < 0) { g_warning ("bind: %s", g_strerror (errno)); close (sock); -@@ -833,7 +849,7 @@ gdm_xdmcp_send_willing (GdmXdmcpDisplayF +@@ -835,7 +851,7 @@ gdm_xdmcp_send_willing (GdmXdmcpDisplayF XdmcpFlush (factory->priv->socket_fd, &factory->priv->buf, (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address), @@ -55,7 +55,7 @@ g_free (status.data); } -@@ -877,7 +893,7 @@ gdm_xdmcp_send_unwilling (GdmXdmcpDispla +@@ -879,7 +895,7 @@ gdm_xdmcp_send_unwilling (GdmXdmcpDispla XdmcpFlush (factory->priv->socket_fd, &factory->priv->buf, (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address), @@ -64,7 +64,7 @@ last_time = time (NULL); } -@@ -986,7 +1002,7 @@ gdm_xdmcp_send_forward_query (GdmXdmcpDi +@@ -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), @@ -73,7 +73,7 @@ g_free (port.data); g_free (addr.data); -@@ -1689,7 +1705,7 @@ gdm_xdmcp_really_send_managed_forward (G +@@ -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), @@ -82,7 +82,7 @@ g_free (addr.data); } -@@ -1770,7 +1786,7 @@ gdm_xdmcp_send_got_managed_forward (GdmX +@@ -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), @@ -91,7 +91,7 @@ } static gboolean -@@ -1943,7 +1959,7 @@ gdm_xdmcp_send_decline (GdmXdmcpDisplayF +@@ -1945,7 +1961,7 @@ gdm_xdmcp_send_decline (GdmXdmcpDisplayF XdmcpFlush (factory->priv->socket_fd, &factory->priv->buf, (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address), @@ -100,7 +100,7 @@ /* Send MANAGED_FORWARD to indicate that the connection * reached some sort of resolution */ -@@ -2091,7 +2107,7 @@ gdm_xdmcp_send_accept (GdmXdmcpDisplayFa +@@ -2093,7 +2109,7 @@ gdm_xdmcp_send_accept (GdmXdmcpDisplayFa XdmcpFlush (factory->priv->socket_fd, &factory->priv->buf, (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address), @@ -109,25 +109,7 @@ host = NULL; gdm_address_get_numeric_info (address, &host, NULL); -@@ -2309,8 +2325,6 @@ gdm_xdmcp_handle_request (GdmXdmcpDispla - authorization_data.data = (CARD8 *) cookie->data; - authorization_data.length = cookie->len; - -- g_array_free (cookie, TRUE); -- - /* the addrs are NOT copied */ - gdm_xdmcp_send_accept (factory, - address, -@@ -2319,6 +2333,8 @@ gdm_xdmcp_handle_request (GdmXdmcpDispla - &authentication_data, - &authorization_name, - &authorization_data); -+ -+ g_array_free (cookie, TRUE); - } - } - } else { -@@ -2422,7 +2438,7 @@ gdm_xdmcp_send_failed (GdmXdmcpDisplayFa +@@ -2424,7 +2440,7 @@ gdm_xdmcp_send_failed (GdmXdmcpDisplayFa XdmcpFlush (factory->priv->socket_fd, &factory->priv->buf, (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address), @@ -136,7 +118,7 @@ } static void -@@ -2446,7 +2462,7 @@ gdm_xdmcp_send_refuse (GdmXdmcpDisplayFa +@@ -2448,7 +2464,7 @@ gdm_xdmcp_send_refuse (GdmXdmcpDisplayFa XdmcpFlush (factory->priv->socket_fd, &factory->priv->buf, (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address), @@ -145,7 +127,7 @@ /* * This was from a forwarded query quite apparently so -@@ -2717,7 +2733,7 @@ gdm_xdmcp_send_alive (GdmXdmcpDisplayFac +@@ -2719,7 +2735,7 @@ gdm_xdmcp_send_alive (GdmXdmcpDisplayFac XdmcpFlush (factory->priv->socket_fd, &factory->priv->buf, (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address), diff --git a/x11/gdm/files/patch-daemon_gdm-display-access-file.c b/x11/gdm/files/patch-daemon_gdm-display-access-file.c deleted file mode 100644 index 0f54784eca16..000000000000 --- a/x11/gdm/files/patch-daemon_gdm-display-access-file.c +++ /dev/null @@ -1,12 +0,0 @@ ---- daemon/gdm-display-access-file.c.orig 2009-04-16 01:32:41.000000000 +0200 -+++ daemon/gdm-display-access-file.c 2009-04-16 01:33:17.000000000 +0200 -@@ -41,6 +41,9 @@ - #include "gdm-display-access-file.h" - #include "gdm-common.h" - -+/* OpenBSD defines 255, glibc defines 64. */ -+#define HOST_NAME_MAX 64 -+ - struct _GdmDisplayAccessFilePrivate - { - char *username; diff --git a/x11/gdm/files/patch-daemon_gdm-session-worker.c b/x11/gdm/files/patch-daemon_gdm-session-worker.c index 0c56d5da4419..362a116eaa79 100644 --- a/x11/gdm/files/patch-daemon_gdm-session-worker.c +++ b/x11/gdm/files/patch-daemon_gdm-session-worker.c @@ -1,5 +1,5 @@ ---- daemon/gdm-session-worker.c.orig 2009-04-14 10:01:14.000000000 -0400 -+++ daemon/gdm-session-worker.c 2009-05-31 15:52:10.000000000 -0400 +--- daemon/gdm-session-worker.c.orig 2009-09-21 22:05:27.000000000 +0200 ++++ daemon/gdm-session-worker.c 2009-09-22 12:33:59.000000000 +0200 @@ -31,6 +31,9 @@ #include <errno.h> #include <grp.h> @@ -8,9 +8,9 @@ +#include <login_cap.h> +#endif - #include <security/pam_appl.h> - -@@ -332,7 +335,7 @@ gdm_session_execute (const char *file, + #ifdef HAVE_LOGINDEVPERM + #include <libdevinfo.h> +@@ -340,7 +343,7 @@ gdm_session_execute (const char *file, * what to search if PATH is unset. POSIX may, dunno. */ @@ -19,8 +19,8 @@ } len = strlen (file) + 1; -@@ -1757,11 +1760,12 @@ gdm_session_worker_start_user_session (G - char **environment; +@@ -1995,15 +1998,16 @@ gdm_session_worker_start_user_session (G + char *cachedirname; char *home_dir; int fd; +#ifdef HAVE_LOGINCAP @@ -28,6 +28,10 @@ + struct passwd *pwent = getpwnam (login); +#endif + /* Make sure cachedir gets created before we drop to user */ + cachedirname = gdm_session_worker_create_cachedir (worker); + g_free (cachedirname); + - if (setuid (worker->priv->uid) < 0) { - g_debug ("GdmSessionWorker: could not reset uid - %s", g_strerror (errno)); - _exit (1); @@ -36,7 +40,7 @@ if (setsid () < 0) { g_debug ("GdmSessionWorker: could not set pid '%u' as leader of new session and process group - %s", -@@ -1769,6 +1773,28 @@ gdm_session_worker_start_user_session (G +@@ -2011,6 +2015,28 @@ gdm_session_worker_start_user_session (G _exit (2); } 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 new file mode 100644 index 000000000000..55f6d7ec8bd2 --- /dev/null +++ b/x11/gdm/files/patch-gui_simple-greeter_gdm-greeter-login-window.c @@ -0,0 +1,155 @@ +--- 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 9116dc917a64..675925aa926b 100644 --- a/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c +++ b/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c @@ -1,5 +1,5 @@ ---- gui/simple-greeter/gdm-languages.c.orig 2008-11-22 17:16:42.000000000 -0500 -+++ gui/simple-greeter/gdm-languages.c 2008-11-22 17:29:05.000000000 -0500 +--- 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; } @@ -16,7 +16,16 @@ } if (modifierp != NULL) { -@@ -353,7 +353,7 @@ add_locale (const char *language_name) +@@ -314,7 +314,7 @@ language_name_has_translations (const ch + const char *name; + gboolean has_translations; + +- path = g_build_filename (GNOMELOCALEDIR, language_name, "LC_MESSAGES", NULL); ++ path = g_build_filename ("/usr/share/locale", language_name, "LC_MESSAGES", NULL); + + has_translations = FALSE; + dir = g_dir_open (path, 0, NULL); +@@ -352,7 +352,7 @@ add_locale (const char *language_name) if (language_name_is_utf8 (language_name)) { name = g_strdup (language_name); } else { @@ -25,20 +34,11 @@ if (!language_name_is_utf8 (name)) { g_free (name); -@@ -482,7 +482,7 @@ select_dirs (const struct dirent *dirent - struct stat st; - char *path; - -- path = g_build_filename (GNOMELOCALEDIR, dirent->d_name, NULL); -+ path = g_build_filename ("/usr/share/locale", dirent->d_name, NULL); - if (g_stat (path, &st) == 0) { - mode = st.st_mode; - } -@@ -502,7 +502,7 @@ collect_locales_from_directory (void) +@@ -501,7 +501,7 @@ collect_locales_from_directory (void) int ndirents; int cnt; -- ndirents = scandir (GNOMELOCALEDIR, &dirents, select_dirs, alphasort); +- ndirents = scandir (LIBLOCALEDIR, &dirents, select_dirs, alphasort); + ndirents = scandir ("/usr/share/locale", &dirents, select_dirs, alphasort); for (cnt = 0; cnt < ndirents; ++cnt) { 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 d666bc1fd826..d0a5d73f5e47 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,12 +1,20 @@ ---- gui/simple-greeter/gdm-user-manager.c.orig 2008-04-29 13:38:43.000000000 -0400 -+++ gui/simple-greeter/gdm-user-manager.c 2008-05-03 13:27:52.000000000 -0400 -@@ -1269,17 +1269,23 @@ reload_passwd (GdmUserManager *manager) - GSList *old_users; +--- 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 @@ + + #ifdef __sun + #define DEFAULT_MINIMAL_UID 100 ++#elif defined(__FreeBSD__) ++#define DEFAULT_MINIMAL_UID 1000 + #else + #define DEFAULT_MINIMAL_UID 500 + #endif +@@ -1366,17 +1368,24 @@ reload_passwd (GdmUserManager *manager) GSList *new_users; GSList *list; -- FILE *fp; + GSList *dup; +#ifndef __FreeBSD__ -+ FILE *fp; + FILE *fp; +#endif old_users = NULL; @@ -15,6 +23,7 @@ +#ifdef __FreeBSD__ + setpwent (); +#else ++ errno = 0; fp = fopen (PATH_PASSWD, "r"); if (fp == NULL) { @@ -25,7 +34,7 @@ g_hash_table_foreach (manager->priv->users, listify_hash_values_hfunc, &old_users); g_slist_foreach (old_users, (GFunc) g_object_ref, NULL); -@@ -1292,7 +1298,11 @@ reload_passwd (GdmUserManager *manager) +@@ -1390,7 +1399,11 @@ reload_passwd (GdmUserManager *manager) } } @@ -37,7 +46,7 @@ GdmUser *user; user = NULL; -@@ -1355,7 +1365,11 @@ reload_passwd (GdmUserManager *manager) +@@ -1461,7 +1474,11 @@ reload_passwd (GdmUserManager *manager) out: /* Cleanup */ diff --git a/x11/gdm/files/patch-gui_simple-greeter_gdm-user.c b/x11/gdm/files/patch-gui_simple-greeter_gdm-user.c index 049b75b42036..fae89ec079d8 100644 --- a/x11/gdm/files/patch-gui_simple-greeter_gdm-user.c +++ b/x11/gdm/files/patch-gui_simple-greeter_gdm-user.c @@ -1,14 +1,14 @@ ---- gui/simple-greeter/gdm-user.c.orig 2009-05-16 17:52:57.000000000 -0400 -+++ gui/simple-greeter/gdm-user.c 2009-05-16 18:08:08.000000000 -0400 -@@ -412,6 +412,7 @@ _gdm_user_update (GdmUser *u +--- gui/simple-greeter/gdm-user.c.orig 2009-07-20 03:09:09.000000000 +0200 ++++ gui/simple-greeter/gdm-user.c 2009-07-20 10:09:41.000000000 +0200 +@@ -427,6 +427,7 @@ _gdm_user_update (GdmUser *u /* Display Name */ if (pwent->pw_gecos && pwent->pw_gecos[0] != '\0') { gchar *first_comma; + gchar *ampersand; + gchar *real_name_utf8; - first_comma = strchr (pwent->pw_gecos, ','); - if (first_comma) { -@@ -425,6 +426,23 @@ _gdm_user_update (GdmUser *u + real_name_utf8 = g_locale_to_utf8 (pwent->pw_gecos, -1, NULL, NULL, NULL); +@@ -443,6 +444,23 @@ _gdm_user_update (GdmUser *u g_free (real_name); real_name = NULL; } diff --git a/x11/gdm/files/patch-hal-keyboard b/x11/gdm/files/patch-hal-keyboard index a712f04a128a..904f1cdaccaa 100644 --- a/x11/gdm/files/patch-hal-keyboard +++ b/x11/gdm/files/patch-hal-keyboard @@ -1,6 +1,5 @@ -diff -up gdm-2.25.2/daemon/gdm-session-direct.c.system-keyboard gdm-2.25.2/daemon/gdm-session-direct.c ---- daemon/gdm-session-direct.c.system-keyboard 2008-08-26 15:04:00.000000000 -0400 -+++ daemon/gdm-session-direct.c 2009-02-24 22:55:02.656566009 -0500 +--- 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> @@ -10,7 +9,7 @@ diff -up gdm-2.25.2/daemon/gdm-session-direct.c.system-keyboard gdm-2.25.2/daemo #include "gdm-session-direct.h" #include "gdm-session.h" #include "gdm-session-private.h" -@@ -595,14 +597,66 @@ get_default_language_name (GdmSessionDir +@@ -597,14 +599,66 @@ get_default_language_name (GdmSessionDir return setlocale (LC_MESSAGES, NULL); } @@ -80,23 +79,19 @@ diff -up gdm-2.25.2/daemon/gdm-session-direct.c.system-keyboard gdm-2.25.2/daemo } static char * -@@ -1971,9 +2025,10 @@ setup_session_environment (GdmSessionDir +@@ -1953,8 +2007,8 @@ setup_session_environment (GdmSessionDir "GDM_LANG", get_language_name (session)); -- gdm_session_direct_set_environment_variable (session, -- "GDM_KEYBOARD_LAYOUT", -- get_layout_name (session)); -+ if (g_strcmp0 (get_layout_name (session), get_system_default_layout (session)) != 0) -+ gdm_session_direct_set_environment_variable (session, -+ "GDM_KEYBOARD_LAYOUT", -+ get_layout_name (session)); - - gdm_session_direct_set_environment_variable (session, - "DISPLAY", -diff -up gdm-2.25.2/daemon/gdm-session-settings.c.system-keyboard gdm-2.25.2/daemon/gdm-session-settings.c ---- daemon/gdm-session-settings.c.system-keyboard 2008-08-26 15:04:00.000000000 -0400 -+++ daemon/gdm-session-settings.c 2009-02-24 22:51:00.158815919 -0500 +- 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)); diff --git a/x11/gdm/pkg-install b/x11/gdm/pkg-install index 4adf27abbb43..97ae6b4832be 100644 --- a/x11/gdm/pkg-install +++ b/x11/gdm/pkg-install @@ -17,6 +17,9 @@ POST-INSTALL) ${MKDIR} -p /var/run/gdm ${CHOWN} root:${GROUP} /var/run/gdm ${CHMOD} 1777 /var/run/gdm + ${MKDIR} -p /var/cache/gdm + ${CHMOD} 1755 /var/cache/gdm + ${CHOWN} root:${GROUP} /var/cache/gdm ${CHOWN} root:wheel ${PKG_PREFIX}/share/gdm ${CHMOD} 0755 ${PKG_PREFIX}/share/gdm ${MKDIR} -p ${PKG_PREFIX}/etc/gdm/home @@ -29,6 +32,7 @@ POST-INSTALL) ${CHMOD} 1750 ${PKG_PREFIX}/etc/gdm/home/.gconf.mandatory ${CHMOD} 1640 ${PKG_PREFIX}/etc/gdm/home/.gconf.mandatory/*.xml + ${MKDIR} -p ${PKG_PREFIX}/etc/gdm/Sessions ${MKDIR} -p ${PKG_PREFIX}/etc/dm/Sessions exit 0 ;; diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist index cfe404abd8bd..95025aa6c2aa 100644 --- a/x11/gdm/pkg-plist +++ b/x11/gdm/pkg-plist @@ -35,6 +35,7 @@ sbin/gdm-stop %%DATADIR%%/autostart/LoginWindow/gok.desktop %%DATADIR%%/autostart/LoginWindow/metacity.desktop %%DATADIR%%/autostart/LoginWindow/orca-screen-reader.desktop +%%DATADIR%%/autostart/LoginWindow/polkit-gnome-authentication-agent-1.desktop %%DATADIR%%/gconf.path %%DATADIR%%/gdb-cmd %%DATADIR%%/gdm-greeter-login-window.glade @@ -43,6 +44,7 @@ share/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml share/gnome/help/gdm/C/gdm.xml share/gnome/help/gdm/C/legal.xml share/gnome/help/gdm/de/gdm.xml +share/gnome/help/gdm/el/gdm.xml share/gnome/help/gdm/en_GB/gdm.xml share/gnome/help/gdm/es/gdm.xml share/gnome/help/gdm/fr/gdm.xml @@ -66,8 +68,10 @@ share/locale/be@latin/LC_MESSAGES/gdm.mo share/locale/bg/LC_MESSAGES/gdm.mo share/locale/bn/LC_MESSAGES/gdm.mo share/locale/bn_IN/LC_MESSAGES/gdm.mo +share/locale/br/LC_MESSAGES/gdm.mo share/locale/bs/LC_MESSAGES/gdm.mo share/locale/ca/LC_MESSAGES/gdm.mo +share/locale/ca@valencia/LC_MESSAGES/gdm.mo share/locale/crh/LC_MESSAGES/gdm.mo share/locale/cs/LC_MESSAGES/gdm.mo share/locale/cy/LC_MESSAGES/gdm.mo @@ -77,6 +81,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/eo/LC_MESSAGES/gdm.mo share/locale/es/LC_MESSAGES/gdm.mo share/locale/et/LC_MESSAGES/gdm.mo share/locale/eu/LC_MESSAGES/gdm.mo @@ -97,6 +102,7 @@ share/locale/is/LC_MESSAGES/gdm.mo share/locale/it/LC_MESSAGES/gdm.mo share/locale/ja/LC_MESSAGES/gdm.mo share/locale/ka/LC_MESSAGES/gdm.mo +share/locale/kk/LC_MESSAGES/gdm.mo share/locale/kn/LC_MESSAGES/gdm.mo share/locale/ko/LC_MESSAGES/gdm.mo share/locale/ku/LC_MESSAGES/gdm.mo @@ -148,6 +154,7 @@ share/locale/zh_TW/LC_MESSAGES/gdm.mo share/locale/zu/LC_MESSAGES/gdm.mo share/omf/gdm/gdm-C.omf share/omf/gdm/gdm-de.omf +share/omf/gdm/gdm-el.omf share/omf/gdm/gdm-en_GB.omf share/omf/gdm/gdm-es.omf share/omf/gdm/gdm-fr.omf @@ -200,6 +207,7 @@ share/pixmaps/nohost.png @dirrm share/gnome/help/gdm/fr @dirrm share/gnome/help/gdm/es @dirrm share/gnome/help/gdm/en_GB +@dirrm share/gnome/help/gdm/el @dirrm share/gnome/help/gdm/de @dirrm share/gnome/help/gdm/C @dirrm share/gnome/help/gdm @@ -222,6 +230,8 @@ share/pixmaps/nohost.png @unexec /bin/rm -rf /var/gdm 2>/dev/null || /usr/bin/true @unexec /bin/rm -rf /var/log/gdm 2>/dev/null || /usr/bin/true @unexec /bin/rm -rf /var/run/gdm 2>/dev/null || /usr/bin/true +@unexec rmdir /var/cache/gdm 2>/dev/null || /usr/bin/true +@unexec rmdir /var/cache 2>/dev/null || /usr/bin/true @dirrmtry share/locale/zu/LC_MESSAGES @dirrmtry share/locale/zu @dirrmtry share/locale/zh_HK/LC_MESSAGES @@ -256,6 +266,8 @@ share/pixmaps/nohost.png @dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/kk/LC_MESSAGES +@dirrmtry share/locale/kk @dirrmtry share/locale/hy/LC_MESSAGES @dirrmtry share/locale/hy @dirrmtry share/locale/fur/LC_MESSAGES @@ -264,6 +276,8 @@ share/pixmaps/nohost.png @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 @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES diff --git a/x11/gir-repository-babl/Makefile b/x11/gir-repository-babl/Makefile new file mode 100644 index 000000000000..8836d904e355 --- /dev/null +++ b/x11/gir-repository-babl/Makefile @@ -0,0 +1,15 @@ +# New ports collection makefile for: gir-repository-babl +# Date created: 12 September 2009 +# Whom: Alexander Logvinov <avl@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/x11/gir-repository-babl/Makefile,v 1.1 2009/09/16 02:05:12 avl Exp $ +# + +CATEGORIES= x11 + +MASTERDIR= ${.CURDIR}/../../devel/gir-repository + +PKGNAMESUFFIX= -babl + +.include "${MASTERDIR}/bsd.gir.mk" diff --git a/x11/gir-repository-gnome-menus/Makefile b/x11/gir-repository-gnome-menus/Makefile new file mode 100644 index 000000000000..5ec5a76ea3c7 --- /dev/null +++ b/x11/gir-repository-gnome-menus/Makefile @@ -0,0 +1,15 @@ +# 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 b314dd99b54b..9f9c55d9298c 100644 --- a/x11/gnome-applets/Makefile +++ b/x11/gnome-applets/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/x11/gnome-applets/Makefile,v 1.1 2009/04/13 13:21:01 kwm Exp $ +# $MCom: ports/x11/gnome-applets/Makefile,v 1.208 2009/11/13 06:07:53 avl Exp $ # PORTNAME= gnome-applets -PORTVERSION= 2.26.3 +PORTVERSION= 2.28.0 PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= GNOME @@ -20,6 +20,7 @@ BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/system-tools-backends-2.0.pc:${POR ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop \ gweather.1:${PORTSDIR}/net/libgweather \ + polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit \ xklavier.12:${PORTSDIR}/x11/libxklavier \ gucharmap.7:${PORTSDIR}/deskutils/gucharmap RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/system-tools-backends-2.0.pc:${PORTSDIR}/sysutils/system-tools-backends \ @@ -38,7 +39,8 @@ WANT_GNOME= yes USE_GSTREAMER= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-gstreamer=0.10 \ - --enable-mixer-applet + --enable-mixer-applet \ + --disable-networkmanager CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ OS_SYS="/usr/include" diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo index ba9c348376bd..f01328d71b07 100644 --- a/x11/gnome-applets/distinfo +++ b/x11/gnome-applets/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-applets-2.26.3.tar.bz2) = 23fb47b3e35ef2136d6ade3f0203328b -SHA256 (gnome2/gnome-applets-2.26.3.tar.bz2) = f6e93d98cbb45f15fff605966eca5e4172cd4404509d612b03da748b9e2e0ee5 -SIZE (gnome2/gnome-applets-2.26.3.tar.bz2) = 9544328 +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 diff --git a/x11/gnome-applets/files/patch-stickynotes_stickynotes.ui b/x11/gnome-applets/files/patch-stickynotes_stickynotes.ui new file mode 100644 index 000000000000..8323a6dd33cf --- /dev/null +++ b/x11/gnome-applets/files/patch-stickynotes_stickynotes.ui @@ -0,0 +1,20 @@ +--- stickynotes/stickynotes.ui.orig 2009-11-13 13:13:28.000000000 +0800 ++++ stickynotes/stickynotes.ui 2009-11-13 13:15:23.000000000 +0800 +@@ -593,7 +593,7 @@ + </packing> + </child> + <child> +- <object class="GtkVBox" id="vbox1"> ++ <object class="GtkVBox" id="vbox3"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <child> +@@ -613,7 +613,7 @@ + </packing> + </child> + <child> +- <object class="GtkLabel" id="label1"> ++ <object class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">This cannot be undone.</property> diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist index ba3ff7ededfd..137dd52e013c 100644 --- a/x11/gnome-applets/pkg-plist +++ b/x11/gnome-applets/pkg-plist @@ -61,7 +61,6 @@ libexec/multiload-applet-2 libexec/null_applet libexec/stickynotes_applet libexec/trashapplet -%%CPUFREQ%%share/PolicyKit/policy/org.gnome.cpufreqselector.policy %%CPUFREQ%%share/dbus-1/system-services/org.gnome.CPUFreqSelector.service share/gnome-2.0/ui/GNOME_AccessxApplet.xml %%BATTERY%%share/gnome-2.0/ui/GNOME_BattstatApplet.xml @@ -340,6 +339,18 @@ share/gnome/help/accessx-status/zh_CN/figures/accessx_sticky-windows-key.png %%BATTERY%%share/gnome/help/battstat/bg/figures/battstat-credits-hal.png %%BATTERY%%share/gnome/help/battstat/bg/figures/battstat-preferences.png %%BATTERY%%share/gnome/help/battstat/bg/figures/context-menu.png +%%BATTERY%%share/gnome/help/battstat/ca/battstat.xml +%%BATTERY%%share/gnome/help/battstat/ca/figures/battstat-applet-expanded.png +%%BATTERY%%share/gnome/help/battstat/ca/figures/battstat-applet.png +%%BATTERY%%share/gnome/help/battstat/ca/figures/battstat-credits-hal.png +%%BATTERY%%share/gnome/help/battstat/ca/figures/battstat-preferences.png +%%BATTERY%%share/gnome/help/battstat/ca/figures/context-menu.png +%%BATTERY%%share/gnome/help/battstat/cs/battstat.xml +%%BATTERY%%share/gnome/help/battstat/cs/figures/battstat-applet-expanded.png +%%BATTERY%%share/gnome/help/battstat/cs/figures/battstat-applet.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/de/battstat.xml %%BATTERY%%share/gnome/help/battstat/de/figures/battstat-applet-expanded.png %%BATTERY%%share/gnome/help/battstat/de/figures/battstat-applet.png @@ -418,6 +429,12 @@ share/gnome/help/accessx-status/zh_CN/figures/accessx_sticky-windows-key.png %%BATTERY%%share/gnome/help/battstat/uk/figures/battstat-credits-hal.png %%BATTERY%%share/gnome/help/battstat/uk/figures/battstat-preferences.png %%BATTERY%%share/gnome/help/battstat/uk/figures/context-menu.png +%%BATTERY%%share/gnome/help/battstat/zh_CN/battstat.xml +%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/battstat-applet-expanded.png +%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/battstat-applet.png +%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/battstat-credits-hal.png +%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/battstat-preferences.png +%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/context-menu.png share/gnome/help/char-palette/C/char-palette.xml share/gnome/help/char-palette/C/figures/charpalette_applet.png share/gnome/help/char-palette/C/figures/charpalette_chargroup.png @@ -524,6 +541,10 @@ share/gnome/help/char-palette/zh_CN/figures/charpick_characters.png %%COMMANDER%%share/gnome/help/command-line/C/figures/prefs-macros.png %%COMMANDER%%share/gnome/help/command-line/C/figures/prefs.png %%COMMANDER%%share/gnome/help/command-line/C/legal.xml +%%COMMANDER%%share/gnome/help/command-line/ca/command-line.xml +%%COMMANDER%%share/gnome/help/command-line/ca/figures/command-line.png +%%COMMANDER%%share/gnome/help/command-line/ca/figures/prefs-macros.png +%%COMMANDER%%share/gnome/help/command-line/ca/figures/prefs.png %%COMMANDER%%share/gnome/help/command-line/de/command-line.xml %%COMMANDER%%share/gnome/help/command-line/de/figures/command-line.png %%COMMANDER%%share/gnome/help/command-line/de/figures/prefs-macros.png @@ -673,6 +694,16 @@ share/gnome/help/char-palette/zh_CN/figures/charpick_characters.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/fr/figures/cpufreq-applet-selector-both.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/fr/figures/cpufreq-applet-selector.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/fr/figures/cpufreq-applet.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/hu/cpufreq-applet.xml +%%CPUFREQ%%share/gnome/help/cpufreq-applet/hu/figures/cpufreq-100.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/hu/figures/cpufreq-25.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/hu/figures/cpufreq-50.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/hu/figures/cpufreq-75.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/hu/figures/cpufreq-applet-preferences-smp.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/hu/figures/cpufreq-applet-preferences.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/hu/figures/cpufreq-applet-selector-both.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/hu/figures/cpufreq-applet-selector.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/hu/figures/cpufreq-applet.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/cpufreq-applet.xml %%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/figures/cpufreq-100.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/figures/cpufreq-25.png @@ -743,6 +774,26 @@ share/gnome/help/char-palette/zh_CN/figures/charpick_characters.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_CN/figures/cpufreq-applet-selector-both.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_CN/figures/cpufreq-applet-selector.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_CN/figures/cpufreq-applet.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_HK/cpufreq-applet.xml +%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_HK/figures/cpufreq-100.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_HK/figures/cpufreq-25.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_HK/figures/cpufreq-50.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_HK/figures/cpufreq-75.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_HK/figures/cpufreq-applet-preferences-smp.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_HK/figures/cpufreq-applet-preferences.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_HK/figures/cpufreq-applet-selector-both.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_HK/figures/cpufreq-applet-selector.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_HK/figures/cpufreq-applet.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_TW/cpufreq-applet.xml +%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_TW/figures/cpufreq-100.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_TW/figures/cpufreq-25.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_TW/figures/cpufreq-50.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_TW/figures/cpufreq-75.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_TW/figures/cpufreq-applet-preferences-smp.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_TW/figures/cpufreq-applet-preferences.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_TW/figures/cpufreq-applet-selector-both.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_TW/figures/cpufreq-applet-selector.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_TW/figures/cpufreq-applet.png share/gnome/help/drivemount/C/drivemount.xml share/gnome/help/drivemount/C/figures/drivemount-applet_eject.png share/gnome/help/drivemount/C/figures/drivemount-applet_example.png @@ -750,6 +801,12 @@ share/gnome/help/drivemount/C/figures/drivemount-applet_mount.png share/gnome/help/drivemount/C/figures/drivemount-applet_open.png share/gnome/help/drivemount/C/figures/drivemount-applet_status.png share/gnome/help/drivemount/C/legal.xml +share/gnome/help/drivemount/ca/drivemount.xml +share/gnome/help/drivemount/ca/figures/drivemount-applet_eject.png +share/gnome/help/drivemount/ca/figures/drivemount-applet_example.png +share/gnome/help/drivemount/ca/figures/drivemount-applet_mount.png +share/gnome/help/drivemount/ca/figures/drivemount-applet_open.png +share/gnome/help/drivemount/ca/figures/drivemount-applet_status.png share/gnome/help/drivemount/cs/drivemount.xml share/gnome/help/drivemount/cs/figures/drivemount-applet_eject.png share/gnome/help/drivemount/cs/figures/drivemount-applet_example.png @@ -917,6 +974,21 @@ share/gnome/help/gweather/C/figures/stock_weather-storm.png share/gnome/help/gweather/C/figures/stock_weather-sunny.png share/gnome/help/gweather/C/gweather.xml share/gnome/help/gweather/C/legal.xml +share/gnome/help/gweather/ar/figures/gweather-details.png +share/gnome/help/gweather/ar/figures/gweather-menu-prefs.png +share/gnome/help/gweather/ar/figures/gweather-prefs-general.png +share/gnome/help/gweather/ar/figures/gweather-prefs-locations.png +share/gnome/help/gweather/ar/figures/gweather_applet.png +share/gnome/help/gweather/ar/figures/stock_weather-cloudy.png +share/gnome/help/gweather/ar/figures/stock_weather-few-clouds.png +share/gnome/help/gweather/ar/figures/stock_weather-fog.png +share/gnome/help/gweather/ar/figures/stock_weather-night-clear.png +share/gnome/help/gweather/ar/figures/stock_weather-night-few-clouds.png +share/gnome/help/gweather/ar/figures/stock_weather-showers.png +share/gnome/help/gweather/ar/figures/stock_weather-snow.png +share/gnome/help/gweather/ar/figures/stock_weather-storm.png +share/gnome/help/gweather/ar/figures/stock_weather-sunny.png +share/gnome/help/gweather/ar/gweather.xml share/gnome/help/gweather/ca/figures/gweather-details.png share/gnome/help/gweather/ca/figures/gweather-menu-prefs.png share/gnome/help/gweather/ca/figures/gweather-prefs-general.png @@ -1189,6 +1261,7 @@ share/gnome/help/gweather/zh_CN/figures/stock_weather-sunny.png share/gnome/help/gweather/zh_CN/gweather.xml %%PYTHON%%share/gnome/help/invest-applet/C/invest-applet.xml %%PYTHON%%share/gnome/help/invest-applet/C/legal.xml +%%PYTHON%%share/gnome/help/invest-applet/ca/invest-applet.xml %%PYTHON%%share/gnome/help/invest-applet/en_GB/invest-applet.xml %%PYTHON%%share/gnome/help/invest-applet/de/invest-applet.xml %%PYTHON%%share/gnome/help/invest-applet/el/invest-applet.xml @@ -1247,6 +1320,10 @@ share/gnome/help/multiload/ca/figures/multiload-preferences.png share/gnome/help/multiload/ca/figures/system-monitor-applet_window.png share/gnome/help/multiload/ca/figures/system_monitor.png share/gnome/help/multiload/ca/multiload.xml +share/gnome/help/multiload/cs/figures/multiload-preferences.png +share/gnome/help/multiload/cs/figures/system-monitor-applet_window.png +share/gnome/help/multiload/cs/figures/system_monitor.png +share/gnome/help/multiload/cs/multiload.xml share/gnome/help/multiload/de/figures/multiload-preferences.png share/gnome/help/multiload/de/figures/system-monitor-applet_window.png share/gnome/help/multiload/de/figures/system_monitor.png @@ -1410,6 +1487,12 @@ share/gnome/help/stickynotes_applet/uk/figures/stickynotes-note-prefs.png share/gnome/help/stickynotes_applet/uk/figures/stickynotes-prefs.png share/gnome/help/stickynotes_applet/uk/figures/stickynotes_applet.png share/gnome/help/stickynotes_applet/uk/stickynotes_applet.xml +share/gnome/help/stickynotes_applet/zh_CN/figures/stickynote-right-menu-lock.png +share/gnome/help/stickynotes_applet/zh_CN/figures/stickynote-right-menu-new.png +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/trashapplet/C/figures/trash-applet.png share/gnome/help/trashapplet/C/legal.xml share/gnome/help/trashapplet/C/trashapplet.xml @@ -1453,6 +1536,10 @@ share/gnome/help/trashapplet/uk/figures/trash-applet.png share/gnome/help/trashapplet/uk/trashapplet.xml share/gnome/help/trashapplet/zh_CN/figures/trash-applet.png share/gnome/help/trashapplet/zh_CN/trashapplet.xml +share/gnome/help/trashapplet/zh_HK/figures/trash-applet.png +share/gnome/help/trashapplet/zh_HK/trashapplet.xml +share/gnome/help/trashapplet/zh_TW/figures/trash-applet.png +share/gnome/help/trashapplet/zh_TW/trashapplet.xml %%CPUFREQ%%share/icons/hicolor/16x16/apps/gnome-cpu-frequency-applet.png share/icons/hicolor/16x16/apps/gnome-eyes-applet.png share/icons/hicolor/16x16/apps/gnome-sticky-notes-applet.png @@ -1485,8 +1572,10 @@ share/locale/be@latin/LC_MESSAGES/gnome-applets-2.0.mo share/locale/bg/LC_MESSAGES/gnome-applets-2.0.mo share/locale/bn/LC_MESSAGES/gnome-applets-2.0.mo share/locale/bn_IN/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/br/LC_MESSAGES/gnome-applets-2.0.mo share/locale/bs/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ca/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/ca@valencia/LC_MESSAGES/gnome-applets-2.0.mo share/locale/crh/LC_MESSAGES/gnome-applets-2.0.mo share/locale/cs/LC_MESSAGES/gnome-applets-2.0.mo share/locale/cy/LC_MESSAGES/gnome-applets-2.0.mo @@ -1597,6 +1686,8 @@ share/omf/accessx-status/accessx-status-uk.omf share/omf/accessx-status/accessx-status-zh_CN.omf %%BATTERY%%share/omf/battstat/battstat-C.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-de.omf %%BATTERY%%share/omf/battstat/battstat-el.omf %%BATTERY%%share/omf/battstat/battstat-en_GB.omf @@ -1610,6 +1701,7 @@ share/omf/accessx-status/accessx-status-zh_CN.omf %%BATTERY%%share/omf/battstat/battstat-pt_BR.omf %%BATTERY%%share/omf/battstat/battstat-sv.omf %%BATTERY%%share/omf/battstat/battstat-uk.omf +%%BATTERY%%share/omf/battstat/battstat-zh_CN.omf share/omf/char-palette/char-palette-C.omf share/omf/char-palette/char-palette-bg.omf share/omf/char-palette/char-palette-ca.omf @@ -1631,6 +1723,7 @@ share/omf/char-palette/char-palette-sv.omf share/omf/char-palette/char-palette-uk.omf share/omf/char-palette/char-palette-zh_CN.omf %%COMMANDER%%share/omf/command-line/command-line-C.omf +%%COMMANDER%%share/omf/command-line/command-line-ca.omf %%COMMANDER%%share/omf/command-line/command-line-de.omf %%COMMANDER%%share/omf/command-line/command-line-el.omf %%COMMANDER%%share/omf/command-line/command-line-en_GB.omf @@ -1653,6 +1746,7 @@ share/omf/char-palette/char-palette-zh_CN.omf %%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-eu.omf %%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-fi.omf %%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-fr.omf +%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-hu.omf %%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-nl.omf %%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-oc.omf %%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-pt_BR.omf @@ -1660,7 +1754,10 @@ share/omf/char-palette/char-palette-zh_CN.omf %%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-sv.omf %%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-uk.omf %%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-zh_CN.omf +%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-zh_HK.omf +%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-zh_TW.omf share/omf/drivemount/drivemount-C.omf +share/omf/drivemount/drivemount-ca.omf share/omf/drivemount/drivemount-cs.omf share/omf/drivemount/drivemount-de.omf share/omf/drivemount/drivemount-el.omf @@ -1712,6 +1809,7 @@ share/omf/gswitchit/gswitchit-sv.omf share/omf/gswitchit/gswitchit-uk.omf share/omf/gswitchit/gswitchit-zh_CN.omf share/omf/gweather/gweather-C.omf +share/omf/gweather/gweather-ar.omf share/omf/gweather/gweather-ca.omf share/omf/gweather/gweather-cs.omf share/omf/gweather/gweather-de.omf @@ -1731,6 +1829,7 @@ share/omf/gweather/gweather-sv.omf share/omf/gweather/gweather-uk.omf share/omf/gweather/gweather-zh_CN.omf %%PYTHON%%share/omf/invest-applet/invest-applet-C.omf +%%PYTHON%%share/omf/invest-applet/invest-applet-ca.omf %%PYTHON%%share/omf/invest-applet/invest-applet-de.omf %%PYTHON%%share/omf/invest-applet/invest-applet-en_GB.omf %%PYTHON%%share/omf/invest-applet/invest-applet-el.omf @@ -1761,6 +1860,7 @@ share/omf/mixer_applet2/mixer_applet2-uk.omf share/omf/mixer_applet2/mixer_applet2-zh_CN.omf share/omf/multiload/multiload-C.omf share/omf/multiload/multiload-ca.omf +share/omf/multiload/multiload-cs.omf share/omf/multiload/multiload-de.omf share/omf/multiload/multiload-el.omf share/omf/multiload/multiload-en_GB.omf @@ -1793,6 +1893,7 @@ share/omf/stickynotes_applet/stickynotes_applet-pt_BR.omf 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/trashapplet/trashapplet-C.omf share/omf/trashapplet/trashapplet-ca.omf share/omf/trashapplet/trashapplet-cs.omf @@ -1814,6 +1915,8 @@ share/omf/trashapplet/trashapplet-ru.omf share/omf/trashapplet/trashapplet-sv.omf share/omf/trashapplet/trashapplet-uk.omf share/omf/trashapplet/trashapplet-zh_CN.omf +share/omf/trashapplet/trashapplet-zh_HK.omf +share/omf/trashapplet/trashapplet-zh_TW.omf share/pixmaps/accessx-status-applet/ax-applet.png share/pixmaps/accessx-status-applet/ax-bouncekeys.png share/pixmaps/accessx-status-applet/ax-key-base.png @@ -1860,6 +1963,7 @@ share/pixmaps/stickynotes/locked.png share/pixmaps/stickynotes/resize_se.png share/pixmaps/stickynotes/resize_sw.png share/pixmaps/stickynotes/unlocked.png +%%CPUFREQ%%share/polkit-1/actions/org.gnome.cpufreqselector.policy share/xmodmap/base.xml share/xmodmap/xmodmap.am share/xmodmap/xmodmap.ar @@ -1963,6 +2067,10 @@ share/xmodmap/xmodmap.yu @dirrm share/omf/char-palette %%BATTERY%%@dirrm share/omf/battstat @dirrm share/omf/accessx-status +@dirrm share/gnome/help/trashapplet/zh_TW/figures +@dirrm share/gnome/help/trashapplet/zh_TW +@dirrm share/gnome/help/trashapplet/zh_HK/figures +@dirrm share/gnome/help/trashapplet/zh_HK @dirrm share/gnome/help/trashapplet/zh_CN/figures @dirrm share/gnome/help/trashapplet/zh_CN @dirrm share/gnome/help/trashapplet/uk/figures @@ -2006,6 +2114,8 @@ 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_CN/figures +@dirrm share/gnome/help/stickynotes_applet/zh_CN @dirrm share/gnome/help/stickynotes_applet/uk/figures @dirrm share/gnome/help/stickynotes_applet/uk @dirrm share/gnome/help/stickynotes_applet/sv/figures @@ -2071,6 +2181,8 @@ share/xmodmap/xmodmap.yu @dirrm share/gnome/help/multiload/el @dirrm share/gnome/help/multiload/de/figures @dirrm share/gnome/help/multiload/de +@dirrm share/gnome/help/multiload/cs/figures +@dirrm share/gnome/help/multiload/cs @dirrm share/gnome/help/multiload/ca/figures @dirrm share/gnome/help/multiload/ca @dirrm share/gnome/help/multiload/C/figures @@ -2125,6 +2237,7 @@ share/xmodmap/xmodmap.yu %%PYTHON%%@dirrm share/gnome/help/invest-applet/el %%PYTHON%%@dirrm share/gnome/help/invest-applet/en_GB %%PYTHON%%@dirrm share/gnome/help/invest-applet/de +%%PYTHON%%@dirrm share/gnome/help/invest-applet/ca %%PYTHON%%@dirrm share/gnome/help/invest-applet/C %%PYTHON%%@dirrm share/gnome/help/invest-applet @dirrm share/gnome/help/gweather/zh_CN/figures @@ -2163,6 +2276,8 @@ share/xmodmap/xmodmap.yu @dirrm share/gnome/help/gweather/cs @dirrm share/gnome/help/gweather/ca/figures @dirrm share/gnome/help/gweather/ca +@dirrm share/gnome/help/gweather/ar/figures +@dirrm share/gnome/help/gweather/ar @dirrm share/gnome/help/gweather/C/figures @dirrm share/gnome/help/gweather/C @dirrm share/gnome/help/gweather @@ -2253,9 +2368,15 @@ share/xmodmap/xmodmap.yu @dirrm share/gnome/help/drivemount/de @dirrm share/gnome/help/drivemount/cs/figures @dirrm share/gnome/help/drivemount/cs +@dirrm share/gnome/help/drivemount/ca/figures +@dirrm share/gnome/help/drivemount/ca @dirrm share/gnome/help/drivemount/C/figures @dirrm share/gnome/help/drivemount/C @dirrm share/gnome/help/drivemount +%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/zh_TW/figures +%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/zh_TW +%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/zh_HK/figures +%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/zh_HK %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/zh_CN/figures %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/zh_CN %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/uk/figures @@ -2270,6 +2391,8 @@ share/xmodmap/xmodmap.yu %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/oc %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/nl/figures %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/nl +%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/hu/figures +%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/hu %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/fr/figures %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/fr %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/fi/figures @@ -2315,6 +2438,8 @@ share/xmodmap/xmodmap.yu %%COMMANDER%%@dirrm share/gnome/help/command-line/el %%COMMANDER%%@dirrm share/gnome/help/command-line/de/figures %%COMMANDER%%@dirrm share/gnome/help/command-line/de +%%COMMANDER%%@dirrm share/gnome/help/command-line/ca/figures +%%COMMANDER%%@dirrm share/gnome/help/command-line/ca %%COMMANDER%%@dirrm share/gnome/help/command-line/C/figures %%COMMANDER%%@dirrm share/gnome/help/command-line/C %%COMMANDER%%@dirrm share/gnome/help/command-line @@ -2359,6 +2484,8 @@ share/xmodmap/xmodmap.yu @dirrm share/gnome/help/char-palette/C/figures @dirrm share/gnome/help/char-palette/C @dirrm share/gnome/help/char-palette +%%BATTERY%%@dirrm share/gnome/help/battstat/zh_CN/figures +%%BATTERY%%@dirrm share/gnome/help/battstat/zh_CN %%BATTERY%%@dirrm share/gnome/help/battstat/uk/figures %%BATTERY%%@dirrm share/gnome/help/battstat/uk %%BATTERY%%@dirrm share/gnome/help/battstat/sv/figures @@ -2387,6 +2514,10 @@ share/xmodmap/xmodmap.yu %%BATTERY%%@dirrm share/gnome/help/battstat/de %%BATTERY%%@dirrm share/gnome/help/battstat/bg/figures %%BATTERY%%@dirrm share/gnome/help/battstat/bg +%%BATTERY%%@dirrm share/gnome/help/battstat/cs/figures +%%BATTERY%%@dirrm share/gnome/help/battstat/cs +%%BATTERY%%@dirrm share/gnome/help/battstat/ca/figures +%%BATTERY%%@dirrm share/gnome/help/battstat/ca %%BATTERY%%@dirrm share/gnome/help/battstat/C/figures %%BATTERY%%@dirrm share/gnome/help/battstat/C %%BATTERY%%@dirrm share/gnome/help/battstat @@ -2499,6 +2630,8 @@ share/xmodmap/xmodmap.yu @dirrmtry share/locale/es_AR @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 diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile index 32bd5a0144c2..1bb4c4156025 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-stable/x11/gnome-desktop/Makefile,v 1.3 2009/04/15 21:55:48 kwm Exp $ +# $MCom: ports/x11/gnome-desktop/Makefile,v 1.171 2009/10/22 14:31:14 kwm Exp $ # PORTNAME= gnome-desktop -PORTVERSION= 2.26.3 -PORTREVISION?= 1 +PORTVERSION= 2.28.1 +PORTREVISION?= 0 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -20,10 +20,10 @@ USE_BZIP2= yes .if !defined(REFERENCE_PORT) -RUN_DEPENDS= ${pygnome2_DETECT}:${PORTSDIR}/x11-toolkits/py-gnome2 +LIB_DEPENDS= startup-notification-1.0:${PORTSDIR}/x11/startup-notification USE_XORG= xpm -USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui gnomedocutils \ +USE_GNOME= gnomeprefix gnomehack intlhack gnomedocutils gconf2 pygtk2 \ ltverhack referencehack GNOME_DESKTOP_VERSION=2 USE_GETTEXT= yes @@ -33,8 +33,7 @@ USE_PYTHON= yes INSTALLS_OMF= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:22 -CONFIGURE_ARGS= --with-gnome-distributor="FreeBSD GNOME Project" \ - --with-kde-datadir=${LOCALBASE}/share +CONFIGURE_ARGS= --with-gnome-distributor="FreeBSD GNOME Project" CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo index 34acc1d523e8..5e145439b1aa 100644 --- a/x11/gnome-desktop/distinfo +++ b/x11/gnome-desktop/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-desktop-2.26.3.tar.bz2) = 1668dcedde64b30aa02f0a73e59c957d -SHA256 (gnome2/gnome-desktop-2.26.3.tar.bz2) = 37b7278d3132bb97f70ba2d5c5c06f5a219433d886e3f85e9a16c1f05c3726b7 -SIZE (gnome2/gnome-desktop-2.26.3.tar.bz2) = 3107987 +MD5 (gnome2/gnome-desktop-2.28.1.tar.bz2) = 6870b71b564dc902af65ddee176e603f +SHA256 (gnome2/gnome-desktop-2.28.1.tar.bz2) = 21bb7d3b4aa9b452ecf1b27d6fe61b824f60f76d7c5f3b78b59f0fd3eedfd461 +SIZE (gnome2/gnome-desktop-2.28.1.tar.bz2) = 1639948 diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist index 40a2944a79fc..f0f0792005f1 100644 --- a/x11/gnome-desktop/pkg-plist +++ b/x11/gnome-desktop/pkg-plist @@ -37,6 +37,7 @@ share/gnome/help/fdl/fr/fdl.xml share/gnome/help/fdl/hu/fdl.xml share/gnome/help/fdl/ko/fdl.xml share/gnome/help/fdl/oc/fdl.xml +share/gnome/help/fdl/pl/fdl.xml share/gnome/help/fdl/sv/fdl.xml share/gnome/help/fdl/uk/fdl.xml share/gnome/help/fdl/vi/fdl.xml @@ -74,6 +75,7 @@ share/gnome/help/lgpl/sv/lgpl.xml share/gnome/help/lgpl/uk/lgpl.xml share/gnome/help/lgpl/vi/lgpl.xml share/gnome/help/lgpl/zh_CN/lgpl.xml +share/libgnome-desktop/pnp.ids share/locale/af/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/am/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ar/LC_MESSAGES/gnome-desktop-2.0.mo @@ -126,8 +128,8 @@ share/locale/ko/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ku/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ky/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/li/LC_MESSAGES/gnome-desktop-2.0.mo -share/locale/lt/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/lo/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/lt/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/lv/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/mai/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/mg/LC_MESSAGES/gnome-desktop-2.0.mo @@ -138,6 +140,7 @@ share/locale/mn/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/mr/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ms/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/nb/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/nds/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ne/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/nl/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/nn/LC_MESSAGES/gnome-desktop-2.0.mo @@ -189,6 +192,7 @@ share/omf/fdl/fdl-fr.omf share/omf/fdl/fdl-hu.omf share/omf/fdl/fdl-ko.omf share/omf/fdl/fdl-oc.omf +share/omf/fdl/fdl-pl.omf share/omf/fdl/fdl-sv.omf share/omf/fdl/fdl-uk.omf share/omf/fdl/fdl-vi.omf @@ -336,6 +340,7 @@ share/pixmaps/vnterm.xpm @dirrm share/gnome/help/fdl/vi @dirrm share/gnome/help/fdl/uk @dirrm share/gnome/help/fdl/sv +@dirrm share/gnome/help/fdl/pl @dirrm share/gnome/help/fdl/oc @dirrm share/gnome/help/fdl/ko @dirrm share/gnome/help/fdl/hu @@ -351,6 +356,7 @@ share/pixmaps/vnterm.xpm @dirrm include/gnome-desktop-2.0/libgnomeui @dirrm include/gnome-desktop-2.0/libgnome @dirrm include/gnome-desktop-2.0 +@dirrm share/libgnome-desktop @dirrmtry share/locale/zu/LC_MESSAGES @dirrmtry share/locale/zu @dirrmtry share/locale/zh_HK/LC_MESSAGES @@ -381,6 +387,8 @@ share/pixmaps/vnterm.xpm @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 diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile index 151f63199686..787e14aaedc9 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-stable/x11/gnome-menus/Makefile,v 1.7 2009/04/15 17:32:15 kwm Exp $ +# $MCom: ports/x11/gnome-menus/Makefile,v 1.100 2009/10/18 23:13:39 marcus Exp $ # PORTNAME= gnome-menus -PORTVERSION= 2.26.2 +PORTVERSION= 2.28.0.1 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -37,6 +37,8 @@ post-patch: < ${FILESDIR}/KDE.directory > ${WRKSRC}/KDE.directory @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/simple-editor/GMenuSimpleEditor/menutreemodel.py + @${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ + ${WRKSRC}/util/Makefile.in post-install: @${INSTALL_DATA} ${WRKSRC}/layout/applications.menu \ diff --git a/x11/gnome-menus/distinfo b/x11/gnome-menus/distinfo index 1ff9efa22dd8..6061681685d2 100644 --- a/x11/gnome-menus/distinfo +++ b/x11/gnome-menus/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-menus-2.26.2.tar.bz2) = 23a7375dd20238184f2fcccc4d83846b -SHA256 (gnome2/gnome-menus-2.26.2.tar.bz2) = c9709695819ffaea92d41647adef8c0a6a408aa9a725e4b2987273bb06115a1c -SIZE (gnome2/gnome-menus-2.26.2.tar.bz2) = 438945 +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 diff --git a/x11/gnome-menus/files/patch-util_Makefile.in b/x11/gnome-menus/files/patch-util_Makefile.in new file mode 100644 index 000000000000..fd9b0fcf098b --- /dev/null +++ b/x11/gnome-menus/files/patch-util_Makefile.in @@ -0,0 +1,10 @@ +--- util/Makefile.in.orig 2009-10-18 19:06:36.000000000 -0400 ++++ util/Makefile.in 2009-10-18 19:10:40.000000000 -0400 +@@ -313,6 +313,7 @@ gnome_menu_spec_test_SOURCES = \ + + gnome_menu_spec_test_LDADD = \ + ../libmenu/libgnome-menu.la \ ++ %%PTHREAD_LIBS%% \ + $(GLIB_LIBS) \ + $(NULL) + diff --git a/x11/gnome-menus/pkg-plist b/x11/gnome-menus/pkg-plist index aebcca475721..b801284aaa12 100644 --- a/x11/gnome-menus/pkg-plist +++ b/x11/gnome-menus/pkg-plist @@ -93,6 +93,7 @@ share/locale/mn/LC_MESSAGES/gnome-menus.mo share/locale/mr/LC_MESSAGES/gnome-menus.mo share/locale/ms/LC_MESSAGES/gnome-menus.mo share/locale/nb/LC_MESSAGES/gnome-menus.mo +share/locale/nds/LC_MESSAGES/gnome-menus.mo share/locale/ne/LC_MESSAGES/gnome-menus.mo share/locale/nl/LC_MESSAGES/gnome-menus.mo share/locale/nn/LC_MESSAGES/gnome-menus.mo @@ -152,6 +153,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo @dirrmtry share/locale/ps @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 diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile index cf428bd304e2..d535db2a1adb 100644 --- a/x11/gnome-panel/Makefile +++ b/x11/gnome-panel/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/x11/gnome-panel/Makefile,v 1.3 2009/04/16 08:01:26 kwm Exp $ +# $MCom: ports/x11/gnome-panel/Makefile,v 1.208 2009/10/12 13:36:46 avl Exp $ # PORTNAME= gnome-panel -PORTVERSION= 2.26.3 +PORTVERSION= 2.28.0 PORTREVISION?= 1 CATEGORIES= x11 gnome MASTER_SITES= GNOME @@ -21,21 +21,20 @@ USE_BZIP2= yes .if !defined(REFERENCE_PORT) LIB_DEPENDS= gweather.1:${PORTSDIR}/net/libgweather \ - polkit-gnome.0:${PORTSDIR}/sysutils/policykit-gnome + polkit-gnome.0:${PORTSDIR}/sysutils/policykit-gnome USE_GETTEXT= yes INSTALLS_OMF= yes USE_LDCONFIG= yes INSTALLS_ICONS= yes USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop librsvg2 \ - libwnck gnomemenus gnomedocutils ltverhack referencehack + libwnck gnomemenus gnomedocutils ltverhack referencehack \ + libgnomeui WANT_GNOME= yes GNOME_DESKTOP_VERSION=2 USE_GMAKE= yes USE_AUTOTOOLS= libtool:22 -CONFIGURE_ARGS= --with-kde-datadir=${LOCALBASE}/share \ - --with-kde-docdir=${LOCALBASE}/share/doc \ - --disable-network-manager \ +CONFIGURE_ARGS= --disable-network-manager \ --enable-polkit CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" @@ -69,9 +68,7 @@ post-patch: 's|"applications.menu"|"gnome-applications.menu"|' @${REINPLACE_CMD} -e 's|xsltproc -o| xsltproc --nonet -o|g' \ ${WRKSRC}/help/clock/Makefile.in \ - ${WRKSRC}/help/fish/Makefile.in \ - ${WRKSRC}/help/window-list/Makefile.in \ - ${WRKSRC}/help/workspace-switcher/Makefile.in + ${WRKSRC}/help/fish/Makefile.in .include <bsd.port.post.mk> diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo index d6092bc525e8..74972b3b2ea9 100644 --- a/x11/gnome-panel/distinfo +++ b/x11/gnome-panel/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-panel-2.26.3.tar.bz2) = 38de69896976d57abb4f4720fef62fcf -SHA256 (gnome2/gnome-panel-2.26.3.tar.bz2) = b50fa78df3e94327e6478fbf8d0addfc0dde1f2022ffc39066bb46040ad3778e -SIZE (gnome2/gnome-panel-2.26.3.tar.bz2) = 2988811 +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 diff --git a/x11/gnome-panel/files/patch-applets_clock_clock.c b/x11/gnome-panel/files/patch-applets_clock_clock.c index 5acc58b408c6..a9b459b74091 100644 --- a/x11/gnome-panel/files/patch-applets_clock_clock.c +++ b/x11/gnome-panel/files/patch-applets_clock_clock.c @@ -1,11 +1,11 @@ ---- applets/clock/clock.c.orig 2008-02-26 14:17:49.000000000 +0100 -+++ applets/clock/clock.c 2008-02-26 18:01:17.000000000 +0100 -@@ -84,6 +84,8 @@ - - #define FALLBACK_CONFIG_TOOL "time-admin" +--- applets/clock/clock.c.orig 2009-07-01 15:06:23.000000000 +0200 ++++ applets/clock/clock.c 2009-07-19 15:59:26.000000000 +0200 +@@ -71,6 +71,8 @@ + #include "set-timezone.h" + #include "system-timezone.h" +#define daylight 1 + - static const char *clock_config_tools [] = { - CLOCK_TIME_UTILITY, - FALLBACK_CONFIG_TOOL + #define INTERNETSECOND (864) + #define INTERNETBEAT (86400) + diff --git a/x11/gnome-panel/files/patch-config.h.in b/x11/gnome-panel/files/patch-config.h.in deleted file mode 100644 index 8a59166a57b7..000000000000 --- a/x11/gnome-panel/files/patch-config.h.in +++ /dev/null @@ -1,11 +0,0 @@ ---- config.h.in.orig Thu Jan 2 19:50:41 2003 -+++ config.h.in Mon Jan 6 13:11:12 2003 -@@ -96,6 +96,8 @@ - /* Define to 1 if you have the <stdlib.h> header file. */ - #undef HAVE_STDLIB_H - -+#undef HAVE_LANGINFO_H -+ - /* Define to 1 if you have the <strings.h> header file. */ - #undef HAVE_STRINGS_H - diff --git a/x11/gnome-panel/files/patch-configure b/x11/gnome-panel/files/patch-configure index 732f3a86022c..1d73358932d3 100644 --- a/x11/gnome-panel/files/patch-configure +++ b/x11/gnome-panel/files/patch-configure @@ -1,11 +1,61 @@ ---- configure.orig Wed Jan 14 15:54:42 2004 -+++ configure Wed Jan 14 15:55:13 2004 -@@ -5536,7 +5536,7 @@ +--- configure.orig 2009-10-04 17:26:08.000000000 -0400 ++++ configure 2009-10-04 17:31:11.000000000 -0400 +@@ -14954,12 +14955,12 @@ if test -n "$CLOCK_CFLAGS"; then + 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 +14971,12 @@ if test -n "$CLOCK_LIBS"; then + 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 +14994,14 @@ else + _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 +15012,7 @@ Alternatively, you may set the environme + 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 - for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ -- inttypes.h stdint.h unistd.h -+ inttypes.h stdint.h unistd.h langinfo.h - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` - echo "$as_me:$LINENO: checking for $ac_header" >&5 diff --git a/x11/gnome-panel/files/patch-gnome-panel_panel-multiscreen.c b/x11/gnome-panel/files/patch-gnome-panel_panel-multiscreen.c new file mode 100644 index 000000000000..50ef12367570 --- /dev/null +++ b/x11/gnome-panel/files/patch-gnome-panel_panel-multiscreen.c @@ -0,0 +1,59 @@ +--- 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 16ed214475df..72143630613a 100644 --- a/x11/gnome-panel/pkg-plist +++ b/x11/gnome-panel/pkg-plist @@ -23,9 +23,9 @@ libdata/pkgconfig/libpanelapplet-2.0.pc libexec/clock-applet libexec/fish-applet-2 libexec/gnome-clock-applet-mechanism +libexec/gnome-panel-add libexec/notification-area-applet libexec/wnck-applet -share/PolicyKit/policy/org.gnome.clockapplet.mechanism.policy share/applications/gnome-panel.desktop share/dbus-1/system-services/org.gnome.ClockApplet.Mechanism.service share/gnome-2.0/ui/GNOME_ClockApplet.xml @@ -36,13 +36,13 @@ share/gnome-2.0/ui/GNOME_ShowDesktopApplet.xml share/gnome-2.0/ui/GNOME_WindowListApplet.xml share/gnome-2.0/ui/GNOME_WindowMenuApplet.xml share/gnome-2.0/ui/GNOME_WorkspaceSwitcherApplet.xml -%%DATADIR%%/glade/clock.glade -%%DATADIR%%/glade/fish.glade -%%DATADIR%%/glade/panel-properties-dialog.glade -%%DATADIR%%/glade/panel-run-dialog.glade -%%DATADIR%%/glade/panel-test-applets.glade -%%DATADIR%%/glade/window-list.glade -%%DATADIR%%/glade/workspace-switcher.glade +%%DATADIR%%/ui/clock.ui +%%DATADIR%%/ui/fish.ui +%%DATADIR%%/ui/panel-properties-dialog.ui +%%DATADIR%%/ui/panel-run-dialog.ui +%%DATADIR%%/ui/panel-test-applets.ui +%%DATADIR%%/ui/window-list.ui +%%DATADIR%%/ui/workspace-switcher.ui %%DATADIR%%/pixmaps/clock-calendar-icon.png %%DATADIR%%/pixmaps/clock-face-large.svg %%DATADIR%%/pixmaps/clock-face-small-day.svg @@ -192,50 +192,6 @@ share/gnome/help/fish/uk/legal.xml share/gnome/help/fish/zh_CN/figures/fish_applet.png share/gnome/help/fish/zh_CN/fish.xml share/gnome/help/fish/zh_CN/legal.xml -share/gnome/help/window-list/C/window-list.xml -share/gnome/help/window-list/ar/window-list.xml -share/gnome/help/window-list/ca/window-list.xml -share/gnome/help/window-list/cs/window-list.xml -share/gnome/help/window-list/da/window-list.xml -share/gnome/help/window-list/de/window-list.xml -share/gnome/help/window-list/el/window-list.xml -share/gnome/help/window-list/en_GB/window-list.xml -share/gnome/help/window-list/es/window-list.xml -share/gnome/help/window-list/eu/window-list.xml -share/gnome/help/window-list/fi/window-list.xml -share/gnome/help/window-list/fr/window-list.xml -share/gnome/help/window-list/it/window-list.xml -share/gnome/help/window-list/ko/window-list.xml -share/gnome/help/window-list/oc/window-list.xml -share/gnome/help/window-list/pa/window-list.xml -share/gnome/help/window-list/pt_BR/window-list.xml -share/gnome/help/window-list/ru/window-list.xml -share/gnome/help/window-list/sv/window-list.xml -share/gnome/help/window-list/uk/window-list.xml -share/gnome/help/window-list/zh_CN/window-list.xml -share/gnome/help/workspace-switcher/C/workspace-switcher.xml -share/gnome/help/workspace-switcher/ar/workspace-switcher.xml -share/gnome/help/workspace-switcher/ca/workspace-switcher.xml -share/gnome/help/workspace-switcher/cs/workspace-switcher.xml -share/gnome/help/workspace-switcher/da/workspace-switcher.xml -share/gnome/help/workspace-switcher/de/workspace-switcher.xml -share/gnome/help/workspace-switcher/el/workspace-switcher.xml -share/gnome/help/workspace-switcher/en_GB/workspace-switcher.xml -share/gnome/help/workspace-switcher/es/workspace-switcher.xml -share/gnome/help/workspace-switcher/eu/workspace-switcher.xml -share/gnome/help/workspace-switcher/fi/workspace-switcher.xml -share/gnome/help/workspace-switcher/fr/workspace-switcher.xml -share/gnome/help/workspace-switcher/it/workspace-switcher.xml -share/gnome/help/workspace-switcher/ko/workspace-switcher.xml -share/gnome/help/workspace-switcher/nl/workspace-switcher.xml -share/gnome/help/workspace-switcher/oc/workspace-switcher.xml -share/gnome/help/workspace-switcher/pa/workspace-switcher.xml -share/gnome/help/workspace-switcher/pt_BR/workspace-switcher.xml -share/gnome/help/workspace-switcher/ru/workspace-switcher.xml -share/gnome/help/workspace-switcher/sv/workspace-switcher.xml -share/gnome/help/workspace-switcher/uk/workspace-switcher.xml -share/gnome/help/workspace-switcher/vi/workspace-switcher.xml -share/gnome/help/workspace-switcher/zh_CN/workspace-switcher.xml share/icons/hicolor/16x16/apps/gnome-panel-clock.png share/icons/hicolor/16x16/apps/gnome-panel-drawer.png share/icons/hicolor/16x16/apps/gnome-panel-fish.png @@ -438,101 +394,10 @@ share/omf/fish/fish-sv.omf share/omf/fish/fish-th.omf share/omf/fish/fish-uk.omf share/omf/fish/fish-zh_CN.omf -share/omf/window-list/window-list-C.omf -share/omf/window-list/window-list-ar.omf -share/omf/window-list/window-list-ca.omf -share/omf/window-list/window-list-cs.omf -share/omf/window-list/window-list-da.omf -share/omf/window-list/window-list-de.omf -share/omf/window-list/window-list-el.omf -share/omf/window-list/window-list-en_GB.omf -share/omf/window-list/window-list-es.omf -share/omf/window-list/window-list-eu.omf -share/omf/window-list/window-list-fi.omf -share/omf/window-list/window-list-fr.omf -share/omf/window-list/window-list-it.omf -share/omf/window-list/window-list-ko.omf -share/omf/window-list/window-list-oc.omf -share/omf/window-list/window-list-pa.omf -share/omf/window-list/window-list-pt_BR.omf -share/omf/window-list/window-list-ru.omf -share/omf/window-list/window-list-sv.omf -share/omf/window-list/window-list-uk.omf -share/omf/window-list/window-list-zh_CN.omf -share/omf/workspace-switcher/workspace-switcher-C.omf -share/omf/workspace-switcher/workspace-switcher-ar.omf -share/omf/workspace-switcher/workspace-switcher-ca.omf -share/omf/workspace-switcher/workspace-switcher-cs.omf -share/omf/workspace-switcher/workspace-switcher-da.omf -share/omf/workspace-switcher/workspace-switcher-de.omf -share/omf/workspace-switcher/workspace-switcher-el.omf -share/omf/workspace-switcher/workspace-switcher-en_GB.omf -share/omf/workspace-switcher/workspace-switcher-es.omf -share/omf/workspace-switcher/workspace-switcher-eu.omf -share/omf/workspace-switcher/workspace-switcher-fi.omf -share/omf/workspace-switcher/workspace-switcher-fr.omf -share/omf/workspace-switcher/workspace-switcher-it.omf -share/omf/workspace-switcher/workspace-switcher-ko.omf -share/omf/workspace-switcher/workspace-switcher-nl.omf -share/omf/workspace-switcher/workspace-switcher-oc.omf -share/omf/workspace-switcher/workspace-switcher-pa.omf -share/omf/workspace-switcher/workspace-switcher-pt_BR.omf -share/omf/workspace-switcher/workspace-switcher-ru.omf -share/omf/workspace-switcher/workspace-switcher-sv.omf -share/omf/workspace-switcher/workspace-switcher-uk.omf -share/omf/workspace-switcher/workspace-switcher-vi.omf -share/omf/workspace-switcher/workspace-switcher-zh_CN.omf -@dirrm share/omf/workspace-switcher -@dirrm share/omf/window-list +share/polkit-1/actions/org.gnome.clockapplet.mechanism.policy @dirrm share/omf/fish @dirrm share/omf/clock @dirrm share/idl/gnome-panel-2.0 -@dirrm share/gnome/help/workspace-switcher/zh_CN -@dirrm share/gnome/help/workspace-switcher/vi -@dirrm share/gnome/help/workspace-switcher/uk -@dirrm share/gnome/help/workspace-switcher/sv -@dirrm share/gnome/help/workspace-switcher/ru -@dirrm share/gnome/help/workspace-switcher/pt_BR -@dirrm share/gnome/help/workspace-switcher/pa -@dirrm share/gnome/help/workspace-switcher/oc -@dirrm share/gnome/help/workspace-switcher/nl -@dirrm share/gnome/help/workspace-switcher/ko -@dirrm share/gnome/help/workspace-switcher/it -@dirrm share/gnome/help/workspace-switcher/fr -@dirrm share/gnome/help/workspace-switcher/fi -@dirrm share/gnome/help/workspace-switcher/eu -@dirrm share/gnome/help/workspace-switcher/es -@dirrm share/gnome/help/workspace-switcher/en_GB -@dirrm share/gnome/help/workspace-switcher/el -@dirrm share/gnome/help/workspace-switcher/de -@dirrm share/gnome/help/workspace-switcher/da -@dirrm share/gnome/help/workspace-switcher/cs -@dirrm share/gnome/help/workspace-switcher/ca -@dirrm share/gnome/help/workspace-switcher/ar -@dirrm share/gnome/help/workspace-switcher/C -@dirrm share/gnome/help/workspace-switcher -@dirrm share/gnome/help/window-list/zh_CN -@dirrm share/gnome/help/window-list/uk -@dirrm share/gnome/help/window-list/sv -@dirrm share/gnome/help/window-list/ru -@dirrm share/gnome/help/window-list/pt_BR -@dirrm share/gnome/help/window-list/pa -@dirrm share/gnome/help/window-list/oc -@dirrm share/gnome/help/window-list/ko -@dirrm share/gnome/help/window-list/it -@dirrm share/gnome/help/window-list/fr -@dirrm share/gnome/help/window-list/fi -@dirrm share/gnome/help/window-list/eu -@dirrm share/gnome/help/window-list/es -@dirrm share/gnome/help/window-list/en_GB -@dirrm share/gnome/help/window-list/el -@dirrm share/gnome/help/window-list/de -@dirrm share/gnome/help/window-list/da -@dirrm share/gnome/help/window-list/cs -@dirrm share/gnome/help/window-list/ca -@dirrm share/gnome/help/window-list/ar -@dirrm share/gnome/help/window-list/C -@dirrm share/gnome/help/window-list @dirrm share/gnome/help/fish/zh_CN/figures @dirrm share/gnome/help/fish/zh_CN @dirrm share/gnome/help/fish/uk/figures @@ -622,7 +487,7 @@ share/omf/workspace-switcher/workspace-switcher-zh_CN.omf @dirrm share/gnome/help/clock/C @dirrm share/gnome/help/clock @dirrm %%DATADIR%%/pixmaps -@dirrm %%DATADIR%%/glade +@dirrm %%DATADIR%%/ui @dirrm %%DATADIR%% @dirrmtry share/applications @dirrm include/panel-2.0 diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile index 46131e0f46e2..f98cb46eab5a 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-stable/x11/gnome-screensaver/Makefile,v 1.1 2009/04/16 01:20:04 kwm Exp $ +# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.112 2009/09/23 11:36:58 kwm Exp $ # PORTNAME= gnome-screensaver -PORTVERSION= 2.26.1 -PORTREVISION= 3 +PORTVERSION= 2.28.0 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11/gnome-screensaver/distinfo b/x11/gnome-screensaver/distinfo index eae52a2b7277..e9349d500e87 100644 --- a/x11/gnome-screensaver/distinfo +++ b/x11/gnome-screensaver/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-screensaver-2.26.1.tar.bz2) = 13b9066bb2dfe9face50b3d852b67ded -SHA256 (gnome2/gnome-screensaver-2.26.1.tar.bz2) = 14b68dc59646b5a53487c311d770ccc8458581480c201faf003349119d340830 -SIZE (gnome2/gnome-screensaver-2.26.1.tar.bz2) = 2031739 +MD5 (gnome2/gnome-screensaver-2.28.0.tar.bz2) = b37d4a210cac22a7312f9736f0c4356f +SHA256 (gnome2/gnome-screensaver-2.28.0.tar.bz2) = 4e1a9c1054a8473b73f2bf3e9adee778e0918e793df6e1c2fa6230485f895412 +SIZE (gnome2/gnome-screensaver-2.28.0.tar.bz2) = 4779450 diff --git a/x11/gnome-screensaver/files/patch-data_Makefile.in b/x11/gnome-screensaver/files/patch-data_Makefile.in index a474e9ef2229..b61f2225d2f4 100644 --- a/x11/gnome-screensaver/files/patch-data_Makefile.in +++ b/x11/gnome-screensaver/files/patch-data_Makefile.in @@ -1,6 +1,6 @@ ---- data/Makefile.in.orig Mon Nov 7 05:37:01 2005 -+++ data/Makefile.in Mon Nov 7 05:37:38 2005 -@@ -737,38 +737,38 @@ +--- data/Makefile.in.orig 2009-06-15 22:41:37.000000000 +0200 ++++ data/Makefile.in 2009-06-15 22:42:51.000000000 +0200 +@@ -916,38 +916,38 @@ @GCONF_SCHEMAS_INSTALL_FALSE@install-data-local: install-data-hook: @@ -68,6 +68,6 @@ +# echo "***" ; \ +# fi; \ +# fi + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: diff --git a/x11/gnome-screensaver/pkg-plist b/x11/gnome-screensaver/pkg-plist index 9532b59e5f49..9e1e7c8d57f7 100644 --- a/x11/gnome-screensaver/pkg-plist +++ b/x11/gnome-screensaver/pkg-plist @@ -2,6 +2,7 @@ bin/gnome-screensaver bin/gnome-screensaver-command bin/gnome-screensaver-preferences %%PAM%%etc/pam.d/gnome-screensaver +etc/xdg/autostart/gnome-screensaver.desktop etc/xdg/menus/gnome-screensavers.menu libdata/pkgconfig/gnome-screensaver.pc libexec/gnome-screensaver-dialog @@ -15,8 +16,8 @@ share/applications/screensavers/footlogo-floaters.desktop share/applications/screensavers/personal-slideshow.desktop share/applications/screensavers/popsquares.desktop share/desktop-directories/gnome-screensaver.directory -%%DATADIR%%/gnome-screensaver-preferences.glade -%%DATADIR%%/lock-dialog-default.glade +%%DATADIR%%/gnome-screensaver-preferences.ui +%%DATADIR%%/lock-dialog-default.ui share/locale/ar/LC_MESSAGES/gnome-screensaver.mo share/locale/as/LC_MESSAGES/gnome-screensaver.mo share/locale/ast/LC_MESSAGES/gnome-screensaver.mo @@ -25,7 +26,9 @@ share/locale/be@latin/LC_MESSAGES/gnome-screensaver.mo share/locale/bg/LC_MESSAGES/gnome-screensaver.mo share/locale/bn/LC_MESSAGES/gnome-screensaver.mo share/locale/bn_IN/LC_MESSAGES/gnome-screensaver.mo +share/locale/br/LC_MESSAGES/gnome-screensaver.mo share/locale/ca/LC_MESSAGES/gnome-screensaver.mo +share/locale/ca@valencia/LC_MESSAGES/gnome-screensaver.mo share/locale/crh/LC_MESSAGES/gnome-screensaver.mo share/locale/cs/LC_MESSAGES/gnome-screensaver.mo share/locale/cy/LC_MESSAGES/gnome-screensaver.mo @@ -58,12 +61,14 @@ share/locale/ko/LC_MESSAGES/gnome-screensaver.mo share/locale/ku/LC_MESSAGES/gnome-screensaver.mo share/locale/lt/LC_MESSAGES/gnome-screensaver.mo share/locale/lv/LC_MESSAGES/gnome-screensaver.mo +share/locale/mai/LC_MESSAGES/gnome-screensaver.mo share/locale/mg/LC_MESSAGES/gnome-screensaver.mo share/locale/mk/LC_MESSAGES/gnome-screensaver.mo share/locale/ml/LC_MESSAGES/gnome-screensaver.mo share/locale/mn/LC_MESSAGES/gnome-screensaver.mo share/locale/mr/LC_MESSAGES/gnome-screensaver.mo share/locale/nb/LC_MESSAGES/gnome-screensaver.mo +share/locale/nds/LC_MESSAGES/gnome-screensaver.mo share/locale/ne/LC_MESSAGES/gnome-screensaver.mo share/locale/nl/LC_MESSAGES/gnome-screensaver.mo share/locale/nn/LC_MESSAGES/gnome-screensaver.mo @@ -92,18 +97,21 @@ share/locale/vi/LC_MESSAGES/gnome-screensaver.mo share/locale/zh_CN/LC_MESSAGES/gnome-screensaver.mo share/locale/zh_HK/LC_MESSAGES/gnome-screensaver.mo share/locale/zh_TW/LC_MESSAGES/gnome-screensaver.mo -share/pixmaps/backgrounds/cosmos/cloud.jpg -share/pixmaps/backgrounds/cosmos/comet.jpg -share/pixmaps/backgrounds/cosmos/earth-horizon.jpg -share/pixmaps/backgrounds/cosmos/earthrise.jpg -share/pixmaps/backgrounds/cosmos/galaxy-ngc3370.jpg -share/pixmaps/backgrounds/cosmos/helix-nebula.jpg -share/pixmaps/backgrounds/cosmos/jupiter.jpg -share/pixmaps/backgrounds/cosmos/sombrero.jpg -share/pixmaps/backgrounds/cosmos/whirlpool.jpg +share/backgrounds/cosmos/background-1.xml +share/backgrounds/cosmos/blue-marble-west.jpg +share/backgrounds/cosmos/cloud.jpg +share/backgrounds/cosmos/comet.jpg +share/backgrounds/cosmos/earth-horizon.jpg +share/backgrounds/cosmos/galaxy-ngc3370.jpg +share/backgrounds/cosmos/helix-nebula.jpg +share/backgrounds/cosmos/jupiter.jpg +share/backgrounds/cosmos/sombrero.jpg +share/backgrounds/cosmos/whirlpool.jpg +share/gnome-background-properties/cosmos.xml share/pixmaps/gnome-logo-white.svg -@dirrm share/pixmaps/backgrounds/cosmos -@dirrmtry share/pixmaps/backgrounds +@dirrm share/gnome-background-properties +@dirrm share/backgrounds/cosmos +@dirrmtry share/backgrounds @dirrm %%DATADIR%% @dirrmtry share/applications @dirrm libexec/gnome-screensaver @@ -119,16 +127,22 @@ share/pixmaps/gnome-logo-white.svg @dirrmtry share/locale/ps @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 @dirrmtry share/locale/mg +@dirrmtry share/locale/mai/LC_MESSAGES +@dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku @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 @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile index 33213548525c..5dfdb755e918 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-stable/x11/gnome-session/Makefile,v 1.3 2009/04/16 01:54:40 kwm Exp $ +# $MCom: ports/x11/gnome-session/Makefile,v 1.175 2009/09/22 09:18:35 kwm Exp $ # PORTNAME= gnome-session -PORTVERSION= 2.26.2 -PORTREVISION= 1 +PORTVERSION= 2.28.0 CATEGORIES= x11 gnome MASTER_SITES= GNOME \ http://www.marcuscom.com/downloads/:local @@ -26,17 +25,19 @@ LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ notify.1:${PORTSDIR}/devel/libnotify \ execinfo:${PORTSDIR}/devel/libexecinfo 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 INSTALLS_ICONS= yes USE_GETTEXT= yes USE_BZIP2= yes -USE_XORG= xau xrandr -USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui +USE_XORG= ice sm xau xrandr +USE_GNOME= gnomeprefix gnomehack intlhack gconf2 GNOME_DESKTOP_VERSION=2 USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-docbook-docs +CONFIGURE_ARGS= --disable-docbook-docs \ + --enable-splash CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo index 0e03e58531cf..7870703d67b6 100644 --- a/x11/gnome-session/distinfo +++ b/x11/gnome-session/distinfo @@ -1,6 +1,6 @@ -MD5 (gnome2/gnome-session-2.26.2.tar.bz2) = 2cc3ff808592d95c3b364d608e99dea4 -SHA256 (gnome2/gnome-session-2.26.2.tar.bz2) = e089c7349bb6bc73d19f65c0a4536757968b929825ec38c616c8049bfd2d6905 -SIZE (gnome2/gnome-session-2.26.2.tar.bz2) = 804340 +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/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 new file mode 100644 index 000000000000..6c8c58f69eac --- /dev/null +++ b/x11/gnome-session/files/patch-configure @@ -0,0 +1,85 @@ +--- 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 new file mode 100644 index 000000000000..02a19373b902 --- /dev/null +++ b/x11/gnome-session/files/patch-configure.in @@ -0,0 +1,18 @@ +--- 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 new file mode 100644 index 000000000000..aff8ee55c44b --- /dev/null +++ b/x11/gnome-session/files/patch-gnome-session_Makefile.am @@ -0,0 +1,21 @@ +--- 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 7febc702d2bf..dcf1a21e9f09 100644 --- a/x11/gnome-session/files/patch-gnome-session_Makefile.in +++ b/x11/gnome-session/files/patch-gnome-session_Makefile.in @@ -1,6 +1,24 @@ ---- gnome-session/Makefile.in.orig 2009-02-21 19:46:07.000000000 +0100 -+++ gnome-session/Makefile.in 2009-02-21 19:46:57.000000000 +0100 -@@ -317,6 +317,7 @@ +--- 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 = \ libgsmutil.la \ @@ -8,3 +26,20 @@ $(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 new file mode 100644 index 000000000000..1ca12557d678 --- /dev/null +++ b/x11/gnome-session/files/patch-gnome-session_gsm-logout-dialog.c @@ -0,0 +1,66 @@ +--- 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 new file mode 100644 index 000000000000..befa415d9c6e --- /dev/null +++ b/x11/gnome-session/files/patch-gnome-session_gsm-manager.c @@ -0,0 +1,150 @@ +--- 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 new file mode 100644 index 000000000000..05342ff0fbf1 --- /dev/null +++ b/x11/gnome-session/files/patch-gnome-session_gsm-power-manager.c @@ -0,0 +1,483 @@ +--- 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 new file mode 100644 index 000000000000..2a27338b7dba --- /dev/null +++ b/x11/gnome-session/files/patch-gnome-session_gsm-power-manager.h @@ -0,0 +1,90 @@ +--- 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 9bc1d79b0b8b..306533fcb5ca 100644 --- a/x11/gnome-session/pkg-plist +++ b/x11/gnome-session/pkg-plist @@ -2,15 +2,13 @@ bin/gnome-session bin/gnome-session-properties bin/gnome-session-save bin/gnome-wm -etc/xdg/autostart/at-spi-registryd-wrapper.desktop +etc/xdg/autostart/gnome-session-splash.desktop etc/xdg/autostart/gnome-settings-daemon-helper.desktop -lib/gnome-session/helpers/at-spi-registryd-wrapper lib/gnome-session/helpers/gnome-session-splash lib/gnome-session/helpers/gnome-settings-daemon-helper share/applications/session-properties.desktop -%%DATADIR%%/gsm-inhibit-dialog.glade -%%DATADIR%%/session-properties.glade -share/gnome/autostart/gnome-session-splash.desktop +%%DATADIR%%/gsm-inhibit-dialog.ui +%%DATADIR%%/session-properties.ui share/icons/hicolor/16x16/apps/session-properties.png share/icons/hicolor/22x22/apps/session-properties.png share/icons/hicolor/24x24/apps/session-properties.png @@ -28,6 +26,7 @@ share/locale/be@latin/LC_MESSAGES/gnome-session-2.0.mo share/locale/bg/LC_MESSAGES/gnome-session-2.0.mo share/locale/bn/LC_MESSAGES/gnome-session-2.0.mo share/locale/bn_IN/LC_MESSAGES/gnome-session-2.0.mo +share/locale/br/LC_MESSAGES/gnome-session-2.0.mo share/locale/bs/LC_MESSAGES/gnome-session-2.0.mo share/locale/ca/LC_MESSAGES/gnome-session-2.0.mo share/locale/ca@valencia/LC_MESSAGES/gnome-session-2.0.mo @@ -68,6 +67,7 @@ share/locale/ko/LC_MESSAGES/gnome-session-2.0.mo share/locale/ku/LC_MESSAGES/gnome-session-2.0.mo share/locale/lt/LC_MESSAGES/gnome-session-2.0.mo share/locale/lv/LC_MESSAGES/gnome-session-2.0.mo +share/locale/mai/LC_MESSAGES/gnome-session-2.0.mo share/locale/mg/LC_MESSAGES/gnome-session-2.0.mo share/locale/mi/LC_MESSAGES/gnome-session-2.0.mo share/locale/mk/LC_MESSAGES/gnome-session-2.0.mo @@ -170,6 +170,8 @@ share/xsessions/gnome.desktop @dirrmtry share/locale/mi @dirrmtry share/locale/mg/LC_MESSAGES @dirrmtry share/locale/mg +@dirrmtry share/locale/mai/LC_MESSAGES +@dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku @dirrmtry share/locale/ig/LC_MESSAGES diff --git a/x11/gnome-shell/Makefile b/x11/gnome-shell/Makefile new file mode 100644 index 000000000000..6c9aa50c86fd --- /dev/null +++ b/x11/gnome-shell/Makefile @@ -0,0 +1,49 @@ +# New ports collection makefile for: gnome-shell +# Date created: 14 Aug 2009 +# 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 $ +# + +PORTNAME= gnome-shell +PORTVERSION= 2.28.0 +CATEGORIES= x11 +MASTER_SITES= GNOME +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 + +USE_BZIP2= yes +USE_XORG= x11 xfixes sm +USE_GETTEXT= yes +USE_GMAKE= yes +USE_AUTOTOOLS= libtool:22 +USE_GNOME= gnomeprefix gnomehack intlhack gtk20 gconf2 gnomemenus \ + gnomedesktop ltverhack libgnomeui librsvg2 +USE_GSTREAMER= theora +USE_LDCONFIG= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/js -I${LOCALBASE}/include/nspr" + +GCONF_SCHEMAS= gnome-shell.schemas + +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 + +post-install: + @${CAT} ${PKGMESSAGE} + +.include <bsd.port.mk> diff --git a/x11/gnome-shell/distinfo b/x11/gnome-shell/distinfo new file mode 100644 index 000000000000..a96b0a90297d --- /dev/null +++ b/x11/gnome-shell/distinfo @@ -0,0 +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 diff --git a/x11/gnome-shell/files/patch-src_Makefile.in b/x11/gnome-shell/files/patch-src_Makefile.in new file mode 100644 index 000000000000..592ea873a8f7 --- /dev/null +++ b/x11/gnome-shell/files/patch-src_Makefile.in @@ -0,0 +1,18 @@ +--- src/Makefile.in.orig 2009-08-29 12:13:13.000000000 +0200 ++++ src/Makefile.in 2009-08-29 12:13:25.000000000 +0200 +@@ -492,7 +492,6 @@ libtray_la_CPPFLAGS = $(tray_cflags) + libtray_la_LDFLAGS = $(LDADD) + gnome_shell_cflags = \ + $(MUTTER_PLUGIN_CFLAGS) \ +- $(LIBGNOMEUI_CFLAGS) \ + -I$(srcdir)/tray \ + -DGETTEXT_PACKAGE=\"gnome-shell\" \ + -DLOCALEDIR=\"$(datadir)/locale\" \ +@@ -548,7 +547,6 @@ libgnome_shell_la_gir_sources = \ + libgnome_shell_la_LDFLAGS = -avoid-version -module + libgnome_shell_la_LIBADD = \ + $(MUTTER_PLUGIN_LIBS) \ +- $(LIBGNOMEUI_LIBS) \ + libbig-1.0.la \ + libgdmuser-1.0.la \ + libtray.la diff --git a/x11/gnome-shell/files/patch-src_gdmuser_gdm-user-manager.c b/x11/gnome-shell/files/patch-src_gdmuser_gdm-user-manager.c new file mode 100644 index 000000000000..1bf59d1bcdf9 --- /dev/null +++ b/x11/gnome-shell/files/patch-src_gdmuser_gdm-user-manager.c @@ -0,0 +1,11 @@ +--- src/gdmuser/gdm-user-manager.c.orig 2009-08-14 05:38:43.000000000 +0000 ++++ src/gdmuser/gdm-user-manager.c 2009-08-14 05:39:14.000000000 +0000 +@@ -1297,7 +1297,7 @@ + } + } + +- for (pwent = fgetpwent (fp); pwent != NULL; pwent = fgetpwent (fp)) { ++ for (pwent = getpwent(); pwent != NULL; pwent = getpwent()) { + GdmUser *user; + + user = NULL; diff --git a/x11/gnome-shell/files/patch-src_gnome-shell.in b/x11/gnome-shell/files/patch-src_gnome-shell.in new file mode 100644 index 000000000000..07775f34dba4 --- /dev/null +++ b/x11/gnome-shell/files/patch-src_gnome-shell.in @@ -0,0 +1,8 @@ +--- src/gnome-shell.in.orig 2009-08-28 18:34:04.000000000 +0200 ++++ src/gnome-shell.in 2009-08-29 12:13:44.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/env python + + import atexit + import optparse diff --git a/x11/gnome-shell/pkg-descr b/x11/gnome-shell/pkg-descr new file mode 100644 index 000000000000..693aa3b6e258 --- /dev/null +++ b/x11/gnome-shell/pkg-descr @@ -0,0 +1,3 @@ +Next generation GNOME desktop shell + +WWW: http://live.gnome.org/GnomeShell diff --git a/x11/gnome-shell/pkg-message b/x11/gnome-shell/pkg-message new file mode 100644 index 000000000000..e00823112f4b --- /dev/null +++ b/x11/gnome-shell/pkg-message @@ -0,0 +1,33 @@ +Running + +You can either start gnome-shell "nested" in a window within your current +session, or you can run it within your session replacing gnome-panel and +window manager. + +Depending on the state of your X drivers, one or of the other of these may +work better. So, if the first one you try doesn't work, try the other. + +==== + +Running gnome-shell replacing the panel + +This approach is best when trying out the GNOME Shell and wanting to see its +full potential. + +gnome-shell --replace + +When gnome-shell exits (you can kill it with Control-C in the terminal in which +you started it), gnome-panel and metacity are restarted. + +==== + +Running gnome-shell nested + +This approach is useful when developing the GNOME Shell and wanting to quickly +test some changes. NOTE: It isn't useful for getting a good feel for how the +shell works since it will be really slow, and won't properly integrate with +the rest of your desktop. + +gnome-shell +(This requires a relatively recent version of Xephyr with GLX support to be +installed on your system (x11-servers/xephyr). diff --git a/x11/gnome-shell/pkg-plist b/x11/gnome-shell/pkg-plist new file mode 100644 index 000000000000..a5c993c9bee7 --- /dev/null +++ b/x11/gnome-shell/pkg-plist @@ -0,0 +1,76 @@ +bin/gnome-shell +lib/gnome-shell/Big-1.0.typelib +lib/gnome-shell/Shell-0.1.typelib +lib/gnome-shell/St-1.0.typelib +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/ui/altTab.js +%%DATADIR%%/js/ui/appDisplay.js +%%DATADIR%%/js/ui/button.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/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/overview.js +%%DATADIR%%/js/ui/panel.js +%%DATADIR%%/js/ui/places.js +%%DATADIR%%/js/ui/runDialog.js +%%DATADIR%%/js/ui/shellDBus.js +%%DATADIR%%/js/ui/sidebar.js +%%DATADIR%%/js/ui/tweener.js +%%DATADIR%%/js/ui/widget.js +%%DATADIR%%/js/ui/widgetBox.js +%%DATADIR%%/js/ui/windowManager.js +%%DATADIR%%/js/ui/workspaces.js +%%DATADIR%%/theme/gnome-shell.css +%%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 +share/locale/ar/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/en_GB/LC_MESSAGES/gnome-shell.mo +share/locale/es/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/hu/LC_MESSAGES/gnome-shell.mo +share/locale/it/LC_MESSAGES/gnome-shell.mo +share/locale/ko/LC_MESSAGES/gnome-shell.mo +share/locale/nb/LC_MESSAGES/gnome-shell.mo +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/sl/LC_MESSAGES/gnome-shell.mo +share/locale/sv/LC_MESSAGES/gnome-shell.mo +share/locale/tr/LC_MESSAGES/gnome-shell.mo +share/locale/zh_CN/LC_MESSAGES/gnome-shell.mo +@dirrm %%DATADIR%%/theme +@dirrm %%DATADIR%%/js/ui +@dirrm %%DATADIR%%/js/misc +@dirrm %%DATADIR%%/js +@dirrm %%DATADIR%%/images +@dirrm %%DATADIR%% +@dirrm lib/gnome-shell diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile index abedfc642a94..ff75c44352cb 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-stable/x11/gnome-terminal/Makefile,v 1.3 2009/04/15 14:55:27 kwm Exp $ +# $MCom: ports/x11/gnome-terminal/Makefile,v 1.125 2009/10/19 20:14:29 kwm Exp $ # PORTNAME= gnome-terminal -PORTVERSION= 2.26.3.1 -PORTREVISION= 2 +PORTVERSION= 2.28.1 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -16,11 +15,14 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Terminal component for the GNOME 2 Desktop +LIB_DEPENDS= startup-notification-1.0:${PORTSDIR}/x11/startup-notification + USE_GETTEXT= yes USE_BZIP2= yes INSTALLS_OMF= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui vte gnomedocutils +USE_XORG= sm +USE_GNOME= gnomeprefix gnomehack intlhack gconf2 vte gnomedocutils 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 aa1b4fa091f3..fb1853fd3c94 100644 --- a/x11/gnome-terminal/distinfo +++ b/x11/gnome-terminal/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-terminal-2.26.3.1.tar.bz2) = b6c6c0f5f3e061da7e56f3a04385bb7b -SHA256 (gnome2/gnome-terminal-2.26.3.1.tar.bz2) = 40d97f983363002d6da574b35f3e4d44d4e8db38b776b226626f1e83d6fde1dc -SIZE (gnome2/gnome-terminal-2.26.3.1.tar.bz2) = 2176049 +MD5 (gnome2/gnome-terminal-2.28.1.tar.bz2) = d0eea9c1fe86260bb302c5650259a2ed +SHA256 (gnome2/gnome-terminal-2.28.1.tar.bz2) = 97bb800a77d95ee33ad6dac8ec995c6c0d5841749eb5e6f40c24357136a02ec0 +SIZE (gnome2/gnome-terminal-2.28.1.tar.bz2) = 2221288 diff --git a/x11/gnome-terminal/files/patch-src_terminal-screen.c b/x11/gnome-terminal/files/patch-src_terminal-screen.c index e283146a72e6..52f80dd55eb3 100644 --- a/x11/gnome-terminal/files/patch-src_terminal-screen.c +++ b/x11/gnome-terminal/files/patch-src_terminal-screen.c @@ -1,5 +1,5 @@ ---- src/terminal-screen.c.orig 2009-04-12 15:40:23.000000000 +0200 -+++ src/terminal-screen.c 2009-05-06 00:30:39.000000000 +0200 +--- src/terminal-screen.c.orig 2009-08-13 14:39:24.000000000 +0200 ++++ src/terminal-screen.c 2009-08-20 10:41:58.000000000 +0200 @@ -18,6 +18,15 @@ #include <config.h> @@ -16,9 +16,9 @@ #include <string.h> #include <stdlib.h> #include <unistd.h> -@@ -1744,10 +1753,22 @@ - char* - terminal_screen_get_current_dir (TerminalScreen *screen) +@@ -184,15 +193,28 @@ G_DEFINE_TYPE (TerminalScreen, terminal_ + static char * + cwd_of_pid (int pid) { +#ifndef __FreeBSD__ static const char patterns[][18] = { @@ -36,22 +36,21 @@ +#endif /* HAVE_KINFO_GETFILE */ +#endif /* __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104) */ +#endif /* __FreeBSD__ */ - TerminalScreenPrivate *priv = screen->priv; - int fgpid; guint i; -@@ -1767,6 +1788,7 @@ - if (fgpid == -1) - return g_strdup (priv->initial_working_directory); + + if (pid == -1) + return NULL; +#ifndef __FreeBSD__ /* Try to get the working directory using various OS-specific mechanisms */ for (i = 0; i < G_N_ELEMENTS (patterns); ++i) { -@@ -1804,6 +1826,48 @@ +@@ -230,6 +252,49 @@ cwd_of_pid (int pid) return working_dir; } } +#else ++ int fgpid; +#if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104) +#ifndef HAVE_KINFO_GETFILE + name[0] = CTL_KERN; @@ -94,5 +93,5 @@ +#endif /* __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104) */ +#endif /* __FreeBSD__ */ - return g_strdup (priv->initial_working_directory); + return NULL; } diff --git a/x11/gnome-terminal/pkg-plist b/x11/gnome-terminal/pkg-plist index 83bb026bad34..f9b20ca1628e 100644 --- a/x11/gnome-terminal/pkg-plist +++ b/x11/gnome-terminal/pkg-plist @@ -85,10 +85,13 @@ share/locale/az/LC_MESSAGES/gnome-terminal.mo share/locale/be/LC_MESSAGES/gnome-terminal.mo 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/bs/LC_MESSAGES/gnome-terminal.mo share/locale/ca/LC_MESSAGES/gnome-terminal.mo +share/locale/ca@valencia/LC_MESSAGES/gnome-terminal.mo share/locale/cs/LC_MESSAGES/gnome-terminal.mo +share/locale/cy/LC_MESSAGES/gnome-terminal.mo share/locale/da/LC_MESSAGES/gnome-terminal.mo share/locale/de/LC_MESSAGES/gnome-terminal.mo share/locale/dz/LC_MESSAGES/gnome-terminal.mo @@ -110,6 +113,7 @@ share/locale/hi/LC_MESSAGES/gnome-terminal.mo share/locale/hr/LC_MESSAGES/gnome-terminal.mo share/locale/hu/LC_MESSAGES/gnome-terminal.mo share/locale/hy/LC_MESSAGES/gnome-terminal.mo +share/locale/id/LC_MESSAGES/gnome-terminal.mo share/locale/it/LC_MESSAGES/gnome-terminal.mo share/locale/ja/LC_MESSAGES/gnome-terminal.mo share/locale/ka/LC_MESSAGES/gnome-terminal.mo @@ -254,6 +258,8 @@ share/omf/gnome-terminal/gnome-terminal-zh_TW.omf @dirrmtry share/locale/fur @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 diff --git a/x11/gnome2-lite/Makefile b/x11/gnome2-lite/Makefile index 49ea13dfada4..1f3f72876f38 100644 --- a/x11/gnome2-lite/Makefile +++ b/x11/gnome2-lite/Makefile @@ -3,10 +3,10 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome2-lite/Makefile,v 1.60 2007/08/15 17:52:07 mezz Exp $ +# $MCom: ports/x11/gnome2-lite/Makefile,v 1.62 2009/11/26 20:39:06 marcus Exp $ # -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= x11 gnome PKGNAMESUFFIX= -lite @@ -23,16 +23,13 @@ RUN_DEPENDS= ${LOCALBASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-applet nautilus:${PORTSDIR}/x11-fm/nautilus \ ${LOCALBASE}/share/gnome/help/user-guide/C/user-guide.xml:${PORTSDIR}/misc/gnome-user-docs \ ${LOCALBASE}/share/sounds/question.wav:${PORTSDIR}/audio/gnome-audio \ - file-roller:${PORTSDIR}/archivers/file-roller \ ${LOCALBASE}/share/themes/HighContrast/gtk-2.0/gtkrc:${PORTSDIR}/x11-themes/gnome-themes \ evince:${PORTSDIR}/graphics/evince \ gcalctool:${PORTSDIR}/math/gcalctool \ - gucharmap:${PORTSDIR}/deskutils/gucharmap \ ${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \ gconf-editor:${PORTSDIR}/sysutils/gconf-editor \ gnome-control-center:${PORTSDIR}/sysutils/gnome-control-center \ - gnome-mount:${PORTSDIR}/sysutils/gnome-mount \ - totem:${PORTSDIR}/multimedia/totem + gnome-mount:${PORTSDIR}/sysutils/gnome-mount MASTERDIR= ${.CURDIR}/../gnome2 CONFLICTS= gnome2-[0-9]* diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile index bfe75b030b86..6b41c17f4cd5 100644 --- a/x11/gnome2/Makefile +++ b/x11/gnome2/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/x11/gnome2/Makefile,v 1.7 2009/04/16 10:56:46 kwm Exp $ +# $MCom: ports/x11/gnome2/Makefile,v 1.279 2009/10/22 15:15:40 kwm Exp $ # PORTNAME= gnome2 -PORTVERSION= 2.26.3 +PORTVERSION= 2.28.1 PORTREVISION?= 0 CATEGORIES?= x11 gnome MASTER_SITES= # 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.26:${PORTSDIR}/mail/evolution-exchange \ + exchange-connector-setup-2.28:${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 \ @@ -68,7 +68,8 @@ USE_PYTHON= yes .endif .if !defined(GNOME_SLAVE) || ${.CURDIR:T}=="gnome2-lite" -OPTIONS= XSCREENSAVER "Use xscreensaver as screen saver app" off +OPTIONS= XSCREENSAVER "Use xscreensaver as screen saver app" off \ + MAPI "Depend on evolution-mapi (pulls in samba4)" on .endif do-install: # empty @@ -91,7 +92,7 @@ RUN_DEPENDS+= empathy:${PORTSDIR}/net-im/empathy \ vinagre:${PORTSDIR}/net/vinagre \ brasero:${PORTSDIR}/sysutils/brasero \ gnome-file-share-properties:${PORTSDIR}/www/gnome-user-share \ - ${LOCALBASE}/lib/deskbar-applet/deskbar-applet:${PORTSDIR}/deskutils/deskbar-applet \ + ${LOCALBASE}/libexec/deskbar-applet/deskbar-applet:${PORTSDIR}/deskutils/deskbar-applet \ ${LOCALBASE}/lib/hamster-applet/hamster-applet:${PORTSDIR}/deskutils/hamster-applet .if ${ARCH} == "i386" #RUN_DEPENDS+= tomboy:${PORTSDIR}/deskutils/tomboy @@ -99,6 +100,9 @@ RUN_DEPENDS+= empathy:${PORTSDIR}/net-im/empathy \ .if ${OSVERSION}>=600000 RUN_DEPENDS+= ekiga:${PORTSDIR}/net/ekiga .endif +.if defined(WITH_MAPI) +RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/libexchangemapi-1.0.pc:${PORTSDIR}/mail/evolution-mapi +.endif .endif .endif diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile index 02bb0d01e0e6..cc2e85820664 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.126 2009/03/18 04:20:56 marcus Exp $ +# $MCom: ports/x11/libgnome/Makefile,v 1.129 2009/09/23 00:32:50 avl Exp $ # PORTNAME= libgnome -PORTVERSION= 2.26.0 -PORTREVISION?= 1 +PORTVERSION= 2.28.0 +PORTREVISION?= 0 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo index 9490458f33bc..a551c7d051ee 100644 --- a/x11/libgnome/distinfo +++ b/x11/libgnome/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgnome-2.26.0.tar.bz2) = a5634fe9ddc54bbb726cbaaa35abc0b9 -SHA256 (gnome2/libgnome-2.26.0.tar.bz2) = 2ef0287ab19fd34a7d20bc8beef86bb22db13cfc414367cb48e6121b8163e318 -SIZE (gnome2/libgnome-2.26.0.tar.bz2) = 1414016 +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 diff --git a/x11/libgnome/files/pkg-deinstall.in b/x11/libgnome/files/pkg-deinstall.in index a0dc080c84b6..e52462b671dd 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.20 2009/04/09 03:24:10 mezz Exp $ +# $MCom: ports/x11/libgnome/files/pkg-deinstall.in,v 1.23 2009/09/26 13:42:02 marcus Exp $ # # Restore gconf keys of gnomevfs2. diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist index b948e7525d12..1e3d9dc8fe7e 100644 --- a/x11/libgnome/pkg-plist +++ b/x11/libgnome/pkg-plist @@ -35,8 +35,10 @@ share/locale/be/LC_MESSAGES/libgnome-2.0.mo share/locale/bg/LC_MESSAGES/libgnome-2.0.mo share/locale/bn/LC_MESSAGES/libgnome-2.0.mo share/locale/bn_IN/LC_MESSAGES/libgnome-2.0.mo +share/locale/br/LC_MESSAGES/libgnome-2.0.mo share/locale/bs/LC_MESSAGES/libgnome-2.0.mo share/locale/ca/LC_MESSAGES/libgnome-2.0.mo +share/locale/ca@valencia/LC_MESSAGES/libgnome-2.0.mo share/locale/crh/LC_MESSAGES/libgnome-2.0.mo share/locale/cs/LC_MESSAGES/libgnome-2.0.mo share/locale/cy/LC_MESSAGES/libgnome-2.0.mo @@ -66,6 +68,7 @@ share/locale/is/LC_MESSAGES/libgnome-2.0.mo share/locale/it/LC_MESSAGES/libgnome-2.0.mo share/locale/ja/LC_MESSAGES/libgnome-2.0.mo share/locale/ka/LC_MESSAGES/libgnome-2.0.mo +share/locale/kn/LC_MESSAGES/libgnome-2.0.mo share/locale/ko/LC_MESSAGES/libgnome-2.0.mo share/locale/ku/LC_MESSAGES/libgnome-2.0.mo share/locale/lt/LC_MESSAGES/libgnome-2.0.mo @@ -151,6 +154,8 @@ share/pixmaps/backgrounds/gnome/background-default.jpg @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 @dirrmtry share/locale/bn_IN @dirrmtry share/locale/ast/LC_MESSAGES diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile index f1aa98c3c3e1..ceba5371cea8 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.29 2009/03/14 05:54:11 marcus Exp $ +# $MCom: ports/x11/libgnomekbd/Makefile,v 1.37 2009/09/22 23:24:04 avl Exp $ # PORTNAME= libgnomekbd -PORTVERSION= 2.26.0 -PORTREVISION= 1 +PORTVERSION= 2.28.0 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -20,7 +19,7 @@ LIB_DEPENDS= xklavier.12:${PORTSDIR}/x11/libxklavier \ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib USE_BZIP2= yes -USE_GNOME= gnomeprefix gnomehack ltverhack gconf2 libglade2 +USE_GNOME= gnomeprefix gnomehack ltverhack gconf2 USE_AUTOTOOLS= libtool:22 INSTALLS_ICONS= yes USE_GETTEXT= yes diff --git a/x11/libgnomekbd/distinfo b/x11/libgnomekbd/distinfo index 1d9ecc89cba2..0460e05c9904 100644 --- a/x11/libgnomekbd/distinfo +++ b/x11/libgnomekbd/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgnomekbd-2.26.0.tar.bz2) = aee58c088c4fd980e1bf813ea813c156 -SHA256 (gnome2/libgnomekbd-2.26.0.tar.bz2) = 26a53552f3eaeda8d386e31622ba605944eb97dfe5ffa834dc0708761811364f -SIZE (gnome2/libgnomekbd-2.26.0.tar.bz2) = 413560 +MD5 (gnome2/libgnomekbd-2.28.0.tar.bz2) = b0989c4a2dbe2b5dd892d14195674f2b +SHA256 (gnome2/libgnomekbd-2.28.0.tar.bz2) = 72da2cc218de666a0ffa8896ae2d01bce3f46fde7072f2aa937c2bcd2d312668 +SIZE (gnome2/libgnomekbd-2.28.0.tar.bz2) = 392332 diff --git a/x11/libgnomekbd/pkg-plist b/x11/libgnomekbd/pkg-plist index cd3c2506f340..c068cc28da70 100644 --- a/x11/libgnomekbd/pkg-plist +++ b/x11/libgnomekbd/pkg-plist @@ -9,20 +9,24 @@ include/libgnomekbd/gkbd-util.h lib/libgnomekbd.a lib/libgnomekbd.la lib/libgnomekbd.so -lib/libgnomekbd.so.3 +lib/libgnomekbd.so.4 lib/libgnomekbdui.a lib/libgnomekbdui.la lib/libgnomekbdui.so -lib/libgnomekbdui.so.3 +lib/libgnomekbdui.so.4 libdata/pkgconfig/libgnomekbd.pc libdata/pkgconfig/libgnomekbdui.pc share/applications/gkbd-indicator-plugins-capplet.desktop -%%DATADIR%%/glade/gkbd-indicator-plugins.glade +%%DATADIR%%/ui/gkbd-indicator-plugins.ui +%%DATADIR%%/ui/gkbd-indicator-plugins_add.ui share/locale/ar/LC_MESSAGES/libgnomekbd.mo +share/locale/as/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 share/locale/bn_IN/LC_MESSAGES/libgnomekbd.mo share/locale/ca/LC_MESSAGES/libgnomekbd.mo +share/locale/ca@valencia/LC_MESSAGES/libgnomekbd.mo share/locale/cs/LC_MESSAGES/libgnomekbd.mo share/locale/da/LC_MESSAGES/libgnomekbd.mo share/locale/de/LC_MESSAGES/libgnomekbd.mo @@ -34,6 +38,7 @@ share/locale/et/LC_MESSAGES/libgnomekbd.mo share/locale/eu/LC_MESSAGES/libgnomekbd.mo share/locale/fi/LC_MESSAGES/libgnomekbd.mo share/locale/fr/LC_MESSAGES/libgnomekbd.mo +share/locale/ga/LC_MESSAGES/libgnomekbd.mo share/locale/gl/LC_MESSAGES/libgnomekbd.mo share/locale/gu/LC_MESSAGES/libgnomekbd.mo share/locale/he/LC_MESSAGES/libgnomekbd.mo @@ -42,9 +47,11 @@ share/locale/hu/LC_MESSAGES/libgnomekbd.mo share/locale/it/LC_MESSAGES/libgnomekbd.mo share/locale/ja/LC_MESSAGES/libgnomekbd.mo share/locale/ka/LC_MESSAGES/libgnomekbd.mo +share/locale/kn/LC_MESSAGES/libgnomekbd.mo share/locale/ko/LC_MESSAGES/libgnomekbd.mo share/locale/lt/LC_MESSAGES/libgnomekbd.mo share/locale/lv/LC_MESSAGES/libgnomekbd.mo +share/locale/mai/LC_MESSAGES/libgnomekbd.mo share/locale/mk/LC_MESSAGES/libgnomekbd.mo share/locale/ml/LC_MESSAGES/libgnomekbd.mo share/locale/mr/LC_MESSAGES/libgnomekbd.mo @@ -74,7 +81,7 @@ share/locale/vi/LC_MESSAGES/libgnomekbd.mo share/locale/zh_CN/LC_MESSAGES/libgnomekbd.mo share/locale/zh_HK/LC_MESSAGES/libgnomekbd.mo share/locale/zh_TW/LC_MESSAGES/libgnomekbd.mo -@dirrm %%DATADIR%%/glade +@dirrm %%DATADIR%%/ui @dirrm %%DATADIR%% @dirrmtry share/applications @dirrm include/libgnomekbd @@ -90,6 +97,8 @@ share/locale/zh_TW/LC_MESSAGES/libgnomekbd.mo @dirrmtry share/locale/oc @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr +@dirrmtry share/locale/mai/LC_MESSAGES +@dirrmtry share/locale/mai @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/bn_IN/LC_MESSAGES diff --git a/x11/libgnomemm26/Makefile b/x11/libgnomemm26/Makefile index 6b05afae5289..1cfdbef3e6f5 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.20 2009/03/17 15:00:20 kwm Exp $ +# $MCom: ports/x11/libgnomemm26/Makefile,v 1.22 2009/09/22 21:02:40 kwm Exp $ # PORTNAME= libgnomemm -PORTVERSION= 2.26.0 -PORTREVISION= 1 +PORTVERSION= 2.28.0 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11/libgnomemm26/distinfo b/x11/libgnomemm26/distinfo index 6bcc7405235b..5ab76c039375 100644 --- a/x11/libgnomemm26/distinfo +++ b/x11/libgnomemm26/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgnomemm-2.26.0.tar.bz2) = 4801c2b60d73b08ea01fe79aafc678df -SHA256 (gnome2/libgnomemm-2.26.0.tar.bz2) = aa8072914c53dc7b04c3eca904768a04fff8fa7f207568fe78a0a09865651e08 -SIZE (gnome2/libgnomemm-2.26.0.tar.bz2) = 299697 +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 diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile index c09671f32c05..83f7314db54a 100644 --- a/x11/libxklavier/Makefile +++ b/x11/libxklavier/Makefile @@ -3,14 +3,15 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/libxklavier/Makefile,v 1.47 2009/03/21 04:28:11 marcus Exp $ +# $MCom: ports/x11/libxklavier/Makefile,v 1.51 2009/07/21 22:14:28 marcus Exp $ # PORTNAME= libxklavier -PORTVERSION= 3.9 +PORTVERSION= 4.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= x11 gnome -MASTER_SITES= SF/gswitchit/${PORTNAME}/${PORTVERSION} +MASTER_SITES= GNOME MAINTAINER= gnome@FreeBSD.org COMMENT= An utility library to make XKB stuff easier diff --git a/x11/libxklavier/distinfo b/x11/libxklavier/distinfo index b5b0fc861e4d..be4bcb007ebc 100644 --- a/x11/libxklavier/distinfo +++ b/x11/libxklavier/distinfo @@ -1,3 +1,3 @@ -MD5 (libxklavier-3.9.tar.bz2) = c8ff3ba6daf899be7ec2a626894852b9 -SHA256 (libxklavier-3.9.tar.bz2) = 462a4e427f201a23de194f824dce70c84867464956f2f6c8dd4a5e07f1f4a554 -SIZE (libxklavier-3.9.tar.bz2) = 339409 +MD5 (libxklavier-4.0.tar.bz2) = 1b714ba04835fb49511f9e1444a5ea4c +SHA256 (libxklavier-4.0.tar.bz2) = 210ed5803109a8cef3b2ab1195bc73fe3385a97a8749d01673e020642d8e5a71 +SIZE (libxklavier-4.0.tar.bz2) = 354149 diff --git a/x11/libxklavier/files/patch-libxklavier_xkl-enum-types.c b/x11/libxklavier/files/patch-libxklavier_xkl-enum-types.c new file mode 100644 index 000000000000..f749303176a8 --- /dev/null +++ b/x11/libxklavier/files/patch-libxklavier_xkl-enum-types.c @@ -0,0 +1,27 @@ +--- 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/libxklavier/files/patch-libxklavier_xklavier_props.c b/x11/libxklavier/files/patch-libxklavier_xklavier_props.c deleted file mode 100644 index a56ec7896810..000000000000 --- a/x11/libxklavier/files/patch-libxklavier_xklavier_props.c +++ /dev/null @@ -1,15 +0,0 @@ ---- libxklavier/xklavier_props.c.orig Sun Apr 16 20:51:36 2006 -+++ libxklavier/xklavier_props.c Tue Jun 13 00:11:24 2006 -@@ -355,10 +355,8 @@ xkl_config_rec_get_from_root_window_prop - --varlen); - var[varlen] = '\0'; - /* Resize the original layout */ -- ((char *) -- g_realloc(*layout, -- laylen + 1))[laylen] = -- '\0'; -+ *layout = g_realloc(*layout, laylen + 1); -+ (*layout)[laylen] = '\0'; - } - } - layout++; diff --git a/x11/libxklavier/pkg-plist b/x11/libxklavier/pkg-plist index 98b5565758cd..56aa8de30942 100644 --- a/x11/libxklavier/pkg-plist +++ b/x11/libxklavier/pkg-plist @@ -3,6 +3,7 @@ include/libxklavier/xkl_config_rec.h include/libxklavier/xkl_config_registry.h include/libxklavier/xkl_engine.h include/libxklavier/xkl_engine_marshal.h +include/libxklavier/xkl-enum-types.h include/libxklavier/xklavier.h lib/libxklavier.a lib/libxklavier.la diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile index bc18bb68a610..8cc59f283fae 100644 --- a/x11/yelp/Makefile +++ b/x11/yelp/Makefile @@ -3,12 +3,12 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/yelp/Makefile,v 1.133 2009/03/30 03:32:43 marcus Exp $ +# $MCom: ports/x11/yelp/Makefile,v 1.145 2009/11/20 10:58:38 kwm Exp $ # PORTNAME= yelp -PORTVERSION= 2.26.0 -PORTREVISION= 2 +PORTVERSION= 2.28.1 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -17,6 +17,7 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= A help browser for the GNOME 2 desktop LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ + startup-notification-1.0:${PORTSDIR}/x11/startup-notification \ rarian.0:${PORTSDIR}/textproc/rarian USE_GECKO= libxul @@ -24,7 +25,7 @@ USE_GETTEXT= yes USE_BZIP2= yes USE_XORG= ice USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui gnomedocutils +USE_GNOME= gnomeprefix gnomehack intlhack gconf2 gnomedocutils GNU_CONFIGURE= yes INSTALLS_ICONS= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ @@ -35,4 +36,7 @@ MAKE_ENV= G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias" GCONF_SCHEMAS= yelp.schemas +post-extract: + ${RM} -f ${WRKSRC}/data/yelp.schemas + .include <bsd.port.mk> diff --git a/x11/yelp/distinfo b/x11/yelp/distinfo index adc47cac83fc..32b4ef3962f2 100644 --- a/x11/yelp/distinfo +++ b/x11/yelp/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/yelp-2.26.0.tar.bz2) = 3413fd051c5ecbfe98819a8fb4ac83dd -SHA256 (gnome2/yelp-2.26.0.tar.bz2) = 0c5a91a206b26ef714e9929404f1711caadcee481299566011b4ae4232d151d0 -SIZE (gnome2/yelp-2.26.0.tar.bz2) = 1021362 +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 diff --git a/x11/yelp/pkg-plist b/x11/yelp/pkg-plist index 23e7fa35e807..5e84fddacae2 100644 --- a/x11/yelp/pkg-plist +++ b/x11/yelp/pkg-plist @@ -16,12 +16,14 @@ share/locale/bn_IN/LC_MESSAGES/yelp.mo 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/cs/LC_MESSAGES/yelp.mo share/locale/cy/LC_MESSAGES/yelp.mo share/locale/da/LC_MESSAGES/yelp.mo share/locale/de/LC_MESSAGES/yelp.mo share/locale/dz/LC_MESSAGES/yelp.mo share/locale/el/LC_MESSAGES/yelp.mo +share/locale/en@shaw/LC_MESSAGES/yelp.mo share/locale/en_CA/LC_MESSAGES/yelp.mo share/locale/en_GB/LC_MESSAGES/yelp.mo share/locale/eo/LC_MESSAGES/yelp.mo @@ -61,7 +63,7 @@ share/locale/mn/LC_MESSAGES/yelp.mo share/locale/mr/LC_MESSAGES/yelp.mo share/locale/ms/LC_MESSAGES/yelp.mo share/locale/nb/LC_MESSAGES/yelp.mo -share/locale/nds@NFE/LC_MESSAGES/yelp.mo +share/locale/nds/LC_MESSAGES/yelp.mo share/locale/ne/LC_MESSAGES/yelp.mo share/locale/nl/LC_MESSAGES/yelp.mo share/locale/nn/LC_MESSAGES/yelp.mo @@ -115,12 +117,16 @@ share/locale/zu/LC_MESSAGES/yelp.mo %%DATADIR%%/man.xml %%DATADIR%%/scrollkeeper.xml %%DATADIR%%/toc.xml +%%DATADIR%%/ui/yelp-bookmarks-add.ui +%%DATADIR%%/ui/yelp-bookmarks.ui +%%DATADIR%%/ui/yelp-open-location.ui +%%DATADIR%%/ui/yelp-preferences.ui %%DATADIR%%/ui/yelp-search-ui.xml %%DATADIR%%/ui/yelp-ui.xml -%%DATADIR%%/ui/yelp.glade %%DATADIR%%/xslt/db-title.xsl %%DATADIR%%/xslt/db2html.xsl %%DATADIR%%/xslt/info2html.xsl +%%DATADIR%%/xslt/mal2html.xsl %%DATADIR%%/xslt/man2html.xsl %%DATADIR%%/xslt/search2html.xsl %%DATADIR%%/xslt/toc2html.xsl @@ -155,8 +161,8 @@ share/locale/zu/LC_MESSAGES/yelp.mo @dirrmtry share/locale/oc @dirrmtry share/locale/nso/LC_MESSAGES @dirrmtry share/locale/nso -@dirrmtry share/locale/nds@NFE/LC_MESSAGES -@dirrmtry share/locale/nds@NFE +@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 @@ -173,8 +179,12 @@ share/locale/zu/LC_MESSAGES/yelp.mo @dirrmtry share/locale/ks @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 +@dirrmtry share/locale/ca@valencia @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile index 58bd06439664..0753c8feb7d9 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.98 2009/03/17 22:47:07 kwm Exp $ +# $MCom: ports/x11/zenity/Makefile,v 1.102 2009/09/21 22:23:34 kwm Exp $ # PORTNAME= zenity -PORTVERSION= 2.26.0 -PORTREVISION= 1 +PORTVERSION= 2.28.0 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -20,7 +19,7 @@ BUILD_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian RUN_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack libgnomecanvas gnomedocutils intlhack +USE_GNOME= gnomeprefix gnomehack gtk20 gnomedocutils intlhack USE_BZIP2= yes USE_GETTEXT= yes GNU_CONFIGURE= yes diff --git a/x11/zenity/distinfo b/x11/zenity/distinfo index 8da51c4de29b..06a52221ec3f 100644 --- a/x11/zenity/distinfo +++ b/x11/zenity/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/zenity-2.26.0.tar.bz2) = 6660ce6dac0a6ca495a0e954cb6b40a2 -SHA256 (gnome2/zenity-2.26.0.tar.bz2) = fc619215ca90cab48efae7bdf524d1de690b75832f07f3cbcb6d5c3910d402a1 -SIZE (gnome2/zenity-2.26.0.tar.bz2) = 2454415 +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 diff --git a/x11/zenity/pkg-plist b/x11/zenity/pkg-plist index 1c49882ffc5c..de7746f1eed5 100644 --- a/x11/zenity/pkg-plist +++ b/x11/zenity/pkg-plist @@ -25,6 +25,30 @@ share/gnome/help/zenity/bg/figures/zenity-question-screenshot.png share/gnome/help/zenity/bg/figures/zenity-text-screenshot.png share/gnome/help/zenity/bg/figures/zenity-warning-screenshot.png share/gnome/help/zenity/bg/zenity.xml +share/gnome/help/zenity/cs/figures/zenity-calendar-screenshot.png +share/gnome/help/zenity/cs/figures/zenity-entry-screenshot.png +share/gnome/help/zenity/cs/figures/zenity-error-screenshot.png +share/gnome/help/zenity/cs/figures/zenity-fileselection-screenshot.png +share/gnome/help/zenity/cs/figures/zenity-information-screenshot.png +share/gnome/help/zenity/cs/figures/zenity-list-screenshot.png +share/gnome/help/zenity/cs/figures/zenity-notification-screenshot.png +share/gnome/help/zenity/cs/figures/zenity-progress-screenshot.png +share/gnome/help/zenity/cs/figures/zenity-question-screenshot.png +share/gnome/help/zenity/cs/figures/zenity-text-screenshot.png +share/gnome/help/zenity/cs/figures/zenity-warning-screenshot.png +share/gnome/help/zenity/cs/zenity.xml +share/gnome/help/zenity/da/figures/zenity-calendar-screenshot.png +share/gnome/help/zenity/da/figures/zenity-entry-screenshot.png +share/gnome/help/zenity/da/figures/zenity-error-screenshot.png +share/gnome/help/zenity/da/figures/zenity-fileselection-screenshot.png +share/gnome/help/zenity/da/figures/zenity-information-screenshot.png +share/gnome/help/zenity/da/figures/zenity-list-screenshot.png +share/gnome/help/zenity/da/figures/zenity-notification-screenshot.png +share/gnome/help/zenity/da/figures/zenity-progress-screenshot.png +share/gnome/help/zenity/da/figures/zenity-question-screenshot.png +share/gnome/help/zenity/da/figures/zenity-text-screenshot.png +share/gnome/help/zenity/da/figures/zenity-warning-screenshot.png +share/gnome/help/zenity/da/zenity.xml share/gnome/help/zenity/de/figures/zenity-calendar-screenshot.png share/gnome/help/zenity/de/figures/zenity-entry-screenshot.png share/gnome/help/zenity/de/figures/zenity-error-screenshot.png @@ -37,6 +61,18 @@ share/gnome/help/zenity/de/figures/zenity-question-screenshot.png share/gnome/help/zenity/de/figures/zenity-text-screenshot.png share/gnome/help/zenity/de/figures/zenity-warning-screenshot.png share/gnome/help/zenity/de/zenity.xml +share/gnome/help/zenity/el/figures/zenity-calendar-screenshot.png +share/gnome/help/zenity/el/figures/zenity-entry-screenshot.png +share/gnome/help/zenity/el/figures/zenity-error-screenshot.png +share/gnome/help/zenity/el/figures/zenity-fileselection-screenshot.png +share/gnome/help/zenity/el/figures/zenity-information-screenshot.png +share/gnome/help/zenity/el/figures/zenity-list-screenshot.png +share/gnome/help/zenity/el/figures/zenity-notification-screenshot.png +share/gnome/help/zenity/el/figures/zenity-progress-screenshot.png +share/gnome/help/zenity/el/figures/zenity-question-screenshot.png +share/gnome/help/zenity/el/figures/zenity-text-screenshot.png +share/gnome/help/zenity/el/figures/zenity-warning-screenshot.png +share/gnome/help/zenity/el/zenity.xml share/gnome/help/zenity/en_GB/figures/zenity-calendar-screenshot.png share/gnome/help/zenity/en_GB/figures/zenity-entry-screenshot.png share/gnome/help/zenity/en_GB/figures/zenity-error-screenshot.png @@ -109,6 +145,18 @@ share/gnome/help/zenity/oc/figures/zenity-question-screenshot.png share/gnome/help/zenity/oc/figures/zenity-text-screenshot.png share/gnome/help/zenity/oc/figures/zenity-warning-screenshot.png share/gnome/help/zenity/oc/zenity.xml +share/gnome/help/zenity/pt_BR/figures/zenity-calendar-screenshot.png +share/gnome/help/zenity/pt_BR/figures/zenity-entry-screenshot.png +share/gnome/help/zenity/pt_BR/figures/zenity-error-screenshot.png +share/gnome/help/zenity/pt_BR/figures/zenity-fileselection-screenshot.png +share/gnome/help/zenity/pt_BR/figures/zenity-information-screenshot.png +share/gnome/help/zenity/pt_BR/figures/zenity-list-screenshot.png +share/gnome/help/zenity/pt_BR/figures/zenity-notification-screenshot.png +share/gnome/help/zenity/pt_BR/figures/zenity-progress-screenshot.png +share/gnome/help/zenity/pt_BR/figures/zenity-question-screenshot.png +share/gnome/help/zenity/pt_BR/figures/zenity-text-screenshot.png +share/gnome/help/zenity/pt_BR/figures/zenity-warning-screenshot.png +share/gnome/help/zenity/pt_BR/zenity.xml share/gnome/help/zenity/ru/figures/zenity-calendar-screenshot.png share/gnome/help/zenity/ru/figures/zenity-entry-screenshot.png share/gnome/help/zenity/ru/figures/zenity-error-screenshot.png @@ -156,6 +204,7 @@ share/locale/bn/LC_MESSAGES/zenity.mo share/locale/bn_IN/LC_MESSAGES/zenity.mo share/locale/bs/LC_MESSAGES/zenity.mo share/locale/ca/LC_MESSAGES/zenity.mo +share/locale/ca@valencia/LC_MESSAGES/zenity.mo share/locale/cs/LC_MESSAGES/zenity.mo share/locale/cy/LC_MESSAGES/zenity.mo share/locale/da/LC_MESSAGES/zenity.mo @@ -187,6 +236,7 @@ share/locale/ko/LC_MESSAGES/zenity.mo share/locale/ku/LC_MESSAGES/zenity.mo share/locale/lt/LC_MESSAGES/zenity.mo share/locale/lv/LC_MESSAGES/zenity.mo +share/locale/mai/LC_MESSAGES/zenity.mo share/locale/mg/LC_MESSAGES/zenity.mo share/locale/mi/LC_MESSAGES/zenity.mo share/locale/mk/LC_MESSAGES/zenity.mo @@ -228,13 +278,17 @@ share/locale/zh_HK/LC_MESSAGES/zenity.mo share/locale/zh_TW/LC_MESSAGES/zenity.mo share/omf/zenity/zenity-C.omf share/omf/zenity/zenity-bg.omf +share/omf/zenity/zenity-cs.omf +share/omf/zenity/zenity-da.omf share/omf/zenity/zenity-de.omf +share/omf/zenity/zenity-el.omf share/omf/zenity/zenity-en_GB.omf share/omf/zenity/zenity-es.omf share/omf/zenity/zenity-eu.omf share/omf/zenity/zenity-fi.omf share/omf/zenity/zenity-fr.omf share/omf/zenity/zenity-oc.omf +share/omf/zenity/zenity-pt_BR.omf share/omf/zenity/zenity-ru.omf share/omf/zenity/zenity-sv.omf share/omf/zenity/zenity-uk.omf @@ -251,36 +305,11 @@ share/omf/zenity/zenity-uk.omf %%DATADIR%%/zenity-progress.png %%DATADIR%%/zenity-scale.png %%DATADIR%%/zenity-text.png -%%DATADIR%%/zenity.glade %%DATADIR%%/zenity.png +%%DATADIR%%/zenity.ui @dirrm %%DATADIR%%/clothes @dirrm %%DATADIR%% @dirrm share/omf/zenity -@dirrm share/gnome/help/zenity/uk/figures -@dirrm share/gnome/help/zenity/uk -@dirrm share/gnome/help/zenity/sv/figures -@dirrm share/gnome/help/zenity/sv -@dirrm share/gnome/help/zenity/ru/figures -@dirrm share/gnome/help/zenity/ru -@dirrm share/gnome/help/zenity/oc/figures -@dirrm share/gnome/help/zenity/oc -@dirrm share/gnome/help/zenity/fr/figures -@dirrm share/gnome/help/zenity/fr -@dirrm share/gnome/help/zenity/fi/figures -@dirrm share/gnome/help/zenity/fi -@dirrm share/gnome/help/zenity/eu/figures -@dirrm share/gnome/help/zenity/eu -@dirrm share/gnome/help/zenity/es/figures -@dirrm share/gnome/help/zenity/es -@dirrm share/gnome/help/zenity/en_GB/figures -@dirrm share/gnome/help/zenity/en_GB -@dirrm share/gnome/help/zenity/de/figures -@dirrm share/gnome/help/zenity/de -@dirrm share/gnome/help/zenity/bg/figures -@dirrm share/gnome/help/zenity/bg -@dirrm share/gnome/help/zenity/C/figures -@dirrm share/gnome/help/zenity/C -@dirrm share/gnome/help/zenity @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/xh/LC_MESSAGES @@ -295,6 +324,8 @@ share/omf/zenity/zenity-uk.omf @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw +@dirrmtry share/locale/ps/LC_MESSAGES +@dirrmtry share/locale/ps @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc @dirrmtry share/locale/mr/LC_MESSAGES @@ -303,13 +334,50 @@ share/omf/zenity/zenity-uk.omf @dirrmtry share/locale/mi @dirrmtry share/locale/mg/LC_MESSAGES @dirrmtry share/locale/mg +@dirrmtry share/locale/mai/LC_MESSAGES +@dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku @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/as/LC_MESSAGES @dirrmtry share/locale/as +@dirrm share/gnome/help/zenity/uk/figures +@dirrm share/gnome/help/zenity/uk +@dirrm share/gnome/help/zenity/sv/figures +@dirrm share/gnome/help/zenity/sv +@dirrm share/gnome/help/zenity/ru/figures +@dirrm share/gnome/help/zenity/ru +@dirrm share/gnome/help/zenity/pt_BR/figures +@dirrm share/gnome/help/zenity/pt_BR +@dirrm share/gnome/help/zenity/oc/figures +@dirrm share/gnome/help/zenity/oc +@dirrm share/gnome/help/zenity/fr/figures +@dirrm share/gnome/help/zenity/fr +@dirrm share/gnome/help/zenity/fi/figures +@dirrm share/gnome/help/zenity/fi +@dirrm share/gnome/help/zenity/eu/figures +@dirrm share/gnome/help/zenity/eu +@dirrm share/gnome/help/zenity/es/figures +@dirrm share/gnome/help/zenity/es +@dirrm share/gnome/help/zenity/en_GB/figures +@dirrm share/gnome/help/zenity/en_GB +@dirrm share/gnome/help/zenity/el/figures +@dirrm share/gnome/help/zenity/el +@dirrm share/gnome/help/zenity/de/figures +@dirrm share/gnome/help/zenity/de +@dirrm share/gnome/help/zenity/da/figures +@dirrm share/gnome/help/zenity/da +@dirrm share/gnome/help/zenity/cs/figures +@dirrm share/gnome/help/zenity/cs +@dirrm share/gnome/help/zenity/bg/figures +@dirrm share/gnome/help/zenity/bg +@dirrm share/gnome/help/zenity/C/figures +@dirrm share/gnome/help/zenity/C +@dirrm share/gnome/help/zenity |