From aa4e27bf4f1a27e219b6c6c78a481bd417eac0a7 Mon Sep 17 00:00:00 2001 From: davidovski Date: Wed, 28 Sep 2022 12:49:10 +0100 Subject: Fixed packages for next release --- repo/binutils/binutils.xibuild | 2 +- repo/cmake/cmake.xibuild | 4 +-- repo/gcc/gcc.xibuild | 9 +++---- repo/iwd/iwd.xibuild | 2 +- repo/libnsl/libnsl.xibuild | 8 +++--- repo/libtirpc/libtirpc.xibuild | 10 +++---- repo/llvm/llvm.xibuild | 2 +- repo/meson/meson.xibuild | 45 +++++++++++++++++++++++--------- repo/openrgb/openrgb.xibuild | 3 +-- repo/perl/perl.xibuild | 32 ++++++++++++----------- repo/python-sphinx/python-sphinx.xibuild | 4 +-- repo/python/python.xibuild | 3 +-- repo/tor/tor.xibuild | 2 +- repo/xiutils/xiutils.xibuild | 2 +- 14 files changed, 71 insertions(+), 57 deletions(-) diff --git a/repo/binutils/binutils.xibuild b/repo/binutils/binutils.xibuild index 595d7b1..f7172ea 100644 --- a/repo/binutils/binutils.xibuild +++ b/repo/binutils/binutils.xibuild @@ -3,7 +3,7 @@ MAKEDEPS="make dejagnu bzip2 xz zlib zstd patch" DEPS="musl zlib libelf" -PKG_VER=2.39 +PKG_VER=2.38 SOURCE=https://ftp.gnu.org/gnu/binutils/binutils-$PKG_VER.tar.xz ADDITIONAL=" diff --git a/repo/cmake/cmake.xibuild b/repo/cmake/cmake.xibuild index 9cafa3f..fc08885 100644 --- a/repo/cmake/cmake.xibuild +++ b/repo/cmake/cmake.xibuild @@ -1,9 +1,9 @@ #!/bin/sh -MAKEDEPS="make" +MAKEDEPS="make gcc" DEPS="curl libarchive jsoncpp libuv rhash openssl" -PKG_VER=3.24.2 +PKG_VER=3.22.1 SOURCE=https://github.com/Kitware/CMake/releases/download/v$PKG_VER/cmake-$PKG_VER.tar.gz DESC="A cross-platform open-source make system" diff --git a/repo/gcc/gcc.xibuild b/repo/gcc/gcc.xibuild index 6f6ab45..33c76d4 100644 --- a/repo/gcc/gcc.xibuild +++ b/repo/gcc/gcc.xibuild @@ -1,10 +1,9 @@ #!/bin/sh -MAKEDEPS="grep make dejagnu flex" -DEPS="zstd musl binutils mpc mpfr gmp libstdc++ libgcc" +MAKEDEPS="grep make dejagnu flex zstd musl binutils mpc mpfr gmp" +DEPS="libstdc++ libgcc" - -PKG_VER=12.2.0 +PKG_VER=11.2.0 SOURCE=https://ftp.gnu.org/gnu/gcc/gcc-$PKG_VER/gcc-$PKG_VER.tar.xz ISL_VER=0.24 @@ -197,6 +196,4 @@ gcc -dumpspecs | sed -e 's@/tools@@g' \ for p in gcov gcc-ar gcc gcc-ranlib c++ g++ gcc-nm lto-dump gcov-tools gcov-dump cpp; do ln -s $TRUPLE-$p $PKG_DEST/usr/bin/$p done - - } diff --git a/repo/iwd/iwd.xibuild b/repo/iwd/iwd.xibuild index f1ce050..f3c73ae 100644 --- a/repo/iwd/iwd.xibuild +++ b/repo/iwd/iwd.xibuild @@ -4,7 +4,7 @@ NAME="iwd" DESC="Internet Wireless Daemon" MAKEDEPS="make " -DEPS="dbus musl readline " +DEPS="dbus openresolv wpa_supplicant" PKG_VER=1.30 SOURCE="https://mirrors.edge.kernel.org/pub/linux/network/wireless/iwd-$PKG_VER.tar.gz" diff --git a/repo/libnsl/libnsl.xibuild b/repo/libnsl/libnsl.xibuild index 8117fc9..fbc29bf 100644 --- a/repo/libnsl/libnsl.xibuild +++ b/repo/libnsl/libnsl.xibuild @@ -4,13 +4,13 @@ MAKEDEPS="make autoconf automake gettext libtirpc libtool" DEPS="intltool libtirpc musl" PKG_VER=2.0.0 -SOURCE=https://github.com/thkukuk/libnsl/archive/v$PKG_VER.tar.gz +SOURCE=https://github.com/thkukuk/libnsl/releases/download/v$PKG_VER/libnsl-$PKG_VER.tar.xz DESC="Public client interface for NIS(YP) and NIS+ in a IPv6 ready version" -prepare () { - autoreconf -vfi -} +#prepare () { + #autoreconf -vfi +#} build () { ./configure --prefix=/usr \ diff --git a/repo/libtirpc/libtirpc.xibuild b/repo/libtirpc/libtirpc.xibuild index 0b5ad51..e3a199d 100644 --- a/repo/libtirpc/libtirpc.xibuild +++ b/repo/libtirpc/libtirpc.xibuild @@ -1,6 +1,6 @@ #!/bin/sh -MAKEDEPS="make queue-standalone" +MAKEDEPS="make queue-standalone libtool automake" DEPS="krb5" PKG_VER=1.3.3 @@ -11,15 +11,11 @@ ADDITIONAL=" https://git.alpinelinux.org/aports/plain/main/libtirpc/soname-suffix.patch " -prepare () { - apply_patches - autoreconf -fi -} - build () { ./configure --prefix=/usr \ --sysconfdir=/etc \ - --disable-static + --disable-static \ + --disable-gssapi make } diff --git a/repo/llvm/llvm.xibuild b/repo/llvm/llvm.xibuild index 896b612..9d42a9c 100644 --- a/repo/llvm/llvm.xibuild +++ b/repo/llvm/llvm.xibuild @@ -3,7 +3,7 @@ MAKEDEPS="make ninja cmake libedit libffi libxml2 ncurses python-sphinx binutils lua python-six" DEPS="perl zlib libffi libedit ncurses" -PKG_VER=15.0.0 +PKG_VER=13.0.1 SOURCE="https://github.com/llvm/llvm-project/releases/download/llvmorg-$PKG_VER/llvm-project-$PKG_VER.src.tar.xz" DESC="Low Level Virtual Machine" diff --git a/repo/meson/meson.xibuild b/repo/meson/meson.xibuild index a642b07..b3dfcf4 100644 --- a/repo/meson/meson.xibuild +++ b/repo/meson/meson.xibuild @@ -1,21 +1,42 @@ #!/bin/sh -MAKEDEPS="python" -DEPS="python ninja" +NAME="meson" +DESC="Fast and user friendly build system" -PKG_VER=0.59 -SOURCE=https://github.com/mesonbuild/meson.git -BRANCH=$PKG_VER +MAKEDEPS="python-setuptools" -DESC="High productivity build system" +PKG_VER=0.63.2 +SOURCE="https://github.com/mesonbuild/meson/releases/download/$PKG_VER/meson-$PKG_VER.tar.gz" -build () { - python setup.py build +ADDITIONAL=" +fix-ninja-output-test.patch +skip-broken-tests.patch +" + +prepare() { + apply_patches + + # https://github.com/mesonbuild/meson/issues/10104 + rm -r "$BUILD_ROOT/test cases/linuxlike/13 cmake dependency" +} + +build() { + python setup.py build } -package () { - python setup.py install --root=$PKG_DEST +check() { + MESON_CI_JOBNAME=thirdparty \ + NINJA=samu \ + NINJA_1_9_OR_NEWER=1 \ + python3 run_tests.py +} + +package() { + python setup.py install --prefix=/usr --root="$PKG_DEST" + + install -Dm644 data/shell-completions/zsh/* -t "$PKG_DEST"/usr/share/zsh/site-functions + install -Dm644 data/shell-completions/bash/* -t "$PKG_DEST"/usr/share/bash-completion/completions - install -Dm644 data/shell-completions/bash/meson $PKG_DEST/usr/share/bash-completion/completions/meson - install -Dm644 data/shell-completions/zsh/_meson $PKG_DEST/usr/share/zsh/site-functions/_meson + install -Dm0755 "$BUILD_ROOT"/meson --prefix=/usr \ + -t "$PKG_DEST"/usr/bin } diff --git a/repo/openrgb/openrgb.xibuild b/repo/openrgb/openrgb.xibuild index 4934a60..207a630 100644 --- a/repo/openrgb/openrgb.xibuild +++ b/repo/openrgb/openrgb.xibuild @@ -15,8 +15,7 @@ openrgb.post-install " prepare () { -# apply_patches -true + apply_patches } build() { diff --git a/repo/perl/perl.xibuild b/repo/perl/perl.xibuild index c8f9d01..472d7ea 100644 --- a/repo/perl/perl.xibuild +++ b/repo/perl/perl.xibuild @@ -1,9 +1,9 @@ #!/bin/sh -MAKEDEPS="make sed" +MAKEDEPS="make sed zlib bzip2" DEPS="gdbm musl bzip2 zlib tar" -PKG_VER=5.37.3 +PKG_VER=5.36.0 SOURCE=https://www.cpan.org/src/5.0/perl-$PKG_VER.tar.gz DESC="The Practical Extraction and Report Language" ADDITIONAL=" @@ -16,35 +16,37 @@ zlib-test.patch prepare () { apply_patches - export BUILD_ZLIB=False + export BUILD_ZLIB=0 export BUILD_BZIP2=0 export CF_OLD=$CFLAGS export CFLAGS="$CFLAGS -DNO_POSIX_2008_LOCALE" export CFLAGS="$CFLAGS -D_GNU_SOURCE" rm -rf cpan/Compress-Raw-Zlib/zlib-src - sed -i '/\(bzip2\|zlib\)-src/d' MANIFEST + rm -rf cpan/Compress-Raw-Bzip2/bzip2-src + sed -i '/\(bzip2\|zlib\)-src/d' MANIFEST - rm -rf cpan/Compress-Raw-Bzip2/bzip2-src - sed -i '/\(bzip2\|zzz\)-src/d' MANIFEST + sed -e 's/less -R/less/g' \ + -e 's/libswanted="\(.*\) nsl\(.*\)"/libswanted="\1\2"/g' \ + -i ./Configure +} + +build () { sh Configure -des -Dprefix=/usr \ -Dvendorprefix=/usr \ - -Dprivlib=/usr/lib/perl5/5.34/core_perl \ - -Darchlib=/usr/lib/perl5/5.34/core_perl \ - -Dsitelib=/usr/lib/perl5/5.34/site_perl \ - -Dsitearch=/usr/lib/perl5/5.34/site_perl \ - -Dvendorlib=/usr/lib/perl5/5.34/vendor_perl \ - -Dvendorarch=/usr/lib/perl5/5.34/vendor_perl \ + -Dprivlib=/usr/lib/perl5/${PKG_VER%.*}/core_perl \ + -Darchlib=/usr/lib/perl5/${PKG_VER%.*}/core_perl \ + -Dsitelib=/usr/lib/perl5/${PKG_VER%.*}/site_perl \ + -Dsitearch=/usr/lib/perl5/${PKG_VER%.*}/site_perl \ + -Dvendorlib=/usr/lib/perl5/${PKG_VER%.*}/vendor_perl \ + -Dvendorarch=/usr/lib/perl5/${PKG_VER%.*}/vendor_perl \ -Dman1dir=/usr/share/man/man1 \ -Dman3dir=/usr/share/man/man3 \ -Dpager="/usr/bin/less -isR" \ -Duseshrplib \ -Dusethreads \ -Dcccdlflags='-fPIC' -Dccdlflags='-rdynamic' -} - -build () { make } diff --git a/repo/python-sphinx/python-sphinx.xibuild b/repo/python-sphinx/python-sphinx.xibuild index 0f97c99..1bfaf8c 100644 --- a/repo/python-sphinx/python-sphinx.xibuild +++ b/repo/python-sphinx/python-sphinx.xibuild @@ -1,7 +1,7 @@ #!/bin/sh -MAKEDEPS="python" -DEPS="python-sphinxcontrib-applehelp python-sphinxcontrib-devhelp python-sphinxcontrib-htmlhelp python-sphinxcontrib-serializinghtml python-sphinxcontrib-qthelp python-Jinja2 python-docutils python-snowballstemmer python-babel python-alabaster python-imagesize python-requests python-packaging python-html5lib" +MAKEDEPS="python python-setuptools" +DEPS="python-sphinxcontrib-applehelp python-sphinxcontrib-devhelp python-sphinxcontrib-htmlhelp python-sphinxcontrib-serializinghtml python-sphinxcontrib-qthelp python-Jinja2 python-docutils python-snowballstemmer python-babel python-alabaster python-imagesize python-requests python-packaging python-html5lib python-setuptools" PKG_VER=4.4.0 SOURCE=https://files.pythonhosted.org/packages/c9/08/c2932e66460cfbc8973928d276dc82ccde2d24b365055eeda9f0afc1951e/Sphinx-$PKG_VER.tar.gz diff --git a/repo/python/python.xibuild b/repo/python/python.xibuild index 23ab3fb..d01fe00 100644 --- a/repo/python/python.xibuild +++ b/repo/python/python.xibuild @@ -1,7 +1,6 @@ #!/bin/sh -MAKEDEPS="make autoconf automake autoconf-archive sqlite3" -DEPS="bzip2 expat gdbm libffi libnsl libxcrypt openssl zlib grep" +MAKEDEPS="make autoconf automake autoconf-archive sqlite3 expat bzip2 gdbm libffi libnsl libxcrypt openssl zlib grep" PKG_VER=3.10.7 SOURCE=https://www.python.org/ftp/python/$PKG_VER/Python-$PKG_VER.tgz diff --git a/repo/tor/tor.xibuild b/repo/tor/tor.xibuild index 39b7419..ea0cd93 100644 --- a/repo/tor/tor.xibuild +++ b/repo/tor/tor.xibuild @@ -5,7 +5,7 @@ DESC="Anonymous network connectivity" MAKEDEPS=" libcap libseccomp libevent openssl cacerts zlib xz zstd" -PKG_VER=0.4.6.12 +PKG_VER=0.4.7.9 SOURCE="https://www.torproject.org/dist/tor-$PKG_VER.tar.gz" ADDITIONAL=" diff --git a/repo/xiutils/xiutils.xibuild b/repo/xiutils/xiutils.xibuild index a5650af..59338e6 100644 --- a/repo/xiutils/xiutils.xibuild +++ b/repo/xiutils/xiutils.xibuild @@ -1,6 +1,6 @@ #!/bin/sh -MAKEDEPS="make gcc" +MAKEDEPS="make gcc libunistring" DEPS="musl sh" PKG_VER=1.8 -- cgit v1.2.1