# HG changeset patch # User Christopher Rogers # Date 1300344726 0 # Node ID fa99a532487355329bda02a89a6e1c230264abef # Parent 397676d92cdbc446a8fc56fd37c3413f347aa243 Fixed fbxkb. diff -r 397676d92cdb -r fa99a5324873 fbxkb/receipt --- a/fbxkb/receipt Thu Mar 17 11:20:04 2011 +0100 +++ b/fbxkb/receipt Thu Mar 17 06:52:06 2011 +0000 @@ -6,8 +6,8 @@ SHORT_DESC="fbxkb is NETWM compliant keyboard indicator and switcher." MAINTAINER="devl547@gmail.com" TARBALL="$PACKAGE-$VERSION.tgz" -DEPENDS="gtk+" -BUILD_DEPENDS="gtk+-dev" +DEPENDS="gtk+ xorg-libXmu" +BUILD_DEPENDS="gtk+-dev xorg-libXmu-dev" WEB_SITE="http://fbxkb.sourceforge.net/" WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" @@ -15,8 +15,9 @@ compile_rules() { cd $src - ./configure \ - --prefix=/usr && + unset LDFLAGS + patch -Np1 -i $stuff/$PACKAGE.patch + ./configure && make } @@ -26,5 +27,6 @@ mkdir -p $fs/usr/bin $fs/usr/share/fbxkb/images cp -a $src/fbxkb $fs/usr/bin cp $src/images/*.png $fs/usr/share/fbxkb/images + } diff -r 397676d92cdb -r fa99a5324873 fbxkb/stuff/fbxkb.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/fbxkb/stuff/fbxkb.patch Thu Mar 17 06:52:06 2011 +0000 @@ -0,0 +1,28 @@ +--- a/fbxkb.c 2006-12-18 21:47:52.000000000 +0000 ++++ b/fbxkb.c 2008-11-08 16:25:32.000000000 +0000 +@@ -378,10 +378,11 @@ + g_assert((no >= 0) && (no < ngroups)); + if (group2info[no].sym != NULL) { + ERR("xkb group #%d is already defined\n", no); ++ } else { ++ group2info[no].sym = g_strdup(tok); ++ group2info[no].flag = sym2flag(tok); ++ group2info[no].name = XGetAtomName(dpy, kbd_desc_ptr->names->groups[no]); + } +- group2info[no].sym = g_strdup(tok); +- group2info[no].flag = sym2flag(tok); +- group2info[no].name = XGetAtomName(dpy, kbd_desc_ptr->names->groups[no]); + } + XFree(sym_name); + } +--- fbxkb-0.6.orig/Makefile.common 2004-10-15 22:18:59.000000000 +0000 ++++ fbxkb-0.6/Makefile.common 2010-11-02 13:35:02.593908176 +0000 +@@ -25,7 +25,7 @@ + endif + + # -DGTK_DISABLE_DEPRECATED does not work yet +-CFLAGS += -g -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED ++CFLAGS += -g + + %.o: %.c + $(CC) $(CFLAGS) $(INCS) -c $<