depends: add dbus, link statically

diff --git a/contrib/depends/packages/dbus.mk b/contrib/depends/packages/dbus.mk
new file mode 100644 (file)
index 0000000..d7f80dc
--- /dev/null
+++ b/contrib/depends/packages/dbus.mk
@@ -0,0 +1,32 @@
+package=dbus
+$(package)_version=1.13.2
+$(package)_download_path=https://dbus.freedesktop.org/releases/dbus
+$(package)_file_name=dbus-$($(package)_version).tar.gz
+$(package)_sha256_hash=945deb349a7e2999184827c17351c1bf93c6395b9c3ade0c91cad42cb93435b1
+$(package)_dependencies=expat
+$(package)_patches=remove-DDBUS_STATIC_BUILD.patch
+
+define $(package)_set_vars
+  $(package)_config_opts=--disable-shared --disable-maintainer-mode --disable-xml-docs --disable-doxygen-docs
+  $(package)_config_opts+=--disable-ducktype-docs
+endef
+
+define $(package)_preprocess_cmds
+  patch -p1 < $($(package)_patch_dir)/remove-DDBUS_STATIC_BUILD.patch
+endef
+
+define $(package)_config_cmds
+  $($(package)_autoconf)
+endef
+
+define $(package)_build_cmds
+  $(MAKE)
+endef
+
+define $(package)_stage_cmds
+  $(MAKE) DESTDIR=$($(package)_staging_dir) install
+endef
+
+define $(package)_postprocess_cmds
+  rm lib/*.la
+endef
\ No newline at end of file

diff --git a/contrib/depends/packages/packages.mk b/contrib/depends/packages/packages.mk
index d3a17312d25a96bb6e74d88e083b47d90c7369dd..0214305a6357980c3561b8f92387bb08ce30ba2c 100644 (file)
--- a/contrib/depends/packages/packages.mk
+++ b/contrib/depends/packages/packages.mk
@@ -10,7 +10,7 @@ darwin_native_packages = darwin_sdk native_cctools native_libtapi
 mingw32_packages =
 mingw32_native_packages =
 
-qt_linux_packages := libxcb xcb_proto libXau xproto libxkbcommon libxcb_util libxcb_util_render libxcb_util_keysyms libxcb_util_image libxcb_util_cursor libxcb_util_wm freetype fontconfig qt
+qt_linux_packages := libxcb xcb_proto libXau xproto libxkbcommon libxcb_util libxcb_util_render libxcb_util_keysyms libxcb_util_image libxcb_util_cursor libxcb_util_wm freetype fontconfig dbus qt
 qt_darwin_packages := qt
 qt_mingw32_packages := qt
 

diff --git a/contrib/depends/packages/qt.mk b/contrib/depends/packages/qt.mk
index b2d55041f4ad1dfb542953b064e55f36dc2d1107..9e6d1315c14108467154c18b69bbedd149858d4a 100644 (file)
--- a/contrib/depends/packages/qt.mk
+++ b/contrib/depends/packages/qt.mk
@@ -6,7 +6,7 @@ $(package)_file_name=qtbase-$($(package)_suffix)
 $(package)_sha256_hash=db56fa1f4303a1189fe33418d25d1924931c7aef237f89eea9de58e858eebfed
 $(package)_darwin_dependencies=native_cctools native_qt openssl
 $(package)_mingw32_dependencies=openssl native_qt native_libxkbcommon
-$(package)_linux_dependencies=openssl native_qt freetype fontconfig libxcb libxkbcommon libxcb_util libxcb_util_render libxcb_util_keysyms libxcb_util_image libxcb_util_wm libxcb_util_cursor
+$(package)_linux_dependencies=openssl native_qt freetype fontconfig libxcb libxkbcommon libxcb_util libxcb_util_render libxcb_util_keysyms libxcb_util_image libxcb_util_wm libxcb_util_cursor dbus
 $(package)_qt_libs=corelib network widgets gui plugins testlib
 $(package)_linguist_tools = lrelease lupdate lconvert
 $(package)_patches  = aarch64Toolchain.cmake
@@ -157,7 +157,7 @@ $(package)_config_opts_linux += -fontconfig
 $(package)_config_opts_linux += -no-opengl
 $(package)_config_opts_linux += -no-feature-vulkan
 $(package)_config_opts_linux += -no-feature-backtrace
-$(package)_config_opts_linux += -dbus-runtime
+$(package)_config_opts_linux += -dbus-linked
 ifneq ($(LTO),)
 $(package)_config_opts_linux += -ltcg
 endif

diff --git a/contrib/depends/patches/dbus/remove-DDBUS_STATIC_BUILD.patch b/contrib/depends/patches/dbus/remove-DDBUS_STATIC_BUILD.patch
new file mode 100644 (file)
index 0000000..f873efd
--- /dev/null
+++ b/contrib/depends/patches/dbus/remove-DDBUS_STATIC_BUILD.patch
@@ -0,0 +1,10 @@
+diff --git a/dbus-1.pc.in b/dbus-1.pc.in
+index 3581be6e..ef422589 100644
+--- a/dbus-1.pc.in
++++ b/dbus-1.pc.in
+@@ -18,4 +18,4 @@ Description: Free desktop message bus
+ Version: @VERSION@
+ Libs: -L${libdir} -ldbus-1
+ Libs.private: @LIBDBUS_LIBS@
+-Cflags: -I${includedir}/dbus-1.0 -I${libdir}/dbus-1.0/include @DBUS_STATIC_BUILD_CPPFLAGS@
++Cflags: -I${includedir}/dbus-1.0 -I${libdir}/dbus-1.0/include