[oe] [PATCH][meta-gnome] meta-gnome: add libuser 0.62

2018-05-07 Thread Hongxu Jia
Since oe-core removed libuser, add it which required by usermode

Signed-off-by: Hongxu Jia 
---
 .../libuser/libuser/0001-Check-for-issetugid.patch | 62 ++
 ...es.c-parse_field-fix-string-formating-in-.patch | 34 
 .../libuser/0002-remove-unused-execinfo.h.patch| 27 ++
 meta-gnome/recipes-support/libuser/libuser_0.62.bb | 35 
 4 files changed, 158 insertions(+)
 create mode 100644 
meta-gnome/recipes-support/libuser/libuser/0001-Check-for-issetugid.patch
 create mode 100644 
meta-gnome/recipes-support/libuser/libuser/0001-modules-files.c-parse_field-fix-string-formating-in-.patch
 create mode 100644 
meta-gnome/recipes-support/libuser/libuser/0002-remove-unused-execinfo.h.patch
 create mode 100644 meta-gnome/recipes-support/libuser/libuser_0.62.bb

diff --git 
a/meta-gnome/recipes-support/libuser/libuser/0001-Check-for-issetugid.patch 
b/meta-gnome/recipes-support/libuser/libuser/0001-Check-for-issetugid.patch
new file mode 100644
index 000..79756b9
--- /dev/null
+++ b/meta-gnome/recipes-support/libuser/libuser/0001-Check-for-issetugid.patch
@@ -0,0 +1,62 @@
+From d0537cb7f2dc5877700ad78dfd191515379d4edc Mon Sep 17 00:00:00 2001
+From: Khem Raj 
+Date: Thu, 7 Jan 2016 02:22:51 +
+Subject: [PATCH 1/2] Check for issetugid()
+
+If secure version of getenv is not there then we can use
+issetugid() as aid to call getenv()
+
+Signed-off-by: Khem Raj 
+---
+Upstream-Status: Pending
+
+ configure.ac |  1 +
+ lib/config.c | 12 +++-
+ 2 files changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1ded1a2..ee19e1f 100644
+--- a/configure.ac
 b/configure.ac
+@@ -125,6 +125,7 @@ AC_TYPE_OFF_T
+ AC_TYPE_SIZE_T
+ 
+ AC_CHECK_FUNCS([__secure_getenv secure_getenv])
++AC_CHECK_FUNCS([issetugid])
+ 
+ # Modify CFLAGS after all tests are run (some of them could fail because
+ # of the -Werror).
+diff --git a/lib/config.c b/lib/config.c
+index 29e7120..30f9daf 100644
+--- a/lib/config.c
 b/lib/config.c
+@@ -44,8 +44,10 @@
+ #  define safe_getenv(string) secure_getenv(string)
+ #elif defined(HAVE___SECURE_GETENV)
+ #  define safe_getenv(string) __secure_getenv(string)
++#elif defined(HAVE_ISSETUGID)
++#  define safe_getenv(string) safe_getenv_issetugid(string)
+ #else
+-#  error Neither secure_getenv not __secure_getenv are available
++#  error None of secure_getenv, __secure_getenv, or issetugid is available
+ #endif
+ 
+ struct config_config {
+@@ -59,6 +61,14 @@ struct config_key {
+   GList *values;
+ };
+ 
++static const char*
++safe_getenv_issetugid(const char* name)
++{
++  if (issetugid ())
++  return 0;
++  return getenv (name);
++}
++
+ /* Compare two section names */
+ static int
+ compare_section_names(gconstpointer a, gconstpointer b)
+-- 
+2.7.0
+
diff --git 
a/meta-gnome/recipes-support/libuser/libuser/0001-modules-files.c-parse_field-fix-string-formating-in-.patch
 
b/meta-gnome/recipes-support/libuser/libuser/0001-modules-files.c-parse_field-fix-string-formating-in-.patch
new file mode 100644
index 000..7c47df2
--- /dev/null
+++ 
b/meta-gnome/recipes-support/libuser/libuser/0001-modules-files.c-parse_field-fix-string-formating-in-.patch
@@ -0,0 +1,34 @@
+From a4857911ece5ebfcdef42aee4c070eb216f39597 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= 
+Date: Fri, 13 May 2016 11:40:13 -0500
+Subject: [PATCH] modules/files.c: parse_field fix string formating in
+ g_warnings
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+[YOCTO #9547]
+
+Signed-off-by: Aníbal Limón 
+
+Upstream-Status: Pending
+---
+ modules/files.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules/files.c b/modules/files.c
+index 4ef0a57..35eafc9 100644
+--- a/modules/files.c
 b/modules/files.c
+@@ -534,7 +534,7 @@ parse_field(const struct format_specifier *format, GValue 
*value,
+string, &err);
+   if (ret == FALSE) {
+   g_assert(err != NULL);
+-  g_warning(lu_strerror(err));
++  g_warning(lu_strerror(err), NULL);
+   lu_error_free(&err);
+   }
+   return ret;
+-- 
+2.1.4
+
diff --git 
a/meta-gnome/recipes-support/libuser/libuser/0002-remove-unused-execinfo.h.patch
 
b/meta-gnome/recipes-support/libuser/libuser/0002-remove-unused-execinfo.h.patch
new file mode 100644
index 000..4bc0219
--- /dev/null
+++ 
b/meta-gnome/recipes-support/libuser/libuser/0002-remove-unused-execinfo.h.patch
@@ -0,0 +1,27 @@
+From 4b2f81f307ffeac12956e5c16e894e5ebb937ea5 Mon Sep 17 00:00:00 2001
+From: Khem Raj 
+Date: Thu, 7 Jan 2016 02:26:00 +
+Subject: [PATCH 2/2] remove unused execinfo.h
+
+Signed-off-by: Khem Raj 
+---
+Upstream-Status: Pending
+
+ lib/error.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/lib/error.c b/lib/error.c
+index a5ec30a..443e601 100644
+--- a/lib/error.c
 b/lib/error.c
+@

[oe] [meta-oe][PATCH] xorg: Replace depreciated *proto depends with xorgproto

2018-05-07 Thread Robert Yang
The oe-core commit 9d236bd40ef8598c78c1ea807d658467700505e2 has removed *proto,
we also need to do so in meta-openembedded.

Signed-off-by: Robert Yang 
---
 meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_7.8.0.bb  | 4 ++--
 meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_1.6.5.bb  | 2 +-
 meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.4.2.bb | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_7.8.0.bb 
b/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_7.8.0.bb
index d409a18..fb81e53 100644
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_7.8.0.bb
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_7.8.0.bb
@@ -6,8 +6,8 @@ SUMMARY = "X.Org X server -- ATI Radeon video driver"
 
 DESCRIPTION = "Open-source X.org graphics driver for ATI Radeon graphics"
 
-DEPENDS += "virtual/libx11 libxvmc drm xf86driproto glproto \
-virtual/libgl xineramaproto libpciaccess"
+DEPENDS += "virtual/libx11 libxvmc drm \
+virtual/libgl xorgproto libpciaccess"
 
 inherit distro_features_check
 REQUIRED_DISTRO_FEATURES += "opengl"
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_1.6.5.bb 
b/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_1.6.5.bb
index cd68059..182e18f 100644
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_1.6.5.bb
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_1.6.5.bb
@@ -16,6 +16,6 @@ SRC_URI[md5sum] = "3ee2549247e01de3e7bce52c27483118"
 SRC_URI[sha256sum] = 
"b663cd8e6364f7c4e2637b9fcab9861d0e3971518c73b00d213f6545a1289422"
 
 PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri', '', 
d)}"
-PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,drm 
xf86driproto,xserver-xorg-extension-dri"
+PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,drm 
xorgproto,xserver-xorg-extension-dri"
 
 RDEPENDS_${PN} = "xserver-xorg-module-exa"
diff --git 
a/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.4.2.bb 
b/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.4.2.bb
index 96bdf0e..f683f53 100644
--- a/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.4.2.bb
+++ b/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.4.2.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = 
"file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
 inherit xfce-panel-plugin
 
-DEPENDS += "xfconf xproto libxtst"
+DEPENDS += "xfconf xorgproto libxtst"
 
 SRC_URI[md5sum] = "9169140af7c9d3fddd8a5c9e0efb5a61"
 SRC_URI[sha256sum] = 
"cf2b45e327e67cc187dcb99a6ef6d95570463045accd24540e17172f005189b3"
-- 
2.10.2

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