vars/build.vars: adds dbus v1.11.20 (via Redfoxmoon.)

patches/dbus-1.11.20.local.patch: via Redfoxmoon.

2 files changed, 118 insertions, 1 deletions

diff --git a/patches/dbus-1.11.20.local.patch b/patches/dbus-1.11.20.local.patch
new file mode 100644
index 00000000..b2e3e21a
--- /dev/null
+++ b/patches/dbus-1.11.20.local.patch
@@ -0,0 +1,113 @@
+diff -ru dbus-1.11.20.orig/bus/Makefile.in dbus-1.11.20/bus/Makefile.in
+--- dbus-1.11.20.orig/bus/Makefile.in	2017-10-03 08:46:44.000000000 +0200
++++ dbus-1.11.20/bus/Makefile.in	2017-10-10 01:13:19.263921202 +0200
+@@ -164,8 +164,8 @@
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1)
+-dbus_daemon_DEPENDENCIES = $(top_builddir)/dbus/libdbus-1.la \
+-	$(top_builddir)/dbus/libdbus-internal.la $(am__DEPENDENCIES_1) \
++dbus_daemon_DEPENDENCIES = $(top_builddir)/dbus/libdbus-internal.la \
++	$(top_builddir)/dbus/libdbus-1.la $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_2)
+ AM_V_lt = $(am__v_lt_@AM_V@)
+ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+@@ -182,8 +182,8 @@
+ am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ dbus_daemon_launch_helper_DEPENDENCIES =  \
+-	$(top_builddir)/dbus/libdbus-1.la \
+-	$(top_builddir)/dbus/libdbus-internal.la $(am__DEPENDENCIES_3)
++	$(top_builddir)/dbus/libdbus-internal.la \
++	$(top_builddir)/dbus/libdbus-1.la $(am__DEPENDENCIES_3)
+ am__objects_4 =  \
+ 	dbus_daemon_launch_helper_test-config-loader-expat.$(OBJEXT) \
+ 	dbus_daemon_launch_helper_test-config-parser-common.$(OBJEXT) \
+@@ -196,8 +196,8 @@
+ dbus_daemon_launch_helper_test_OBJECTS =  \
+ 	$(am_dbus_daemon_launch_helper_test_OBJECTS)
+ dbus_daemon_launch_helper_test_DEPENDENCIES =  \
+-	$(top_builddir)/dbus/libdbus-1.la \
+-	$(top_builddir)/dbus/libdbus-internal.la $(am__DEPENDENCIES_3)
++	$(top_builddir)/dbus/libdbus-internal.la \
++	$(top_builddir)/dbus/libdbus-1.la $(am__DEPENDENCIES_3)
+ am__test_bus_SOURCES_DIST = activation.c activation.h \
+ 	activation-exit-codes.h apparmor.c apparmor.h audit.c audit.h \
+ 	bus.c bus.h config-loader-expat.c config-parser.c \
+@@ -223,8 +223,8 @@
+ 	$(am__objects_5)
+ test_bus_launch_helper_OBJECTS = $(am_test_bus_launch_helper_OBJECTS)
+ test_bus_launch_helper_DEPENDENCIES =  \
+-	$(top_builddir)/dbus/libdbus-1.la \
+-	$(top_builddir)/dbus/libdbus-internal.la $(am__DEPENDENCIES_3)
++	$(top_builddir)/dbus/libdbus-internal.la \
++	$(top_builddir)/dbus/libdbus-1.la $(am__DEPENDENCIES_3)
+ am_test_bus_system_OBJECTS = config-loader-expat.$(OBJEXT) \
+ 	config-parser-common.$(OBJEXT) config-parser-trivial.$(OBJEXT) \
+ 	utils.$(OBJEXT) test-system.$(OBJEXT)
+@@ -685,8 +685,8 @@
+ 	main.c
+ 
+ dbus_daemon_LDADD = \
+-	$(top_builddir)/dbus/libdbus-1.la	\
+-	$(top_builddir)/dbus/libdbus-internal.la	\
++	$(top_builddir)/dbus/libdbus-internal.la 	\
++	$(top_builddir)/dbus/libdbus-1.la		\
+ 	$(EFENCE)					\
+ 	$(DBUS_BUS_LIBS)
+ 
+@@ -709,8 +709,8 @@
+ 	$(LAUNCH_HELPER_SOURCES)
+ 
+ dbus_daemon_launch_helper_LDADD = \
++	$(top_builddir)/dbus/libdbus-internal.la \
+ 	$(top_builddir)/dbus/libdbus-1.la \
+-	$(top_builddir)/dbus/libdbus-internal.la	\
+ 	$(DBUS_LAUNCHER_LIBS)
+ 
+ dbus_daemon_launch_helper_test_SOURCES = \
+diff -ru dbus-1.11.20.orig/dbus/dbus-sysdeps.h dbus-1.11.20/dbus/dbus-sysdeps.h
+--- dbus-1.11.20.orig/dbus/dbus-sysdeps.h	2017-09-27 16:15:31.000000000 +0200
++++ dbus-1.11.20/dbus/dbus-sysdeps.h	2017-10-10 01:24:40.402809152 +0200
+@@ -53,7 +53,7 @@
+  * DBusPollFD
+  */ 
+ #ifdef HAVE_POLL
+-#include <sys/poll.h>
++#include <poll.h>
+ #endif
+ 
+ #ifdef DBUS_WINCE
+diff -ru dbus-1.11.20.orig/dbus/dbus-sysdeps-unix.c dbus-1.11.20/dbus/dbus-sysdeps-unix.c
+--- dbus-1.11.20.orig/dbus/dbus-sysdeps-unix.c	2017-10-02 10:41:48.000000000 +0200
++++ dbus-1.11.20/dbus/dbus-sysdeps-unix.c	2017-10-10 01:24:57.590686601 +0200
+@@ -69,7 +69,7 @@
+ #include <sys/uio.h>
+ #endif
+ #ifdef HAVE_POLL
+-#include <sys/poll.h>
++#include <poll.h>
+ #endif
+ #ifdef HAVE_BACKTRACE
+ #include <execinfo.h>
+diff -ru dbus-1.11.20.orig/dbus/Makefile.in dbus-1.11.20/dbus/Makefile.in
+--- dbus-1.11.20.orig/dbus/Makefile.in	2017-10-03 08:46:45.000000000 +0200
++++ dbus-1.11.20/dbus/Makefile.in	2017-10-10 00:54:28.948451539 +0200
+@@ -250,7 +250,7 @@
+ @DBUS_WIN_TRUE@am_libdbus_init_win_la_OBJECTS = dbus-init-win.lo
+ libdbus_init_win_la_OBJECTS = $(am_libdbus_init_win_la_OBJECTS)
+ @DBUS_WIN_TRUE@am_libdbus_init_win_la_rpath =
+-libdbus_internal_la_DEPENDENCIES = $(am__DEPENDENCIES_1) libdbus-1.la
++libdbus_internal_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+ am__libdbus_internal_la_SOURCES_DIST = dbus-asv-util.c dbus-asv-util.h \
+ 	dbus-auth-script.c dbus-auth-script.h dbus-auth-util.c \
+ 	dbus-credentials-util.c dbus-mainloop.c dbus-mainloop.h \
+@@ -838,7 +838,7 @@
+ 	$(dbus_res_ldflag) \
+ 	$(NULL)
+ 
+-libdbus_internal_la_LIBADD = $(LIBDBUS_LIBS) libdbus-1.la
++libdbus_internal_la_LIBADD = $(LIBDBUS_LIBS)
+ @DBUS_WIN_TRUE@AM_CXXFLAGS = \
+ @DBUS_WIN_TRUE@	$(CODE_COVERAGE_CXXFLAGS) \
+ @DBUS_WIN_TRUE@	$(NULL)
diff --git a/vars/build.vars b/vars/build.vars
index 944bf90c..37e32691 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -262,7 +262,7 @@ libksba libudns lua ncurses ncursestw ncursesw npth ruby_host shared_mime_info s
 LIB_PACKAGES_PACKAGES_X11="
 inputproto kbproto xcb_proto xproto libXau libpthread_stubs xcb xextproto xtrans libX11
 libXext freetype fontconfig renderproto Xrender libXft libICE libSM libXt libXmu libXpm
-libXaw libxkbfile pixman cairo pango atk gdk imlib2 libcaca";
+libXaw libxkbfile pixman cairo dbus pango atk gdk imlib2 libcaca";
 LIB_PACKAGES_PACKAGES_LIBS="
 cmake llvm_host";
 LIB_PACKAGES_PACKAGES="
@@ -562,6 +562,10 @@ LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_CAIRO_URL:=http://cairographics.org/snapshots/cairo-${PKG_CAIRO_VERSION}.tar.xz};
 : ${PKG_CAIRO_SHA256SUM:=5228e0a1f8fd14317f30f08f3dd72971bca432f8cdd2281d421fdcc2279de58c};
 : ${PKG_CAIRO_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_PANGO_VERSION:=1.40.11};
 : ${PKG_PANGO_SHA256SUM:=5b11140590e632739e4151cae06b8116160d59e22bf36a3ccd5df76d1cf0383e};
 : ${PKG_PANGO_URL:=http://ftp.gnome.org/pub/GNOME/sources/pango/${PKG_PANGO_VERSION%.*}/pango-${PKG_PANGO_VERSION}.tar.xz};