summaryrefslogtreecommitdiff
path: root/user/kio
diff options
context:
space:
mode:
authorCyberLeo <cyberleo@cyberleo.net>2020-03-28 05:45:52 -0500
committerCyberLeo <cyberleo@cyberleo.net>2020-03-28 05:45:52 -0500
commit9297468fa579836e3a6a381b798feb6b78217c2d (patch)
tree53168212f427afbcf0693b534530a4af803152e9 /user/kio
parenta63cc05c53a6f4c22422dc8c69808b14d87a6f6e (diff)
parentda5a69b65a8791fffa6e93366ee585f87eff136d (diff)
downloadpackages-9297468fa579836e3a6a381b798feb6b78217c2d.tar.gz
packages-9297468fa579836e3a6a381b798feb6b78217c2d.tar.bz2
packages-9297468fa579836e3a6a381b798feb6b78217c2d.tar.xz
packages-9297468fa579836e3a6a381b798feb6b78217c2d.zip
Merge branch 'master' into zfs
Diffstat (limited to 'user/kio')
-rw-r--r--user/kio/APKBUILD13
-rw-r--r--user/kio/strcpy-ppc.patch6
2 files changed, 8 insertions, 11 deletions
diff --git a/user/kio/APKBUILD b/user/kio/APKBUILD
index b2ae829ce..8f56f536e 100644
--- a/user/kio/APKBUILD
+++ b/user/kio/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kio
-pkgver=5.54.0
+pkgver=5.68.0
pkgrel=0
pkgdesc="Framework for data and file management"
url="https://www.kde.org/"
@@ -14,13 +14,12 @@ depends_dev="qt5-qtbase-dev attica-dev kbookmarks-dev kcompletion-dev
kjobwidgets-dev kservice-dev kwidgetsaddons-dev solid-dev"
makedepends="$depends_dev cmake extra-cmake-modules kdoctools-dev python3
qt5-qttools-dev doxygen graphviz karchive-dev kdbusaddons-dev ki18n-dev
- knotifications-dev kwallet-dev acl-dev"
+ knotifications-dev kwallet-dev acl-dev krb5-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kio-$pkgver.tar.xz
strcpy-ppc.patch"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -32,19 +31,17 @@ build() {
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
-DBUILD_QCH:BOOL=ON \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="163929bd8e6e4d3be5390090511cafd11213e476a0460e5fdcffde15181332545380ef25f6350e465dbc7f9872a6b771e891f5302af64bd3ced162b2a94a8c6d kio-5.54.0.tar.xz
-280b2a610613786e688c06f4d4b51d3b9d583472bf1941b7b5873fece31b5df0b2f8f08f8de677ebb39fc906c57a2fa50d7890105c0aeb930b82986e0b504623 strcpy-ppc.patch"
+sha512sums="f962631383719a7265a9b300881c812d00eda566198c1f68ad134a21407717245b49fd383901440a13d403245a0b9b3bab98432ec31c22e3dbe78b09240840e7 kio-5.68.0.tar.xz
+a21e700948317e460f273276aee36359b5bba8a69da1e43714169002ca4bf4538f1cc3663e823be30a0fa838d61103769afb7445caa6e8ceba29830f8532b6db strcpy-ppc.patch"
diff --git a/user/kio/strcpy-ppc.patch b/user/kio/strcpy-ppc.patch
index 95f2deb9c..119f0a71f 100644
--- a/user/kio/strcpy-ppc.patch
+++ b/user/kio/strcpy-ppc.patch
@@ -1,10 +1,10 @@
--- kio-5.43.0/src/ioslaves/file/sharefd_p.h.old 2018-03-09 01:13:49.473808589 -0600
+++ kio-5.43.0/src/ioslaves/file/sharefd_p.h 2018-03-09 01:35:33.903523248 -0600
-@@ -21,6 +21,7 @@
+@@ -24,6 +24,7 @@
#include <sys/un.h>
#include <iostream>
#include <unistd.h>
+#include <cstring>
#include <sys/socket.h>
-
- // fix SOCK_NONBLOCK for e.g. macOS
+ #include <string.h>
+ #include <stddef.h>