wok-stable rev 9295

Fixed fbxkb.
author Christopher Rogers <slaxemulator@gmail.com>
date Thu Mar 17 06:52:06 2011 +0000 (2011-03-17)
parents 397676d92cdb
children 0086e76a8443
files fbxkb/receipt fbxkb/stuff/fbxkb.patch
line diff
     1.1 --- a/fbxkb/receipt	Thu Mar 17 11:20:04 2011 +0100
     1.2 +++ b/fbxkb/receipt	Thu Mar 17 06:52:06 2011 +0000
     1.3 @@ -6,8 +6,8 @@
     1.4  SHORT_DESC="fbxkb is NETWM compliant keyboard indicator and switcher."
     1.5  MAINTAINER="devl547@gmail.com"
     1.6  TARBALL="$PACKAGE-$VERSION.tgz"
     1.7 -DEPENDS="gtk+"
     1.8 -BUILD_DEPENDS="gtk+-dev"
     1.9 +DEPENDS="gtk+ xorg-libXmu"
    1.10 +BUILD_DEPENDS="gtk+-dev xorg-libXmu-dev"
    1.11  WEB_SITE="http://fbxkb.sourceforge.net/"
    1.12  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
    1.13  
    1.14 @@ -15,8 +15,9 @@
    1.15  compile_rules()
    1.16  {
    1.17  	cd $src
    1.18 -	./configure \
    1.19 -		--prefix=/usr &&
    1.20 +	unset LDFLAGS
    1.21 +	patch -Np1 -i $stuff/$PACKAGE.patch
    1.22 +	./configure &&
    1.23  	make
    1.24  }
    1.25  
    1.26 @@ -26,5 +27,6 @@
    1.27  	mkdir -p $fs/usr/bin $fs/usr/share/fbxkb/images
    1.28  	cp -a $src/fbxkb $fs/usr/bin
    1.29  	cp $src/images/*.png $fs/usr/share/fbxkb/images
    1.30 +
    1.31  }
    1.32  
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/fbxkb/stuff/fbxkb.patch	Thu Mar 17 06:52:06 2011 +0000
     2.3 @@ -0,0 +1,28 @@
     2.4 +--- a/fbxkb.c	2006-12-18 21:47:52.000000000 +0000
     2.5 ++++ b/fbxkb.c	2008-11-08 16:25:32.000000000 +0000
     2.6 +@@ -378,10 +378,11 @@
     2.7 +             g_assert((no >= 0) && (no < ngroups));
     2.8 +             if (group2info[no].sym != NULL) {
     2.9 +                 ERR("xkb group #%d is already defined\n", no);
    2.10 ++            } else {
    2.11 ++                group2info[no].sym = g_strdup(tok);
    2.12 ++                group2info[no].flag = sym2flag(tok);
    2.13 ++                group2info[no].name = XGetAtomName(dpy, kbd_desc_ptr->names->groups[no]);           
    2.14 +             }
    2.15 +-            group2info[no].sym = g_strdup(tok);
    2.16 +-            group2info[no].flag = sym2flag(tok);
    2.17 +-            group2info[no].name = XGetAtomName(dpy, kbd_desc_ptr->names->groups[no]);           
    2.18 +         }
    2.19 +         XFree(sym_name);
    2.20 +     }
    2.21 +--- fbxkb-0.6.orig/Makefile.common      2004-10-15 22:18:59.000000000 +0000
    2.22 ++++ fbxkb-0.6/Makefile.common   2010-11-02 13:35:02.593908176 +0000
    2.23 +@@ -25,7 +25,7 @@
    2.24 + endif
    2.25 +
    2.26 + # -DGTK_DISABLE_DEPRECATED does not work yet
    2.27 +-CFLAGS += -g -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
    2.28 ++CFLAGS += -g
    2.29 +
    2.30 + %.o: %.c
    2.31 +        $(CC) $(CFLAGS) $(INCS) -c $<