wok-next annotate fbxkb/stuff/patches/fbxkb.patch @ rev 20879
mate-session-manager: update bdeps; ntop: up (5.0.1); sslh: normalize receipt
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Sat Jul 07 16:28:22 2018 +0300 (2018-07-07) |
| parents | e1c0edabdcb2 |
| children |
| rev | line source |
|---|---|
| slaxemulator@9295 | 1 --- a/fbxkb.c 2006-12-18 21:47:52.000000000 +0000 |
| slaxemulator@9295 | 2 +++ b/fbxkb.c 2008-11-08 16:25:32.000000000 +0000 |
| slaxemulator@9295 | 3 @@ -378,10 +378,11 @@ |
| slaxemulator@9295 | 4 g_assert((no >= 0) && (no < ngroups)); |
| slaxemulator@9295 | 5 if (group2info[no].sym != NULL) { |
| slaxemulator@9295 | 6 ERR("xkb group #%d is already defined\n", no); |
| slaxemulator@9295 | 7 + } else { |
| slaxemulator@9295 | 8 + group2info[no].sym = g_strdup(tok); |
| slaxemulator@9295 | 9 + group2info[no].flag = sym2flag(tok); |
| slaxemulator@9295 | 10 + group2info[no].name = XGetAtomName(dpy, kbd_desc_ptr->names->groups[no]); |
| slaxemulator@9295 | 11 } |
| slaxemulator@9295 | 12 - group2info[no].sym = g_strdup(tok); |
| slaxemulator@9295 | 13 - group2info[no].flag = sym2flag(tok); |
| slaxemulator@9295 | 14 - group2info[no].name = XGetAtomName(dpy, kbd_desc_ptr->names->groups[no]); |
| slaxemulator@9295 | 15 } |
| slaxemulator@9295 | 16 XFree(sym_name); |
| slaxemulator@9295 | 17 } |
| al@20870 | 18 --- a/Makefile.common 2004-10-16 01:18:59.000000000 +0300 |
| al@20870 | 19 +++ b/Makefile.common 2012-01-15 23:20:02.081020564 +0200 |
| al@20870 | 20 @@ -16,7 +16,7 @@ endif |
| slaxemulator@9295 | 21 endif |
| al@20870 | 22 |
| al@20870 | 23 CC = gcc |
| al@20870 | 24 -LIBS = $(shell pkg-config --libs gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0) -L/usr/X11R6/lib -lXmu |
| al@20870 | 25 +LIBS = $(shell pkg-config --libs gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0) -lX11 -L/usr/X11R6/lib -lXmu |
| al@20870 | 26 INCS = $(shell pkg-config --cflags gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0) |
| al@20870 | 27 CFLAGS = -O2 # overwriten by command line or env. variable |
| al@20870 | 28 CFLAGS += -Wall # always nice to have |
| al@20870 | 29 @@ -24,9 +24,6 @@ ifneq (,$(DEVEL)) |
| al@20870 | 30 CFLAGS := -g -Wall |
| al@20870 | 31 endif |
| al@20870 | 32 |
| al@20870 | 33 -# -DGTK_DISABLE_DEPRECATED does not work yet |
| slaxemulator@9295 | 34 -CFLAGS += -g -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED |
| al@20870 | 35 - |
| slaxemulator@9295 | 36 %.o: %.c |
| al@20870 | 37 $(CC) $(CFLAGS) $(INCS) -c $< |