Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package grantlee5 for openSUSE:Factory checked in at 2022-11-16 15:42:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grantlee5 (Old) and /work/SRC/openSUSE:Factory/.grantlee5.new.1597 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grantlee5" Wed Nov 16 15:42:07 2022 rev:9 rq:1035528 version:5.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/grantlee5/grantlee5.changes 2020-05-16 22:26:37.761309452 +0200 +++ /work/SRC/openSUSE:Factory/.grantlee5.new.1597/grantlee5.changes 2022-11-16 15:42:12.847548571 +0100 @@ -1,0 +2,20 @@ +Sun Nov 13 11:19:25 UTC 2022 - Luca Beltrame <[email protected]> + +- Update to 5.3.1 + * Use C++11 nullptr where appropriate + * Use QRandomGenerator instead of deprecated qRand + * Increase compatibility with Qt 6 APIs + * Add CMake option to build with Qt 6 - GRANTLEE_BUILD_WITH_QT6 + * Support enum introspection on Q_GADGET + * filesizeformat implementation as well as localized filesize + * Make enums comparable with more operations + * Add "truncatechars" filter + * Fix concatenation of string lists +- Refreshed patches: + * includes.diff + * grantlee-5.2.0-fix-ctest-ld-library-path.patch +- Add patch to fix tests on i586 (gh#steveire/grantlee#85): + * fix-i586-precision.patch +- Add keyring for GPG source verification + +------------------------------------------------------------------- Old: ---- grantlee-5.2.0.tar.gz New: ---- fix-i586-precision.patch grantlee-5.3.1.tar.gz grantlee5.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grantlee5.spec ++++++ --- /var/tmp/diff_new_pack.4iBRA6/_old 2022-11-16 15:42:13.251550655 +0100 +++ /var/tmp/diff_new_pack.4iBRA6/_new 2022-11-16 15:42:13.255550675 +0100 @@ -1,7 +1,7 @@ # # spec file for package grantlee5 # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,18 +22,21 @@ %{?!cmake_install:%global cmake_install() DESTDIR=%{buildroot} make install} Name: grantlee5 -Version: 5.2.0 +Version: 5.3.1 Release: 0 Summary: Qt string template library License: LGPL-2.1-or-later Group: System/Libraries -URL: http://grantlee.org/ -Source: http://www.grantlee.org/downloads/grantlee-%{version}.tar.gz +URL: https://github.com/steveire/grantlee +Source: https://github.com/steveire/grantlee/releases/download/v%{version}/grantlee-%{version}.tar.gz Source2: baselibs.conf +Source3: grantlee5.keyring # PATCH-FIX-OPENSUSE includes.diff -- since upstream doesn't provide a way to install to custom directory, we cheat! Patch0: includes.diff # PATCH-FIX-OPENSUSE grantlee-5.2.0-fix-ctest-ld-library-path.patch -- set ld library path for tests Patch1: grantlee-5.2.0-fix-ctest-ld-library-path.patch +# PATCH-FIX-UPSTREAM https://github.com/steveire/grantlee/pull/86/ +Patch2: fix-i586-precision.patch BuildRequires: cmake >= 3.5 BuildRequires: cmake(Qt5Core) >= 5.3 BuildRequires: cmake(Qt5Gui) >= 5.3 ++++++ fix-i586-precision.patch ++++++ >From 13094b78a790786030a468453c2b3ead4c7fd9cf Mon Sep 17 00:00:00 2001 From: Fabian Vogt <[email protected]> Date: Sun, 13 Nov 2022 14:01:21 +0100 Subject: [PATCH] Fix formatting of some larger file sizes on 32bit x86 With the x87 FPU available, GCC uses long double precision for some variables. Due to the function call passing a double, some comparisons break down. That resulted in "1.00 YB" being printed as "1000.00 ZB" instead. Fixes #85 --- templates/lib/util.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/templates/lib/util.cpp b/templates/lib/util.cpp index 504674a7..a0381c59 100644 --- a/templates/lib/util.cpp +++ b/templates/lib/util.cpp @@ -23,6 +23,7 @@ #include "metaenumvariable_p.h" #include "metatype.h" +#include <cfloat> #include <QtCore/QStringList> QString Grantlee::unescapeStringLiteral(const QString &input) @@ -212,7 +213,13 @@ std::pair<qreal, QString> Grantlee::calcFileSize(qreal size, int unitSystem, bool found = false; int count = 0; const qreal baseVal = (_unitSystem == 10) ? 1000.0F : 1024.0F; +#if FLT_EVAL_METHOD == 2 + // Avoid that this is treated as long double, as the increased + // precision breaks the comparison below. + volatile qreal current = 1.0F; +#else qreal current = 1.0F; +#endif int units = decimalUnits.size(); while (!found && (count < units)) { current *= baseVal; ++++++ grantlee-5.2.0-fix-ctest-ld-library-path.patch ++++++ --- /var/tmp/diff_new_pack.4iBRA6/_old 2022-11-16 15:42:13.303550923 +0100 +++ /var/tmp/diff_new_pack.4iBRA6/_new 2022-11-16 15:42:13.307550943 +0100 @@ -11,24 +11,28 @@ textdocument/tests/CMakeLists.txt | 1 + 2 files changed, 2 insertions(+) ---- a/textdocument/tests/CMakeLists.txt 2019-12-18 20:57:28.000000000 +0100 -+++ b/textdocument/tests/CMakeLists.txt 2019-12-19 14:19:32.712757537 +0100 -@@ -14,6 +14,7 @@ +Index: grantlee-5.3.1/textdocument/tests/CMakeLists.txt +=================================================================== +--- grantlee-5.3.1.orig/textdocument/tests/CMakeLists.txt ++++ grantlee-5.3.1/textdocument/tests/CMakeLists.txt +@@ -23,6 +23,7 @@ macro(GRANTLEE_TEXTDOCUMENT_UNIT_TESTS) add_test(${_testname} ${_testname}_exec ) target_link_libraries(${_testname}_exec Grantlee::TextDocument textdocument_test_builtins) set_property(GLOBAL APPEND PROPERTY TEST_COVERAGE "${CMAKE_CURRENT_BINARY_DIR}/${_testname}_exec" ) + set_property(TEST ${_testname} PROPERTY ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/textdocument/lib") endforeach(_testname) endmacro(GRANTLEE_TEXTDOCUMENT_UNIT_TESTS) - ---- a/templates/tests/CMakeLists.txt 2019-12-18 20:57:28.000000000 +0100 -+++ b/templates/tests/CMakeLists.txt 2019-12-19 14:17:42.057605600 +0100 -@@ -68,6 +68,7 @@ + +Index: grantlee-5.3.1/templates/tests/CMakeLists.txt +=================================================================== +--- grantlee-5.3.1.orig/templates/tests/CMakeLists.txt ++++ grantlee-5.3.1/templates/tests/CMakeLists.txt +@@ -89,6 +89,7 @@ macro(grantlee_templates_unit_tests) endif() - + set_property(GLOBAL APPEND PROPERTY TEST_COVERAGE "${CMAKE_CURRENT_BINARY_DIR}/${_testname}_exec" ) + set_property(TEST ${_testname} PROPERTY ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/templates/lib:${CMAKE_BINARY_DIR}/grantlee") endforeach(_testname) endmacro() - + ++++++ grantlee-5.2.0.tar.gz -> grantlee-5.3.1.tar.gz ++++++ ++++ 8267 lines of diff (skipped) ++++++ includes.diff ++++++ --- /var/tmp/diff_new_pack.4iBRA6/_old 2022-11-16 15:42:13.519552037 +0100 +++ /var/tmp/diff_new_pack.4iBRA6/_new 2022-11-16 15:42:13.519552037 +0100 @@ -1,6 +1,8 @@ ---- a/templates/lib/CMakeLists.txt 2019-12-18 20:57:28.000000000 +0100 -+++ b/templates/lib/CMakeLists.txt 2019-12-19 00:53:23.253568027 +0100 -@@ -125,7 +125,7 @@ +Index: grantlee-5.3.1/templates/lib/CMakeLists.txt +=================================================================== +--- grantlee-5.3.1.orig/templates/lib/CMakeLists.txt ++++ grantlee-5.3.1/templates/lib/CMakeLists.txt +@@ -137,7 +137,7 @@ install(TARGETS Grantlee_Templates EXPOR RUNTIME DESTINATION bin COMPONENT Templates LIBRARY DESTINATION ${LIB_INSTALL_DIR} COMPONENT Templates ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT Templates @@ -9,7 +11,7 @@ ) install(FILES -@@ -152,10 +152,10 @@ +@@ -164,10 +164,10 @@ install(FILES token.h util.h variable.h @@ -22,9 +24,11 @@ - DESTINATION include COMPONENT Templates + DESTINATION include/grantlee5 COMPONENT Templates ) ---- a/textdocument/lib/CMakeLists.txt 2019-12-18 20:57:28.000000000 +0100 -+++ b/textdocument/lib/CMakeLists.txt 2019-12-19 00:54:55.780989914 +0100 -@@ -48,7 +48,7 @@ +Index: grantlee-5.3.1/textdocument/lib/CMakeLists.txt +=================================================================== +--- grantlee-5.3.1.orig/textdocument/lib/CMakeLists.txt ++++ grantlee-5.3.1/textdocument/lib/CMakeLists.txt +@@ -54,7 +54,7 @@ install(TARGETS Grantlee_TextDocument EX RUNTIME DESTINATION bin COMPONENT TextDocument LIBRARY DESTINATION ${LIB_INSTALL_DIR} COMPONENT TextDocument ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT TextDocument @@ -33,7 +37,7 @@ ) install(FILES -@@ -59,10 +59,10 @@ +@@ -65,10 +65,10 @@ install(FILES texthtmlbuilder.h mediawikimarkupbuilder.h ${CMAKE_CURRENT_BINARY_DIR}/grantlee_textdocument_export.h
