Conan/conan-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[DO-981] fix qt package info (!17)

Browse Source 
Co-authored-by: aleksandr.vodyanov <aleksandr.vodyanov@avroid.tech>
Reviewed-on: https://git.avroid.tech/Conan/conan_build/pulls/17
This commit is contained in:
Aleksandr Vodyanov
2025-02-25 14:03:04 +03:00
parent a82e89a1bc
commit d0bb8ff38d
18 changed files with 421 additions and 663 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
recipes/dbus/all/conandata.yml Normal file
View File

@@ -0,0 +1,29 @@
sources:
"1.15.8":
url: "https://nexus.avroid.tech/repository/all-raw-proxy-dbus_freedesktop_org/releases/dbus/dbus-1.15.8.tar.xz"
sha256: "84fc597e6ec82f05dc18a7d12c17046f95bad7be99fc03c15bc254c4701ed204"
"1.15.6":
url: "https://nexus.avroid.tech/repository/all-raw-proxy-dbus_freedesktop_org/releases/dbus/dbus-1.15.6.tar.xz"
sha256: "f97f5845f9c4a5a1fb3df67dfa9e16b5a3fd545d348d6dc850cb7ccc9942bd8c"
"1.15.2":
url: "https://nexus.avroid.tech/repository/all-raw-proxy-dbus_freedesktop_org/releases/dbus/dbus-1.15.2.tar.xz"
sha256: "7e640803084af59f5e477b7ded11fd888b5380910a895c51ca3aedd63c0626ca"
"1.15.0":
url: "https://nexus.avroid.tech/repository/all-raw-proxy-dbus_freedesktop_org/releases/dbus/dbus-1.15.0.tar.xz"
sha256: "5073c8cb9ad20226647bb38f4965182b762a6e1f595ccdc8e59411014bfd640a"
patches:
"1.15.8":
- patch_file: "patches/0001-meson-Use-check_header-to-confirm-headers-work.patch"
patch_type: "portability"
patch_description: "Fix build with Visual Studio 2022"
patch_source: "https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/454"
"1.15.2":
- patch_file: "patches/0003-meson-monotonic-clock-check.patch"
patch_type: "portability"
patch_description: "Fix detection of necessary monotonic clock functions in pthread"
patch_source: "https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/352"
"1.15.0":
- patch_file: "patches/0003-meson-monotonic-clock-check.patch"
patch_type: "portability"
patch_description: "Fix detection of necessary monotonic clock functions in pthread"
patch_source: "https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/352"

224
recipes/dbus/all/conanfile.py Normal file
View File

@@ -0,0 +1,224 @@
from conan import ConanFile
from conan.errors import ConanInvalidConfiguration
from conan.tools.apple import fix_apple_shared_install_name, is_apple_os
from conan.tools.env import VirtualBuildEnv
from conan.tools.files import apply_conandata_patches, copy, export_conandata_patches, get, rename, replace_in_file, rm, rmdir, save
from conan.tools.gnu import PkgConfigDeps
from conan.tools.layout import basic_layout
from conan.tools.meson import Meson, MesonToolchain
from conan.tools.scm import Version
import os
import textwrap
required_conan_version = ">=1.64.0 <2 || >=2.2.0"
class DbusConan(ConanFile):
name = "dbus"
# license is AFL-2.1 OR GPL-2.0-or-later with several other compatible licenses for smaller sections of code
license = "(AFL-2.1 OR GPL-2.0-or-later) AND DocumentRef-COPYING"
url = "https://github.com/conan-io/conan-center-index"
homepage = "https://www.freedesktop.org/wiki/Software/dbus"
description = "D-Bus is a simple system for interprocess communication and coordination."
topics = "bus", "interprocess", "message"
package_type = "library"
settings = "os", "arch", "compiler", "build_type"
short_paths = True
options = {
"shared": [True, False],
"fPIC": [True, False],
"dbus_user": [None, "ANY"],
"message_bus": [True, False],
"system_socket": [None, "ANY"],
"system_pid_file": [None, "ANY"],
"with_x11": [True, False],
"with_systemd": [True, False],
"with_selinux": [True, False],
"session_socket_dir": [None, "ANY"],
}
default_options = {
"shared": False,
"fPIC": True,
"dbus_user": "messagebus",
"message_bus": False,
"system_socket": None,
"system_pid_file": None,
"with_x11": False,
"with_systemd": False,
"with_selinux": False,
"session_socket_dir": "/tmp",
}
@property
def _has_message_bus_option(self):
return Version(self.version) > "1.15.2"
def export_sources(self):
export_conandata_patches(self)
def config_options(self):
if self.settings.os not in ["Linux", "FreeBSD"]:
del self.options.with_systemd
del self.options.with_x11
del self.options.with_selinux
if self.settings.os == "Windows":
del self.options.fPIC
if not self._has_message_bus_option:
self.options.rm_safe("message_bus")
def configure(self):
self.settings.rm_safe("compiler.cppstd")
self.settings.rm_safe("compiler.libcxx")
if self.options.shared:
self.options.rm_safe("fPIC")
if not self.options.get_safe("message_bus"):
self.options.rm_safe("dbus_user")
def layout(self):
basic_layout(self, src_folder="src")
def requirements(self):
self.requires("expat/[>=2.6.2 <3]")
if self.options.get_safe("with_systemd"):
self.requires("libsystemd/253.6")
if self.options.get_safe("with_selinux"):
self.requires("libselinux/3.6")
if self.options.get_safe("with_x11"):
# X11 is only linked into an executable and should not be propagated as a library dependency.
# It should still be provided in a VirtualRunEnv context, though,
# but Conan as of v2.2 does not yet provide a fine-grained enough control over this.
self.requires("xorg/system", visible=False)
def package_id(self):
# The dbus_user option only effects the installation of dbus during the package method.
# Otherwise, it only appears in the system.conf file in the package.
self.info.options.rm_safe("dbus_user")
def validate(self):
if self.settings.compiler == "gcc" and Version(self.settings.compiler.version) < 7:
raise ConanInvalidConfiguration(f"{self.ref} requires at least gcc 7.")
def build_requirements(self):
self.tool_requires("meson/[>=1.4.0]")
if not self.conf.get("tools.gnu:pkg_config",check_type=str):
self.tool_requires("pkgconf/[>=2.1.0]")
def source(self):
get(self, **self.conan_data["sources"][self.version], strip_root=True)
def generate(self):
env = VirtualBuildEnv(self)
env.generate()
tc = MesonToolchain(self)
tc.project_options["asserts"] = not is_apple_os(self)
tc.project_options["checks"] = False
tc.project_options["datadir"] = os.path.join("res", "share")
tc.project_options["sysconfdir"] = os.path.join("res", "etc")
tc.project_options["doxygen_docs"] = "disabled"
tc.project_options["ducktype_docs"] = "disabled"
tc.project_options["qt_help"] = "disabled"
tc.project_options["modular_tests"] = "disabled"
tc.project_options["selinux"] = "enabled" if self.options.get_safe("with_selinux") else "disabled"
if self.options.session_socket_dir:
tc.project_options["session_socket_dir"] = str(self.options.session_socket_dir)
tc.project_options["systemd"] = "enabled" if self.options.get_safe("with_systemd") else "disabled"
if self.options.get_safe("with_systemd"):
tc.project_options["systemd_system_unitdir"] = "/res/lib/systemd/system"
tc.project_options["systemd_user_unitdir"] = "/res/usr/lib/systemd/system"
if self._has_message_bus_option:
tc.project_options["message_bus"] = bool(self.options.message_bus)
if self.options.get_safe("dbus_user"):
tc.project_options["dbus_user"] = str(self.options.dbus_user)
if self.options.system_pid_file:
tc.project_options["system_pid_file"] = str(self.options.system_pid_file)
if self.options.system_socket:
tc.project_options["system_socket"] = str(self.options.system_socket)
if is_apple_os(self):
tc.project_options["launchd_agent_dir"] = os.path.join("res", "LaunchAgents")
tc.project_options["x11_autolaunch"] = "enabled" if self.options.get_safe("with_x11") else "disabled"
tc.project_options["xml_docs"] = "disabled"
tc.generate()
deps = PkgConfigDeps(self)
deps.generate()
def _patch_sources(self):
apply_conandata_patches(self)
replace_in_file(self, os.path.join(self.source_folder, "meson.build"),
"subdir('test')", "# subdir('test')")
def build(self):
self._patch_sources()
meson = Meson(self)
meson.configure()
meson.build()
def package(self):
copy(self, "COPYING", self.source_folder, os.path.join(self.package_folder, "licenses"))
copy(self, "*", os.path.join(self.source_folder, "LICENSES"), os.path.join(self.package_folder, "licenses"))
meson = Meson(self)
meson.install()
rm(self, "*.pdb", os.path.join(self.package_folder, "bin"))
rmdir(self, os.path.join(self.package_folder, "res", "share", "doc"))
rmdir(self, os.path.join(self.package_folder, "lib", "cmake"))
rmdir(self, os.path.join(self.package_folder, "lib", "pkgconfig"))
fix_apple_shared_install_name(self)
if self.settings.os == "Windows" and not self.options.shared:
rename(self, os.path.join(self.package_folder, "lib", "libdbus-1.a"), os.path.join(self.package_folder, "lib", "dbus-1.lib"))
# TODO: to remove in conan v2 once cmake_find_package_* generators removed
self._create_cmake_module_alias_targets(
os.path.join(self.package_folder, self._module_file_rel_path),
{"dbus-1": "dbus-1::dbus-1"}
)
def _create_cmake_module_alias_targets(self, module_file, targets):
content = ""
for alias, aliased in targets.items():
content += textwrap.dedent(f"""\
if(TARGET {aliased} AND NOT TARGET {alias})
add_library({alias} INTERFACE IMPORTED)
set_property(TARGET {alias} PROPERTY INTERFACE_LINK_LIBRARIES {aliased})
endif()
""")
save(self, module_file, content)
@property
def _module_file_rel_path(self):
return os.path.join("lib", "cmake", f"conan-official-{self.name}-targets.cmake")
def package_info(self):
self.cpp_info.set_property("cmake_file_name", "DBus1")
self.cpp_info.set_property("cmake_target_name", "dbus-1")
self.cpp_info.set_property("pkg_config_name", "dbus-1")
self.cpp_info.includedirs.extend([
os.path.join("include", "dbus-1.0"),
os.path.join("lib", "dbus-1.0", "include"),
])
self.cpp_info.resdirs = ["res"]
self.cpp_info.libs = ["dbus-1"]
if self.settings.os == "Linux":
self.cpp_info.system_libs.append("rt")
if self.settings.os == "Windows":
self.cpp_info.system_libs.extend(["iphlpapi", "ws2_32"])
else:
self.cpp_info.system_libs.append("pthread")
if not self.options.shared:
self.cpp_info.defines.append("DBUS_STATIC_BUILD")
self.cpp_info.requires.append("expat::expat")
if self.options.get_safe("with_systemd"):
self.cpp_info.requires.append("libsystemd::libsystemd")
if self.options.get_safe("with_selinux"):
self.cpp_info.requires.append("libselinux::selinux")
# TODO: to remove in conan v2 once cmake_find_package_* & pkg_config generators removed
self.cpp_info.filenames["cmake_find_package"] = "DBus1"
self.cpp_info.filenames["cmake_find_package_multi"] = "DBus1"
self.cpp_info.names["cmake_find_package"] = "dbus-1"
self.cpp_info.names["cmake_find_package_multi"] = "dbus-1"
self.cpp_info.build_modules["cmake_find_package"] = [self._module_file_rel_path]
self.cpp_info.build_modules["cmake_find_package_multi"] = [self._module_file_rel_path]
self.cpp_info.names["pkg_config"] = "dbus-1"

46
recipes/dbus/all/patches/0001-meson-Use-check_header-to-confirm-headers-work.patch Executable file
View File

@@ -0,0 +1,46 @@
From e52ccaf7c3abf9d0adccfd001c1417ce08a7f335 Mon Sep 17 00:00:00 2001
From: Thomas Sondergaard <Thomas.Sondergaard@mi.medical.canon>
Date: Thu, 4 Jan 2024 17:45:46 +0100
Subject: [PATCH] meson: Use check_header to confirm headers work
instead of using has_header use check_header to confirm the header
works. This is necessary to get the meson build to work with Visual
Studio 2022. It has <stdatomic.h> but it does not actually work when
compiling a C program. A minimal C program that include <stdatomic.h>
fails with the following errors:
C:\Program Files\Microsoft Visual Studio\2022\Professional\VC\Tools\MSVC\14.38.33130\include\vcruntime_c11_stdatomic.h(36): error C2061: syntax error: identifier 'atomic_bool'
C:\Program Files\Microsoft Visual Studio\2022\Professional\VC\Tools\MSVC\14.38.33130\include\vcruntime_c11_stdatomic.h(36): error C2059: syntax error: ';'
C:\Program Files\Microsoft Visual Studio\2022\Professional\VC\Tools\MSVC\14.38.33130\include\vcruntime_c11_stdatomic.h(37): error C2061: syntax error: identifier 'atomic_char'
C:\Program Files\Microsoft Visual Studio\2022\Professional\VC\Tools\MSVC\14.38.33130\include\vcruntime_c11_stdatomic.h(37): error C2059: syntax error: ';'
...
...
check_header is consistent with CMake's
check_include_file(stdatomic.h HAVE_STDATOMIC_H)
which is why the CMake-based build of dbus works with Visual Studio
2022, while the meson build doesn't.
Fixes #494
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 17b2a837..19b41cd9 100644
--- a/meson.build
+++ b/meson.build
@@ -705,7 +705,7 @@ check_headers = [
foreach header : check_headers
macro = 'HAVE_' + header.underscorify().to_upper()
- config.set(macro, cc.has_header(header, args: compile_args_c) ? 1 : false)
+ config.set(macro, cc.check_header(header, args: compile_args_c) ? 1 : false)
endforeach
execinfo = cc.find_library('execinfo', required: false)
--
2.43.0.windows.1

15
recipes/dbus/all/patches/0003-meson-monotonic-clock-check.patch Normal file
View File

@@ -0,0 +1,15 @@
diff --git a/meson.build b/meson.build
index 3b5b182c..4e400a52 100644
--- a/meson.build
+++ b/meson.build
@@ -328,7 +328,9 @@ data_config.set('top_builddir', meson.project_build_root())
threads = dependency('threads')
config.set(
'HAVE_MONOTONIC_CLOCK',
- cc.has_header_symbol('pthread.h', 'CLOCK_MONOTONIC', args: compile_args_c),
+ cc.has_header_symbol('pthread.h', 'CLOCK_MONOTONIC', args: compile_args_c)
+ and cc.has_header_symbol('pthread.h', 'pthread_condattr_setclock', args: compile_args_c)
+ and cc.has_header_symbol('time.h', 'clock_getres', args: compile_args_c),
)
glib = dependency(

7
recipes/dbus/all/test_package/CMakeLists.txt Normal file
View File

@@ -0,0 +1,7 @@
cmake_minimum_required(VERSION 3.1)
project(test_package LANGUAGES C)
find_package(DBus1 REQUIRED CONFIG)
add_executable(${PROJECT_NAME} test_package.c)
target_link_libraries(${PROJECT_NAME} PRIVATE dbus-1)

27
recipes/dbus/all/test_package/conanfile.py Normal file
View File

@@ -0,0 +1,27 @@
from conan import ConanFile
from conan.tools.build import can_run
from conan.tools.cmake import CMake, cmake_layout
import os
class TestPackageConan(ConanFile):
settings = "os", "arch", "compiler", "build_type"
generators = "CMakeToolchain", "CMakeDeps", "VirtualRunEnv"
test_type = "explicit"
def layout(self):
cmake_layout(self)
def requirements(self):
self.requires(self.tested_reference_str, run=True)
def build(self):
cmake = CMake(self)
cmake.configure()
cmake.build()
def test(self):
if can_run(self):
self.run("dbus-monitor --help", env="conanrun")
bin_path = os.path.join(self.cpp.build.bindirs[0], "test_package")
self.run(bin_path, env="conanrun")

13
recipes/dbus/all/test_package/test_package.c Normal file
View File

@@ -0,0 +1,13 @@
#include <stdio.h>
#include <dbus/dbus.h>
int main() {
int major_version = 0;
int minor_version = 0;
int micro_version = 0;
dbus_get_version(&major_version, &minor_version, &micro_version);
printf("D-Bus version: v%i.%i.%i\n", major_version, minor_version, micro_version);
return 0;
}