commit d6dd9bf741054bd184342a35a0b63ac362507541
Author: Elan Ruusamäe <[email protected]>
Date: Sat Mar 9 20:31:19 2013 +0200
up to 6, build errors...
kmscon-format.patch | 15 ---------------
kmscon-link.patch | 14 +++++++-------
kmscon-xkbcommon.patch | 13 -------------
kmscon.spec | 14 +++++---------
4 files changed, 12 insertions(+), 44 deletions(-)
---
diff --git a/kmscon.spec b/kmscon.spec
index b62eb13..97a150d 100644
--- a/kmscon.spec
+++ b/kmscon.spec
@@ -5,20 +5,18 @@
%bcond_without udev # udev-based hotplug support
%bcond_without unifont # Unifont backend (could make kmscon GPLed)
%bcond_with wayland # wayland-based wlterm [needs update for
wayland 1.0]
-#
+
Summary: Simple terminal emulator based on Linux Kernel Mode Setting
(KMS)
Summary(pl.UTF-8): Prosty emulator terminala oparty na linuksowym KMS
(Kernel Mode Setting)
Name: kmscon
-Version: 5
-Release: 1
+Version: 6
+Release: 0.1
License: MIT (code), GPL (Unifont)
Group: Applications/Terminal
#Source0Download: https://github.com/dvdhrm/kmscon/downloads
Source0:
https://github.com/downloads/dvdhrm/kmscon/%{name}-%{version}.tar.bz2
-# Source0-md5: d35014947a468d1a5e633d4221d2e4fa
-Patch0: %{name}-xkbcommon.patch
+# Source0-md5: 12f6966cef8e846f31dbcad916a9f347
Patch1: %{name}-link.patch
-Patch2: %{name}-format.patch
URL: https://github.com/dvdhrm/kmscon/wiki/KMSCON
BuildRequires: Mesa-libEGL-devel
BuildRequires: Mesa-libGLES-devel
@@ -32,7 +30,7 @@ BuildRequires: libtool >= 2:2.2
BuildRequires: pango-devel
BuildRequires: pkgconfig
%{?with_systemd:BuildRequires: systemd-devel}
-BuildRequires: udev-devel
+BuildRequires: udev-devel >= 1:172
# wayland-client wayland-server wayland-cursor
%{?with_wayland:BuildRequires: wayland-devel}
BuildRequires: xorg-lib-libxkbcommon-devel >= 0.2.0
@@ -89,9 +87,7 @@ Statyczne biblioteki kmscon.
%prep
%setup -q
-%patch0 -p1
%patch1 -p1
-%patch2 -p1
%build
%{__libtoolize}
diff --git a/kmscon-format.patch b/kmscon-format.patch
deleted file mode 100644
index 688e242..0000000
--- a/kmscon-format.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- kmscon-5/src/genunifont.c.orig 2012-08-25 15:54:35.997327647 +0200
-+++ kmscon-5/src/genunifont.c 2012-11-09 20:21:20.869890307 +0100
-@@ -82,10 +82,10 @@
-
- idx = hex_val(c);
- if (idx < 16) {
-- fprintf(out, line_map[idx]);
-+ fputs(line_map[idx], out);
- } else {
- fprintf(stderr, "genunifont: invalid value %c\n", c);
-- fprintf(out, line_map[0]);
-+ fputs(line_map[0], out);
- }
- }
-
diff --git a/kmscon-link.patch b/kmscon-link.patch
index 964b095..7cffa2f 100644
--- a/kmscon-link.patch
+++ b/kmscon-link.patch
@@ -1,5 +1,5 @@
---- 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
+--- kmscon-6/Makefile.am~ 2013-03-09 20:27:31.000000000 +0200
++++ kmscon-6/Makefile.am 2013-03-09 20:27:42.798733628 +0200
@@ -56,16 +56,6 @@
AM_LDFLAGS = \
-Wl,--as-needed
@@ -17,15 +17,15 @@
#
# SHL - Static Helper Library
# The SHL subsystem contains several small code pieces used all over kmscon
and
-@@ -119,7 +109,7 @@
- $(AM_CPPFLAGS) \
+@@ -112,7 +112,7 @@
+ libeloop_la_CPPFLAGS += \
$(DBUS_CFLAGS)
- libeloop_la_LIBADD = \
+ libeloop_la_LIBADD += \
- $(DBUS_LIBS)
+ $(DBUS_LIBS) -lpthread
- libeloop_la_LDFLAGS = \
- -version-info 1:0:0
+ endif
+ #
@@ -156,6 +146,7 @@
$(AM_CPPFLAGS)
libtsm_la_LDFLAGS = \
diff --git a/kmscon-xkbcommon.patch b/kmscon-xkbcommon.patch
deleted file mode 100644
index 1f62681..0000000
--- a/kmscon-xkbcommon.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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/8c9bc761ea1a5b23a3ef01b520028d698eb66172
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
