Fixed build with x11/deforaos-libdesktop 0.0.10

7 files changed, 47 insertions, 11 deletions

diff --git a/x11/deforaos-keyboard/Makefile b/x11/deforaos-keyboard/Makefile
index 3a2bc36c8c1..57e5472caf2 100644
--- a/x11/deforaos-keyboard/Makefile
+++ b/x11/deforaos-keyboard/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2013/06/06 12:53:56 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2013/06/15 12:27:47 khorben Exp $
 #
 
 DISTNAME=	Keyboard-0.2.1
 PKGNAME=	deforaos-keyboard-0.2.1
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	x11
 MASTER_SITES=	http://www.defora.org/os/download/download/3696/
 
@@ -24,5 +24,4 @@ MAKE_FLAGS+=	PREFIX=${PREFIX}
 .include "../../x11/libXtst/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/deforaos-libdesktop/buildlink3.mk"
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/deforaos-keyboard/distinfo b/x11/deforaos-keyboard/distinfo
index 9756315a1ff..ce3462f118f 100644
--- a/x11/deforaos-keyboard/distinfo
+++ b/x11/deforaos-keyboard/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1 2012/12/17 00:27:52 khorben Exp $
+$NetBSD: distinfo,v 1.2 2013/06/15 12:27:47 khorben Exp $
 
 SHA1 (Keyboard-0.2.1.tar.gz) = f852d01c172fd7bebb9f73b6709050b7ed8d7526
 RMD160 (Keyboard-0.2.1.tar.gz) = 9f3206cc67b7e68ad81aebb767ca258bbe8853ca
 Size (Keyboard-0.2.1.tar.gz) = 29127 bytes
+SHA1 (patch-src_keyboard.c) = ffc100bea3bd5d6dd643bf19d41567011d988e87
diff --git a/x11/deforaos-keyboard/patches/patch-src_keyboard.c b/x11/deforaos-keyboard/patches/patch-src_keyboard.c
new file mode 100644
index 00000000000..9170df31cfc
--- /dev/null
+++ b/x11/deforaos-keyboard/patches/patch-src_keyboard.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_keyboard.c,v 1.1 2013/06/15 12:27:47 khorben Exp $
+
+API change in libDesktop 0.0.10
+
+--- src/keyboard.c.orig	2012-09-22 01:07:48.000000000 +0000
++++ src/keyboard.c
+@@ -437,8 +437,8 @@ Keyboard * keyboard_new(KeyboardPrefs * 
+ 	keyboard_set_layout(keyboard, KLS_LETTERS);
+ 	pango_font_description_free(bold);
+ 	/* messages */
+-	desktop_message_register(KEYBOARD_CLIENT_MESSAGE, on_keyboard_message,
+-			keyboard);
++	desktop_message_register(keyboard->window, KEYBOARD_CLIENT_MESSAGE,
++			on_keyboard_message, keyboard);
+ 	return keyboard;
+ }
+ 
diff --git a/x11/deforaos-locker/Makefile b/x11/deforaos-locker/Makefile
index e4fa9d075dd..f7c93cdc169 100644
--- a/x11/deforaos-locker/Makefile
+++ b/x11/deforaos-locker/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2013/06/06 12:53:59 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2013/06/15 12:25:23 khorben Exp $
 #
 
 DISTNAME=	Locker-0.2.1
 PKGNAME=	deforaos-locker-0.2.1
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	x11
 MASTER_SITES=	http://www.defora.org/os/download/download/3703/
 
@@ -34,5 +34,4 @@ post-install:
 .include "../../x11/deforaos-libdesktop/buildlink3.mk"
 .include "../../x11/libXScrnSaver/buildlink3.mk"
 .include "../../x11/deforaos-panel/buildlink3.mk"
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/deforaos-locker/distinfo b/x11/deforaos-locker/distinfo
index 39485405a8c..6da05d5b337 100644
--- a/x11/deforaos-locker/distinfo
+++ b/x11/deforaos-locker/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1 2012/12/17 00:47:37 khorben Exp $
+$NetBSD: distinfo,v 1.2 2013/06/15 12:25:23 khorben Exp $
 
 SHA1 (Locker-0.2.1.tar.gz) = b78288b7a45212dc2b89361539c7b63c85f7ee83
 RMD160 (Locker-0.2.1.tar.gz) = 81d96bcff075eac749027841f2194351940f9a55
 Size (Locker-0.2.1.tar.gz) = 49812 bytes
-SHA1 (patch-src_auth_Makefile) = dbad9612918cdb0e3d3b52f6116aea5632a89792
+SHA1 (patch-src_auth_Makefile) = 23c5cafc182e32eb226ab1e283ac0260a8ca0e45
+SHA1 (patch-src_locker.c) = 63a7f11d9e1948de3f27107392b9a962f7885880
diff --git a/x11/deforaos-locker/patches/patch-src_auth_Makefile b/x11/deforaos-locker/patches/patch-src_auth_Makefile
index ffd75f2cc26..718dda755d3 100644
--- a/x11/deforaos-locker/patches/patch-src_auth_Makefile
+++ b/x11/deforaos-locker/patches/patch-src_auth_Makefile
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_auth_Makefile,v 1.1 2012/12/17 00:47:38 khorben Exp $
+$NetBSD: patch-src_auth_Makefile,v 1.2 2013/06/15 12:25:23 khorben Exp $
 
 Fixes build in src/auth on netbsd-6
 
---- src/auth/Makefile.orig	2012-09-16 01:15:22.000000000 +0000
+--- src/auth/Makefile.orig	2012-10-14 16:56:53.000000000 +0000
 +++ src/auth/Makefile
 @@ -21,7 +21,7 @@ all: $(TARGETS)
  
diff --git a/x11/deforaos-locker/patches/patch-src_locker.c b/x11/deforaos-locker/patches/patch-src_locker.c
new file mode 100644
index 00000000000..a56feb4b004
--- /dev/null
+++ b/x11/deforaos-locker/patches/patch-src_locker.c
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_locker.c,v 1.1 2013/06/15 12:25:23 khorben Exp $
+
+API change in libDesktop 0.0.10
+
+--- src/locker.c.orig	2012-10-12 23:18:24.000000000 +0000
++++ src/locker.c
+@@ -268,8 +268,10 @@ Locker * locker_new(char const * demo, c
+ 			GDK_WINDOW_XID(root), ScreenSaverNotifyMask);
+ 	gdk_x11_register_standard_event_type(locker->display, locker->event, 1);
+ 	gdk_window_add_filter(root, _locker_on_filter, locker);
+-	desktop_message_register(LOCKER_CLIENT_MESSAGE, _locker_on_message,
+-			locker);
++	/* listen to desktop messages */
++	gtk_widget_realize(locker->windows[0]);
++	desktop_message_register(locker->windows[0], LOCKER_CLIENT_MESSAGE,
++			_locker_on_message, locker);
+ 	return locker;
+ }
+