diff options
-rw-r--r-- | meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks/0001-Make-python-path-configurable.patch | 6 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks_40.0.bb (renamed from meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks_3.34.0.bb) | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks/0001-Make-python-path-configurable.patch b/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks/0001-Make-python-path-configurable.patch index 8129f85a4d..733249c7e6 100644 --- a/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks/0001-Make-python-path-configurable.patch +++ b/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks/0001-Make-python-path-configurable.patch | |||
@@ -16,14 +16,14 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> | |||
16 | create mode 100644 meson_options.txt | 16 | create mode 100644 meson_options.txt |
17 | 17 | ||
18 | diff --git a/meson.build b/meson.build | 18 | diff --git a/meson.build b/meson.build |
19 | index b7da518..d58fb5b 100644 | 19 | index 5b824e9..a673d9c 100644 |
20 | --- a/meson.build | 20 | --- a/meson.build |
21 | +++ b/meson.build | 21 | +++ b/meson.build |
22 | @@ -13,7 +13,7 @@ bindir = join_paths(prefix, get_option('bindir')) | 22 | @@ -18,7 +18,7 @@ bindir = join_paths(prefix, get_option('bindir')) |
23 | datadir = join_paths(prefix, get_option('datadir')) | 23 | datadir = join_paths(prefix, get_option('datadir')) |
24 | libexecdir = join_paths(prefix, get_option('libexecdir')) | 24 | libexecdir = join_paths(prefix, get_option('libexecdir')) |
25 | localedir = join_paths(prefix, get_option('localedir')) | 25 | localedir = join_paths(prefix, get_option('localedir')) |
26 | -pythondir = join_paths(prefix, python3.sysconfig_path('purelib')) | 26 | -pythondir = join_paths(prefix, python3.get_path('purelib')) |
27 | +pythondir = get_option('python_site_dir') | 27 | +pythondir = get_option('python_site_dir') |
28 | 28 | ||
29 | pkgdatadir = join_paths(datadir, meson.project_name()) | 29 | pkgdatadir = join_paths(datadir, meson.project_name()) |
diff --git a/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks_3.34.0.bb b/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks_40.0.bb index 0fa0b31704..530cfdcb36 100644 --- a/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks_3.34.0.bb +++ b/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks_40.0.bb | |||
@@ -9,7 +9,7 @@ DEPENDS = "libhandy" | |||
9 | 9 | ||
10 | GNOMEBASEBUILDCLASS = "meson" | 10 | GNOMEBASEBUILDCLASS = "meson" |
11 | 11 | ||
12 | inherit gnomebase gtk-icon-cache gobject-introspection features_check upstream-version-is-even | 12 | inherit gnomebase gtk-icon-cache gobject-introspection features_check |
13 | 13 | ||
14 | # same as gnome-shell | 14 | # same as gnome-shell |
15 | REQUIRED_DISTRO_FEATURES = "x11 polkit systemd pam" | 15 | REQUIRED_DISTRO_FEATURES = "x11 polkit systemd pam" |
@@ -18,8 +18,7 @@ REQUIRED_DISTRO_FEATURES = "x11 polkit systemd pam" | |||
18 | REQUIRED_DISTRO_FEATURES += "gobject-introspection-data" | 18 | REQUIRED_DISTRO_FEATURES += "gobject-introspection-data" |
19 | UNKNOWN_CONFIGURE_WHITELIST:append = " introspection" | 19 | UNKNOWN_CONFIGURE_WHITELIST:append = " introspection" |
20 | 20 | ||
21 | SRC_URI[archive.md5sum] = "a625d8b167c5549c68e1c6ac7a87d369" | 21 | SRC_URI[archive.sha256sum] = "f95f3fe031b0b01c02f79a1659f889152d3772ae3e44df8403d1460ba5eec36a" |
22 | SRC_URI[archive.sha256sum] = "003326fab46e6faad9485924bca503f0c583e3b4553d6f673406eda396205250" | ||
23 | SRC_URI += "file://0001-Make-python-path-configurable.patch" | 22 | SRC_URI += "file://0001-Make-python-path-configurable.patch" |
24 | 23 | ||
25 | EXTRA_OEMESON = "-Dpython_site_dir=${PYTHON_SITEPACKAGES_DIR}" | 24 | EXTRA_OEMESON = "-Dpython_site_dir=${PYTHON_SITEPACKAGES_DIR}" |