Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

dbus: don't propagate X11 libs, drop with_glib, update license info #23384

Merged
merged 6 commits into from
Apr 8, 2024
Merged

dbus: don't propagate X11 libs, drop with_glib, update license info #23384

Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4906878
dbus: avoid overlinking of glib and X11 libraries
valgur Apr 5, 2024
e1c8107
dbus: set xorg dependency visible=False
valgur Apr 6, 2024
1a1e88f
dbus: update license details
valgur Apr 6, 2024
bb8ebd4
dbus: drop with_glib option
valgur Apr 6, 2024
eeb60eb
dbus: fix systemd unitdir installation paths
valgur Apr 6, 2024
080f0b8
dbus: revert macOS install path
valgur Apr 6, 2024
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
51 changes: 34 additions & 17 deletions recipes/dbus/1.x.x/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@

class DbusConan(ConanFile):
name = "dbus"
license = ("AFL-2.1", "GPL-2.0-or-later")
# 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."
Expand All @@ -29,7 +30,7 @@
"system_socket": [None, "ANY"],
"system_pid_file": [None, "ANY"],
"with_x11": [True, False],
"with_glib": [True, False],
"with_glib": ["deprecated", True, False],
"with_systemd": [True, False],
"with_selinux": [True, False],
"session_socket_dir": ["ANY"],
Expand All @@ -40,7 +41,7 @@
"system_socket": None,
"system_pid_file": None,
"with_x11": False,
"with_glib": False,
"with_glib": "deprecated",
"with_systemd": False,
"with_selinux": False,
"session_socket_dir": "/tmp",
Expand All @@ -52,8 +53,8 @@
def config_options(self):
if self.settings.os not in ("Linux", "FreeBSD"):
del self.options.with_systemd
if self.settings.os not in ("Linux", "FreeBSD"):
del self.options.with_x11
del self.options.with_selinux
if self.settings.os == "Windows":
del self.options.fPIC

Expand All @@ -63,26 +64,32 @@
if self.options.shared:
self.options.rm_safe("fPIC")

def package_id(self):
del self.info.options.with_glib

def layout(self):
basic_layout(self, src_folder="src")

def requirements(self):
self.requires("expat/2.6.0")
if self.options.with_glib:
self.requires("glib/2.78.3")
if self.options.get_safe("with_systemd"):
self.requires("libsystemd/253.6")
if self.options.with_selinux:
self.requires("libselinux/3.3")
if self.options.get_safe("with_selinux"):
self.requires("libselinux/3.5")
if self.options.get_safe("with_x11"):
self.requires("xorg/system")
# 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 validate(self):
if self.settings.compiler == "gcc" and Version(self.settings.compiler.version) < 7:
raise ConanInvalidConfiguration(f"{self.ref} requires at least gcc 7.")
if self.options.with_glib != "deprecated":
raise ConanInvalidConfiguration(f"with_glib option is deprecated and should not be used - the option had no effect.")

Check warning on line 89 in recipes/dbus/1.x.x/conanfile.py

View workflow job for this annotation

GitHub Actions / Lint changed conanfile.py (v2 migration) 

 Using an f-string that does not have any interpolated variables

def build_requirements(self):
self.tool_requires("meson/1.3.2")
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")

Expand All @@ -103,25 +110,30 @@
tc.project_options["selinux"] = "enabled" if self.options.get_safe("with_selinux", False) else "disabled"
tc.project_options["systemd"] = "enabled" if self.options.get_safe("with_systemd", False) else "disabled"
if self.options.get_safe("with_systemd", False):
tc.project_options["systemd_system_unitdir"] = os.path.join(self.package_folder, "lib", "systemd", "system")
tc.project_options["systemd_user_unitdir"] = os.path.join(self.package_folder, "lib", "systemd", "user")
tc.project_options["systemd_system_unitdir"] = "/res/lib/systemd/system"
tc.project_options["systemd_user_unitdir"] = "/res/usr/lib/systemd/system"
if is_apple_os(self):
tc.project_options["launchd_agent_dir"] = os.path.join(self.package_folder, "res", "LaunchAgents")
tc.project_options["launchd_agent_dir"] = "/res/LaunchAgents"
tc.project_options["x11_autolaunch"] = "enabled" if self.options.get_safe("with_x11", False) else "disabled"
tc.project_options["xml_docs"] = "disabled"
tc.generate()
deps = PkgConfigDeps(self)
deps.generate()

def build(self):
def _patch_sources(self):
apply_conandata_patches(self)
replace_in_file(self, os.path.join(self.source_folder, "meson.build"), "subdir('test')", "# subdir('test')")
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", src=self.source_folder, dst=os.path.join(self.package_folder, "licenses"))
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()

Expand All @@ -133,7 +145,6 @@

rmdir(self, os.path.join(self.package_folder, "lib", "cmake"))
rmdir(self, os.path.join(self.package_folder, "lib", "pkgconfig"))
rmdir(self, os.path.join(self.package_folder, "lib", "systemd"))
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"))
Expand Down Expand Up @@ -179,6 +190,12 @@
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"
Expand Down
Loading