diff --git a/srcpkgs/fwupd/patches/fix-systemd-breakage.patch b/srcpkgs/fwupd/patches/fix-systemd-breakage.patch new file mode 100644 index 00000000000..1b5494fac74 --- /dev/null +++ b/srcpkgs/fwupd/patches/fix-systemd-breakage.patch @@ -0,0 +1,82 @@ +Souce: maxice8 +Upstream: not upstreamable +Reason: force meson to build org.freedesktop dbus entry regardless if systemd + option is on or not. not generating it causes the package to break. + +--- data/meson.build ++++ data/meson.build +@@ -30,59 +30,18 @@ if get_option('daemon') + ) + endif + +-if get_option('systemd') +- con2 = configuration_data() +- con2.set('libexecdir', libexecdir) +- con2.set('bindir', bindir) +- con2.set('datadir', datadir) +- +- rw_directories = [] +- rw_directories += join_paths (localstatedir, 'lib', 'fwupd') +- rw_directories += join_paths (default_sysconfdir, 'fwupd', 'remotes.d') +- if get_option('plugin_uefi') +- rw_directories += ['-/boot/efi', '-/boot', '-/efi'] +- endif +- +- dynamic_options = [] +- if systemd.version().version_compare('>= 232') +- dynamic_options += 'ProtectControlGroups=yes' +- dynamic_options += 'ProtectKernelModules=yes' +- endif +- if systemd.version().version_compare('>= 231') +- dynamic_options += 'RestrictRealtime=yes' +- dynamic_options += 'MemoryDenyWriteExecute=yes' +- dynamic_options += ['ReadWritePaths=' + ' '.join(rw_directories)] +- else +- dynamic_options += ['ReadWriteDirectories=' + ' '.join(rw_directories)] +- endif +- con2.set('dynamic_options', '\n'.join(dynamic_options)) +- +- # replace @libexecdir@ +- configure_file( +- input : 'org.freedesktop.fwupd.service.in', +- output : 'org.freedesktop.fwupd.service', +- configuration : con2, +- install: true, +- install_dir: join_paths(datadir, +- 'dbus-1', +- 'system-services'), +- ) +- +- # replace @bindir@ +- configure_file( +- input : 'fwupd-offline-update.service.in', +- output : 'fwupd-offline-update.service', +- configuration : con2, +- install: true, +- install_dir: systemdunitdir, +- ) +- +- # replace @dynamic_options@ +- configure_file( +- input : 'fwupd.service.in', +- output : 'fwupd.service', +- configuration : con2, +- install: true, +- install_dir: systemdunitdir, +- ) +-endif ++con2 = configuration_data() ++con2.set('libexecdir', libexecdir) ++con2.set('bindir', bindir) ++con2.set('datadir', datadir) ++ ++# replace @libexecdir@ ++configure_file( ++ input : 'org.freedesktop.fwupd.service.in', ++ output : 'org.freedesktop.fwupd.service', ++ configuration : con2, ++ install: true, ++ install_dir: join_paths(datadir, ++ 'dbus-1', ++ 'system-services'), ++) diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template index 3d6ae60bb61..670b4667b0a 100644 --- a/srcpkgs/fwupd/template +++ b/srcpkgs/fwupd/template @@ -1,23 +1,23 @@ # Template file for 'fwupd' pkgname=fwupd -version=1.0.8 -revision=2 +version=1.1.0 +revision=1 build_style=meson # manpages fail to build # tests require unpackaged umockdev configure_args="-Dbootdir=/boot/EFI -Dconsolekit=false -Dgtkdoc=false -Dintrospection=false -Dsystemd=false -Dplugin_altos=false -Dtests=false -Dman=false -Dpkcs7=false" -hostmakedepends="dejavu-fonts-ttf gnutls-tools help2man pkg-config" -makedepends="appstream-glib-devel cairo-devel colord-devel fwupdate-devel +hostmakedepends="dejavu-fonts-ttf gnutls-tools help2man pkg-config gcab" +makedepends="appstream-glib-devel cairo-devel colord-devel gnutls-devel gpgme-devel json-glib-devel libgusb-devel polkit-devel - python3-Pillow python3-gobject" + python3-Pillow python3-gobject libefivar-devel gnu-efi-libs" short_desc="Daemon to allow session software to update firmware" maintainer="maxice8 " license="LGPL-2.1-or-later" homepage="https://github.com/hughsie/fwupd" distfiles="https://github.com/hughsie/fwupd/archive/${version}.tar.gz" -checksum=512c04480de6d7404df22bcf718c435bfca75d4f9ff0b1aaa781f72bbe33b4fd +checksum=fc5b4453edc47e880d7800e2149e777a10f77deae0ec87d4ab07b5f0e3504db2 conf_files="/etc/dbus-1/system.d/org.freedesktop.fwupd.conf /etc/fwupd/daemon.conf /etc/fwupd/remotes.d/*.conf"