diff --git a/0001-Fix-charconv-support-with-MSVC-GCC11.patch b/0001-Fix-charconv-support-with-MSVC-GCC11.patch deleted file mode 100644 index fcdf094..0000000 --- a/0001-Fix-charconv-support-with-MSVC-GCC11.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 1e8e6c8da1e22c4d32e50d8999705fd370824736 Mon Sep 17 00:00:00 2001 -From: "L. E. Segovia" -Date: Tue, 1 Jun 2021 23:35:40 +0000 -Subject: [PATCH] Fix charconv support with MSVC/GCC11 - -BUG: 437890 ---- - src/KSeExpr/Utils.cpp | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/KSeExpr/Utils.cpp b/src/KSeExpr/Utils.cpp -index 22e6cd8..e48cfe9 100644 ---- a/src/KSeExpr/Utils.cpp -+++ b/src/KSeExpr/Utils.cpp -@@ -6,6 +6,7 @@ - - #if defined(KSeExpr_HAVE_CHARCONV_WITH_DOUBLES) - #include -+#include - - double_t KSeExpr::Utils::atof(const char *num) - { -@@ -21,7 +22,7 @@ double_t KSeExpr::Utils::atof(const char *num) - double_t KSeExpr::Utils::atof(const std::string &num) - { - double_t v; -- auto [p, ec] = std::from_chars(val.data(), val.data() + val.size(), v); -+ auto [p, ec] = std::from_chars(num.data(), num.data() + num.size(), v); - if (ec == std::errc()) { - return v; - } else { -@@ -32,7 +33,7 @@ double_t KSeExpr::Utils::atof(const std::string &num) - int32_t KSeExpr::Utils::strtol(const std::string &num) - { - int32_t v; -- auto [p, ec] = std::from_chars(val.data(), val.data() + val.size(), v); -+ auto [p, ec] = std::from_chars(num.data(), num.data() + num.size(), v); - if (ec == std::errc()) { - return v; - } else if (ec == std::errc::result_out_of_range) { --- -2.31.1 - diff --git a/Fix-translation-lookup-in-stock-Linux-deployments.patch b/Fix-translation-lookup-in-stock-Linux-deployments.patch deleted file mode 100644 index c86526f..0000000 --- a/Fix-translation-lookup-in-stock-Linux-deployments.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 27355bcea93bab88954188cd53f1dce2796a0a49 Mon Sep 17 00:00:00 2001 -From: "L. E. Segovia" -Date: Tue, 1 Dec 2020 01:23:31 +0000 -Subject: [PATCH] Fix translation lookup in stock Linux deployments - -BUG: 429782 ---- - src/KSeExprUI/ECMQmLoader-seexpr2_qt.cpp | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -diff --git a/src/KSeExprUI/ECMQmLoader-seexpr2_qt.cpp b/src/KSeExprUI/ECMQmLoader-seexpr2_qt.cpp -index 0bddaf2..6781bdf 100644 ---- a/src/KSeExprUI/ECMQmLoader-seexpr2_qt.cpp -+++ b/src/KSeExprUI/ECMQmLoader-seexpr2_qt.cpp -@@ -35,9 +35,13 @@ namespace { - return false; - } - #else -- const QString fullPath = QStandardPaths::locate(QStandardPaths::DataLocation, subPath); -+ // Use application's own data directory (e.g. Krita on AppImage, Windows) -+ QString fullPath = QStandardPaths::locate(QStandardPaths::DataLocation, subPath); - if (fullPath.isEmpty()) { -- return false; -+ // Try falling back to stock folder -+ fullPath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, subPath); -+ if (fullPath.isEmpty()) -+ return false; - } - #endif - QTranslator *translator = new QTranslator(QCoreApplication::instance()); -@@ -61,7 +65,8 @@ namespace { - #if defined(Q_OS_ANDROID) - const auto paths = QStringLiteral("assets:/share/"); - #else -- const auto paths = QStandardPaths::standardLocations(QStandardPaths::DataLocation); -+ auto paths = QStandardPaths::standardLocations(QStandardPaths::DataLocation); -+ paths << QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation); - #endif - dbgSeExpr << "Base paths for translations: " << paths; - --- -GitLab - diff --git a/kseexpr-4.0.1.0.tar.gz b/kseexpr-4.0.1.0.tar.gz deleted file mode 100644 index cb7d9ec..0000000 --- a/kseexpr-4.0.1.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:13b8455883001668f5d79c5734821c1ad2a0fbc91d019af085bb7e31cf6ce926 -size 895833 diff --git a/kseexpr-4.0.2.0.tar.gz b/kseexpr-4.0.2.0.tar.gz new file mode 100644 index 0000000..d9e7829 --- /dev/null +++ b/kseexpr-4.0.2.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6a9857522883691a4184e7567645e7103a662d27f0452b7602b78c6f8b8bc1c2 +size 934667 diff --git a/kseexpr.changes b/kseexpr.changes index c677fe4..829dad0 100644 --- a/kseexpr.changes +++ b/kseexpr.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Thu Jun 10 05:42:30 UTC 2021 - Wolfgang Bauer + +- Update to 4.0.2.0 + * Fix charconv support with MSVC/GCC11 (kde#437890) + * Remove unnecessary parameters in CMakeLists + * Fix translation lookup in stock Linux deployments (kde#429782) + * Make reproducible tarballs + * Add support for LLVM 11 +- Drop patches merged upstream: + * Fix-translation-lookup-in-stock-Linux-deployments.patch + * 0001-Fix-charconv-support-with-MSVC-GCC11.patch + ------------------------------------------------------------------- Wed Jun 2 06:04:23 UTC 2021 - Christophe Giboudeaux diff --git a/kseexpr.spec b/kseexpr.spec index 449ab0b..478fa82 100644 --- a/kseexpr.spec +++ b/kseexpr.spec @@ -16,26 +16,22 @@ # -%define sover 4_0_1_0 +%define sover 4_0_2_0 %if %pkg_vcmp extra-cmake-modules >= 5.64 %bcond_without lang %else %bcond_with lang %endif Name: kseexpr -Version: 4.0.1.0 +Version: 4.0.2.0 Release: 0 Summary: The embeddable expression engine fork for Krita License: GPL-3.0-or-later AND Apache-2.0 AND BSD-3-Clause AND MIT Group: Productivity/Graphics/Other URL: https://invent.kde.org/graphics/kseexpr/ -Source0: https://download.kde.org/stable/%{name}/4.0.1/%{name}-%{version}.tar.gz -# PATCH-FIX-UPSTREAM -Patch0: Fix-translation-lookup-in-stock-Linux-deployments.patch +Source0: https://download.kde.org/stable/%{name}/4.0.2/%{name}-%{version}.tar.gz # PATCH-FIX-OPENSUSE -Patch1: Fix-possible-compiler-error.patch -# PATCH-FIX-UPSTREAM -Patch2: 0001-Fix-charconv-support-with-MSVC-GCC11.patch +Patch0: Fix-possible-compiler-error.patch BuildRequires: extra-cmake-modules BuildRequires: cmake(Qt5Core) BuildRequires: cmake(Qt5Gui) @@ -94,10 +90,10 @@ Development headers and libraries for %{name}. %{_libdir}/libKSeExprUI.so.%{version} %files devel -%{_datadir}/cmake/KSeExpr/ %{_datadir}/pkgconfig/kseexpr.pc %{_includedir}/KSeExpr/ %{_includedir}/KSeExprUI/ +%{_libdir}/cmake/KSeExpr/ %{_libdir}/libKSeExpr.so %{_libdir}/libKSeExprUI.so