Hello community, here is the log from the commit of package kvirc for openSUSE:Factory checked in at 2018-11-27 10:44:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kvirc (Old) and /work/SRC/openSUSE:Factory/.kvirc.new.19453 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kvirc" Tue Nov 27 10:44:27 2018 rev:40 rq:652037 version:4.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kvirc/kvirc.changes 2017-12-19 10:57:21.884602325 +0100 +++ /work/SRC/openSUSE:Factory/.kvirc.new.19453/kvirc.changes 2018-11-27 10:46:10.411964770 +0100 @@ -1,0 +2,6 @@ +Fri Nov 16 23:37:39 UTC 2018 - Bernhard Wiedemann <[email protected]> + +- Add kvirc-cmake-timestamp.patch kvirc-gendoc-date.patch (boo#1047218) +- Add kvirc-no-uname.patch to make package build reproducible (boo#1101107) + +------------------------------------------------------------------- New: ---- kvirc-cmake-timestamp.patch kvirc-gendoc-date.patch kvirc-no-uname.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kvirc.spec ++++++ --- /var/tmp/diff_new_pack.ADHCmx/_old 2018-11-27 10:46:11.919963221 +0100 +++ /var/tmp/diff_new_pack.ADHCmx/_new 2018-11-27 10:46:11.923963217 +0100 @@ -26,6 +26,12 @@ Source: ftp://ftp.kvirc.de/pub/kvirc/%{version}/source/kvirc-%{version}.tar.bz2 # PATCH-FIX-UPSTREAM fix-processEvents.patch [email protected] -- fixes use of wrong operator when constructing the parameter to QApplication::processEvents(), and as a result also the build with gcc6 Patch: fix-processEvents.patch +# PATCH-FIX-UPSTREAM +Patch1: kvirc-gendoc-date.patch +# PATCH-FIX-UPSTREAM +Patch2: kvirc-cmake-timestamp.patch +# PATCH-FIX-UPSTREAM +Patch3: kvirc-no-uname.patch %define _realversion 4.0 BuildRequires: audiofile-devel BuildRequires: fdupes @@ -64,8 +70,7 @@ %prep %setup -q -n kvirc-%{version} -%patch -p1 -sed -i -e 's|@CMAKE_KVIRC_BUILD_DATE@||g' cmake/kvirc-config.cmake +%autopatch -p1 %build EXTRA_FLAGS="-DWANT_KDE4=ON \ ++++++ kvirc-cmake-timestamp.patch ++++++ https://github.com/kvirc/KVIrc/pull/2361 merged upstream https://bugzilla.opensuse.org/show_bug.cgi?id=1047218 packages do not build reproducibly from including build time >From 911e328d757e5c180434051ffedb4d4179700c94 Mon Sep 17 00:00:00 2001 From: "Bernhard M. Wiedemann" <[email protected]> Date: Fri, 23 Mar 2018 06:34:59 +0100 Subject: [PATCH] Use cmake TIMESTAMP This greatly simlifies the code and helps to allow reproducible builds. See https://reproducible-builds.org/ for why this is good. --- CMakeLists.txt | 11 +--------- cmake/datetime.cpp | 55 ---------------------------------------------- 2 files changed, 1 insertion(+), 65 deletions(-) delete mode 100644 cmake/datetime.cpp Index: kvirc-4.2.0/CMakeLists.txt =================================================================== --- kvirc-4.2.0.orig/CMakeLists.txt +++ kvirc-4.2.0/CMakeLists.txt @@ -126,16 +126,7 @@ ENDIF() LIST(APPEND CMAKE_KVIRC_BUILD_FLAGS MANDIR=${MANDIR_PREFIX}) # Get the build date -TRY_RUN(TEST_DID_RUN TEST_DID_COMPILE "${CMAKE_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/datetime.cpp" OUTPUT_VARIABLE TEST_BUILD_DATE) -IF(TEST_DID_COMPILE) - STRING(REGEX MATCH "[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9] [A-Z][A-Z][A-Z]" CMAKE_KVIRC_BUILD_DATE "${TEST_BUILD_DATE}") -ELSE() - MESSAGE(STATUS " Test datetime program failed to compile:") - MESSAGE(STATUS " ----------------------------------------") - MESSAGE(STATUS "${TEST_BUILD_DATE}") - MESSAGE(STATUS " ----------------------------------------") - SET(CMAKE_KVIRC_BUILD_DATE "ERROR ") -ENDIF() +string(TIMESTAMP CMAKE_KVIRC_BUILD_DATE "%Y-%m-%d %H:%M:%S UTC" UTC) # Set var to link with, for later use SET(LIBS) ++++++ kvirc-gendoc-date.patch ++++++ https://github.com/kvirc/KVIrc/pull/2360 merged upstream https://bugzilla.opensuse.org/show_bug.cgi?id=1047218 packages do not build reproducibly from including build time >From 567d4f5de84d0794baac1fd6046abf6157ad7df2 Mon Sep 17 00:00:00 2001 From: "Bernhard M. Wiedemann" <[email protected]> Date: Fri, 23 Mar 2018 06:49:51 +0100 Subject: [PATCH] doc: Allow to override build date in order to make builds reproducible. See https://reproducible-builds.org/ for why this is good and https://reproducible-builds.org/specs/source-date-epoch/ for the definition of this variable. --- admin/gendoc.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: kvirc-4.2.0/admin/gendoc.pl =================================================================== --- kvirc-4.2.0.orig/admin/gendoc.pl +++ kvirc-4.2.0/admin/gendoc.pl @@ -28,8 +28,8 @@ # GLOBAL CONFIGS ################################################################################################# -$g_currenttime=gmtime; -$g_currentuser = getlogin || getpwuid($<) || "Unknown"; +$g_currenttime = gmtime($ENV{SOURCE_DATE_EPOCH} || time); +$g_currentuser = $ENV{USER} || getlogin || getpwuid($<) || "Unknown"; $g_notetablebgcolor="#F0F0F0"; $g_notetextcolor="#909090"; $g_syntaxcolor="#802000"; ++++++ kvirc-no-uname.patch ++++++ https://github.com/kvirc/KVIrc/pull/2411 https://bugzilla.opensuse.org/show_bug.cgi?id=1101107 packages do not build reproducibly from including kernel version commit 6da49f66cd27f7ce44450ec30bdd6d60f1f082b7 Author: Bernhard M. Wiedemann <[email protected]> Date: Sat Nov 17 09:17:47 2018 +0100 Do not track Linux kernel version of build system to make reproducible builds easier. See https://reproducible-builds.org/ for why this is good. Index: kvirc-4.2.0/CMakeLists.txt =================================================================== --- kvirc-4.2.0.orig/CMakeLists.txt +++ kvirc-4.2.0/CMakeLists.txt @@ -44,7 +44,6 @@ SET(CMAKE_KVIRC_BUILD_COMMAND ${CMAKE_CO SET(CMAKE_KVIRC_BUILD_FLAGS) SET(CMAKE_KVIRC_BUILD_SYSTEM ${CMAKE_SYSTEM}) SET(CMAKE_KVIRC_BUILD_SYSTEM_NAME ${CMAKE_SYSTEM_NAME}) -SET(CMAKE_KVIRC_BUILD_SYSTEM_VERSION ${CMAKE_SYSTEM_VERSION}) SET(CMAKE_KVIRC_BUILD_CPU ${CMAKE_SYSTEM_PROCESSOR}) SET(CMAKE_KVIRC_BUILD_COMPILER ${CMAKE_CXX_COMPILER}) SET(CMAKE_KVIRC_BUILD_COMPILER_FLAGS ${CMAKE_CXX_FLAGS}) Index: kvirc-4.2.0/cmake/kvi_sysbuildinfo.h.cmake =================================================================== --- kvirc-4.2.0.orig/cmake/kvi_sysbuildinfo.h.cmake +++ kvirc-4.2.0/cmake/kvi_sysbuildinfo.h.cmake @@ -12,7 +12,6 @@ #define KVIRC_BUILD_FLAGS "${CMAKE_KVIRC_BUILD_FLAGS}" #define KVIRC_BUILD_SYSTEM "${CMAKE_KVIRC_BUILD_SYSTEM}" #define KVIRC_BUILD_SYSTEM_NAME "${CMAKE_KVIRC_BUILD_SYSTEM_NAME}" -#define KVIRC_BUILD_SYSTEM_VERSION "${CMAKE_KVIRC_BUILD_SYSTEM_VERSION}" #define KVIRC_BUILD_CPU "${CMAKE_KVIRC_BUILD_CPU}" #define KVIRC_BUILD_COMPILER "${CMAKE_KVIRC_BUILD_COMPILER}" #define KVIRC_BUILD_COMPILER_FLAGS "${CMAKE_KVIRC_BUILD_COMPILER_FLAGS}" Index: kvirc-4.2.0/src/kvilib/config/KviBuildInfo.cpp =================================================================== --- kvirc-4.2.0.orig/src/kvilib/config/KviBuildInfo.cpp +++ kvirc-4.2.0/src/kvilib/config/KviBuildInfo.cpp @@ -51,7 +51,11 @@ namespace KviBuildInfo QString buildSystem() { - return QString(KVIRC_BUILD_SYSTEM); + #ifdef COMPILE_ON_WINDOWS + return QString(KVIRC_BUILD_SYSTEM); + #else + return QString(); + #endif } QString buildSystemName() @@ -65,11 +69,7 @@ namespace KviBuildInfo QString buildSystemVersion() { - #ifdef COMPILE_ON_WINDOWS - return QString(); - #else - return QString(KVIRC_BUILD_SYSTEM_VERSION); - #endif + return QString(); } QString buildCPU()
