diff --git a/srcpkgs/libreoffice/patches/no-tar.patch b/srcpkgs/libreoffice/patches/no-tar.patch deleted file mode 100644 index 888ae4019c9..00000000000 --- a/srcpkgs/libreoffice/patches/no-tar.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/bin/unpack-sources -+++ b/bin/unpack-sources -@@ -78,8 +78,8 @@ for tarball in $tarballs ; do - if ! mkdir -p "$lo_src_dir/$tarname" ; then - echo "Error: could not create directory $lo_src_dir/$tarname" - fi -- echo tar -xf "$tarball" -C "$lo_src_dir/$tarname" --strip-components=1 -- if ! tar -xf "$tarball" -C "$lo_src_dir/$tarname" --strip-components=1; then -+ echo bsdtar -xf "$tarball" -C "$lo_src_dir/$tarname" --strip-components=1 -+ if ! bsdtar -xf "$tarball" -C "$lo_src_dir/$tarname" --strip-components=1; then - echo "Error: could not unpack $tarname" - exit 1 - fi diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template index 90716364482..b044d0b4e34 100644 --- a/srcpkgs/libreoffice/template +++ b/srcpkgs/libreoffice/template @@ -23,7 +23,7 @@ _xdeps="zlib-devel libjpeg-turbo-devel clucene-devel expat-devel xmlsec1-devel libwebp-devel fontconfig-devel libcmis-devel gobject-introspection libgirepository-devel libglib-devel" hostmakedepends="automake flex gperf hyphen icu libtool openldap which gettext - tar perl-Archive-Zip pkg-config sane unzip zip python3-setuptools + tar xz perl-Archive-Zip pkg-config sane unzip zip python3-setuptools fontforge python3-lxml qt6-base gnupg glib-devel $(vopt_if java 'openjdk17 apache-ant beanshell rhino hsqldb1.8.0')" makedepends="$_xdeps openssl-devel libXrender-devel libbluetooth-devel