Hello community,
here is the log from the commit of package qscintilla-qt5 for openSUSE:Factory
checked in at 2018-11-09 07:54:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qscintilla-qt5 (Old)
and /work/SRC/openSUSE:Factory/.qscintilla-qt5.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qscintilla-qt5"
Fri Nov 9 07:54:11 2018 rev:7 rq:647097 version:2.10.8
Changes:
--------
--- /work/SRC/openSUSE:Factory/qscintilla-qt5/python-qscintilla-qt5.changes
2018-10-23 20:38:40.404667379 +0200
+++
/work/SRC/openSUSE:Factory/.qscintilla-qt5.new/python-qscintilla-qt5.changes
2018-11-09 07:54:18.779718454 +0100
@@ -1,0 +2,6 @@
+Wed Nov 7 20:10:51 UTC 2018 - Bernhard Wiedemann <[email protected]>
+
+- Add reproducible.patch to sort input file list to make package
+ build reproducible (boo#1041090)
+
+-------------------------------------------------------------------
qscintilla-qt5.changes: same change
New:
----
reproducible.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-qscintilla-qt5.spec ++++++
--- /var/tmp/diff_new_pack.PBuUW0/_old 2018-11-09 07:54:19.399717743 +0100
+++ /var/tmp/diff_new_pack.PBuUW0/_new 2018-11-09 07:54:19.403717738 +0100
@@ -27,6 +27,8 @@
Source: QScintilla_gpl-%{version}.tar.gz
#PATCH-FIX-OPENSUSE: Rename qscintilla2 to qscintilla2-qt5:
Patch0: python-config.diff
+#PATCH-FIX-OPENSUSE
+Patch1: reproducible.patch
BuildRequires: %{python_module devel}
BuildRequires: %{python_module qt5-devel}
BuildRequires: %{python_module sip-devel >= 4.19.8}
@@ -65,6 +67,7 @@
%prep
%setup -q -n QScintilla_gpl-%{version}
%patch0 -p1
+%patch1 -p1
%build
%{python_expand cp -r Python Python_%{$python_bin_suffix}
qscintilla-qt5.spec: same change
++++++ reproducible.patch ++++++
https://www.riverbankcomputing.com/pipermail/qscintilla/2018-November/001349.html
From: "Bernhard M. Wiedemann" <[email protected]>
Date: Sun, 11 Jun 2017 05:10:57 +0000
Subject: [PATCH] Sort input file list
Sort input file list
so that Qsci.so builds in a reproducible way
in spite of indeterministic filesystem readdir order
See https://reproducible-builds.org/ for why this is good.
Without this patch, openSUSE's python-qscintilla-qt5 package
varied for every build.
On this topic: https://bugzilla.opensuse.org/show_bug.cgi?id=1041090
Index: QScintilla_gpl-2.10/Python/configure.py
===================================================================
--- QScintilla_gpl-2.10.orig/Python/configure.py
+++ QScintilla_gpl-2.10/Python/configure.py
@@ -1544,7 +1544,7 @@ macx {
pro.write('HEADERS = sipAPI%s.h\n' % mname)
pro.write('SOURCES =')
- for s in os.listdir(module_config.name):
+ for s in sorted(os.listdir(module_config.name)):
if s.endswith('.cpp'):
pro.write(' \\\n %s' % s)
pro.write('\n')
