groups/231.native_packages_etc.group: drop dbus

Signed-off-by: Ørjan Malde <red@foxi.me>

2 files changed, 1 insertions, 142 deletions

diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group
index 3eb8b267..2a17b3e4 100644
--- a/groups/231.native_packages_etc.group
+++ b/groups/231.native_packages_etc.group
@@ -3,7 +3,7 @@
 #
 GROUP_TARGET="native_packages";
 NATIVE_PACKAGES_PACKAGES="$(rtl_lconcat "${NATIVE_PACKAGES_PACKAGES}" "
-apr apr_util bdwgc bmake bochs bzip2 cherokee clzip cmake cron dante dbus
+apr apr_util bdwgc bmake bochs bzip2 cherokee clzip cmake cron dante
 dosbox doomgeneric emacs enscript expat ffmpeg file gdbm geoip gettext_tiny ghostpdl
 giflib gnuchess graphicsmagick gzip hastyhex hexcurse hexer icoutils imagemagick infounzip infozip
 john lbreakout2 lcms2 less libmetalink lolcode ltris minizip mintty mlogin musl_compat musl_fts ncdu
@@ -105,11 +105,6 @@ zstd")";
 : ${PKG_DANTE_URL:=http://www.inet.no/dante/files/dante-${PKG_DANTE_VERSION}.tar.gz};
 : ${PKG_DANTE_CONFIGURE_ARGS_EXTRA:="ac_cv_func_sched_setscheduler=no --without-libwrap LIBS=-ltirpc"};
 : ${PKG_DANTE_IN_TREE:=1};
-: ${PKG_DBUS_DEPENDS:="expat"};
-: ${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 --with-x=no"};
 : ${PKG_DOSBOX_DEPENDS:="sdl1"};
 : ${PKG_DOSBOX_SHA256SUM:=c0d13dd7ed2ed363b68de615475781e891cd582e8162b5c3669137502222260a};
 : ${PKG_DOSBOX_VERSION:=0.74-3};
diff --git a/patches/dbus-1.11.20.local.patch b/patches/dbus-1.11.20.local.patch
deleted file mode 100644
index 9d53ef2a..00000000
--- a/patches/dbus-1.11.20.local.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-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 -Naur dbus-1.11.20.orig/Makefile.in dbus-1.11.20/Makefile.in
---- dbus-1.11.20.orig/Makefile.in       2017-10-03 00:46:44.000000000 -0600
-+++ dbus-1.11.20/Makefile.in    2017-12-07 10:56:37.853995935 -0700
-@@ -498,7 +498,7 @@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = dbus bus tools test doc
-+SUBDIRS = dbus bus tools doc
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = dbus-1.pc
- cmakeconfigdir = $(libdir)/cmake/DBus1
---- dbus-1.11.20/test/Makefile.in.orig	2017-10-03 06:46:45.000000000 +0000
-+++ dbus-1.11.20/test/Makefile.in	2018-10-14 20:56:47.156000000 +0000
-@@ -2288,7 +2288,7 @@
- @DBUS_ENABLE_INSTALLED_TESTS_TRUE@		$(installable_tests); }
- 
- all-local: copy-config-local uninstalled-config-local
--	$(AM_V_at)$(MKDIR_P) -m700 XDG_RUNTIME_DIR
-+	$(AM_V_at)$(MKDIR_P) -m 700 XDG_RUNTIME_DIR
- 
- copy-config-local:
- 	$(AM_V_at)$(MKDIR_P) data/valid-config-files/session.d