!5 解决软件包efl在mainline的编译失败问题
From: @tushenmei Reviewed-by: @jianminw Signed-off-by: @jianminw
This commit is contained in:
openeuler-ci-bot
Gitee
commit
3a489656d7
188
bugfix-of-gcc-10.patch
Normal file
188
bugfix-of-gcc-10.patch
Normal file
@ -0,0 +1,188 @@
|
|||||||
|
diff -Nur efl-1.23.3/src/benchmarks/eina/eina_bench_crc_hash.c efl-1.23.3-new/src/benchmarks/eina/eina_bench_crc_hash.c
|
||||||
|
--- efl-1.23.3/src/benchmarks/eina/eina_bench_crc_hash.c 2019-11-28 02:27:00.000000000 +0800
|
||||||
|
+++ efl-1.23.3-new/src/benchmarks/eina/eina_bench_crc_hash.c 2021-08-02 17:41:32.000000000 +0800
|
||||||
|
@@ -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 -Nur efl-1.23.3/src/benchmarks/eina/eina_bench.h efl-1.23.3-new/src/benchmarks/eina/eina_bench.h
|
||||||
|
--- efl-1.23.3/src/benchmarks/eina/eina_bench.h 2019-11-28 02:27:00.000000000 +0800
|
||||||
|
+++ efl-1.23.3-new/src/benchmarks/eina/eina_bench.h 2021-08-02 17:39:56.000000000 +0800
|
||||||
|
@@ -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 -Nur efl-1.23.3/src/bin/elementary/test_ui_clock.c efl-1.23.3-new/src/bin/elementary/test_ui_clock.c
|
||||||
|
--- efl-1.23.3/src/bin/elementary/test_ui_clock.c 2019-11-28 02:27:01.000000000 +0800
|
||||||
|
+++ efl-1.23.3-new/src/bin/elementary/test_ui_clock.c 2021-08-02 17:48:00.000000000 +0800
|
||||||
|
@@ -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 @@
|
||||||
|
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 @@
|
||||||
|
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,13 @@
|
||||||
|
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 -Nur efl-1.23.3/src/tests/eio/eio_test_map.c efl-1.23.3-new/src/tests/eio/eio_test_map.c
|
||||||
|
--- efl-1.23.3/src/tests/eio/eio_test_map.c 2019-11-28 02:27:01.000000000 +0800
|
||||||
|
+++ efl-1.23.3-new/src/tests/eio/eio_test_map.c 2021-08-02 17:50:54.000000000 +0800
|
||||||
|
@@ -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 @@
|
||||||
|
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 @@
|
||||||
|
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);
|
||||||
|
|
||||||
7
efl.spec
7
efl.spec
@ -1,6 +1,6 @@
|
|||||||
Name: efl
|
Name: efl
|
||||||
Version: 1.23.3
|
Version: 1.23.3
|
||||||
Release: 1
|
Release: 2
|
||||||
Summary: Collection of Enlightenment libraries
|
Summary: Collection of Enlightenment libraries
|
||||||
License: BSD and LGPLv2+ and GPLv2 and zlib
|
License: BSD and LGPLv2+ and GPLv2 and zlib
|
||||||
URL: http://enlightenment.org/
|
URL: http://enlightenment.org/
|
||||||
@ -34,6 +34,8 @@ Obsoletes: e_dbus <= 1.7.10 ecore <= 1.7.10 edje <= 1.7.10 eet <= 1.7.10
|
|||||||
Obsoletes: efreet <= 1.7.10 eio <= 1.7.10 elementary <= 1.17.1 embryo <= 1.7.10 emotion <= 1.7.10
|
Obsoletes: efreet <= 1.7.10 eio <= 1.7.10 elementary <= 1.17.1 embryo <= 1.7.10 emotion <= 1.7.10
|
||||||
Obsoletes: ethumb <= 1.7.10 evas <= 1.7.10 evas-generic-loaders <= 1.17.0 libeina <= 1.7.10
|
Obsoletes: ethumb <= 1.7.10 evas <= 1.7.10 evas-generic-loaders <= 1.17.0 libeina <= 1.7.10
|
||||||
|
|
||||||
|
Patch0001: bugfix-of-gcc-10.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Enlightenment Foundation Libraries, or EFL, are the set of libraries
|
Enlightenment Foundation Libraries, or EFL, are the set of libraries
|
||||||
used to create the Enlightenment Window Manager DR17 (E17). This set
|
used to create the Enlightenment Window Manager DR17 (E17). This set
|
||||||
@ -139,6 +141,9 @@ chmod 644 src/bin/edje/edje_cc_out.c
|
|||||||
%exclude %{_libdir}/cmake/Elua/
|
%exclude %{_libdir}/cmake/Elua/
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Aug 2 2021 Shenemi Tu <tushenmei@huawei.com> - 1.23.3-2
|
||||||
|
- bugfix-of-gcc-10.patch
|
||||||
|
|
||||||
* Fri Oct 16 2020 maminjie <maminjie1@huawei.com> - 1.23.3-1
|
* Fri Oct 16 2020 maminjie <maminjie1@huawei.com> - 1.23.3-1
|
||||||
- Upgrade to 1.23.3
|
- Upgrade to 1.23.3
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user