From 1d79518b6b0f748fd0149bb7e4495b4df8d9a8e0 Mon Sep 17 00:00:00 2001 From: Ribbon Date: Mon, 22 May 2023 01:04:28 +0000 Subject: [PATCH] Restore libpng-dev --- bootstrap.sh | 5 +++-- podman/redox-base-containerfile | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/bootstrap.sh b/bootstrap.sh index a2fdd6c..a06497f 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -195,7 +195,7 @@ freebsd() archLinux() { echo "Detected Arch Linux" - packages="cmake fuse git gperf perl-html-parser nasm wget texinfo bison flex po4a autoconf curl file expat gmp libtool m4 pkgconf po4a syslinux meson python python-mako make xdg-utils zip unzip llvm clang perl doxygen" + packages="cmake fuse git gperf perl-html-parser nasm wget texinfo bison flex po4a autoconf curl file expat gmp libtool libpng m4 pkgconf po4a syslinux meson python python-mako make xdg-utils zip unzip llvm clang perl doxygen" if [ "$1" == "qemu" ]; then packages="$packages qemu" elif [ "$1" == "virtualbox" ]; then @@ -241,6 +241,7 @@ ubuntu() libexpat-dev \ libfuse-dev \ libgmp-dev \ + libpng-dev \ libhtml-parser-perl \ libtool \ m4 \ @@ -307,7 +308,7 @@ fedora() fi fi # Use rpm -q to check if it's already installed - PKGS=$(for pkg in file autoconf vim bison flex genisoimage gperf glibc-devel.i686 expat expat-devel fuse-devel fuse3-devel gmp-devel perl perl-HTML-Parser libtool m4 nasm po4a syslinux texinfo ninja-build meson python3-mako make gcc gcc-c++ openssl patch automake perl-Pod-Html perl-FindBin gperf curl gettext-devel perl-Pod-Xhtml pkgconf-pkg-config cmake llvm zip unzip lua luajit make clang doxygen ; do rpm -q $pkg > /dev/null || echo $pkg; done) + PKGS=$(for pkg in file autoconf vim bison flex genisoimage gperf glibc-devel.i686 expat expat-devel fuse-devel fuse3-devel gmp-devel libpng-devel perl perl-HTML-Parser libtool m4 nasm po4a syslinux texinfo ninja-build meson python3-mako make gcc gcc-c++ openssl patch automake perl-Pod-Html perl-FindBin gperf curl gettext-devel perl-Pod-Xhtml pkgconf-pkg-config cmake llvm zip unzip lua luajit make clang doxygen ; do rpm -q $pkg > /dev/null || echo $pkg; done) # If the list of packages is not empty, install missing COUNT=$(echo $PKGS | wc -w) if [ $COUNT -ne 0 ]; then diff --git a/podman/redox-base-containerfile b/podman/redox-base-containerfile index d5d80f9..eb3c7d4 100644 --- a/podman/redox-base-containerfile +++ b/podman/redox-base-containerfile @@ -23,6 +23,7 @@ RUN apt-get update \ libhtml-parser-perl \ libtool \ libfontconfig1-dev \ + libpng-dev m4 \ nasm \ pkg-config \