Merge branch 't/29424/slackware__system_packages_fix' into t/29341/optional-test-9.1.rc0

Matthias Koeppe · Matthias Koeppe · commit 5fe653823f72 · 2020-04-18T11:55:15.000-07:00
diff --git a/build/pkgs/libgd/distros/slackware.txt b/build/pkgs/libgd/distros/slackware.txt
@@ -1 +1,3 @@
 gd
+# shared library dependencies of gd
+fontconfig libXpm libX11 libxcb libXau libXdmcp
diff --git a/build/pkgs/libpng/distros/slackware.txt b/build/pkgs/libpng/distros/slackware.txt
@@ -0,0 +1 @@
+libpng
diff --git a/build/pkgs/slackware-bootstrap.txt b/build/pkgs/slackware-bootstrap.txt
@@ -1,6 +1,4 @@
-# Packages needed for ./bootstrap
-gettext-tools
+# Additional packages needed for ./bootstrap
 autoconf
 automake
 libtool
-pkg-config
diff --git a/build/pkgs/slackware.txt b/build/pkgs/slackware.txt
@@ -11,3 +11,7 @@ python-2.7
 flex
 # for https upstream_url downloads
 ca-certificates
+pkg-config
+gettext-tools
+libcroco         # gettext dependency (msgfmt)
+libxml2

Original file line number	Diff line number	Diff line change
`@@ -1 +1,3 @@`
`1`	`1`	`gd`
	`2`	`+# shared library dependencies of gd`
	`3`	`+fontconfig libXpm libX11 libxcb libXau libXdmcp`