fwupd: 2.0.15 -> 2.0.16 (Fix regression in 2.0.15 preventing any updates) (#442316)

pkgs/by-name/fw/fwupd/add-option-for-installation-sysconfdir.patch

···
-commit 448e265ad3fef9a5ef0ff57593dd5a9164118852
+commit 56507892ff7a03ed283d7fd2d7ff2000fc9c17d7
 Author: r-vdp <[e-mail]>
 Date:   Tue Oct 15 11:46:38 2024 +0200
 
     Add option for installation sysconfdir
 
 diff --git a/data/bios-settings.d/meson.build b/data/bios-settings.d/meson.build
-index 3f1cb3574..acbdccb61 100644
+index 2a2a07016..99df55afb 100644
 --- a/data/bios-settings.d/meson.build
 +++ b/data/bios-settings.d/meson.build
-@@ -1,6 +1,6 @@
- if build_standalone and host_machine.system() == 'linux'
- install_data('README.md',
-   install_tag: 'doc',
--  install_dir: join_paths(sysconfdir, 'fwupd', 'bios-settings.d')
-+  install_dir: join_paths(datadir, 'fwupd', 'bios-settings.d')
- )
+@@ -2,6 +2,6 @@ if build_standalone and host_machine.system() == 'linux'
+   install_data(
+     'README.md',
+     install_tag: 'doc',
+-    install_dir: join_paths(sysconfdir, 'fwupd', 'bios-settings.d'),
++    install_dir: join_paths(datadir, 'fwupd', 'bios-settings.d'),
+   )
  endif
 diff --git a/data/meson.build b/data/meson.build
-index 78f54bd83..aae01ed56 100644
+index 5716669f0..78e754f40 100644
 --- a/data/meson.build
 +++ b/data/meson.build
-@@ -28,7 +28,7 @@ endif
- if build_standalone
-   install_data(['fwupd.conf'],
+@@ -29,7 +29,7 @@ if build_standalone
+   install_data(
+     ['fwupd.conf'],
      install_tag: 'runtime',
 -    install_dir: join_paths(sysconfdir, 'fwupd'),
 +    install_dir: join_paths(sysconfdir_install, 'fwupd'),
      install_mode: 'rw-r-----',
    )
-   plugin_quirks += files([
+   plugin_quirks += files('cfi.quirk', 'ds20.quirk', 'power.quirk', 'vendors.quirk')
 diff --git a/data/pki/meson.build b/data/pki/meson.build
-index 9b1e6b372..5c80ba564 100644
+index 5b962adf1..b6575f7e4 100644
 --- a/data/pki/meson.build
 +++ b/data/pki/meson.build
-@@ -8,14 +8,14 @@ install_data([
-     'GPG-KEY-Linux-Vendor-Firmware-Service',
-   ],
-   install_tag: 'runtime',
--  install_dir: join_paths(sysconfdir, 'pki', 'fwupd')
-+  install_dir: join_paths(sysconfdir_install, 'pki', 'fwupd')
- )
- install_data([
-     'GPG-KEY-Linux-Foundation-Metadata',
-     'GPG-KEY-Linux-Vendor-Firmware-Service',
-   ],
-   install_tag: 'runtime',
--  install_dir: join_paths(sysconfdir, 'pki', 'fwupd-metadata')
-+  install_dir: join_paths(sysconfdir_install, 'pki', 'fwupd-metadata')
- )
+@@ -12,12 +12,12 @@ if supported_gpg
+   install_data(
+     ['GPG-KEY-Linux-Foundation-Firmware', 'GPG-KEY-Linux-Vendor-Firmware-Service'],
+     install_tag: 'runtime',
+-    install_dir: join_paths(sysconfdir, 'pki', 'fwupd'),
++    install_dir: join_paths(sysconfdir_install, 'pki', 'fwupd'),
+   )
+   install_data(
+     ['GPG-KEY-Linux-Foundation-Metadata', 'GPG-KEY-Linux-Vendor-Firmware-Service'],
+     install_tag: 'runtime',
+-    install_dir: join_paths(sysconfdir, 'pki', 'fwupd-metadata'),
++    install_dir: join_paths(sysconfdir_install, 'pki', 'fwupd-metadata'),
+   )
  endif
  
-@@ -24,12 +24,12 @@ install_data([
-     'LVFS-CA.pem',
-   ],
-   install_tag: 'runtime',
--  install_dir: join_paths(sysconfdir, 'pki', 'fwupd')
-+  install_dir: join_paths(sysconfdir_install, 'pki', 'fwupd')
- )
- install_data([
-     'LVFS-CA.pem',
-   ],
-   install_tag: 'runtime',
--  install_dir: join_paths(sysconfdir, 'pki', 'fwupd-metadata')
-+  install_dir: join_paths(sysconfdir_install, 'pki', 'fwupd-metadata')
- )
+@@ -25,11 +25,11 @@ if supported_pkcs7
+   install_data(
+     ['LVFS-CA.pem'],
+     install_tag: 'runtime',
+-    install_dir: join_paths(sysconfdir, 'pki', 'fwupd'),
++    install_dir: join_paths(sysconfdir_install, 'pki', 'fwupd'),
+   )
+   install_data(
+     ['LVFS-CA.pem'],
+     install_tag: 'runtime',
+-    install_dir: join_paths(sysconfdir, 'pki', 'fwupd-metadata'),
++    install_dir: join_paths(sysconfdir_install, 'pki', 'fwupd-metadata'),
+   )
  endif
 diff --git a/data/remotes.d/meson.build b/data/remotes.d/meson.build
-index 77285cafa..7d2cb8f58 100644
+index b8d24c267..0dd4ad32a 100644
 --- a/data/remotes.d/meson.build
 +++ b/data/remotes.d/meson.build
 @@ -12,7 +12,7 @@ if build_standalone and get_option('lvfs') != 'false'
···
    )
    i18n.merge_file(
      input: 'lvfs.metainfo.xml',
-@@ -58,7 +58,7 @@ configure_file(
+@@ -59,7 +59,7 @@ configure_file(
    configuration: con2,
    install: get_option('vendor_metadata'),
    install_tag: 'runtime',
···
  )
  configure_file(
    input: 'vendor-directory.conf',
-@@ -66,5 +66,5 @@ configure_file(
+@@ -67,5 +67,5 @@ configure_file(
    configuration: con2,
    install: true,
    install_tag: 'runtime',
···
 +  install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),
  )
 diff --git a/docs/meson.build b/docs/meson.build
-index c1e483f4f..684ec3fbe 100644
+index 787b4387c..b3144757f 100644
 --- a/docs/meson.build
 +++ b/docs/meson.build
-@@ -127,7 +127,7 @@ if build_docs
+@@ -196,7 +196,7 @@ if build_docs
      build_by_default: true,
      install: true,
      install_tag: 'doc',
···
    )
  
    subdir('hsi-tests.d')
-@@ -186,7 +186,7 @@ if build_docs
+@@ -247,7 +247,7 @@ if build_docs
      build_by_default: true,
      install: true,
      install_tag: 'doc',
···
 +    install_dir: join_paths(sysconfdir_install, 'doc'),
    )
    man_cmd = []
-   foreach man: man_md
-@@ -201,31 +201,31 @@ if build_docs
-     ],
+   foreach man : man_md
+@@ -260,36 +260,36 @@ if build_docs
+     command: [generate_index, '@INPUT@', '-o', '@OUTPUT@', man_cmd],
      install: true,
      install_tag: 'doc',
--    install_dir: join_paths(datadir, 'doc', 'fwupd')
-+    install_dir: join_paths(sysconfdir_install, 'doc', 'fwupd')
+-    install_dir: join_paths(datadir, 'doc', 'fwupd'),
++    install_dir: join_paths(sysconfdir_install, 'doc', 'fwupd'),
    )
    if hsi
-     install_data(['hsi.html'],
+     install_data(
+       ['hsi.html'],
        install_tag: 'doc',
--      install_dir : join_paths(datadir, 'doc', 'fwupd')
-+      install_dir : join_paths(sysconfdir_install, 'doc', 'fwupd')
+-      install_dir: join_paths(datadir, 'doc', 'fwupd'),
++      install_dir: join_paths(sysconfdir_install, 'doc', 'fwupd'),
      )
    endif
-   install_data(['urlmap_fwupd.js'],
+   install_data(
+     ['urlmap_fwupd.js'],
      install_tag: 'doc',
--    install_dir: join_paths(datadir, 'doc', 'libfwupd')
-+    install_dir: join_paths(sysconfdir_install, 'doc', 'libfwupd')
+-    install_dir: join_paths(datadir, 'doc', 'libfwupd'),
++    install_dir: join_paths(sysconfdir_install, 'doc', 'libfwupd'),
    )
-   install_data(['urlmap_fwupdplugin.js'],
+   install_data(
+     ['urlmap_fwupdplugin.js'],
      install_tag: 'doc',
--    install_dir: join_paths(datadir, 'doc', 'libfwupdplugin')
-+    install_dir: join_paths(sysconfdir_install, 'doc', 'libfwupdplugin')
+-    install_dir: join_paths(datadir, 'doc', 'libfwupdplugin'),
++    install_dir: join_paths(sysconfdir_install, 'doc', 'libfwupdplugin'),
    )
    #make devhelp work
-   install_symlink('libfwupd',
+   install_symlink(
+     'libfwupd',
      install_tag: 'doc',
 -    install_dir: join_paths(datadir, 'doc', 'fwupd'),
 +    install_dir: join_paths(sysconfdir_install, 'doc', 'fwupd'),
      pointing_to: join_paths('..', 'libfwupd'),
    )
-   install_symlink('libfwupdplugin',
+   install_symlink(
+     'libfwupdplugin',
      install_tag: 'doc',
 -    install_dir: join_paths(datadir, 'doc', 'fwupd'),
 +    install_dir: join_paths(sysconfdir_install, 'doc', 'fwupd'),
···
    )
  endif
 diff --git a/meson.build b/meson.build
-index 4faedcc0b..980f9bb0c 100644
+index ca431980b..d9bab5264 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -212,6 +212,12 @@ endif
+@@ -246,6 +246,12 @@ endif
  mandir = join_paths(prefix, get_option('mandir'))
  localedir = join_paths(prefix, get_option('localedir'))
  
···
 +endif
 +
  diffcmd = find_program('diff')
- gio = dependency('gio-2.0', version: '>= 2.68.0') # limited by RHEL-9, which has v2.68.4
- giounix = dependency('gio-unix-2.0', version: '>= 2.68.0', required: false)
+ gio = dependency(
+   'gio-2.0',
 diff --git a/meson_options.txt b/meson_options.txt
 index 63c8d288d..04f6651e6 100644
 --- a/meson_options.txt

pkgs/by-name/fw/fwupd/efi-app-path.patch

···
-commit 1770b1871a567dfa78ae1e32094b6007bb7639e9
+commit f60f2bf6dd4961bdda742f590bf2d7871db6cdab
 Author: r-vdp <[e-mail]>
 Date:   Mon Oct 28 12:08:49 2024 +0100
 
     Get the efi app from fwupd-efi
 
 diff --git a/meson.build b/meson.build
-index e4e764b97..8acaa3d2d 100644
+index d9bab5264..ee91d34b0 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -482,7 +482,7 @@ endif
+@@ -650,7 +650,7 @@ endif
  
  # EFI
  if build_standalone
 -  efi_app_location = join_paths(libexecdir, 'fwupd', 'efi')
 +  efi_app_location = join_paths(dependency('fwupd-efi').get_variable(pkgconfig: 'prefix'), 'libexec', 'fwupd', 'efi')
    conf.set_quoted('EFI_APP_LOCATION', efi_app_location)
-   if host_cpu == 'x86'
-     EFI_MACHINE_TYPE_NAME = 'ia32'
+ endif
+ 

pkgs/by-name/fw/fwupd/install-fwupdplugin-to-out.patch

···
-commit 1b7f8b3ad7df9a5911fbc45608d9b40e0787baca
+commit 3ffe2d7842b62986e2267e6542068e6356b06fdf
 Author: r-vdp <[e-mail]>
 Date:   Mon Oct 28 12:07:51 2024 +0100
 
     Install fwupdplugin to out
 
 diff --git a/meson.build b/meson.build
-index 747d1b385..312513d75 100644
+index 3a163331e..cb66be0cc 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -548,7 +548,7 @@ if build_standalone
- if host_machine.system() == 'windows'
-   libdir_pkg = bindir
- else
--  libdir_pkg = join_paths(libdir, 'fwupd-@0@'.format(fwupd_version))
-+  libdir_pkg = join_paths(prefix, 'lib', 'fwupd-@0@'.format(fwupd_version))
- endif
- conf.set_quoted('FWUPD_LIBDIR_PKG', libdir_pkg)
+@@ -733,7 +733,7 @@ if build_standalone
+   if host_machine.system() == 'windows'
+     libdir_pkg = bindir
+   else
+-    libdir_pkg = join_paths(libdir, 'fwupd-@0@'.format(fwupd_version))
++    libdir_pkg = join_paths(prefix, 'lib', 'fwupd-@0@'.format(fwupd_version))
+   endif
+   conf.set_quoted('FWUPD_LIBDIR_PKG', libdir_pkg)
  endif

pkgs/by-name/fw/fwupd/installed-tests-path.patch

···
-commit abaf36af96c7dfc966110c5342d5a8814c0df492
+commit 954e41500e1b409a24fca43ae3bdc1c6a890db48
 Author: r-vdp <[e-mail]>
 Date:   Tue Oct 15 14:49:53 2024 +0200
 
     Add output for installed tests
 
 diff --git a/data/tests/meson.build b/data/tests/meson.build
-index da9524677..505d7a80e 100644
+index 3eba65eea..cf3931bb7 100644
 --- a/data/tests/meson.build
 +++ b/data/tests/meson.build
-@@ -131,7 +131,7 @@ configure_file(
+@@ -122,7 +122,7 @@ configure_file(
    configuration: con2,
    install: true,
    install_tag: 'tests',
···
  
  if umockdev_integration_tests.allowed()
 diff --git a/meson.build b/meson.build
-index 312513d75..4faedcc0b 100644
+index cb66be0cc..ca431980b 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -205,8 +205,8 @@ else
+@@ -239,8 +239,8 @@ else
    datadir = join_paths(prefix, get_option('datadir'))
    sysconfdir = join_paths(prefix, get_option('sysconfdir'))
    localstatedir = join_paths(prefix, get_option('localstatedir'))
···
    daemon_dir = join_paths(libexecdir, 'fwupd')
  endif
  mandir = join_paths(prefix, get_option('mandir'))
-@@ -536,6 +536,7 @@ gnome = import('gnome')
+@@ -721,6 +721,7 @@ gnome = import('gnome')
  i18n = import('i18n')
  
  conf.set_quoted('FWUPD_PREFIX', prefix)
···
    type: 'boolean',
    value: true,
 diff --git a/src/tests/host-emulate/meson.build b/src/tests/host-emulate/meson.build
-index 0a67d70e8..7e07c0a49 100644
+index c36da65cd..f0b70d4d6 100644
 --- a/src/tests/host-emulate/meson.build
 +++ b/src/tests/host-emulate/meson.build
-@@ -10,7 +10,7 @@ if build_standalone
+@@ -9,7 +9,7 @@ if build_standalone
        command: [gzip, '-k', '--stdout', '@INPUT@'],
        install: true,
        install_tag: 'tests',

pkgs/by-name/fw/fwupd/package.nix

···
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "fwupd";
-  version = "2.0.15";
+  version = "2.0.16";
 
   # libfwupd goes to lib
   # daemon, plug-ins and libfwupdplugin go to out
···
     owner = "fwupd";
     repo = "fwupd";
     tag = finalAttrs.version;
-    hash = "sha256-p0ZpbthjUaEKAn1UwzoW2gxqiBTsC4GMoXTmV3zKN2o=";
+    hash = "sha256-fsjW3Idaqg4pNGaRP0bm2R94FcW2MVfPQwPFWrN+Qy8=";
   };
 
   patches = [
···
   meta = {
     homepage = "https://fwupd.org/";
     changelog = "https://github.com/fwupd/fwupd/releases/tag/${finalAttrs.version}";
-    maintainers = with lib.maintainers; [ rvdp ];
+    maintainers = with lib.maintainers; [
+      rvdp
+      johnazoidberg
+    ];
     license = lib.licenses.lgpl21Plus;
     platforms = lib.platforms.linux;
   };