gentoo resync : 22.10.2018

2 files changed, 68 insertions, 0 deletions

diff --git a/kde-misc/tellico/files/tellico-3.1.3-regexp-filtering.patch b/kde-misc/tellico/files/tellico-3.1.3-regexp-filtering.patch
new file mode 100644
index 000000000000..51a4c2b470f6
--- /dev/null
+++ b/kde-misc/tellico/files/tellico-3.1.3-regexp-filtering.patch
@@ -0,0 +1,44 @@
+From 47f19fac2fdbbf5c5b5124883043e473f8c44edd Mon Sep 17 00:00:00 2001
+From: Robby Stephenson <robby@periapsis.org>
+Date: Tue, 2 Oct 2018 21:02:37 -0400
+Subject: Fix bug when using regexp filter for number fields
+
+Only use a QIntValidator when the filter rule is not a regular
+expression.
+
+BUG: 399323
+FIXED-IN: 3.1.4
+FIXED-IN: 3.2
+---
+ ChangeLog                    | 4 ++++
+ src/gui/filterrulewidget.cpp | 3 ++-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 879f4d0..3284dc7 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,7 @@
++2018-10-02  Robby Stephenson  <robby@periapsis.org>
++
++	* Fixed bug when using a regular expression for filtering in a number field (Bug 399323).
++
+ 2018-09-02  Robby Stephenson  <robby@periapsis.org>
+ 
+ 	* Released Tellico 3.1.3.
+diff --git a/src/gui/filterrulewidget.cpp b/src/gui/filterrulewidget.cpp
+index 8e3d7b1..aa3718d 100644
+--- a/src/gui/filterrulewidget.cpp
++++ b/src/gui/filterrulewidget.cpp
+@@ -169,7 +169,8 @@ void FilterRuleWidget::slotRuleFunctionChanged(int which_) {
+   } else {
+     m_valueStack->setCurrentWidget(m_ruleValue);
+     m_ruleValue->setPlaceholderText(QString());
+-    if(m_ruleType == Number) {
++    if(m_ruleType == Number &&
++      (data != FilterRule::FuncRegExp && data != FilterRule::FuncNotRegExp)) {
+       m_ruleValue->setValidator(new QIntValidator(this));
+     } else {
+       m_ruleValue->setValidator(nullptr);
+-- 
+cgit v0.11.2
diff --git a/kde-misc/tellico/files/tellico-3.1.3-version.patch b/kde-misc/tellico/files/tellico-3.1.3-version.patch
new file mode 100644
index 000000000000..845d08316178
--- /dev/null
+++ b/kde-misc/tellico/files/tellico-3.1.3-version.patch
@@ -0,0 +1,24 @@
+From 1aa87a1c1538a0103a1624c663606b8d47566f42 Mon Sep 17 00:00:00 2001
+From: Robby Stephenson <robby@periapsis.org>
+Date: Mon, 3 Sep 2018 08:39:49 -0400
+Subject: Correctly set version number
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 214e2ca..817750b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -2,7 +2,7 @@
+ cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
+ 
+ project(Tellico)
+-set(TELLICO_VERSION "3.1.2+git")
++set(TELLICO_VERSION "3.1.3")
+ 
+ set(QT_MIN_VERSION "5.4.0")
+ 
+-- 
+cgit v0.11.2