Package updated.

3 files changed, 3 insertions, 86 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5bb7bffdf67e..8f63ae7c19d0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -22,13 +22,11 @@ pkgbase = android-x86-freetype2-bootstrap
 	source = 0001-Enable-table-validation-modules.patch
 	source = 0002-Enable-subpixel-rendering.patch
 	source = 0003-Enable-long-PCF-family-names.patch
-	source = 0004-Fix-build.patch
 	validpgpkeys = E30674707856409FF1948010BE6C3AAC63AD8E3F
 	b2sums = cebc82180d9afaeb112a65ba78903d7bf7a9295a803166a033585ad2325add6023f05066852240c4665e56285345ba503b01ecd461d48f0478a8f3f56136988e
 	b2sums = SKIP
 	b2sums = 2c148694e150b3faae9dc46ead824ae6d94cfe34f2918bc9066f45bab7e6b6f77b4d4b2fee00c3d466d866e1985132cea4a774dcf1bab95409b7cf55efff01e1
 	b2sums = 9598d13eae0411878c1af8e5d875c3b1fc09f4e6649edfbbf3b0a819c4c585648521f0b30ffd1318f5106cfde9c899d3db70c8ffe36dac59f3f98b5fd7dab115
 	b2sums = 66deb179d1f1f4e2e35f6d50acfbacce80595d5128f5fed8c1871838c210dbf1a7173a87dd937d64997844c8f478c8f81120f71e33b9d59d980e179d103ff31c
-	b2sums = 1ef51ab6bacfecc731541531f3dacf0f17cea5b1b4be9dde5b313cd0f61e463b4d21d81f3b7ffac30d108ce0ece34b1407b8018585662fbbcd5dd2899eb5a12b
 
 pkgname = android-x86-freetype2-bootstrap
diff --git a/0004-Fix-build.patch b/0004-Fix-build.patch
deleted file mode 100644
index d7488db7832a..000000000000
--- a/0004-Fix-build.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- a/meson.build	2024-02-10 12:33:38.571741005 -0300
-+++ b/meson.build	2024-02-10 12:44:21.523784137 -0300
-@@ -279,11 +279,17 @@
-   zlib_option = 'auto'
- endif
-
-+res = run_command('python3', '-c', 'import os; print(os.environ["LIBRARY_PATH"])')
-+library_path = []
-+
-+if res.returncode() == 0
-+  library_path = res.stdout().strip().split(':')
-+endif
-+
- if zlib_option == 'auto'
-   # First try to find a system installation, otherwise fall back to
-   # the subproject.
--  zlib_dep = dependency('zlib',
--    required: false)
-+  zlib_dep = cc.find_library('z', required: false, dirs: library_path)
-   if zlib_dep.found()
-     zlib_option = 'system'
-   else
-@@ -303,8 +309,7 @@
-   zlib_dep = zlib_project.get_variable('zlib_dep')
-   ft2_deps += [zlib_dep]
- elif zlib_option == 'system'
--  zlib_dep = dependency('zlib',
--    required: true)
-+  zlib_dep = cc.find_library('z', required: true, dirs: library_path)
-   assert(zlib_dep.found(), 'Could not find system zlib installation!')
-   ftoption_command += [
-     '--enable=FT_CONFIG_OPTION_USE_ZLIB',
-@@ -316,8 +321,7 @@
- endif
-
- # BZip2 support
--bzip2_dep = cc.find_library('bz2',
--  required: get_option('bzip2'))
-+bzip2_dep = cc.find_library('bz2', required: get_option('bzip2'), dirs: library_path)
-
- if bzip2_dep.found()
-   ftoption_command += ['--enable=FT_CONFIG_OPTION_USE_BZIP2']
-@@ -326,9 +330,7 @@
- endif
-
- # PNG support
--libpng_dep = dependency('libpng',
--  required: get_option('png'),
--  fallback: 'libpng')
-+libpng_dep = cc.find_library('png', required: get_option('png'), dirs: library_path)
-
- if libpng_dep.found()
-   ftoption_command += ['--enable=FT_CONFIG_OPTION_USE_PNG']
-@@ -336,10 +338,7 @@
- endif
-
- # Harfbuzz support
--harfbuzz_dep = dependency('harfbuzz',
--  version: '>= 2.0.0',
--  required: get_option('harfbuzz'),
--  default_options: ['freetype=disabled'])
-+harfbuzz_dep = cc.find_library('harfbuzz', required: get_option('harfbuzz'), dirs: library_path)
-
- if harfbuzz_dep.found()
-   ftoption_command += ['--enable=FT_CONFIG_OPTION_USE_HARFBUZZ']
-@@ -347,8 +346,7 @@
- endif
-
- # Brotli decompression support
--brotli_dep = dependency('libbrotlidec',
--  required: get_option('brotli'))
-+brotli_dep = cc.find_library('brotlidec', required: get_option('brotli'), dirs: library_path)
-
- if brotli_dep.found()
-   ftoption_command += ['--enable=FT_CONFIG_OPTION_USE_BROTLI']
diff --git a/PKGBUILD b/PKGBUILD
index 70a7e9d165ae..c7dc109e9c24 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,14 +22,12 @@ url='https://www.freetype.org/'
 source=("https://download-mirror.savannah.gnu.org/releases/freetype/freetype-$pkgver.tar.xz"{,.sig}
         '0001-Enable-table-validation-modules.patch'
         '0002-Enable-subpixel-rendering.patch'
-        '0003-Enable-long-PCF-family-names.patch'
-        '0004-Fix-build.patch')
+        '0003-Enable-long-PCF-family-names.patch')
 b2sums=('cebc82180d9afaeb112a65ba78903d7bf7a9295a803166a033585ad2325add6023f05066852240c4665e56285345ba503b01ecd461d48f0478a8f3f56136988e'
         'SKIP'
         '2c148694e150b3faae9dc46ead824ae6d94cfe34f2918bc9066f45bab7e6b6f77b4d4b2fee00c3d466d866e1985132cea4a774dcf1bab95409b7cf55efff01e1'
         '9598d13eae0411878c1af8e5d875c3b1fc09f4e6649edfbbf3b0a819c4c585648521f0b30ffd1318f5106cfde9c899d3db70c8ffe36dac59f3f98b5fd7dab115'
-        '66deb179d1f1f4e2e35f6d50acfbacce80595d5128f5fed8c1871838c210dbf1a7173a87dd937d64997844c8f478c8f81120f71e33b9d59d980e179d103ff31c'
-        '1ef51ab6bacfecc731541531f3dacf0f17cea5b1b4be9dde5b313cd0f61e463b4d21d81f3b7ffac30d108ce0ece34b1407b8018585662fbbcd5dd2899eb5a12b')
+        '66deb179d1f1f4e2e35f6d50acfbacce80595d5128f5fed8c1871838c210dbf1a7173a87dd937d64997844c8f478c8f81120f71e33b9d59d980e179d103ff31c')
 validpgpkeys=(
   E30674707856409FF1948010BE6C3AAC63AD8E3F  # Werner Lemberg <wl@gnu.org>
 )
@@ -39,17 +37,13 @@ prepare() {
     patch -Np1 -i ../0001-Enable-table-validation-modules.patch
     patch -Np1 -i ../0002-Enable-subpixel-rendering.patch
     patch -Np1 -i ../0003-Enable-long-PCF-family-names.patch
-    patch -Np1 -i ../0004-Fix-build.patch
-
-    find . -type f -exec sed -i 's|#include <png\.h>|#include <libpng/png.h>|g' {} \;
 }
 
 build() {
     cd "${srcdir}/freetype-${pkgver}"
     source android-env ${_android_arch}
 
-    export C_INCLUDE_PATH="${ANDROID_PREFIX_INCLUDE}"
-    export LIBRARY_PATH="${ANDROID_PREFIX_LIB}"
+    export C_INCLUDE_PATH="${ANDROID_PREFIX_INCLUDE}/libpng:${ANDROID_PREFIX_INCLUDE}"
     bzip2opt=enabled
 
     # Platform specific patches