[dbus] no absolute paths (#27036)

microsoft · Oct 9, 2022 · 4d85e16 · 4d85e16
1 parent cc11545
commit 4d85e16
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/ports/dbus/portfile.cmake b/ports/dbus/portfile.cmake
@@ -47,7 +47,14 @@ file(REMOVE_RECURSE     "${CURRENT_PACKAGES_DIR}/debug/var/"
                         "${CURRENT_PACKAGES_DIR}/share/dbus-1/services"
                         "${CURRENT_PACKAGES_DIR}/share/dbus-1/session.d"
                         "${CURRENT_PACKAGES_DIR}/share/dbus-1/system-services"
-                        "${CURRENT_PACKAGES_DIR}/share/dbus-1/system.d")
+                        "${CURRENT_PACKAGES_DIR}/share/dbus-1/system.d"
+                        "${CURRENT_PACKAGES_DIR}/share/dbus-1/system.conf"
+                        "${CURRENT_PACKAGES_DIR}/share/dbus-1/system.conf"
+                        "${CURRENT_PACKAGES_DIR}/etc")
+
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/dbus-1/session.conf" "<include ignore_missing=\"yes\">${CURRENT_PACKAGES_DIR}/etc/dbus/dbus-1/session.conf</include>" "")
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/dbus-1/session.conf" "<includedir>${CURRENT_PACKAGES_DIR}/etc/dbus/dbus-1/session.d</includedir>" "")
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/dbus-1/session.conf" "<include ignore_missing=\"yes\">${CURRENT_PACKAGES_DIR}/etc/dbus/dbus-1/session-local.conf</include>" "")
 
 file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
 set(TOOLS daemon launch monitor run-session send test-tool update-activation-environment)

diff --git a/ports/dbus/vcpkg.json b/ports/dbus/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "dbus",
   "version": "1.13.18",
-  "port-version": 1,
+  "port-version": 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
@@ -1886,7 +1886,7 @@
     },
     "dbus": {
       "baseline": "1.13.18",
-      "port-version": 1
+      "port-version": 2
     },
     "dcmtk": {
       "baseline": "3.6.7",

diff --git a/versions/d-/dbus.json b/versions/d-/dbus.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "68f92ce062e5a0bfb408087a34e1c5b7d0a8315a",
+      "version": "1.13.18",
+      "port-version": 2
+    },
     {
       "git-tree": "18e1551271c49540ec2170dcd0d770395717c7c3",
       "version": "1.13.18",