4 files changed, 16 insertions, 13 deletions
diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group
index 07e801a8..882b52cd 100644
--- a/groups/231.native_packages_etc.group
+++ b/groups/231.native_packages_etc.group
@@ -204,7 +204,7 @@ fi;
 : ${PKG_LCMS2_SHA256SUM:=48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20};
 : ${PKG_LCMS2_VERSION:=2.9};
 : ${PKG_LCMS2_URL:=https://sourceforge.mirrorservice.org/l/lc/lcms/lcms/${PKG_LCMS2_VERSION}/lcms2-${PKG_LCMS2_VERSION}.tar.gz};
-: ${PKG_LESS_DEPENDS:="ncursesw"};
+: ${PKG_LESS_DEPENDS:="ncurses ncursesw"};
 : ${PKG_LESS_SHA256SUM:=ff165275859381a63f19135a8f1f6c5a194d53ec3187f94121ecd8ef0795fe3d};
 : ${PKG_LESS_VERSION:=551};
 : ${PKG_LESS_URL:=http://www.greenwoodsoftware.com/less/less-${PKG_LESS_VERSION}.tar.gz};
@@ -286,14 +286,16 @@ fi;
 : ${PKG_PROCPS_NG_VERSION:=3.3.15};
 : ${PKG_PROCPS_NG_URL:=https://gitlab.com/procps-ng/procps/repository/archive.tar.gz?ref=v${PKG_PROCPS_NG_VERSION}};
 : ${PKG_PROCPS_NG_CFLAGS_CONFIGURE_EXTRA:=-I${PREFIX_NATIVE}/include/ncursesw};
+: ${PKG_PROCPS_NG_IN_TREE:=1};
 : ${PKG_PROCPS_NG_MAKEFLAGS_BUILD:="LIBS=-Wl,-lncurses,-ltinfo"};
 : ${PKG_PROCPS_NG_FNAME:=procps_ng-${PKG_PROCPS_NG_VERSION}.tar.gz};
 : ${PKG_PROCPS_NG_SUBDIR:=procps-v${PKG_PROCPS_NG_VERSION}-7bb949bcba13c107fa0f45d2d0298b1ad6b6d6cc};
-: ${PKG_QEMU_DEPENDS:="curl"};
+: ${PKG_QEMU_DEPENDS:="curl pixman w32api w32lib"};
 : ${PKG_QEMU_SHA256SUM:=6a0508df079a0a33c2487ca936a56c12122f105b8a96a44374704bef6c69abfc};
 : ${PKG_QEMU_VERSION:=3.1.0};
 : ${PKG_QEMU_URL:=https://download.qemu.org/qemu-${PKG_QEMU_VERSION}.tar.xz};
-: ${PKG_QEMU_CONFIGURE_ARGS:="--host=${DEFAULT_TARGET} --prefix="" --cc=${DEFAULT_TARGET}-gcc --disable-strip"};
+: ${PKG_QEMU_CFLAGS_CONFIGURE_EXTRA:="-I${PREFIX_NATIVE}/include/w32api.ports"};
+: ${PKG_QEMU_CONFIGURE_ARGS:="--host=${DEFAULT_TARGET} --prefix= --cc=${DEFAULT_TARGET}-gcc --disable-strip"};
 : ${PKG_QPDF_DEPENDS:="libz pcre"};
 : ${PKG_QPDF_SHA256SUM:=a9fdc7e94d38fcd3831f37b6e0fe36492bf79aa6d54f8f66062cf7f9c4155233};
 : ${PKG_QPDF_VERSION:=6.0.0};
@@ -305,7 +307,7 @@ fi;
 : ${PKG_QRENCODE_VERSION:=3.4.4};
 : ${PKG_QRENCODE_URL:=https://fukuchi.org/works/qrencode/qrencode-${PKG_QRENCODE_VERSION}.tar.bz2};
 : ${PKG_QRENCODE_CONFIGURE_ARGS_EXTRA:=--disable-sdltest};
-: ${PKG_RPM_DEPENDS:="curl file libarchive libgcrypt lmdb lua popt"};
+: ${PKG_RPM_DEPENDS:="curl dbus file libarchive libgcrypt lmdb lua popt"};
 : ${PKG_RPM_SHA256SUM:=ddef45f9601cd12042edfc9b6e37efcca32814e1e0f4bb8682d08144a3e2d230};
 : ${PKG_RPM_VERSION:=4.15.1};
 : ${PKG_RPM_URL:=http://ftp.rpm.org/releases/rpm-${PKG_RPM_VERSION%.*}.x/rpm-${PKG_RPM_VERSION}.tar.bz2};
@@ -336,7 +338,7 @@ fi;
 : ${PKG_TCL_VERSION:=8.7a1};
 : ${PKG_TCL_URL:=http://kuiper.mirrorservice.org/sites/ftp.tcl.tk/pub/tcl/tcl8_7/tcl${PKG_TCL_VERSION}-src.tar.gz};
 : ${PKG_TCL_SUBDIR:=tcl${PKG_TCL_VERSION}/unix};
-: ${PKG_TDNF_DEPENDS:="curl"};
+: ${PKG_TDNF_DEPENDS:="curl libsolv"};
 : ${PKG_TDNF_SHA256SUM:=ccab50046405d8cd5d4fd5b7154686170311184e63d8bb541b2792e280fee97f};
 : ${PKG_TDNF_VERSION:=2.0.0-alpha.1};
 : ${PKG_TDNF_URL:=https://github.com/vmware/tdnf/archive/v${PKG_TDNF_VERSION}.tar.gz};
diff --git a/groups/241.native_packages_inet.group b/groups/241.native_packages_inet.group
index 416858e7..79bd6ef5 100644
--- a/groups/241.native_packages_inet.group
+++ b/groups/241.native_packages_inet.group
@@ -137,7 +137,7 @@ w3m weechat wget whois";
 : ${PKG_OPENSMTPD_URL:=https://www.opensmtpd.org/archives/opensmtpd-${PKG_OPENSMTPD_VERSION}.tar.gz}
 : ${PKG_OPENSMTPD_CONFIGURE_ARGS_EXTRA:="--with-maildir=/var/mail --with-libz=${PREFIX_NATIVE} --with-libevent=${PREFIX_NATIVE}"};
 : ${PKG_OPENSMTPD_IN_TREE:=1};
-: ${PKG_OPENSSH_DEPENDS:="libedit"};
+: ${PKG_OPENSSH_DEPENDS:="libedit libressl"};
 : ${PKG_OPENSSH_SHA256SUM:=02f5dbef3835d0753556f973cd57b4c19b6b1f6cd24c03445e23ac77ca1b93ff};
 : ${PKG_OPENSSH_VERSION:=8.1p1};
 : ${PKG_OPENSSH_URL:=http://artfiles.org/openbsd/OpenSSH/portable/openssh-${PKG_OPENSSH_VERSION}.tar.gz};
diff --git a/groups/251.native_packages_lib.group b/groups/251.native_packages_lib.group
index 2c87e5a9..5f82f67e 100644
--- a/groups/251.native_packages_lib.group
+++ b/groups/251.native_packages_lib.group
@@ -133,7 +133,7 @@ libudns libunistring libuv libvorbis libxml2 libxslt libz libzip";
 : ${PKG_LIBSNDFILE_SHA256SUM:=1ff33929f042fa333aed1e8923aa628c3ee9e1eb85512686c55092d1e5a9dfa9};
 : ${PKG_LIBSNDFILE_VERSION:=1.0.28};
 : ${PKG_LIBSNDFILE_URL:=http://www.mega-nerd.com/libsndfile/files/libsndfile-${PKG_LIBSNDFILE_VERSION}.tar.gz};
-: ${PKG_LIBSOLV_DEPENDS:="bzip2 libxml2 libz rpm"};
+: ${PKG_LIBSOLV_DEPENDS:="bzip2 libxml2 libz musl_compat rpm"};
 : ${PKG_LIBSOLV_SHA256SUM:=153eb48814ffdbac396c98126037cf45c07e2b7087a61f86eb18a75ea1ab134b};
 : ${PKG_LIBSOLV_VERSION:=0.6.34};
 : ${PKG_LIBSOLV_URL:=https://github.com/openSUSE/libsolv/archive/${PKG_LIBSOLV_VERSION}.tar.gz};
@@ -179,7 +179,7 @@ libudns libunistring libuv libvorbis libxml2 libxslt libz libzip";
 : ${PKG_LIBZ_CONFIG_CACHE_LOCAL:="${CONFIG_CACHE_GNULIB}"};
 : ${PKG_LIBZ_CONFIGURE_ARGS:="--host=${DEFAULT_TARGET} --prefix= --target=${DEFAULT_TARGET} --enable-shared"};
 : ${PKG_LIBZ_MAKEFLAGS_INSTALL:="PREFIX= prefix="};
-: ${PKG_LIBZIP_DEPENDS:="bzip2 musl_fts"};
+: ${PKG_LIBZIP_DEPENDS:="bzip2 libz musl_fts"};
 : ${PKG_LIBZIP_SHA256SUM:=a6cd804b4b3cffd997bd563fec693eb7eb052c225909a98a620689c2befb699b};
 : ${PKG_LIBZIP_VERSION:=1.6.0};
 : ${PKG_LIBZIP_URL:=https://libzip.org/download/libzip-${PKG_LIBZIP_VERSION}.tar.xz};
diff --git a/groups/261.native_packages_x11.group b/groups/261.native_packages_x11.group
index f1750519..7f43310e 100644
--- a/groups/261.native_packages_x11.group
+++ b/groups/261.native_packages_x11.group
@@ -15,14 +15,14 @@ xterm xtrans xwd xwin";
 : ${PKG_ATK_VERSION:=2.26.0};
 : ${PKG_ATK_SHA256SUM:=eafe49d5c4546cb723ec98053290d7e0b8d85b3fdb123938213acb7bb4178827};
 : ${PKG_ATK_URL:=http://ftp.gnome.org/pub/gnome/sources/atk/${PKG_ATK_VERSION%.*}/atk-${PKG_ATK_VERSION}.tar.xz};
-: ${PKG_AT_SPI2_ATK_DEPENDS:="atk dbus glib libXtst"};
+: ${PKG_AT_SPI2_ATK_DEPENDS:="atk at_spi2_core dbus glib libXtst"};
 : ${PKG_AT_SPI2_ATK_VERSION:=2.26.1};
 : ${PKG_AT_SPI2_ATK_SHA256SUM:=b4f0c27b61dbffba7a5b5ba2ff88c8cee10ff8dac774fa5b79ce906853623b75};
 : ${PKG_AT_SPI2_ATK_URL:=https://download.gnome.org/sources/at-spi2-atk/${PKG_AT_SPI2_ATK_VERSION%.*}/at-spi2-atk-${PKG_AT_SPI2_ATK_VERSION}.tar.xz};
 : ${PKG_AT_SPI2_CORE_VERSION:=2.26.2};
 : ${PKG_AT_SPI2_CORE_SHA256SUM:=c80e0cdf5e3d713400315b63c7deffa561032a6c37289211d8afcfaa267c2615};
 : ${PKG_AT_SPI2_CORE_URL:=https://download.gnome.org/sources/at-spi2-core/${PKG_AT_SPI2_CORE_VERSION%.*}/at-spi2-core-${PKG_AT_SPI2_CORE_VERSION}.tar.xz};
-: ${PKG_CAIRO_DEPENDS:="fontconfig freetype ghostscript libXext libpng pixman"};
+: ${PKG_CAIRO_DEPENDS:="fontconfig freetype ghostscript glib libXext libpng pixman"};
 : ${PKG_CAIRO_VERSION:=1.15.6};
 : ${PKG_CAIRO_URL:=http://cairographics.org/snapshots/cairo-${PKG_CAIRO_VERSION}.tar.xz};
 : ${PKG_CAIRO_SHA256SUM:=5228e0a1f8fd14317f30f08f3dd72971bca432f8cdd2281d421fdcc2279de58c};
@@ -45,7 +45,7 @@ xterm xtrans xwd xwin";
 : ${PKG_FRIBIDI_SHA256SUM:=6a64f2a687f5c4f203a46fa659f43dd43d1f8b845df8d723107e8a7e6158e4ce};
 : ${PKG_FRIBIDI_VERSION:=1.0.5};
 : ${PKG_FRIBIDI_URL:=https://github.com/fribidi/fribidi/releases/download/v${PKG_FRIBIDI_VERSION}/fribidi-${PKG_FRIBIDI_VERSION}.tar.bz2};
-: ${PKG_GDK_DEPENDS:="libjpeg_turbo shared_mime_info tiff"};
+: ${PKG_GDK_DEPENDS:="libjpeg_turbo libpng shared_mime_info tiff"};
 : ${PKG_GDK_VERSION:=2.36.10};
 : ${PKG_GDK_SHA256SUM:=f8f6fa896b89475c73b6e9e8d2a2b062fc359c4b4ccb8e96470d6ab5da949ace};
 : ${PKG_GDK_URL:=http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/${PKG_GDK_VERSION%.*}/gdk-pixbuf-${PKG_GDK_VERSION}.tar.xz};
@@ -64,7 +64,7 @@ xterm xtrans xwd xwin";
 : ${PKG_GTK2_URL:=http://ftp.gnome.org/pub/gnome/sources/gtk+/${PKG_GTK2_VERSION%.*}/gtk+-${PKG_GTK2_VERSION}.tar.xz};
 : ${PKG_GTK2_CFLAGS_CONFIGURE_EXTRA:="-I${PREFIX_NATIVE}/include/freetype2 -I${PREFIX_NATIVE}/include/pango-1.0 -I${PREFIX_NATIVE}/include/gdk-pixbuf-2.0 -I${PREFIX_NATIVE}/include/atk-1.0 -I${PREFIX_NATIVE}/include/cairo -I${PREFIX_NATIVE}/include/glib-2.0 -I${PREFIX_NATIVE}/include/glib-2.0/gio -I${PREFIX_NATIVE}/lib/glib-2.0/include"};
 : ${PKG_GTK2_CONFIGURE_ARGS_EXTRA:="--disable-cups --disable-papi"};
-: ${PKG_GTK3_DEPENDS:="atk cairo freetype gdk glib harfbuzz pango"};
+: ${PKG_GTK3_DEPENDS:="atk cairo fontconfig freetype gdk glib harfbuzz libepoxy libX11 libXext bXfixes libXi pango"};
 : ${PKG_GTK3_SHA256SUM:=d299612b018cfed7b2c689168ab52b668023708e17c335eb592260d186f15e1f};
 : ${PKG_GTK3_VERSION:=3.22.28};
 : ${PKG_GTK3_URL:=https://download.gnome.org/sources/gtk+/${PKG_GTK3_VERSION%.*}/gtk+-${PKG_GTK3_VERSION}.tar.xz};
@@ -100,6 +100,7 @@ xterm xtrans xwd xwin";
 : ${PKG_LIBFONTENC_SHA256SUM:=6fba26760ca8d5045f2b52ddf641c12cedc19ee30939c6478162b7db8b6220fb};
 : ${PKG_LIBFONTENC_VERSION:=1.1.3};
 : ${PKG_LIBFONTENC_URL:=https://x.org/releases/individual/lib/libfontenc-${PKG_LIBFONTENC_VERSION}.tar.gz};
+: ${PKG_LIBICE_DEPENDS:="xorgproto xtrans"};
 : ${PKG_LIBICE_SHA256SUM:=8f7032f2c1c64352b5423f6b48a8ebdc339cc63064af34d66a6c9aa79759e202};
 : ${PKG_LIBICE_VERSION:=1.0.9};
 : ${PKG_LIBICE_URL:=https://www.x.org/releases/individual/lib/libICE-${PKG_LIBICE_VERSION}.tar.bz2};
@@ -118,7 +119,7 @@ xterm xtrans xwd xwin";
 : ${PKG_LIBXAU_SHA256SUM:=fdd477320aeb5cdd67272838722d6b7d544887dfe7de46e1e7cc0c27c2bea4f2};
 : ${PKG_LIBXAU_VERSION:=1.0.8};
 : ${PKG_LIBXAU_URL:=https://www.x.org/releases/individual/lib/libXau-${PKG_LIBXAU_VERSION}.tar.bz2};
-: ${PKG_LIBXAW_DEPENDS:="libX11 libXext libXmu libXt"};
+: ${PKG_LIBXAW_DEPENDS:="libX11 libXext libXmu libXpm libXt xorgproto"};
 : ${PKG_LIBXAW_SHA256SUM:=8ef8067312571292ccc2bbe94c41109dcf022ea5a4ec71656a83d8cce9edb0cd};
 : ${PKG_LIBXAW_VERSION:=1.0.13};
 : ${PKG_LIBXAW_URL:=https://www.x.org/releases/individual/lib/libXaw-${PKG_LIBXAW_VERSION}.tar.bz2};