libdecor: Add recipe

recipes/libdecor/all/conandata.yml

@@ -0,0 +1,10 @@
+sources:
+  "0.2.2":
+    url: "https://gitlab.freedesktop.org/libdecor/libdecor/-/releases/0.2.2/downloads/libdecor-0.2.2.tar.xz"
+    sha256: "16a288e24354d461b20dda9cf38e68543569134f04e4b7fa2914aa647907dfac"
+patches:
+  "0.2.2":
+    - patch_file: "patches/0.2.2-0001-Rename-os_create_anonymous_file-to-avoid-a-conflict-.patch"
+      patch_description: "Rename os_create_anonymous_file to avoid a conflict in wayland-cursor"
+      patch_type: "portability"
+      patch_source: "https://gitlab.freedesktop.org/libdecor/libdecor/-/merge_requests/146"

recipes/libdecor/all/conanfile.py

@@ -0,0 +1,137 @@
+import os
+import textwrap
+
+from conan import ConanFile
+from conan.tools.env import VirtualBuildEnv
+from conan.tools.files import apply_conandata_patches, copy, export_conandata_patches, get, replace_in_file, rmdir, save
+from conan.tools.gnu import PkgConfigDeps
+from conan.tools.layout import basic_layout
+from conan.tools.meson import Meson, MesonToolchain
+from conan.errors import ConanInvalidConfiguration
+
+required_conan_version = ">=1.53.0"
+
+
+class libdecorConan(ConanFile):
+    name = "libdecor"
+    package_type = "shared-library"
+    description = "libdecor is a library that can help Wayland clients draw window decorations for them."
+    topics = ("decoration", "wayland", "window")
+    url = "https://github.com/conan-io/conan-center-index"
+    homepage = "https://gitlab.freedesktop.org/libdecor/libdecor"
+    license = "MIT"
+    settings = "os", "arch", "compiler", "build_type"
+    options = {
+        "with_dbus": [True, False],
+        "with_gtk": [True, False],
+    }
+    default_options = {
+        "with_dbus": True,
+        "with_gtk": False,
+    }
+
+    @property
+    def _has_build_profile(self):
+        return hasattr(self, "settings_build")
+
+    def export_sources(self):
+        export_conandata_patches(self)
+
+    def configure(self):
+        self.settings.rm_safe("compiler.cppstd")
+        self.settings.rm_safe("compiler.libcxx")
+        self.options["pango"].with_cairo = True
+
+    def layout(self):
+        basic_layout(self, src_folder="src")
+
+    def requirements(self):
+        self.requires("cairo/1.18.0")
+        if self.options.get_safe("with_dbus"):
+            self.requires("dbus/1.15.8")
+        if self.options.get_safe("with_gtk"):
+            self.requires("gtk/system")
+        # Linking the test package results in missing freetype sympols without this.
+        # It appears that this is due to an issue with a dependency such as pango or cairo pulling in the system freetype instead of Conan's.
+        # Or potentially, it's related to an incorrectly specified dependency.
+        self.requires("pango/1.51.0", transitive_libs=True)
+        self.requires("wayland/1.22.0", transitive_headers=True)
+
+    def validate(self):
+        if self.settings.os != "Linux":
+            raise ConanInvalidConfiguration(f"{self.ref} only supports Linux")
+        if not self.dependencies["pango"].options.with_cairo:
+            raise ConanInvalidConfiguration(f"{self.ref} requires the with_cairo option of pango to be enabled")
+
+    def build_requirements(self):
+        self.tool_requires("meson/1.3.2")
+        if not self.conf.get("tools.gnu:pkg_config", default=False, check_type=str):
+            self.tool_requires("pkgconf/2.1.0")
+        self.tool_requires("wayland/<host_version>")
+        self.tool_requires("wayland-protocols/1.33")
+
+    def source(self):
+        get(self, **self.conan_data["sources"][self.version], strip_root=True)
+
+    def _patch_sources(self):
+        apply_conandata_patches(self)
+        replace_in_file(
+            self,
+            os.path.join(self.source_folder, "src", "plugins", "meson.build"),
+            "gtk_dep = dependency('gtk+-3.0', required: get_option('gtk'))",
+            "gtk_dep = dependency('gtk', required: get_option('gtk'))",
+        )
+
+    def generate(self):
+        def feature(option):
+            return "enabled" if self.options.get_safe(option) else "disabled"
+
+        tc = MesonToolchain(self)
+        tc.project_options["dbus"] = feature("with_dbus")
+        tc.project_options["demo"] = False
+        tc.project_options["gtk"] = feature("with_gtk")
+        tc.generate()
+        pkg_config_deps = PkgConfigDeps(self)
+        if self._has_build_profile:
+            pkg_config_deps.build_context_activated = ["wayland-protocols"]
+        else:
+            # Manually generate pkgconfig file of wayland-protocols since
+            # PkgConfigDeps.build_context_activated can't work with legacy 1 profile
+            # We must use legacy conan v1 deps_cpp_info because self.dependencies doesn't
+            # contain build requirements when using 1 profile.
+            wp_prefix = self.deps_cpp_info["wayland-protocols"].rootpath
+            wp_version = self.deps_cpp_info["wayland-protocols"].version
+            wp_pkg_content = textwrap.dedent(f"""\
+                prefix={wp_prefix}
+                datarootdir=${{prefix}}/res
+                pkgdatadir=${{datarootdir}}/wayland-protocols
+                Name: Wayland Protocols
+                Description: Wayland protocol files
+                Version: {wp_version}
+            """)
+            save(self, os.path.join(self.generators_folder, "wayland-protocols.pc"), wp_pkg_content)
+        pkg_config_deps.generate()
+        virtual_build_env = VirtualBuildEnv(self)
+        virtual_build_env.generate()
+
+    def build(self):
+        self._patch_sources()
+        meson = Meson(self)
+        meson.configure()
+        meson.build()
+
+    def package(self):
+        copy(self, "LICENSE", self.source_folder, os.path.join(self.package_folder, "licenses"))
+        meson = Meson(self)
+        meson.install()
+        rmdir(self, os.path.join(self.package_folder, "lib", "pkgconfig"))
+
+    def package_info(self):
+        libdecor_soversion = "0"
+        self.cpp_info.libs = [f"decor-{libdecor_soversion}"]
+        self.cpp_info.set_property("pkg_config_name", f"libdecor-{libdecor_soversion}")
+
+        self.cpp_info.includedirs = [os.path.join(self.package_folder, "include", f"libdecor-{libdecor_soversion}")]
+
+        plugins_soversion = "1"
+        self.runenv_info.define("LIBDECOR_PLUGIN_DIR", os.path.join(self.package_folder, "lib", "libdecor", f"plugins-{plugins_soversion}"))

recipes/libdecor/all/patches/0.2.2-0001-Rename-os_create_anonymous_file-to-avoid-a-conflict-.patch

@@ -0,0 +1,96 @@
+From 64638f1affc4fcff1ca07e6544101b7beeecd563 Mon Sep 17 00:00:00 2001
+From: Jordan Williams <jordan@jwillikers.com>
+Date: Mon, 4 Mar 2024 07:01:04 -0600
+Subject: [PATCH] Rename os_create_anonymous_file to avoid a conflict in
+ wayland-cursor
+
+Fixes #66.
+---
+ demo/c++-demo.cc                   | 2 +-
+ demo/demo.c                        | 2 +-
+ src/os-compatibility.c             | 2 +-
+ src/os-compatibility.h             | 2 +-
+ src/plugins/cairo/libdecor-cairo.c | 2 +-
+ src/plugins/gtk/libdecor-gtk.c     | 2 +-
+ 6 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/demo/c++-demo.cc b/demo/c++-demo.cc
+index 72f63db..1a29ec7 100644
+--- a/demo/c++-demo.cc
++++ b/demo/c++-demo.cc
+@@ -94,7 +94,7 @@ public:
+ 		stride = width * 4;
+ 		size = stride * height;
+
+-		fd = os_create_anonymous_file(size);
++		fd = libdecor_os_create_anonymous_file(size);
+ 		if (fd < 0) {
+ 			cerr << "Creating a buffer file for " << size <<
+ 				" B failed: " << strerror(errno) << endl;
+diff --git a/demo/demo.c b/demo/demo.c
+index c347845..a736a46 100644
+--- a/demo/demo.c
++++ b/demo/demo.c
+@@ -1026,7 +1026,7 @@ create_shm_buffer(int width,
+ 	stride = width * 4;
+ 	size = stride * height;
+
+-	fd = os_create_anonymous_file(size);
++	fd = libdecor_os_create_anonymous_file(size);
+ 	if (fd < 0) {
+ 		fprintf(stderr, "creating a buffer file for %d B failed: %s\n",
+ 			size, strerror(errno));
+diff --git a/src/os-compatibility.c b/src/os-compatibility.c
+index 8287da0..2376647 100644
+--- a/src/os-compatibility.c
++++ b/src/os-compatibility.c
+@@ -148,7 +148,7 @@ os_resize_anonymous_file(int fd, off_t size)
+  * XDG_RUNTIME_DIR.
+  */
+ int
+-os_create_anonymous_file(off_t size)
++libdecor_os_create_anonymous_file(off_t size)
+ {
+ 	static const char template[] = "/libdecor-shared-XXXXXX";
+ 	const char *path;
+diff --git a/src/os-compatibility.h b/src/os-compatibility.h
+index d0e69ac..6ce49d0 100644
+--- a/src/os-compatibility.h
++++ b/src/os-compatibility.h
+@@ -29,6 +29,6 @@
+ #include <sys/types.h>
+
+ int
+-os_create_anonymous_file(off_t size);
++libdecor_os_create_anonymous_file(off_t size);
+
+ #endif /* OS_COMPATIBILITY_H */
+diff --git a/src/plugins/cairo/libdecor-cairo.c b/src/plugins/cairo/libdecor-cairo.c
+index 765800d..30f6f87 100644
+--- a/src/plugins/cairo/libdecor-cairo.c
++++ b/src/plugins/cairo/libdecor-cairo.c
+@@ -597,7 +597,7 @@ create_shm_buffer(struct libdecor_plugin_cairo *plugin_cairo,
+ 	stride = buffer_width * 4;
+ 	size = stride * buffer_height;
+
+-	fd = os_create_anonymous_file(size);
++	fd = libdecor_os_create_anonymous_file(size);
+ 	if (fd < 0) {
+ 		fprintf(stderr, "creating a buffer file for %d B failed: %s\n",
+ 			size, strerror(errno));
+diff --git a/src/plugins/gtk/libdecor-gtk.c b/src/plugins/gtk/libdecor-gtk.c
+index ef638f1..8655d45 100644
+--- a/src/plugins/gtk/libdecor-gtk.c
++++ b/src/plugins/gtk/libdecor-gtk.c
+@@ -595,7 +595,7 @@ create_shm_buffer(struct libdecor_plugin_gtk *plugin_gtk,
+ 	stride = buffer_width * 4;
+ 	size = stride * buffer_height;
+
+-	fd = os_create_anonymous_file(size);
++	fd = libdecor_os_create_anonymous_file(size);
+ 	if (fd < 0) {
+ 		fprintf(stderr, "creating a buffer file for %d B failed: %s\n",
+ 			size, strerror(errno));
+-- 
+2.44.0
+

recipes/libdecor/all/test_package/conanfile.py

@@ -0,0 +1,32 @@
+from conan import ConanFile
+from conan.tools.build import can_run
+from conan.tools.layout import basic_layout
+from conan.tools.meson import Meson
+import os
+
+
+class TestPackageConan(ConanFile):
+    settings = "os", "arch", "compiler", "build_type"
+    generators = "PkgConfigDeps", "MesonToolchain", "VirtualRunEnv", "VirtualBuildEnv"
+    test_type = "explicit"
+
+    def layout(self):
+        basic_layout(self)
+
+    def requirements(self):
+        self.requires(self.tested_reference_str)
+
+    def build_requirements(self):
+        self.tool_requires("meson/1.3.2")
+        if not self.conf.get("tools.gnu:pkg_config", default=False, check_type=str):
+            self.tool_requires("pkgconf/2.1.0")
+
+    def build(self):
+        meson = Meson(self)
+        meson.configure()
+        meson.build()
+
+    def test(self):
+        if can_run(self):
+            bin_path = os.path.join(self.cpp.build.bindir, "test_package")
+            self.run(bin_path, env="conanrun")

recipes/libdecor/all/test_package/meson.build

@@ -0,0 +1,14 @@
+project('test_package', 'c')
+
+libdecor_dep = dependency('libdecor-0')
+
+executable('test_package',
+  sources: [
+    'test_package.c',
+  ],
+  dependencies: [
+    libdecor_dep,
+    ],
+)
+
+

recipes/libdecor/all/test_package/test_package.c

@@ -0,0 +1,11 @@
+#include <stdlib.h>
+#include <libdecor.h>
+
+int main(int argc, char **argv) {
+    struct libdecor_state *state = libdecor_state_new(0, 0);
+    if (!state) {
+        return EXIT_FAILURE;
+    }
+    libdecor_state_free(state);
+	return EXIT_SUCCESS;
+}

recipes/libdecor/config.yml

@@ -0,0 +1,3 @@
+versions:
+  "0.2.2":
+    folder: all