Sat Jun 15 12:27:47 2013 UTC ()
Fixed build with x11/deforaos-libdesktop 0.0.10


(khorben)
diff -r1.5 -r1.6 pkgsrc/x11/deforaos-keyboard/Makefile
diff -r1.1 -r1.2 pkgsrc/x11/deforaos-keyboard/distinfo
diff -r0 -r1.1 pkgsrc/x11/deforaos-keyboard/patches/patch-src_keyboard.c
cvs diff -r1.5 -r1.6 pkgsrc/x11/deforaos-keyboard/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/deforaos-keyboard/Makefile 2013/06/06 12:53:56 1.5
+++ pkgsrc/x11/deforaos-keyboard/Makefile 2013/06/15 12:27:47 1.6
@@ -1,28 +1,27 @@ @@ -1,28 +1,27 @@
1# $NetBSD: Makefile,v 1.5 2013/06/06 12:53:56 wiz Exp $ 1# $NetBSD: Makefile,v 1.6 2013/06/15 12:27:47 khorben Exp $
2# 2#
3 3
4DISTNAME= Keyboard-0.2.1 4DISTNAME= Keyboard-0.2.1
5PKGNAME= deforaos-keyboard-0.2.1 5PKGNAME= deforaos-keyboard-0.2.1
6PKGREVISION= 5 6PKGREVISION= 6
7CATEGORIES= x11 7CATEGORIES= x11
8MASTER_SITES= http://www.defora.org/os/download/download/3696/ 8MASTER_SITES= http://www.defora.org/os/download/download/3696/
9 9
10MAINTAINER= khorben@defora.org 10MAINTAINER= khorben@defora.org
11HOMEPAGE= http://www.defora.org/ 11HOMEPAGE= http://www.defora.org/
12COMMENT= DeforaOS desktop virtual keyboard 12COMMENT= DeforaOS desktop virtual keyboard
13 13
14LICENSE= gnu-gpl-v3 14LICENSE= gnu-gpl-v3
15 15
16CONFLICTS+= gnome-control-center>=2.20.1{,nb*} 16CONFLICTS+= gnome-control-center>=2.20.1{,nb*}
17 17
18USE_TOOLS+= pkg-config 18USE_TOOLS+= pkg-config
19USE_TOOLS+= xgettext 19USE_TOOLS+= xgettext
20 20
21MAKE_FLAGS+= DESTDIR=${DESTDIR} 21MAKE_FLAGS+= DESTDIR=${DESTDIR}
22MAKE_FLAGS+= PREFIX=${PREFIX} 22MAKE_FLAGS+= PREFIX=${PREFIX}
23 23
24.include "../../x11/libXtst/buildlink3.mk" 24.include "../../x11/libXtst/buildlink3.mk"
25.include "../../x11/gtk2/buildlink3.mk" 25.include "../../x11/gtk2/buildlink3.mk"
26.include "../../x11/deforaos-libdesktop/buildlink3.mk" 26.include "../../x11/deforaos-libdesktop/buildlink3.mk"
27.include "../../sysutils/desktop-file-utils/desktopdb.mk" 
28.include "../../mk/bsd.pkg.mk" 27.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/x11/deforaos-keyboard/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/deforaos-keyboard/distinfo 2012/12/17 00:27:52 1.1
+++ pkgsrc/x11/deforaos-keyboard/distinfo 2013/06/15 12:27:47 1.2
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.1 2012/12/17 00:27:52 khorben Exp $ 1$NetBSD: distinfo,v 1.2 2013/06/15 12:27:47 khorben Exp $
2 2
3SHA1 (Keyboard-0.2.1.tar.gz) = f852d01c172fd7bebb9f73b6709050b7ed8d7526 3SHA1 (Keyboard-0.2.1.tar.gz) = f852d01c172fd7bebb9f73b6709050b7ed8d7526
4RMD160 (Keyboard-0.2.1.tar.gz) = 9f3206cc67b7e68ad81aebb767ca258bbe8853ca 4RMD160 (Keyboard-0.2.1.tar.gz) = 9f3206cc67b7e68ad81aebb767ca258bbe8853ca
5Size (Keyboard-0.2.1.tar.gz) = 29127 bytes 5Size (Keyboard-0.2.1.tar.gz) = 29127 bytes
 6SHA1 (patch-src_keyboard.c) = ffc100bea3bd5d6dd643bf19d41567011d988e87
File Added: pkgsrc/x11/deforaos-keyboard/patches/Attic/patch-src_keyboard.c
$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;
 }