* [gentoo-commits] proj/kde:master commit in: kde-frameworks/kio/files/, kde-frameworks/kio/
@ 2015-01-21 20:48 Johannes Huber
0 siblings, 0 replies; 5+ messages in thread
From: Johannes Huber @ 2015-01-21 20:48 UTC (permalink / raw
To: gentoo-commits
commit: f3868805653e4f9494f2c64231adc257deaa4342
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Tue Jan 20 00:27:17 2015 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Jan 21 20:47:43 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=f3868805
[kde-frameworks/kio] Make tests optional
---
.../kio/files/kio-9999-tests-optional.patch | 28 ++++++++++++++++++++++
kde-frameworks/kio/kio-9999.ebuild | 7 ++++++
2 files changed, 35 insertions(+)
diff --git a/kde-frameworks/kio/files/kio-9999-tests-optional.patch b/kde-frameworks/kio/files/kio-9999-tests-optional.patch
new file mode 100644
index 0000000..ca45d88
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-9999-tests-optional.patch
@@ -0,0 +1,28 @@
+--- a/CMakeLists.txt 2015-01-21 01:30:56.784894492 +0100
++++ b/CMakeLists.txt 2015-01-21 01:34:51.192505604 +0100
+@@ -57,7 +57,7 @@
+ add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
+
+ set(REQUIRED_QT_VERSION 5.2.0)
+-find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets DBus Network Concurrent Xml Test)
++find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets DBus Network Concurrent Xml)
+
+ find_package(GSSAPI)
+ set_package_properties(GSSAPI PROPERTIES DESCRIPTION "Allows KIO to make use of certain HTTP authentication services"
+@@ -85,10 +85,13 @@
+ endif()
+ include(CheckLibraryExists)
+ add_subdirectory(src)
+-add_subdirectory(autotests)
+
+-if (NOT KIOCORE_ONLY)
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++ find_package(Qt5Test ${REQUIRED_QT_VERSION} CONFIG REQUIRED)
++ add_subdirectory(autotests)
++ if (NOT KIOCORE_ONLY)
++ add_subdirectory(tests)
++ endif()
+ endif()
+
+ # create a Config.cmake and a ConfigVersion.cmake file and install them
diff --git a/kde-frameworks/kio/kio-9999.ebuild b/kde-frameworks/kio/kio-9999.ebuild
index 5de4a75..ace8399 100644
--- a/kde-frameworks/kio/kio-9999.ebuild
+++ b/kde-frameworks/kio/kio-9999.ebuild
@@ -64,6 +64,13 @@ PDEPEND="
# tests hang
RESTRICT="test"
+src_prepare() {
+ # whole patch should be upstreamed, doesn't work in PATCHES
+ epatch "${FILESDIR}/${PN}-9999-tests-optional.patch"
+
+ kde5_src_prepare
+}
+
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package acl)
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-frameworks/kio/files/, kde-frameworks/kio/
@ 2015-06-19 14:47 Johannes Huber
0 siblings, 0 replies; 5+ messages in thread
From: Johannes Huber @ 2015-06-19 14:47 UTC (permalink / raw
To: gentoo-commits
commit: 9974945dd6f822c381e044340456b02ce2ca803e
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 19 14:40:24 2015 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Jun 19 14:40:24 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=9974945d
[kde-frameworks/kio] Rename patch
Package-Manager: portage-2.2.20
.../files/{kio-9999-tests-optional.patch => kio-tests-optional.patch} | 0
kde-frameworks/kio/kio-9999.ebuild | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/kde-frameworks/kio/files/kio-9999-tests-optional.patch b/kde-frameworks/kio/files/kio-tests-optional.patch
similarity index 100%
rename from kde-frameworks/kio/files/kio-9999-tests-optional.patch
rename to kde-frameworks/kio/files/kio-tests-optional.patch
diff --git a/kde-frameworks/kio/kio-9999.ebuild b/kde-frameworks/kio/kio-9999.ebuild
index 5922897..44e8fbc 100644
--- a/kde-frameworks/kio/kio-9999.ebuild
+++ b/kde-frameworks/kio/kio-9999.ebuild
@@ -68,7 +68,7 @@ RESTRICT="test"
src_prepare() {
# whole patch should be upstreamed, doesn't work in PATCHES
- epatch "${FILESDIR}/${PN}-9999-tests-optional.patch"
+ epatch "${FILESDIR}/${PN}-tests-optional.patch"
kde5_src_prepare
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-frameworks/kio/files/, kde-frameworks/kio/
@ 2016-03-17 15:18 Michael Palimaka
0 siblings, 0 replies; 5+ messages in thread
From: Michael Palimaka @ 2016-03-17 15:18 UTC (permalink / raw
To: gentoo-commits
commit: 9c0c4a346dfbe1d155e31d7ad0533c4e798decc9
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu Mar 17 09:59:49 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Mar 17 15:18:24 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=9c0c4a34
kde-frameworks/kio: Fix crash on in-place copy/paste
See also: https://bugs.kde.org/show_bug.cgi?id=360488
Package-Manager: portage-2.2.27
.../kio/files/kio-5.20.0-rename-crash.patch | 54 ++++++++++++++++++++++
.../{kio-5.20.0.ebuild => kio-5.20.0-r1.ebuild} | 2 +
2 files changed, 56 insertions(+)
diff --git a/kde-frameworks/kio/files/kio-5.20.0-rename-crash.patch b/kde-frameworks/kio/files/kio-5.20.0-rename-crash.patch
new file mode 100644
index 0000000..34c5cfb
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.20.0-rename-crash.patch
@@ -0,0 +1,54 @@
+From a5f62007c294220c13bb080287035aeab77ae640 Mon Sep 17 00:00:00 2001
+From: Emmanuel Pescosta <emmanuelpescosta099@gmail.com>
+Date: Thu, 17 Mar 2016 10:28:09 +0100
+Subject: [PATCH] Fix crash in rename dialog
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+ResizePanels must only be called in case of overwrite, all other cases violate
+the preconditions.
+
+BUG: 360488
+---
+ src/widgets/renamedialog.cpp | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/src/widgets/renamedialog.cpp b/src/widgets/renamedialog.cpp
+index 2d456c7..cb3c0fb 100644
+--- a/src/widgets/renamedialog.cpp
++++ b/src/widgets/renamedialog.cpp
+@@ -105,6 +105,8 @@ public:
+ m_destPendingPreview = false;
+ m_srcPreview = 0;
+ m_destPreview = 0;
++ m_srcArea = Q_NULLPTR;
++ m_destArea = Q_NULLPTR;
+ }
+
+ void setRenameBoxText(const QString &fileName)
+@@ -385,7 +387,9 @@ RenameDialog::RenameDialog(QWidget *parent, const QString &_caption,
+
+ #if 1 // without kfilemetadata
+ // don't wait for kfilemetadata, but wait until the layouting is done
+- QMetaObject::invokeMethod(this, "resizePanels", Qt::QueuedConnection);
++ if (_options & RenameDialog_Overwrite) {
++ QMetaObject::invokeMethod(this, "resizePanels", Qt::QueuedConnection);
++ }
+ #endif
+ }
+
+@@ -584,6 +588,11 @@ void RenameDialog::showDestPreview(const KFileItem &fileitem, const QPixmap &pix
+
+ void RenameDialog::resizePanels()
+ {
++ Q_ASSERT(d->m_srcArea != Q_NULLPTR);
++ Q_ASSERT(d->m_destArea != Q_NULLPTR);
++ Q_ASSERT(d->m_srcPreview != Q_NULLPTR);
++ Q_ASSERT(d->m_destPreview != Q_NULLPTR);
++
+ // using QDesktopWidget geometry as Kephal isn't accessible here in kdelibs
+ const QSize screenSize = QApplication::desktop()->availableGeometry(this).size();
+ QSize halfSize = d->m_srcArea->widget()->sizeHint().expandedTo(d->m_destArea->widget()->sizeHint());
+--
+2.7.3
+
diff --git a/kde-frameworks/kio/kio-5.20.0.ebuild b/kde-frameworks/kio/kio-5.20.0-r1.ebuild
similarity index 97%
rename from kde-frameworks/kio/kio-5.20.0.ebuild
rename to kde-frameworks/kio/kio-5.20.0-r1.ebuild
index 29b28be..c778b74 100644
--- a/kde-frameworks/kio/kio-5.20.0.ebuild
+++ b/kde-frameworks/kio/kio-5.20.0-r1.ebuild
@@ -67,6 +67,8 @@ RDEPEND="${COMMON_DEPEND}"
# tests hang
RESTRICT="test"
+PATCHES=( "${FILESDIR}/${P}-rename-crash.patch" )
+
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package acl ACL)
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-frameworks/kio/files/, kde-frameworks/kio/
@ 2017-08-08 23:49 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2017-08-08 23:49 UTC (permalink / raw
To: gentoo-commits
commit: 20caf700d502f20281c3d067f7c2fd8d3a143391
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 8 22:44:21 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 8 22:44:21 2017 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=20caf700
kde-frameworks/kio: Switch KDE_TEST back to forceoptional
Package-Manager: Portage-2.3.6, Repoman-2.3.1
kde-frameworks/kio/files/kio-5.37.0-tests.patch | 50 +++++++++++++++++++++++++
kde-frameworks/kio/kio-5.37.0.ebuild | 9 +++--
kde-frameworks/kio/kio-9999.ebuild | 7 ++--
3 files changed, 58 insertions(+), 8 deletions(-)
diff --git a/kde-frameworks/kio/files/kio-5.37.0-tests.patch b/kde-frameworks/kio/files/kio-5.37.0-tests.patch
new file mode 100644
index 0000000000..4fdb08fc02
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.37.0-tests.patch
@@ -0,0 +1,50 @@
+commit dec4afb4145b1c9ccfe3474e26a86716f597910d
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Tue Aug 8 22:33:08 2017 +0200
+
+ Use ecm_add_test and benefit from BUILD_TESTING awareness
+
+ Reviewers: #frameworks, kfunk
+
+ Reviewed By: kfunk
+
+ Subscribers: kfunk
+
+ Tags: #frameworks
+
+ Differential Revision: https://phabricator.kde.org/D7213
+
+diff --git a/src/ioslaves/trash/tests/CMakeLists.txt b/src/ioslaves/trash/tests/CMakeLists.txt
+index 7adba49b..514fd79c 100644
+--- a/src/ioslaves/trash/tests/CMakeLists.txt
++++ b/src/ioslaves/trash/tests/CMakeLists.txt
+@@ -11,21 +11,16 @@ set(testtrash_SRCS
+ ${CMAKE_CURRENT_SOURCE_DIR}/../kiotrashdebug.cpp
+ )
+
+-add_executable(testtrash ${testtrash_SRCS})
+-ecm_mark_as_test(testtrash)
+-add_test(NAME testtrash COMMAND testtrash)
+-
+-target_link_libraries(testtrash
+- KF5::I18n
+- Qt5::DBus
+- KF5::KIOCore
+- KF5::Solid
+- Qt5::Test
+-)
+ if(APPLE)
+- target_link_libraries(testtrash "-framework DiskArbitration -framework CoreFoundation")
++ set(testtrash_APPLE_LIBS "-framework DiskArbitration -framework CoreFoundation")
+ endif(APPLE)
+-ecm_mark_nongui_executable(testtrash)
++
++include(ECMAddTests)
++
++ecm_add_test(${testtrash_SRCS}
++ TEST_NAME testtrash
++ LINK_LIBRARIES KF5::I18n Qt5::DBus KF5::KIOCore KF5::Solid Qt5::Test ${testtrash_APPLE_LIBS}
++)
+
+ ### next target ###
+
diff --git a/kde-frameworks/kio/kio-5.37.0.ebuild b/kde-frameworks/kio/kio-5.37.0.ebuild
index 5bbe22d834..5f3130eaf9 100644
--- a/kde-frameworks/kio/kio-5.37.0.ebuild
+++ b/kde-frameworks/kio/kio-5.37.0.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-KDE_TEST="forceoptional-recursive"
+KDE_TEST="forceoptional"
VIRTUALX_REQUIRED="test"
inherit kde5
@@ -12,7 +12,7 @@ LICENSE="LGPL-2+"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
IUSE="acl +handbook kerberos +kwallet X"
-COMMON_DEPEND="
+RDEPEND="
$(add_frameworks_dep karchive)
$(add_frameworks_dep kbookmarks)
$(add_frameworks_dep kcodecs)
@@ -48,7 +48,7 @@ COMMON_DEPEND="
kwallet? ( $(add_frameworks_dep kwallet) )
X? ( $(add_qt_dep qtx11extras) )
"
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
$(add_qt_dep qtconcurrent)
handbook? ( $(add_frameworks_dep kdoctools) )
test? ( sys-libs/zlib )
@@ -61,7 +61,8 @@ DEPEND="${COMMON_DEPEND}
PDEPEND="
$(add_frameworks_dep kded)
"
-RDEPEND="${COMMON_DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-tests.patch" )
# tests hang
RESTRICT+=" test"
diff --git a/kde-frameworks/kio/kio-9999.ebuild b/kde-frameworks/kio/kio-9999.ebuild
index 683897a310..2eb7ab56e6 100644
--- a/kde-frameworks/kio/kio-9999.ebuild
+++ b/kde-frameworks/kio/kio-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-KDE_TEST="forceoptional-recursive"
+KDE_TEST="forceoptional"
VIRTUALX_REQUIRED="test"
inherit kde5
@@ -12,7 +12,7 @@ LICENSE="LGPL-2+"
KEYWORDS=""
IUSE="acl +handbook kerberos +kwallet X"
-COMMON_DEPEND="
+RDEPEND="
$(add_frameworks_dep karchive)
$(add_frameworks_dep kbookmarks)
$(add_frameworks_dep kcodecs)
@@ -48,7 +48,7 @@ COMMON_DEPEND="
kwallet? ( $(add_frameworks_dep kwallet) )
X? ( $(add_qt_dep qtx11extras) )
"
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
$(add_qt_dep qtconcurrent)
handbook? ( $(add_frameworks_dep kdoctools) )
test? ( sys-libs/zlib )
@@ -61,7 +61,6 @@ DEPEND="${COMMON_DEPEND}
PDEPEND="
$(add_frameworks_dep kded)
"
-RDEPEND="${COMMON_DEPEND}"
# tests hang
RESTRICT+=" test"
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-frameworks/kio/files/, kde-frameworks/kio/
@ 2021-05-02 7:58 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2021-05-02 7:58 UTC (permalink / raw
To: gentoo-commits
commit: f4f8dbb2a4d596dd71903a46b8955f1aad83b375
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 23 19:37:59 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 2 07:53:52 2021 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f4f8dbb2
kde-frameworks/kio: Fix public link interface
Closes: https://bugs.gentoo.org/784971
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../kio-5.81.0-fix-qtconcurrent-private-link.patch | 46 ++++++++++++++++++++++
kde-frameworks/kio/kio-9999.ebuild | 5 +++
2 files changed, 51 insertions(+)
diff --git a/kde-frameworks/kio/files/kio-5.81.0-fix-qtconcurrent-private-link.patch b/kde-frameworks/kio/files/kio-5.81.0-fix-qtconcurrent-private-link.patch
new file mode 100644
index 0000000000..42637cd6e1
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.81.0-fix-qtconcurrent-private-link.patch
@@ -0,0 +1,46 @@
+From e6825658b7f59a3a933559def9aebf21ff0efb7f Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Fri, 23 Apr 2021 20:10:31 +0200
+Subject: [PATCH] Drop find_dependency(Qt5Concurrent) from
+ KF5KIOConfig.cmake.in
+
+This was added in 2f83dde2c8e8a25f0fe3dd52012bb49cb69e1ea5 but as far as I can
+see it is only a KIO build time dependency with no Qt5Concurrent header being
+used in KIO headers.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ KF5KIOConfig.cmake.in | 1 -
+ src/core/CMakeLists.txt | 2 +-
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/KF5KIOConfig.cmake.in b/KF5KIOConfig.cmake.in
+index 687ec512..749e9b9b 100644
+--- a/KF5KIOConfig.cmake.in
++++ b/KF5KIOConfig.cmake.in
+@@ -21,7 +21,6 @@ find_dependency(KF5WindowSystem "@KF_DEP_VERSION@")
+ endif()
+
+ find_dependency(Qt5Network "@REQUIRED_QT_VERSION@")
+-find_dependency(Qt5Concurrent "@REQUIRED_QT_VERSION@")
+ find_dependency(Qt5DBus "@REQUIRED_QT_VERSION@")
+
+ include("${CMAKE_CURRENT_LIST_DIR}/KF5KIOTargets.cmake")
+diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
+index 76c3061c..fe4be56b 100644
+--- a/src/core/CMakeLists.txt
++++ b/src/core/CMakeLists.txt
+@@ -188,9 +188,9 @@ PUBLIC
+ KF5::CoreAddons # KJob
+ KF5::Service # TODO KF6 move to PRIVATE
+ Qt5::Network
+- Qt5::Concurrent # QtConcurrentRun in hostinfo.cpp
+ Qt5::DBus
+ PRIVATE
++ Qt5::Concurrent # QtConcurrentRun in hostinfo.cpp
+ Qt5::Xml # davjob.cpp uses QDom
+ KF5::ConfigCore
+ KF5::I18n
+--
+2.31.1
+
diff --git a/kde-frameworks/kio/kio-9999.ebuild b/kde-frameworks/kio/kio-9999.ebuild
index 64aaff51d1..d05142638a 100644
--- a/kde-frameworks/kio/kio-9999.ebuild
+++ b/kde-frameworks/kio/kio-9999.ebuild
@@ -71,6 +71,11 @@ PDEPEND="
>=kde-frameworks/kded-${PVCUT}:5
"
+PATCHES=(
+ # pending https://invent.kde.org/frameworks/kio/-/merge_requests/426
+ "${FILESDIR}"/${PN}-5.81.0-fix-qtconcurrent-private-link.patch # bug 784971
+)
+
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package acl ACL)
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-05-02 7:58 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-01-21 20:48 [gentoo-commits] proj/kde:master commit in: kde-frameworks/kio/files/, kde-frameworks/kio/ Johannes Huber
-- strict thread matches above, loose matches on Subject: below --
2015-06-19 14:47 Johannes Huber
2016-03-17 15:18 Michael Palimaka
2017-08-08 23:49 Andreas Sturmlechner
2021-05-02 7:58 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox