Merge master into staging-next

This commit is contained in:
github-actions[bot] 2022-06-11 00:01:54 +00:00 committed by GitHub
commit 0fff57e90d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
29 changed files with 1311 additions and 1282 deletions

View file

@ -7056,13 +7056,6 @@
githubId = 449813;
name = "Roman Kuznetsov";
};
kvark = {
name = "Dzmitry Malyshau";
email = "kvark@fastmail.com";
matrix = "@kvark:matrix.org";
github = "kvark";
githubId = 107301;
};
kwohlfahrt = {
email = "kai.wohlfahrt@gmail.com";
github = "kwohlfahrt";

View file

@ -72,6 +72,6 @@ buildPythonApplication rec {
'';
homepage = "https://tabatkins.github.io/bikeshed/";
license = licenses.cc0;
maintainers = [ maintainers.kvark ];
maintainers = [];
};
}

View file

@ -53,7 +53,7 @@ buildPythonApplication rec {
'';
homepage = "https://moz-conduit.readthedocs.io/en/latest/phabricator-user.html";
license = licenses.mpl20;
maintainers = [ maintainers.kvark ];
maintainers = [];
platforms = platforms.unix;
};
}

View file

@ -1,8 +1,8 @@
{
"stable": {
"version": "102.0.5005.61",
"sha256": "07vbi3gn9g4n04b2qi2hm34r122snrqaifa46yk3pyh1d79rfdqs",
"sha256bin64": "100n8k3d9k5bq58irc36ig6m5m0lxggffyk4crqqqcib2anqd0zv",
"version": "102.0.5005.115",
"sha256": "1rj7vy824vn513hiivc90lnxvxyi2s0qkdmfqsdssv9v6zjl079h",
"sha256bin64": "0b32sscbjnvr98lk962i9k2srckv2s7fp9pifmsv5jlwndjhzm7y",
"deps": {
"gn": {
"version": "2022-04-14",
@ -12,16 +12,16 @@
}
},
"chromedriver": {
"version": "102.0.5005.27",
"sha256_linux": "1978xwj9kf8nihgakmnzgibizq6wp74qp2d2fxgrsgggjy1clmbv",
"sha256_darwin": "0abnqpdm5hgirzj9g2zwkjcc7cwnnr3va4qn09g5yqndlbvi9nqd",
"sha256_darwin_aarch64": "0mw7vypghnw3qdci8g11hgfwbfln471dq1mymxn4bi7691xxb6a2"
"version": "102.0.5005.61",
"sha256_linux": "0fzmvggb4jkjx8cdanarlqqava8xdf3z5wrx560x7772pgd7q02b",
"sha256_darwin": "1y6wq5waivrc5svlwj1svcsh0w72lp68kid52q4qwi044d0l25jg",
"sha256_darwin_aarch64": "03xvmix3hkzlvsv1k5yai2hvsvv60in59n3wdwxkb79fdnkpr3i3"
}
},
"beta": {
"version": "103.0.5060.33",
"sha256": "00s9nwy5y2vik08snqxv1wbajllb7d81bryl5v4miyihjs511zjb",
"sha256bin64": "1l1fmfsl6ms4ps6sixp6chq3p6spik2fsvz5njvj1zf84p90mx4l",
"version": "103.0.5060.42",
"sha256": "0275n5g8j4sha98drjwlm6d2smwm3nmpmfpszi16cx59m6zylncq",
"sha256bin64": "0pq41iv296mk508yc1snvm5a4fvgs9y85gk2w45w973g5maipzgf",
"deps": {
"gn": {
"version": "2022-05-11",
@ -32,15 +32,15 @@
}
},
"dev": {
"version": "104.0.5098.0",
"sha256": "1h5szy6jp2n55m0fs2czdlldgkgyrqsnkfhhpwxzl8fyanlpw1hj",
"sha256bin64": "1w97mkdz3ab9wxw7fj5fpm8cjazdpb0s715c85hd3h0wrvwm1g8p",
"version": "104.0.5110.0",
"sha256": "12qdwkrhnjykmjc0q42xwq0cz1mllb3bv3ajp53pdpkjb6c3dvf1",
"sha256bin64": "0zg9n2z9pccw42gsd2fqs5ifvk2kkr4yznpz04839grs4bdsdv0j",
"deps": {
"gn": {
"version": "2022-05-31",
"version": "2022-06-08",
"url": "https://gn.googlesource.com/gn",
"rev": "37baefb026b199605affa7bcb24810d1724ce373",
"sha256": "166ciclcp77vn7k4k8nvb7xn1clddbrk35am4hqiayfya57yal3c"
"rev": "fd6cae41bd7d5d255dc2fb96004a8bf74ac9d972",
"sha256": "04v7hrxy48q7awj6in5q6j3nr05anjq9ldx71ky6lgla10yyzx7m"
}
}
},

View file

@ -3,10 +3,10 @@
rec {
firefox = buildMozillaMach rec {
pname = "firefox";
version = "101.0";
version = "101.0.1";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "fffe7e0940c1443fcdc5b205677764cb4e04b29f33fcfafb2857d383700584f309806b81fc4989efb56cc12a3cca1ff7d451b647050c43e98777b5c952ed5d56";
sha512 = "435a7f6013582933e75c41e554a45beda30b5affd7d3ed7d2876026609ba7f17b2c20b507d9d0c9ce2379e335ec09b021257ba30ac55fabf02dca54b03ea70b4";
};
meta = {

View file

@ -243,19 +243,19 @@ rec {
# Get revisions from
# https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/*
docker_20_10 = callPackage dockerGen rec {
version = "20.10.16";
version = "20.10.17";
rev = "v${version}";
sha256 = "sha256-Sktjh1JabeXrmWljLe5G934cxgChN0u3vdmQXasEFro=";
sha256 = "sha256-YCuohqtE4rbGyboVRyxvpqs93IS1k7aUTPdtHIlkUU8=";
moby-src = fetchFromGitHub {
owner = "moby";
repo = "moby";
rev = "v${version}";
sha256 = "sha256-3dog2aGbFKiYzsPTXkG+bo9xjTWZYlmWxtrqXjdzO2s=";
sha256 = "sha256-7SQubrbMvXSN3blcCW47F9OnjuKZxdXM5O/lE85zx0I=";
};
runcRev = "v1.1.1";
runcSha256 = "sha256-6g2km+Y45INo2MTWMFFQFhfF8DAR5Su+YrJS8k3LYBY=";
containerdRev = "v1.6.4";
containerdSha256 = "sha256-425BcVHCliAHFQqGn6sWH/ahDX3JR6l/sYZWHpgmZW0=";
runcRev = "v1.1.2";
runcSha256 = "sha256-tMneqB81w8lQp5RWWCjALyKbOY3xog+oqb6cYKasG/8=";
containerdRev = "v1.6.6";
containerdSha256 = "sha256-cmarbad6VzcGTCHT/NtApkYsK/oo6WZQ//q8Fvh+ez8=";
tiniRev = "v0.19.0";
tiniSha256 = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI=";
};

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "closure-compiler";
version = "20220202";
version = "20220502";
src = fetchurl {
url = "mirror://maven/com/google/javascript/closure-compiler/v${version}/closure-compiler-v${version}.jar";
sha256 = "sha256-I9kcK9oL6AMStI7eGfruJ+CYQuAsVsixTzkh0JWJrw8=";
sha256 = "sha256-ha0y/voqnYpZ7VmAkfZ/r/Iw7KAV+2ELOfWCpFjOdd4=";
};
dontUnpack = true;

View file

@ -17,7 +17,7 @@
stdenv.mkDerivation rec {
pname = "libxmlb";
version = "0.3.8";
version = "0.3.9";
outputs = [ "out" "lib" "dev" "devdoc" "installedTests" ];
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
owner = "hughsie";
repo = "libxmlb";
rev = version;
sha256 = "vT/NGFDzP0ut+TKD8pYVQrjTkepzKEJUo3uKF4MX334=";
sha256 = "sha256-4WTuwxpIsE7gHXFiuWuZeu2JMGzPLpsmS1KTEdR3ztg=";
};
patches = [

View file

@ -3,16 +3,20 @@
, fetchPypi
, azure-mgmt-common
, azure-mgmt-core
, pythonOlder
}:
buildPythonPackage rec {
version = "27.0.0";
pname = "azure-mgmt-compute";
version = "27.1.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "sha256-n+MQJ0ZeQ/hyS2G8CrNCtoxbvcfrIXmn4LXB/V6JXT0=";
hash = "sha256-ixTWYs1hecmvuXrMbW1hXFsH9/nd7HjPUMSl3seXy7E=";
};
propagatedBuildInputs = [
@ -20,12 +24,16 @@ buildPythonPackage rec {
azure-mgmt-core
];
pythonNamespaces = [ "azure.mgmt" ];
pythonNamespaces = [
"azure.mgmt"
];
# has no tests
doCheck = false;
pythonImportsCheck = [ "azure.mgmt.compute" ];
pythonImportsCheck = [
"azure.mgmt.compute"
];
meta = with lib; {
description = "This is the Microsoft Azure Compute Management Client Library";

View file

@ -63,6 +63,6 @@ buildPythonPackage rec {
description = "Tools for parsing the metadata for Mozilla's glean telemetry SDK";
homepage = "https://github.com/mozilla/glean_parser";
license = licenses.mpl20;
maintainers = with maintainers; [ kvark ];
maintainers = with maintainers; [];
};
}

View file

@ -63,6 +63,6 @@ buildPythonPackage rec {
description = "Telemetry client libraries and are a part of the Glean project";
homepage = "https://mozilla.github.io/glean/book/index.html";
license = licenses.mpl20;
maintainers = with maintainers; [ kvark ];
maintainers = [];
};
}

View file

@ -35,6 +35,6 @@ buildPythonPackage rec {
description = "Client class for calling http+json APIs in Python";
homepage = "https://github.com/plinss/json_home_client";
license = licenses.mit;
maintainers = [ maintainers.kvark ];
maintainers = [];
};
}

View file

@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "msgpack-numpy";
version = "0.4.7.1";
version = "0.4.8";
src = fetchPypi {
inherit pname version;
sha256 = "7eaf51acf82d7c467d21aa71df94e1c051b2055e54b755442051b474fa7cf5e1";
sha256 = "sha256-xmfTGAUTQi+cdUW+XuxdKW3Ls1fgb3LtOcxoN5dVbmk=";
};
buildInputs = [

View file

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "pyhiveapi";
version = "0.5.5";
version = "0.5.9";
format = "pyproject";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "Pyhass";
repo = "Pyhiveapi";
rev = "v${version}";
hash = "sha256-tihIgEjtsAmSjQZMWNaUynrDwZsiM5P3EvgxUhsSEv0=";
hash = "sha256-bJ9PI16m8JiXbhhNWtSJwwE+GRUbnSiCrcVhxnVeqQY=";
};
postPatch = ''

View file

@ -27,6 +27,6 @@ buildPythonPackage rec {
description = "Library with a fast, convenient interface to Mercurial. It uses Mercurials command server for communication with hg.";
homepage = "https://www.mercurial-scm.org/wiki/PythonHglibs";
license = licenses.mit;
maintainers = [ maintainers.kvark ];
maintainers = [];
};
}

View file

@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "pywlroots";
version = "0.15.15";
version = "0.15.17";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "Xg1Bd9Q6XV/+vuJH9Huiq2+igdAE/RS8yTvLeJz1l34=";
sha256 = "mDD2PLlq1rVlgYrLIN88MwAEVE/hU/K0mrTszpXQ30g=";
};
nativeBuildInputs = [ pkg-config ];

View file

@ -40,6 +40,6 @@ buildPythonPackage rec {
description = "A simple Result type for Python 3 inspired by Rust, fully type annotated";
homepage = "https://github.com/rustedpy/result";
license = licenses.mit;
maintainers = [ maintainers.kvark ];
maintainers = [];
};
}

View file

@ -25,6 +25,6 @@ buildPythonPackage rec {
description = "An implementation of RFC 6570 URI Templates";
homepage = "https://github.com/plinss/uri_template/";
license = licenses.mit;
maintainers = [ maintainers.kvark ];
maintainers = [];
};
}

View file

@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "Stand-alone WebIDL Parser in Python";
homepage = "https://github.com/plinss/widlparser";
license = licenses.mit;
maintainers = [ maintainers.kvark ];
maintainers = [];
};
}

View file

@ -1,6 +1,7 @@
{ lib
, fetchFromGitLab
, gobject-introspection
, pciutils
, python3Packages
, gtk3
, wrapGAppsHook
@ -9,21 +10,21 @@
, desktop-file-utils
, xdg-utils
, xdg-user-dirs
, wine
, gettext
, winetricks
, pciutils
, wine
, glxinfo
}:
python3Packages.buildPythonApplication rec {
pname = "grapejuice";
version = "4.10.2";
version = "5.1.1";
src = fetchFromGitLab {
owner = "BrinkerVII";
repo = "grapejuice";
rev = "9a7cf806d35b4d53b3d3762339eba7d861b5043d";
sha256 = "sha256-cKZv9qPCnl7i4kb6PG8RYx3HNLcwgI4d2zkw899MA6E=";
rev = "v${version}";
sha256 = "sha256-31pxQtKw5sLGnnNdboF7AAIFqsan5pXKHIHtKq/ErRE=";
};
nativeBuildInputs = [
@ -36,16 +37,19 @@ python3Packages.buildPythonApplication rec {
buildInputs = [
cairo
gettext
];
propagatedBuildInputs = with python3Packages; [
requests
pygobject3
dbus-python
packaging
psutil
dbus-python
pygobject3
packaging
wheel
setuptools
requests
unidecode
click
];
dontWrapGApps = true;
@ -58,6 +62,7 @@ python3Packages.buildPythonApplication rec {
postPatch = ''
substituteInPlace src/grapejuice_common/assets/desktop/grapejuice.desktop \
--replace \$GRAPEJUICE_EXECUTABLE "$out/bin/grapejuice" \
--replace \$GRAPEJUICE_GUI_EXECUTABLE "$out/bin/grapejuice-gui" \
--replace \$GRAPEJUICE_ICON grapejuice
substituteInPlace src/grapejuice_common/assets/desktop/roblox-player.desktop \
@ -71,6 +76,12 @@ python3Packages.buildPythonApplication rec {
substituteInPlace src/grapejuice_common/assets/desktop/roblox-studio.desktop \
--replace \$GRAPEJUICE_EXECUTABLE "$out/bin/grapejuice" \
--replace \$STUDIO_ICON "grapejuice-roblox-studio"
substituteInPlace src/grapejuice_common/paths.py \
--replace 'return local_share() / "locale"' 'return Path("${placeholder "out"}/share/locale")'
substituteInPlace src/grapejuice_common/features/settings.py \
--replace 'k_default_wine_home: "",' 'k_default_wine_home: "${wine}",'
'';
postInstall = ''
@ -78,6 +89,23 @@ python3Packages.buildPythonApplication rec {
cp -r src/grapejuice_common/assets/desktop/* $out/share/applications/
cp -r src/grapejuice_common/assets/icons $out/share/
cp src/grapejuice_common/assets/mime_xml/*.xml $out/share/mime/packages/
# compile locales (*.po -> *.mo)
# from https://gitlab.com/brinkervii/grapejuice/-/blob/master/src/grapejuice_common/util/mo_util.py
LOCALE_DIR="$out/share/locale"
PO_DIR="src/grapejuice_common/assets/po"
LINGUAS_FILE="src/grapejuice_common/assets/po/LINGUAS"
for lang in $(<"$LINGUAS_FILE") # extract langs from LINGUAS_FILE
do
po_file="$PO_DIR/$lang.po"
mo_file_dir="$LOCALE_DIR/$lang/LC_MESSAGES"
mkdir -p $mo_file_dir
mo_file="$mo_file_dir/grapejuice.mo"
msgfmt $po_file -o $mo_file # msgfmt from gettext
done
'';
# No tests
@ -87,9 +115,9 @@ python3Packages.buildPythonApplication rec {
meta = with lib; {
homepage = "https://gitlab.com/brinkervii/grapejuice";
description = "A wine+Roblox management application";
description = "Simple Wine+Roblox management tool";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ artturin ];
maintainers = with maintainers; [ artturin helium ];
};
}

View file

@ -1,5 +1,5 @@
diff --git a/data/meson.build b/data/meson.build
index 2ae29ce5..342cac92 100644
index 9176aa34..1a0298a9 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -26,7 +26,7 @@ endif
@ -12,7 +12,7 @@ index 2ae29ce5..342cac92 100644
install_data(['power.quirk', 'cfi.quirk'],
install_dir: join_paths(datadir, 'fwupd', 'quirks.d'))
diff --git a/data/pki/meson.build b/data/pki/meson.build
index 2a7d0f24..091981f7 100644
index 499b7201..1be13607 100644
--- a/data/pki/meson.build
+++ b/data/pki/meson.build
@@ -12,13 +12,13 @@ install_data([
@ -31,7 +31,7 @@ index 2a7d0f24..091981f7 100644
)
endif
@@ -26,11 +26,11 @@ if supported_pkcs7 == '1'
@@ -26,11 +26,11 @@ if supported_pkcs7
install_data([
'LVFS-CA.pem',
],
@ -46,7 +46,7 @@ index 2a7d0f24..091981f7 100644
)
endif
diff --git a/data/remotes.d/meson.build b/data/remotes.d/meson.build
index 02d8777b..2c89d593 100644
index 87e794b1..ebeeeca7 100644
--- a/data/remotes.d/meson.build
+++ b/data/remotes.d/meson.build
@@ -2,7 +2,7 @@ if build_standalone and get_option('lvfs') != 'false'
@ -83,10 +83,10 @@ index 02d8777b..2c89d593 100644
+ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),
)
diff --git a/meson.build b/meson.build
index 394f40fa..7b602c73 100644
index b91dd037..a8de7810 100644
--- a/meson.build
+++ b/meson.build
@@ -187,6 +187,12 @@ endif
@@ -195,6 +195,12 @@ endif
mandir = join_paths(prefix, get_option('mandir'))
localedir = join_paths(prefix, get_option('localedir'))
@ -100,16 +100,16 @@ index 394f40fa..7b602c73 100644
gio = dependency('gio-2.0', version : '>= 2.45.8')
giounix = dependency('gio-unix-2.0', version : '>= 2.45.8', required: false)
diff --git a/meson_options.txt b/meson_options.txt
index c1b483cb..047dbdd8 100644
index d00038db..c84652ca 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,3 +1,4 @@
+option('sysconfdir_install', type: 'string', value: '', description: 'sysconfdir to use during installation')
option('build', type : 'combo', choices : ['all', 'standalone', 'library'], value : 'all', description : 'build type')
option('consolekit', type : 'boolean', value : true, description : 'enable ConsoleKit support')
option('consolekit', type : 'feature', description : 'ConsoleKit support', deprecated: {'true': 'enabled', 'false': 'disabled'})
option('static_analysis', type : 'boolean', value : false, description : 'enable GCC static analysis support')
diff --git a/plugins/dell-esrt/meson.build b/plugins/dell-esrt/meson.build
index e9f12879..a0126dbb 100644
index 00b7ecda..789f34ca 100644
--- a/plugins/dell-esrt/meson.build
+++ b/plugins/dell-esrt/meson.build
@@ -38,6 +38,6 @@ configure_file(
@ -121,7 +121,7 @@ index e9f12879..a0126dbb 100644
)
endif
diff --git a/plugins/msr/meson.build b/plugins/msr/meson.build
index 3ea47456..40dbd116 100644
index 1a278375..f57ae530 100644
--- a/plugins/msr/meson.build
+++ b/plugins/msr/meson.build
@@ -12,7 +12,7 @@ install_data(['fwupd-msr.conf'],
@ -134,10 +134,10 @@ index 3ea47456..40dbd116 100644
shared_module('fu_plugin_msr',
fu_hash,
diff --git a/plugins/redfish/meson.build b/plugins/redfish/meson.build
index 4a0a8664..7d9ba77d 100644
index 8717d50f..9a703723 100644
--- a/plugins/redfish/meson.build
+++ b/plugins/redfish/meson.build
@@ -53,7 +53,7 @@ shared_module('fu_plugin_redfish',
@@ -51,7 +51,7 @@ shared_module('fu_plugin_redfish',
)
install_data(['redfish.conf'],
@ -147,10 +147,10 @@ index 4a0a8664..7d9ba77d 100644
if get_option('tests')
diff --git a/plugins/thunderbolt/meson.build b/plugins/thunderbolt/meson.build
index 1ba9562f..c074f770 100644
index aa6c8ce1..61734c4d 100644
--- a/plugins/thunderbolt/meson.build
+++ b/plugins/thunderbolt/meson.build
@@ -37,7 +37,7 @@ fu_plugin_thunderbolt = shared_module('fu_plugin_thunderbolt',
@@ -35,7 +35,7 @@ fu_plugin_thunderbolt = shared_module('fu_plugin_thunderbolt',
)
install_data(['thunderbolt.conf'],
@ -158,9 +158,9 @@ index 1ba9562f..c074f770 100644
+ install_dir: join_paths(sysconfdir_install, 'fwupd')
)
# we use functions from 2.52 in the tests
if get_option('tests') and umockdev.found() and gio.version().version_compare('>= 2.52')
if get_option('tests') and run_sanitize_unsafe_tests and umockdev.found() and gio.version().version_compare('>= 2.52')
diff --git a/plugins/uefi-capsule/meson.build b/plugins/uefi-capsule/meson.build
index 04cbd51a..9a8c43de 100644
index 2d9ba819..0feb5f6b 100644
--- a/plugins/uefi-capsule/meson.build
+++ b/plugins/uefi-capsule/meson.build
@@ -21,7 +21,7 @@ if host_machine.system() == 'linux'
@ -172,7 +172,7 @@ index 04cbd51a..9a8c43de 100644
)
elif host_machine.system() == 'freebsd'
backend_srcs += 'fu-uefi-backend-freebsd.c'
@@ -114,7 +114,7 @@ if get_option('compat_cli') and get_option('man')
@@ -112,7 +112,7 @@ if get_option('compat_cli') and get_option('man')
endif
install_data(['uefi_capsule.conf'],

View file

@ -117,7 +117,7 @@ let
self = stdenv.mkDerivation rec {
pname = "fwupd";
version = "1.8.0";
version = "1.8.1";
# libfwupd goes to lib
# daemon, plug-ins and libfwupdplugin go to out
@ -126,7 +126,7 @@ let
src = fetchurl {
url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
sha256 = "LAliLnOSowtORQQ0M4z2cNQzKMLyE/RsX//xAWifrps=";
sha256 = "sha256-V1ZGZELrkTT7QM3IpG+eAQAyR8jqyC+l2LFvZCA3W3k=";
};
patches = [

View file

@ -1,10 +1,10 @@
diff --git a/meson.build b/meson.build
index 4330512e..e53b70ab 100644
index b91dd037..01d70a61 100644
--- a/meson.build
+++ b/meson.build
@@ -403,7 +403,7 @@ endif
if build_standalone and get_option('plugin_uefi_capsule')
efiboot = dependency('efiboot')
@@ -413,7 +413,7 @@ if build_standalone and efiboot.found() and efivar.found()
conf.set('HAVE_EFI_TIME_T', '1')
endif
- efi_app_location = join_paths(libexecdir, 'fwupd', 'efi')
+ efi_app_location = join_paths(dependency('fwupd-efi').get_pkgconfig_variable('prefix'), 'libexec', 'fwupd', 'efi')

View file

@ -1,10 +1,10 @@
diff --git a/libfwupdplugin/meson.build b/libfwupdplugin/meson.build
index d6a2ed68..12c82a95 100644
index 1afa28e1..3da81d30 100644
--- a/libfwupdplugin/meson.build
+++ b/libfwupdplugin/meson.build
@@ -216,7 +216,8 @@ fwupdplugin = library(
@@ -220,7 +220,8 @@ fwupdplugin = library(
],
link_args : vflag,
link_args : cc.get_supported_link_arguments([vflag]),
link_depends : fwupdplugin_mapfile,
- install : true
+ install : true,
@ -12,7 +12,7 @@ index d6a2ed68..12c82a95 100644
)
fwupdplugin_pkgg = import('pkgconfig')
@@ -276,7 +277,8 @@ if get_option('introspection')
@@ -280,7 +281,8 @@ if introspection.allowed()
girtargets,
fwupd_gir[0],
],
@ -23,10 +23,10 @@ index d6a2ed68..12c82a95 100644
# Verify the map file is correct -- note we can't actually use the generated
diff --git a/meson.build b/meson.build
index 38aa36b0..3fb7e579 100644
index b91dd037..f97b4c26 100644
--- a/meson.build
+++ b/meson.build
@@ -521,7 +521,7 @@ if build_standalone
@@ -504,7 +504,7 @@ if build_standalone
if host_machine.system() == 'windows'
plugin_dir = 'fwupd-plugins-@0@'.format(libfwupdplugin_lt_current)
else

View file

@ -1,5 +1,5 @@
diff --git a/data/installed-tests/meson.build b/data/installed-tests/meson.build
index b8ec916f0..38209b363 100644
index b8ec916f..38209b36 100644
--- a/data/installed-tests/meson.build
+++ b/data/installed-tests/meson.build
@@ -83,5 +83,5 @@ configure_file(
@ -10,10 +10,10 @@ index b8ec916f0..38209b363 100644
+ install_dir: join_paths(get_option('installed_test_prefix'), 'etc', 'fwupd', 'remotes.d'),
)
diff --git a/meson.build b/meson.build
index d8bd9fdc7..ff924d373 100644
index b91dd037..d7e20b18 100644
--- a/meson.build
+++ b/meson.build
@@ -187,8 +187,8 @@ else
@@ -188,8 +188,8 @@ else
datadir = join_paths(prefix, get_option('datadir'))
sysconfdir = join_paths(prefix, get_option('sysconfdir'))
localstatedir = join_paths(prefix, get_option('localstatedir'))
@ -21,10 +21,10 @@ index d8bd9fdc7..ff924d373 100644
- installed_test_datadir = join_paths(datadir, 'installed-tests', meson.project_name())
+ installed_test_bindir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests', meson.project_name())
+ installed_test_datadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', meson.project_name())
daemon_dir = join_paths(libexecdir, 'fwupd')
endif
mandir = join_paths(prefix, get_option('mandir'))
localedir = join_paths(prefix, get_option('localedir'))
@@ -487,6 +487,7 @@ gnome = import('gnome')
@@ -492,6 +492,7 @@ gnome = import('gnome')
i18n = import('i18n')
conf.set_quoted('FWUPD_PREFIX', prefix)
@ -33,7 +33,7 @@ index d8bd9fdc7..ff924d373 100644
conf.set_quoted('FWUPD_LIBDIR', libdir)
conf.set_quoted('FWUPD_LIBEXECDIR', libexecdir)
diff --git a/meson_options.txt b/meson_options.txt
index d00038dbc..be1c45b40 100644
index d00038db..be1c45b4 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -56,6 +56,7 @@ option('systemd', type : 'feature', description : 'systemd support', deprecated:
@ -45,7 +45,7 @@ index d00038dbc..be1c45b40 100644
option('soup_session_compat', type : 'boolean', value : true, description : 'enable SoupSession runtime compatibility support')
option('curl', type : 'feature', description : 'libcurl support', deprecated: {'true': 'enabled', 'false': 'disabled'})
diff --git a/plugins/redfish/fu-self-test.c b/plugins/redfish/fu-self-test.c
index 4d19e560f..91cfaa616 100644
index 4d19e560..91cfaa61 100644
--- a/plugins/redfish/fu-self-test.c
+++ b/plugins/redfish/fu-self-test.c
@@ -27,7 +27,7 @@ fu_test_is_installed_test(void)

View file

@ -25,7 +25,7 @@ mkYarnPackage rec {
runHook preBuild
pushd deps/renderer
npm run build
yarn run build
popd
runHook postBuild