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


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

--- pkgsrc/x11/deforaos-locker/Makefile 2013/06/06 12:53:59 1.5
+++ pkgsrc/x11/deforaos-locker/Makefile 2013/06/15 12:25:23 1.6
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.5 2013/06/06 12:53:59 wiz Exp $ 1# $NetBSD: Makefile,v 1.6 2013/06/15 12:25:23 khorben Exp $
2# 2#
3 3
4DISTNAME= Locker-0.2.1 4DISTNAME= Locker-0.2.1
5PKGNAME= deforaos-locker-0.2.1 5PKGNAME= deforaos-locker-0.2.1
6PKGREVISION= 4 6PKGREVISION= 5
7CATEGORIES= x11 7CATEGORIES= x11
8MASTER_SITES= http://www.defora.org/os/download/download/3703/ 8MASTER_SITES= http://www.defora.org/os/download/download/3703/
9 9
10MAINTAINER= khorben@defora.org 10MAINTAINER= khorben@defora.org
11HOMEPAGE= http://www.defora.org/ 11HOMEPAGE= http://www.defora.org/
12COMMENT= DeforaOS desktop screensaver 12COMMENT= DeforaOS desktop screensaver
13 13
14LICENSE= gnu-gpl-v3 14LICENSE= gnu-gpl-v3
15 15
16USE_TOOLS+= pkg-config 16USE_TOOLS+= pkg-config
17USE_TOOLS+= xgettext 17USE_TOOLS+= xgettext
18 18
19BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt 19BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
@@ -24,15 +24,14 @@ MAKE_FLAGS+= PREFIX=${PREFIX} @@ -24,15 +24,14 @@ MAKE_FLAGS+= PREFIX=${PREFIX}
24AUTO_MKDIRS= yes 24AUTO_MKDIRS= yes
25 25
26post-install: 26post-install:
27 ${MV} ${DESTDIR}${PREFIX}/share/man/man1/locker.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/locker.1 27 ${MV} ${DESTDIR}${PREFIX}/share/man/man1/locker.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/locker.1
28 ${MV} ${DESTDIR}${PREFIX}/share/man/man1/lockerctl.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/lockerctl.1 28 ${MV} ${DESTDIR}${PREFIX}/share/man/man1/lockerctl.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/lockerctl.1
29 ${RMDIR} ${DESTDIR}${PREFIX}/share/man/man1 29 ${RMDIR} ${DESTDIR}${PREFIX}/share/man/man1
30 ${RMDIR} ${DESTDIR}${PREFIX}/share/man 30 ${RMDIR} ${DESTDIR}${PREFIX}/share/man
31 31
32.include "options.mk" 32.include "options.mk"
33 33
34.include "../../x11/deforaos-libdesktop/buildlink3.mk" 34.include "../../x11/deforaos-libdesktop/buildlink3.mk"
35.include "../../x11/libXScrnSaver/buildlink3.mk" 35.include "../../x11/libXScrnSaver/buildlink3.mk"
36.include "../../x11/deforaos-panel/buildlink3.mk" 36.include "../../x11/deforaos-panel/buildlink3.mk"
37.include "../../sysutils/desktop-file-utils/desktopdb.mk" 
38.include "../../mk/bsd.pkg.mk" 37.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/x11/deforaos-locker/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/deforaos-locker/distinfo 2012/12/17 00:47:37 1.1
+++ pkgsrc/x11/deforaos-locker/distinfo 2013/06/15 12:25:23 1.2
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.1 2012/12/17 00:47:37 khorben Exp $ 1$NetBSD: distinfo,v 1.2 2013/06/15 12:25:23 khorben Exp $
2 2
3SHA1 (Locker-0.2.1.tar.gz) = b78288b7a45212dc2b89361539c7b63c85f7ee83 3SHA1 (Locker-0.2.1.tar.gz) = b78288b7a45212dc2b89361539c7b63c85f7ee83
4RMD160 (Locker-0.2.1.tar.gz) = 81d96bcff075eac749027841f2194351940f9a55 4RMD160 (Locker-0.2.1.tar.gz) = 81d96bcff075eac749027841f2194351940f9a55
5Size (Locker-0.2.1.tar.gz) = 49812 bytes 5Size (Locker-0.2.1.tar.gz) = 49812 bytes
6SHA1 (patch-src_auth_Makefile) = dbad9612918cdb0e3d3b52f6116aea5632a89792 6SHA1 (patch-src_auth_Makefile) = 23c5cafc182e32eb226ab1e283ac0260a8ca0e45
 7SHA1 (patch-src_locker.c) = 63a7f11d9e1948de3f27107392b9a962f7885880
cvs diff -r1.1 -r1.2 pkgsrc/x11/deforaos-locker/patches/Attic/patch-src_auth_Makefile (expand / switch to unified diff)

--- pkgsrc/x11/deforaos-locker/patches/Attic/patch-src_auth_Makefile 2012/12/17 00:47:38 1.1
+++ pkgsrc/x11/deforaos-locker/patches/Attic/patch-src_auth_Makefile 2013/06/15 12:25:23 1.2
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-src_auth_Makefile,v 1.1 2012/12/17 00:47:38 khorben Exp $ 1$NetBSD: patch-src_auth_Makefile,v 1.2 2013/06/15 12:25:23 khorben Exp $
2 2
3Fixes build in src/auth on netbsd-6 3Fixes build in src/auth on netbsd-6
4 4
5--- src/auth/Makefile.orig 2012-09-16 01:15:22.000000000 +0000 5--- src/auth/Makefile.orig 2012-10-14 16:56:53.000000000 +0000
6+++ src/auth/Makefile 6+++ src/auth/Makefile
7@@ -21,7 +21,7 @@ all: $(TARGETS) 7@@ -21,7 +21,7 @@ all: $(TARGETS)
8  8
9 password_OBJS = password.o 9 password_OBJS = password.o
10 password_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) 10 password_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
11-password_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -l crypt 11-password_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -l crypt
12+password_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -lcrypt 12+password_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -lcrypt
13  13
14 password.so: $(password_OBJS) 14 password.so: $(password_OBJS)
15 $(CCSHARED) -o password.so $(password_OBJS) $(password_LDFLAGS) 15 $(CCSHARED) -o password.so $(password_OBJS) $(password_LDFLAGS)
File Added: pkgsrc/x11/deforaos-locker/patches/Attic/patch-src_locker.c
$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;
 }