fbxkb/fbxkb.patch

   1 diff -rupN fbxkb-0.6/fbxkb.c fbxkb-0.6-new/fbxkb.c
   2 --- fbxkb-0.6/fbxkb.c   2006-12-18 23:47:52.000000000 +0200
   3 +++ fbxkb-0.6-new/fbxkb.c       2012-01-15 22:27:30.571427088 +0200
   4 @@ -378,10 +378,11 @@ read_kbd_description()
   5              g_assert((no >= 0) && (no < ngroups));
   6              if (group2info[no].sym != NULL) {
   7                  ERR("xkb group #%d is already defined\n", no);
   8 +            } else {
   9 +                group2info[no].sym = g_strdup(tok);
  10 +                group2info[no].flag = sym2flag(tok);
  11 +                group2info[no].name = XGetAtomName(dpy, kbd_desc_ptr->names->groups[no]);
  12              }
  13 -            group2info[no].sym = g_strdup(tok);
  14 -            group2info[no].flag = sym2flag(tok);
  15 -            group2info[no].name = XGetAtomName(dpy, kbd_desc_ptr->names->groups[no]);
  16          }
  17          XFree(sym_name);
  18      }
  19 diff -rupN fbxkb-0.6/Makefile.common fbxkb-0.6-new/Makefile.common
  20 --- fbxkb-0.6/Makefile.common   2004-10-16 01:18:59.000000000 +0300
  21 +++ fbxkb-0.6-new/Makefile.common       2012-01-15 23:20:02.081020564 +0200
  22 @@ -16,7 +16,7 @@ endif
  23  endif
  24
  25  CC = gcc
  26 -LIBS = $(shell pkg-config --libs gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0) -L/usr/X11R6/lib  -lXmu
  27 +LIBS = $(shell pkg-config --libs gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0) -lX11 -L/usr/X11R6/lib  -lXmu
  28  INCS = $(shell pkg-config --cflags gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0)
  29  CFLAGS = -O2    # overwriten by command line or env. variable
  30  CFLAGS += -Wall # always nice to have
  31 @@ -24,9 +24,6 @@ ifneq (,$(DEVEL))
  32  CFLAGS := -g -Wall
  33  endif
  34
  35 -# -DGTK_DISABLE_DEPRECATED does not work yet
  36 -CFLAGS += -g -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
  37 -
  38  %.o: %.c
  39         $(CC) $(CFLAGS) $(INCS) -c $<