summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2022-01-24 10:01:46 -0800
committerKhem Raj <raj.khem@gmail.com>2022-01-25 09:13:09 -0800
commitdc0796487b338c0f801d1c57cc1b832f46da0aac (patch)
tree6a57abbe80024878cf492bea4ba6eca5d6cb87e2
parente9f5b21fd54a1fab455eff96e15d8c32a235fa38 (diff)
downloadmeta-openembedded-dc0796487b338c0f801d1c57cc1b832f46da0aac.tar.gz
xfce4-datetime-setter: Fix build with meson 0.61+
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-xfce/recipes-apps/xfce4-datetime-setter/files/0001-Fix-build-with-meson-0.61.patch26
-rw-r--r--meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb1
2 files changed, 27 insertions, 0 deletions
diff --git a/meta-xfce/recipes-apps/xfce4-datetime-setter/files/0001-Fix-build-with-meson-0.61.patch b/meta-xfce/recipes-apps/xfce4-datetime-setter/files/0001-Fix-build-with-meson-0.61.patch
new file mode 100644
index 0000000000..617d175579
--- /dev/null
+++ b/meta-xfce/recipes-apps/xfce4-datetime-setter/files/0001-Fix-build-with-meson-0.61.patch
@@ -0,0 +1,26 @@
1From d463b7e9abbbc87ec0e25216a24d9a40d347f1a6 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 24 Jan 2022 09:59:02 -0800
4Subject: [PATCH] Fix build with meson >= 0.61
5
6Upstream-Status: Submitted [https://github.com/schnitzeltony/xfce4-datetime-setter/pull/3]
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8---
9 panels/datetime/meson.build | 1 -
10 1 file changed, 1 deletion(-)
11
12diff --git a/panels/datetime/meson.build b/panels/datetime/meson.build
13index 241e177..4356907 100644
14--- a/panels/datetime/meson.build
15+++ b/panels/datetime/meson.build
16@@ -10,7 +10,6 @@ desktop_in = configure_file(
17 )
18
19 i18n.merge_file(
20- desktop,
21 type: 'desktop',
22 input: desktop_in,
23 output: 'xfce-datetime.desktop',
24--
252.34.1
26
diff --git a/meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb b/meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb
index 4ae83ceca1..9d68ad272b 100644
--- a/meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb
+++ b/meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb
@@ -8,6 +8,7 @@ DEPENDS = "glib-2.0-native libxfce4ui"
8 8
9SRC_URI = "git://github.com/schnitzeltony/xfce4-datetime-setter.git;protocol=https;branch=master \ 9SRC_URI = "git://github.com/schnitzeltony/xfce4-datetime-setter.git;protocol=https;branch=master \
10 file://fix-inner-dependency.patch \ 10 file://fix-inner-dependency.patch \
11 file://0001-Fix-build-with-meson-0.61.patch \
11" 12"
12SRCREV = "5c7a73a3824b03b91719e05e2604b97c7a72d50f" 13SRCREV = "5c7a73a3824b03b91719e05e2604b97c7a72d50f"
13 14