diff --git a/recipes/libs/atk/recipe.sh b/recipes/libs/atk/recipe.sh deleted file mode 100644 index 7fd1786db..000000000 --- a/recipes/libs/atk/recipe.sh +++ /dev/null @@ -1,37 +0,0 @@ -VERSION="2.26.1" -TAR="https://ftp.gnome.org/pub/gnome/sources/atk/${VERSION%.*}/atk-${VERSION}.tar.xz" -BUILD_DEPENDS=(gettext glib libffi libiconv pcre) - -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" - export GLIB_GENMARSHAL="$sysroot/bin/glib-genmarshal" - ./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/atk/recipe.toml b/recipes/libs/atk/recipe.toml new file mode 100644 index 000000000..a0d1185fe --- /dev/null +++ b/recipes/libs/atk/recipe.toml @@ -0,0 +1,21 @@ +[source] +tar = "https://download.gnome.org/sources/atk/2.38/atk-2.38.0.tar.xz" +blake3 = "cbc1b7ba03009ee5cc0e646d8a86117e0d65bf8d105f2e8714fbde0299a8012e" +script = """ +wget -O config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false" +""" + +[build] +dependencies = [ + "gettext", + "glib", + #TODO "gobject-introspection", + "libffi", + "libiconv", + "pcre2", +] +template = "custom" +script = """ +DYNAMIC_INIT +cookbook_meson -Dintrospection=false +""" diff --git a/recipes/libs/atk/redox.patch b/recipes/libs/atk/redox.patch deleted file mode 100644 index ba4f22a7a..000000000 --- a/recipes/libs/atk/redox.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ruwN source/configure source-new/configure ---- source/configure 2017-10-20 07:00:49.000000000 -0600 -+++ source-new/configure 2019-07-16 19:45:25.127698132 -0600 -@@ -12930,8 +12930,8 @@ - - - --GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` --GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` -+#GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` -+#GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` - - -