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

fix build against check in rawhide

This commit is contained in:
spot 2020-08-05 11:58:02 -04:00
parent 63cdc0e9c0
commit d51e4ab838
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
efl-1.24.3-check-fix.patch Normal file
View File

@ -0,0 +1,26 @@
diff -up efl-1.24.3/src/tests/eldbus/eldbus_fake_server.c.checkfix efl-1.24.3/src/tests/eldbus/eldbus_fake_server.c
--- efl-1.24.3/src/tests/eldbus/eldbus_fake_server.c.checkfix 2020-08-05 11:47:06.340045747 -0400
+++ efl-1.24.3/src/tests/eldbus/eldbus_fake_server.c 2020-08-05 11:47:27.437985789 -0400
@@ -170,11 +170,11 @@ _fake_server_name_request_cb(void *data
{
const char *name, *text;
if (eldbus_message_error_get(msg, &name, &text))
- ck_abort_msg("error on _fake_server_name_request_cb: %s %s", name, text);
+ fail("error on _fake_server_name_request_cb: %s %s", name, text);
unsigned int reply;
if (!eldbus_message_arguments_get(msg, "u", &reply))
- ck_abort_msg("error geting arguments on _fake_server_name_request_cb");
+ fail("error geting arguments on _fake_server_name_request_cb");
if (ELDBUS_NAME_REQUEST_REPLY_PRIMARY_OWNER != reply)
{
@@ -196,7 +196,7 @@ _fake_server_name_request_cb(void *data
}
snprintf(errmsg, sizeof(errmsg), "Failed to start fake server: %s (%u)",
errcode, reply);
- ck_abort_msg(errmsg);
+ fail(errmsg);
}
ecore_main_loop_quit();

9
efl.spec
View File

@ -26,7 +26,7 @@
Name: efl
Version: 1.24.3
Release: 3%{?dist}
Release: 4%{?dist}
Summary: Collection of Enlightenment libraries
License: BSD and LGPLv2+ and GPLv2 and zlib
URL: http://enlightenment.org/
@ -38,6 +38,9 @@ Source0: http://download.enlightenment.org/rel/libs/efl/efl-%{version}.tar.xz
#Patch2: efl-1.23.1-luajitfix.patch
# Our armv7 builds do not use neon
Patch3: efl-1.23.1-no-neon.patch
# This is hacky, but it gets us building in rawhide again.
# Upstream efl probably needs to rework how they use check in their C tests
Patch4: efl-1.24.3-check-fix.patch
%ifnarch s390 s390x
BuildRequires: libunwind-devel
@ -196,6 +199,7 @@ Development files for EFL.
%endif
#%patch2 -p1 -b .luajitfix
%patch3 -p1 -b .noneon
%patch4 -p1 -b .checkfix
# This is why hardcoding paths is bad.
# sed -i -e 's|/opt/efl-%{version}/share/|%{_datadir}/|' \
@ -560,6 +564,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
%{_libdir}/libexactness*.so
%changelog
* Wed Aug 5 2020 Tom Callaway <spot@fedoraproject.org> - 1.24.3-4
- fix build against check in rawhide
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.24.3-3
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild