Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-misc/tellico/files/
Date: Sat, 09 Feb 2019 09:52:26
Message-Id: 1549705920.1466c13547f732ae666d4909706d2e5b49fd463d.asturm@gentoo
1 commit: 1466c13547f732ae666d4909706d2e5b49fd463d
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Fri Feb 8 16:01:14 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 9 09:52:00 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1466c135
7
8 kde-misc/tellico: remove unused patches
9
10 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 .../files/tellico-3.1.3-regexp-filtering.patch | 44 ----------------------
14 kde-misc/tellico/files/tellico-3.1.3-version.patch | 24 ------------
15 2 files changed, 68 deletions(-)
16
17 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
18 deleted file mode 100644
19 index 51a4c2b470f..00000000000
20 --- a/kde-misc/tellico/files/tellico-3.1.3-regexp-filtering.patch
21 +++ /dev/null
22 @@ -1,44 +0,0 @@
23 -From 47f19fac2fdbbf5c5b5124883043e473f8c44edd Mon Sep 17 00:00:00 2001
24 -From: Robby Stephenson <robby@×××××××××.org>
25 -Date: Tue, 2 Oct 2018 21:02:37 -0400
26 -Subject: Fix bug when using regexp filter for number fields
27 -
28 -Only use a QIntValidator when the filter rule is not a regular
29 -expression.
30 -
31 -BUG: 399323
32 -FIXED-IN: 3.1.4
33 -FIXED-IN: 3.2
34 ----
35 - ChangeLog | 4 ++++
36 - src/gui/filterrulewidget.cpp | 3 ++-
37 - 2 files changed, 6 insertions(+), 1 deletion(-)
38 -
39 -diff --git a/ChangeLog b/ChangeLog
40 -index 879f4d0..3284dc7 100644
41 ---- a/ChangeLog
42 -+++ b/ChangeLog
43 -@@ -1,3 +1,7 @@
44 -+2018-10-02 Robby Stephenson <robby@×××××××××.org>
45 -+
46 -+ * Fixed bug when using a regular expression for filtering in a number field (Bug 399323).
47 -+
48 - 2018-09-02 Robby Stephenson <robby@×××××××××.org>
49 -
50 - * Released Tellico 3.1.3.
51 -diff --git a/src/gui/filterrulewidget.cpp b/src/gui/filterrulewidget.cpp
52 -index 8e3d7b1..aa3718d 100644
53 ---- a/src/gui/filterrulewidget.cpp
54 -+++ b/src/gui/filterrulewidget.cpp
55 -@@ -169,7 +169,8 @@ void FilterRuleWidget::slotRuleFunctionChanged(int which_) {
56 - } else {
57 - m_valueStack->setCurrentWidget(m_ruleValue);
58 - m_ruleValue->setPlaceholderText(QString());
59 -- if(m_ruleType == Number) {
60 -+ if(m_ruleType == Number &&
61 -+ (data != FilterRule::FuncRegExp && data != FilterRule::FuncNotRegExp)) {
62 - m_ruleValue->setValidator(new QIntValidator(this));
63 - } else {
64 - m_ruleValue->setValidator(nullptr);
65 ---
66 -cgit v0.11.2
67
68 diff --git a/kde-misc/tellico/files/tellico-3.1.3-version.patch b/kde-misc/tellico/files/tellico-3.1.3-version.patch
69 deleted file mode 100644
70 index 845d0831617..00000000000
71 --- a/kde-misc/tellico/files/tellico-3.1.3-version.patch
72 +++ /dev/null
73 @@ -1,24 +0,0 @@
74 -From 1aa87a1c1538a0103a1624c663606b8d47566f42 Mon Sep 17 00:00:00 2001
75 -From: Robby Stephenson <robby@×××××××××.org>
76 -Date: Mon, 3 Sep 2018 08:39:49 -0400
77 -Subject: Correctly set version number
78 -
79 ----
80 - CMakeLists.txt | 2 +-
81 - 1 file changed, 1 insertion(+), 1 deletion(-)
82 -
83 -diff --git a/CMakeLists.txt b/CMakeLists.txt
84 -index 214e2ca..817750b 100644
85 ---- a/CMakeLists.txt
86 -+++ b/CMakeLists.txt
87 -@@ -2,7 +2,7 @@
88 - cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
89 -
90 - project(Tellico)
91 --set(TELLICO_VERSION "3.1.2+git")
92 -+set(TELLICO_VERSION "3.1.3")
93 -
94 - set(QT_MIN_VERSION "5.4.0")
95 -
96 ---
97 -cgit v0.11.2