diff options
| -rw-r--r-- | meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks/0002-meson-fix-invalid-positional-argument.patch | 33 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks_40.10.bb (renamed from meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks_40.0.bb) | 3 |
2 files changed, 1 insertions, 35 deletions
diff --git a/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks/0002-meson-fix-invalid-positional-argument.patch b/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks/0002-meson-fix-invalid-positional-argument.patch deleted file mode 100644 index d921ff3308..0000000000 --- a/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks/0002-meson-fix-invalid-positional-argument.patch +++ /dev/null | |||
| @@ -1,33 +0,0 @@ | |||
| 1 | From dc9701e18775c01d0b69fabaa350147f70096da8 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Mae Dartmann <hello@maedartmann.name> | ||
| 3 | Date: Wed, 16 Feb 2022 06:08:41 +0000 | ||
| 4 | Subject: [PATCH] meson: fix invalid positional argument | ||
| 5 | |||
| 6 | Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gnome-tweaks/-/commit/dc9701e18775c01d0b69fabaa350147f70096da8] | ||
| 7 | --- | ||
| 8 | data/meson.build | 4 ++-- | ||
| 9 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 10 | |||
| 11 | diff --git a/data/meson.build b/data/meson.build | ||
| 12 | index fd6d5da..74f7e82 100644 | ||
| 13 | --- a/data/meson.build | ||
| 14 | +++ b/data/meson.build | ||
| 15 | @@ -1,5 +1,5 @@ | ||
| 16 | appdata_file = 'org.gnome.tweaks.appdata.xml' | ||
| 17 | -i18n.merge_file(appdata_file, | ||
| 18 | +i18n.merge_file( | ||
| 19 | input: appdata_file + '.in', | ||
| 20 | output: appdata_file, | ||
| 21 | po_dir: '../po', | ||
| 22 | @@ -8,7 +8,7 @@ i18n.merge_file(appdata_file, | ||
| 23 | ) | ||
| 24 | |||
| 25 | desktop_file = 'org.gnome.tweaks.desktop' | ||
| 26 | -i18n.merge_file(desktop_file, | ||
| 27 | +i18n.merge_file( | ||
| 28 | input: desktop_file + '.in', | ||
| 29 | output: desktop_file, | ||
| 30 | po_dir: '../po', | ||
| 31 | -- | ||
| 32 | GitLab | ||
| 33 | |||
diff --git a/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks_40.0.bb b/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks_40.10.bb index 498d392e89..d0f00a85e6 100644 --- a/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks_40.0.bb +++ b/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks_40.10.bb | |||
| @@ -17,10 +17,9 @@ REQUIRED_DISTRO_FEATURES = "x11 polkit systemd pam" | |||
| 17 | REQUIRED_DISTRO_FEATURES += "gobject-introspection-data" | 17 | REQUIRED_DISTRO_FEATURES += "gobject-introspection-data" |
| 18 | GIR_MESON_OPTION = "" | 18 | GIR_MESON_OPTION = "" |
| 19 | 19 | ||
| 20 | SRC_URI[archive.sha256sum] = "f95f3fe031b0b01c02f79a1659f889152d3772ae3e44df8403d1460ba5eec36a" | 20 | SRC_URI[archive.sha256sum] = "cffd3b33a399577fbb4491ce8fbd02f54c5924f1056f30114e8d420290ef23fc" |
| 21 | SRC_URI += " \ | 21 | SRC_URI += " \ |
| 22 | file://0001-Make-python-path-configurable.patch \ | 22 | file://0001-Make-python-path-configurable.patch \ |
| 23 | file://0002-meson-fix-invalid-positional-argument.patch \ | ||
| 24 | " | 23 | " |
| 25 | 24 | ||
| 26 | EXTRA_OEMESON = "-Dpython_site_dir=${PYTHON_SITEPACKAGES_DIR}" | 25 | EXTRA_OEMESON = "-Dpython_site_dir=${PYTHON_SITEPACKAGES_DIR}" |
