diff --git a/srcpkgs/bolt/patches/a9fda276415abb4c0ae7031271c2d5703c435086.patch b/srcpkgs/bolt/patches/a9fda276415abb4c0ae7031271c2d5703c435086.patch deleted file mode 100644 index 978011c5f02..00000000000 --- a/srcpkgs/bolt/patches/a9fda276415abb4c0ae7031271c2d5703c435086.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a9fda276415abb4c0ae7031271c2d5703c435086 Mon Sep 17 00:00:00 2001 -From: Christian Kellner -Date: Fri, 15 Jun 2018 15:43:54 +0200 -Subject: [PATCH] test: common: no enum auto cleanup for glib > 2.57 - -Newer glib (starting with 2.57) have gained support for autoptr -cleanup functions for GEnumClass and GFlagsClass, so we don't -need to define our own ones anymore. -This change was already done to bolt-enums.c, but also is needed -for the test. ---- - tests/test-common.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/tests/test-common.c b/tests/test-common.c -index c44d8ae..eb50a81 100644 ---- tests/test-common.c -+++ tests/test-common.c -@@ -43,8 +43,10 @@ - #include - #include /* unlinkat */ - -+#if !GLIB_CHECK_VERSION (2, 57, 0) - G_DEFINE_AUTOPTR_CLEANUP_FUNC (GEnumClass, g_type_class_unref); - G_DEFINE_AUTOPTR_CLEANUP_FUNC (GFlagsClass, g_type_class_unref); -+#endif - - static void - cleanup_dir (DIR *d) --- -2.18.0 - diff --git a/srcpkgs/bolt/patches/dont-require-systemd.patch b/srcpkgs/bolt/patches/dont-require-systemd.patch deleted file mode 100644 index 2592921d1e3..00000000000 --- a/srcpkgs/bolt/patches/dont-require-systemd.patch +++ /dev/null @@ -1,51 +0,0 @@ -Upstream: https://gitlab.freedesktop.org/bolt/bolt/merge_requests/103 (rebased) -From 3330913f5979208c622d5525ff358a12c0973d98 Mon Sep 17 00:00:00 2001 -From: Rasmus Thomsen -Date: Tue, 28 Aug 2018 23:25:41 +0200 -Subject: [PATCH] build: optionalise systemd unit installation ---- meson.build -+++ meson.build -@@ -76,7 +76,6 @@ libudev = dependency('libudev') - unix = dependency('gio-unix-2.0') - udev = dependency('udev') - polkit = dependency('polkit-gobject-1') --systemd = dependency('systemd') - libsysd = dependency('libsystemd') - - git = find_program('git', required: false) -@@ -95,7 +94,12 @@ mandir = get_option('mandir') - - dbdir = get_option('db-path') - udevdir = udev.get_pkgconfig_variable('udevdir') --unitdir = systemd.get_pkgconfig_variable('systemdsystemunitdir') -+ -+unitdir = '' -+if get_option('systemd') -+ systemd = dependency('systemd') -+ unitdir = systemd.get_pkgconfig_variable('systemdsystemunitdir') -+endif - - version_split = meson.project_version().split('.') - version_major = version_split[0] -@@ -262,9 +266,11 @@ unit_file = configure_file( - configuration: subs - ) - --install_data(unit_file, -- install_dir: unitdir --) -+if unitdir != '' -+ install_data(unit_file, -+ install_dir: unitdir -+ ) -+endif - - install_data('data/90-bolt.rules', - install_dir: join_paths(udevdir, 'rules.d') ---- meson_options.txt -+++ meson_options.txt -@@ -1,3 +1,4 @@ - option('db-path', type: 'string', value: '/var/lib/boltd', description: 'Directory for the device database') - option('man', type: 'combo', choices: ['auto', 'true', 'false'], value: 'auto', description: 'Build man pages') - option('privileged-group', type: 'string', value: 'wheel', description: 'Name of privileged group') -+option('systemd', type: 'boolean', value: 'true', description: 'Whether or not to install the systemd unit') diff --git a/srcpkgs/bolt/template b/srcpkgs/bolt/template index 2533ec47e88..d6edf8ccded 100644 --- a/srcpkgs/bolt/template +++ b/srcpkgs/bolt/template @@ -1,24 +1,20 @@ # Template file for 'bolt' pkgname=bolt -version=0.4 +version=0.5 revision=1 build_style=meson configure_args="-Dman=true -Dsystemd=false" hostmakedepends="asciidoc glib-devel pkg-config" -makedepends="elogind-devel eudev-libudev-devel libglib-devel polkit-devel" +makedepends="eudev-libudev-devel libglib-devel polkit-devel" +checkdepends="dbus" short_desc="Thunderbolt 3 device manager" maintainer="Rasmus Thomsen " license="LGPL-2.1-or-later" homepage="https://gitlab.freedesktop.org/bolt/bolt" distfiles="https://gitlab.freedesktop.org/bolt/bolt/-/archive/${version}/bolt-${version}.tar.gz" -checksum=7692799545cd84b31aa7145712c55e36afc0d369c62157b19e5e865deae5f6f6 +checksum=f0ed0a6f50fd3a741fbe2b51290daf1cd4c9d4859941df832c5c1f681a418631 make_dirs="/var/lib/boltd 0755 root root" -do_check() { - # Tests seem to be broken - : -} - post_install() { vsv boltd }