[gentoo-commits] repo/gentoo:master commit in: kde-misc/tellico/files/

[gentoo-commits] repo/gentoo:master commit in: kde-misc/tellico/files/

[Andreas Sturmlechner]

commit:     13f4a8d98a6eea1188d319e229052ae9f3e36854
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 10 10:18:36 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jan 10 10:18:36 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13f4a8d9

kde-misc/tellico: Drop unused patch

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/tellico-3.2.1-missing-header.patch       | 48 ----------------------
 1 file changed, 48 deletions(-)

diff --git a/kde-misc/tellico/files/tellico-3.2.1-missing-header.patch b/kde-misc/tellico/files/tellico-3.2.1-missing-header.patch
deleted file mode 100644
index cff61fcdb61..00000000000
--- a/kde-misc/tellico/files/tellico-3.2.1-missing-header.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 43851a0a655a3a961f289087bdea989aa32cc028 Mon Sep 17 00:00:00 2001
-From: Luca Beltrame <lbeltrame@kde.org>
-Date: Sun, 21 Jul 2019 09:21:16 +0200
-Subject: Fix build with Qt 5.13
-
-(cherry picked from commit 43e6bbb4721adc83d8b2a77bd51d9efaf7aefd6b)
----
- src/gui/datewidget.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/gui/datewidget.cpp b/src/gui/datewidget.cpp
-index 724370e..e6502bb 100644
---- a/src/gui/datewidget.cpp
-+++ b/src/gui/datewidget.cpp
-@@ -35,6 +35,7 @@
- #include <QPushButton>
- #include <QHBoxLayout>
- #include <QFrame>
-+#include <QDate>
- #include <QEvent>
- #include <QMenu>
- #include <QWidgetAction>
--- 
-cgit v1.1
-
-From d3c56eca11cd059d4348ab6696822c23d85af61a Mon Sep 17 00:00:00 2001
-From: Robby Stephenson <robby@periapsis.org>
-Date: Sun, 21 Jul 2019 19:17:35 -0400
-Subject: Fix apparent build problem on Jenkins
-
----
- src/mainwindow.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
-index d8348e8..8250c56 100644
---- a/src/mainwindow.cpp
-+++ b/src/mainwindow.cpp
-@@ -108,6 +108,7 @@
- #include <QMimeType>
- #include <QMenuBar>
- #include <QFileDialog>
-+#include <QMetaMethod>
- 
- #include <unistd.h>
- 
--- 
-cgit v1.1

[gentoo-commits] repo/gentoo:master commit in: kde-misc/tellico/files/

[Andreas Sturmlechner]

commit:     1466c13547f732ae666d4909706d2e5b49fd463d
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Feb  8 16:01:14 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb  9 09:52:00 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1466c135

kde-misc/tellico: remove unused patches

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/tellico-3.1.3-regexp-filtering.patch     | 44 ----------------------
 kde-misc/tellico/files/tellico-3.1.3-version.patch | 24 ------------
 2 files changed, 68 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
deleted file mode 100644
index 51a4c2b470f..00000000000
--- 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 845d0831617..00000000000
--- 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