cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- minor cleanups:

Browse Source 
* regen PLIST
* use FAKE_FLAGS
* add a comment to patch-gnome-settings-daemon_gnome-settings-module_c
* remove bogus chunk from patch-plugins_media-keys_gsd-media-keys-manager_c
This commit is contained in:
jasper 2009-11-12 00:14:53 +00:00
parent 019c27a252
commit e6afe67e17
5 changed files with 13 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
x11/gnome/settings-daemon/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.25 2009/10/19 16:35:35 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.26 2009/11/12 00:14:53 jasper Exp $
COMMENT= GNOME settings daemon
GNOME_PROJECT= gnome-settings-daemon
GNOME_VERSION= 2.28.1
PKGNAME= ${DISTNAME}p0
# GPLv3
PERMIT_PACKAGE_CDROM= Yes
@ -44,6 +45,8 @@ CONFIGURE_ARGS= ${CONFIUGRE_SHARED} \
--disable-esd \
--disable-pulse
FAKE_FLAGS+= desktopdir=${PREFIX}/share/gnome-settings-daemon/autostart
pre-configure:
${SUBST_CMD} ${WRKSRC}/gnome-settings-daemon/gnome-settings-module.c

12
x11/gnome/settings-daemon/patches/patch-data_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-data_Makefile_in,v 1.3 2009/10/11 22:53:22 ajacoutot Exp $
--- data/Makefile.in.orig Mon Sep 21 12:34:44 2009
+++ data/Makefile.in Sun Oct 11 23:59:44 2009
@@ -264,7 +264,7 @@ schemas_in_files = \
$(NULL)
schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
-desktopdir = $(sysconfdir)/xdg/autostart
+desktopdir = $(datadir)/gnome-settings-daemon/autostart
desktop_in_files = gnome-settings-daemon.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
servicedir = $(datadir)/dbus-1/services

6
x11/gnome/settings-daemon/patches/patch-gnome-settings-daemon_gnome-settings-module_c
View File

@ -1,4 +1,8 @@
$OpenBSD: patch-gnome-settings-daemon_gnome-settings-module_c,v 1.2 2009/10/11 22:53:22 ajacoutot Exp $
$OpenBSD: patch-gnome-settings-daemon_gnome-settings-module_c,v 1.3 2009/11/12 00:14:53 jasper Exp $
- disable loading of the keyboard plugin under VNC-like displays, prevents
crasher with VNC displays.
--- gnome-settings-daemon/gnome-settings-module.c.orig Sun May 3 20:15:30 2009
+++ gnome-settings-daemon/gnome-settings-module.c Mon Oct 12 00:43:13 2009
@@ -24,6 +24,11 @@

19
x11/gnome/settings-daemon/patches/patch-plugins_media-keys_gsd-media-keys-manager_c
View File

@ -1,10 +1,9 @@
$OpenBSD: patch-plugins_media-keys_gsd-media-keys-manager_c,v 1.3 2009/10/11 22:53:22 ajacoutot Exp $
$OpenBSD: patch-plugins_media-keys_gsd-media-keys-manager_c,v 1.4 2009/11/12 00:14:53 jasper Exp $
- Give eject(1) a slightly bigger chance of actually doing something.
- Set the correct "sleep" command for apm(8).
--- plugins/media-keys/gsd-media-keys-manager.c.orig Sun Oct 11 23:53:00 2009
+++ plugins/media-keys/gsd-media-keys-manager.c Sun Oct 11 23:54:43 2009
--- plugins/media-keys/gsd-media-keys-manager.c.orig Mon Sep 21 12:24:02 2009
+++ plugins/media-keys/gsd-media-keys-manager.c Thu Nov 12 01:04:54 2009
@@ -64,7 +64,7 @@
#define MAX_VOLUME 65536.0
@ -14,15 +13,3 @@ $OpenBSD: patch-plugins_media-keys_gsd-media-keys-manager_c,v 1.3 2009/10/11 22:
#else
# define EJECT_COMMAND "eject -T"
#endif
@@ -896,6 +896,11 @@ do_action (GsdMediaKeysManager *manager,
break;
case SLEEP_KEY:
do_sleep_action (SLEEP_COMMAND, "xset dpms force off");
+#if defined(__OpenBSD__) || defined(__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"))) {

4
x11/gnome/settings-daemon/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.9 2009/10/19 16:35:36 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.10 2009/11/12 00:14:53 jasper Exp $
@conflict control-center2-<=2.22
%%SHARED%%
include/gnome-settings-daemon-2.0/
@ -95,8 +95,6 @@ share/locale/br/LC_MESSAGES/
share/locale/br/LC_MESSAGES/gnome-settings-daemon.mo
share/locale/bs/LC_MESSAGES/gnome-settings-daemon.mo
share/locale/ca/LC_MESSAGES/gnome-settings-daemon.mo
share/locale/ca@valencia/
share/locale/ca@valencia/LC_MESSAGES/
share/locale/ca@valencia/LC_MESSAGES/gnome-settings-daemon.mo
share/locale/cs/LC_MESSAGES/gnome-settings-daemon.mo
share/locale/cy/LC_MESSAGES/gnome-settings-daemon.mo