fix FTBFS
This commit is contained in:
parent
cd517b59cc
commit
ab2a79008f
|
@ -0,0 +1,188 @@
|
||||||
|
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);
|
||||||
|
|
9
efl.spec
9
efl.spec
|
@ -26,7 +26,7 @@
|
||||||
|
|
||||||
Name: efl
|
Name: efl
|
||||||
Version: 1.23.3
|
Version: 1.23.3
|
||||||
Release: 3%{?dist}
|
Release: 4%{?dist}
|
||||||
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/
|
||||||
|
@ -38,6 +38,9 @@ Patch1: efl-1.17.1-old-nomodifier-in-drm_mode_fb_cmd2.patch
|
||||||
Patch2: efl-1.23.1-luajitfix.patch
|
Patch2: efl-1.23.1-luajitfix.patch
|
||||||
# Our armv7 builds do not use neon
|
# Our armv7 builds do not use neon
|
||||||
Patch3: efl-1.23.1-no-neon.patch
|
Patch3: efl-1.23.1-no-neon.patch
|
||||||
|
# gcc10 -fno-common is now default
|
||||||
|
# https://phab.enlightenment.org/D11259
|
||||||
|
Patch4: efl-1.23.3-gcc10.patch
|
||||||
|
|
||||||
%ifnarch s390 s390x
|
%ifnarch s390 s390x
|
||||||
BuildRequires: libunwind-devel
|
BuildRequires: libunwind-devel
|
||||||
|
@ -195,6 +198,7 @@ Development files for EFL.
|
||||||
%endif
|
%endif
|
||||||
%patch2 -p1 -b .luajitfix
|
%patch2 -p1 -b .luajitfix
|
||||||
%patch3 -p1 -b .noneon
|
%patch3 -p1 -b .noneon
|
||||||
|
%patch4 -p1 -b .gcc10
|
||||||
|
|
||||||
# This is why hardcoding paths is bad.
|
# This is why hardcoding paths is bad.
|
||||||
# sed -i -e 's|/opt/efl-%{version}/share/|%{_datadir}/|' \
|
# sed -i -e 's|/opt/efl-%{version}/share/|%{_datadir}/|' \
|
||||||
|
@ -545,6 +549,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
|
||||||
%{_libdir}/pkgconfig/evas*.pc
|
%{_libdir}/pkgconfig/evas*.pc
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jan 31 2020 Tom Callaway <spot@fedoraproject.org> - 1.23.3-4
|
||||||
|
- fix FTBFS
|
||||||
|
|
||||||
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.23.3-3
|
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.23.3-3
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue