From bb1e3b29e8c14eaff413206163816af5285fb665 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?=
 <lucio@lucioillanes.de>
Date: Sun, 9 Feb 2020 16:22:57 +0000
Subject: vars/build.vars:dbus: moved into native_packages_deps.

---
 vars/build.vars | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'vars')

diff --git a/vars/build.vars b/vars/build.vars
index f4af19d7..281f5516 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -758,7 +758,7 @@ libjpeg_turbo tiff giflib lcms2 openjpeg libedit libffi gdbm geoip pcre
 gettext_tiny glib gzip musl_compat musl_fts libzip libpipeline libtelnet
 libevent libfetch libogg libvorbis libflac libtheora libsasl2 libshine
 libsndfile libgpg_error libassuan libfirm libgcrypt libksba libudns lua
-libxslt libtirpc npth popt file zstd rpm libsolv tdnf shared_mime_info
+libxslt libtirpc npth popt file zstd dbus rpm libsolv tdnf shared_mime_info
 sqlite3 w32api w32lib cmake qrencode tcl util_linux slang utf8proc";
 NATIVE_PACKAGES_DEPS_PREFIX="${PREFIX_NATIVE}";
 NATIVE_PACKAGES_DEPS_PYTHON="${PREFIX}/bin/python2";
@@ -793,12 +793,10 @@ NATIVE_PACKAGES_DEPS_PYTHON="${PREFIX}/bin/python2";
 : ${PKG_APR_SHA256SUM:=a67ca9fcf9c4ff59bce7f428a323c8b5e18667fdea7b0ebad47d194371b0a105};
 : ${PKG_APR_VERSION:=1.6.5};
 : ${PKG_APR_URL:=http://ftp.fau.de/apache/apr/apr-${PKG_APR_VERSION}.tar.bz2};
-: ${PKG_APR_DEPS_BASE:=apr_util};
 : ${PKG_APR_UTIL_SHA256SUM:=d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b};
 : ${PKG_APR_UTIL_VERSION:=1.6.1};
 : ${PKG_APR_UTIL_URL:=https://archive.apache.org/dist/apr/apr-util-${PKG_APR_UTIL_VERSION}.tar.bz2};
 : ${PKG_APR_UTIL_CONFIGURE_ARGS_EXTRA:="--with-apr=${BUILD_WORKDIR}/apr-native-${DEFAULT_TARGET}/obj"};
-: ${PKG_APR_UTIL_DEPS_PARENT:=apr};
 : ${PKG_APR_UTIL_INSTALL_FILES:=bin/apu-1-config=${PREFIX}/bin/${DEFAULT_TARGET}-apu-1-config};
 : ${PKG_BZIP2_SHA256SUM:=ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269};
 : ${PKG_BZIP2_VERSION:=1.0.8};
@@ -1004,6 +1002,10 @@ NATIVE_PACKAGES_DEPS_PYTHON="${PREFIX}/bin/python2";
 : ${PKG_ZSTD_CFLAGS_BUILD_EXTRA:=${NATIVE_PACKAGES_DEPS_CFLAGS_CONFIGURE}};
 : ${PKG_ZSTD_IN_TREE:=1};
 : ${PKG_ZSTD_SUBDIR:=zstd-${PKG_ZSTD_VERSION}};
+: ${PKG_DBUS_VERSION:=1.11.20};
+: ${PKG_DBUS_URL:=https://dbus.freedesktop.org/releases/dbus/dbus-${PKG_DBUS_VERSION}.tar.gz};
+: ${PKG_DBUS_SHA256SUM:=7fd9d0536f7ec2f2afc94b84d5b5487f88c464e8d47c661d8e0b54aa83974bfa};
+: ${PKG_DBUS_CONFIGURE_ARGS_EXTRA:=--disable-tests};
 : ${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};
@@ -1074,7 +1076,7 @@ util_macros xorgproto xcb_proto xtrans libpthread_stubs libXau xcb xcb_util
 xcb_util_image xcb_util_wm libX11 libXext freetype fontconfig Xrender libXft
 libXfixes libXi libXtst libICE libSM libXt libXmu libXpm libXaw libxkbfile
 libXdamage libfontenc libXfont2 libXdmcp xwin mesa glew harfbuzz fribidi libass pixman cairo
-dbus dbus_glib sdl2 pango atk at_spi2_core at_spi2_atk gdk libepoxy gtk2
+dbus_glib sdl2 pango atk at_spi2_core at_spi2_atk gdk libepoxy gtk2
 gtk3 imlib2 libcaca libxfce4util xfconf libxfce4ui sdl1";
 NATIVE_PACKAGES_DEPS_X11_PREFIX="${PREFIX_NATIVE}";
 NATIVE_PACKAGES_DEPS_X11_PYTHON="${PREFIX}/bin/python2";
@@ -1221,10 +1223,6 @@ NATIVE_PACKAGES_DEPS_X11_PYTHON="${PREFIX}/bin/python2";
 : ${PKG_HARFBUZZ_SHA256SUM:=84574e1b1f65ca694cb8fb6905309665c0368af18a312357f8ff886ee2f29563};
 : ${PKG_HARFBUZZ_CONFIGURE_ARGS_EXTRA:=--with-icu=no};
 : ${PKG_HARFBUZZ_CFLAGS_CONFIGURE_EXTRA:="-I${PREFIX_NATIVE}/include/freetype2"};
-: ${PKG_DBUS_VERSION:=1.11.20};
-: ${PKG_DBUS_URL:=https://dbus.freedesktop.org/releases/dbus/dbus-${PKG_DBUS_VERSION}.tar.gz};
-: ${PKG_DBUS_SHA256SUM:=7fd9d0536f7ec2f2afc94b84d5b5487f88c464e8d47c661d8e0b54aa83974bfa};
-: ${PKG_DBUS_CONFIGURE_ARGS_EXTRA:=--disable-tests};
 : ${PKG_DBUS_GLIB_SHA256SUM:=7ce4760cf66c69148f6bd6c92feaabb8812dee30846b24cd0f7395c436d7e825};
 : ${PKG_DBUS_GLIB_VERSION:=0.110};
 : ${PKG_DBUS_GLIB_URL:=https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PKG_DBUS_GLIB_VERSION}.tar.gz};
-- 
cgit v1.2.3