diff --git a/x11-packages/kf6-kio/build.sh b/x11-packages/kf6-kio/build.sh index f6c99006cb..45717f23e7 100644 --- a/x11-packages/kf6-kio/build.sh +++ b/x11-packages/kf6-kio/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE='https://invent.kde.org/frameworks/kio' TERMUX_PKG_DESCRIPTION='Resource and network access abstraction' TERMUX_PKG_LICENSE="LGPL-2.0, LGPL-3.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="6.22.1" -TERMUX_PKG_REVISION=1 +TERMUX_PKG_VERSION="6.23.0" TERMUX_PKG_SRCURL="https://download.kde.org/stable/frameworks/${TERMUX_PKG_VERSION%.*}/kio-${TERMUX_PKG_VERSION}.tar.xz" -TERMUX_PKG_SHA256=04aaf8eb2b3bcac6d921fc3a1d033d67df89d9af8f69355185edf1af61c93370 +TERMUX_PKG_SHA256=629e59f0f007b8a19fc6daf4e39a5043b30f565eeb501048126422506d34eb97 TERMUX_PKG_DEPENDS="kf6-karchive (>= ${TERMUX_PKG_VERSION%.*}), kf6-kauth (>= ${TERMUX_PKG_VERSION%.*}), kf6-kbookmarks (>= ${TERMUX_PKG_VERSION%.*}), kf6-kcolorscheme (>= ${TERMUX_PKG_VERSION%.*}), kf6-kcompletion (>= ${TERMUX_PKG_VERSION%.*}), kf6-kconfig (>= ${TERMUX_PKG_VERSION%.*}), kf6-kcoreaddons (>= ${TERMUX_PKG_VERSION%.*}), kf6-kdbusaddons (>= ${TERMUX_PKG_VERSION%.*}), kf6-kguiaddons (>= ${TERMUX_PKG_VERSION%.*}), kf6-ki18n (>= ${TERMUX_PKG_VERSION%.*}), kf6-kiconthemes (>= ${TERMUX_PKG_VERSION%.*}), kf6-kitemviews (>= ${TERMUX_PKG_VERSION%.*}), kf6-kjobwidgets (>= ${TERMUX_PKG_VERSION%.*}), kf6-kservice (>= ${TERMUX_PKG_VERSION%.*}), kf6-kwallet (>= ${TERMUX_PKG_VERSION%.*}), kf6-kwidgetsaddons (>= ${TERMUX_PKG_VERSION%.*}), kf6-kwindowsystem (>= ${TERMUX_PKG_VERSION%.*}), kf6-solid (>= ${TERMUX_PKG_VERSION%.*}), libacl, libandroid-shmem, libc++, libmount, libxml2, libxslt, qt6-qtbase, util-linux" TERMUX_PKG_BUILD_DEPENDS="extra-cmake-modules (>= ${TERMUX_PKG_VERSION%.*}), kf6-kdoctools (>= ${TERMUX_PKG_VERSION%.*}), kf6-kdoctools-cross-tools (>= ${TERMUX_PKG_VERSION%.*}), qt6-qttools" TERMUX_PKG_AUTO_UPDATE=true diff --git a/x11-packages/kf6-kio/revert-kmountpoint-statx.patch b/x11-packages/kf6-kio/revert-kmountpoint-statx.patch new file mode 100644 index 0000000000..cf61d3935f --- /dev/null +++ b/x11-packages/kf6-kio/revert-kmountpoint-statx.patch @@ -0,0 +1,25 @@ +Reverts https://invent.kde.org/frameworks/kio/-/commit/4709688aa80d7fc2cac7bce7285f6830e4cbcf21 +statx is unavailable in Android until API level 30 + +Prevents: +kmountpoint.cpp:375:56: error: cannot initialize a member subobject of type '__u32' +(aka 'unsigned int') with an rvalue of type 'const char *' + +--- a/src/core/kmountpoint.cpp ++++ b/src/core/kmountpoint.cpp +@@ -372,8 +371,13 @@ KMountPoint::List KMountPoint::currentMountPoints(DetailsNeededFlags infoNeeded) + } + #endif + +- if (struct statx buff; statx(AT_FDCWD, mnt_fs_get_target(fs), AT_STATX_DONT_SYNC, STATX_INO, &buff) == 0) { +- mp->d->m_deviceId = makedev(buff.stx_dev_major, buff.stx_dev_minor); ++ // handle bind mounts ++ if (mp->d->m_mountedFrom != mp->d->m_mountPoint) { ++ if (QT_STATBUF buff; QT_LSTAT(mnt_fs_get_target(fs), &buff) == 0) { ++ mp->d->m_deviceId = buff.st_dev; ++ } ++ } else { ++ mp->d->m_deviceId = mnt_fs_get_devno(fs); + } + + if (infoNeeded & NeedMountOptions) {