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