diff --git a/recipes/libs/pango/recipe.sh b/recipes/libs/pango/recipe.sh deleted file mode 100644 index a76a68afb..000000000 --- a/recipes/libs/pango/recipe.sh +++ /dev/null @@ -1,36 +0,0 @@ -VERSION="1.42.4" -TAR="ftp.gnome.org/pub/GNOME/sources/pango/${VERSION%.*}/pango-${VERSION}.tar.xz" -BUILD_DEPENDS=(cairo expat fontconfig freetype2 fribidi gettext glib harfbuzz libffi libiconv libpng pcre pixman zlib) - -function recipe_version { - echo "$VERSION" - skip=1 -} - -function recipe_build { - wget -O config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false" - sysroot="$(realpath ../sysroot)" - export CFLAGS="-I$sysroot/include" - export LDFLAGS="-L$sysroot/lib --static" - export GLIB_MKENUMS="$sysroot/bin/glib-mkenums" - ./configure \ - --build=${BUILD} \ - --host=${HOST} \ - --prefix=/ \ - --disable-shared \ - --enable-static - "$REDOX_MAKE" -j"$($NPROC)" - skip=1 -} - -function recipe_clean { - "$REDOX_MAKE" clean - skip=1 -} - -function recipe_stage { - dest="$(realpath $1)" - "$REDOX_MAKE" DESTDIR="$dest" install - rm -f "$dest/lib/"*.la - skip=1 -} diff --git a/recipes/libs/pango/recipe.toml b/recipes/libs/pango/recipe.toml new file mode 100644 index 000000000..eaf03af80 --- /dev/null +++ b/recipes/libs/pango/recipe.toml @@ -0,0 +1,31 @@ +[source] +tar="https://download.gnome.org/sources/pango/1.56/pango-1.56.3.tar.xz" +blake3 = "78542feaaf007c1d648b94c4e9b6655ed7515d27ce434766aea99bef886c21ac" +patches = ["redox.patch"] + +[build] +dependencies = [ + "cairo", + "expat", + "fontconfig", + "freetype2", + "fribidi", + "gettext", + "glib", + "harfbuzz", + "libffi", + "libiconv", + "libpng", + "pcre", + "pixman", + "zlib", +] +template = "custom" +script = """ +DYNAMIC_INIT +#TODO: why are these libs not automatic? +cookbook_meson \ + -Dc_args="-lfontconfig -lexpat -lpixman-1 -lpng -lz" \ + -Dbuild-examples=false \ + -Dbuild-testsuite=false +""" diff --git a/recipes/libs/pango/redox.patch b/recipes/libs/pango/redox.patch index d6a96c33b..d04c9538d 100644 --- a/recipes/libs/pango/redox.patch +++ b/recipes/libs/pango/redox.patch @@ -1,12 +1,14 @@ -diff -ruwN source/configure source-new/configure ---- source/configure 2015-10-12 13:14:13.000000000 -0600 -+++ source-new/configure 2019-07-16 17:31:27.949906081 -0600 -@@ -19323,7 +19323,7 @@ - fi +diff -ruwN pango-1.56.3/meson.build source/meson.build +--- pango-1.56.3/meson.build 2025-03-16 05:45:47.000000000 -0600 ++++ source/meson.build 2025-05-01 13:51:05.834742120 -0600 +@@ -551,8 +551,8 @@ + pango_inc = include_directories('pango') - # Setup GLIB_MKENUMS to use glib-mkenums even if GLib is uninstalled. --GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` -+#GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` - - - # + subdir('pango') +-subdir('utils') +-subdir('tools') ++#TODO: fails to build on Redox: subdir('utils') ++#TODO: fails to build on Redox: subdir('tools') + subdir('docs') + if get_option('build-testsuite') + subdir('tests')