* [gentoo-commits] proj/kde:master commit in: kde-apps/kio-extras/files/, kde-apps/kio-extras/
@ 2017-07-12 20:34 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2017-07-12 20:34 UTC (permalink / raw
To: gentoo-commits
commit: fd9cf6144ea9e3b67cf32ac5e25532c5de09e64a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 12 20:34:35 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jul 12 20:34:35 2017 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=fd9cf614
kde-apps/kio-extras: Add smb and mtp upstream fixes
Package-Manager: Portage-2.3.6, Repoman-2.3.1
| 87 ++++++++
| 240 +++++++++++++++++++++
| 5 +
3 files changed, 332 insertions(+)
--git a/kde-apps/kio-extras/files/kio-extras-17.04.3-mtp.patch b/kde-apps/kio-extras/files/kio-extras-17.04.3-mtp.patch
new file mode 100644
index 0000000000..04aff7dcdb
--- /dev/null
+++ b/kde-apps/kio-extras/files/kio-extras-17.04.3-mtp.patch
@@ -0,0 +1,87 @@
+From bdd0e54ee303559106d2ac746f9a3d167bd89146 Mon Sep 17 00:00:00 2001
+From: Kevin Funk <kfunk@kde.org>
+Date: Tue, 11 Jul 2017 03:03:21 +0200
+Subject: mtp: Simplify code a bit
+
+Only one branch can be taken per call, make this clear by using
+if/else-if instead of a series of ifs.
+---
+ mtp/kio_mtp.cpp | 9 ++-------
+ 1 file changed, 2 insertions(+), 7 deletions(-)
+
+diff --git a/mtp/kio_mtp.cpp b/mtp/kio_mtp.cpp
+index 0532820..9d8585f 100644
+--- a/mtp/kio_mtp.cpp
++++ b/mtp/kio_mtp.cpp
+@@ -593,15 +593,12 @@ void MTPSlave::copy(const QUrl &src, const QUrl &dest, int, JobFlags flags)
+ {
+ qCDebug(LOG_KIO_MTP) << src.path() << dest.path();
+
+- // mtp:/// to mtp:///
+ if (src.scheme() == QLatin1String("mtp") && dest.scheme() == QLatin1String("mtp")) {
+ qCDebug(LOG_KIO_MTP) << "Copy on device: Not supported";
+ // MTP doesn't support moving files directly on the device, so we have to download and then upload...
+
+ error(ERR_UNSUPPORTED_ACTION, i18n("Cannot copy/move files on the device itself"));
+- }
+- // file:/// tp mtp:///
+- if (src.scheme() == QLatin1String("file") && dest.scheme() == QLatin1String("mtp")) {
++ } else if (src.scheme() == QLatin1String("file") && dest.scheme() == QLatin1String("mtp")) {
+ int check = checkUrl(dest);
+ switch (check) {
+ case 0:
+@@ -680,9 +677,7 @@ void MTPSlave::copy(const QUrl &src, const QUrl &dest, int, JobFlags flags)
+ }
+
+ qCDebug(LOG_KIO_MTP) << "Sent file";
+- }
+- // mtp:/// to file:///
+- if (src.scheme() == QLatin1String("mtp") && dest.scheme() == QLatin1String("file")) {
++ } else if (src.scheme() == QLatin1String("mtp") && dest.scheme() == QLatin1String("file")) {
+ int check = checkUrl(src);
+ switch (check) {
+ case 0:
+--
+cgit v0.11.2
+From f7b9b827ed7a23403913a4e356b0549d9deaf351 Mon Sep 17 00:00:00 2001
+From: Kevin Funk <kfunk@kde.org>
+Date: Tue, 11 Jul 2017 03:04:21 +0200
+Subject: A couple of fixes for the MTP kio slave (2 patches)
+
+Summary:
+mtp: Simplify code a bit
+
+Only one branch can be taken per call, make this clear by using
+if/else-if instead of a series of ifs.
+
+mtp: Don't crash if getPath returns something invalid
+
+This happens when you try to copy a file from a device which just got
+locked again (I think...)
+
+Reviewers: elvisangelaccio
+
+Reviewed By: elvisangelaccio
+
+Differential Revision: https://phabricator.kde.org/D6620
+---
+ mtp/kio_mtp.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/mtp/kio_mtp.cpp b/mtp/kio_mtp.cpp
+index 9d8585f..541268a 100644
+--- a/mtp/kio_mtp.cpp
++++ b/mtp/kio_mtp.cpp
+@@ -705,6 +705,10 @@ void MTPSlave::copy(const QUrl &src, const QUrl &dest, int, JobFlags flags)
+ }
+
+ QPair<void *, LIBMTP_mtpdevice_t *> pair = getPath(src.path());
++ if (!pair.first) {
++ error(ERR_COULD_NOT_READ, src.path());
++ return;
++ }
+
+ LIBMTP_mtpdevice_t *device = pair.second;
+ LIBMTP_file_t *source = (LIBMTP_file_t *) pair.first;
+--
+cgit v0.11.2
--git a/kde-apps/kio-extras/files/kio-extras-17.04.3-smb.patch b/kde-apps/kio-extras/files/kio-extras-17.04.3-smb.patch
new file mode 100644
index 0000000000..b6b83845f7
--- /dev/null
+++ b/kde-apps/kio-extras/files/kio-extras-17.04.3-smb.patch
@@ -0,0 +1,240 @@
+From 2574c9158febdcb3dd7a0ebc3e76311f016d00d0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michal=20Mal=C3=BD?= <malymi@natur.cuni.cz>
+Date: Wed, 12 Jul 2017 11:55:04 +0200
+Subject: Always create the "." UDSEntry
+
+Summary:
+The smb_kio plugin does not create the "." UDSEntry,
+relying on the underlying KIO infrastructure to create a default one.
+
+This patch ensures that the UDSEntry is always created with proper access permissions.
+
+CCBUG: 376344
+
+Reviewers: elvisangelaccio
+
+Differential Revision: https://phabricator.kde.org/D6616
+---
+ smb/kio_smb_browse.cpp | 23 ++++++++++++++++++++++-
+ 1 file changed, 22 insertions(+), 1 deletion(-)
+
+diff --git a/smb/kio_smb_browse.cpp b/smb/kio_smb_browse.cpp
+index 1ca90a2..06ca60b 100644
+--- a/smb/kio_smb_browse.cpp
++++ b/smb/kio_smb_browse.cpp
+@@ -309,6 +309,7 @@ void SMBSlave::listDir( const QUrl& kurl )
+ int dirfd;
+ struct smbc_dirent *dirp = NULL;
+ UDSEntry udsentry;
++ bool dir_is_root = true;
+
+ dirfd = smbc_opendir( m_current_url.toSmbcUrl() );
+ if (dirfd > 0){
+@@ -350,8 +351,14 @@ void SMBSlave::listDir( const QUrl& kurl )
+ udsentry.insert(KIO::UDSEntry::UDS_HIDDEN, 1);
+ }
+
+- if (udsName == "." || udsName == "..")
++ if (udsName == ".")
+ {
++ // Skip the "." entry
++ // Mind the way m_current_url is handled in the loop
++ }
++ else if (udsName == "..")
++ {
++ dir_is_root = false;
+ // fprintf(stderr,"----------- hide: -%s-\n",dirp->name);
+ // do nothing and hide the hidden shares
+ }
+@@ -430,6 +437,20 @@ void SMBSlave::listDir( const QUrl& kurl )
+ udsentry.clear();
+ } while (dirp); // checked already in the head
+
++ if (dir_is_root) {
++ udsentry.insert(KIO::UDSEntry::UDS_FILE_TYPE, S_IFDIR);
++ udsentry.insert(KIO::UDSEntry::UDS_NAME, ".");
++ udsentry.insert(KIO::UDSEntry::UDS_ACCESS, (S_IRUSR | S_IRGRP | S_IROTH | S_IXUSR | S_IXGRP | S_IXOTH));
++ udsentry.insert(KIO::UDSEntry::UDS_MIME_TYPE, QLatin1String("application/x-smb-server"));
++ }
++ else
++ {
++ udsentry.insert(KIO::UDSEntry::UDS_NAME, ".");
++ browse_stat_path(m_current_url, udsentry, true);
++ }
++ listEntry(udsentry);
++ udsentry.clear();
++
+ // clean up
+ smbc_closedir(dirfd);
+ }
+--
+cgit v0.11.2
+From e792aa44b5aa0b122e006234a8f87a16ff12fe6f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michal=20Mal=C3=BD?= <malymi@natur.cuni.cz>
+Date: Wed, 12 Jul 2017 11:57:12 +0200
+Subject: Return appropriate error code from browse_stat_path() instead of
+ trying to deal with the error internally.
+
+Summary:
+Current behavior of browse_stat_path() can result in both finished() and error() being signaled to KIO.
+This patch adjusts the logic to prevent this case.
+
+Reviewers: elvisangelaccio
+
+BUG: 376344
+FIXED-IN: 17.08.0
+
+Differential Revision: https://phabricator.kde.org/D6617
+---
+ smb/kio_smb.h | 5 ++--
+ smb/kio_smb_browse.cpp | 67 ++++++++++++++++++++++++++++----------------------
+ 2 files changed, 40 insertions(+), 32 deletions(-)
+
+diff --git a/smb/kio_smb.h b/smb/kio_smb.h
+index a5cae11..a2a9343 100644
+--- a/smb/kio_smb.h
++++ b/smb/kio_smb.h
+@@ -156,10 +156,9 @@ protected:
+ * Description : Return a stat of given SMBUrl. Calls cache_stat and
+ * pack it in UDSEntry. UDSEntry will not be cleared
+ * Parameter : SMBUrl the url to stat
+- * ignore_errors do not call error(), but warning()
+- * Return : false if any error occurred (errno), else true
++ * Return : cache_stat() return code
+ */
+- bool browse_stat_path(const SMBUrl& url, UDSEntry& udsentry, bool ignore_errors);
++ int browse_stat_path(const SMBUrl& url, UDSEntry& udsentry);
+
+ /**
+ * Description : call smbc_stat and return stats of the url
+diff --git a/smb/kio_smb_browse.cpp b/smb/kio_smb_browse.cpp
+index 06ca60b..84bfdc2 100644
+--- a/smb/kio_smb_browse.cpp
++++ b/smb/kio_smb_browse.cpp
+@@ -55,8 +55,7 @@ int SMBSlave::cache_stat(const SMBUrl &url, struct stat* st )
+ }
+
+ //---------------------------------------------------------------------------
+-bool SMBSlave::browse_stat_path(const SMBUrl& _url, UDSEntry& udsentry, bool ignore_errors)
+- // Returns: true on success, false on failure
++int SMBSlave::browse_stat_path(const SMBUrl& _url, UDSEntry& udsentry)
+ {
+ SMBUrl url = _url;
+
+@@ -68,7 +67,7 @@ bool SMBSlave::browse_stat_path(const SMBUrl& _url, UDSEntry& udsentry, bool ign
+ qCDebug(KIO_SMB) << "mode: "<< st.st_mode;
+ warning(i18n("%1:\n"
+ "Unknown file type, neither directory or file.", url.toDisplayString()));
+- return false;
++ return EINVAL;
+ }
+
+ udsentry.insert(KIO::UDSEntry::UDS_FILE_TYPE, st.st_mode & S_IFMT);
+@@ -96,24 +95,8 @@ bool SMBSlave::browse_stat_path(const SMBUrl& _url, UDSEntry& udsentry, bool ign
+ udsentry.insert(KIO::UDSEntry::UDS_ACCESS_TIME, st.st_atime);
+ // No, st_ctime is not UDS_CREATION_TIME...
+ }
+- else
+- {
+- if (!ignore_errors) {
+- if (cacheStatErr == EPERM || cacheStatErr == EACCES)
+- if (checkPassword(url)) {
+- redirection( url );
+- return false;
+- }
+-
+- reportError(url, cacheStatErr);
+- } else if (cacheStatErr == ENOENT || cacheStatErr == ENOTDIR) {
+- warning(i18n("File does not exist: %1", url.url()));
+- }
+- qCDebug(KIO_SMB) << "ERROR!!";
+- return false;
+- }
+
+- return true;
++ return cacheStatErr;
+ }
+
+ //===========================================================================
+@@ -141,7 +124,7 @@ void SMBSlave::stat( const QUrl& kurl )
+ switch(m_current_url.getType())
+ {
+ case SMBURLTYPE_UNKNOWN:
+- error(ERR_MALFORMED_URL,m_current_url.toDisplayString());
++ error(ERR_MALFORMED_URL, url.toDisplayString());
+ return;
+
+ case SMBURLTYPE_ENTIRE_NETWORK:
+@@ -150,12 +133,38 @@ void SMBSlave::stat( const QUrl& kurl )
+ break;
+
+ case SMBURLTYPE_SHARE_OR_PATH:
+- if (browse_stat_path(m_current_url, udsentry, false))
++ {
++ int ret = browse_stat_path(m_current_url, udsentry);
++
++ if (ret == EPERM || ret == EACCES)
++ {
++ SMBUrl smbUrl(url);
++
++ if (checkPassword(smbUrl))
++ {
++ redirection(smbUrl);
++ finished();
++ }
++ else
++ {
++ reportError(url, ret);
++ }
++
++ return;
++ }
++ else if (ret == ENOENT || ret == ENOTDIR)
++ {
++ warning(i18n("File does not exist: %1", url.url()));
++ finished();
++ return;
++ }
++ else if (ret != 0)
++ {
++ qCDebug(KIO_SMB) << "stat() error" << ret << url;
++ reportError(url, ret);
++ return;
++ }
+ break;
+- else {
+- qCDebug(KIO_SMB) << "ERROR!!";
+- finished();
+- return;
+ }
+ default:
+ qCDebug(KIO_SMB) << "UNKNOWN " << url;
+@@ -366,7 +375,7 @@ void SMBSlave::listDir( const QUrl& kurl )
+ {
+ // Set stat information
+ m_current_url.addPath(dirpName);
+- browse_stat_path(m_current_url, udsentry, true);
++ browse_stat_path(m_current_url, udsentry);
+ m_current_url.cd("..");
+
+ // Call base class to list entry
+@@ -375,7 +384,7 @@ void SMBSlave::listDir( const QUrl& kurl )
+ else if(dirp->smbc_type == SMBC_DIR)
+ {
+ m_current_url.addPath(dirpName);
+- browse_stat_path(m_current_url, udsentry, true);
++ browse_stat_path(m_current_url, udsentry);
+ m_current_url.cd("..");
+
+ // Call base class to list entry
+@@ -446,7 +455,7 @@ void SMBSlave::listDir( const QUrl& kurl )
+ else
+ {
+ udsentry.insert(KIO::UDSEntry::UDS_NAME, ".");
+- browse_stat_path(m_current_url, udsentry, true);
++ browse_stat_path(m_current_url, udsentry);
+ }
+ listEntry(udsentry);
+ udsentry.clear();
+--
+cgit v0.11.2
--git a/kde-apps/kio-extras/kio-extras-17.04.3.ebuild b/kde-apps/kio-extras/kio-extras-17.04.3.ebuild
index ee1ee9235b..1747bb1725 100644
--- a/kde-apps/kio-extras/kio-extras-17.04.3.ebuild
+++ b/kde-apps/kio-extras/kio-extras-17.04.3.ebuild
@@ -66,6 +66,11 @@ DEPEND="${COMMON_DEPEND}
# requires running kde environment
RESTRICT+=" test"
+PATCHES=(
+ "${FILESDIR}/${P}-mtp.patch"
+ "${FILESDIR}/${P}-smb.patch"
+)
+
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package activities KF5Activities)
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/kio-extras/files/, kde-apps/kio-extras/
@ 2022-07-31 15:12 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2022-07-31 15:12 UTC (permalink / raw
To: gentoo-commits
commit: f4ca7e64ce2ed768bb1ff43d6a0ae9f2a7f8d330
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 28 19:23:36 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jul 31 15:09:13 2022 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f4ca7e64
kde-apps/kio-extras: Fix build with USE -X
Upstream commit b8dda4b3129f42323e1f6ccb37c16cb62a740d39
Bug: https://bugs.gentoo.org/813450
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
| 62 ++++++++++++++++++++++
| 4 +-
| 4 +-
3 files changed, 68 insertions(+), 2 deletions(-)
--git a/kde-apps/kio-extras/files/kio-extras-22.04.3-without_x11.patch b/kde-apps/kio-extras/files/kio-extras-22.04.3-without_x11.patch
new file mode 100644
index 0000000000..4c97ab5187
--- /dev/null
+++ b/kde-apps/kio-extras/files/kio-extras-22.04.3-without_x11.patch
@@ -0,0 +1,62 @@
+From b8dda4b3129f42323e1f6ccb37c16cb62a740d39 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 27 Nov 2021 14:07:32 +0100
+Subject: [PATCH] Add CMake option to build WITHOUT_X11
+
+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.
+
+-DCMAKE_DISABLE_FIND_PACKAGE_X11 will break if any dependencies list X11
+as required in their cmake config, also X11_FOUND could be set by
+cascading cmake dependencies.
+
+Introducing this option means there is no behavior change by default,
+cmake will just skip finding X11 or adding unwanted features if the
+option is enabled.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ thumbnail/CMakeLists.txt | 19 +++++++++++--------
+ 1 file changed, 11 insertions(+), 8 deletions(-)
+
+diff --git a/thumbnail/CMakeLists.txt b/thumbnail/CMakeLists.txt
+index f6f38992d..ee322a1bf 100644
+--- a/thumbnail/CMakeLists.txt
++++ b/thumbnail/CMakeLists.txt
+@@ -21,13 +21,16 @@ set_package_properties(libappimage PROPERTIES
+ PURPOSE "Provides support for AppImage thumbnails"
+ )
+
+-find_package(X11)
+-set_package_properties(X11 PROPERTIES
+- DESCRIPTION "X11 libraries"
+- URL "https://www.x.org"
+- TYPE OPTIONAL
+- PURPOSE "Provides support for XCursor thumbnails"
+-)
++option(WITHOUT_X11 "Build without support for XCursor thumbnails (disables finding X11)" OFF)
++if (NOT WITHOUT_X11)
++ find_package(X11)
++ set_package_properties(X11 PROPERTIES
++ DESCRIPTION "X11 libraries"
++ URL "https://www.x.org"
++ TYPE OPTIONAL
++ PURPOSE "Provides support for XCursor thumbnails"
++ )
++endif()
+
+ find_package(Taglib 1.11)
+ set_package_properties(Taglib PROPERTIES
+@@ -210,7 +213,7 @@ endif()
+
+ ########### next target ###############
+
+-if(X11_Xcursor_FOUND)
++if(X11_Xcursor_FOUND AND NOT WITHOUT_X11)
+
+ add_library(cursorthumbnail MODULE cursorcreator.cpp cursorcreatorplugin.cpp)
+
+--
+GitLab
+
--git a/kde-apps/kio-extras/kio-extras-22.07.80.ebuild b/kde-apps/kio-extras/kio-extras-22.07.80.ebuild
index e6f3cbd701..5b21318900 100644
--- a/kde-apps/kio-extras/kio-extras-22.07.80.ebuild
+++ b/kde-apps/kio-extras/kio-extras-22.07.80.ebuild
@@ -70,6 +70,8 @@ RDEPEND="${DEPEND}
"
BDEPEND="man? ( dev-util/gperf )"
+PATCHES=( "${FILESDIR}/${PN}-22.04.3-without_x11.patch" )
+
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package activities KF5Activities)
@@ -83,7 +85,7 @@ src_configure() {
$(cmake_use_find_package samba Samba)
$(cmake_use_find_package sftp libssh)
$(cmake_use_find_package taglib Taglib)
- $(cmake_use_find_package X X11)
+ -DWITHOUT_X11=$(usex !X)
)
use samba && mycmakeargs+=(
-DBUILD_KDSoapWSDiscoveryClient=OFF # disable bundled stuff
--git a/kde-apps/kio-extras/kio-extras-22.08.49.9999.ebuild b/kde-apps/kio-extras/kio-extras-22.08.49.9999.ebuild
index dbdf736e08..fd4e30eb56 100644
--- a/kde-apps/kio-extras/kio-extras-22.08.49.9999.ebuild
+++ b/kde-apps/kio-extras/kio-extras-22.08.49.9999.ebuild
@@ -70,6 +70,8 @@ RDEPEND="${DEPEND}
"
BDEPEND="man? ( dev-util/gperf )"
+PATCHES=( "${FILESDIR}/${PN}-22.04.3-without_x11.patch" )
+
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package activities KF5Activities)
@@ -83,7 +85,7 @@ src_configure() {
$(cmake_use_find_package samba Samba)
$(cmake_use_find_package sftp libssh)
$(cmake_use_find_package taglib Taglib)
- $(cmake_use_find_package X X11)
+ -DWITHOUT_X11=$(usex !X)
)
use samba && mycmakeargs+=(
-DBUILD_KDSoapWSDiscoveryClient=OFF # disable bundled stuff
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-07-31 15:12 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-07-12 20:34 [gentoo-commits] proj/kde:master commit in: kde-apps/kio-extras/files/, kde-apps/kio-extras/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2022-07-31 15:12 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox