summaryrefslogtreecommitdiffstats
path: root/meta-gnome
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2017-07-13 22:40:05 -0700
committerMartin Jansa <Martin.Jansa@gmail.com>2017-07-24 18:57:34 +0200
commit94f92801d6731790c40af69a37b0f3ec471a407f (patch)
tree3aaa4ffc846b69e3de86f73948139039b62c6636 /meta-gnome
parent0cb5343932bdd4df2629d41f16a471a611fdfa2e (diff)
downloadmeta-openembedded-94f92801d6731790c40af69a37b0f3ec471a407f.tar.gz
gedit: Define ACCESSPERMS if not defined already
Fixes build on musl Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-gnome')
-rw-r--r--meta-gnome/recipes-gnome/gedit/files/0001-tests-document-saver.c-Define-ACCESSPERMS-if-not-def.patch31
-rw-r--r--meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb11
2 files changed, 37 insertions, 5 deletions
diff --git a/meta-gnome/recipes-gnome/gedit/files/0001-tests-document-saver.c-Define-ACCESSPERMS-if-not-def.patch b/meta-gnome/recipes-gnome/gedit/files/0001-tests-document-saver.c-Define-ACCESSPERMS-if-not-def.patch
new file mode 100644
index 000000000..11afe75ce
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gedit/files/0001-tests-document-saver.c-Define-ACCESSPERMS-if-not-def.patch
@@ -0,0 +1,31 @@
1From ee43bcc3c8d69fe56a64c3487e2d3c780ea5d25e Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 13 Jul 2017 06:53:35 -0700
4Subject: [PATCH] tests/document-saver.c: Define ACCESSPERMS if not defined
5 already
6
7Helps compile with musl
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 tests/document-saver.c | 4 ++++
12 1 file changed, 4 insertions(+)
13
14diff --git a/tests/document-saver.c b/tests/document-saver.c
15index 9f44d5a..811ade6 100644
16--- a/tests/document-saver.c
17+++ b/tests/document-saver.c
18@@ -41,6 +41,10 @@
19 #define UNOWNED_GROUP_LOCAL_URI "/tmp/gedit-document-saver-unowned-group.txt"
20 #define UNOWNED_GROUP_REMOTE_URI "sftp://localhost/tmp/gedit-document-saver-unowned-group.txt"
21
22+#if !defined(ACCESSPERMS)
23+#define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO) /* 0777 */
24+#endif
25+
26 static gboolean test_completed;
27 static gboolean mount_completed;
28 static gboolean mount_success;
29--
302.13.2
31
diff --git a/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb b/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb
index 03d7fa4e5..4352b5e11 100644
--- a/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb
+++ b/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb
@@ -8,11 +8,12 @@ DEPENDS = "gvfs enchant gconf gnome-doc-utils glib-2.0 gtk+ gtksourceview2 iso-c
8LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" 8LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
9 9
10inherit gnome gettext pythonnative 10inherit gnome gettext pythonnative
11SRC_URI+= " \ 11SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
12 file://0001-workaround-void-pointer-arithmetic.patch \ 12 file://0001-workaround-void-pointer-arithmetic.patch \
13 file://0001-Remove-help-directory-from-build.patch \ 13 file://0001-Remove-help-directory-from-build.patch \
14 file://0002-suppress-string-format-literal-warning-to-fix-build-.patch \ 14 file://0002-suppress-string-format-literal-warning-to-fix-build-.patch \
15" 15 file://0001-tests-document-saver.c-Define-ACCESSPERMS-if-not-def.patch \
16 "
16SRC_URI[archive.md5sum] = "e1eecb0a92a1a363b3d375ec5ac0fb3b" 17SRC_URI[archive.md5sum] = "e1eecb0a92a1a363b3d375ec5ac0fb3b"
17SRC_URI[archive.sha256sum] = "a561fe3dd1d199baede1bd07c4ee65f06fc7c494dd4d3327117f04149a608e3c" 18SRC_URI[archive.sha256sum] = "a561fe3dd1d199baede1bd07c4ee65f06fc7c494dd4d3327117f04149a608e3c"
18GNOME_COMPRESS_TYPE="bz2" 19GNOME_COMPRESS_TYPE="bz2"