summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sysutils/gnome-settings-daemon/Makefile11
-rw-r--r--sysutils/gnome-settings-daemon/PLIST7
-rw-r--r--sysutils/gnome-settings-daemon/distinfo11
-rw-r--r--sysutils/gnome-settings-daemon/patches/patch-aa12
-rw-r--r--sysutils/gnome-settings-daemon/patches/patch-ab46
-rw-r--r--sysutils/gnome-settings-daemon/patches/patch-ad13
6 files changed, 17 insertions, 83 deletions
diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile
index f81aa68f40a..94a449b8373 100644
--- a/sysutils/gnome-settings-daemon/Makefile
+++ b/sysutils/gnome-settings-daemon/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2008/12/18 15:56:13 jmcneill Exp $
+# $NetBSD: Makefile,v 1.12 2009/03/16 16:21:36 jmcneill Exp $
#
-DISTNAME= gnome-settings-daemon-2.24.1
-PKGREVISION= 1
+DISTNAME= gnome-settings-daemon-2.26.0
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-settings-daemon/2.24/}
+MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-settings-daemon/2.26/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
@@ -21,6 +20,7 @@ CONFLICTS+= gnome-control-center<2.22.0
GCONF_SCHEMAS+= gnome-settings-daemon.schemas
GCONF_SCHEMAS+= desktop_gnome_font_rendering.schemas
+GCONF_SCHEMAS+= desktop_gnome_keybindings.schemas
GCONF_SCHEMAS+= apps_gnome_settings_daemon_keybindings.schemas
GCONF_SCHEMAS+= apps_gnome_settings_daemon_screensaver.schemas
GCONF_SCHEMAS+= apps_gnome_settings_daemon_xrandr.schemas
@@ -28,6 +28,8 @@ PKGCONFIG_OVERRIDE+= data/gnome-settings-daemon.pc.in
BUILDLINK_API_DEPENDS.libxklavier+= libxklavier>=3.3
+.include "../../audio/pulseaudio/buildlink3.mk"
+.include "../../databases/gdbm/buildlink3.mk"
.include "../../devel/GConf/schemas.mk"
.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
@@ -36,6 +38,7 @@ BUILDLINK_API_DEPENDS.libxklavier+= libxklavier>=3.3
.include "../../multimedia/gstreamer0.10/buildlink3.mk"
.include "../../sysutils/dbus-glib/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
.include "../../x11/gnome-desktop/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/libgnomekbd/buildlink3.mk"
diff --git a/sysutils/gnome-settings-daemon/PLIST b/sysutils/gnome-settings-daemon/PLIST
index 2dba0803f83..3d581a8d5ca 100644
--- a/sysutils/gnome-settings-daemon/PLIST
+++ b/sysutils/gnome-settings-daemon/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2008/11/14 01:01:51 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/03/16 16:21:36 jmcneill Exp $
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
@@ -39,7 +40,9 @@ share/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas
share/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas
share/gconf/schemas/apps_gnome_settings_daemon_xrandr.schemas
share/gconf/schemas/desktop_gnome_font_rendering.schemas
+share/gconf/schemas/desktop_gnome_keybindings.schemas
share/gconf/schemas/gnome-settings-daemon.schemas
+share/gnome-control-center/keybindings/50-accessibility.xml
share/gnome-settings-daemon/acme-eject.png
share/gnome-settings-daemon/acme.glade
share/gnome-settings-daemon/gsd-a11y-preferences-dialog.glade
@@ -59,6 +62,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
diff --git a/sysutils/gnome-settings-daemon/distinfo b/sysutils/gnome-settings-daemon/distinfo
index 23c172b5eb3..b3d490b755f 100644
--- a/sysutils/gnome-settings-daemon/distinfo
+++ b/sysutils/gnome-settings-daemon/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.7 2008/12/18 15:56:13 jmcneill Exp $
+$NetBSD: distinfo,v 1.8 2009/03/16 16:21:36 jmcneill Exp $
-SHA1 (gnome-settings-daemon-2.24.1.tar.bz2) = d0dbf6ba82cdc1e814d6c46bdc363e61ee9fd0f3
-RMD160 (gnome-settings-daemon-2.24.1.tar.bz2) = 27d432cd217a836fcef0deac5f80f638a73cda7c
-Size (gnome-settings-daemon-2.24.1.tar.bz2) = 1131518 bytes
-SHA1 (patch-aa) = 66ed26db1eb571bdf6bc4640c989e6384d2f99db
-SHA1 (patch-ab) = 28315b12cb41d4c1072f6dd683c2e23eedc116b3
+SHA1 (gnome-settings-daemon-2.26.0.tar.bz2) = ccdf4ddb5e736d03a87843865c3462e55335f093
+RMD160 (gnome-settings-daemon-2.26.0.tar.bz2) = bb5c0554aa5d635cffc042c92d373e77ea3ff82a
+Size (gnome-settings-daemon-2.26.0.tar.bz2) = 1143867 bytes
SHA1 (patch-ac) = 6e77934d2ad8a75a0b476cf26a3ec72ea8160b23
-SHA1 (patch-ad) = dd3a45da76f0d9e728240adacc01aa5251db0342
diff --git a/sysutils/gnome-settings-daemon/patches/patch-aa b/sysutils/gnome-settings-daemon/patches/patch-aa
deleted file mode 100644
index bb4e658ee17..00000000000
--- a/sysutils/gnome-settings-daemon/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/04/11 19:12:09 drochner Exp $
-
---- plugins/typing-break/gsd-typing-break-manager.c.orig 2008-04-03 14:08:12.000000000 +0200
-+++ plugins/typing-break/gsd-typing-break-manager.c
-@@ -27,6 +27,7 @@
- #include <unistd.h>
- #include <string.h>
- #include <errno.h>
-+#include <signal.h>
-
- #include <locale.h>
-
diff --git a/sysutils/gnome-settings-daemon/patches/patch-ab b/sysutils/gnome-settings-daemon/patches/patch-ab
deleted file mode 100644
index fb3f6e38fe0..00000000000
--- a/sysutils/gnome-settings-daemon/patches/patch-ab
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2008/12/18 15:56:13 jmcneill Exp $
-
---- plugins/sound/gsd-sound-manager.c.orig 2008-11-24 18:02:41.000000000 -0500
-+++ plugins/sound/gsd-sound-manager.c
-@@ -21,6 +21,7 @@
-
- #include "config.h"
-
-+#include <sys/stat.h>
- #include <sys/types.h>
- #include <sys/wait.h>
- #include <stdlib.h>
-@@ -28,6 +29,7 @@
- #include <unistd.h>
- #include <string.h>
- #include <errno.h>
-+#include <signal.h>
-
- #include <locale.h>
-
-@@ -97,16 +99,24 @@ reset_esd_pid (GPid pid,
- static gboolean
- start_gnome_sound (GsdSoundManager *manager)
- {
-- char *argv[] = { ESD_LOCATION "esd", "-nobeeps", NULL};
-+ char **argv;
-+ char *argv_esd[] = { ESD_LOCATION "esd", "-nobeeps", NULL};
-+ char *argv_esdcompat[] = { ESD_LOCATION "esdcompat", "-nobeeps", NULL};
- GError *error;
- gboolean res;
- time_t starttime;
- gboolean ret;
-+ struct stat st;
-
- ret = FALSE;
-
- gnome_settings_profile_start (NULL);
-
-+ if (stat (argv_esdcompat[0], &st) == 0)
-+ argv = argv_esdcompat;
-+ else
-+ argv = argv_esd;
-+
- error = NULL;
- res = g_spawn_async (NULL,
- argv,
diff --git a/sysutils/gnome-settings-daemon/patches/patch-ad b/sysutils/gnome-settings-daemon/patches/patch-ad
deleted file mode 100644
index c559919c882..00000000000
--- a/sysutils/gnome-settings-daemon/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2008/11/20 18:15:28 wiz Exp $
-
---- configure.orig 2008-11-20 17:52:52.000000000 +0000
-+++ configure
-@@ -27374,7 +27374,7 @@ fi
- if test "x$GSD_ESD_LOCATION" != "x"; then
- # Add slash so that if the ESD pkgconfig file does not
- # specify esd_serverdir, g-s-d will look in the PATH
-- GSD_ESD_LOCATION="$GSD_ESD_LOCATION/"
-+ ESD_LOCATION="$GSD_ESD_LOCATION/"
- fi
- fi
-
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-13 02:24:45 +0000