* [gentoo-commits] proj/kde:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/
@ 2015-08-01 17:27 Johannes Huber
0 siblings, 0 replies; 6+ messages in thread
From: Johannes Huber @ 2015-08-01 17:27 UTC (permalink / raw
To: gentoo-commits
commit: e184e882cf22f3a8eb4640f1decdeab312f51789
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 1 17:29:16 2015 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Aug 1 17:29:16 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=e184e882
[kde-frameworks/kio] Drop failing patch
Use KDE_PUNT_BOGUS_DEPS magic instead.
Package-Manager: portage-2.2.20
kde-frameworks/kio/files/kio-tests-optional.patch | 28 -----------------------
kde-frameworks/kio/kio-9999.ebuild | 8 +------
2 files changed, 1 insertion(+), 35 deletions(-)
diff --git a/kde-frameworks/kio/files/kio-tests-optional.patch b/kde-frameworks/kio/files/kio-tests-optional.patch
deleted file mode 100644
index ca45d88..0000000
--- a/kde-frameworks/kio/files/kio-tests-optional.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- 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 f471eb1..af3e18b 100644
--- a/kde-frameworks/kio/kio-9999.ebuild
+++ b/kde-frameworks/kio/kio-9999.ebuild
@@ -5,6 +5,7 @@
EAPI=5
VIRTUALX_REQUIRED="test"
+KDE_PUNT_BOGUS_DEPS=true
inherit kde5
DESCRIPTION="Framework providing transparent file and data management"
@@ -65,13 +66,6 @@ PDEPEND="
# tests hang
RESTRICT="test"
-src_prepare() {
- # whole patch should be upstreamed, doesn't work in PATCHES
- epatch "${FILESDIR}/${PN}-tests-optional.patch"
-
- kde5_src_prepare
-}
-
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package acl)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/
@ 2016-01-09 15:17 Michael Palimaka
0 siblings, 0 replies; 6+ messages in thread
From: Michael Palimaka @ 2016-01-09 15:17 UTC (permalink / raw
To: gentoo-commits
commit: 4696fab6b49c284d20c0b134e905dd25c630ea91
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Jan 9 13:48:15 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Jan 9 15:16:58 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=4696fab6
kde-frameworks/kio: Add fix for ftp timestamps
Package-Manager: portage-2.2.26
.../kio/files/kio-5.18.0-ftp-timestamps.patch | 60 ++++++++++++++++++++++
kde-frameworks/kio/kio-5.18.0.ebuild | 2 +
2 files changed, 62 insertions(+)
diff --git a/kde-frameworks/kio/files/kio-5.18.0-ftp-timestamps.patch b/kde-frameworks/kio/files/kio-5.18.0-ftp-timestamps.patch
new file mode 100644
index 0000000..71a7d8c
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.18.0-ftp-timestamps.patch
@@ -0,0 +1,60 @@
+From: Wolfgang Bauer <wbauer@tmo.at>
+Date: Thu, 07 Jan 2016 12:38:55 +0000
+Subject: [kio_ftp] fix display of file/directory modification time/date
+X-Git-Url: http://quickgit.kde.org/?p=kio.git&a=commitdiff&h=68af1d7e89b7fed136d4cc62b76c1c6ded2d94eb
+---
+[kio_ftp] fix display of file/directory modification time/date
+
+- QDate() treats the year literally (i.e. 90 is really year 90, not
+1990), so subtracting 1900 is wrong.
+- Use QDate::currentDate() instead of QDateTime::currentDateTime(), we
+only need the current date anyway
+- Initialize day, month, and year to the current date instead of 0. In
+the case when no year is mentioned in the server's reply (the year is
+implicit), it wasn't set to the current year at all, so the result was
+either 0 or -1.
+
+BUG: 354597
+FIXED-IN: 5.19.0
+REVIEW: 126659
+---
+
+
+--- a/src/ioslaves/ftp/ftp.cpp
++++ b/src/ioslaves/ftp/ftp.cpp
+@@ -1763,18 +1763,16 @@
+ // Parsing the date is somewhat tricky
+ // Examples : "Oct 6 22:49", "May 13 1999"
+
+- // First get current time - we need the current month and year
+- QDateTime currentTime(QDateTime::currentDateTime());
+- int currentMonth = currentTime.date().month();
++ // First get current date - we need the current month and year
++ QDate currentDate(QDate::currentDate());
++ int currentMonth = currentDate.month();
+ //qDebug() << "Current time :" << asctime( tmptr );
+- // Reset time fields
+- currentTime.setTime(QTime(0, 0, 0));
+- // Get day number (always second field)
+- int day = 0;
+- int month = 0;
+- int year = 0;
++ int day = currentDate.day();
++ int month = currentDate.month();
++ int year = currentDate.year();
+ int minute = 0;
+ int hour = 0;
++ // Get day number (always second field)
+ if (p_date_2) {
+ day = atoi(p_date_2);
+ }
+@@ -1794,7 +1792,7 @@
+
+ // Parse third field
+ if (qstrlen(p_date_3) == 4) { // 4 digits, looks like a year
+- year = atoi(p_date_3) - 1900;
++ year = atoi(p_date_3);
+ } else {
+ // otherwise, the year is implicit
+ // according to man ls, this happens when it is between than 6 months
+
diff --git a/kde-frameworks/kio/kio-5.18.0.ebuild b/kde-frameworks/kio/kio-5.18.0.ebuild
index 0039f75..8405de4 100644
--- a/kde-frameworks/kio/kio-5.18.0.ebuild
+++ b/kde-frameworks/kio/kio-5.18.0.ebuild
@@ -67,6 +67,8 @@ RDEPEND="${COMMON_DEPEND}"
# tests hang
RESTRICT="test"
+PATCHES=( "${FILESDIR}/${P}-ftp-timestamps.patch" )
+
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package acl)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/
@ 2016-09-14 14:13 Michael Palimaka
0 siblings, 0 replies; 6+ messages in thread
From: Michael Palimaka @ 2016-09-14 14:13 UTC (permalink / raw
To: gentoo-commits
commit: 52a2f0d00c4bc54eebf96a0afce27bc770ff6862
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Sep 11 16:26:49 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Sep 14 14:13:12 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=52a2f0d0
kde-frameworks/kio: Fix launching terminal .desktop files w/ konsole
Package-Manager: portage-2.3.0
.../kio/files/kio-5.26.0-fix-desktop-launch.patch | 26 +++++++
kde-frameworks/kio/kio-5.26.0-r1.ebuild | 82 ++++++++++++++++++++++
2 files changed, 108 insertions(+)
diff --git a/kde-frameworks/kio/files/kio-5.26.0-fix-desktop-launch.patch b/kde-frameworks/kio/files/kio-5.26.0-fix-desktop-launch.patch
new file mode 100644
index 0000000..b2766a6
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.26.0-fix-desktop-launch.patch
@@ -0,0 +1,26 @@
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Sat, 10 Sep 2016 22:14:56 +0000
+Subject: Fix launching terminal .desktop files with konsole
+X-Git-Url: http://quickgit.kde.org/?p=kio.git&a=commitdiff&h=c784a879eaba0babc6274bc32e761772add3d4f8
+---
+Fix launching terminal .desktop files with konsole
+
+Launching .desktop files which have Terminal=true currently fails, because kio adds to the konsole command the obsolete KDE4 command line options,
+which are not recognized by the KF5 konsole.
+
+REVIEW: 128882
+---
+
+
+--- a/src/core/desktopexecparser.cpp
++++ b/src/core/desktopexecparser.cpp
+@@ -363,7 +363,7 @@
+ if (!d->service.path().isEmpty()) {
+ terminal += " --workdir " + KShell::quoteArg(d->service.path());
+ }
+- terminal += QLatin1String(" -caption=%c %i %m");
++ terminal += QLatin1String(" -qwindowtitle '%c' %i");
+ }
+ terminal += ' ';
+ terminal += d->service.terminalOptions();
+
diff --git a/kde-frameworks/kio/kio-5.26.0-r1.ebuild b/kde-frameworks/kio/kio-5.26.0-r1.ebuild
new file mode 100644
index 0000000..1970470
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.26.0-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing transparent file and data management"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="acl +handbook kerberos +kwallet X"
+
+COMMON_DEPEND="
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kbookmarks)
+ $(add_frameworks_dep kcodecs)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep solid)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtnetwork 'ssl')
+ $(add_qt_dep qtscript)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtxml)
+ dev-libs/libxml2
+ dev-libs/libxslt
+ acl? (
+ sys-apps/attr
+ virtual/acl
+ )
+ kerberos? ( virtual/krb5 )
+ kwallet? ( $(add_frameworks_dep kwallet) )
+ X? ( $(add_qt_dep qtx11extras) )
+"
+DEPEND="${COMMON_DEPEND}
+ $(add_qt_dep qtconcurrent)
+ handbook? ( $(add_frameworks_dep kdoctools) )
+ test? ( sys-libs/zlib )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXrender
+ x11-proto/xproto
+ )
+"
+PDEPEND="
+ $(add_frameworks_dep kded)
+"
+RDEPEND="${COMMON_DEPEND}"
+
+# tests hang
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${P}-fix-desktop-launch.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package acl ACL)
+ $(cmake-utils_use_find_package handbook KF5DocTools)
+ $(cmake-utils_use_find_package kerberos GSSAPI)
+ $(cmake-utils_use_find_package kwallet KF5Wallet)
+ $(cmake-utils_use_find_package X X11)
+ )
+
+ kde5_src_configure
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/
@ 2021-05-07 16:28 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2021-05-07 16:28 UTC (permalink / raw
To: gentoo-commits
commit: 87c948cd1007b7cd18620cb3f8ed8eaa304cf92c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri May 7 16:26:11 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri May 7 16:27:32 2021 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=87c948cd
kde-frameworks/kio: Backport drop useragent and cache KCMs
Upstream commits:
1aa42558a0f539abfe4bc92cf2c8078ac4adb9a0
581fab08ff4d5539e4684adcffc74ec3517ce29d
See also:
https://invent.kde.org/frameworks/kio/-/merge_requests/438
https://invent.kde.org/frameworks/kio/-/merge_requests/440
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../kio/files/kio-5.82.0-no-cache-kcm.patch | 79 ++++++++++++++++
.../kio/files/kio-5.82.0-no-useragent-kcm.patch | 105 +++++++++++++++++++++
kde-frameworks/kio/kio-5.82.0.ebuild | 8 ++
3 files changed, 192 insertions(+)
diff --git a/kde-frameworks/kio/files/kio-5.82.0-no-cache-kcm.patch b/kde-frameworks/kio/files/kio-5.82.0-no-cache-kcm.patch
new file mode 100644
index 0000000000..9cc0379b69
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.82.0-no-cache-kcm.patch
@@ -0,0 +1,79 @@
+From 581fab08ff4d5539e4684adcffc74ec3517ce29d Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Thu, 6 May 2021 21:26:31 +0200
+Subject: [PATCH] Remove the cache KCM
+
+Same reasoning as for
+https://invent.kde.org/frameworks/kio/-/merge_requests/438.
+
+It is very targeted towards KIO-based browsers which don't really exist
+any more.
+
+The setting is also global to everything that uses KIO and it's a bit
+questionable whether for example webdav browsing in Dolphin should
+automatically have the same cache settings as network access in Choqok.
+
+It being part of system settings is also confusing for users since it
+gives the false impression of true globality. They might expect it to
+affect Firefox or Webengine-based Konqueror which it does not.
+---
+ docs/kcontrol5/CMakeLists.txt | 1 -
+ src/kcms/kio/CMakeLists.txt | 4 +-
+ src/kcms/kio/main.cpp | 4 +-
+ 3 files changed, 2 insertions(+), 7 deletions(-)
+
+diff --git a/docs/kcontrol5/CMakeLists.txt b/docs/kcontrol5/CMakeLists.txt
+index 2dd1ae16a..6c2f21b07 100644
+--- a/docs/kcontrol5/CMakeLists.txt
++++ b/docs/kcontrol5/CMakeLists.txt
+@@ -1,4 +1,3 @@
+-add_subdirectory(cache)
+ add_subdirectory(cookies)
+ add_subdirectory(netpref)
+ add_subdirectory(proxy)
+diff --git a/src/kcms/kio/CMakeLists.txt b/src/kcms/kio/CMakeLists.txt
+index 11cd239f2..5281fc7dc 100644
+--- a/src/kcms/kio/CMakeLists.txt
++++ b/src/kcms/kio/CMakeLists.txt
+@@ -12,11 +12,9 @@ set(kcm_kio_PART_SRCS
+ smbrodlg.cpp
+ kproxydlg.cpp
+ netpref.cpp
+- cache.cpp
+ ksaveioconfig.cpp)
+
+ ki18n_wrap_ui(kcm_kio_PART_SRCS
+- cache.ui
+ kproxydlg.ui
+ kcookiespolicies.ui
+ kcookiesmanagement.ui
+@@ -41,5 +39,5 @@ install(TARGETS kcm_kio DESTINATION ${KDE_INSTALL_PLUGINDIR} )
+
+ ########### install files ###############
+
+-install( FILES smb.desktop cookies.desktop cache.desktop
++install( FILES smb.desktop cookies.desktop
+ netpref.desktop proxy.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
+diff --git a/src/kcms/kio/main.cpp b/src/kcms/kio/main.cpp
+index 8bacb10ca..2c0ebc29b 100644
+--- a/src/kcms/kio/main.cpp
++++ b/src/kcms/kio/main.cpp
+@@ -13,7 +13,6 @@
+ #include <KPluginFactory>
+
+ // Local
+-#include "cache.h"
+ #include "kcookiesmain.h"
+ #include "kproxydlg.h"
+ #include "netpref.h"
+@@ -21,7 +20,6 @@
+
+ K_PLUGIN_FACTORY(KioConfigFactory, registerPlugin<SMBRoOptions>(QStringLiteral("smb")); registerPlugin<KIOPreferences>(QStringLiteral("netpref"));
+ registerPlugin<KProxyDialog>(QStringLiteral("proxy"));
+- registerPlugin<KCookiesMain>(QStringLiteral("cookie"));
+- registerPlugin<CacheConfigModule>(QStringLiteral("cache"));)
++ registerPlugin<KCookiesMain>(QStringLiteral("cookie"));)
+
+ #include "main.moc"
+--
+GitLab
diff --git a/kde-frameworks/kio/files/kio-5.82.0-no-useragent-kcm.patch b/kde-frameworks/kio/files/kio-5.82.0-no-useragent-kcm.patch
new file mode 100644
index 0000000000..ce0e891e91
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.82.0-no-useragent-kcm.patch
@@ -0,0 +1,105 @@
+From 1aa42558a0f539abfe4bc92cf2c8078ac4adb9a0 Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Wed, 5 May 2021 22:27:25 +0200
+Subject: [PATCH] Remove the Browser Identification KCM
+
+It's purpose is to control the user agent used by kio-http.
+
+Very few things use kio-http these days, not even Konqueror with the
+webengine part.
+
+For the remaining use cases (kioclient, webdav kio worker, etc.) this
+kind of configurability is overkill.
+
+Moreover being part of systemsettings this gives a false impression of
+globality. A user might change something in there and wonder why it does
+not apply to Firefox or Falkon.
+
+Given the questionable usefulness and the potential for confusion I
+propose to remove it entirely.
+---
+ docs/kcontrol5/CMakeLists.txt | 1 -
+ src/kcms/kio/CMakeLists.txt | 18 +-
+ src/kcms/kio/main.cpp | 4 +-
+ 3 files changed, 2 insertions(+), 21 deletions(-)
+
+diff --git a/docs/kcontrol5/CMakeLists.txt b/docs/kcontrol5/CMakeLists.txt
+index 1b19e5e7b..2dd1ae16a 100644
+--- a/docs/kcontrol5/CMakeLists.txt
++++ b/docs/kcontrol5/CMakeLists.txt
+@@ -4,5 +4,4 @@ add_subdirectory(netpref)
+ add_subdirectory(proxy)
+ add_subdirectory(smb)
+ add_subdirectory(trash)
+-add_subdirectory(useragent)
+ add_subdirectory(webshortcuts)
+diff --git a/src/kcms/kio/CMakeLists.txt b/src/kcms/kio/CMakeLists.txt
+index a354651b0..11cd239f2 100644
+--- a/src/kcms/kio/CMakeLists.txt
++++ b/src/kcms/kio/CMakeLists.txt
+@@ -1,6 +1,4 @@
+
+-add_subdirectory( uasproviders )
+-
+ find_package(KF5TextWidgets ${KF_DEP_VERSION} REQUIRED)
+
+ ########### next target ###############
+@@ -12,31 +10,18 @@ set(kcm_kio_PART_SRCS
+ kcookiesmanagement.cpp
+ kcookiespolicyselectiondlg.cpp
+ smbrodlg.cpp
+- useragentdlg.cpp
+ kproxydlg.cpp
+- useragentinfo.cpp
+- useragentselectordlg.cpp
+ netpref.cpp
+ cache.cpp
+ ksaveioconfig.cpp)
+
+ ki18n_wrap_ui(kcm_kio_PART_SRCS
+ cache.ui
+- useragentselectordlg.ui
+- useragentdlg.ui
+ kproxydlg.ui
+ kcookiespolicies.ui
+ kcookiesmanagement.ui
+ kcookiespolicyselectiondlg.ui)
+
+-ecm_qt_export_logging_category(
+- IDENTIFIER KIO_USERAGENTDLG
+- CATEGORY_NAME kf.configwidgets.cms.kf.kio.useragentdlg
+- OLD_CATEGORY_NAMES kf5.kio.useragentdlg
+- DESCRIPTION "kio useragentdialog (KIO)"
+- EXPORT KIO
+-)
+-
+ add_library(kcm_kio MODULE ${kcm_kio_PART_SRCS})
+
+ target_link_libraries(kcm_kio
+@@ -56,6 +41,5 @@ install(TARGETS kcm_kio DESTINATION ${KDE_INSTALL_PLUGINDIR} )
+
+ ########### install files ###############
+
+-install( FILES smb.desktop cookies.desktop useragent.desktop cache.desktop
++install( FILES smb.desktop cookies.desktop cache.desktop
+ netpref.desktop proxy.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
+-install( FILES uasprovider.desktop DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR} )
+diff --git a/src/kcms/kio/main.cpp b/src/kcms/kio/main.cpp
+index f1b065f46..8bacb10ca 100644
+--- a/src/kcms/kio/main.cpp
++++ b/src/kcms/kio/main.cpp
+@@ -18,10 +18,8 @@
+ #include "kproxydlg.h"
+ #include "netpref.h"
+ #include "smbrodlg.h"
+-#include "useragentdlg.h"
+
+-K_PLUGIN_FACTORY(KioConfigFactory, registerPlugin<UserAgentDlg>(QStringLiteral("useragent")); registerPlugin<SMBRoOptions>(QStringLiteral("smb"));
+- registerPlugin<KIOPreferences>(QStringLiteral("netpref"));
++K_PLUGIN_FACTORY(KioConfigFactory, registerPlugin<SMBRoOptions>(QStringLiteral("smb")); registerPlugin<KIOPreferences>(QStringLiteral("netpref"));
+ registerPlugin<KProxyDialog>(QStringLiteral("proxy"));
+ registerPlugin<KCookiesMain>(QStringLiteral("cookie"));
+ registerPlugin<CacheConfigModule>(QStringLiteral("cache"));)
+--
+GitLab
+
diff --git a/kde-frameworks/kio/kio-5.82.0.ebuild b/kde-frameworks/kio/kio-5.82.0.ebuild
index 154cff27d3..4f99cc9cee 100644
--- a/kde-frameworks/kio/kio-5.82.0.ebuild
+++ b/kde-frameworks/kio/kio-5.82.0.ebuild
@@ -75,8 +75,16 @@ PDEPEND="
PATCHES=(
# pending https://invent.kde.org/frameworks/kio/-/merge_requests/426
"${FILESDIR}"/${PN}-5.81.0-fix-qtconcurrent-private-link.patch # bug 784971
+ # git master/KIO 5.83:
+ "${FILESDIR}"/${P}-no-useragent-kcm.patch
+ "${FILESDIR}"/${P}-no-cache-kcm.patch
)
+src_prepare() {
+ ecm_src_prepare
+ rm -rf po/*/docs/kcontrol5/{cache,useragent} || die # superfluous docs
+}
+
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package acl ACL)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/
@ 2021-06-30 6:07 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2021-06-30 6:07 UTC (permalink / raw
To: gentoo-commits
commit: d6ea63eb367b1da7f3461b441580ac38d841bb78
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 30 06:06:30 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jun 30 06:06:30 2021 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=d6ea63eb
kde-frameworks/kio: Rebase fix-qtconcurrent-private-link.patch
Reported-by: Duncan <1i5t5.duncan <AT> cox.net>
Closes: https://bugs.gentoo.org/799215
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
... => kio-5.84.0-fix-qtconcurrent-private-link.patch} | 18 +++++++++++-------
kde-frameworks/kio/kio-9999.ebuild | 2 +-
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/kde-frameworks/kio/files/kio-5.81.0-fix-qtconcurrent-private-link.patch b/kde-frameworks/kio/files/kio-5.84.0-fix-qtconcurrent-private-link.patch
similarity index 67%
rename from kde-frameworks/kio/files/kio-5.81.0-fix-qtconcurrent-private-link.patch
rename to kde-frameworks/kio/files/kio-5.84.0-fix-qtconcurrent-private-link.patch
index 42637cd6e1..13ae80db4e 100644
--- a/kde-frameworks/kio/files/kio-5.81.0-fix-qtconcurrent-private-link.patch
+++ b/kde-frameworks/kio/files/kio-5.84.0-fix-qtconcurrent-private-link.patch
@@ -1,13 +1,17 @@
-From e6825658b7f59a3a933559def9aebf21ff0efb7f Mon Sep 17 00:00:00 2001
+From fd019eca92a423e83e49a94f16ebca930e0fe51d 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
+Subject: [PATCH] Move Qt5Concurrent to private link libraries, drop 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.
+Test-built various revdeps successfully against the patched KIO with/without
+Qt5Concurrent installed, fixing implicit deps while at it. KDE Gear packages
+are fixed in >=21.04.2, KDE Plasma in >=5.21.5.
+
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---
KF5KIOConfig.cmake.in | 1 -
@@ -27,20 +31,20 @@ index 687ec512..749e9b9b 100644
include("${CMAKE_CURRENT_LIST_DIR}/KF5KIOTargets.cmake")
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
-index 76c3061c..fe4be56b 100644
+index b35258a7..16c83d59 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
-@@ -188,9 +188,9 @@ PUBLIC
+@@ -201,9 +201,9 @@ PUBLIC
KF5::CoreAddons # KJob
KF5::Service # TODO KF6 move to PRIVATE
Qt5::Network
-- Qt5::Concurrent # QtConcurrentRun in hostinfo.cpp
+- Qt5::Concurrent # QtConcurrentRun in hostinfo.cpp # TODO KF6 move to PRIVATE
Qt5::DBus
PRIVATE
-+ Qt5::Concurrent # QtConcurrentRun in hostinfo.cpp
++ Qt5::Concurrent # QtConcurrentRun in hostinfo.cpp # TODO KF6 move to PRIVATE
Qt5::Xml # davjob.cpp uses QDom
KF5::ConfigCore
KF5::I18n
--
-2.31.1
+2.32.0
diff --git a/kde-frameworks/kio/kio-9999.ebuild b/kde-frameworks/kio/kio-9999.ebuild
index 522952a13d..a247d1aa41 100644
--- a/kde-frameworks/kio/kio-9999.ebuild
+++ b/kde-frameworks/kio/kio-9999.ebuild
@@ -74,7 +74,7 @@ PDEPEND="
PATCHES=(
# pending https://invent.kde.org/frameworks/kio/-/merge_requests/426
- "${FILESDIR}"/${PN}-5.81.0-fix-qtconcurrent-private-link.patch # bug 784971
+ "${FILESDIR}"/${PN}-5.84.0-fix-qtconcurrent-private-link.patch # bug 784971
)
src_configure() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/
@ 2022-08-08 14:39 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2022-08-08 14:39 UTC (permalink / raw
To: gentoo-commits
commit: 4ca2ea850eba56b825a8cf70fdc78be36434858b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 8 14:17:54 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Aug 8 14:21:42 2022 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=4ca2ea85
kde-frameworks/kio: Fix build with USE -X, drop obsolete DEPENDs
Upstream commit c7a277e6810b74b7f664b029573beab592932421
Bug: https://bugs.gentoo.org/813450
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-frameworks/kio/files/kio-5.96.0-with_x11.patch | 72 ++++++++++++++++++++++
kde-frameworks/kio/kio-5.97.0.ebuild | 11 ++--
kde-frameworks/kio/kio-9999.ebuild | 9 +--
3 files changed, 78 insertions(+), 14 deletions(-)
diff --git a/kde-frameworks/kio/files/kio-5.96.0-with_x11.patch b/kde-frameworks/kio/files/kio-5.96.0-with_x11.patch
new file mode 100644
index 0000000000..9f87ec989a
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.96.0-with_x11.patch
@@ -0,0 +1,72 @@
+From c7a277e6810b74b7f664b029573beab592932421 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 1 Aug 2022 22:10:02 +0200
+Subject: [PATCH] Drop obsolete X11 dependency, introduce WITH_X11 option
+ instead
+
+This will only determine whether to search for Qt5X11Extras and then
+set HAVE_X11 accordingly. This is a behavior change as previously it was
+silently disabled if X11 was not found.
+
+We want to be able to build without X11 support even if some of the used
+libraries may not work w/o X11 themselves yet or need to be built with
+X11 support for other reverse dependencies.
+
+HAVE_X11 already exists and is set automagically so far, but using
+-DCMAKE_DISABLE_FIND_PACKAGE_X11 will break if any dependencies list X11
+as required in their cmake config.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 19 +++++++++----------
+ src/ioslaves/http/CMakeLists.txt | 3 ---
+ 2 files changed, 9 insertions(+), 13 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 95b5db299..c3372f7ea 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -117,17 +117,16 @@ set_package_properties(GSSAPI PROPERTIES DESCRIPTION "Allows KIO to make use of
+ PURPOSE "A MIT or HEIMDAL flavor of GSSAPI can be used"
+ )
+
+-if (NOT APPLE AND NOT WIN32)
+- find_package(X11)
+-endif()
+-
+-set(HAVE_X11 ${X11_FOUND})
+-if (HAVE_X11)
+- if (QT_MAJOR_VERSION STREQUAL "5")
+- find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras)
+- else()
+- # qtx11extras_p.h is in Qt6Gui, which is implied by the find_package(QtWidgets) above
++if (NOT APPLE AND NOT WIN32 AND NOT ANDROID)
++ option(WITH_X11 "Build with X11 integration" ON)
++ if(WITH_X11)
++ if (QT_MAJOR_VERSION STREQUAL "5")
++ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras)
++ else()
++ # qtx11extras_p.h is in Qt6Gui, which is implied by the find_package(QtWidgets) above
++ endif()
+ endif()
++ set(HAVE_X11 ${WITH_X11})
+ endif()
+
+ find_package(ACL)
+diff --git a/src/ioslaves/http/CMakeLists.txt b/src/ioslaves/http/CMakeLists.txt
+index 4fbddb4a3..689f63dd8 100644
+--- a/src/ioslaves/http/CMakeLists.txt
++++ b/src/ioslaves/http/CMakeLists.txt
+@@ -3,9 +3,6 @@ include(ECMMarkNonGuiExecutable)
+ include(ConfigureChecks.cmake)
+ configure_file(config-kioslave-http.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kioslave-http.h )
+
+-find_package(X11)
+-set(HAVE_X11 ${X11_FOUND})
+-
+ if(GSSAPI_FOUND)
+ set(HAVE_LIBGSSAPI 1)
+ if(GSSAPI_FLAVOR STREQUAL "MIT")
+--
+GitLab
+
diff --git a/kde-frameworks/kio/kio-5.97.0.ebuild b/kde-frameworks/kio/kio-5.97.0.ebuild
index cc6c2eecc0..834eb3d27e 100644
--- a/kde-frameworks/kio/kio-5.97.0.ebuild
+++ b/kde-frameworks/kio/kio-5.97.0.ebuild
@@ -47,7 +47,7 @@ RDEPEND="
=kde-frameworks/kservice-${PVCUT}*:5
=kde-frameworks/ktextwidgets-${PVCUT}*:5
=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
- =kde-frameworks/kwindowsystem-${PVCUT}*:5
+ =kde-frameworks/kwindowsystem-${PVCUT}*:5[X?]
=kde-frameworks/kxmlgui-${PVCUT}*:5
=kde-frameworks/solid-${PVCUT}*:5
acl? (
@@ -62,14 +62,11 @@ RDEPEND="
DEPEND="${RDEPEND}
>=dev-qt/qtconcurrent-${QTMIN}:5
test? ( sys-libs/zlib )
- X? (
- x11-base/xorg-proto
- x11-libs/libX11
- x11-libs/libXrender
- )
"
PDEPEND=">=kde-frameworks/kded-${PVCUT}:5"
+PATCHES=( "${FILESDIR}/${PN}-5.96.0-with_x11.patch" )
+
src_configure() {
local mycmakeargs=(
-DKIO_NO_PUBLIC_QTCONCURRENT=ON
@@ -77,7 +74,7 @@ src_configure() {
$(cmake_use_find_package handbook KF5DocTools)
$(cmake_use_find_package kerberos GSSAPI)
$(cmake_use_find_package kwallet KF5Wallet)
- $(cmake_use_find_package X X11)
+ -DWITH_X11=$(usex X)
)
ecm_src_configure
diff --git a/kde-frameworks/kio/kio-9999.ebuild b/kde-frameworks/kio/kio-9999.ebuild
index e793c5c9e7..35ffd9161a 100644
--- a/kde-frameworks/kio/kio-9999.ebuild
+++ b/kde-frameworks/kio/kio-9999.ebuild
@@ -47,7 +47,7 @@ RDEPEND="
=kde-frameworks/kservice-${PVCUT}*:5
=kde-frameworks/ktextwidgets-${PVCUT}*:5
=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
- =kde-frameworks/kwindowsystem-${PVCUT}*:5
+ =kde-frameworks/kwindowsystem-${PVCUT}*:5[X?]
=kde-frameworks/kxmlgui-${PVCUT}*:5
=kde-frameworks/solid-${PVCUT}*:5
acl? (
@@ -62,11 +62,6 @@ RDEPEND="
DEPEND="${RDEPEND}
>=dev-qt/qtconcurrent-${QTMIN}:5
test? ( sys-libs/zlib )
- X? (
- x11-base/xorg-proto
- x11-libs/libX11
- x11-libs/libXrender
- )
"
PDEPEND=">=kde-frameworks/kded-${PVCUT}:5"
@@ -77,7 +72,7 @@ src_configure() {
$(cmake_use_find_package handbook KF5DocTools)
$(cmake_use_find_package kerberos GSSAPI)
$(cmake_use_find_package kwallet KF5Wallet)
- $(cmake_use_find_package X X11)
+ -DWITH_X11=$(usex X)
)
ecm_src_configure
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-08-08 14:39 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-07 16:28 [gentoo-commits] proj/kde:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2022-08-08 14:39 Andreas Sturmlechner
2021-06-30 6:07 Andreas Sturmlechner
2016-09-14 14:13 Michael Palimaka
2016-01-09 15:17 Michael Palimaka
2015-08-01 17:27 Johannes Huber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox