diff options
author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2009-04-10 05:56:28 +0000 |
---|---|---|
committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2009-04-10 05:56:28 +0000 |
commit | ae52bc80895a23ddbe33b86e75a9cf331ae32ba9 (patch) | |
tree | 5538a7d3541f6d56e4bbab9c6329f5b9db64dafb /sysutils/gnome-settings-daemon | |
parent | 7934df773e0cc2a9924de75dd7cad9cc3d79d4ee (diff) |
Notes
Diffstat (limited to 'sysutils/gnome-settings-daemon')
6 files changed, 26 insertions, 63 deletions
diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile index 78f670a8e3f5..e86d4ec00dcb 100644 --- a/sysutils/gnome-settings-daemon/Makefile +++ b/sysutils/gnome-settings-daemon/Makefile @@ -3,11 +3,11 @@ # Whom: Koop Mast <kwm@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gnome-settings-daemon/Makefile,v 1.31 2008/11/25 16:39:52 marcus Exp $ +# $MCom: ports/sysutils/gnome-settings-daemon/Makefile,v 1.37 2009/03/17 14:00:07 kwm Exp $ # PORTNAME= gnome-settings-daemon -PORTVERSION= 2.24.1 +PORTVERSION= 2.26.0 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -15,6 +15,8 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME 2 settings daemon +LIB_DEPENDS= pulse.0:${PORTSDIR}/audio/pulseaudio + USE_XORG= xxf86misc USE_BZIP2= yes USE_GMAKE= yes @@ -31,6 +33,7 @@ GCONF_SCHEMAS= apps_gnome_settings_daemon_keybindings.schemas \ apps_gnome_settings_daemon_xrandr.schemas \ apps_gnome_settings_daemon_screensaver.schemas \ desktop_gnome_font_rendering.schemas \ + desktop_gnome_keybindings.schemas \ gnome-settings-daemon.schemas .include <bsd.port.mk> diff --git a/sysutils/gnome-settings-daemon/distinfo b/sysutils/gnome-settings-daemon/distinfo index bdcc78e1d6a5..e075a7705eb3 100644 --- a/sysutils/gnome-settings-daemon/distinfo +++ b/sysutils/gnome-settings-daemon/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-settings-daemon-2.24.1.tar.bz2) = 841447fa690a3a4712e9ddaec2584824 -SHA256 (gnome2/gnome-settings-daemon-2.24.1.tar.bz2) = a2a5132a5b9d0bef52010ea45b14560b6344f591ce3296ed555165332cce9a70 -SIZE (gnome2/gnome-settings-daemon-2.24.1.tar.bz2) = 1131518 +MD5 (gnome2/gnome-settings-daemon-2.26.0.tar.bz2) = c3a2934deccfcf13de15507d4be802d3 +SHA256 (gnome2/gnome-settings-daemon-2.26.0.tar.bz2) = 20502568f82ce92bc26122ceafae0f63ed71bfba0366db03c163c8567db2a103 +SIZE (gnome2/gnome-settings-daemon-2.26.0.tar.bz2) = 1143867 diff --git a/sysutils/gnome-settings-daemon/files/patch-gsd_typing-break_gsd-typing-break-manager.c b/sysutils/gnome-settings-daemon/files/patch-gsd_typing-break_gsd-typing-break-manager.c deleted file mode 100644 index 6fce0da1831a..000000000000 --- a/sysutils/gnome-settings-daemon/files/patch-gsd_typing-break_gsd-typing-break-manager.c +++ /dev/null @@ -1,10 +0,0 @@ ---- plugins/typing-break/gsd-typing-break-manager.c.orig 2008-01-14 01:20:09.000000000 +0100 -+++ plugins/typing-break/gsd-typing-break-manager.c 2008-01-14 01:20:37.000000000 +0100 -@@ -27,6 +27,7 @@ - #include <unistd.h> - #include <string.h> - #include <errno.h> -+#include <sys/signal.h> - - #include <locale.h> - diff --git a/sysutils/gnome-settings-daemon/files/patch-plugins_background_gsd-background-manager.c b/sysutils/gnome-settings-daemon/files/patch-plugins_background_gsd-background-manager.c deleted file mode 100644 index 8820c1482a96..000000000000 --- a/sysutils/gnome-settings-daemon/files/patch-plugins_background_gsd-background-manager.c +++ /dev/null @@ -1,21 +0,0 @@ ---- plugins/background/gsd-background-manager.c.orig 2008-11-03 13:25:29.000000000 -0600 -+++ plugins/background/gsd-background-manager.c 2008-11-03 13:28:16.000000000 -0600 -@@ -160,6 +160,18 @@ - GdkDisplay *display; - int n_screens; - int i; -+ GConfClient *client; -+ gboolean enabled; -+ -+ client = gconf_client_get_default (); -+ -+ enabled = gconf_client_get_bool (client, -+ "/desktop/gnome/background/draw_background", -+ NULL); -+ g_object_unref (client); -+ -+ if (!enabled) -+ return FALSE; - - if (nautilus_is_running ()) { - return; diff --git a/sysutils/gnome-settings-daemon/files/patch-plugins_media-keys_gsd-media-keys-manager.c b/sysutils/gnome-settings-daemon/files/patch-plugins_media-keys_gsd-media-keys-manager.c index 1db1bb16efe8..73931511df77 100644 --- a/sysutils/gnome-settings-daemon/files/patch-plugins_media-keys_gsd-media-keys-manager.c +++ b/sysutils/gnome-settings-daemon/files/patch-plugins_media-keys_gsd-media-keys-manager.c @@ -1,26 +1,11 @@ ---- plugins/media-keys/gsd-media-keys-manager.c.orig 2008-01-29 15:58:30.000000000 -0600 -+++ plugins/media-keys/gsd-media-keys-manager.c 2008-01-29 16:00:55.000000000 -0600 -@@ -667,7 +667,11 @@ - if ((command != NULL) && (strcmp (command, "") != 0)) { - execute (manager, command, FALSE, FALSE); - } else { -+#if __FreeBSD__ -+ execute (manager, "cdcontrol eject", FALSE, FALSE); -+#else - execute (manager, "eject -T", FALSE, FALSE); -+#endif - } +--- plugins/media-keys/gsd-media-keys-manager.c.orig 2009-02-04 16:33:14.000000000 -0500 ++++ plugins/media-keys/gsd-media-keys-manager.c 2009-02-27 14:05:26.000000000 -0500 +@@ -64,6 +64,8 @@ - g_free (command); -@@ -869,7 +873,11 @@ - do_mail_action (manager); - break; - case SLEEP_KEY: -+#if __FreeBSD__ -+ do_sleep_action ("zzz", "xset dpms force off"); -+#else - do_sleep_action ("apm", "xset dpms force off"); -+#endif - break; - case SCREENSAVER_KEY: - if ((cmd = g_find_program_in_path ("gnome-screensaver-command"))) { + #if defined(__OpenBSD__) + # define EJECT_COMMAND "eject -t /dev/cd0" ++#elif defined(__FreeBSD__) ++# define EJECT_COMMAND "cdcontrol eject" + #else + # define EJECT_COMMAND "eject -T" + #endif diff --git a/sysutils/gnome-settings-daemon/pkg-plist b/sysutils/gnome-settings-daemon/pkg-plist index 9711a5722e9f..dd7b5a3e25f9 100644 --- a/sysutils/gnome-settings-daemon/pkg-plist +++ b/sysutils/gnome-settings-daemon/pkg-plist @@ -1,5 +1,6 @@ etc/xdg/autostart/gnome-settings-daemon.desktop include/gnome-settings-daemon-2.0/gnome-settings-daemon/gnome-settings-client.h +include/gnome-settings-daemon-2.0/gnome-settings-daemon/gnome-settings-plugin.h lib/gnome-settings-daemon-2.0/a11y-keyboard.gnome-settings-plugin lib/gnome-settings-daemon-2.0/background.gnome-settings-plugin lib/gnome-settings-daemon-2.0/clipboard.gnome-settings-plugin @@ -67,6 +68,7 @@ lib/gnome-settings-daemon-2.0/xsettings.gnome-settings-plugin libdata/pkgconfig/gnome-settings-daemon.pc libexec/gnome-settings-daemon share/dbus-1/services/org.gnome.SettingsDaemon.service +share/gnome-control-center/keybindings/50-accessibility.xml %%DATADIR%%/acme-eject.png %%DATADIR%%/acme.glade %%DATADIR%%/gsd-a11y-preferences-dialog.glade @@ -85,6 +87,8 @@ share/icons/hicolor/scalable/apps/gsd-xrandr.svg share/locale/af/LC_MESSAGES/gnome-settings-daemon.mo share/locale/am/LC_MESSAGES/gnome-settings-daemon.mo share/locale/ar/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/as/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/ast/LC_MESSAGES/gnome-settings-daemon.mo share/locale/az/LC_MESSAGES/gnome-settings-daemon.mo share/locale/be/LC_MESSAGES/gnome-settings-daemon.mo share/locale/be@latin/LC_MESSAGES/gnome-settings-daemon.mo @@ -169,8 +173,6 @@ share/locale/zu/LC_MESSAGES/gnome-settings-daemon.mo @dirrm lib/gnome-settings-daemon-2.0 @dirrm include/gnome-settings-daemon-2.0/gnome-settings-daemon @dirrm include/gnome-settings-daemon-2.0 -@dirrmtry etc/xdg/autostart -@dirrmtry etc/xdg @dirrmtry share/locale/zu/LC_MESSAGES @dirrmtry share/locale/zu @dirrmtry share/locale/zh_HK/LC_MESSAGES @@ -201,3 +203,7 @@ share/locale/zu/LC_MESSAGES/gnome-settings-daemon.mo @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast +@dirrmtry share/locale/as/LC_MESSAGES +@dirrmtry share/locale/as |