14.1: Fixup Freetype

90b7894627

Signed-off-by: Tad <tad@spotco.us>

Patches/LineageOS-14.1/android_external_freetype/0002-fixup.patch

@@ -0,0 +1,24 @@
+From 90b78946273c7a27a66bd3e9828c6d11567b1e56 Mon Sep 17 00:00:00 2001
+From: syphyr <syphyr@gmail.com>
+Date: Sat, 2 Sep 2023 20:45:26 +0200
+Subject: [PATCH] Enable png and zlib support to Android.mk
+
+lineage-18.1 branch requires these changes since it is commented
+out now in include/freetype/config/ftoption.h
+---
+ Android.mk | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Android.mk b/Android.mk
+index 1661e506a..a4f49f825 100644
+--- a/Android.mk
++++ b/Android.mk
+@@ -48,6 +48,8 @@ LOCAL_CFLAGS += -W -Wall
+ LOCAL_CFLAGS += -fPIC -DPIC
+ LOCAL_CFLAGS += "-DDARWIN_NO_CARBON"
+ LOCAL_CFLAGS += "-DFT2_BUILD_LIBRARY"
++LOCAL_CFLAGS += "-DFT_CONFIG_OPTION_USE_PNG"
++LOCAL_CFLAGS += "-DFT_CONFIG_OPTION_USE_ZLIB"
+ 
+ LOCAL_SHARED_LIBRARIES += libpng libz
+ 

Scripts/LineageOS-14.1/Patch.sh

@@ -109,6 +109,7 @@ fi;
 if enterAndClear "external/freetype"; then
 #applyPatch "$DOS_PATCHES/android_external_freetype/360899.patch"; #n-asb-2023-07 Cherry-pick two upstream changes
 applyPatch "$DOS_PATCHES/android_external_freetype/0001-makefile.patch"; #Add Android.mk for legacy builds (syphyr)
+applyPatch "$DOS_PATCHES/android_external_freetype/0002-fixup.patch"; #Enable png and zlib support to Android.mk (syphyr)
 fi;
 
 if enterAndClear "external/libavc"; then