Pārlūkot izejas kodu

fontconfig avoid recalculating cache on different mtime for fontdir

Reinhard Russinger 7 gadi atpakaļ
vecāks
revīzija
758ce7c351

+ 31 - 0
GfA-buildroot_fontconfig_mtime_always_ok.patch

@@ -0,0 +1,31 @@
+diff --git a/package/fontconfig/001-mtime-always-ok.patch b/package/fontconfig/001-mtime-always-ok.patch
+new file mode 100644
+index 0000000..671c1f1
+--- /dev/null
++++ b/package/fontconfig/001-mtime-always-ok.patch
+@@ -0,0 +1,12 @@
++diff -Naurp a/src/fccache.c b/src/fccache.c
++--- a/src/fccache.c	2016-08-05 07:35:05.000000000 +0200
+++++ b/src/fccache.c	2017-11-26 00:51:18.800927077 +0100
++@@ -585,7 +585,7 @@ FcCacheTimeValid (FcConfig *config, FcCa
++ 		FcCacheDir (cache), cache->checksum, (int) dir_stat->st_mtime);
++ #endif
++ 
++-    return cache->checksum == (int) dir_stat->st_mtime && fnano;
+++    return FcTrue;
++ }
++ 
++ static FcBool
+diff --git a/package/fontconfig/fontconfig.mk b/package/fontconfig/fontconfig.mk
+index 93f2a15..a470d1f 100644
+--- a/package/fontconfig/fontconfig.mk
++++ b/package/fontconfig/fontconfig.mk
+@@ -15,7 +15,7 @@ FONTCONFIG_LICENSE_FILES = COPYING
+ 
+ FONTCONFIG_CONF_OPTS = \
+ 	--with-arch=$(GNU_TARGET_NAME) \
+-	--with-cache-dir=/var/cache/fontconfig \
++	--with-cache-dir=/fontconfig_cache \
+ 	--disable-docs
+ 
+ HOST_FONTCONFIG_CONF_OPTS = \

+ 1 - 0
Make-bb-kernel_Qt5.6.2.sh

@@ -41,6 +41,7 @@ patch -p1 < ../GfA/GfA-buildroot_include_inittab_on_update.patch
 patch -p1 < ../GfA/GfA-buildroot-libmodbus-GfA.patch
 patch -p1 < ../GfA/GfA-buildroot-update-add-fullhd.patch
 patch -p1 < ../GfA/GfA-buildroot-MakeDTSupdate.patch
+patch -p1 < ../GfA/GfA-buildroot_fontconfig_mtime_always_ok.patch
 #
 chmod a+x *.sh
 cp ../GfA/configs/* ./configs

+ 1 - 1
board/GfA/Display001/BUILD

@@ -1 +1 @@
-461
+463

BIN
board/GfA/Display001/rootfs/fontconfig_cache/12b26b760a24f8b4feb03ad48a333a72-arm-buildroot-linux-gnueabihf.cache-7


BIN
board/GfA/Display001/rootfs/fontconfig_cache/3830d5c3ddfd5cd38a049b759396e72e-arm-buildroot-linux-gnueabihf.cache-7


BIN
board/GfA/Display001/rootfs/fontconfig_cache/573ec803664ed168555e0e8b6d0f0c7f-arm-buildroot-linux-gnueabihf.cache-7


BIN
board/GfA/Display001/rootfs/fontconfig_cache/9b89f8e3dae116d678bbf48e5f21f69b-arm-buildroot-linux-gnueabihf.cache-7


BIN
board/GfA/Display001/rootfs/fontconfig_cache/b67b32625a2bb51b023d3814a918f351-arm-buildroot-linux-gnueabihf.cache-7


+ 0 - 3
board/GfA/Display001/rootfs/root/startbrowser.sh

@@ -1,7 +1,4 @@
 #!/bin/sh
-rm -rf /var/cache/fontconfig
-mkdir /fontconfig_cache
-ln -s /fontconfig_cache/ /var/cache/fontconfig
 echo -e "\033[?25l\033[9;0]\033[14;0]" > /dev/tty0
 cd /root
 #-- browsercache loeschen