diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-02-02 01:39:05 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-02-02 01:39:05 +0000 |
| commit | fcc5224904648a8e6eb528d7603154160a20022f (patch) | |
| tree | 3bfce096b38a9cea8eed13fc70c1526c456e9abd /gnome-base/gnome-settings-daemon | |
| parent | 2fd57282f0262ca084e05b0f2c63fbada395d02b (diff) | |
gentoo resync : 02.02.2022
Diffstat (limited to 'gnome-base/gnome-settings-daemon')
4 files changed, 38 insertions, 3 deletions
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest index a8f06c343161..4054113a4e7b 100644 --- a/gnome-base/gnome-settings-daemon/Manifest +++ b/gnome-base/gnome-settings-daemon/Manifest @@ -2,9 +2,10 @@ AUX gnome-settings-daemon-3.38.1-Allow-udev-optional-on-Linux.patch 4505 BLAKE2B AUX gnome-settings-daemon-3.38.1-build-Allow-NM-optional-on-Linux.patch 694 BLAKE2B e4f32a376c2b1c55a396504e98c8a69d512bb9161a854482aa877023a2761e59d3fc682d724398ffb53bc138b010c33276071359d42ac19bcac2d9af87d42eef SHA512 618ad312b54709d0f95e5d881c2896c156246ae41eee1925f76b0a398b7ce6815a7466f8587f2291b07f7a34d1a3e1afb7df33823d9b52ebe8ad46a3f5f1e84d AUX gnome-settings-daemon-3.38.1-build-Make-colord-and-wacom-optional-and-controllabl.patch 3096 BLAKE2B 44587b5a73c5c1a622a8e5a422f03da414856e79edce30056f56fe93a7dcea0ca5a84be737de7fe723f023bb65714d589f60819667432109a212fc03ec4c7b68 SHA512 5ebfd528f7c446c02bf2c4160b91600e7dc27a3f6c17fec071ab9a72c6e4fffc3ba81427bdf7ba10d19cb5059238ec798ab136711018bd3269bbd658ed1c0632 AUX gnome-settings-daemon-40.0.1-build-fix-str-bool-comparison.patch 909 BLAKE2B ae6115763a16d2ec54ad96c970f5b5a4df310a6818059ab9bb9e9a6f874f209ac05f17cd248e8a335631d9822a3df3de975d63704c458af0ccab3fd8da91b815 SHA512 7635b8c7370410921ae39a9f1278e45147261ad9a2b30b95ed07f1d08c9e0de86acdaafca99c04e4a78d646490f8f5356472887accff2d8e6057887ba52d8438 +AUX gnome-settings-daemon-41.0-meson-0.61-build.patch 843 BLAKE2B 0f922f7f35e6801795508d5cabfb388e091c436f97d4745eb93fa5f0ea71d53f73c341315f65d4af1855bbef08555201fd38cc01e6e2fcf32d997fd0f1e2dae8 SHA512 2eda9c6e9a2c5cd82dc16a95b8f8043db47f996b27f3c2d3d30b56476d5f5cd8fb125e31ea622d0efabdeb76d769050e33bbd41d97376fc024ab36919d5ac9c2 AUX org.gnome.settings-daemon.plugins.power.gschema.override 75 BLAKE2B 1c80bbb15e998de9f5fddc956dab862552ecc3734083391f124ef577dd2efb70e29efd230511cca83536dcd8c32118ecebcfe52b2927d6f0094540ec73a6ae23 SHA512 9c4b1e1b63b1a6d97eed962969704accca2fc53763a4b7806e2a3e4ff49ecc7d4a0d7f8253ff2e33d83e766908d852721ffa33f363aed7d04c20002bfdee173b DIST gnome-settings-daemon-40.0.1.tar.xz 1443100 BLAKE2B 2615165e4b33b3ae4f9ceac73fdd298ad5288b5de03424ade70a0dfd64b7349ae759138c0c930ba4c78ff70ed52389b2f0a996333234755f793dc114870d2460 SHA512 d5b7235e097baded66cbbc2c4f05effcac722daa09413f495368555ad97830746415c4c8f1ecfe54dac262f3b75ab1a83863dc4b736b9854dcf86c94c14edd79 DIST gnome-settings-daemon-41.0.tar.xz 1477876 BLAKE2B f17005b03cbee142434f0805e8f590d6d9edad0f09b3226bb40ab7e312ee13bcd46c211efb140303d4a351d8818238a28bd9aa3fe760fb617fb006e97eebde61 SHA512 2c6848a749f84fd0c3a9ade6f4a83ae3ff7464da429b2d73030c9dcbd278b070c40475c678c819e31464941f2bd38d81f11b96f24d0d1fb05271267c3a1ecc2a -EBUILD gnome-settings-daemon-40.0.1-r1.ebuild 3962 BLAKE2B 63026baa76a890c73f70118ab5b512e80741ffd5176b5a35e4dc3dd89b5e4b3ace64aafd54224a6f067e72a820e757b9c2783727fe92f82015528c5d3f9592c7 SHA512 8ed8580fcc318c467be4e4636901ec506647b45ec77d47bf49ae12079a9fa2d53340bb6933cd9e5485dc7a0d184155acf3b57b222241a34aa907ad77168219fa -EBUILD gnome-settings-daemon-41.0.ebuild 3914 BLAKE2B ced2ccbd573d5719ed05df639f916de572a0167946c44cd459419921eb588cb2ec1080f4838a5b4890655c62c55ef2850698a022fe4ab4b37a3304794d1858f0 SHA512 105c5d1219b34206021e8a49b393639f105ab7dc039181c2d263131d1f0870c885d32d2fe23f164faa0a9155c9bfe7c7c05d91d768df2748b07876a7a47edbca +EBUILD gnome-settings-daemon-40.0.1-r1.ebuild 4027 BLAKE2B 1fe7f17a64b22ed30d609727bbb45f4cc7fc55a28c310bb18293fa8bd90a4d0aa0085e5ca3070cb33fc41adec156f86501c3bc4b23f72109ec1e6f808a151363 SHA512 67e718c9a534ac94c2ba372918ff089671a8449e190f7448b67695f3f1c035459c485f8f89b0136e8dd4070a710989801161e3ca4372518023d421d6504af251 +EBUILD gnome-settings-daemon-41.0.ebuild 3957 BLAKE2B c84baf97c719b6abcd99c4757b62e161646db17496c3b746ab108cc46bb2d6f25ec297f919af0399f4363e59e4e56aaa08d2991bc7ab95801a90213c11075e2f SHA512 9d096e3e92120d337036f84843b64ad8b2fd04d056dec5727777ef493b2cfc1e7430f579bdf44b4574bc38fa05ed2eeaba3e36b6ac47bf00c1ef4d46bce638ee MISC metadata.xml 547 BLAKE2B ef7c1ef4b899bd7ba6f1d05b725a5c2205e949d03d41ae4922559e740fd94ecf767c25da34a9a45a4da796e336133ed250f675a525fec9db5fb53c4c7df35dd4 SHA512 ddc99a174f19c7c949cee4d130082572bcf71dc9c50d637cd94ea0f3609b9d032ff603552c2b077245cadc6cf03f8726cf81efe89fbf2e8b3e5293dcc572005c diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-41.0-meson-0.61-build.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-41.0-meson-0.61-build.patch new file mode 100644 index 000000000000..59aa0f433ae8 --- /dev/null +++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-41.0-meson-0.61-build.patch @@ -0,0 +1,32 @@ +https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/281.patch +https://bugs.gentoo.org/831431 + +From d88484002b5a0c8d2adccb2a5886a7da0a247d27 Mon Sep 17 00:00:00 2001 +From: Michal Vasilek <michal@vasilek.cz> +Date: Fri, 14 Jan 2022 23:55:06 +0100 +Subject: [PATCH] build: remove positional i18n.merge_file arguments + +otherwise building with meson 0.61+ fails: + + ERROR: Function does not take positional arguments. +--- a/plugins/power/meson.build ++++ b/plugins/power/meson.build +@@ -76,7 +76,6 @@ if host_is_linux + ) + + i18n.merge_file( +- policy, + input: policy_in, + output: policy, + po_dir: po_dir, +--- a/plugins/wacom/meson.build ++++ b/plugins/wacom/meson.build +@@ -7,7 +7,6 @@ policy_in = configure_file( + ) + + i18n.merge_file( +- policy, + input: policy_in, + output: policy, + po_dir: po_dir, +GitLab diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-40.0.1-r1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-40.0.1-r1.ebuild index 5ad49d3f30c6..b355aaa5d382 100644 --- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-40.0.1-r1.ebuild +++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-40.0.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -93,6 +93,7 @@ PATCHES=( "${FILESDIR}"/${PN}-3.38.1-build-Allow-NM-optional-on-Linux.patch "${FILESDIR}"/${PN}-3.38.1-Allow-udev-optional-on-Linux.patch "${FILESDIR}"/gnome-settings-daemon-40.0.1-build-fix-str-bool-comparison.patch + "${FILESDIR}"/gnome-settings-daemon-41.0-meson-0.61-build.patch ) python_check_deps() { diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-41.0.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-41.0.ebuild index b0e196bea8d6..f5bbb821b4c3 100644 --- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-41.0.ebuild +++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-41.0.ebuild @@ -93,6 +93,7 @@ PATCHES=( "${FILESDIR}"/${PN}-3.38.1-build-Make-colord-and-wacom-optional-and-controllabl.patch "${FILESDIR}"/${PN}-3.38.1-build-Allow-NM-optional-on-Linux.patch "${FILESDIR}"/${PN}-3.38.1-Allow-udev-optional-on-Linux.patch + "${FILESDIR}"/${P}-meson-0.61-build.patch ) python_check_deps() { |