Skip to content

Commit 4aad102

Browse files
committed
Fix checking of libraries (and return missing ones) & Update libpng
1 parent 3ce846f commit 4aad102

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

static/ensure_deps.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ GIFLIB_VERSION=4.2.3
99
GLIB_VERSION=2.50.2
1010
HARFBUZZ_VERSION=1.4.2
1111
LIBJPEG_VERSION=1.2.1
12-
LIBPNG_VERSION=1.2.56
12+
LIBPNG_VERSION=1.6.37
1313
PANGO_VERSION=1.40.3
1414
PIXMAN_VERSION=0.32.6
1515
ZLIB_VERSION=1.2.11
@@ -23,7 +23,7 @@ GIFLIB_URL=http://sourceforge.net/projects/giflib/files/giflib-4.x/giflib-$GIFLI
2323
GLIB_URL=https://download.gnome.org/sources/glib/2.50/glib-$GLIB_VERSION.tar.xz
2424
HARFBUZZ_URL=https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-$HARFBUZZ_VERSION.tar.bz2
2525
LIBJPEG_URL=http://downloads.sourceforge.net/project/libjpeg-turbo/$LIBJPEG_VERSION/libjpeg-turbo-$LIBJPEG_VERSION.tar.gz
26-
LIBPNG_URL=http://sourceforge.net/projects/libpng/files/libpng12/$LIBPNG_VERSION/libpng-$LIBPNG_VERSION.tar.xz
26+
LIBPNG_URL=http://sourceforge.net/projects/libpng/files/libpng16/$LIBPNG_VERSION/libpng-$LIBPNG_VERSION.tar.xz
2727
PANGO_URL=http://ftp.gnome.org/pub/GNOME/sources/pango/1.40/pango-$PANGO_VERSION.tar.xz
2828
PIXMAN_URL=http://cairographics.org/releases/pixman-$PIXMAN_VERSION.tar.gz
2929
ZLIB_URL=https://sourceforge.net/projects/libpng/files/zlib/$ZLIB_VERSION/zlib-$ZLIB_VERSION.tar.gz

util/has_lib.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ function hasLdconfig () {
6565
try {
6666
// Add /sbin to path as ldconfig is located there on some systems -- e.g.
6767
// Debian (and it can still be used by unprivileged users):
68-
childProcess.execSync('export PATH="$PATH:/sbin"')
69-
process.env.PATH = '...'
68+
execSync('export PATH="$PATH:/sbin"')
69+
// process.env.PATH = '...'
7070
// execSync throws on nonzero exit
71-
childProcess.execSync('hash ldconfig 2>/dev/null')
71+
execSync('hash ldconfig 2>/dev/null')
7272
return true
7373
} catch (err) {
7474
return false
@@ -96,7 +96,7 @@ function hasPkgconfigLib (lib) {
9696
function main (query) {
9797
if (!query) {
9898
for (var libname of ['gif', 'jpeg', 'cairo', 'pango', 'freetype', 'rsvg']) {
99-
if (!main(libname)) return false
99+
if (!main(libname)) return libname
100100
}
101101

102102
return true

0 commit comments

Comments
 (0)