forked from pool/kseexpr
Accepting request 906650 from home:wolfi323:branches:KDE:Extra
- Update to 4.0.3.0
* Update the UI parser to enable string variables (kde#439292)
* Comment parsing: fix skipping the first character after #\s+
* ExprEditor: disconnect the correct signal
* Fix typo in LLVM support
* Insert new variables at the start of the current line
(kde#439260)
* Fix mixed up translations (kde#439257)
* Complete removal of float_t and double_t from function
signatures (kde#431436)
* VectorControl: fix valueChanged connect signature
* ExprCurve, ExprColorCurve: add missing label on interpolation
type (kde#439263)
* ExprAddDialog: fix alignment of Default label for String
variables
* Insert new variables above the current line (kde#439260)
* Insert variable name assignment with string types (kde#439259)
* Interpolate Image Editor root via Qt's native path handling
* Docstrings typo fixes (kde#439257)
* Do not use float/double_t types for C++17 utils (kde#431436)
* Fix SOVERSION (kde#429320)
* i18n: load translations for ki18n's fallback languages
(kde#438836)
* Add support for LLVM 12
* Add compatibility with VFX 2019
- Drop Fix-possible-compiler-error.patch, fixed upstream
Now without the "File listed twice" warnings.
OBS-URL: https://build.opensuse.org/request/show/906650
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kseexpr?expand=0&rev=9
This commit is contained in:
Christophe Giboudeaux
Git OBS Bridge
parent
03987bb2c3
commit
10e28e8863
@ -1,55 +0,0 @@
|
||||
From 2d20eb59a09d16cb37f1cc58c916af22c71107c0 Mon Sep 17 00:00:00 2001
|
||||
From: Wolfgang Bauer <wbauer@tmo.at>
|
||||
Date: Wed, 13 Jan 2021 13:33:05 +0100
|
||||
Subject: [PATCH] Fix possible compiler error
|
||||
|
||||
`KSeExpr::Utils::parseRangeComment()` is called with `float` parameters
|
||||
from other parts of the code.
|
||||
|
||||
But `float_t` is not necessarily the same as `float` (the standard
|
||||
defines it as "floating type at least as wide as float").
|
||||
Worse, it may actually be the same as `double_t`, for which
|
||||
`KSeExpr::Utils::parseRangeComment()` has an overload as well.
|
||||
|
||||
On openSUSE Tumbleweed i586 in particular, both are defined to `long
|
||||
double`, which means that both overloads are actually the same resulting
|
||||
in compiler errors.
|
||||
|
||||
To avoid the problem, change `float_t` to `float` in the function
|
||||
signature.
|
||||
|
||||
BUG: 431436
|
||||
---
|
||||
src/KSeExprUI/Utils.cpp | 2 +-
|
||||
src/KSeExprUI/Utils.h | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/KSeExprUI/Utils.cpp b/src/KSeExprUI/Utils.cpp
|
||||
index ac42022..f23fdbd 100644
|
||||
--- a/src/KSeExprUI/Utils.cpp
|
||||
+++ b/src/KSeExprUI/Utils.cpp
|
||||
@@ -34,7 +34,7 @@ bool KSeExpr::Utils::parseRangeComment(const std::string &comment, double_t &fro
|
||||
return false;
|
||||
}
|
||||
|
||||
-bool KSeExpr::Utils::parseRangeComment(const std::string &comment, float_t &from, float_t &to)
|
||||
+bool KSeExpr::Utils::parseRangeComment(const std::string &comment, float &from, float &to)
|
||||
{
|
||||
if (comment.find_first_of('#') != 0) {
|
||||
return false;
|
||||
diff --git a/src/KSeExprUI/Utils.h b/src/KSeExprUI/Utils.h
|
||||
index 39f5c2a..a82b699 100644
|
||||
--- a/src/KSeExprUI/Utils.h
|
||||
+++ b/src/KSeExprUI/Utils.h
|
||||
@@ -11,7 +11,7 @@ namespace KSeExpr
|
||||
namespace Utils
|
||||
{
|
||||
bool parseRangeComment(const std::string &comment, double_t &from, double_t &to);
|
||||
- bool parseRangeComment(const std::string &comment, float_t &from, float_t &to);
|
||||
+ bool parseRangeComment(const std::string &comment, float &from, float &to);
|
||||
bool parseRangeComment(const std::string &comment, int32_t &from, int32_t &to);
|
||||
bool parseTypeNameComment(const std::string &comment, std::string &type, std::string &name);
|
||||
bool parseLabelComment(const std::string &comment, std::string &label);
|
||||
--
|
||||
2.26.2
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6a9857522883691a4184e7567645e7103a662d27f0452b7602b78c6f8b8bc1c2
|
||||
size 934667
|
||||
3
kseexpr-4.0.3.0.tar.gz
Normal file
3
kseexpr-4.0.3.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e07b5ec4c874fbeeee3cd2490a0c8e4360230e3492c7f8e3b02dd63dbfd3f195
|
||||
size 954171
|
||||
@ -1,3 +1,33 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 13 10:27:16 UTC 2021 - Wolfgang Bauer <wbauer@tmo.at>
|
||||
|
||||
- Update to 4.0.3.0
|
||||
* Update the UI parser to enable string variables (kde#439292)
|
||||
* Comment parsing: fix skipping the first character after #\s+
|
||||
* ExprEditor: disconnect the correct signal
|
||||
* Fix typo in LLVM support
|
||||
* Insert new variables at the start of the current line
|
||||
(kde#439260)
|
||||
* Fix mixed up translations (kde#439257)
|
||||
* Complete removal of float_t and double_t from function
|
||||
signatures (kde#431436)
|
||||
* VectorControl: fix valueChanged connect signature
|
||||
* ExprCurve, ExprColorCurve: add missing label on interpolation
|
||||
type (kde#439263)
|
||||
* ExprAddDialog: fix alignment of Default label for String
|
||||
variables
|
||||
* Insert new variables above the current line (kde#439260)
|
||||
* Insert variable name assignment with string types (kde#439259)
|
||||
* Interpolate Image Editor root via Qt's native path handling
|
||||
* Docstrings typo fixes (kde#439257)
|
||||
* Do not use float/double_t types for C++17 utils (kde#431436)
|
||||
* Fix SOVERSION (kde#429320)
|
||||
* i18n: load translations for ki18n's fallback languages
|
||||
(kde#438836)
|
||||
* Add support for LLVM 12
|
||||
* Add compatibility with VFX 2019
|
||||
- Drop Fix-possible-compiler-error.patch, fixed upstream
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 10 05:42:30 UTC 2021 - Wolfgang Bauer <wbauer@tmo.at>
|
||||
|
||||
|
||||
19
kseexpr.spec
19
kseexpr.spec
@ -16,23 +16,18 @@
|
||||
#
|
||||
|
||||
|
||||
%define sover 4_0_2_0
|
||||
%if %pkg_vcmp extra-cmake-modules >= 5.64
|
||||
%define sover 4
|
||||
%bcond_without lang
|
||||
%else
|
||||
%bcond_with lang
|
||||
%endif
|
||||
Name: kseexpr
|
||||
Version: 4.0.2.0
|
||||
Version: 4.0.3.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.2/%{name}-%{version}.tar.gz
|
||||
# PATCH-FIX-OPENSUSE
|
||||
Patch0: Fix-possible-compiler-error.patch
|
||||
Source0: https://download.kde.org/stable/%{name}/4.0.3/%{name}-%{version}.tar.gz
|
||||
BuildRequires: extra-cmake-modules
|
||||
BuildRequires: cmake(KF5I18n)
|
||||
BuildRequires: cmake(Qt5Core)
|
||||
BuildRequires: cmake(Qt5Gui)
|
||||
BuildRequires: cmake(Qt5LinguistTools)
|
||||
@ -86,8 +81,10 @@ Development headers and libraries for %{name}.
|
||||
|
||||
%files -n libKSeExpr%{sover}
|
||||
%license LICENSES/*
|
||||
%{_libdir}/libKSeExpr.so.%{version}
|
||||
%{_libdir}/libKSeExprUI.so.%{version}
|
||||
%{_libdir}/libKSeExpr.so.%{sover}
|
||||
%{_libdir}/libKSeExpr.so.%{sover}.*
|
||||
%{_libdir}/libKSeExprUI.so.%{sover}
|
||||
%{_libdir}/libKSeExprUI.so.%{sover}.*
|
||||
|
||||
%files devel
|
||||
%{_datadir}/pkgconfig/kseexpr.pc
|
||||
|
||||
Loading…
Reference in New Issue
Block a user