Use system packaged unifont

Last-Update: 2016-08-15

Gbp-Pq: Name 20_use_system_unifont.patch

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5c53130336cc8add7e63ef706fa354a51349a049..331529b4623698791c10c78a97f51d114bc8c900 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -101,10 +101,10 @@ add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/generated/bitmapfont.table.h
     COMMAND $<TARGET_FILE:unifont2c>
             ${CMAKE_CURRENT_BINARY_DIR}/generated/bitmapfont.table.h
-            ${CMAKE_CURRENT_SOURCE_DIR}/fonts/unifont-8.0.01.hex.gz
+            /usr/share/unifont/unifont.hex
             ${chars}
     DEPENDS unifont2c
-            ${CMAKE_CURRENT_SOURCE_DIR}/fonts/unifont-8.0.01.hex.gz
+            /usr/share/unifont/unifont.hex
             ${chars}
     VERBATIM)
 

diff --git a/tools/unifont2c.cpp b/tools/unifont2c.cpp
index 7e9bf7a773883356d42ec267bd55039ed9eea3b4..f8ba2da6af0b4412ac2e6dd1a6db99766daaa153 100644 (file)
--- a/tools/unifont2c.cpp
+++ b/tools/unifont2c.cpp
@@ -118,17 +118,17 @@ int main(int argc, char** argv) {
         properties[codepoint].exists = true;
     }
 
-    gzFile unifont = gzopen(argv[2], "rb");
+    FILE *unifont = fopen(argv[2], "rb");
     if(!unifont)
         die("unifont fopen failed");
 
     while(1) {
         char buf[100];
-        if(!gzgets(unifont, buf, sizeof(buf))){
-            if(gzeof(unifont)) {
+        if(!fgets(buf, sizeof(buf), unifont)){
+            if(feof(unifont)) {
                 break;
             } else {
-                die("unifont gzgets failed");
+                die("unifont gets failed");
             }
         }
 
@@ -164,7 +164,7 @@ int main(int argc, char** argv) {
         properties[codepoint].isWide = isWide;
     }
 
-    gzclose(unifont);
+    fclose(unifont);
 
     FILE *source = fopen(argv[1], "wt");
     if(!source)