Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
9b1491f
[dbus-cxx] add new port
luadebug Oct 2, 2025
59e757a
vdb
luadebug Oct 2, 2025
79c8780
try to get only qt5 core
luadebug Oct 2, 2025
10dbe31
vdb
luadebug Oct 2, 2025
328c1d6
Update ports/dbus-cxx/portfile.cmake
luadebug Oct 2, 2025
1ac63de
Update ports/dbus-cxx/portfile.cmake
luadebug Oct 2, 2025
1c39d17
vdb
luadebug Oct 2, 2025
d4b0d99
re
luadebug Oct 2, 2025
643a471
vdb
luadebug Oct 2, 2025
b909b83
fix
luadebug Oct 2, 2025
4820c3f
vdb
luadebug Oct 2, 2025
9b5fde7
test
luadebug Oct 2, 2025
99acc6f
vdb
luadebug Oct 2, 2025
e86d0e8
fixup
luadebug Oct 2, 2025
4996c74
vdb
luadebug Oct 2, 2025
c3f3277
Update portfile.cmake
luadebug Oct 2, 2025
3365b5b
vdb
luadebug Oct 2, 2025
00287dc
try to use cmakeconfig instead of pc
luadebug Oct 2, 2025
3b48cc4
vdb
luadebug Oct 2, 2025
d92505b
try to use cmakeconfigs only
luadebug Oct 3, 2025
81c77cc
vdb
luadebug Oct 3, 2025
5eba7aa
checkpoint
luadebug Oct 3, 2025
f8802a7
vdb
luadebug Oct 3, 2025
5fd03a3
Update create-cmakeconfig.patch
luadebug Oct 3, 2025
485dd71
vdb
luadebug Oct 3, 2025
8ebfc64
retry
luadebug Oct 3, 2025
82241f8
vdb
luadebug Oct 3, 2025
dd76bef
fixup
luadebug Oct 3, 2025
41bdbf0
vdb
luadebug Oct 3, 2025
5ab6b01
Update CMakeLists.txt
luadebug Oct 3, 2025
a89301e
fixup
luadebug Oct 3, 2025
1dd5be7
vdb
luadebug Oct 3, 2025
714841b
improve vcpkg-ci-dbus-cxx
luadebug Oct 3, 2025
973bd70
vdb
luadebug Oct 3, 2025
18eccc2
Update main.cpp
luadebug Oct 3, 2025
3d89bd1
cl
luadebug Oct 3, 2025
8ea6a34
try to get rid of gcov and finally acquire good enough cmakeconfig
luadebug Oct 3, 2025
2d5fd42
vdb
luadebug Oct 3, 2025
959c5ee
check using add_lib alias
luadebug Oct 3, 2025
9069cd6
vdb
luadebug Oct 3, 2025
acfcd42
test
luadebug Oct 3, 2025
4d4d09a
vdb
luadebug Oct 3, 2025
bb0fd02
fixup
luadebug Oct 3, 2025
a0c6df8
vdb
luadebug Oct 3, 2025
aae0b1d
retry
luadebug Oct 3, 2025
bb537c8
vdb
luadebug Oct 3, 2025
8480251
fixup
luadebug Oct 3, 2025
a8620c5
vdb
luadebug Oct 3, 2025
92fa113
fixup
luadebug Oct 3, 2025
b7e6457
vdb
luadebug Oct 3, 2025
9661198
fixup
luadebug Oct 3, 2025
74086ef
vdb
luadebug Oct 3, 2025
426d409
fixup
luadebug Oct 3, 2025
e1bf1f0
vdb
luadebug Oct 3, 2025
9dd3832
qt6 check
luadebug Oct 4, 2025
970ad64
vdb
luadebug Oct 4, 2025
7d5cd2a
Update vcpkg.json
luadebug Oct 4, 2025
48d925e
vdb
luadebug Oct 4, 2025
f4149d0
fixup
luadebug Oct 4, 2025
b141975
vdb
luadebug Oct 4, 2025
9e46379
fixup
luadebug Oct 4, 2025
8f5f78f
vdb test QT6 for https://github.com/dbus-cxx/dbus-cxx/pull/191
luadebug Oct 4, 2025
17d9e39
simplify Qt6 usage
luadebug Oct 4, 2025
f18ab28
vdb
luadebug Oct 4, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions ports/dbus-cxx/portfile.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO dbus-cxx/dbus-cxx
REF "${VERSION}"
SHA512 ad6551d03d0c7d499e9f0c6d77584e39d361a1464017be3c40c237d4c43306ad0ffb49b52c06b89cd62ec7346ebcb29f3d166a31b245fd978159e337a08ebafb
HEAD_REF master
)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
"glib" ENABLE_GLIB_SUPPORT # Build dbus-cxx with GLib module
"qt5" ENABLE_QT_SUPPORT # Build dbus-cxx with QT5 module
"libuv" ENABLE_UV_SUPPORT # Build dbus-cxx with libuv module
Comment thread
luadebug marked this conversation as resolved.
Outdated
)

if (EXISTS "${_VCPKG_INSTALLED_DIR}/${TARGET_TRIPLET}/lib/pkgconfig/libuv-static.pc")
Comment thread
luadebug marked this conversation as resolved.
Outdated
set(UV_STATIC ON)
else ()
set(UV_STATIC OFF)
endif ()

vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
${FEATURE_OPTIONS}
-DBUILD_TESTING=OFF
-DENABLE_CODE_COVERAGE_REPORT=OFF
-DENABLE_EXAMPLES=OFF
-DENABLE_TOOLS=OFF
-DBUILD_SITE=OFF
-DUV_STATIC=${UV_STATIC}
)

vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/dbus-cxx")
vcpkg_copy_pdbs()
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
44 changes: 44 additions & 0 deletions ports/dbus-cxx/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"name": "dbus-cxx",
"version": "2.6.0",
"description": "DBus-cxx provides an object-oriented interface to DBus.",
"homepage": "https://dbus-cxx.github.io/",
"license": "LGPL-3.0-or-later AND BSD-3-Clause",
"supports": "linux",
"dependencies": [
"libsigcpp",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
],
"default-features": [
"glib",
"libuv",
"qt5"
],
Comment thread
luadebug marked this conversation as resolved.
Comment on lines +19 to +23
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JavierMatosD Why is this set of default-features acceptable here and rejected in other proposal? An application wouldn't use three different dispatchers at the same time.

"use Qt, GLib, or libuv as your main event loop without requiring a new thread"

https://dbus-cxx.github.io/ > Features

And all three options are off by default upstream.
https://github.com/dbus-cxx/dbus-cxx/blob/master/CMakeLists.txt#L46-L57

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They are not acceptable. This was an oversight on my part and should not have been merged in its current form.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reverting this PR @luadebug, please reopen this PR and note we generally try to avoid using "default-features" as it was intended to only provide the minimum required for the port to be usable but default features can be difficult to disable downstream. I recommend taking a look at our docs on default features: https://learn.microsoft.com/en-us/vcpkg/concepts/default-features#role-of-default-features and its constraints https://learn.microsoft.com/en-us/vcpkg/contributing/maintainer-guide#default-features-should-enable-behaviors-not-apis

"features": {
"glib": {
"description": "Build dbus-cxx with GLib module",
"dependencies": [
"glib"
]
},
"libuv": {
"description": "Build dbus-cxx with libuv module",
"dependencies": [
"libuv"
]
},
"qt5": {
"description": "Build dbus-cxx with QT5 module",
"dependencies": [
"qt5"
]
}
}
}
5 changes: 5 additions & 0 deletions scripts/test_ports/vcpkg-ci-dbus-cxx/portfile.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
vcpkg_cmake_configure(
SOURCE_PATH "${CURRENT_PORT_DIR}/project"
)
vcpkg_cmake_build()
6 changes: 6 additions & 0 deletions scripts/test_ports/vcpkg-ci-dbus-cxx/project/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
cmake_minimum_required(VERSION 3.25.1)
project(dbus-cxx-test CXX)
set(CMAKE_CXX_STANDARD 17)
find_package (dbus-cxx REQUIRED CONFIG)
add_executable(main main.cpp)
target_link_libraries(main PRIVATE dbus-cxx::dbus-cxx)
6 changes: 6 additions & 0 deletions scripts/test_ports/vcpkg-ci-dbus-cxx/project/main.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#include <dbus-cxx.h>
int main()
{
auto connection = DBus::Connection::create(DBus::BusType::SESSION);
return 0;
}
12 changes: 12 additions & 0 deletions scripts/test_ports/vcpkg-ci-dbus-cxx/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"name": "vcpkg-ci-dbus-cxx",
"version-string": "ci",
"description": "Validates dbus-cxx",
"dependencies": [
"dbus-cxx",
{
"name": "vcpkg-cmake",
"host": true
}
]
}
4 changes: 4 additions & 0 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -2376,6 +2376,10 @@
"baseline": "1.16.2",
"port-version": 2
},
"dbus-cxx": {
"baseline": "2.6.0",
"port-version": 0
},
"dcmtk": {
"baseline": "3.6.9",
"port-version": 2
Expand Down
9 changes: 9 additions & 0 deletions versions/d-/dbus-cxx.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"versions": [
{
"git-tree": "99904d636d5ea68d7a521343463323d6490a009d",
"version": "2.6.0",
"port-version": 0
}
]
}
Loading