commit a37968127765c67e5a0fca30efff1f4d504bc802
Author: Jakub Bogusz <[email protected]>
Date: Fri Nov 9 19:02:10 2012 +0100
- new
- xkbcommon patch to build with libxkbcommon 0.2.x
- link patch to fix undefined symbols in libeloop and libtsm
kmscon-link.patch | 36 ++++++++++++++++++++++++++++++++++++
kmscon-xkbcommon.patch | 13 +++++++++++++
2 files changed, 49 insertions(+)
---
diff --git a/kmscon-link.patch b/kmscon-link.patch
new file mode 100644
index 0000000..964b095
--- /dev/null
+++ b/kmscon-link.patch
@@ -0,0 +1,36 @@
+--- kmscon-5/Makefile.am.orig 2012-09-26 22:56:09.716902778 +0200
++++ kmscon-5/Makefile.am 2012-11-09 17:56:46.818557932 +0100
+@@ -56,16 +56,6 @@
+ AM_LDFLAGS = \
+ -Wl,--as-needed
+
+-if BUILD_ENABLE_DEBUG
+-AM_CFLAGS += -g
+-endif
+-
+-if BUILD_ENABLE_OPTIMIZATIONS
+-AM_CFLAGS += -O2
+-else
+-AM_CFLAGS += -O0
+-endif
+-
+ #
+ # SHL - Static Helper Library
+ # The SHL subsystem contains several small code pieces used all over kmscon
and
+@@ -119,7 +109,7 @@
+ $(AM_CPPFLAGS) \
+ $(DBUS_CFLAGS)
+ libeloop_la_LIBADD = \
+- $(DBUS_LIBS)
++ $(DBUS_LIBS) -lpthread
+ libeloop_la_LDFLAGS = \
+ -version-info 1:0:0
+
+@@ -156,6 +146,7 @@
+ $(AM_CPPFLAGS)
+ libtsm_la_LDFLAGS = \
+ -version-info 1:0:0
++libtsm_la_LIBADD = -lrt
+
+ #
+ # libuterm
diff --git a/kmscon-xkbcommon.patch b/kmscon-xkbcommon.patch
new file mode 100644
index 0000000..1f62681
--- /dev/null
+++ b/kmscon-xkbcommon.patch
@@ -0,0 +1,13 @@
+--- kmscon-5/src/uterm_input_uxkb.c.orig 2012-09-11 19:14:56.837808737
+0200
++++ kmscon-5/src/uterm_input_uxkb.c 2012-11-09 16:37:55.362089827 +0100
+@@ -298,7 +298,9 @@
+
+ /* TODO: fix xkbcommon upstream to be case-insensitive if case-sensitive
+ * match fails. */
+- keysym = xkb_keysym_from_name(n);
++ keysym = xkb_keysym_from_name(n, 0);
++ if (!keysym)
++ keysym = xkb_keysym_from_name(n, XKB_KEYSYM_CASE_INSENSITIVE);
+ if (!keysym)
+ return -EFAULT;
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kmscon.git/commitdiff/a37968127765c67e5a0fca30efff1f4d504bc802
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
