gentoo resync : 10.02.2019

3 files changed, 0 insertions, 70 deletions

diff --git a/kde-misc/tellico/Manifest b/kde-misc/tellico/Manifest
index 826681eb7cd8..46759017bb8e 100644
--- a/kde-misc/tellico/Manifest
+++ b/kde-misc/tellico/Manifest
@@ -1,5 +1,3 @@
-AUX tellico-3.1.3-regexp-filtering.patch 1450 BLAKE2B 0149988de7c468ba089fe61aff7d7d0b111576f894d2f80bf4e2ddec13edf59baf575fec007833baa1d2610f045948dc79a89896d9482927bed62df4c341ad53 SHA512 406d30f13b3f9c7adf884ab71658781ceececa9e3befe05338f7d90bc0955ac93bc6d362c1e03a70452da34fb8640907fd89374f896ef33523bc51bdce3208ec
-AUX tellico-3.1.3-version.patch 586 BLAKE2B a4e6a53891b8418f1abdde2ecd25085c15f7f689e3647be241af605c877798e31a95bc3bd269c6a5103919f13a542cd60a626f7fab4e129b91cacfd80a0bde93 SHA512 72393098706404d200c5c57826ec064db49ace5508577e05d35078f215c204d6cf5921384ee823d4adf0f0d3e3aeb15e29fae214dfe01b21748b36b199e87ed4
 AUX tellico-3.1.4-empty-permissions-set.patch 906 BLAKE2B e46830a15f0f1fa05b1d94c57ecc27c06f7fe269b1eef3f2bb94c378b0d794ec43ebff9904e964741c2a35a46e7b0ea1faeccffff0dc930aa345ba16746cf1aa SHA512 49bc0ffa89049c964e92a15ed1067964ef2a66af3611929c0dc7263b7dfaae8077e0214f03f99359fe71d5c27e22853fdecc5998a4cd81231f7b30aeadce2c0b
 AUX tellico-3.1.4-xmloutputclosecallback-signature.patch 918 BLAKE2B 2150dd13332ea01a5524951085dfe4a7032a4cf26776af5818f4caa7764584027112b3f793e3a839ade84979aa75c1e2e7034d5baaff250b9d32c64832d2e930 SHA512 6ceda2d2a10b480539677654a2b21132c17e88a4395016fdb703c09f9ee066a93c834bc9b229730970dd35dca4a110f4c2fea19775062d404f76515fc0fbc0f0
 DIST tellico-3.1.4.tar.xz 4632792 BLAKE2B 29db598ef558fe04618843cad6a58055b5de392f34aeea4860683f04ef4ab20856fd4a01523dc13c2d68023c266de69590e843ea56f912989d57c01e0d701ee2 SHA512 d09183bee13ae9f7c6c5114b76eeeb959a184def559ae239bb880ef9be964e33878530e9c4c0d3baa6f872bf8db155dffb94592e3a857623ab131d2f28f1f139
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
deleted file mode 100644
index 51a4c2b470f6..000000000000
--- a/kde-misc/tellico/files/tellico-3.1.3-regexp-filtering.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-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
deleted file mode 100644
index 845d08316178..000000000000
--- a/kde-misc/tellico/files/tellico-3.1.3-version.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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