diff --git a/packages/g/grantlee5/.files b/packages/g/grantlee5/.files index b38c71543ef..837f8d76e68 100644 Binary files a/packages/g/grantlee5/.files and b/packages/g/grantlee5/.files differ diff --git a/packages/g/grantlee5/.rev b/packages/g/grantlee5/.rev index bb7ff4ecb88..474bf21f826 100644 --- a/packages/g/grantlee5/.rev +++ b/packages/g/grantlee5/.rev @@ -64,4 +64,30 @@ 805835 + + 29f2e67bd4e4b2b9773d313262f28dc1 + 5.3.1 + + dimstar_suse + - 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 + +- Require cmake(Qt5LinguistTools) for building to enable testing of +- update to version 0.1.3 + 1035528 + diff --git a/packages/g/grantlee5/fix-i586-precision.patch b/packages/g/grantlee5/fix-i586-precision.patch new file mode 100644 index 00000000000..f3d4384b5bd --- /dev/null +++ b/packages/g/grantlee5/fix-i586-precision.patch @@ -0,0 +1,40 @@ +From 13094b78a790786030a468453c2b3ead4c7fd9cf Mon Sep 17 00:00:00 2001 +From: Fabian Vogt +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 + #include + + QString Grantlee::unescapeStringLiteral(const QString &input) +@@ -212,7 +213,13 @@ std::pair 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; diff --git a/packages/g/grantlee5/grantlee-5.2.0-fix-ctest-ld-library-path.patch b/packages/g/grantlee5/grantlee-5.2.0-fix-ctest-ld-library-path.patch index ef90084332b..e2dbb1ba9e3 100644 --- a/packages/g/grantlee5/grantlee-5.2.0-fix-ctest-ld-library-path.patch +++ b/packages/g/grantlee5/grantlee-5.2.0-fix-ctest-ld-library-path.patch @@ -11,23 +11,27 @@ by the tests. 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() - + diff --git a/packages/g/grantlee5/grantlee-5.2.0.tar.gz b/packages/g/grantlee5/grantlee-5.2.0.tar.gz deleted file mode 120000 index 2e83a0f120d..00000000000 --- a/packages/g/grantlee5/grantlee-5.2.0.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafybeicaasf3xtn3nzhmovcr3nwhaqlwwsnshuofpwl63kgrzf5oepenby \ No newline at end of file diff --git a/packages/g/grantlee5/grantlee-5.3.1.tar.gz b/packages/g/grantlee5/grantlee-5.3.1.tar.gz new file mode 120000 index 00000000000..4061bfc74f3 --- /dev/null +++ b/packages/g/grantlee5/grantlee-5.3.1.tar.gz @@ -0,0 +1 @@ +/ipfs/bafybeiay5vthqc46lu7yrl7de2pjbg2xy45pkh2ygkms7efuwegtbgyyhu \ No newline at end of file diff --git a/packages/g/grantlee5/grantlee5.changes b/packages/g/grantlee5/grantlee5.changes index 3a5eb5ef895..8985150b639 100644 --- a/packages/g/grantlee5/grantlee5.changes +++ b/packages/g/grantlee5/grantlee5.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Sun Nov 13 11:19:25 UTC 2022 - Luca Beltrame + +- 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 + ------------------------------------------------------------------- Thu May 14 20:32:27 UTC 2020 - Fabian Vogt @@ -6,7 +26,7 @@ Thu May 14 20:32:27 UTC 2020 - Fabian Vogt ------------------------------------------------------------------- Tue Mar 31 09:18:33 UTC 2020 - Matthias Fehring -- Require cmake(Qt5LinguistTools) for building to enable testing of +- Require cmake(Qt5LinguistTools) for building to enable testing of internationalization - Use xvfb-run to run all tests, this obsoletes the following patch: * grantlee-5.2.0-disable-textdocument-tests.patch @@ -222,7 +242,7 @@ Fri Sep 10 16:25:51 UTC 2010 - tittiatcoke@gmail.com ------------------------------------------------------------------- Mon Jul 19 19:56:27 UTC 2010 - freitag@novell.com -- update to version 0.1.3 +- update to version 0.1.3 ------------------------------------------------------------------- Mon Apr 19 20:07:43 UTC 2010 - tittiatcoke@gmail.com diff --git a/packages/g/grantlee5/grantlee5.keyring b/packages/g/grantlee5/grantlee5.keyring new file mode 100644 index 00000000000..d6ef281e674 --- /dev/null +++ b/packages/g/grantlee5/grantlee5.keyring @@ -0,0 +1,29 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQGiBEu+MA8RBADp2YIeQhF69CtoPRA2SR71vDnmEtp7AkLWi4h6a8O7K2wQMBby +hyZPWeguPs8C9jbp58u5d1ufd7P12/wmevPEUriOdUN4kdrZf48IODr5u1/W44ow +AkaTHrjQY0+gpbGkncTU/ifaryR6+m1mwp1tsFjoa2KRR0kzDizzuynlPwCg7Ac/ +qCH/cAljX8Zgj1zDQhRXYX8D/REQFx11r2v0iv2Uj/wglTscIAn+Cf69yuEMVvKB +7bUo3kkcLaMIhrPahg3Xo8HCOuBijtSb65hS20Jt8VzgypMd5w28sv5lBVQgu7FO +JpliIrvPLgt45/8vurkp57DiuSn3+jxKh/fGgItu0qqP+2ph2KNpz9phxgyEj9Ro +330uA/9ZAa7Hw2Dx6sQOOoMDdDUcltv7PjG6qoVvf1q6oFOHNON61XFIY+Zcoj60 +c2tHeQjbSVeV4soYElmN6zTNRtMe55RvtJGsexQh866SAax5ACan+EhAuxay/3o+ +JjDanb6zq0byA7iFHi2D1bw01ED9xCdsOCYNabZj2rMnPnrP+rQtU3RlcGhlbiBL +ZWxseSAoUGVyc29uYWwpIDxzdGV2ZWlyZUBnbWFpbC5jb20+iGAEExECACAFAku+ +MA8CGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRDSZMex0C1lCVvTAKDep4Q/ +CdO0YBy5UybRrTMFs/vogACg2NFIhEd2UN2v+TqPXTADBv0FEWm5Ag0ES74wDxAI +AKFPVn+yeb11E1KtyLGM2gHijS453KxcYUQaFWjFrVO9iafv9Kd8FM2ti1Zl8/Jd +YhuzJYNQCBsEKI5dGt2gvxshknFB/mfaeNekSQqGtyd2tMYiRv6U0nVNfxPhJrW7 +ujsCX0bNiUJgmjuBrz89503uKEGWaPHk6IUP3U0btjqIW8er9DrvrBHthvaiMxN3 +I0umMXVYZGepFX+QbtMlVZtiRIUL4cXorQOYDAOFy4CFdkpVzMrhPn4/p+RkgwQs +EEaFMcNSt8QZAIyYV4DelNjf5dnr5JBGyjJRK7mQLz0oqvczl+wPcId+wZIOk/qu +rZxlZvNkgASKUzFJvB24qV8AAwUH/AlQ9HCa3vJX3TNFDCf5MX0ON6aeq7hUX5KW +M/2cbOGUMyriIIiWhaxjDIT/bpXIJE3bkL7/hnixKag8/iStTMRk8s6KAR9Hr2Gu +93WGvalc0xVUzWk9w72yg7Sh3oXIPSGDqb2veGFL9gdbSbooO8cewkmTPPOTDYMP +7dNua/BPFsoPqepgylMc2yQD048l4NEhtvx3KFQGuMAm8skTsvmi9BUM0dkDCkTK +lVRlkv5I2y8qiaSUb2+fvCeFhtyTghW+74Eq3qKVB5sK9CNVgX6uwDz+oeDsgiDo +Nq9/y4YhuDOI4yUTB0wSQvAAJnczFvmxH1HGsJU72JOxEbYfHRiISQQYEQIACQUC +S74wDwIbDAAKCRDSZMex0C1lCZs2AKCJ0LsYeEggPtTB2NGT4cm6VpixxQCfSxLA +qBE1xByW/GR3eyZxbppDxno= +=X2xR +-----END PGP PUBLIC KEY BLOCK----- diff --git a/packages/g/grantlee5/grantlee5.spec b/packages/g/grantlee5/grantlee5.spec index ebed75aeaa0..1f3a5918005 100644 --- a/packages/g/grantlee5/grantlee5.spec +++ b/packages/g/grantlee5/grantlee5.spec @@ -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 diff --git a/packages/g/grantlee5/includes.diff b/packages/g/grantlee5/includes.diff index ce1a0e2f687..9ae6fbdcaaa 100644 --- a/packages/g/grantlee5/includes.diff +++ b/packages/g/grantlee5/includes.diff @@ -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