vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'restore-libpng-dev' into 'master'

Browse source 
Restore libpng-dev (fix NetSurf compilation)

See merge request redox-os/redox!1339
This commit is contained in:
Jeremy Soller 2023-05-22 01:42:17 +00:00
parent ce4ee49e7a 1d79518b6b
commit 10e7b59314
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
bootstrap.sh
View file

@ -195,7 +195,7 @@ freebsd()
archLinux() archLinux()
{ {
echo "Detected Arch Linux" 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 if [ "$1" == "qemu" ]; then
packages="$packages qemu" packages="$packages qemu"
elif [ "$1" == "virtualbox" ]; then elif [ "$1" == "virtualbox" ]; then
@ -241,6 +241,7 @@ ubuntu()
libexpat-dev \ libexpat-dev \
libfuse-dev \ libfuse-dev \
libgmp-dev \ libgmp-dev \
libpng-dev \
libhtml-parser-perl \ libhtml-parser-perl \
libtool \ libtool \
m4 \ m4 \
@ -307,7 +308,7 @@ fedora()
fi fi
fi fi
# Use rpm -q <package> to check if it's already installed # Use rpm -q <package> 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 # If the list of packages is not empty, install missing
COUNT=$(echo $PKGS | wc -w) COUNT=$(echo $PKGS | wc -w)
if [ $COUNT -ne 0 ]; then if [ $COUNT -ne 0 ]; then

1
podman/redox-base-containerfile
View file

@ -23,6 +23,7 @@ RUN apt-get update \
libhtml-parser-perl \ libhtml-parser-perl \
libtool \ libtool \
libfontconfig1-dev \ libfontconfig1-dev \
libpng-dev
m4 \ m4 \
nasm \ nasm \
pkg-config \ pkg-config \