rpms
/
efl
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to 1.24.3

This commit is contained in:
Ding-Yi Chen 2020-07-21 08:34:46 +10:00
parent c0633a6bd8
commit 1ac95604b4
14 changed files with 14 additions and 637 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -30,3 +30,4 @@
/efl-1.23.2.tar.xz
/efl-1.23.3.tar.xz
/efl-1.24.2.tar.xz
/efl-1.24.3.tar.xz

12
efl-1.11.4-tslibfix.patch
View File

@ -1,12 +0,0 @@
diff -up efl-1.18.0/configure.ac.tslibfix efl-1.18.0/configure.ac
--- efl-1.18.0/configure.ac.tslibfix 2016-08-29 15:35:41.784900935 -0400
+++ efl-1.18.0/configure.ac 2016-08-29 15:35:48.936847061 -0400
@@ -3442,7 +3442,7 @@ EFL_INTERNAL_DEPEND_PKG([ECORE_FB], [eo]
EFL_INTERNAL_DEPEND_PKG([ECORE_FB], [efl])
EFL_INTERNAL_DEPEND_PKG([ECORE_FB], [eina])
-EFL_OPTIONAL_DEPEND_PKG([ECORE_FB], [${want_tslib}], [TSLIB], [tslib])
+EFL_OPTIONAL_DEPEND_PKG([ECORE_FB], [${want_tslib}], [TSLIB], [tslib-0.0])
EFL_ADD_FEATURE([ECORE_FB], [tslib])
EFL_EVAL_PKGS([ECORE_FB])

12
efl-1.17.1-old-nomodifier-in-drm_mode_fb_cmd2.patch
View File

@ -1,12 +0,0 @@
diff -up efl-1.17.1/src/lib/ecore_drm/ecore_drm_fb.c.old efl-1.17.1/src/lib/ecore_drm/ecore_drm_fb.c
--- efl-1.17.1/src/lib/ecore_drm/ecore_drm_fb.c.old 2016-06-13 16:13:15.168379067 -0400
+++ efl-1.17.1/src/lib/ecore_drm/ecore_drm_fb.c 2016-06-13 16:13:43.240229369 -0400
@@ -37,7 +37,7 @@ _ecore_drm_fb_create2(int fd, Ecore_Drm_
memcpy(cmd.handles, hdls, 4 * sizeof(hdls[0]));
memcpy(cmd.pitches, pitches, 4 * sizeof(pitches[0]));
memcpy(cmd.offsets, offsets, 4 * sizeof(offsets[0]));
- memcpy(cmd.modifier, modifiers, 4 * sizeof(modifiers[0]));
+ /* memcpy(cmd.modifier, modifiers, 4 * sizeof(modifiers[0])); */
if (drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &cmd))
return EINA_FALSE;

247
efl-1.18.2-openssl-1.1.patch
View File

@ -1,247 +0,0 @@
diff -up efl-1.18.2/src/lib/eet/eet_cipher.c.fixup efl-1.18.2/src/lib/eet/eet_cipher.c
--- efl-1.18.2/src/lib/eet/eet_cipher.c.fixup 2016-10-19 10:31:31.601037298 -0400
+++ efl-1.18.2/src/lib/eet/eet_cipher.c 2016-10-19 10:43:13.258515381 -0400
@@ -475,9 +475,15 @@ eet_identity_sign(FILE *fp,
gnutls_datum_t signum = { NULL, 0 };
gnutls_privkey_t privkey;
# else /* ifdef HAVE_GNUTLS */
- EVP_MD_CTX md_ctx;
unsigned int sign_len = 0;
int cert_len = 0;
+# if OPENSSL_VERSION_NUMBER >= 0x10100000L
+ EVP_MD_CTX *md_ctx = EVP_MD_CTX_new();
+ if (md_ctx == NULL)
+ return EET_ERROR_BAD_OBJECT;
+# else /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
+ EVP_MD_CTX md_ctx;
+# endif /* if OPENSSL_VERSION_NUMBER >= 0x10100000L */
# endif /* ifdef HAVE_GNUTLS */
/* A few check and flush pending write. */
@@ -560,6 +566,15 @@ eet_identity_sign(FILE *fp,
goto on_error;
}
+# if OPENSSL_VERSION_NUMBER >= 0x10100000L
+ /* Do the signature. */
+ EVP_SignInit(md_ctx, EVP_sha1());
+ EVP_SignUpdate(md_ctx, data, st_buf.st_size);
+ err = EVP_SignFinal(md_ctx,
+ sign,
+ (unsigned int *)&sign_len,
+ key->private_key);
+# else
/* Do the signature. */
EVP_SignInit(&md_ctx, EVP_sha1());
EVP_SignUpdate(&md_ctx, data, st_buf.st_size);
@@ -567,6 +582,7 @@ eet_identity_sign(FILE *fp,
sign,
(unsigned int *)&sign_len,
key->private_key);
+# endif
if (err != 1)
{
ERR_print_errors_fp(stdout);
@@ -615,6 +631,9 @@ on_error:
# else /* ifdef HAVE_GNUTLS */
if (cert)
OPENSSL_free(cert);
+# if OPENSSL_VERSION_NUMBER >= 0x10100000L
+ EVP_MD_CTX_free(md_ctx);
+# endif /* if OPENSSL_VERSION_NUMBER >= 0x10100000L */
# endif /* ifdef HAVE_GNUTLS */
if (sign)
@@ -739,7 +758,13 @@ eet_identity_check(const void *data_ba
const unsigned char *tmp;
EVP_PKEY *pkey;
X509 *x509;
+# if OPENSSL_VERSION_NUMBER >= 0x10100000L
+ EVP_MD_CTX *md_ctx = EVP_MD_CTX_new();
+ if (md_ctx == NULL)
+ return NULL;
+# else /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
EVP_MD_CTX md_ctx;
+# endif /* if OPENSSL_VERSION_NUMBER >= 0x10100000L */
int err;
/* Strange but d2i_X509 seems to put 0 all over the place. */
@@ -757,10 +782,17 @@ eet_identity_check(const void *data_ba
return NULL;
}
+# if OPENSSL_VERSION_NUMBER >= 0x10100000L
+ /* Verify the signature */
+ EVP_VerifyInit(md_ctx, EVP_sha1());
+ EVP_VerifyUpdate(md_ctx, data_base, data_length);
+ err = EVP_VerifyFinal(md_ctx, sign, sign_len, pkey);
+# else /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
/* Verify the signature */
EVP_VerifyInit(&md_ctx, EVP_sha1());
EVP_VerifyUpdate(&md_ctx, data_base, data_length);
err = EVP_VerifyFinal(&md_ctx, sign, sign_len, pkey);
+# endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
X509_free(x509);
EVP_PKEY_free(pkey);
@@ -800,6 +832,9 @@ eet_identity_check(const void *data_ba
raw_signature_base = NULL;
raw_signature_length = NULL;
x509_length = NULL;
+# if OPENSSL_VERSION_NUMBER >= 0x10100000L
+ EVP_MD_CTX_free(md_ctx);
+# endif /* if OPENSSL_VERSION_NUMBER >= 0x10100000L */
return NULL;
#endif /* ifdef HAVE_SIGNATURE */
}
diff -up efl-1.18.2/src/lib/emile/emile_cipher_openssl.c.fixup efl-1.18.2/src/lib/emile/emile_cipher_openssl.c
--- efl-1.18.2/src/lib/emile/emile_cipher_openssl.c.fixup 2016-10-19 10:10:05.735351607 -0400
+++ efl-1.18.2/src/lib/emile/emile_cipher_openssl.c 2016-10-19 10:30:27.529498249 -0400
@@ -87,7 +87,11 @@ emile_binbuf_cipher(Emile_Cipher_Algorit
unsigned int crypted_length;
int opened = 0;
/* Openssl declarations*/
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+ EVP_CIPHER_CTX *ctx;
+#else
EVP_CIPHER_CTX ctx;
+#endif
unsigned int *buffer = NULL;
int tmp_len;
@@ -134,17 +138,43 @@ emile_binbuf_cipher(Emile_Cipher_Algorit
/* Openssl create the corresponding cipher
AES with a 256 bit key, Cipher Block Chaining mode */
- EVP_CIPHER_CTX_init(&ctx);
- if (!EVP_EncryptInit_ex(&ctx, EVP_aes_256_cbc(), NULL, ik, iv))
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+ ctx = EVP_CIPHER_CTX_new();
+ if (ctx == NULL)
+ goto on_error;
+
+ opened = 1;
+
+ if (!EVP_EncryptInit_ex(ctx, EVP_aes_256_cbc(), NULL, ik, iv))
goto on_error;
+#else
+ EVP_CIPHER_CTX_init(&ctx);
opened = 1;
+ if (!EVP_EncryptInit_ex(&ctx, EVP_aes_256_cbc(), NULL, ik, iv))
+ goto on_error;
+#endif
+
memset(iv, 0, sizeof (iv));
memset(ik, 0, sizeof (ik));
pointer = (unsigned char*) eina_binbuf_string_get(result);
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+ /* Openssl encrypt */
+ if (!EVP_EncryptUpdate(ctx, pointer + sizeof (int), &tmp_len,
+ (unsigned char *)buffer,
+ eina_binbuf_length_get(data) + sizeof(unsigned int)))
+ goto on_error;
+
+ /* Openssl close the cipher */
+ if (!EVP_EncryptFinal_ex(ctx, pointer + sizeof (int) + tmp_len,
+ &tmp_len))
+ goto on_error;
+
+ EVP_CIPHER_CTX_free(ctx);
+#else
/* Openssl encrypt */
if (!EVP_EncryptUpdate(&ctx, pointer + sizeof (int), &tmp_len,
(unsigned char *)buffer,
@@ -157,6 +187,8 @@ emile_binbuf_cipher(Emile_Cipher_Algorit
goto on_error;
EVP_CIPHER_CTX_cleanup(&ctx);
+#endif
+
free(buffer);
return result;
@@ -167,8 +199,11 @@ on_error:
/* Openssl error */
if (opened)
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+ EVP_CIPHER_CTX_free(ctx);
+#else
EVP_CIPHER_CTX_cleanup(&ctx);
-
+#endif
free(buffer);
/* General error */
@@ -186,7 +221,11 @@ emile_binbuf_decipher(Emile_Cipher_Algor
{
Eina_Binbuf *result = NULL;
unsigned int *over;
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+ EVP_CIPHER_CTX *ctx;
+#else
EVP_CIPHER_CTX ctx;
+#endif
unsigned char ik[MAX_KEY_LEN];
unsigned char iv[MAX_IV_LEN];
unsigned char key_material[MAX_KEY_LEN + MAX_IV_LEN];
@@ -230,15 +269,35 @@ emile_binbuf_decipher(Emile_Cipher_Algor
eina_binbuf_append_length(result, (unsigned char*) (over + 1), tmp_len);
/* Openssl create the corresponding cipher */
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+ ctx = EVP_CIPHER_CTX_new();
+ if (ctx == NULL)
+ goto on_error;
+ opened = 1;
+
+ if (!EVP_DecryptInit_ex(ctx, EVP_aes_256_cbc(), NULL, ik, iv))
+ goto on_error;
+#else
EVP_CIPHER_CTX_init(&ctx);
opened = 1;
if (!EVP_DecryptInit_ex(&ctx, EVP_aes_256_cbc(), NULL, ik, iv))
goto on_error;
+#endif
memset(iv, 0, sizeof (iv));
memset(ik, 0, sizeof (ik));
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+ /* Openssl decrypt */
+ if (!EVP_DecryptUpdate(ctx,
+ (void*) eina_binbuf_string_get(result), &tmp,
+ (void*) (over + 1), tmp_len))
+ goto on_error;
+
+ /* Openssl close the cipher*/
+ EVP_CIPHER_CTX_free(ctx);
+#else
/* Openssl decrypt */
if (!EVP_DecryptUpdate(&ctx,
(void*) eina_binbuf_string_get(result), &tmp,
@@ -247,6 +306,7 @@ emile_binbuf_decipher(Emile_Cipher_Algor
/* Openssl close the cipher*/
EVP_CIPHER_CTX_cleanup(&ctx);
+#endif
/* Get the decrypted data size */
tmp = *(unsigned int*)(eina_binbuf_string_get(result));
@@ -265,7 +325,11 @@ on_error:
memset(ik, 0, sizeof (ik));
if (opened)
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+ EVP_CIPHER_CTX_free(ctx);
+#else
EVP_CIPHER_CTX_cleanup(&ctx);
+#endif
eina_binbuf_free(result);

39
efl-1.19.0-luajitfix.patch
View File

@ -1,39 +0,0 @@
diff -up efl-1.19.0/src/lib/edje/edje_private.h.luajitfix efl-1.19.0/src/lib/edje/edje_private.h
--- efl-1.19.0/src/lib/edje/edje_private.h.luajitfix 2017-05-15 09:53:45.314265022 -0400
+++ efl-1.19.0/src/lib/edje/edje_private.h 2017-05-15 09:55:13.508048012 -0400
@@ -33,6 +33,9 @@
#include <lua.h>
#include <lualib.h>
#include <lauxlib.h>
+#ifndef luaL_reg
+# define luaL_reg luaL_Reg
+#endif
#include <setjmp.h>
#ifdef HAVE_EVIL
diff -up efl-1.19.0/src/lib/elua/elua_private.h.luajitfix efl-1.19.0/src/lib/elua/elua_private.h
--- efl-1.19.0/src/lib/elua/elua_private.h.luajitfix 2017-05-15 09:56:03.481791776 -0400
+++ efl-1.19.0/src/lib/elua/elua_private.h 2017-05-15 09:56:14.867505561 -0400
@@ -27,6 +27,9 @@
#include <lua.h>
#include <lualib.h>
#include <lauxlib.h>
+#ifndef luaL_reg
+# define luaL_reg luaL_Reg
+#endif
#include "Elua.h"
diff -up efl-1.19.0/src/lib/evas/filters/evas_filter_parser.c.luajitfix efl-1.19.0/src/lib/evas/filters/evas_filter_parser.c
--- efl-1.19.0/src/lib/evas/filters/evas_filter_parser.c.luajitfix 2017-05-15 09:56:44.449766382 -0400
+++ efl-1.19.0/src/lib/evas/filters/evas_filter_parser.c 2017-05-15 09:57:00.786361265 -0400
@@ -13,6 +13,9 @@
#include <lua.h>
#include <lualib.h>
#include <lauxlib.h>
+#ifndef luaL_reg
+# define luaL_reg luaL_Reg
+#endif
#define FILTERS_LEGACY_COMPAT

11
efl-1.20.2-endian.patch
View File

@ -1,11 +0,0 @@
diff -up efl-1.20.2/src/lib/eina/eina_debug.c.orig efl-1.20.2/src/lib/eina/eina_debug.c
--- efl-1.20.2/src/lib/eina/eina_debug.c.orig 2017-08-30 18:09:56.823901819 +0200
+++ efl-1.20.2/src/lib/eina/eina_debug.c 2017-08-30 18:10:09.023901819 +0200
@@ -60,6 +60,7 @@
#endif
#include "eina_debug.h"
+#include "eina_cpu.h"
#include "eina_types.h"
#include "eina_list.h"
#include "eina_mempool.h"

39
efl-1.21.0-luajitfix.patch
View File

@ -1,39 +0,0 @@
diff -up efl-1.21.0/src/lib/edje/edje_private.h.luajitfix efl-1.21.0/src/lib/edje/edje_private.h
--- efl-1.21.0/src/lib/edje/edje_private.h.luajitfix 2018-08-18 14:53:50.946311297 -0400
+++ efl-1.21.0/src/lib/edje/edje_private.h 2018-08-18 14:55:48.918580278 -0400
@@ -33,6 +33,9 @@
#include <lua.h>
#include <lualib.h>
#include <lauxlib.h>
+#ifndef luaL_reg
+# define luaL_reg luaL_Reg
+#endif
#include <setjmp.h>
#ifdef _WIN32
diff -up efl-1.21.0/src/lib/elua/elua_private.h.luajitfix efl-1.21.0/src/lib/elua/elua_private.h
--- efl-1.21.0/src/lib/elua/elua_private.h.luajitfix 2018-07-27 06:22:36.000000000 -0400
+++ efl-1.21.0/src/lib/elua/elua_private.h 2018-08-18 14:53:50.946311297 -0400
@@ -27,6 +27,9 @@
#include <lua.h>
#include <lualib.h>
#include <lauxlib.h>
+#ifndef luaL_reg
+# define luaL_reg luaL_Reg
+#endif
#include "Elua.h"
diff -up efl-1.21.0/src/lib/evas/filters/evas_filter_parser.c.luajitfix efl-1.21.0/src/lib/evas/filters/evas_filter_parser.c
--- efl-1.21.0/src/lib/evas/filters/evas_filter_parser.c.luajitfix 2018-05-17 16:34:58.000000000 -0400
+++ efl-1.21.0/src/lib/evas/filters/evas_filter_parser.c 2018-08-18 14:53:50.946311297 -0400
@@ -13,6 +13,9 @@
#include <lua.h>
#include <lualib.h>
#include <lauxlib.h>
+#ifndef luaL_reg
+# define luaL_reg luaL_Reg
+#endif
#define FILTERS_LEGACY_COMPAT

14
efl-1.21.0-use-pragma-to-ignore-safe-printf.patch
View File

@ -1,14 +0,0 @@
diff -up efl-1.21.0/src/lib/efl/interfaces/efl_ui_format.c.pragma efl-1.21.0/src/lib/efl/interfaces/efl_ui_format.c
--- efl-1.21.0/src/lib/efl/interfaces/efl_ui_format.c.pragma 2018-08-18 15:27:24.073708072 -0400
+++ efl-1.21.0/src/lib/efl/interfaces/efl_ui_format.c 2018-08-18 15:28:38.690980709 -0400
@@ -130,7 +130,10 @@ _default_format_cb(void *data, Eina_Strb
}
else if (sd->format_type == FORMAT_TYPE_STATIC)
{
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-security"
eina_strbuf_append_printf(str, sd->template);
+#pragma GCC diagnostic pop
}
else
{

15
efl-1.21.1-khrplatform.patch
View File

@ -1,15 +0,0 @@
diff -up efl-1.21.1/src/lib/evas/Evas_GL.h.khrplatform efl-1.21.1/src/lib/evas/Evas_GL.h
--- efl-1.21.1/src/lib/evas/Evas_GL.h.khrplatform 2019-02-15 19:58:49.927937159 -0500
+++ efl-1.21.1/src/lib/evas/Evas_GL.h 2019-02-15 19:58:55.970818084 -0500
@@ -4273,8 +4273,9 @@ typedef signed int GLfixed; /
#ifndef GL_ES_VERSION_2_0
/* GL types for handling large vertex buffer objects */
#include <stddef.h>
-typedef ptrdiff_t GLintptr; // Changed khronos_intptr_t
-typedef ptrdiff_t GLsizeiptr; // Changed khronos_ssize_t
+#include <KHR/khrplatform.h>
+typedef khronos_intptr_t GLintptr;
+typedef khronos_ssize_t GLsizeiptr;
#endif
/* Some definitions from GLES 3.0.

14
efl-1.22.2-use-pragma-to-ignore-safe-printf.patch
View File

@ -1,14 +0,0 @@
diff -up efl-1.22.2/src/lib/efl/interfaces/efl_ui_format.c.pragma efl-1.22.2/src/lib/efl/interfaces/efl_ui_format.c
--- efl-1.22.2/src/lib/efl/interfaces/efl_ui_format.c.pragma 2019-05-02 15:05:56.681118361 -0400
+++ efl-1.22.2/src/lib/efl/interfaces/efl_ui_format.c 2019-05-02 15:07:48.641683821 -0400
@@ -124,7 +124,10 @@ _default_format_cb(void *data, Eina_Strb
}
else if (sd->format_type == FORMAT_TYPE_STATIC)
{
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-security"
eina_strbuf_append(str, sd->template);
+#pragma GCC diagnostic pop
}
else
{

39
efl-1.23.1-luajitfix.patch
View File

@ -1,39 +0,0 @@
diff -up efl-1.23.1/src/lib/edje/edje_private.h.luajitfix efl-1.23.1/src/lib/edje/edje_private.h
--- efl-1.23.1/src/lib/edje/edje_private.h.luajitfix 2019-10-16 13:56:59.684150112 -0400
+++ efl-1.23.1/src/lib/edje/edje_private.h 2019-10-16 13:58:53.881731556 -0400
@@ -34,6 +34,9 @@
#include <lua.h>
#include <lualib.h>
#include <lauxlib.h>
+#ifndef luaL_reg
+# define luaL_reg luaL_Reg
+#endif
#include <setjmp.h>
// auto_unref
diff -up efl-1.23.1/src/lib/elua/elua_private.h.luajitfix efl-1.23.1/src/lib/elua/elua_private.h
--- efl-1.23.1/src/lib/elua/elua_private.h.luajitfix 2019-10-11 10:58:46.000000000 -0400
+++ efl-1.23.1/src/lib/elua/elua_private.h 2019-10-16 13:56:59.685150091 -0400
@@ -23,6 +23,9 @@
#include <lua.h>
#include <lualib.h>
#include <lauxlib.h>
+#ifndef luaL_reg
+# define luaL_reg luaL_Reg
+#endif
#include "Elua.h"
diff -up efl-1.23.1/src/lib/evas/filters/evas_filter_parser.c.luajitfix efl-1.23.1/src/lib/evas/filters/evas_filter_parser.c
--- efl-1.23.1/src/lib/evas/filters/evas_filter_parser.c.luajitfix 2019-10-11 10:58:47.000000000 -0400
+++ efl-1.23.1/src/lib/evas/filters/evas_filter_parser.c 2019-10-16 13:56:59.687150049 -0400
@@ -13,6 +13,9 @@
#include <lua.h>
#include <lualib.h>
#include <lauxlib.h>
+#ifndef luaL_reg
+# define luaL_reg luaL_Reg
+#endif
#define FILTERS_LEGACY_COMPAT

188
efl-1.23.3-gcc10.patch
View File

@ -1,188 +0,0 @@
diff -up efl-1.23.3/src/benchmarks/eina/eina_bench_crc_hash.c.gcc10 efl-1.23.3/src/benchmarks/eina/eina_bench_crc_hash.c
--- efl-1.23.3/src/benchmarks/eina/eina_bench_crc_hash.c.gcc10 2019-11-27 13:27:00.000000000 -0500
+++ efl-1.23.3/src/benchmarks/eina/eina_bench_crc_hash.c 2020-01-31 07:08:43.212321502 -0500
@@ -26,6 +26,7 @@
uint64_t CityHash64(const char *buf, size_t len);
#endif
+int key_size;
char *key_str=NULL;
void repchar(int n)
diff -up efl-1.23.3/src/benchmarks/eina/eina_bench.h.gcc10 efl-1.23.3/src/benchmarks/eina/eina_bench.h
--- efl-1.23.3/src/benchmarks/eina/eina_bench.h.gcc10 2019-11-27 13:27:00.000000000 -0500
+++ efl-1.23.3/src/benchmarks/eina/eina_bench.h 2020-01-31 07:08:43.213321484 -0500
@@ -21,7 +21,7 @@
#include "eina_benchmark.h"
-int key_size;
+extern int key_size;
void eina_bench_hash(Eina_Benchmark *bench);
void eina_bench_crc_hash_short(Eina_Benchmark *bench);
diff -up efl-1.23.3/src/bin/elementary/test_ui_clock.c.gcc10 efl-1.23.3/src/bin/elementary/test_ui_clock.c
--- efl-1.23.3/src/bin/elementary/test_ui_clock.c.gcc10 2019-11-27 13:27:01.000000000 -0500
+++ efl-1.23.3/src/bin/elementary/test_ui_clock.c 2020-01-31 07:08:43.213321484 -0500
@@ -6,7 +6,7 @@
#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h
/* A simple test, just displaying clock in its default format */
-Evas_Object *dt1, *dt2, *dt3, *dt4;
+Evas_Object *uicdt1, *uicdt2, *uicdt3, *uicdt4;
static void
_changed_cb(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
@@ -28,19 +28,19 @@ _bt_clicked(void *data EINA_UNUSED, cons
new_time.tm_mday = 26;
new_time.tm_hour = 9;
new_time.tm_min = 0;
- efl_ui_clock_field_visible_set(dt1, EFL_UI_CLOCK_TYPE_HOUR, EINA_TRUE);
- efl_ui_clock_field_visible_set(dt1, EFL_UI_CLOCK_TYPE_MINUTE, EINA_TRUE);
- efl_ui_clock_field_visible_set(dt1, EFL_UI_CLOCK_TYPE_AMPM, EINA_TRUE);
- efl_ui_clock_field_visible_set(dt1, EFL_UI_CLOCK_TYPE_SECOND, EINA_TRUE);
- efl_ui_clock_field_visible_set(dt1, EFL_UI_CLOCK_TYPE_DAY, EINA_TRUE);
- efl_ui_clock_time_set(dt1, new_time);
+ efl_ui_clock_field_visible_set(uicdt1, EFL_UI_CLOCK_TYPE_HOUR, EINA_TRUE);
+ efl_ui_clock_field_visible_set(uicdt1, EFL_UI_CLOCK_TYPE_MINUTE, EINA_TRUE);
+ efl_ui_clock_field_visible_set(uicdt1, EFL_UI_CLOCK_TYPE_AMPM, EINA_TRUE);
+ efl_ui_clock_field_visible_set(uicdt1, EFL_UI_CLOCK_TYPE_SECOND, EINA_TRUE);
+ efl_ui_clock_field_visible_set(uicdt1, EFL_UI_CLOCK_TYPE_DAY, EINA_TRUE);
+ efl_ui_clock_time_set(uicdt1, new_time);
- elm_object_disabled_set(dt1, EINA_TRUE);
+ elm_object_disabled_set(uicdt1, EINA_TRUE);
elm_object_disabled_set(ev->object, EINA_TRUE);
- efl_del(dt2);
- efl_del(dt3);
- dt2 = dt3 = NULL;
+ efl_del(uicdt2);
+ efl_del(uicdt3);
+ uicdt2 = uicdt3 = NULL;
}
void
@@ -56,33 +56,33 @@ test_ui_clock(void *data EINA_UNUSED, Ev
efl_content_set(win, efl_added),
efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(360, 240)));
- dt1 = efl_add(EFL_UI_CLOCK_CLASS, bx,
- efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND),
- efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
- efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_HOUR, EINA_FALSE),
- efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_MINUTE, EINA_FALSE),
- efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_AMPM, EINA_FALSE),
- efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_SECOND, EINA_FALSE),
- efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_DAY, EINA_FALSE),
- efl_ui_clock_pause_set(efl_added, EINA_TRUE),
- efl_event_callback_add(efl_added, EFL_UI_CLOCK_EVENT_CHANGED, _changed_cb, NULL),
- efl_pack(bx, efl_added));
-
- dt2 = efl_add(EFL_UI_CLOCK_CLASS, bx,
- efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND),
- efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
- efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_YEAR, EINA_FALSE),
- efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_MONTH, EINA_FALSE),
- efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_DATE, EINA_FALSE),
- efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_SECOND, EINA_FALSE),
- efl_ui_clock_pause_set(efl_added, EINA_TRUE),
- efl_pack(bx, efl_added));
- elm_object_disabled_set(dt2, EINA_TRUE);
-
- dt3 = efl_add(EFL_UI_CLOCK_CLASS, bx,
- efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND),
- efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
- efl_pack(bx, efl_added));
+ uicdt1 = efl_add(EFL_UI_CLOCK_CLASS, bx,
+ efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND),
+ efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
+ efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_HOUR, EINA_FALSE),
+ efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_MINUTE, EINA_FALSE),
+ efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_AMPM, EINA_FALSE),
+ efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_SECOND, EINA_FALSE),
+ efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_DAY, EINA_FALSE),
+ efl_ui_clock_pause_set(efl_added, EINA_TRUE),
+ efl_event_callback_add(efl_added, EFL_UI_CLOCK_EVENT_CHANGED, _changed_cb, NULL),
+ efl_pack(bx, efl_added));
+
+ uicdt2 = efl_add(EFL_UI_CLOCK_CLASS, bx,
+ efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND),
+ efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
+ efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_YEAR, EINA_FALSE),
+ efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_MONTH, EINA_FALSE),
+ efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_DATE, EINA_FALSE),
+ efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_SECOND, EINA_FALSE),
+ efl_ui_clock_pause_set(efl_added, EINA_TRUE),
+ efl_pack(bx, efl_added));
+ elm_object_disabled_set(uicdt2, EINA_TRUE);
+
+ uicdt3 = efl_add(EFL_UI_CLOCK_CLASS, bx,
+ efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND),
+ efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
+ efl_pack(bx, efl_added));
efl_add(EFL_UI_TEXT_CLASS, bx,
efl_text_set(efl_added, "Editable Clock:"),
@@ -92,12 +92,12 @@ test_ui_clock(void *data EINA_UNUSED, Ev
efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(100, 25)),
efl_pack(bx, efl_added));
- dt4 = efl_add(EFL_UI_CLOCK_CLASS, bx,
- efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND),
- efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
- efl_ui_clock_edit_mode_set(efl_added, EINA_TRUE),
- efl_ui_clock_pause_set(efl_added, EINA_TRUE),
- efl_pack(bx, efl_added));
+ uicdt4 = efl_add(EFL_UI_CLOCK_CLASS, bx,
+ efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND),
+ efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
+ efl_ui_clock_edit_mode_set(efl_added, EINA_TRUE),
+ efl_ui_clock_pause_set(efl_added, EINA_TRUE),
+ efl_pack(bx, efl_added));
efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Back to the future..."),
diff -up efl-1.23.3/src/tests/eio/eio_suite.h.gcc10 efl-1.23.3/src/tests/eio/eio_suite.h
diff -up efl-1.23.3/src/tests/eio/eio_test_map.c.gcc10 efl-1.23.3/src/tests/eio/eio_test_map.c
--- efl-1.23.3/src/tests/eio/eio_test_map.c.gcc10 2020-01-31 07:14:33.127257341 -0500
+++ efl-1.23.3/src/tests/eio/eio_test_map.c 2020-01-31 07:15:03.096972699 -0500
@@ -14,7 +14,7 @@
#include "eio_suite.h"
-Eina_File *ee;
+Eina_File *eie;
static void
_done_cb(void *data EINA_UNUSED, Eio_File *handler EINA_UNUSED)
@@ -25,7 +25,7 @@ _done_cb(void *data EINA_UNUSED, Eio_Fil
static void
_open_cb(void *data EINA_UNUSED, Eio_File *handler EINA_UNUSED, Eina_File *ef)
{
- ee = ef;
+ eie = ef;
ecore_main_loop_quit();
}
@@ -70,17 +70,17 @@ EFL_START_TEST(eio_test_map_simple)
ecore_main_loop_begin();
fail_if(!ef);
- ef = eio_file_map_all(ee, EINA_FILE_POPULATE, _filter_cb, _map_cb,
+ ef = eio_file_map_all(eie, EINA_FILE_POPULATE, _filter_cb, _map_cb,
_error_cb, data);
ecore_main_loop_begin();
fail_if(!ef);
- ef = eio_file_map_new(ee, EINA_FILE_WILLNEED, 0, strlen(data), _filter_cb,
+ ef = eio_file_map_new(eie, EINA_FILE_WILLNEED, 0, strlen(data), _filter_cb,
_map_cb, _error_cb, data);
ecore_main_loop_begin();
fail_if(!ef);
- ef = eio_file_close(ee, _done_cb, _error_cb, NULL);
+ ef = eio_file_close(eie, _done_cb, _error_cb, NULL);
ecore_main_loop_begin();
fail_if(!ef);

18
efl.spec
View File

@ -25,7 +25,7 @@
Name: efl
Version: 1.24.2
Version: 1.24.3
Release: 1%{?dist}
Summary: Collection of Enlightenment libraries
License: BSD and LGPLv2+ and GPLv2 and zlib
@ -33,9 +33,9 @@ URL: http://enlightenment.org/
Source0: http://download.enlightenment.org/rel/libs/efl/efl-%{version}.tar.xz
# There is probably a way to conditionalize this in the code that could go upstream
# but this works for now.
Patch1: efl-1.17.1-old-nomodifier-in-drm_mode_fb_cmd2.patch
#Patch1: efl-1.17.1-old-nomodifier-in-drm_mode_fb_cmd2.patch
# If luaL_reg is not defined, define it.
Patch2: efl-1.23.1-luajitfix.patch
#Patch2: efl-1.23.1-luajitfix.patch
# Our armv7 builds do not use neon
Patch3: efl-1.23.1-no-neon.patch
@ -192,9 +192,9 @@ Development files for EFL.
%prep
%setup -q
%if 0%{?rhel} && 0%{?rhel} <= 7
%patch1 -p1 -b .old
#%patch1 -p1 -b .old
%endif
%patch2 -p1 -b .luajitfix
#%patch2 -p1 -b .luajitfix
%patch3 -p1 -b .noneon
# This is why hardcoding paths is bad.
@ -221,7 +221,6 @@ Development files for EFL.
-Dwl=true \
%endif
-Ddrm=true \
-Dopengl=full \
-Dinstall-eo-files=true \
%if 0%{?has_luajit}
-Dbindings=luajit,cxx \
@ -561,6 +560,13 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
%{_libdir}/libexactness*.so
%changelog
* Mon Jul 20 2020 Ding-Yi Chen <dchen@redhat.com> - 1.24.3-1
- update to 1.24.3
- Remove meson flag -Dopengl=full
- Remove Patch1 efl-1.17.1-old-nomodifier-in-drm_mode_fb_cmd2.patch
- Remove Patch2 efl-1.23.1-luajitfix.patch
as luaL_reg is no longer required
* Tue May 26 2020 Tom Callaway <spot@fedoraproject.org> - 1.24.2-1
- update to 1.24.2

2
sources
View File

@ -1 +1 @@
SHA512 (efl-1.24.2.tar.xz) = 0fc2ee94a074e33ae3c7142f2bb8ec5d174c843a26d2cb0641af466c3f413a25ee81bba2445fe03d518358f11546ec716a70e785fe1a8b90727e29bcc7d5f706
SHA512 (efl-1.24.3.tar.xz) = 3791955c588bc1b2ca55caa19dc0fb351c9f6c681791bfe76a435255edd55257c9c5ab2f16d0d91ec2d55113bd9d24d45c0f9026ae72d9f6afbddfd093975089