39 lines
1.8 KiB
Diff
39 lines
1.8 KiB
Diff
--- spiceterm/Makefile.alt 2015-02-28 07:18:01.008125536 +0000
|
|
+++ spiceterm/Makefile 2017-07-19 08:47:53.296990815 +0000
|
|
@@ -19,8 +19,11 @@ SOURCES=screen.c event_loop.c input.c sp
|
|
|
|
all: ${PROGRAMS}
|
|
|
|
-spiceterm: ${SOURCES} ${HEADERS} spiceterm.c
|
|
- gcc -Werror -Wall -Wl,-z,relro -Wtype-limits ${SOURCES} -g -O2 -o $@ -lutil $(shell pkg-config) $(shell pkg-config --cflags --libs gthread-2.0,spice-protocol,spice-server,libsasl2)
|
|
+spiceterm: ${SOURCES} ${HEADERS} spiceterm.c spiceterm.1
|
|
+ gcc -Wall -Wl,-z,relro -Wtype-limits ${SOURCES} -g -O2 -o $@ -I$(shell pwd)/spice/server -lutil $(shell pkg-config) $(shell pkg-config --cflags --libs gthread-2.0,spice-protocol,libsasl2) \
|
|
+ $(shell pwd)/spice/server/.libs/libspice-server.a \
|
|
+ $(shell pwd)/celt/libcelt/.libs/libcelt051.a \
|
|
+ -lgio-2.0 -lgobject-2.0 -lopus -lglib-2.0 -ljpeg -llz4 -lpixman-1 -lsasl2 -lssl -lcrypto -lz -lm -lrt
|
|
|
|
genfont: genfont.c
|
|
gcc -g -O2 -o $@ genfont.c -Wall -D_GNU_SOURCE -lz
|
|
--- spiceterm/input.c.alt 2015-02-28 10:18:01.000000000 +0300
|
|
+++ spiceterm/input.c 2017-07-19 12:12:53.172901735 +0300
|
|
@@ -732,7 +732,7 @@ parse_keymap(const char *language)
|
|
}
|
|
}
|
|
|
|
- char *filename = g_strdup_printf("/usr/share/kvm/keymaps/%s", language);
|
|
+ char *filename = g_strdup_printf("/usr/share/qemu/keymaps/%s", language);
|
|
FILE *f = fopen(filename, "r");
|
|
g_free(filename);
|
|
if (!f) {
|
|
--- spiceterm/spiceterm.pod.alt 2015-02-28 10:18:01.000000000 +0300
|
|
+++ spiceterm/spiceterm.pod 2017-07-19 12:12:41.015893190 +0300
|
|
@@ -55,7 +55,7 @@ the C<SPICE_TICKET> environment variable
|
|
|
|
Due to SPICE protocol limitation, you need to specify the keyboard
|
|
layout used by the client. We currently use the keymap files from kvm
|
|
-(/usr/share/kvm/keymaps/).
|
|
+(/usr/share/qemu/keymaps/).
|
|
|
|
# spiceterm --keymap de
|
|
|