9 files changed, 145 insertions, 12 deletions
diff --git a/user/kde-system/APKBUILD b/user/kde-system/APKBUILD
index 07eea36a0..2d45df4ff 100644
--- a/user/kde-system/APKBUILD
+++ b/user/kde-system/APKBUILD
@@ -2,14 +2,14 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kde-system
 pkgver=18.08.3
-pkgrel=0
+pkgrel=1
 pkgdesc="System utiltiies from the KDE Software Collection"
 url="https://www.kde.org/applications/system/"
 arch="noarch"
 options="!check"  # Empty meta package, no point in testing.
 license="NCSA"
 depends="dolphin kdf khelpcenter kinfocenter konsole krfb ksysguard ksystemlog
-	kwalletmanager xdg-utils yakuake"
+	kwalletmanager partitionmanager xdg-utils yakuake"
 makedepends=""
 source="org.adelie-linux.about-system.desktop"
 
diff --git a/user/kpmcore/APKBUILD b/user/kpmcore/APKBUILD
new file mode 100644
index 000000000..102059e09
--- /dev/null
+++ b/user/kpmcore/APKBUILD
@@ -0,0 +1,43 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=kpmcore
+pkgver=3.3.0
+pkgrel=0
+pkgdesc="Core routines for KDE Partition Manager"
+url="https://www.kde.org/applications/system/kdepartitionmanager"
+arch="all"
+license="LGPL-2.1+"
+depends=""
+depends_dev="libatasmart-dev parted-dev qt5-qtbase-dev"
+makedepends="$depends_dev cmake extra-cmake-modules kcoreaddons-dev ki18n-dev
+	kwidgetsaddons-dev util-linux-dev"
+subpackages="$pkgname-dev $pkgname-lang"
+source="https://download.kde.org/stable/kpmcore/$pkgver/src/kpmcore-$pkgver.tar.xz"
+
+build() {
+	cd "$builddir"
+	if [ "$CBUILD" != "$CHOST" ]; then
+		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+	fi
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=lib \
+		-DBUILD_SHARED_LIBS=True \
+		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
+		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+		-DCMAKE_C_FLAGS="$CFLAGS" \
+		${CMAKE_CROSSOPTS}
+	make
+}
+
+check() {
+	cd "$builddir"
+	CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+sha512sums="62a0a341fbbec426291e2c9dd183a20466fce48ffaa360dd816c58402ee03c1f61c4ef7887d0a66c4693d77c2183a5da3477b828ba4ac2ed405f684ffb27125e  kpmcore-3.3.0.tar.xz"
diff --git a/user/libcanberra/APKBUILD b/user/libcanberra/APKBUILD
index 9e105c892..9d2431be0 100644
--- a/user/libcanberra/APKBUILD
+++ b/user/libcanberra/APKBUILD
@@ -14,7 +14,7 @@ depends_dev="alsa-lib-dev gstreamer-dev gtk+2.0-dev gtk+3.0-dev libogg-dev
 makedepends="$depends_dev lynx"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-gtk2 $pkgname-gtk3
 	$pkgname-gstreamer $pkgname-pulse"
-source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="http://0pointer.de/lennart/projects/$pkgname/$pkgname-$pkgver.tar.xz"
 
 prepare() {
 	cd "$builddir"
diff --git a/user/libcddb/APKBUILD b/user/libcddb/APKBUILD
index de8b4f6ff..f28442f59 100644
--- a/user/libcddb/APKBUILD
+++ b/user/libcddb/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer:
 pkgname=libcddb
 pkgver=1.3.2
-pkgrel=4
+pkgrel=5
 pkgdesc="Library that implements the different protocols (CDDBP, HTTP, SMTP) to access data on a CDDB server (e.g. http://freedb.org)."
 url="https://sourceforge.net/projects/libcddb/"
 arch="all"
@@ -12,7 +12,9 @@ license="LGPL-2.0+"
 depends=""
 makedepends=""
 subpackages="$pkgname-dev"
-source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2"
+source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
+	connect-ppc64.patch
+	"
 
 prepare() {
 	cd "$builddir"
@@ -37,4 +39,5 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="0e07e7d37f2013164d75b530a5528f54847271fd20f3b7bedb192a05d1f61dcf006d10dc2927efe155a01eddcc57b940bc31d8ac88d5dfc4f1a09771caa84e0a  libcddb-1.3.2.tar.bz2"
+sha512sums="0e07e7d37f2013164d75b530a5528f54847271fd20f3b7bedb192a05d1f61dcf006d10dc2927efe155a01eddcc57b940bc31d8ac88d5dfc4f1a09771caa84e0a  libcddb-1.3.2.tar.bz2
+70f6644c7b4f40d556d81b87bcdf7a07b96f48dd741a25c6918c44bc38edd2598cc46f50a23d7c77ea8d98c9193c7ef589c277801a7ac098e9845b0a7f086993  connect-ppc64.patch"
diff --git a/user/libcddb/connect-ppc64.patch b/user/libcddb/connect-ppc64.patch
new file mode 100644
index 000000000..0c79fdc4d
--- /dev/null
+++ b/user/libcddb/connect-ppc64.patch
@@ -0,0 +1,41 @@
+--- libcddb-1.3.2/lib/cddb_net.c.old	2009-03-01 03:28:07.000000000 +0000
++++ libcddb-1.3.2/lib/cddb_net.c	2019-01-03 06:43:42.480000000 +0000
+@@ -273,7 +273,7 @@
+ int timeout_connect(int sockfd, const struct sockaddr *addr, 
+                     size_t len, int timeout)
+ {
+-    int got_error = 0;
++    int got_error = 0, conn_result;
+ 
+     /* set socket to non-blocking */
+ #ifdef BEOS
+@@ -299,7 +299,7 @@
+ #endif /* BEOS */
+ 
+     /* try connecting */
+-    if (connect(sockfd, addr, len) == -1) {
++    if ((conn_result = connect(sockfd, addr, len)) == -1) {
+         /* check whether we can continue */
+         if (errno == EINPROGRESS) {
+             int rv;
+@@ -333,6 +333,9 @@
+                 }
+             }
+         }
++    } else if (conn_result == 0) {
++        /* it worked without needing timeout */
++        got_error = 0;
+     } else {
+         /* connect failed */
+         got_error = -1;
+--- libcddb-1.3.2/lib/cddb_net.c.old	2009-03-01 03:28:07.000000000 +0000
++++ libcddb-1.3.2/lib/cddb_net.c	2019-01-03 07:30:27.050000000 +0000
+@@ -325,6 +325,8 @@
+             default:
+                 /* we got connected, check error condition */
+                 l = sizeof(rv);
++		/* Work around Linux/ppc64 bug */
++		rv = 0;
+                 getsockopt(sockfd, SOL_SOCKET, SO_ERROR, &rv, &l);
+                 if (rv) {
+                     /* something went wrong, simulate normal connect behaviour */
diff --git a/user/mkfontdir/APKBUILD b/user/mkfontdir/APKBUILD
index ef3ed4edc..45629cd20 100644
--- a/user/mkfontdir/APKBUILD
+++ b/user/mkfontdir/APKBUILD
@@ -1,15 +1,16 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=mkfontdir
 pkgver=1.0.7
-pkgrel=2
+pkgrel=3
 pkgdesc="Font file index utility from X.Org"
 url="https://www.X.Org/"
 arch="noarch"
 license="X11 AND MIT"
-depends="mkfontscale"
+depends="encodings mkfontscale"
 makedepends="util-macros"
 subpackages="$pkgname-doc"
-triggers="$pkgname.trigger=/usr/share/fonts/*"
+triggers="$pkgname.trigger=/usr/share/fonts/*
+	$pkgname.trigger=/usr/share/fonts/X11/*"
 source="https://www.X.Org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
 
 prepare() {
diff --git a/user/mkfontdir/mkfontdir.trigger b/user/mkfontdir/mkfontdir.trigger
index 4fce36a11..3024d71f1 100644
--- a/user/mkfontdir/mkfontdir.trigger
+++ b/user/mkfontdir/mkfontdir.trigger
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 for i in "$@"; do
-	mkfontdir "$i"
+	mkfontdir -e "/usr/share/fonts/X11/encodings" -e "/usr/share/fonts/X11/encodings/large" -- "$i"
 done
 
diff --git a/user/mkfontscale/APKBUILD b/user/mkfontscale/APKBUILD
index 812fd97af..c2d81ec73 100644
--- a/user/mkfontscale/APKBUILD
+++ b/user/mkfontscale/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=mkfontscale
 pkgver=1.1.3
-pkgrel=0
+pkgrel=1
 pkgdesc="Scalable font file creator for X.Org"
 url="https://www.X.Org/"
 arch="all"
@@ -9,7 +9,8 @@ license="MIT"
 subpackages="$pkgname-doc"
 depends=""
 makedepends="freetype-dev libfontenc-dev util-macros xorgproto-dev zlib-dev"
-triggers="$pkgname.trigger=/usr/share/fonts/*"
+triggers="$pkgname.trigger=/usr/share/fonts/*
+	$pkgname.trigger=/usr/share/fonts/X11/*"
 source="https://www.X.Org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
 
 build() {
diff --git a/user/partitionmanager/APKBUILD b/user/partitionmanager/APKBUILD
new file mode 100644
index 000000000..33c6e3bdf
--- /dev/null
+++ b/user/partitionmanager/APKBUILD
@@ -0,0 +1,44 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=partitionmanager
+pkgver=3.3.1
+pkgrel=0
+pkgdesc="Qt-based partition manager"
+url="https://www.kde.org/applications/system/kdepartitionmanager"
+arch="all"
+license="GPL-3.0+"
+depends=""
+makedepends="cmake extra-cmake-modules qt5-qtbase-dev kconfig-dev
+	kconfigwidgets-dev kcoreaddons-dev kcrash-dev kdoctools-dev ki18n-dev
+	kiconthemes-dev kio-dev kjobwidgets-dev kservice-dev kwidgetsaddons-dev
+	kxmlgui-dev kpmcore-dev"
+subpackages="$pkgname-doc $pkgname-lang"
+source="https://download.kde.org/stable/partitionmanager/$pkgver/src/partitionmanager-$pkgver.tar.xz"
+
+build() {
+	cd "$builddir"
+	if [ "$CBUILD" != "$CHOST" ]; then
+		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+	fi
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=lib \
+		-DBUILD_SHARED_LIBS=True \
+		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
+		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+		-DCMAKE_C_FLAGS="$CFLAGS" \
+		${CMAKE_CROSSOPTS}
+	make
+}
+
+check() {
+	cd "$builddir"
+	CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+sha512sums="9189004c27a118510ddf7f148d2a245a7e17d0d0c038ea7486fc50638f2897f947ef2a2a92f0196c277b14e8dafb2f1e2f20978cce5927c04299232ecf8260b0  partitionmanager-3.3.1.tar.xz"