[prev in list] [next in list] [prev in thread] [next in thread] 

List:       opensuse-commit
Subject:    commit deepin-qt-dbus-factory for openSUSE:Factory
From:       root <root () hilbert ! suse ! de>
Date:       2018-11-30 15:33:08
Message-ID: 20181130153308.E193C9B882 () hilbert ! suse ! de
[Download RAW message or body]

Hello community,

here is the log from the commit of package deepin-qt-dbus-factory for \
openSUSE:Factory checked in at 2018-11-30 16:32:58 \
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing \
/work/SRC/openSUSE:Factory/deepin-qt-dbus-factory (Old)  and      \
/work/SRC/openSUSE:Factory/.deepin-qt-dbus-factory.new.19453 (New) \
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "deepin-qt-dbus-factory"

Fri Nov 30 16:32:58 2018 rev:2 rq:652761 version:0.4.2

Changes:
--------
--- /work/SRC/openSUSE:Factory/deepin-qt-dbus-factory/deepin-qt-dbus-factory.changes	2017-12-31 \
                19:32:14.717565552 +0100
+++ /work/SRC/openSUSE:Factory/.deepin-qt-dbus-factory.new.19453/deepin-qt-dbus-factory.changes	2018-11-30 \
16:33:07.129305503 +0100 @@ -1,0 +2,6 @@
+Wed Nov 28 06:07:02 UTC 2018 - Bernhard Wiedemann <bwiedemann@suse.com>
+
+- Add reproducible.patch to sort input file list in order to
+  enable reproducible builds (boo#1041090)
+
+-------------------------------------------------------------------

New:
----
  reproducible.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ deepin-qt-dbus-factory.spec ++++++
--- /var/tmp/diff_new_pack.7lAaog/_old	2018-11-30 16:33:08.833303269 +0100
+++ /var/tmp/diff_new_pack.7lAaog/_new	2018-11-30 16:33:08.837303264 +0100
@@ -26,6 +26,8 @@
 Url:            https://github.com/linuxdeepin/dde-qt-dbus-factory
 Group:          Development/Libraries/C and C++
 Source:         https://github.com/linuxdeepin/dde-qt-dbus-factory/archive/%{version}/%{_name}-%{version}.tar.gz
 +# PATCH-FIX-UPSTREAM https://cr.deepin.io/#/c/dde/dde-qt-dbus-factory/+/40105
+Patch0:         reproducible.patch
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
 BuildRequires:  gcc-c++
@@ -71,6 +73,7 @@
 
 %prep
 %setup -q -n %{_name}-%{version}
+%patch0 -p1
 
 %build
 %qmake5 DEFINES+=QT_NO_DEBUG_OUTPUT \

++++++ reproducible.patch ++++++
commit 895926b86a25c7623e318529029db2a1fbb18cc1
Author: Bernhard M. Wiedemann <bwiedemann@suse.de>
Date:   Tue Nov 27 22:07:48 2018 +0100

    Sort input file list
    
    so that libdframeworkdbus.so.1.0.0 builds in a reproducible way
    in spite of indeterministic filesystem readdir order
    and http://bugs.python.org/issue30461
    
    See https://reproducible-builds.org/ for why this is good.
    
    Without this patch, openSUSE's deepin-qt-dbus-factory package
    varied for every build.
    
    Change-Id: I2baf9f0aeb09e16d81c85a22aee8d60cad7ffa87

diff --git a/libdframeworkdbus/generate_code.py b/libdframeworkdbus/generate_code.py
index 58b07cd..d86838c 100755
--- a/libdframeworkdbus/generate_code.py
+++ b/libdframeworkdbus/generate_code.py
@@ -52,8 +52,8 @@ def main():
 
         print("generating the pri file...")
         pwdfy = lambda x: "$$PWD/%s" % x
-        sources = map(pwdfy, glob.glob1(generated_dir, "*.cpp"))
-        headers = map(pwdfy, glob.glob1(generated_dir, "*.h"))
+        sources = map(pwdfy, sorted(glob.glob1(generated_dir, "*.cpp")))
+        headers = map(pwdfy, sorted(glob.glob1(generated_dir, "*.h")))
         pri.write("HEADERS += %s\n" % " ".join(headers))
         pri.write("SOURCES += %s" % " ".join(sources))
         print("done.")


[prev in list] [next in list] [prev in thread] [next in thread]