1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00

Merge pull request #1407 from wstrm/fix-arch-zst

Change to .tar.zst archives that latest Arch devtools uses
This commit is contained in:
Michael Vetter 2020-07-20 11:31:13 +02:00 committed by GitHub
commit c5c969a929
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -34,17 +34,23 @@ RUN useradd -mb /usr/src --shell=/bin/false aur && usermod -L aur
USER aur USER aur
WORKDIR /usr/src/aur WORKDIR /usr/src/aur
# NOTE: These will change their extension to .tar.zst if a new snapshot is built
# due to:
# https://www.archlinux.org/news/now-using-zstandard-instead-of-xz-for-package-compression/
RUN wget https://aur.archlinux.org/cgit/aur.git/snapshot/libstrophe-git.tar.gz RUN wget https://aur.archlinux.org/cgit/aur.git/snapshot/libstrophe-git.tar.gz
RUN wget https://aur.archlinux.org/cgit/aur.git/snapshot/libsignal-protocol-c.tar.gz RUN wget https://aur.archlinux.org/cgit/aur.git/snapshot/libsignal-protocol-c.tar.gz
RUN tar -zxvf libstrophe-git.tar.gz RUN tar -zxvf libstrophe-git.tar.gz
RUN tar -zxvf libsignal-protocol-c.tar.gz RUN tar -zxvf libsignal-protocol-c.tar.gz
RUN pushd libstrophe-git && makepkg && popd RUN pushd libstrophe-git && makepkg && popd
RUN pushd libsignal-protocol-c && makepkg && popd RUN pushd libsignal-protocol-c && makepkg && popd
USER root USER root
RUN pacman -U --noconfirm libstrophe-git/libstrophe-git-*.pkg.tar.xz RUN pacman -U --noconfirm libstrophe-git/libstrophe-git-*.pkg.tar.zst
RUN pacman -U --noconfirm libsignal-protocol-c/libsignal-protocol-c-*.pkg.tar.xz RUN pacman -U --noconfirm libsignal-protocol-c/libsignal-protocol-c-*.pkg.tar.zst
WORKDIR /usr/src WORKDIR /usr/src
RUN git clone git://github.com/boothj5/stabber.git RUN git clone git://github.com/boothj5/stabber.git