Updating port with staging support and adapted to new deforaos lib version This PR is number 2 of 6 01 - deforaos-libdesktop 0.0.10 02 - deforaos-keyboard rev1 03 - deforaos-browser 0.4.13 04 - deforaos-player 0.1.6 05 - deforaos-panel 0.2.18 06 - deforaos-locker rev1 Fix: Patch attached with submission follows:
Responsible Changed From-To: freebsd-ports-bugs->wg I'll take it.
It is not building, I have the newer libdesktop on. In file included from /usr/local/include/X11/Xlib.h:47, from /usr/local/include/gtk-2.0/gdk/gdkx.h:32, from key.c:20: /usr/local/include/X11/Xfuncproto.h:136:24: warning: ISO C does not permit named variadic macros In file included from /usr/local/include/X11/Xlib.h:47, from keyboard.c:35: /usr/local/include/X11/Xfuncproto.h:136:24: warning: ISO C does not permit named variadic macros keyboard.c: In function 'keyboard_new': keyboard.c:441: warning: passing argument 1 of 'desktop_message_register' from incompatible pointer type keyboard.c:441: warning: passing argument 2 of 'desktop_message_register' from incompatible pointer type keyboard.c:441: warning: passing argument 3 of 'desktop_message_register' from incompatible pointer type keyboard.c:441: error: too few arguments to function 'desktop_message_register' key.c:275: warning: unused parameter 'widget' key.c:298: warning: unused parameter 'widget' key.c:299: warning: unused parameter 'event' keyboard.c: In function 'keyboard_set_page': keyboard.c:586: warning: enumeration value 'KEYBOARD_PAGE_URL' not handled in switch *** [keyboard.o] Error code 1 1 error *** [subdirs] Error code 2 1 error ===> Compilation failed unexpectedly. Any ideas? -- William Grzybowski ------------------------------------------ Curitiba/PR - Brasil
State Changed From-To: open->closed Committed. Thanks!
Author: wg Date: Mon Nov 4 19:55:56 2013 New Revision: 332765 URL: http://svnweb.freebsd.org/changeset/ports/332765 Log: x11/deforaos-keyboard: allow staging - Allow staging - Bump port revision for libdesktop update - Convert lib depends to new format PR: ports/183633 Submitted by: Olivier Cochard-Labbe <olivier cochard.me> (maintainer) Added: head/x11/deforaos-keyboard/files/ head/x11/deforaos-keyboard/files/patch-keyboard.c.diff (contents, props changed) Modified: head/x11/deforaos-keyboard/Makefile head/x11/deforaos-keyboard/pkg-plist Modified: head/x11/deforaos-keyboard/Makefile ============================================================================== --- head/x11/deforaos-keyboard/Makefile Mon Nov 4 19:54:24 2013 (r332764) +++ head/x11/deforaos-keyboard/Makefile Mon Nov 4 19:55:56 2013 (r332765) @@ -3,23 +3,22 @@ PORTNAME= keyboard PORTVERSION= 0.2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= http://www.defora.org/os/download/download/3696/ -DISTNAME= Keyboard-${PORTVERSION} PKGNAMEPREFIX= deforaos- +DISTNAME= Keyboard-${PORTVERSION} MAINTAINER= olivier@cochard.me COMMENT= DeforaOS desktop virtual keyboardr LICENSE= GPLv3 -LIB_DEPENDS= Desktop:${PORTSDIR}/x11/deforaos-libdesktop +LIB_DEPENDS= libDesktop.so:${PORTSDIR}/x11/deforaos-libdesktop USE_GNOME= gtk20 -USES= pkgconfig gettext +USES= desktop-file-utils gettext pkgconfig USE_XORG= xtst MAKE_ARGS+= PREFIX=${PREFIX} -NO_STAGE= yes .include <bsd.port.mk> Added: head/x11/deforaos-keyboard/files/patch-keyboard.c.diff ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/deforaos-keyboard/files/patch-keyboard.c.diff Mon Nov 4 19:55:56 2013 (r332765) @@ -0,0 +1,11 @@ +--- src/keyboard.c.orig 2013-10-30 12:04:38.512854430 +0100 ++++ src/keyboard.c 2013-10-30 12:04:53.198851447 +0100 +@@ -437,7 +437,7 @@ + keyboard_set_layout(keyboard, KLS_LETTERS); + pango_font_description_free(bold); + /* messages */ +- desktop_message_register(KEYBOARD_CLIENT_MESSAGE, on_keyboard_message, ++ desktop_message_register(keyboard->window,KEYBOARD_CLIENT_MESSAGE, on_keyboard_message, + keyboard); + return keyboard; + } Modified: head/x11/deforaos-keyboard/pkg-plist ============================================================================== --- head/x11/deforaos-keyboard/pkg-plist Mon Nov 4 19:54:24 2013 (r332764) +++ head/x11/deforaos-keyboard/pkg-plist Mon Nov 4 19:55:56 2013 (r332765) @@ -3,3 +3,4 @@ bin/keyboard include/Desktop/Keyboard.h share/applications/keyboard.desktop share/locale/fr/LC_MESSAGES/Keyboard.mo +@dirrm include/Desktop _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"