diff --git a/ports/dbus/getpeereid.patch b/ports/dbus/getpeereid.patch index d946002083..9be817a525 100644 --- a/ports/dbus/getpeereid.patch +++ b/ports/dbus/getpeereid.patch @@ -2,9 +2,8 @@ diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake index 7bc789f0e..ec476d9ed 100644 --- a/cmake/ConfigureChecks.cmake +++ b/cmake/ConfigureChecks.cmake -@@ -44,6 +44,7 @@ check_include_file(sys/inotify.h DBUS_BUS_ENABLE_INOTIFY) +@@ -44,5 +44,6 @@ check_include_file(sys/inotify.h DBUS_BUS_ENABLE_INOTIFY) - check_symbol_exists(backtrace "execinfo.h" HAVE_BACKTRACE) # dbus-sysdeps.c, dbus-sysdeps-win.c check_symbol_exists(getgrouplist "grp.h" HAVE_GETGROUPLIST) # dbus-sysdeps.c +check_symbol_exists(getpeereid "sys/types.h;unistd.h" HAVE_GETPEEREID) # dbus-sysdeps.c, check_symbol_exists(getpeerucred "ucred.h" HAVE_GETPEERUCRED) # dbus-sysdeps.c, dbus-sysdeps-win.c diff --git a/ports/dbus/portfile.cmake b/ports/dbus/portfile.cmake index c9a7f2dfcc..b66c68f181 100644 --- a/ports/dbus/portfile.cmake +++ b/ports/dbus/portfile.cmake @@ -4,14 +4,13 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org/ OUT_SOURCE_PATH SOURCE_PATH REPO dbus/dbus - REF c91ca6edad658274607323a438eea7c7c6c5e392 #1.13.18 - SHA512 4dd4d369152591040ebe9f474a0ba8911d8a91546d64b1d6f7335b7fd8026bd99a8a4fe1c78b80eb2e31e9e58324d432857e2a7af1d1cb950d22b4430cc0f7ac + REF ed866a94889e13c83dc873d8b5f86a907f908456 #1.15.2 + SHA512 eca9bfabfa6e8a3bf82ecc3c36dbd038c2450aded539a6d405a2709e876ccbf5002391802f6d538a5bbc16723f0d51f059f03cb6d226b400bc032b3bbe59cf10 HEAD_REF master PATCHES cmake.dep.patch pkgconfig.patch getpeereid.patch # missing check from configure.ac - rdynamic.patch # OSX doesn't like '-Wl,--export-dynamic' ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/dbus/rdynamic.patch b/ports/dbus/rdynamic.patch deleted file mode 100644 index 34096a3ddf..0000000000 --- a/ports/dbus/rdynamic.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1c2f6ba5b..6a4c5410b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -277,8 +277,8 @@ endif() - - if(UNIX AND NOT DBUS_DISABLE_ASSERT) - # required for backtrace -- set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wl,--export-dynamic") -- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Wl,--export-dynamic") -+ set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -rdynamic") -+ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -rdynamic") - add_definitions(-DDBUS_BUILT_R_DYNAMIC) - endif() - diff --git a/ports/dbus/vcpkg.json b/ports/dbus/vcpkg.json index 70ed444b08..27ddba56f8 100644 --- a/ports/dbus/vcpkg.json +++ b/ports/dbus/vcpkg.json @@ -1,7 +1,6 @@ { "name": "dbus", - "version": "1.13.18", - "port-version": 3, + "version": "1.15.2", "description": "D-Bus specification and reference implementation, including libdbus and dbus-daemon", "homepage": "https://gitlab.freedesktop.org/dbus/dbus", "license": "AFL-2.1 OR GPL-2.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index fd7e39dc7b..175e49742e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1893,8 +1893,8 @@ "port-version": 2 }, "dbus": { - "baseline": "1.13.18", - "port-version": 3 + "baseline": "1.15.2", + "port-version": 0 }, "dcmtk": { "baseline": "3.6.7", diff --git a/versions/d-/dbus.json b/versions/d-/dbus.json index 41bba61411..d5541e518e 100644 --- a/versions/d-/dbus.json +++ b/versions/d-/dbus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1805ee4cbe77b30b7e922f8854acbd7bd3733e83", + "version": "1.15.2", + "port-version": 0 + }, { "git-tree": "64987c1349d8190e762e5e7779a8cee15e92b1ef", "version": "1.13.18",