Hello community, here is the log from the commit of package efl for openSUSE:Factory checked in at 2018-04-25 10:02:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/efl (Old) and /work/SRC/openSUSE:Factory/.efl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "efl" Wed Apr 25 10:02:54 2018 rev:36 rq:600806 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/efl/efl.changes 2018-03-28 10:29:34.816932079 +0200 +++ /work/SRC/openSUSE:Factory/.efl.new/efl.changes 2018-04-25 10:02:56.807330995 +0200 @@ -1,0 +2,14 @@ +Sun Apr 15 00:47:28 UTC 2018 - [email protected] + +- Add reproducible-edje.patch to make .edj files in elemines + and other packages build reproducibly + +------------------------------------------------------------------- +Tue Apr 3 10:02:47 UTC 2018 - [email protected] + +- Disable luajit for aarch64 and remove non working patches for aarch64 + * 0002-eina-safepointer-mimic-47-bit-eoid-patch.patch + * 0003-elua-use-safeptr-with-lightuserdata-to-work-around-l.patch + * 0004-elua-build-fix.patch + +------------------------------------------------------------------- Old: ---- 0002-eina-safepointer-mimic-47-bit-eoid-patch.patch 0003-elua-use-safeptr-with-lightuserdata-to-work-around-l.patch 0004-elua-build-fix.patch New: ---- reproducible-edje.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ efl.spec ++++++ --- /var/tmp/diff_new_pack.Y0AY6V/_old 2018-04-25 10:02:59.979214611 +0200 +++ /var/tmp/diff_new_pack.Y0AY6V/_new 2018-04-25 10:02:59.983214464 +0200 @@ -46,7 +46,7 @@ %else %define xine_present 1 %endif -%ifarch %ix86 x86_64 %{arml} ppc aarch64 +%ifarch %ix86 x86_64 %{arml} ppc %if !0%{?suse_version} || 0%{?is_opensuse} %define luajit_present 1 %endif @@ -83,9 +83,8 @@ Group: Development/Libraries/C and C++ Url: https://git.enlightenment.org/core/efl.git Source: %{name}-%{version}.tar.xz -Patch1: 0002-eina-safepointer-mimic-47-bit-eoid-patch.patch -Patch2: 0003-elua-use-safeptr-with-lightuserdata-to-work-around-l.patch -Patch3: 0004-elua-build-fix.patch +# PATCH-FIX-UPSTREAM bmwiedemann +Patch3: reproducible-edje.patch BuildRequires: ImageMagick BuildRequires: autoconf >= 2.5 BuildRequires: automake @@ -759,7 +758,7 @@ %prep %setup -q -%autopatch -p1 +%patch3 -p1 # remove __DATE__ and __TIME__ FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M') ++++++ reproducible-edje.patch ++++++ >From 8800eb0ba29fe56855e3d521387635fc3aebd515 Mon Sep 17 00:00:00 2001 From: Stefan Schmidt <[email protected]> Date: Tue, 16 May 2017 17:58:36 +0200 Subject: edje: make the generated default program name reproducible over builds For programs without specific names edje_cc generated default names in the form of program_$MEMORY_ADDRESS. That worked well enough for keeping the names unique, but it causes problems if one wants to have these files being binary reproducible due to different memory layouts, compilers, etc. Simply using a counter as unique part should work well enough for our use case and help people who want to verify builds. Ref T5113 --- src/bin/edje/edje_cc_handlers.c | 5 +++-- src/lib/edje/edje_private.h | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c index a3f5ddd..cd6b353 100644 --- a/src/bin/edje/edje_cc_handlers.c +++ b/src/bin/edje/edje_cc_handlers.c @@ -14608,14 +14608,15 @@ ob_collections_group_programs_program(void) epp->can_override = EINA_FALSE; /* generate new name */ - def_name = alloca(strlen("program_") + strlen("0xFFFFFFFFFFFFFFFF") + 1); - sprintf(def_name, "program_%p", ep); + def_name = alloca(strlen("program_") + strlen("FFFFFFFFFFFFFFFF") + 1); + sprintf(def_name, "program_%X", pc->programs.total_count); ep->name = strdup(def_name); if (pcp->default_source) ep->source = strdup(pcp->default_source); _edje_program_insert(pc, ep); current_program = ep; + pc->programs.total_count++; } static void diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h index 94c994a..9c01861 100644 --- a/src/lib/edje/edje_private.h +++ b/src/lib/edje/edje_private.h @@ -1087,6 +1087,7 @@ struct _Edje_Part_Collection unsigned int strncmp_count; unsigned int strrncmp_count; unsigned int nocmp_count; + unsigned int total_count; } programs; struct { /* list of limit that need to be monitored */ -- cgit v0.12
