From 42e5974e029b4910f5aa257873f0665fa53929a7 Mon Sep 17 00:00:00 2001 From: Matheus Date: Sat, 19 Sep 2026 12:52:52 -0300 Subject: [PATCH] ports: update fontconfog/freetype and add poppler --- patches/fontconfig/jinx-working-patch.patch | 31 ++++++------ recipes/fontconfig | 4 +- recipes/freetype | 2 +- recipes/poppler | 52 +++++++++++++++++++++ source-recipes/fontconfig | 6 +-- source-recipes/freetype | 4 +- source-recipes/poppler | 5 ++ 7 files changed, 83 insertions(+), 21 deletions(-) create mode 100644 recipes/poppler create mode 100644 source-recipes/poppler diff --git a/patches/fontconfig/jinx-working-patch.patch b/patches/fontconfig/jinx-working-patch.patch index 43873464..04b24aaa 100644 --- a/patches/fontconfig/jinx-working-patch.patch +++ b/patches/fontconfig/jinx-working-patch.patch @@ -1,13 +1,18 @@ -diff --git fontconfig-clean/src/fcstat.c fontconfig-workdir/src/fcstat.c -index 4f69eae..03c1b95 100644 ---- fontconfig-clean/src/fcstat.c -+++ fontconfig-workdir/src/fcstat.c -@@ -386,7 +386,7 @@ FcFStatFs (int fd, FcStatFS *statb) - # endif - # if defined(HAVE_STRUCT_STATFS_F_FSTYPENAME) - p = buf.f_fstypename; --# elif defined(__linux__) || defined (__EMSCRIPTEN__) -+# elif defined(__linux__) || defined (__EMSCRIPTEN__) || defined(__astral__) - switch (buf.f_type) - { - case 0x6969: /* nfs */ +--- a/src/fcstat.c ++++ b/src/fcstat.c +@@ -375,1 +375,1 @@ +-# elif defined(__linux__) || defined(__EMSCRIPTEN__) ++# elif defined(__linux__) || defined(__EMSCRIPTEN__) || defined(__astral__) +--- a/configure.ac ++++ b/configure.ac +@@ -26,1 +26,1 @@ +-AC_PREREQ([2.71]) ++AC_PREREQ([2.69]) +@@ -195,1 +195,0 @@ +-AC_CHECK_INCLUDES_DEFAULT +@@ -208,1 +208,0 @@ +-AX_FUNC_SNPRINTF +--- a/git.mk ++++ b/git.mk +@@ -235,1 +235,0 @@ +-all: $(srcdir)/.gitignore gitignore-recurse-maybe diff --git a/recipes/fontconfig b/recipes/fontconfig index c5a87f98..22181daf 100644 --- a/recipes/fontconfig +++ b/recipes/fontconfig @@ -1,12 +1,12 @@ name=fontconfig -revision=3 +revision=4 from_source=fontconfig imagedeps="build-essential python3 gperf" hostdeps="xgcc xbinutils pkgconfig" deps="base freetype libexpat" configure() { - ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --enable-shared --disable-static + ac_cv_va_copy=C99 ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --enable-shared --disable-static --disable-nls } build() { diff --git a/recipes/freetype b/recipes/freetype index 4ec746c1..bac55d48 100644 --- a/recipes/freetype +++ b/recipes/freetype @@ -1,5 +1,5 @@ name=freetype -revision=3 +revision=4 from_source=freetype imagedeps="gcc build-essential" hostdeps="xgcc xbinutils pkgconfig" diff --git a/recipes/poppler b/recipes/poppler new file mode 100644 index 00000000..fe6e825f --- /dev/null +++ b/recipes/poppler @@ -0,0 +1,52 @@ +name=poppler +revision=1 +from_source=poppler +imagedeps="build-essential cmake" +hostdeps="xgcc xbinutils pkgconfig libstdc++-v3" +deps="base cairo fontconfig freetype glib harfbuzz lcms libjpeg-turbo libpng openjpeg zlib" + +configure() { + cmake \ + -DPKG_CONFIG_EXECUTABLE="/usr/local/bin/x86_64-astral-pkg-config" \ + -DCMAKE_TOOLCHAIN_FILE=${base_dir}/util/cmake \ + -DCMAKE_INSTALL_PREFIX=${prefix} \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_SHARED_LIBS=ON \ + -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \ + -DENABLE_UTILS=ON \ + -DENABLE_CPP=ON \ + -DENABLE_GLIB=ON \ + -DENABLE_GOBJECT_INTROSPECTION=OFF \ + -DGLIB2_MKENUMS=/sysroot/usr/bin/glib-mkenums \ + -DENABLE_GTK_DOC=OFF \ + -DENABLE_QT5=OFF \ + -DENABLE_QT6=OFF \ + -DENABLE_BOOST=OFF \ + -DENABLE_LIBCURL=OFF \ + -DENABLE_LIBTIFF=OFF \ + -DENABLE_NSS3=OFF \ + -DENABLE_GPGME=OFF \ + -DENABLE_PGP_SIGNATURES=OFF \ + -DENABLE_ZLIB_UNCOMPRESS=OFF \ + -DENABLE_LIBJPEG=ON \ + -DENABLE_LIBOPENJPEG=ON \ + -DENABLE_LCMS=ON \ + -DENABLE_HARFBUZZ=ON \ + -DBUILD_GTK_TESTS=OFF \ + -DBUILD_QT5_TESTS=OFF \ + -DBUILD_QT6_TESTS=OFF \ + -DBUILD_CPP_TESTS=OFF \ + -DBUILD_MANUAL_TESTS=OFF \ + -DINSTALL_GLIB_DEMO=OFF \ + -DRUN_GPERF_IF_PRESENT=OFF \ + ${source_dir} +} + +build() { + make -j${parallelism} +} + +package() { + DESTDIR=${dest_dir} make install +} diff --git a/source-recipes/fontconfig b/source-recipes/fontconfig index ee947370..0d5b7fec 100644 --- a/source-recipes/fontconfig +++ b/source-recipes/fontconfig @@ -1,8 +1,8 @@ name=fontconfig -version=2.14.0 +version=2.18.3 source_method=tarball -tarball_url="https://www.freedesktop.org/software/fontconfig/release/fontconfig-${version}.tar.xz" -tarball_sha512="a5257249d031b3cd1a7b1521cd58f48d235a970020da4136a727db5407ec98e74a3776bc467d7e39f30ec664f56ff9fe39068317744a5e737a65109f7a005bfc" +tarball_url="https://gitlab.freedesktop.org/fontconfig/fontconfig/-/archive/${version}/fontconfig-${version}.tar.gz" +tarball_sha512="b3503cd7d56229ff80accae214b6e39335cb6724a36b28ca357bdd3ca749dcfb6bdda7eafe0a14b68b5fe1878bd1c363ae4526ca2aca00e9d1fb6f8fa7638282" hostdeps="autoconf automake util-macros pkgconfig libtool" prepare() { autoreconf -fvi diff --git a/source-recipes/freetype b/source-recipes/freetype index f7b1829f..432aea47 100644 --- a/source-recipes/freetype +++ b/source-recipes/freetype @@ -1,8 +1,8 @@ name=freetype -version=2.12.1 +version=2.14.3 source_method=tarball tarball_url="https://download-mirror.savannah.gnu.org/releases/freetype/freetype-${version}.tar.xz" -tarball_sha512="6482de1748dc2cc01e033d21a3b492dadb1f039d13d9179685fdcf985e24d7f587cbca4c27ed8a7fdb7d9ad59612642ac5f4db062443154753295363f45c052f" +tarball_sha512="43de86ea70b4b47f6efaae67f3440f65a24ffac29dc6d11203a9764e4f1a749ce1ba7645acd23525220b3ba12ddad8687b962b9f1254e2c0a86070854e85d5a0" hostdeps="autoconf automake libtool pkgconfig" prepare() { ./autogen.sh diff --git a/source-recipes/poppler b/source-recipes/poppler new file mode 100644 index 00000000..11a38839 --- /dev/null +++ b/source-recipes/poppler @@ -0,0 +1,5 @@ +name=poppler +version=26.09.0 +source_method=tarball +tarball_url="https://poppler.freedesktop.org/poppler-${version}.tar.xz" +tarball_sha512="c5207d7b97cfe72153b94a7b3a2634a188fcef1fc4a192a0b15b798d2c385e3dae27e10c5da36f226740baa9cf334062beb05c7d2c18de26f4d1f8a1e989e642"