summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2022-02-03 09:00:32 +0000
committerSam James <sam@gentoo.org>2022-02-03 09:00:32 +0000
commit7630b95d0d2d9d9d825d39081b282cd6c280bfa2 (patch)
treeb017de3673cbcfd9426e8e5d5783d7cab8ba983a /gnome-extra
parentapp-text/libnumbertext: Drop 1.0.7 (diff)
downloadgentoo-7630b95d0d2d9d9d825d39081b282cd6c280bfa2.tar.gz
gentoo-7630b95d0d2d9d9d825d39081b282cd6c280bfa2.tar.bz2
gentoo-7630b95d0d2d9d9d825d39081b282cd6c280bfa2.zip
gnome-extra/gnome-shell-extensions: fix build with meson 0.61
Closes: https://bugs.gentoo.org/831938 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'gnome-extra')
-rw-r--r--gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-41.1-meson-0.61.patch12
-rw-r--r--gnome-extra/gnome-shell-extensions/gnome-shell-extensions-41.1.ebuild4
2 files changed, 16 insertions, 0 deletions
diff --git a/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-41.1-meson-0.61.patch b/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-41.1-meson-0.61.patch
new file mode 100644
index 000000000000..692f828ecd7f
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-41.1-meson-0.61.patch
@@ -0,0 +1,12 @@
+Rebased version of https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/commit/cdaa837d48894737ca0b4e7d2dfb365119e53759
+https://bugs.gentoo.org/831938
+
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,5 +1,5 @@
+ session_desktop = 'gnome-classic.desktop'
+-i18n.merge_file('',
++i18n.merge_file(
+ input: session_desktop + '.in',
+ output: session_desktop,
+ po_dir: '../po',
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-41.1.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-41.1.ebuild
index aea37b082f55..286bd9385b2d 100644
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-41.1.ebuild
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-41.1.ebuild
@@ -46,6 +46,10 @@ https://extensions.gnome.org/ web interface, or modify the
org.gnome.shell enabled-extensions gsettings key from the command
line or a script."
+PATCHES=(
+ "${FILESDIR}"/${P}-meson-0.61.patch
+)
+
src_configure() {
meson_src_configure \
-Dextension_set=all \