Remove upstream patch and rename the remaining patch.
This version is needed for enlightenment 0.23.0.
See:
https://www.enlightenment.org/news/efl-1.22.3
Signed-off-by: Romain Naour <romain.naour@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
--- /dev/null
+From b8458ed248cf49bfe9a263d708b5e34adf77e275 Mon Sep 17 00:00:00 2001
+From: Cedric BAIL <cedric.bail@free.fr>
+Date: Wed, 17 Jul 2019 11:12:18 -0700
+Subject: [PATCH] eina: set EINA_VALUE_EMPTY during library init.
+
+This is a work around compiler/linker limit on some system as reported
+by Romain Naour.
+
+Reviewed-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
+Differential Revision: https://phab.enlightenment.org/D9348
+
+(cherry picked from commit c46a8143916f0d3f66bbdffc7107c97c88df212d)
+[Romain: backport to 1.22.x]
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ src/lib/eina/eina_value.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/lib/eina/eina_value.c b/src/lib/eina/eina_value.c
+index c75a5f1235..942a6d533e 100644
+--- a/src/lib/eina/eina_value.c
++++ b/src/lib/eina/eina_value.c
+@@ -58,7 +58,7 @@ static Eina_Hash *_eina_value_inner_mps = NULL;
+ static Eina_Lock _eina_value_inner_mps_lock;
+ static char *_eina_value_mp_choice = NULL;
+ static int _eina_value_log_dom = -1;
+-static const Eina_Value _eina_value_empty = EINA_VALUE_EMPTY;
++static Eina_Value _eina_value_empty;
+
+ #ifdef ERR
+ #undef ERR
+@@ -5404,6 +5404,7 @@ eina_value_inner_free(size_t size, void *mem)
+ Eina_Bool
+ eina_value_init(void)
+ {
++ const Eina_Value empty = EINA_VALUE_EMPTY;
+ const char *choice, *tmp;
+
+ _eina_value_log_dom = eina_log_domain_register("eina_value",
+@@ -5490,6 +5491,8 @@ eina_value_init(void)
+
+ EINA_ERROR_VALUE_FAILED = eina_error_msg_static_register("Eina_Value failed to copy/convert.");
+
++ memcpy(&_eina_value_empty, &empty, sizeof (empty));
++
+ return EINA_TRUE;
+
+ on_init_fail_hash:
+--
+2.21.0
+
+++ /dev/null
-From c394fba4c4c820ea2b7200306ff033e4bbc12ead Mon Sep 17 00:00:00 2001
-From: Romain Naour <romain.naour@gmail.com>
-Date: Mon, 22 Apr 2019 19:26:09 +0200
-Subject: [PATCH] libunibreak: add missing __has_attribute definitions for old
- compilers
-
-__has_attribute has been introduced with gcc 5 [1].
-
-[1] https://www.gnu.org/software/gcc/gcc-5/changes.html
-
-Fixes:
-http://autobuild.buildroot.net/results/64ab825048fac1654b0d0698740ddf857fcc0afa/build-end.log
-
-Upstream status:
-https://phab.enlightenment.org/T7818
-
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
----
- src/static_libs/libunibreak/wordbreak.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/static_libs/libunibreak/wordbreak.c b/src/static_libs/libunibreak/wordbreak.c
-index 017e0fd091..50c830c7cc 100644
---- a/src/static_libs/libunibreak/wordbreak.c
-+++ b/src/static_libs/libunibreak/wordbreak.c
-@@ -209,6 +209,9 @@ static void set_wordbreaks(
- posLast = posCur;
- break;
- }
-+#ifndef __has_attribute
-+# define __has_attribute(x) 0
-+#endif
- #if __has_attribute(fallthrough)
- __attribute__((fallthrough));
- #endif
-@@ -325,6 +328,9 @@ static void set_wordbreaks(
- wbcSeqStart = wbcCur;
- posLast = posCur;
- }
-+#ifndef __has_attribute
-+# define __has_attribute(x) 0
-+#endif
- #if __has_attribute(fallthrough)
- __attribute__((fallthrough));
- #endif
---
-2.14.5
-
+++ /dev/null
-From b8458ed248cf49bfe9a263d708b5e34adf77e275 Mon Sep 17 00:00:00 2001
-From: Cedric BAIL <cedric.bail@free.fr>
-Date: Wed, 17 Jul 2019 11:12:18 -0700
-Subject: [PATCH] eina: set EINA_VALUE_EMPTY during library init.
-
-This is a work around compiler/linker limit on some system as reported
-by Romain Naour.
-
-Reviewed-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
-Differential Revision: https://phab.enlightenment.org/D9348
-
-(cherry picked from commit c46a8143916f0d3f66bbdffc7107c97c88df212d)
-[Romain: backport to 1.22.x]
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
----
- src/lib/eina/eina_value.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/lib/eina/eina_value.c b/src/lib/eina/eina_value.c
-index c75a5f1235..942a6d533e 100644
---- a/src/lib/eina/eina_value.c
-+++ b/src/lib/eina/eina_value.c
-@@ -58,7 +58,7 @@ static Eina_Hash *_eina_value_inner_mps = NULL;
- static Eina_Lock _eina_value_inner_mps_lock;
- static char *_eina_value_mp_choice = NULL;
- static int _eina_value_log_dom = -1;
--static const Eina_Value _eina_value_empty = EINA_VALUE_EMPTY;
-+static Eina_Value _eina_value_empty;
-
- #ifdef ERR
- #undef ERR
-@@ -5404,6 +5404,7 @@ eina_value_inner_free(size_t size, void *mem)
- Eina_Bool
- eina_value_init(void)
- {
-+ const Eina_Value empty = EINA_VALUE_EMPTY;
- const char *choice, *tmp;
-
- _eina_value_log_dom = eina_log_domain_register("eina_value",
-@@ -5490,6 +5491,8 @@ eina_value_init(void)
-
- EINA_ERROR_VALUE_FAILED = eina_error_msg_static_register("Eina_Value failed to copy/convert.");
-
-+ memcpy(&_eina_value_empty, &empty, sizeof (empty));
-+
- return EINA_TRUE;
-
- on_init_fail_hash:
---
-2.21.0
-
-# From https://download.enlightenment.org/rel/libs/efl/efl-1.22.2.tar.xz.sha256
-sha256 1699891f825911622de0aa77fe1140eff7335aba619d2352485e54dcff6b1cd0 efl-1.22.2.tar.xz
+# From https://download.enlightenment.org/rel/libs/efl/efl-1.22.3.tar.xz.sha256
+sha256 7e7a4199b1e90d400dab2491db6032f8e0b26bab65ec19c9f8a97a82394331c8 efl-1.22.3.tar.xz
sha256 d949e42ca8fd48d275c397c5fc2ac34c9b63ada715dcaf1a670e17bb62964341 COMPLIANCE
sha256 1f0597d326e2fdb54aa2f0caec6d8bb0afb9941ef32475f017ed02ca214fcf37 COPYING
#
################################################################################
-EFL_VERSION = 1.22.2
+EFL_VERSION = 1.22.3
EFL_SOURCE = efl-$(EFL_VERSION).tar.xz
EFL_SITE = http://download.enlightenment.org/rel/libs/efl
EFL_LICENSE = BSD-2-Clause, LGPL-2.1+, GPL-2.0+, FTL, MIT
projects / buildroot.git / commitdiff