Remove unifont and terminal checks/support

3 files changed, 0 insertions, 142 deletions

diff --git a/.gitignore b/.gitignore
index 875ada5ebd..7b64b1e737 100644
--- a/.gitignore
+++ b/.gitignore
@@ -260,7 +260,6 @@
 /test-udev
 /test-uid-range
 /test-unaligned
-/test-unifont
 /test-unit-file
 /test-unit-name
 /test-utf8
diff --git a/configure.ac b/configure.ac
index 92bc24330d..55767290e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1054,27 +1054,6 @@ AS_IF([test "x$enable_gnuefi" != "xno"], [
 AM_CONDITIONAL(HAVE_GNUEFI, [test "x$have_gnuefi" = xyes])
 
 # ------------------------------------------------------------------------------
-AC_ARG_WITH(unifont,
-        AS_HELP_STRING([--with-unifont=PATH],
-                [Path to unifont.hex]),
-        [UNIFONT="$withval"],
-        [UNIFONT="/usr/share/unifont/unifont.hex"])
-AC_SUBST(UNIFONT)
-
-have_terminal=no
-have_unifont=no
-AC_ARG_ENABLE(terminal, AS_HELP_STRING([--enable-terminal], [enable terminal support]))
-if test "x$enable_terminal" = "xyes"; then
-        PKG_CHECK_MODULES([TERMINAL], [ libevdev >= 1.2 xkbcommon >= 0.5 libdrm >= 2.4], [have_terminal=yes])
-        AC_CHECK_FILE($UNIFONT, [have_unifont=yes])
-        AS_IF([test "x$have_terminal" != xyes -o "x$have_unifont" != "xyes" -a "x$enable_terminal" = xyes],
-              [AC_MSG_ERROR([*** terminal support requested but required dependencies not available])],
-              [test "x$have_terminal" = xyes -a "x$have_unifont" = "xyes"],
-              [AC_DEFINE(ENABLE_TERMINAL, 1, [Define if terminal support is to be enabled])])
-fi
-AM_CONDITIONAL(ENABLE_TERMINAL, [test "x$have_terminal" = "xyes" -a "x$have_unifont" = "xyes"])
-
-# ------------------------------------------------------------------------------
 have_kdbus=no
 AC_ARG_ENABLE(kdbus, AS_HELP_STRING([--enable-kdbus], [do connect to kdbus by default]))
 if test "x$enable_kdbus" = "xyes"; then
@@ -1388,7 +1367,6 @@ AC_MSG_RESULT([
         nss-myhostname:          ${have_myhostname}
         gudev:                   ${enable_gudev}
         hwdb:                    ${enable_hwdb}
-        terminal:                ${have_terminal}
         kdbus:                   ${have_kdbus}
         Python:                  ${have_python}
         Python Headers:          ${have_python_devel}
diff --git a/tools/compile-unifont.py b/tools/compile-unifont.py
deleted file mode 100755
index 5464c53e7f..0000000000
--- a/tools/compile-unifont.py
+++ /dev/null
@@ -1,119 +0,0 @@
-#  -*- Mode: python; coding: utf-8; indent-tabs-mode: nil -*- */
-#
-#  This file is part of systemd.
-#
-#  Copyright 2013-2014 David Herrmann <dh.herrmann@gmail.com>
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU Lesser General Public License as published by
-#  the Free Software Foundation; either version 2.1 of the License, or
-#  (at your option) any later version.
-#
-#  systemd is distributed in the hope that it will be useful, but
-#  WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#  Lesser General Public License for more details.
-#
-#  You should have received a copy of the GNU Lesser General Public License
-#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-
-#
-# Parse a unifont.hex file and produce a compressed binary-format.
-#
-
-from __future__ import print_function
-import re
-import sys
-import fileinput
-import struct
-
-#
-# Write "bits" array as binary output.
-#
-
-
-write = getattr(sys.stdout, 'buffer', sys.stdout).write
-
-def write_bin_entry(entry):
-    l = len(entry)
-    if l != 32 and l != 64:
-        entry = "0" * 64
-        l = 0
-    elif l < 64:
-        entry += "0" * (64 - l)
-
-    write(struct.pack('B', int(l / 32)))  # width
-    write(struct.pack('B', 0))            # padding
-    write(struct.pack('H', 0))            # padding
-    write(struct.pack('I', 0))            # padding
-
-    i = 0
-    for j in range(0, 16):
-        for k in range(0, 2):
-            if l <= k * 16 * 2:
-                c = 0
-            else:
-                c = int(entry[i:i+2], 16)
-                i += 2
-
-            write(struct.pack('B', c))
-
-def write_bin(bits):
-    write(struct.pack('B', 0x44))         # ASCII: 'D'
-    write(struct.pack('B', 0x56))         # ASCII: 'V'
-    write(struct.pack('B', 0x44))         # ASCII: 'D'
-    write(struct.pack('B', 0x48))         # ASCII: 'H'
-    write(struct.pack('B', 0x52))         # ASCII: 'R'
-    write(struct.pack('B', 0x4d))         # ASCII: 'M'
-    write(struct.pack('B', 0x55))         # ASCII: 'U'
-    write(struct.pack('B', 0x46))         # ASCII: 'F'
-    write(struct.pack('<I', 0))           # compatible-flags
-    write(struct.pack('<I', 0))           # incompatible-flags
-    write(struct.pack('<I', 32))          # header-size
-    write(struct.pack('<H', 8))           # glyph-header-size
-    write(struct.pack('<H', 2))           # glyph-stride
-    write(struct.pack('<Q', 32))          # glyph-body-size
-
-    # write glyphs
-    for idx in range(len(bits)):
-        write_bin_entry(bits[idx])
-
-#
-# Parse hex file into "bits" array
-#
-
-def parse_hex_line(bits, line):
-    m = re.match(r"^([0-9A-Fa-f]+):([0-9A-Fa-f]+)$", line)
-    if m == None:
-        return
-
-    idx = int(m.group(1), 16)
-    val = m.group(2)
-
-    # insert skipped lines
-    for i in range(len(bits), idx):
-        bits.append("")
-
-    bits.insert(idx, val)
-
-def parse_hex():
-    bits = []
-
-    for line in sys.stdin:
-        if not line:
-            continue
-        if line.startswith("#"):
-            continue
-
-        parse_hex_line(bits, line)
-
-    return bits
-
-#
-# In normal mode we simply read line by line from standard-input and write the
-# binary-file to standard-output.
-#
-
-if __name__ == "__main__":
-    bits = parse_hex()
-    write_bin(bits)