From 6021da9d6a1217b3d891e48a424732f3f7fcd46c Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Tue, 5 Jun 2018 02:05:02 -0500
Subject: user: KDE Frameworks 5.46.0

---
 user/kio/APKBUILD                         |  6 ++----
 user/kio/D11011-msghdr-iovec-struct.patch | 23 -----------------------
 2 files changed, 2 insertions(+), 27 deletions(-)
 delete mode 100644 user/kio/D11011-msghdr-iovec-struct.patch

(limited to 'user/kio')

diff --git a/user/kio/APKBUILD b/user/kio/APKBUILD
index 7dc6c4293..289b4c2eb 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.43.0
+pkgver=5.46.0
 pkgrel=0
 pkgdesc="Framework for data and file management"
 url="https://www.kde.org/"
@@ -17,7 +17,6 @@ makedepends="$depends_dev cmake extra-cmake-modules kdoctools-dev gettext-dev
 install=""
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 source="http://download.kde.org/stable/frameworks/${pkgver%.*}/kio-$pkgver.tar.xz
-	D11011-msghdr-iovec-struct.patch
 	strcpy-ppc.patch"
 builddir="$srcdir/kio-$pkgver"
 
@@ -48,6 +47,5 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="23885d851dade24bb08ba1de2eda65db3ab13c8f378a42281f8a50230c9e836b5255643c89fbfca3dedc1e41ee259e67aaed2933cdf739ee4fb1c7eb650b95f6  kio-5.43.0.tar.xz
-c08360de86780f63703d70f607d90410043c8a8711eab7315e2ac66e2e656fec9f9a6f5d04c031f739a0187c0d34aa35b5942f59f47efb60ad95584f95087979  D11011-msghdr-iovec-struct.patch
+sha512sums="64ea3c5cd27990a03f693eb6add5a9d148f16ef5c4b4e4e7118fe841258f2b8d4062697a9922cfabb3ac84d015e1fcc4e342bcce91fc80e55027cc7f8d8c78d9  kio-5.46.0.tar.xz
 280b2a610613786e688c06f4d4b51d3b9d583472bf1941b7b5873fece31b5df0b2f8f08f8de677ebb39fc906c57a2fa50d7890105c0aeb930b82986e0b504623  strcpy-ppc.patch"
diff --git a/user/kio/D11011-msghdr-iovec-struct.patch b/user/kio/D11011-msghdr-iovec-struct.patch
deleted file mode 100644
index 641bb8629..000000000
--- a/user/kio/D11011-msghdr-iovec-struct.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/src/ioslaves/file/sharefd_p.h b/src/ioslaves/file/sharefd_p.h
---- a/src/ioslaves/file/sharefd_p.h
-+++ b/src/ioslaves/file/sharefd_p.h
-@@ -74,9 +74,16 @@
-     FDMessageHeader()
-         : io_buf{0}
-         , cmsg_buf{0}
--        , io{io_buf, sizeof io_buf}
--        , msg{nullptr, 0,  &io, 1,  &cmsg_buf, sizeof cmsg_buf, 0}
-     {
-+        memset(&io, 0, sizeof io);
-+        io.iov_base = io_buf;
-+        io.iov_len = sizeof io_buf;
-+
-+        memset(&msg, 0, sizeof msg);
-+        msg.msg_iov = &io;
-+        msg.msg_iovlen = 1;
-+        msg.msg_control = &cmsg_buf;
-+        msg.msg_controllen = sizeof cmsg_buf;
-     }
- 
-     msghdr *message()
-
-- 
cgit v1.2.3-70-g09d2