[oe,meta-gnome,4/6] metacity: Fix build with musl

Message ID 20170714183456.22548-4-raj.khem@gmail.com
State New
Headers show
Series
  • [oe,meta-filesystems,1/6] unionfs-fuse: Fix build with musl
Related show

Commit Message

Khem Raj July 14, 2017, 6:34 p.m.
Signed-off-by: Khem Raj <raj.khem@gmail.com>

---
 ...1-ui-Replace-__USE_XOPEN-with-_GNU_SOURCE.patch | 31 ++++++++++++++++++++++
 .../recipes-gnome/metacity/metacity_2.34.13.bb     |  5 +++-
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 meta-gnome/recipes-gnome/metacity/metacity/0001-ui-Replace-__USE_XOPEN-with-_GNU_SOURCE.patch

-- 
2.13.3

-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Patch

diff --git a/meta-gnome/recipes-gnome/metacity/metacity/0001-ui-Replace-__USE_XOPEN-with-_GNU_SOURCE.patch b/meta-gnome/recipes-gnome/metacity/metacity/0001-ui-Replace-__USE_XOPEN-with-_GNU_SOURCE.patch
new file mode 100644
index 000000000..3d2b9c7d2
--- /dev/null
+++ b/meta-gnome/recipes-gnome/metacity/metacity/0001-ui-Replace-__USE_XOPEN-with-_GNU_SOURCE.patch
@@ -0,0 +1,31 @@ 
+From 57493928f16c6bfd054c063c511201e295128539 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 14 Jul 2017 10:26:31 -0700
+Subject: [PATCH] ui: Replace __USE_XOPEN with _GNU_SOURCE
+
+Defining _GNU_SOURCE defines _XOPEN_SOURCE too which inturn defined __USE_XOPEN
+which is internal define for glibc
+
+additionally it becomes portable across musl and glibc
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/ui/theme.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ui/theme.c b/src/ui/theme.c
+index 84b57a0..6209b51 100644
+--- a/src/ui/theme.c
++++ b/src/ui/theme.c
+@@ -60,7 +60,7 @@
+ #include <gtk/gtk.h>
+ #include <string.h>
+ #include <stdlib.h>
+-#define __USE_XOPEN
++#define _GNU_SOURCE
+ #include <math.h>
+ 
+ #define GDK_COLOR_RGBA(color)                                           \
+-- 
+2.13.3
+
diff --git a/meta-gnome/recipes-gnome/metacity/metacity_2.34.13.bb b/meta-gnome/recipes-gnome/metacity/metacity_2.34.13.bb
index 662c90db8..537414d9d 100644
--- a/meta-gnome/recipes-gnome/metacity/metacity_2.34.13.bb
+++ b/meta-gnome/recipes-gnome/metacity/metacity_2.34.13.bb
@@ -13,7 +13,10 @@  REQUIRED_DISTRO_FEATURES = "x11"
 
 GNOME_COMPRESS_TYPE = "xz"
 
-SRC_URI += "file://remove-yelp-help-rules-var.patch"
+SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
+           file://remove-yelp-help-rules-var.patch \
+           file://0001-ui-Replace-__USE_XOPEN-with-_GNU_SOURCE.patch \
+           "
 SRC_URI[archive.md5sum] = "6d89b71672d4fa49fc87f83d610d0ef6"
 SRC_URI[archive.sha256sum] = "8cf4dbf0da0a6f36357ce7db7f829ec685908a7792453c662fb8184572b91075"