* [gentoo-commits] proj/kde:master commit in: kde-apps/akregator/files/, kde-apps/akregator/
@ 2018-12-16 19:42 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2018-12-16 19:42 UTC (permalink / raw
To: gentoo-commits
commit: 885ff5bc1798ba82947b1a7780ab496e4d8680c4
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 16 09:35:58 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 16 19:41:02 2018 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=885ff5bc
kde-apps/akregator: Drop never upstreamed patch
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/akregator/akregator-18.12.49.9999.ebuild | 2 --
kde-apps/akregator/akregator-9999.ebuild | 4 +---
.../akregator/files/akregator-17.12.2-crashfix.patch | 16 ----------------
3 files changed, 1 insertion(+), 21 deletions(-)
diff --git a/kde-apps/akregator/akregator-18.12.49.9999.ebuild b/kde-apps/akregator/akregator-18.12.49.9999.ebuild
index 064af1783e..7399dfe457 100644
--- a/kde-apps/akregator/akregator-18.12.49.9999.ebuild
+++ b/kde-apps/akregator/akregator-18.12.49.9999.ebuild
@@ -53,5 +53,3 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
!kde-apps/kdepim-l10n
"
-
-PATCHES=( "${FILESDIR}/${PN}-17.12.2-crashfix.patch" )
diff --git a/kde-apps/akregator/akregator-9999.ebuild b/kde-apps/akregator/akregator-9999.ebuild
index b8fd326563..7399dfe457 100644
--- a/kde-apps/akregator/akregator-9999.ebuild
+++ b/kde-apps/akregator/akregator-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -53,5 +53,3 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
!kde-apps/kdepim-l10n
"
-
-PATCHES=( "${FILESDIR}/${PN}-17.12.2-crashfix.patch" )
diff --git a/kde-apps/akregator/files/akregator-17.12.2-crashfix.patch b/kde-apps/akregator/files/akregator-17.12.2-crashfix.patch
deleted file mode 100644
index c8c872f433..0000000000
--- a/kde-apps/akregator/files/akregator-17.12.2-crashfix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
-index fd533ecd..2733b273 100644
---- a/src/mainwindow.cpp
-+++ b/src/mainwindow.cpp
-@@ -137,9 +137,7 @@ MainWindow::~MainWindow()
- void MainWindow::saveProperties(KConfigGroup &config)
- {
- if (!m_part) {
-- if (!loadPart()) {
-- return;
-- }
-+ return;
- }
-
- m_part->saveProperties(config);
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/akregator/files/, kde-apps/akregator/
@ 2019-11-16 23:18 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2019-11-16 23:18 UTC (permalink / raw
To: gentoo-commits
commit: 87cb56d80dcf4ff45a6bbee25bec106736529a0f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 16 19:45:06 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 16 22:42:10 2019 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=87cb56d8
kde-apps/akregator: Make tests optional
Closes: https://bugs.gentoo.org/700276
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/akregator/akregator-19.11.80.ebuild | 2 ++
kde-apps/akregator/akregator-19.12.49.9999.ebuild | 2 ++
kde-apps/akregator/akregator-9999.ebuild | 2 ++
.../akregator/files/akregator-19.11.80-tests-optional.patch | 10 ++++++++++
4 files changed, 16 insertions(+)
diff --git a/kde-apps/akregator/akregator-19.11.80.ebuild b/kde-apps/akregator/akregator-19.11.80.ebuild
index 2501013f4e..9ccde9faf1 100644
--- a/kde-apps/akregator/akregator-19.11.80.ebuild
+++ b/kde-apps/akregator/akregator-19.11.80.ebuild
@@ -57,3 +57,5 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
!kde-apps/kdepim-l10n
"
+
+PATCHES=( "${FILESDIR}/${P}-tests-optional.patch" )
diff --git a/kde-apps/akregator/akregator-19.12.49.9999.ebuild b/kde-apps/akregator/akregator-19.12.49.9999.ebuild
index 79f0f030b1..a863693b03 100644
--- a/kde-apps/akregator/akregator-19.12.49.9999.ebuild
+++ b/kde-apps/akregator/akregator-19.12.49.9999.ebuild
@@ -57,3 +57,5 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
!kde-apps/kdepim-l10n
"
+
+PATCHES=( "${FILESDIR}/${PN}-19.11.80-tests-optional.patch" )
diff --git a/kde-apps/akregator/akregator-9999.ebuild b/kde-apps/akregator/akregator-9999.ebuild
index 79f0f030b1..a863693b03 100644
--- a/kde-apps/akregator/akregator-9999.ebuild
+++ b/kde-apps/akregator/akregator-9999.ebuild
@@ -57,3 +57,5 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
!kde-apps/kdepim-l10n
"
+
+PATCHES=( "${FILESDIR}/${PN}-19.11.80-tests-optional.patch" )
diff --git a/kde-apps/akregator/files/akregator-19.11.80-tests-optional.patch b/kde-apps/akregator/files/akregator-19.11.80-tests-optional.patch
new file mode 100644
index 0000000000..81213ebb8c
--- /dev/null
+++ b/kde-apps/akregator/files/akregator-19.11.80-tests-optional.patch
@@ -0,0 +1,10 @@
+--- a/src/CMakeLists.txt 2019-11-16 20:42:18.983877842 +0100
++++ b/src/CMakeLists.txt 2019-11-16 20:42:18.991877596 +0100
+@@ -234,5 +234,7 @@
+ install(FILES data/akregator.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFY5RCDIR} )
+
+ add_subdirectory(formatter/html)
++if(BUILD_TESTING)
+ add_subdirectory(job/autotests)
++endif()
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/akregator/files/, kde-apps/akregator/
@ 2019-11-30 9:42 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2019-11-30 9:42 UTC (permalink / raw
To: gentoo-commits
commit: fae48eb0b7540b0ea5b2c7d3848456ba45739539
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 30 09:41:28 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 30 09:41:28 2019 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=fae48eb0
kde-apps/akregator: Drop obsolete tests-optional patch
Upstream commit d5bfa6379d04f453ca74b1c0a11fa4df3daf1f0b
Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/akregator/akregator-19.11.90.ebuild | 2 --
kde-apps/akregator/akregator-19.12.49.9999.ebuild | 2 --
kde-apps/akregator/akregator-9999.ebuild | 2 --
.../akregator/files/akregator-19.11.80-tests-optional.patch | 10 ----------
4 files changed, 16 deletions(-)
diff --git a/kde-apps/akregator/akregator-19.11.90.ebuild b/kde-apps/akregator/akregator-19.11.90.ebuild
index 21c3b5182d..2501013f4e 100644
--- a/kde-apps/akregator/akregator-19.11.90.ebuild
+++ b/kde-apps/akregator/akregator-19.11.90.ebuild
@@ -57,5 +57,3 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
!kde-apps/kdepim-l10n
"
-
-PATCHES=( "${FILESDIR}/${PN}-19.11.80-tests-optional.patch" )
diff --git a/kde-apps/akregator/akregator-19.12.49.9999.ebuild b/kde-apps/akregator/akregator-19.12.49.9999.ebuild
index a863693b03..79f0f030b1 100644
--- a/kde-apps/akregator/akregator-19.12.49.9999.ebuild
+++ b/kde-apps/akregator/akregator-19.12.49.9999.ebuild
@@ -57,5 +57,3 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
!kde-apps/kdepim-l10n
"
-
-PATCHES=( "${FILESDIR}/${PN}-19.11.80-tests-optional.patch" )
diff --git a/kde-apps/akregator/akregator-9999.ebuild b/kde-apps/akregator/akregator-9999.ebuild
index cf3cd5ad02..a869b8ab6d 100644
--- a/kde-apps/akregator/akregator-9999.ebuild
+++ b/kde-apps/akregator/akregator-9999.ebuild
@@ -57,5 +57,3 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
!kde-apps/kdepim-l10n
"
-
-PATCHES=( "${FILESDIR}/${PN}-19.11.80-tests-optional.patch" )
diff --git a/kde-apps/akregator/files/akregator-19.11.80-tests-optional.patch b/kde-apps/akregator/files/akregator-19.11.80-tests-optional.patch
deleted file mode 100644
index 81213ebb8c..0000000000
--- a/kde-apps/akregator/files/akregator-19.11.80-tests-optional.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/CMakeLists.txt 2019-11-16 20:42:18.983877842 +0100
-+++ b/src/CMakeLists.txt 2019-11-16 20:42:18.991877596 +0100
-@@ -234,5 +234,7 @@
- install(FILES data/akregator.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFY5RCDIR} )
-
- add_subdirectory(formatter/html)
-+if(BUILD_TESTING)
- add_subdirectory(job/autotests)
-+endif()
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-11-30 9:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-11-30 9:42 [gentoo-commits] proj/kde:master commit in: kde-apps/akregator/files/, kde-apps/akregator/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2019-11-16 23:18 Andreas Sturmlechner
2018-12-16 19:42 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox