* [gentoo-commits] repo/gentoo:master commit in: kde-apps/kio-extras/, kde-apps/kio-extras/files/
@ 2019-11-14 15:59 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2019-11-14 15:59 UTC (permalink / raw
To: gentoo-commits
commit: 41981aa42bc2b74bda500ee77c055c46ee6e57b7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 14 13:11:22 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Nov 14 15:59:32 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41981aa4
kde-apps/kio-extras: Fix build against >=net-libs/libssh-0.9.2
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
| 88 ++++++++++++++++++++++
| 19 +++--
2 files changed, 99 insertions(+), 8 deletions(-)
--git a/kde-apps/kio-extras/files/kio-extras-19.08.3-libssh-0.9.2.patch b/kde-apps/kio-extras/files/kio-extras-19.08.3-libssh-0.9.2.patch
new file mode 100644
index 00000000000..b133140ac26
--- /dev/null
+++ b/kde-apps/kio-extras/files/kio-extras-19.08.3-libssh-0.9.2.patch
@@ -0,0 +1,88 @@
+From 24506c2af8d1904a99538543804306c6c2b81ca2 Mon Sep 17 00:00:00 2001
+From: Harald Sitter <sitter@kde.org>
+Date: Wed, 6 Nov 2019 13:57:20 +0100
+Subject: make the libssh finder ensure the new ssh target is set
+
+Summary:
+starting with 0.9.2 the libssh cmake config defines a new ssh imported
+target, use this as the new gold standard and ensure older versions
+are compatible
+
+broken ubuntu: no cmake config -> manual finder -> target injected
+0.9.0 and earlier: cmake config -> target injected
+0.9.2: cmake config -> target already defined; noop
+
+(0.9.1 is broken as it neither matches the old nor the new expectation)
+
+Test Plan:
+no cmake config -> target injected
+older cmake config -> target injected
+newer cmake config (with merge request) -> noop
+
+Subscribers: kde-frameworks-devel, kfm-devel
+
+Tags: #dolphin, #frameworks
+
+Differential Revision: https://phabricator.kde.org/D25170
+---
+ cmake/Findlibssh.cmake | 18 ++++++++++++++++++
+ sftp/CMakeLists.txt | 2 +-
+ 2 files changed, 19 insertions(+), 1 deletion(-)
+
+diff --git a/cmake/Findlibssh.cmake b/cmake/Findlibssh.cmake
+index bf6d797..f37846f 100644
+--- a/cmake/Findlibssh.cmake
++++ b/cmake/Findlibssh.cmake
+@@ -32,6 +32,19 @@
+ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ # SUCH DAMAGE.
+
++# Define an imported target to have compatibility with newer libssh and so
++# we have a single target to use regardless of the code path taken in the
++# finder and the actual libssh version defining the target.
++macro(libssh_ensure_imported_target)
++ if(NOT TARGET ssh)
++ add_library(ssh SHARED IMPORTED)
++ set_target_properties(ssh PROPERTIES
++ IMPORTED_LOCATION "${LIBSSH_LIBRARIES}"
++ INTERFACE_INCLUDE_DIRECTORIES "${LIBSSH_INCLUDE_DIR}"
++ )
++ endif()
++endmacro()
++
+ # We prefer the config, but on Ubuntu 18.04 LTS (and to some extent later
+ # versions it seems) they've not packaged the config properly. So, go for the
+ # config by default and fall back to manual lookup iff the config was not found.
+@@ -39,6 +52,9 @@
+ # https://bugs.launchpad.net/ubuntu/+source/libssh/+bug/1800135
+ find_package(libssh ${libssh_FIND_VERSION} NO_MODULE QUIET)
+ if(libssh_FOUND)
++ # Certain versions with config may not have the target, so make sure it's
++ # defined.
++ libssh_ensure_imported_target()
+ return()
+ endif()
+
+@@ -109,5 +125,7 @@ find_package_handle_standard_args(libssh
+ VERSION_VAR
+ LIBSSH_VERSION)
+
++libssh_ensure_imported_target()
++
+ # show the LIBSSH_INCLUDE_DIRS and LIBSSH_LIBRARIES variables only in the advanced view
+ mark_as_advanced(LIBSSH_INCLUDE_DIR LIBSSH_LIBRARIES)
+diff --git a/sftp/CMakeLists.txt b/sftp/CMakeLists.txt
+index cd09cd3..5d1eccb 100644
+--- a/sftp/CMakeLists.txt
++++ b/sftp/CMakeLists.txt
+@@ -22,7 +22,7 @@ target_link_libraries(kio_sftp
+ KF5::WidgetsAddons # KMessageBox
+ KF5::I18n
+ Qt5::Network
+- ${LIBSSH_LIBRARIES})
++ ssh)
+ set_target_properties(kio_sftp PROPERTIES OUTPUT_NAME "sftp")
+
+ install(TARGETS kio_sftp DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/kio)
+--
+cgit v1.1
--git a/kde-apps/kio-extras/kio-extras-19.08.3.ebuild b/kde-apps/kio-extras/kio-extras-19.08.3.ebuild
index 5e1cd88821f..8b8ae07f60d 100644
--- a/kde-apps/kio-extras/kio-extras-19.08.3.ebuild
+++ b/kde-apps/kio-extras/kio-extras-19.08.3.ebuild
@@ -5,13 +5,14 @@ EAPI=7
ECM_HANDBOOK="forceoptional"
ECM_TEST="optional"
-VIRTUALX_REQUIRED="test"
KFMIN=5.60.0
QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
inherit ecm kde.org
DESCRIPTION="KIO plugins present a filesystem-like view of arbitrary data"
HOMEPAGE="https://cgit.kde.org/kio-extras.git"
+
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
@@ -21,6 +22,12 @@ BDEPEND="
man? ( dev-util/gperf )
"
DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
>=kde-frameworks/karchive-${KFMIN}:5[bzip2,lzma]
>=kde-frameworks/kbookmarks-${KFMIN}:5
>=kde-frameworks/kcodecs-${KFMIN}:5
@@ -39,15 +46,9 @@ DEPEND="
>=kde-frameworks/kxmlgui-${KFMIN}:5
>=kde-frameworks/solid-${KFMIN}:5
>=kde-frameworks/syntax-highlighting-${KFMIN}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
activities? (
- >=kde-frameworks/kactivities-${KFMIN}:5
>=dev-qt/qtsql-${QTMIN}:5
+ >=kde-frameworks/kactivities-${KFMIN}:5
)
man? ( >=kde-frameworks/khtml-${KFMIN}:5 )
mtp? ( >=media-libs/libmtp-1.1.16:= )
@@ -64,6 +65,8 @@ RDEPEND="${DEPEND}
# requires running kde environment
RESTRICT+=" test"
+PATCHES=( "${FILESDIR}/${P}-libssh-0.9.2.patch" )
+
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package activities KF5Activities)
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/kio-extras/, kde-apps/kio-extras/files/
@ 2020-03-05 19:39 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2020-03-05 19:39 UTC (permalink / raw
To: gentoo-commits
commit: bba00d525e78de6dcfb59a6eee04a55a88fec0f2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 5 19:31:05 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 5 19:38:59 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bba00d52
kde-apps/kio-extras: Add USE nls
Upstream commit 1029148d9ca743ffa4ccff7dfd75069808de7953
Package-Manager: Portage-2.3.92, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
| 171 +++++++++++++++++++++
| 6 +-
2 files changed, 176 insertions(+), 1 deletion(-)
--git a/kde-apps/kio-extras/files/kio-extras-19.12.3-kio_nfs.patch b/kde-apps/kio-extras/files/kio-extras-19.12.3-kio_nfs.patch
new file mode 100644
index 00000000000..4bdf9af413a
--- /dev/null
+++ b/kde-apps/kio-extras/files/kio-extras-19.12.3-kio_nfs.patch
@@ -0,0 +1,171 @@
+From a0a7ccb17fbb702ebc9122015f40fa9b112cedc6 Mon Sep 17 00:00:00 2001
+From: Christophe Giboudeaux <christophe@krop.fr>
+Date: Tue, 27 Nov 2018 23:37:13 +0100
+Subject: [PATCH 1/2] Add FindTIRPC.cmake
+
+Taken from https://phabricator.kde.org/D12761
+---
+ cmake/FindTIRPC.cmake | 60 +++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 60 insertions(+)
+ create mode 100644 cmake/FindTIRPC.cmake
+
+diff --git a/cmake/FindTIRPC.cmake b/cmake/FindTIRPC.cmake
+new file mode 100644
+index 00000000..20e78f9f
+--- /dev/null
++++ b/cmake/FindTIRPC.cmake
+@@ -0,0 +1,60 @@
++# - Try to find TI-RPC
++#
++# The following variables will be available once found :
++#
++# TIRPC_INCLUDE_DIRS - The TI-RPC headers location
++# TIRPC_LIBRARIES - Link these to use TI-RPC
++# TIRPC_VERSION - The TIRPC version
++#
++#=============================================================================
++# Copyright (c) 2017 Christophe Giboudeaux <christophe@krop.fr>
++#
++#
++# Redistribution and use in source and binary forms, with or without
++# modification, are permitted provided that the following conditions
++# are met:
++#
++# 1. Redistributions of source code must retain the copyright
++# notice, this list of conditions and the following disclaimer.
++# 2. Redistributions in binary form must reproduce the copyright
++# notice, this list of conditions and the following disclaimer in the
++# documentation and/or other materials provided with the distribution.
++# 3. The name of the author may not be used to endorse or promote products
++# derived from this software without specific prior written permission.
++#
++# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
++# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
++# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
++# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
++# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
++# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
++# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
++# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
++# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++#=============================================================================
++
++find_package(PkgConfig QUIET)
++pkg_check_modules(PC_TIRPC libtirpc)
++
++find_path(TIRPC_INCLUDE_DIRS
++ NAMES netconfig.h
++ PATH_SUFFIXES tirpc
++ HINTS ${PC_TIRPC_INCLUDE_DIRS}
++)
++
++find_library(TIRPC_LIBRARIES
++ NAMES tirpc
++ HINTS ${PC_TIRPC_LIBRARY_DIRS}
++)
++
++set(TIRPC_VERSION ${PC_TIRPC_VERSION})
++
++include(FindPackageHandleStandardArgs)
++
++find_package_handle_standard_args(TIRPC
++ REQUIRED_VARS TIRPC_LIBRARIES TIRPC_INCLUDE_DIRS
++ VERSION_VAR TIRPC_VERSION
++)
++
++mark_as_advanced(TIRPC_INCLUDE_DIRS TIRPC_LIBRARIES)
+--
+2.25.1
+
+
+From 7cd0142ada663ac1bfcf4926f80f7ac53ccfb37c Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 27 Nov 2018 23:43:18 +0100
+Subject: [PATCH 2/2] Build kio_nfs against standalone libtirpc
+
+Summary:
+Since glibc-2.26, cmake skipped over nfs when standalone tirpc
+was installed in tirpc subdir (as done by Debian, Fedora, Arch, Gentoo...)
+
+Use FindTIRPC and make kio_nfs optional that way
+FindTIRPC taken from https://phabricator.kde.org/D12761
+
+Test Plan: Built with libtirpc successfully.
+
+Reviewers: #dolphin, dfaure, rdieter, sitter
+
+Subscribers: kde-frameworks-devel, cgiboudeaux, arojas, kfm-devel, meven
+
+Tags: #dolphin, #frameworks
+
+Differential Revision: https://phabricator.kde.org/D17205
+---
+ CMakeLists.txt | 9 ++++++---
+ nfs/CMakeLists.txt | 15 +++++++++------
+ 2 files changed, 15 insertions(+), 9 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 347caaad..37d56b3f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -134,6 +134,11 @@ if(UNIX)
+ set_package_properties(Gperf PROPERTIES TYPE OPTIONAL
+ PURPOSE "Needed to build the man kioslave"
+ )
++
++ find_package(TIRPC)
++ set_package_properties(TIRPC PROPERTIES TYPE OPTIONAL
++ PURPOSE "Needed to build the NFS kioslave"
++ )
+ else()
+ # FIXME: on windows we ignore support until trash gets integrated
+ endif()
+@@ -178,9 +183,7 @@ if(NOT WIN32)
+ if(Gperf_FOUND)
+ add_subdirectory( man )
+ endif()
+- check_include_files(rpc/rpc.h HAVE_RPC_RPC_H)
+- add_feature_info("NFS kioslave" HAVE_RPC_RPC_H "The RPC library is needed to build the NFS kioslave")
+- if(HAVE_RPC_RPC_H)
++ if(TIRPC_FOUND)
+ add_subdirectory( nfs )
+ endif()
+ endif()
+diff --git a/nfs/CMakeLists.txt b/nfs/CMakeLists.txt
+index 6436e0d1..7189b25a 100644
+--- a/nfs/CMakeLists.txt
++++ b/nfs/CMakeLists.txt
+@@ -1,10 +1,12 @@
+ ## Check for XDR functions
+-include(CheckFunctionExists)
++include(CheckCXXSymbolExists)
+
+-CHECK_FUNCTION_EXISTS(xdr_u_int64_t HAVE_XDR_U_INT64_T)
+-CHECK_FUNCTION_EXISTS(xdr_uint64_t HAVE_XDR_UINT64_T)
+-CHECK_FUNCTION_EXISTS(xdr_u_hyper HAVE_XDR_U_HYPER)
+-CHECK_FUNCTION_EXISTS(xdr_u_longlong_t HAVE_XDR_U_LONGLONG_T)
++set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${TIRPC_LIBRARIES})
++set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${TIRPC_INCLUDE_DIRS})
++check_cxx_symbol_exists(xdr_u_int64_t "rpc/xdr.h" HAVE_XDR_U_INT64_T)
++check_cxx_symbol_exists(xdr_uint64_t "rpc/xdr.h" HAVE_XDR_UINT64_T)
++check_cxx_symbol_exists(xdr_u_hyper "rpc/xdr.h" HAVE_XDR_U_HYPER)
++check_cxx_symbol_exists(xdr_u_longlong_t "rpc/xdr.h" HAVE_XDR_U_LONGLONG_T)
+
+ if (NOT HAVE_XDR_U_INT64_T AND NOT HAVE_XDR_UINT64_T AND NOT HAVE_XDR_U_HYPER AND NOT HAVE_XDR_U_LONGLONG_T)
+ message(FATAL_ERROR "Could not find 64-bit XDR datatype functions!")
+@@ -24,9 +26,10 @@ if (HAVE_XDR_U_LONGLONG_T)
+ endif (HAVE_XDR_U_LONGLONG_T)
+
+ add_definitions(-DTRANSLATION_DOMAIN=\"kio5_nfs\")
++include_directories(${TIRPC_INCLUDE_DIRS})
+
+ add_library(kio_nfs MODULE kio_nfs.cpp nfsv2.cpp nfsv3.cpp rpc_nfs3_prot_xdr.c rpc_nfs2_prot_xdr.c)
+-target_link_libraries(kio_nfs KF5::KIOCore KF5::I18n Qt5::Network)
++target_link_libraries(kio_nfs KF5::KIOCore KF5::I18n Qt5::Network ${TIRPC_LIBRARIES})
+ set_target_properties(kio_nfs PROPERTIES OUTPUT_NAME "nfs")
+
+ install(TARGETS kio_nfs DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/kio)
+--
+2.25.1
+
--git a/kde-apps/kio-extras/kio-extras-19.12.3.ebuild b/kde-apps/kio-extras/kio-extras-19.12.3.ebuild
index dac7d525141..53ffdb067ac 100644
--- a/kde-apps/kio-extras/kio-extras-19.12.3.ebuild
+++ b/kde-apps/kio-extras/kio-extras-19.12.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://cgit.kde.org/kio-extras.git"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="activities +man mtp openexr phonon samba +sftp taglib"
+IUSE="activities +man mtp nls openexr phonon samba +sftp taglib"
BDEPEND="
man? ( dev-util/gperf )
@@ -52,6 +52,7 @@ DEPEND="
>=dev-qt/qtsql-${QTMIN}:5
)
mtp? ( >=media-libs/libmtp-1.1.16:= )
+ nls? ( net-libs/libtirpc:= )
openexr? ( media-libs/openexr:= )
phonon? ( media-libs/phonon[qt5(+)] )
samba? ( net-fs/samba[client] )
@@ -65,12 +66,15 @@ RDEPEND="${DEPEND}
# requires running kde environment
RESTRICT+=" test"
+PATCHES=( "${FILESDIR}/${P}-kio_nfs.patch" )
+
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package activities KF5Activities)
$(cmake_use_find_package activities KF5ActivitiesStats)
$(cmake_use_find_package man Gperf)
$(cmake_use_find_package mtp Mtp)
+ $(cmake_use_find_package nls TIRPC)
$(cmake_use_find_package openexr OpenEXR)
$(cmake_use_find_package phonon Phonon4Qt5)
$(cmake_use_find_package samba Samba)
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/kio-extras/, kde-apps/kio-extras/files/
@ 2021-05-30 11:37 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2021-05-30 11:37 UTC (permalink / raw
To: gentoo-commits
commit: 78070035d19deec11ddfe97230230f38b8818144
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 30 11:05:04 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 30 11:37:37 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78070035
kde-apps/kio-extras: thumbnail: Check shm size before writing to it
Upstream commit a288a7ba4283b2102a4602aa105072f33bc25645
See also: https://invent.kde.org/network/kio-extras/-/merge_requests/92
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=430862
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
| 44 ++++++++++
| 95 ++++++++++++++++++++++
| 95 ++++++++++++++++++++++
3 files changed, 234 insertions(+)
--git a/kde-apps/kio-extras/files/kio-extras-20.12.3-thumbnail-check-shm-size.patch b/kde-apps/kio-extras/files/kio-extras-20.12.3-thumbnail-check-shm-size.patch
new file mode 100644
index 00000000000..ef53e0fc3f6
--- /dev/null
+++ b/kde-apps/kio-extras/files/kio-extras-20.12.3-thumbnail-check-shm-size.patch
@@ -0,0 +1,44 @@
+From a288a7ba4283b2102a4602aa105072f33bc25645 Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fabian@ritter-vogt.de>
+Date: Tue, 4 May 2021 20:52:59 +0200
+Subject: [PATCH] thumbnail: Check shm size before writing to it
+
+The SHM is created by the application, which might've done a different size
+calculation. Verify that the data fits instead of writing past the end and
+crashing.
+
+CCBUG: 430862
+
+
+(cherry picked from commit 112b67ae7895bdc4f32d851c09a4d6baecbb6666)
+---
+ thumbnail/thumbnail.cpp | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/thumbnail/thumbnail.cpp b/thumbnail/thumbnail.cpp
+index 6b133323..afdb088e 100644
+--- a/thumbnail/thumbnail.cpp
++++ b/thumbnail/thumbnail.cpp
+@@ -288,14 +288,15 @@ void ThumbnailProtocol::get(const QUrl &url)
+ error(KIO::ERR_INTERNAL, i18n("Failed to attach to shared memory segment %1", shmid));
+ return;
+ }
+- if (img.width() * img.height() > m_width * m_height) {
++ if( img.format() != QImage::Format_ARGB32 ) { // KIO::PreviewJob and this code below completely ignores colortable :-/,
++ img = img.convertToFormat(QImage::Format_ARGB32); // so make sure there is none
++ }
++ struct shmid_ds shmStat;
++ if (shmctl(shmid.toInt(), IPC_STAT, &shmStat) == -1 || shmStat.shm_segsz < img.sizeInBytes()) {
+ error(KIO::ERR_INTERNAL, i18n("Image is too big for the shared memory segment"));
+ shmdt((char*)shmaddr);
+ return;
+ }
+- if( img.format() != QImage::Format_ARGB32 ) { // KIO::PreviewJob and this code below completely ignores colortable :-/,
+- img = img.convertToFormat(QImage::Format_ARGB32); // so make sure there is none
+- }
+ // Keep in sync with kdelibs/kio/kio/previewjob.cpp
+ stream << img.width() << img.height() << quint8(img.format());
+ memcpy(shmaddr, img.bits(), img.sizeInBytes());
+--
+GitLab
+
--git a/kde-apps/kio-extras/kio-extras-20.12.3-r1.ebuild b/kde-apps/kio-extras/kio-extras-20.12.3-r1.ebuild
new file mode 100644
index 00000000000..1ca9d48fb3a
--- /dev/null
+++ b/kde-apps/kio-extras/kio-extras-20.12.3-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="optional"
+KFMIN=5.75.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KIO plugins present a filesystem-like view of arbitrary data"
+HOMEPAGE="https://invent.kde.org/network/kio-extras"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="activities +man mtp nfs openexr phonon samba +sftp taglib X"
+
+# requires running Plasma environment
+RESTRICT+=" test"
+
+DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=kde-frameworks/karchive-${KFMIN}:5
+ >=kde-frameworks/kbookmarks-${KFMIN}:5
+ >=kde-frameworks/kcodecs-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5
+ >=kde-frameworks/kdnssd-${KFMIN}:5
+ >=kde-frameworks/kguiaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kparts-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ >=kde-frameworks/solid-${KFMIN}:5
+ >=kde-frameworks/syntax-highlighting-${KFMIN}:5
+ activities? (
+ >=dev-qt/qtsql-${QTMIN}:5
+ >=kde-frameworks/kactivities-${KFMIN}:5
+ >=kde-frameworks/kactivities-stats-${KFMIN}:5
+ )
+ mtp? ( >=media-libs/libmtp-1.1.16:= )
+ nfs? ( net-libs/libtirpc:= )
+ openexr? ( media-libs/openexr:= )
+ phonon? ( >=media-libs/phonon-4.11.0 )
+ samba? (
+ net-fs/samba[client]
+ net-libs/kdsoap:=
+ net-libs/kdsoap-ws-discovery-client
+ )
+ sftp? ( net-libs/libssh:=[sftp] )
+ taglib? ( >=media-libs/taglib-1.11.1 )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXcursor
+ )
+"
+RDEPEND="${DEPEND}
+ >=kde-frameworks/kded-${KFMIN}:5
+"
+BDEPEND="man? ( dev-util/gperf )"
+
+PATCHES=( "${FILESDIR}"/${P}-thumbnail-check-shm-size.patch ) # KDE-bug 430862
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package activities KF5Activities)
+ $(cmake_use_find_package activities KF5ActivitiesStats)
+ $(cmake_use_find_package man Gperf)
+ $(cmake_use_find_package mtp Mtp)
+ $(cmake_use_find_package nfs TIRPC)
+ $(cmake_use_find_package openexr OpenEXR)
+ $(cmake_use_find_package phonon Phonon4Qt5)
+ $(cmake_use_find_package samba Samba)
+ $(cmake_use_find_package sftp libssh)
+ $(cmake_use_find_package taglib Taglib)
+ $(cmake_use_find_package X X11)
+ )
+ use samba && mycmakeargs+=(
+ -DBUILD_KDSoapWSDiscoveryClient=OFF # disable bundled stuff
+ )
+
+ ecm_src_configure
+}
--git a/kde-apps/kio-extras/kio-extras-21.04.1-r1.ebuild b/kde-apps/kio-extras/kio-extras-21.04.1-r1.ebuild
new file mode 100644
index 00000000000..16b5e1d74f4
--- /dev/null
+++ b/kde-apps/kio-extras/kio-extras-21.04.1-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="optional"
+KFMIN=5.80.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KIO plugins present a filesystem-like view of arbitrary data"
+HOMEPAGE="https://invent.kde.org/network/kio-extras"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="activities +man mtp nfs openexr phonon samba +sftp taglib X"
+
+# requires running Plasma environment
+RESTRICT+=" test"
+
+DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=kde-frameworks/karchive-${KFMIN}:5
+ >=kde-frameworks/kbookmarks-${KFMIN}:5
+ >=kde-frameworks/kcodecs-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5
+ >=kde-frameworks/kdnssd-${KFMIN}:5
+ >=kde-frameworks/kguiaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kparts-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ >=kde-frameworks/solid-${KFMIN}:5
+ >=kde-frameworks/syntax-highlighting-${KFMIN}:5
+ activities? (
+ >=dev-qt/qtsql-${QTMIN}:5
+ >=kde-frameworks/kactivities-${KFMIN}:5
+ >=kde-frameworks/kactivities-stats-${KFMIN}:5
+ )
+ mtp? ( >=media-libs/libmtp-1.1.16:= )
+ nfs? ( net-libs/libtirpc:= )
+ openexr? ( media-libs/openexr:= )
+ phonon? ( >=media-libs/phonon-4.11.0 )
+ samba? (
+ net-fs/samba[client]
+ net-libs/kdsoap:=
+ net-libs/kdsoap-ws-discovery-client
+ )
+ sftp? ( net-libs/libssh:=[sftp] )
+ taglib? ( >=media-libs/taglib-1.11.1 )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXcursor
+ )
+"
+RDEPEND="${DEPEND}
+ >=kde-frameworks/kded-${KFMIN}:5
+"
+BDEPEND="man? ( dev-util/gperf )"
+
+PATCHES=( "${FILESDIR}"/${PN}-20.12.3-thumbnail-check-shm-size.patch ) # KDE-bug 430862
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package activities KF5Activities)
+ $(cmake_use_find_package activities KF5ActivitiesStats)
+ $(cmake_use_find_package activities Qt5Sql)
+ $(cmake_use_find_package man Gperf)
+ $(cmake_use_find_package mtp Mtp)
+ $(cmake_use_find_package nfs TIRPC)
+ $(cmake_use_find_package openexr OpenEXR)
+ $(cmake_use_find_package phonon Phonon4Qt5)
+ $(cmake_use_find_package samba Samba)
+ $(cmake_use_find_package sftp libssh)
+ $(cmake_use_find_package taglib Taglib)
+ $(cmake_use_find_package X X11)
+ )
+ use samba && mycmakeargs+=(
+ -DBUILD_KDSoapWSDiscoveryClient=OFF # disable bundled stuff
+ )
+
+ ecm_src_configure
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/kio-extras/, kde-apps/kio-extras/files/
@ 2021-10-20 13:53 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2021-10-20 13:53 UTC (permalink / raw
To: gentoo-commits
commit: 2ed9b8f4bd6dcb9ae88c6d3dcd63f4ff5861d18c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 16 21:32:46 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Oct 20 13:25:56 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ed9b8f4
kde-apps/kio-extras: Fix kio-mtp with >=media-libs/libmtp-1.1.19
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
| 26 ++++++
| 102 +++++++++++++++++++++
2 files changed, 128 insertions(+)
--git a/kde-apps/kio-extras/files/kio-extras-21.04.3-libmtp-0.1.19.patch b/kde-apps/kio-extras/files/kio-extras-21.04.3-libmtp-0.1.19.patch
new file mode 100644
index 00000000000..400fdd85965
--- /dev/null
+++ b/kde-apps/kio-extras/files/kio-extras-21.04.3-libmtp-0.1.19.patch
@@ -0,0 +1,26 @@
+From a6ecc8855a0a2a8f76234f77422940b863960944 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Sat, 2 Oct 2021 12:53:27 +0200
+Subject: [PATCH] Fix kio-mtp with libmtp 1.1.19
+
+In libmtp 1.1.19, an empty string is returned instead of NULL for devices without a deviceName, which breaks accessing those devices with kio-mtp
+---
+ mtp/kiod_module/mtpdevice.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mtp/kiod_module/mtpdevice.cpp b/mtp/kiod_module/mtpdevice.cpp
+index 8fe4abb2..f32cd1a4 100644
+--- a/mtp/kiod_module/mtpdevice.cpp
++++ b/mtp/kiod_module/mtpdevice.cpp
+@@ -40,7 +40,7 @@ MTPDevice::MTPDevice(const QString &dbusObjectPath, LIBMTP_mtpdevice_t *device,
+ const char *deviceModel = LIBMTP_Get_Modelname(device);
+
+ // prefer friendly devicename over model
+- if (!deviceName) {
++ if (!deviceName || strlen(deviceName) == 0) {
+ m_friendlyName = QString::fromUtf8(deviceModel);
+ } else {
+ m_friendlyName = QString::fromUtf8(deviceName);
+--
+GitLab
+
--git a/kde-apps/kio-extras/kio-extras-21.04.3-r3.ebuild b/kde-apps/kio-extras/kio-extras-21.04.3-r3.ebuild
new file mode 100644
index 00000000000..8814d0c4cb6
--- /dev/null
+++ b/kde-apps/kio-extras/kio-extras-21.04.3-r3.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="optional"
+KFMIN=5.80.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KIO plugins present a filesystem-like view of arbitrary data"
+HOMEPAGE="https://invent.kde.org/network/kio-extras"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="activities +man mtp nfs openexr phonon samba +sftp taglib X"
+
+# requires running Plasma environment
+RESTRICT+=" test"
+
+DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=kde-frameworks/karchive-${KFMIN}:5
+ >=kde-frameworks/kbookmarks-${KFMIN}:5
+ >=kde-frameworks/kcodecs-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5
+ >=kde-frameworks/kdnssd-${KFMIN}:5
+ >=kde-frameworks/kguiaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kparts-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ >=kde-frameworks/solid-${KFMIN}:5
+ >=kde-frameworks/syntax-highlighting-${KFMIN}:5
+ activities? (
+ >=dev-qt/qtsql-${QTMIN}:5
+ >=kde-frameworks/kactivities-${KFMIN}:5
+ >=kde-frameworks/kactivities-stats-${KFMIN}:5
+ )
+ mtp? ( >=media-libs/libmtp-1.1.16:= )
+ nfs? ( net-libs/libtirpc:= )
+ openexr? ( media-libs/openexr:* )
+ phonon? ( >=media-libs/phonon-4.11.0 )
+ samba? (
+ net-fs/samba[client]
+ net-libs/kdsoap:=
+ net-libs/kdsoap-ws-discovery-client
+ )
+ sftp? ( net-libs/libssh:=[sftp] )
+ taglib? ( >=media-libs/taglib-1.11.1 )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXcursor
+ )
+"
+RDEPEND="${DEPEND}
+ >=kde-frameworks/kded-${KFMIN}:5
+"
+BDEPEND="man? ( dev-util/gperf )"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-libmtp-0.1.19.patch
+)
+
+src_prepare() {
+ ecm_src_prepare
+ cmake_comment_add_subdirectory network
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package activities KF5Activities)
+ $(cmake_use_find_package activities KF5ActivitiesStats)
+ $(cmake_use_find_package activities Qt5Sql)
+ $(cmake_use_find_package man Gperf)
+ $(cmake_use_find_package mtp Mtp)
+ $(cmake_use_find_package nfs TIRPC)
+ $(cmake_use_find_package openexr OpenEXR)
+ $(cmake_use_find_package phonon Phonon4Qt5)
+ $(cmake_use_find_package samba Samba)
+ $(cmake_use_find_package sftp libssh)
+ $(cmake_use_find_package taglib Taglib)
+ $(cmake_use_find_package X X11)
+ )
+ use samba && mycmakeargs+=(
+ -DBUILD_KDSoapWSDiscoveryClient=OFF # disable bundled stuff
+ )
+
+ ecm_src_configure
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/kio-extras/, kde-apps/kio-extras/files/
@ 2021-10-20 13:53 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2021-10-20 13:53 UTC (permalink / raw
To: gentoo-commits
commit: 19a0f717d4322e58473f4e8aea88521fd158abf6
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 16 21:58:32 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Oct 20 13:25:57 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19a0f717
kde-apps/kio-extras: Fix kio_filenamesearch crash
Reported-by: Eric F. Garioud <eric-f.garioud <AT> wanadoo.fr>
Bug: https://bugs.gentoo.org/817008
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
| 36 ++++++++++++++++++++++
| 1 +
| 15 +++------
3 files changed, 42 insertions(+), 10 deletions(-)
--git a/kde-apps/kio-extras/files/kio-extras-21.04.3-kio_filenamesearch-crash.patch b/kde-apps/kio-extras/files/kio-extras-21.04.3-kio_filenamesearch-crash.patch
new file mode 100644
index 00000000000..dff398e68a2
--- /dev/null
+++ b/kde-apps/kio-extras/files/kio-extras-21.04.3-kio_filenamesearch-crash.patch
@@ -0,0 +1,36 @@
+From 5dff395ecea2977cf149c293c16c4d4a5151493b Mon Sep 17 00:00:00 2001
+From: Ahmad Samir <a.samirh78@gmail.com>
+Date: Fri, 9 Jul 2021 17:11:02 +0200
+Subject: [PATCH] kio_filenamesearch: fix crash due to KCoreDirLister changes
+
+Error reporting was changed in KCoreDirlister, to match the original behaviour
+we need to explicitly disable auto error handling.
+
+This fixes a crash while searching in Dolphin, kio_filenamesearch intrenally
+uses a dirlister, and a nested event loop, if there is an error while listing
+some dir it tries to report it using a job ui delegate, but the parent job
+could well be dead by that time, which causes a crash:
+"QWidget: Cannot create a QWidget without QApplication"
+
+Note that this crash only happens if KDE_FORK_SLAVES is _not_ set.
+
+BUG: 438187
+---
+ filenamesearch/kio_filenamesearch.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/filenamesearch/kio_filenamesearch.cpp b/filenamesearch/kio_filenamesearch.cpp
+index 4d15aac2..5651a025 100644
+--- a/filenamesearch/kio_filenamesearch.cpp
++++ b/filenamesearch/kio_filenamesearch.cpp
+@@ -102,6 +102,7 @@ void FileNameSearchProtocol::searchDirectory(const QUrl &directory,
+ QScopedPointer<KCoreDirLister> dirLister(new KCoreDirLister);
+ dirLister->setDelayedMimeTypes(true);
+ dirLister->openUrl(directory);
++ dirLister->setAutoErrorHandlingEnabled(false);
+
+ QEventLoop eventLoop;
+ QObject::connect(dirLister.data(), static_cast<void(KCoreDirLister::*)()>(&KCoreDirLister::canceled),
+--
+GitLab
+
--git a/kde-apps/kio-extras/kio-extras-21.04.3-r3.ebuild b/kde-apps/kio-extras/kio-extras-21.04.3-r3.ebuild
index 8814d0c4cb6..b23dee6554d 100644
--- a/kde-apps/kio-extras/kio-extras-21.04.3-r3.ebuild
+++ b/kde-apps/kio-extras/kio-extras-21.04.3-r3.ebuild
@@ -72,6 +72,7 @@ BDEPEND="man? ( dev-util/gperf )"
PATCHES=(
"${FILESDIR}"/${P}-libmtp-0.1.19.patch
+ "${FILESDIR}"/${P}-kio_filenamesearch-crash.patch # bug 817008
)
src_prepare() {
diff --git a/kde-apps/kio-extras/kio-extras-21.04.3-r3.ebuild b/kde-apps/kio-extras/kio-extras-21.08.2-r1.ebuild
similarity index 93%
copy from kde-apps/kio-extras/kio-extras-21.04.3-r3.ebuild
copy to kde-apps/kio-extras/kio-extras-21.08.2-r1.ebuild
index 8814d0c4cb6..79248e2a040 100644
--- a/kde-apps/kio-extras/kio-extras-21.04.3-r3.ebuild
+++ b/kde-apps/kio-extras/kio-extras-21.08.2-r1.ebuild
@@ -1,11 +1,11 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ECM_HANDBOOK="forceoptional"
ECM_TEST="optional"
-KFMIN=5.80.0
+KFMIN=5.84.0
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
@@ -19,7 +19,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
IUSE="activities +man mtp nfs openexr phonon samba +sftp taglib X"
# requires running Plasma environment
-RESTRICT+=" test"
+RESTRICT="test"
DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
@@ -71,21 +71,16 @@ RDEPEND="${DEPEND}
BDEPEND="man? ( dev-util/gperf )"
PATCHES=(
- "${FILESDIR}"/${P}-libmtp-0.1.19.patch
+ "${FILESDIR}"/${PN}-21.04.3-kio_filenamesearch-crash.patch # bug 817008
)
-src_prepare() {
- ecm_src_prepare
- cmake_comment_add_subdirectory network
-}
-
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package activities KF5Activities)
$(cmake_use_find_package activities KF5ActivitiesStats)
$(cmake_use_find_package activities Qt5Sql)
$(cmake_use_find_package man Gperf)
- $(cmake_use_find_package mtp Mtp)
+ $(cmake_use_find_package mtp Libmtp)
$(cmake_use_find_package nfs TIRPC)
$(cmake_use_find_package openexr OpenEXR)
$(cmake_use_find_package phonon Phonon4Qt5)
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/kio-extras/, kde-apps/kio-extras/files/
@ 2022-08-06 7:45 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2022-08-06 7:45 UTC (permalink / raw
To: gentoo-commits
commit: b56ec81c56cd13fca4f34fc632d275560c5c4dbe
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 27 13:10:40 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 6 07:26:46 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b56ec81c
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 +-
2 files changed, 65 insertions(+), 1 deletion(-)
--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 000000000000..4c97ab5187c6
--- /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.04.3.ebuild b/kde-apps/kio-extras/kio-extras-22.04.3.ebuild
index abf5c1450dcd..dd98f82228bd 100644
--- a/kde-apps/kio-extras/kio-extras-22.04.3.ebuild
+++ b/kde-apps/kio-extras/kio-extras-22.04.3.ebuild
@@ -70,6 +70,8 @@ RDEPEND="${DEPEND}
"
BDEPEND="man? ( dev-util/gperf )"
+PATCHES=( "${FILESDIR}/${P}-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] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/kio-extras/, kde-apps/kio-extras/files/
@ 2023-12-17 23:02 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2023-12-17 23:02 UTC (permalink / raw
To: gentoo-commits
commit: 8977b6200d197d1177c564c39b70fecca42bdeb7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 17 12:24:56 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 17 23:00:50 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8977b620
kde-apps/kio-extras: add 24.01.80
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
| 1 +
| 11 +++
| 96 ++++++++++++++++++++++
| 1 +
4 files changed, 109 insertions(+)
--git a/kde-apps/kio-extras/Manifest b/kde-apps/kio-extras/Manifest
index 173eb0b66979..a534031445c6 100644
--- a/kde-apps/kio-extras/Manifest
+++ b/kde-apps/kio-extras/Manifest
@@ -1,3 +1,4 @@
DIST kio-extras-23.04.3.tar.xz 1427552 BLAKE2B d6888d161f1680f098b0b0d7ed4f911386f35e07338a78ffb5e23db75370a2e9b59a0271956f7085b84a850945719bc608548b4698aab3c35aa2882616bfba4e SHA512 f44a74a43b7b3cc54811405e6e671cc50754d054ef8e0456f2ab54f57178b4852037f5e7e56cc5c07aa391c5e6012dd07ed134ace68a80e2b880b248f3757ca3
DIST kio-extras-23.08.3.tar.xz 1489156 BLAKE2B 6ad66a1658ac2ad8a5b88ca5f7c66cb3fd5dfbcee9baa49feeea185eb935121a7e51035f539e84c79af066fb50c68cba850eeefaf0f99a65d457a06e1f46fe9d SHA512 dac80cce3e47a6b0686feae297cf6707bbbb2ede0930d2636a4c93b43610beea391148df92ba381fec3ba8b8eed279de19ad5315b3aa989436b0bc8e6937e680
DIST kio-extras-23.08.4.tar.xz 1490584 BLAKE2B f38b87c9934a2d8f7862131d6ad8200035cdd55696918e1e8164e7811907a17ae583f392856fb4e709a2a09dcb560fb40c08d2485caed12331da9068bc3b3932 SHA512 ac2be6e745121962e13fe952d746281fa45778b6d491b001b9ea7a65caedfd5d6354ee75537fde0bf174638d248eb8796db6710830641149dcf35544048cfe27
+DIST kio-extras-24.01.80.tar.xz 3584496 BLAKE2B 7aade7182c34e244e937d4b58989d6e31d408ba2a16e4765dedf0fcf8a106346d107753c3403d0dd63a0404ade0add04518a26cfb47eaf128178792c63a067c8 SHA512 4f9f5720d1986a5fe3aefa54b398dde12740005ebd8dc5381b79b54527c39cb1103f87667ea2a5e865c0da6f87e6ccaa3356688d6ee5a0ef7094b86dea471b5f
--git a/kde-apps/kio-extras/files/kio-extras-24.01.80-no-activities.patch b/kde-apps/kio-extras/files/kio-extras-24.01.80-no-activities.patch
new file mode 100644
index 000000000000..a3bcf2d6c45a
--- /dev/null
+++ b/kde-apps/kio-extras/files/kio-extras-24.01.80-no-activities.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt 2023-12-17 13:30:08.829164269 +0100
++++ b/CMakeLists.txt 2023-12-17 13:30:28.109541642 +0100
+@@ -67,7 +67,7 @@
+ file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h)
+ kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES})
+
+-if (NOT WIN32)
++if (0)
+ find_package(PlasmaActivities REQUIRED)
+ find_package(Qt6Sql REQUIRED)
+ find_package(PlasmaActivitiesStats REQUIRED)
--git a/kde-apps/kio-extras/kio-extras-24.01.80.ebuild b/kde-apps/kio-extras/kio-extras-24.01.80.ebuild
new file mode 100644
index 000000000000..fabda3993173
--- /dev/null
+++ b/kde-apps/kio-extras/kio-extras-24.01.80.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="optional"
+KFMIN=5.245.0
+QTMIN=6.6.0
+inherit ecm gear.kde.org
+
+DESCRIPTION="KIO plugins present a filesystem-like view of arbitrary data"
+HOMEPAGE="https://invent.kde.org/network/kio-extras"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64"
+IUSE="ios +man mtp openexr phonon +sftp taglib X"
+# TODO: activities: collides with Plasma-5, plus:
+# https://invent.kde.org/network/kio-extras/-/merge_requests/320
+# TODO: samba (net-libs/kdsoap packaging issue w/ upstream)
+# disabled upstream: nfs
+
+# requires running Plasma environment
+RESTRICT="test"
+
+DEPEND="
+ dev-libs/qcoro
+ >=dev-qt/qt5compat-${QTMIN}:6
+ >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml]
+ >=dev-qt/qtsvg-${QTMIN}:6
+ kde-apps/libkexiv2:6
+ >=kde-frameworks/karchive-${KFMIN}:6
+ >=kde-frameworks/kcmutils-${KFMIN}:6
+ >=kde-frameworks/kcodecs-${KFMIN}:6
+ >=kde-frameworks/kconfig-${KFMIN}:6
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:6
+ >=kde-frameworks/kcoreaddons-${KFMIN}:6
+ >=kde-frameworks/kdbusaddons-${KFMIN}:6
+ >=kde-frameworks/kdnssd-${KFMIN}:6
+ >=kde-frameworks/kguiaddons-${KFMIN}:6
+ >=kde-frameworks/ki18n-${KFMIN}:6
+ >=kde-frameworks/kio-${KFMIN}:6
+ >=kde-frameworks/kparts-${KFMIN}:6
+ >=kde-frameworks/kservice-${KFMIN}:6
+ >=kde-frameworks/ktextwidgets-${KFMIN}:6
+ >=kde-frameworks/kxmlgui-${KFMIN}:6
+ >=kde-frameworks/solid-${KFMIN}:6
+ >=kde-frameworks/syntax-highlighting-${KFMIN}:6
+ ios? (
+ app-pda/libimobiledevice:=
+ app-pda/libplist:=
+ )
+ mtp? ( >=media-libs/libmtp-1.1.16:= )
+ openexr? ( media-libs/openexr:= )
+ phonon? ( >=media-libs/phonon-4.12.0[qt6] )
+ sftp? ( net-libs/libssh:=[sftp] )
+ taglib? ( >=media-libs/taglib-1.11.1 )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXcursor
+ )
+"
+# nfs? ( net-libs/libtirpc:= )
+# samba? (
+# net-fs/samba[client]
+# >=net-libs/kdsoap-2.1.1-r1:=
+# >=net-libs/kdsoap-ws-discovery-client-0.3.0
+# )
+RDEPEND="${DEPEND}
+ !kde-apps/kio-extras:5
+ !kde-apps/kio-extras-kf5:5[-kf6compat]
+ !kde-frameworks/kio:5[-kf6compat(-)]
+ >=kde-frameworks/kded-${KFMIN}:6
+"
+BDEPEND="man? ( dev-util/gperf )"
+
+PATCHES=( "${FILESDIR}/${P}-no-activities.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package ios IMobileDevice)
+ $(cmake_use_find_package ios PList)
+ $(cmake_use_find_package man Gperf)
+ $(cmake_use_find_package mtp Libmtp)
+# $(cmake_use_find_package nfs TIRPC)
+ $(cmake_use_find_package openexr OpenEXR)
+ $(cmake_use_find_package phonon Phonon4Qt6)
+ -DCMAKE_DISABLE_FIND_PACKAGE_Samba=ON
+ $(cmake_use_find_package sftp libssh)
+ $(cmake_use_find_package taglib Taglib)
+ -DWITHOUT_X11=$(usex !X)
+ )
+
+ ecm_src_configure
+}
--git a/kde-apps/kio-extras/metadata.xml b/kde-apps/kio-extras/metadata.xml
index 1874c376d137..48490c08acda 100644
--- a/kde-apps/kio-extras/metadata.xml
+++ b/kde-apps/kio-extras/metadata.xml
@@ -8,6 +8,7 @@
<upstream>
<bugs-to>https://bugs.kde.org/</bugs-to>
<remote-id type="cpe">cpe:/a:kde:kio-extras</remote-id>
+ <remote-id type="kde-invent">network/kio-extras</remote-id>
</upstream>
<use>
<flag name="activities">Enable activities KIO worker and fileitem plugin</flag>
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2023-12-17 23:03 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-11-14 15:59 [gentoo-commits] repo/gentoo:master commit in: kde-apps/kio-extras/, kde-apps/kio-extras/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2020-03-05 19:39 Andreas Sturmlechner
2021-05-30 11:37 Andreas Sturmlechner
2021-10-20 13:53 Andreas Sturmlechner
2021-10-20 13:53 Andreas Sturmlechner
2022-08-06 7:45 Andreas Sturmlechner
2023-12-17 23:02 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox