Update to gnome-settings-daemon-2.32.0.

ok jasper@
This commit is contained in:
ajacoutot 2010-09-30 07:37:26 +00:00
parent 8928b1eeeb
commit 1880c59794
5 changed files with 58 additions and 25 deletions

View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.33 2010/07/22 11:26:29 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.34 2010/09/30 07:37:26 ajacoutot Exp $
COMMENT= GNOME settings daemon
GNOME_PROJECT= gnome-settings-daemon
GNOME_VERSION= 2.30.2
REVISION= 1
GNOME_VERSION= 2.32.0
# GPLv3
PERMIT_PACKAGE_CDROM= Yes
@ -21,7 +20,8 @@ WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
WANTLIB += png pthread pthread-stubs startup-notification-1 xcb
WANTLIB += xcb-atom xcb-aux xcb-event xkbfile xklavier xml2 z
WANTLIB += xcb-render xcb-render-util notify gnome-desktop-2
WANTLIB += gnomekbd gnomekbdui
WANTLIB += gnomekbd gnomekbdui ssl3 polkit-gobject-1 sqlite3
WANTLIB += eggdbus-1 nspr4 nss3 nssutil3 plc4 plds4 smime3 softokn3
MODULES= devel/gettext \
x11/gnome \
@ -30,7 +30,8 @@ MODULES= devel/gettext \
BUILD_DEPENDS= ::textproc/rarian
LIB_DEPENDS= ::devel/libnotify \
::x11/gnome/desktop \
::x11/gnome/libgnomekbd
::x11/gnome/libgnomekbd \
::sysutils/polkit
# otherwise we end up without icons on minimal install
RUN_DEPENDS= ::x11/gnome/icon-theme
@ -45,7 +46,9 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
CONFIGURE_ARGS= ${CONFIUGRE_SHARED} \
--disable-pulse
FAKE_FLAGS+= desktopdir=${PREFIX}/share/gnome-settings-daemon/autostart
FAKE_FLAGS+= desktopdir=${PREFIX}/share/examples/gnome-settings-daemon/xdg/autostart \
sysconfdir=${PREFIX}/share/examples/gnome-settings-daemon \
DBUS_SYS_DIR=${PREFIX}/share/examples/gnome-settings-daemon/dbus-1/system.d
pre-configure:
${SUBST_CMD} ${WRKSRC}/gnome-settings-daemon/gnome-settings-module.c

View File

@ -1,5 +1,5 @@
MD5 (gnome/gnome-settings-daemon-2.30.2.tar.bz2) = uUWx9UIWfCAaEfC6HhpHOQ==
RMD160 (gnome/gnome-settings-daemon-2.30.2.tar.bz2) = pFR82xPCxdyPaQzxmIUxKVFK2qs=
SHA1 (gnome/gnome-settings-daemon-2.30.2.tar.bz2) = df516qfWGXUUwd6LjEfIafK63iw=
SHA256 (gnome/gnome-settings-daemon-2.30.2.tar.bz2) = fNItq1L1KQDuE6W8DBoYbpHTPnf1MzxGIvhNheTrcfQ=
SIZE (gnome/gnome-settings-daemon-2.30.2.tar.bz2) = 1250365
MD5 (gnome/gnome-settings-daemon-2.32.0.tar.bz2) = jpyiaoGVOjbT2SPSi38BdQ==
RMD160 (gnome/gnome-settings-daemon-2.32.0.tar.bz2) = ceV/P276XCVBK5k8HxLwToTrqK4=
SHA1 (gnome/gnome-settings-daemon-2.32.0.tar.bz2) = xMxwNZCYQ0cumlBg5c0pQyKZmjI=
SHA256 (gnome/gnome-settings-daemon-2.32.0.tar.bz2) = 1esCcAKPBy6NNsYeRnfVWERmnZqwnVJfbHa0mA7IHJ4=
SIZE (gnome/gnome-settings-daemon-2.32.0.tar.bz2) = 1322416

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-plugins_media-keys_Makefile_in,v 1.1 2010/07/22 11:26:29 ajacoutot Exp $
$OpenBSD: patch-plugins_media-keys_Makefile_in,v 1.2 2010/09/30 07:37:26 ajacoutot Exp $
We want media keys support even if we don't have pulseaudio.
--- plugins/media-keys/Makefile.in.orig Tue Jun 22 10:59:44 2010
+++ plugins/media-keys/Makefile.in Thu Jul 22 12:32:43 2010
--- plugins/media-keys/Makefile.in.orig Mon Sep 27 15:20:47 2010
+++ plugins/media-keys/Makefile.in Tue Sep 28 12:38:19 2010
@@ -37,7 +37,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
@ -30,7 +30,7 @@ We want media keys support even if we don't have pulseaudio.
am__EXEEXT_1 =
PROGRAMS = $(noinst_PROGRAMS)
am__objects_3 = test_media_keys-gsd-marshal.$(OBJEXT) $(am__objects_1)
@@ -395,7 +394,6 @@ libmedia_keys_la_SOURCES = \
@@ -400,7 +399,6 @@ libmedia_keys_la_SOURCES = \
libmedia_keys_la_CPPFLAGS = \
-I$(top_srcdir)/gnome-settings-daemon \
-I$(top_srcdir)/plugins/common \
@ -38,7 +38,7 @@ We want media keys support even if we don't have pulseaudio.
-DPIXMAPDIR=\""$(pkgdatadir)"\" \
-DGTKBUILDERDIR=\""$(pkgdatadir)"\" \
-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
@@ -410,7 +408,6 @@ libmedia_keys_la_LDFLAGS = \
@@ -415,7 +413,6 @@ libmedia_keys_la_LDFLAGS = \
libmedia_keys_la_LIBADD = \
$(top_builddir)/plugins/common/libcommon.la \
@ -46,7 +46,7 @@ We want media keys support even if we don't have pulseaudio.
$(SETTINGS_PLUGIN_LIBS) \
$(XF86MISC_LIBS) \
-lm
@@ -418,7 +415,7 @@ libmedia_keys_la_LIBADD = \
@@ -423,7 +420,7 @@ libmedia_keys_la_LIBADD = \
plugin_in_files = \
media-keys.gnome-settings-plugin.in

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.shared,v 1.3 2010/07/22 11:26:29 ajacoutot Exp $
@comment $OpenBSD: PFRAG.shared,v 1.4 2010/09/30 07:37:26 ajacoutot Exp $
lib/gnome-settings-daemon-2.0/liba11y-keyboard.so
lib/gnome-settings-daemon-2.0/libbackground.so
lib/gnome-settings-daemon-2.0/libclipboard.so
@ -8,6 +8,7 @@ lib/gnome-settings-daemon-2.0/libkeybindings.so
lib/gnome-settings-daemon-2.0/libkeyboard.so
lib/gnome-settings-daemon-2.0/libmedia-keys.so
lib/gnome-settings-daemon-2.0/libmouse.so
lib/gnome-settings-daemon-2.0/libsmartcard.so
lib/gnome-settings-daemon-2.0/libsound.so
lib/gnome-settings-daemon-2.0/libtyping-break.so
lib/gnome-settings-daemon-2.0/libxrandr.so

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.15 2010/07/22 11:26:29 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.16 2010/09/30 07:37:26 ajacoutot Exp $
@conflict control-center2-<=2.22
%%SHARED%%
include/gnome-settings-daemon-2.0/
@ -31,6 +31,8 @@ lib/gnome-settings-daemon-2.0/keyboard.gnome-settings-plugin
@comment lib/gnome-settings-daemon-2.0/libmedia-keys.la
@comment lib/gnome-settings-daemon-2.0/libmouse.a
@comment lib/gnome-settings-daemon-2.0/libmouse.la
@comment lib/gnome-settings-daemon-2.0/libsmartcard.a
@comment lib/gnome-settings-daemon-2.0/libsmartcard.la
@comment lib/gnome-settings-daemon-2.0/libsound.a
@comment lib/gnome-settings-daemon-2.0/libsound.la
@comment lib/gnome-settings-daemon-2.0/libtyping-break.a
@ -43,6 +45,7 @@ lib/gnome-settings-daemon-2.0/keyboard.gnome-settings-plugin
@comment lib/gnome-settings-daemon-2.0/libxsettings.la
lib/gnome-settings-daemon-2.0/media-keys.gnome-settings-plugin
lib/gnome-settings-daemon-2.0/mouse.gnome-settings-plugin
lib/gnome-settings-daemon-2.0/smartcard.gnome-settings-plugin
lib/gnome-settings-daemon-2.0/sound.gnome-settings-plugin
lib/gnome-settings-daemon-2.0/typing-break.gnome-settings-plugin
lib/gnome-settings-daemon-2.0/xrandr.gnome-settings-plugin
@ -50,21 +53,43 @@ lib/gnome-settings-daemon-2.0/xrdb.gnome-settings-plugin
lib/gnome-settings-daemon-2.0/xsettings.gnome-settings-plugin
lib/pkgconfig/gnome-settings-daemon.pc
@bin libexec/gnome-settings-daemon
@bin libexec/gsd-datetime-mechanism
@bin libexec/gsd-locate-pointer
share/dbus-1/services/org.gnome.SettingsDaemon.service
share/dbus-1/system-services/
share/dbus-1/system-services/org.gnome.SettingsDaemon.DateTimeMechanism.service
share/examples/gnome-settings-daemon/
share/examples/gnome-settings-daemon/dbus-1/
share/examples/gnome-settings-daemon/dbus-1/system.d/
share/examples/gnome-settings-daemon/dbus-1/system.d/org.gnome.SettingsDaemon.DateTimeMechanism.conf
@sample ${SYSCONFDIR}/dbus-1/system.d/org.gnome.SettingsDaemon.DateTimeMechanism.conf
share/examples/gnome-settings-daemon/gnome-settings-daemon/
@sample ${SYSCONFDIR}/gnome-settings-daemon/
share/examples/gnome-settings-daemon/gnome-settings-daemon/xrandr/
@sample ${SYSCONFDIR}/gnome-settings-daemon/xrandr/
share/examples/gnome-settings-daemon/xdg/
@sample ${SYSCONFDIR}/xdg/
share/examples/gnome-settings-daemon/xdg/autostart/
@sample ${SYSCONFDIR}/xdg/autostart/
share/examples/gnome-settings-daemon/xdg/autostart/gnome-settings-daemon.desktop
@sample ${SYSCONFDIR}/xdg/autostart/gnome-setting-daemon.desktop
share/gnome-control-center/
share/gnome-control-center/keybindings/
share/gnome-control-center/keybindings/50-accessibility.xml
share/gnome-settings-daemon/
@sample ${SYSCONFDIR}/xdg/
share/gnome-settings-daemon/acme.ui
share/gnome-settings-daemon/autostart/
@sample ${SYSCONFDIR}/xdg/autostart/
share/gnome-settings-daemon/autostart/gnome-settings-daemon.desktop
@sample ${SYSCONFDIR}/xdg/autostart/gnome-setting-daemon.desktop
share/gnome-settings-daemon/gsd-a11y-preferences-dialog.ui
share/gnome-settings-daemon/icons/
share/gnome-settings-daemon/icons/hicolor/
share/gnome-settings-daemon/icons/hicolor/64x64/
share/gnome-settings-daemon/icons/hicolor/64x64/devices/
share/gnome-settings-daemon/icons/hicolor/64x64/devices/kbd-capslock-off.png
share/gnome-settings-daemon/icons/hicolor/64x64/devices/kbd-capslock-on.png
share/gnome-settings-daemon/icons/hicolor/64x64/devices/kbd-numlock-off.png
share/gnome-settings-daemon/icons/hicolor/64x64/devices/kbd-numlock-on.png
share/gnome-settings-daemon/icons/hicolor/64x64/devices/kbd-scrolllock-off.png
share/gnome-settings-daemon/icons/hicolor/64x64/devices/kbd-scrolllock-on.png
share/gnome-settings-daemon/modmap-dialog.ui
share/gnome-settings-daemon/show-layout.ui
share/gnome-settings-daemon/xrdb/
share/gnome-settings-daemon/xrdb/Editres.ad
share/gnome-settings-daemon/xrdb/Emacs.ad
@ -209,12 +234,16 @@ share/locale/zu/
share/locale/zu/LC_MESSAGES/
share/locale/zu/LC_MESSAGES/gnome-settings-daemon.mo
@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null
share/polkit-1/
share/polkit-1/actions/
share/polkit-1/actions/org.gnome.settingsdaemon.datetimemechanism.policy
${SCHEMAS_INSTDIR}/
${SCHEMAS_INSTDIR}/apps_gnome_settings_daemon_housekeeping.schemas
${SCHEMAS_INSTDIR}/apps_gnome_settings_daemon_keybindings.schemas
${SCHEMAS_INSTDIR}/apps_gnome_settings_daemon_xrandr.schemas
${SCHEMAS_INSTDIR}/desktop_gnome_font_rendering.schemas
${SCHEMAS_INSTDIR}/desktop_gnome_keybindings.schemas
${SCHEMAS_INSTDIR}/desktop_gnome_peripherals_smartcard.schemas
${SCHEMAS_INSTDIR}/desktop_gnome_peripherals_touchpad.schemas
${SCHEMAS_INSTDIR}/gnome-settings-daemon.schemas
@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null