summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--harmony/glib/APKBUILD3
-rw-r--r--harmony/zsh/APKBUILD3
-rw-r--r--system/adelie-base/APKBUILD10
-rw-r--r--system/debianutils/APKBUILD6
-rw-r--r--system/gcc/APKBUILD6
-rw-r--r--system/gcc/add-classic_table-support.patch181
-rw-r--r--system/gcc/lra-pentium.patch48
-rw-r--r--system/libarchive/APKBUILD3
-rw-r--r--system/shimmy/APKBUILD6
-rw-r--r--system/syslinux/APKBUILD19
-rwxr-xr-xsystem/syslinux/update-extlinux2
-rw-r--r--system/vlc/APKBUILD359
-rw-r--r--system/vlc/check-headless.patch13
-rw-r--r--system/vlc/disable-sub-autodetect-fuzzy-1-test.patch20
-rw-r--r--system/vlc/fribidi-update.patch83
-rw-r--r--system/vlc/omxil-rpi-codecs.patch15
-rw-r--r--system/vlc/tar-compat.patch11
-rw-r--r--system/vlc/test-s390x.patch13
-rw-r--r--system/vlc/vlc-daemon.pre-install15
-rw-r--r--system/vlc/vlc-libs.trigger5
-rw-r--r--system/vlc/vlc.confd15
-rwxr-xr-xsystem/vlc/vlc.initd32
-rw-r--r--user/analitza/APKBUILD43
-rw-r--r--user/artikulate/APKBUILD45
-rw-r--r--user/audiofile/APKBUILD47
-rw-r--r--user/audiofile/tests-unsigned-gcc6.patch29
-rw-r--r--user/blinken/APKBUILD44
-rw-r--r--user/blinken/test.patch13
-rw-r--r--user/dragonplayer/APKBUILD46
-rw-r--r--user/fluidsynth/APKBUILD41
-rw-r--r--user/gcompris-qt/APKBUILD44
-rw-r--r--user/heirloom-pax/APKBUILD32
-rw-r--r--user/id3lib/APKBUILD51
-rw-r--r--user/id3lib/modern-cpp.patch22
-rw-r--r--user/id3lib/test-expose-proper-stdlib-symbols.patch12
-rw-r--r--user/juk/APKBUILD46
-rw-r--r--user/kaffeine/APKBUILD44
-rw-r--r--user/kalgebra/APKBUILD44
-rw-r--r--user/kalzium/APKBUILD47
-rw-r--r--user/kanagram/APKBUILD45
-rw-r--r--user/kbruch/APKBUILD43
-rw-r--r--user/kde-education/APKBUILD27
-rw-r--r--user/kde-education/org.adelie-linux.about-education.desktop8
-rw-r--r--user/kde-multimedia/APKBUILD25
-rw-r--r--user/kde-multimedia/org.adelie-linux.about-multimedia.desktop8
-rw-r--r--user/kdenlive/APKBUILD48
-rw-r--r--user/kgeography/APKBUILD44
-rw-r--r--user/khangman/APKBUILD45
-rw-r--r--user/kig/APKBUILD44
-rw-r--r--user/kiten/APKBUILD44
-rw-r--r--user/klettres/APKBUILD44
-rw-r--r--user/kmediaplayer/APKBUILD45
-rw-r--r--user/kmix/APKBUILD46
-rw-r--r--user/kmplot/APKBUILD45
-rw-r--r--user/ktouch/APKBUILD46
-rw-r--r--user/kturtle/APKBUILD44
-rw-r--r--user/kwave/APKBUILD47
-rw-r--r--user/kwordquiz/APKBUILD46
-rw-r--r--user/labplot/APKBUILD46
-rw-r--r--user/libdca/APKBUILD43
-rw-r--r--user/libkcddb/APKBUILD46
-rw-r--r--user/libkcddb/update-tests.patch22
-rw-r--r--user/libkeduvocdocument/APKBUILD43
-rw-r--r--user/marble/APKBUILD42
-rw-r--r--user/minuet/APKBUILD44
-rw-r--r--user/ncompress/APKBUILD13
-rw-r--r--user/ncompress/fix-9bit-compress.patch20
-rw-r--r--user/pax/APKBUILD42
-rw-r--r--user/pax/needed-header.patch11
-rw-r--r--user/pax/pax-20160306-glibc-to-linux.patch38
-rw-r--r--user/phonon-vlc/APKBUILD43
-rw-r--r--user/phonon/APKBUILD4
-rw-r--r--user/qml-box2d/APKBUILD30
-rw-r--r--user/rocs/APKBUILD46
-rw-r--r--user/schismtracker/APKBUILD30
-rw-r--r--user/step/APKBUILD45
-rw-r--r--user/umbrello/APKBUILD46
77 files changed, 2696 insertions, 220 deletions
diff --git a/harmony/glib/APKBUILD b/harmony/glib/APKBUILD
index 31a4fc576..89a98754f 100644
--- a/harmony/glib/APKBUILD
+++ b/harmony/glib/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=glib
pkgver=2.54.2
-pkgrel=0
+pkgrel=1
pkgdesc="Common C routines used by Gtk+ and other libs"
url="https://developer.gnome.org/glib/"
arch="all"
@@ -46,6 +46,7 @@ build() {
--disable-compile-warnings \
--disable-selinux \
--with-pcre=system \
+ --with-python=python3 \
--with-pic \
--enable-static
make
diff --git a/harmony/zsh/APKBUILD b/harmony/zsh/APKBUILD
index 277501492..0405b6ba6 100644
--- a/harmony/zsh/APKBUILD
+++ b/harmony/zsh/APKBUILD
@@ -3,11 +3,12 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=zsh
pkgver=5.4.1
-pkgrel=0
+pkgrel=1
pkgdesc="A very advanced and programmable command interpreter (shell)"
url="http://www.zsh.org/"
arch="all"
license="BSD"
+depends="debianutils" # add-shell
makedepends="ncurses-dev pcre-dev"
install="zsh.post-install zsh.post-upgrade zsh.pre-deinstall"
source="http://www.zsh.org/pub/$pkgname-$pkgver.tar.gz
diff --git a/system/adelie-base/APKBUILD b/system/adelie-base/APKBUILD
index cbd38f552..3f522a67d 100644
--- a/system/adelie-base/APKBUILD
+++ b/system/adelie-base/APKBUILD
@@ -1,13 +1,13 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=adelie-base
-pkgver=0.4.0
-pkgrel=2
+pkgver=0.5.0
+pkgrel=1
pkgdesc="The Adélie Linux Base System"
url="http://adelielinux.org/"
arch="noarch"
license="NCSA"
-depends="apk-tools shadow debianutils
+depends="apk-tools ca-certificates shadow debianutils
libarchive-tools file shimmy grep procps
zsh bash
binutils coreutils diffutils findutils sharutils
@@ -60,7 +60,7 @@ doc() {
}
posix() {
- depends="at bc cflow cups ed m4 mailx ncompress pax"
+ depends="at bc cflow cups ed fcron heirloom-pax m4 mailx mawk"
pkgdesc="$pkgdesc - Additional POSIX tools"
mkdir -p "$subpkgdir"
return 0
@@ -80,7 +80,7 @@ devkit() {
return 0
}
-sha512sums="557cc53610c3fed8d570f0c0048370eb633f87b72df52fac73b3f3b4327cf76191419f5fbe12208f45dee15588514509bcda8efa2bb0a2dfa52f4f26dbce0f53 adelie-base-0.4.0.tar.xz
+sha512sums="1feef98b2e58ffec9ea19145be2daa84c42d1f4b13e08219e1eb3f11c5565bb5e3d1e23db7dc341e19bce7ee1ad9d8727f3e69f4b8bc2bedb253d56b4f88d79b adelie-base-0.5.0.tar.xz
e6775b9e1c6421338aaceee375b3b74aa100fd444e369b280ce45c9167119b76bebc11737d7f929e50e20a553a35e0e25f7d0f71deb0483d3bccc08e319dcf98 group
9eede0c1cd56a9ffb5227cc9446cdb1bbe73d5f17cd5ee99cf29acca3160f3a96d79e1420311a140f9d9f32950b9823b33ad84dadf7b85921d4f1a945dd5a252 passwd
a5035c18efc50be5d0c8dd452619d781da09c9441ed53462c99693170d1ae2b4306a81846e42b616c5ef8cd5b6fbbf047f93ae5ee9613126581cf701b3a6ade7 addgroup
diff --git a/system/debianutils/APKBUILD b/system/debianutils/APKBUILD
index 37267b3ec..6c87f1867 100644
--- a/system/debianutils/APKBUILD
+++ b/system/debianutils/APKBUILD
@@ -2,14 +2,14 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=debianutils
pkgver=4.8.1.1
-pkgrel=1
+pkgrel=2
pkgdesc="Useful utilities from Debian"
url="https://packages.qa.debian.org/d/debianutils.html"
arch="all"
options="!check" # No test suite.
license="BSD-3 GPL-2.0"
-depends=""
-makedepends="mawk grep" # early package, declare these
+depends="coreutils mawk" # awk, cat, and rm are required by add-shell
+makedepends="grep" # early package, declare these
install=""
subpackages="$pkgname-doc $pkgname-which"
source="http://ftp.debian.org/debian/pool/main/d/$pkgname/${pkgname}_${pkgver}.tar.xz"
diff --git a/system/gcc/APKBUILD b/system/gcc/APKBUILD
index 0ae8352ae..5fa1e4e11 100644
--- a/system/gcc/APKBUILD
+++ b/system/gcc/APKBUILD
@@ -6,7 +6,7 @@ pkgver=6.4.0
[ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
pkgname="$pkgname$_target"
-pkgrel=7
+pkgrel=8
pkgdesc="The GNU Compiler Collection"
url="http://gcc.gnu.org"
arch="all"
@@ -187,6 +187,7 @@ source="ftp://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkgba
fix-rs6000-pie.patch
add-classic_table-support.patch
+ lra-pentium.patch
"
# we build out-of-tree
@@ -641,4 +642,5 @@ fa44c8158111627aa0e91c43e7cc3aa38642c2041c96532dd4f0932dae4d6f92ea2850b683abcf10
385bc2fa50204f678964e5148c6170f572701dab920fbec8301f505bda34d182cde0adb7da042fee71719e12fb59f59181897f9b1bb4f4716ff59aad46ca1998 310-build-gcj-s390x.patch
f4ef08454e28c8732db69115e4998ec153399e8d229dd27f923dbdcf57b68128a65640d026cc7f45b58ba8764ab1eb575d4eb6d6dfc550a87a183f8b94e76181 320-libffi-gnulinux.patch
01c71cd5881fc07ea3b9b980697e89b3ca0fe98502958ceafc3fca18b2604c844e2f457feab711baf8e03f00a5383b0e38aac7eb954034e306f43d4a37f165ed fix-rs6000-pie.patch
-68483be0f4daa56bff9f1b4ddcbc9db9087bc0a459388c916dd36746ce20558e092116c3d2eac3daa4512978270901504a6ec6b2aa589e81864e6f236e5d9639 add-classic_table-support.patch"
+1860593584f629d24d5b6db14b0a3412e9f93449b663aaa4981301a0923db0159314905e694f27366fbfef72dce06636ab6df86862b7e9e9564847e03bee82c1 add-classic_table-support.patch
+4e1b421ed72668b66ecbcb0a34afa99d2a34cb2ea9ee51c4aad605fc8a0e94e3bfbabae4ebe236efc5ec86fc01a472cbe93f36fe25cf579714939d8102a9b84a lra-pentium.patch"
diff --git a/system/gcc/add-classic_table-support.patch b/system/gcc/add-classic_table-support.patch
index 0f5e0f8e3..e74929302 100644
--- a/system/gcc/add-classic_table-support.patch
+++ b/system/gcc/add-classic_table-support.patch
@@ -43,7 +43,7 @@
_GLIBCXX_END_NAMESPACE_VERSION
--- gcc-6.4.0/libstdc++-v3/config/os/generic/ctype_configure_char.cc.old 2016-01-04 08:30:50.652828000 -0600
+++ gcc-6.4.0/libstdc++-v3/config/os/generic/ctype_configure_char.cc 2017-10-16 08:37:57.986260218 -0500
-@@ -40,7 +40,104 @@
+@@ -40,7 +40,105 @@
const ctype_base::mask*
ctype<char>::classic_table() throw()
@@ -51,98 +51,99 @@
+ {
+ static ctype_base::mask mask[256] = {
+ cntrl, cntrl, cntrl, cntrl, cntrl, cntrl, cntrl, cntrl,
-+ cntrl, cntrl | print | space, cntrl, cntrl, cntrl, cntrl | print, cntrl, cntrl,
++ cntrl, cntrl | blank | space, cntrl | space, cntrl | space,
++ cntrl | space, cntrl | space, cntrl, cntrl,
+ cntrl, cntrl, cntrl, cntrl, cntrl, cntrl, cntrl, cntrl,
+ cntrl, cntrl, cntrl, cntrl, cntrl, cntrl, cntrl, cntrl,
+ print | space | blank,
-+ print | punct | graph, print | punct | graph,
-+ print | punct | graph, print | punct | graph,
-+ print | punct | graph, print | punct | graph,
-+ print | punct | graph, print | punct | graph,
-+ print | punct | graph, print | punct | graph,
-+ print | punct | graph, print | punct | graph,
-+ print | punct | graph, print | punct | graph,
-+ print | punct | graph,
-+ print | graph | alnum | digit | xdigit, print | graph | alnum | digit | xdigit,
-+ print | graph | alnum | digit | xdigit, print | graph | alnum | digit | xdigit,
-+ print | graph | alnum | digit | xdigit, print | graph | alnum | digit | xdigit,
-+ print | graph | alnum | digit | xdigit, print | graph | alnum | digit | xdigit,
-+ print | graph | alnum | digit | xdigit, print | graph | alnum | digit | xdigit,
-+ print | punct | graph, print | punct | graph,
-+ print | graph, print | graph, print | graph,
-+ print | punct | graph, print | graph,
-+ print | graph | alnum | xdigit | alpha | upper,
-+ print | graph | alnum | xdigit | alpha | upper,
-+ print | graph | alnum | xdigit | alpha | upper,
-+ print | graph | alnum | xdigit | alpha | upper,
-+ print | graph | alnum | xdigit | alpha | upper,
-+ print | graph | alnum | xdigit | alpha | upper,
-+ print | graph | alnum | alpha | upper,
-+ print | graph | alnum | alpha | upper,
-+ print | graph | alnum | alpha | upper,
-+ print | graph | alnum | alpha | upper,
-+ print | graph | alnum | alpha | upper,
-+ print | graph | alnum | alpha | upper,
-+ print | graph | alnum | alpha | upper,
-+ print | graph | alnum | alpha | upper,
-+ print | graph | alnum | alpha | upper,
-+ print | graph | alnum | alpha | upper,
-+ print | graph | alnum | alpha | upper,
-+ print | graph | alnum | alpha | upper,
-+ print | graph | alnum | alpha | upper,
-+ print | graph | alnum | alpha | upper,
-+ print | graph | alnum | alpha | upper,
-+ print | graph | alnum | alpha | upper,
-+ print | graph | alnum | alpha | upper,
-+ print | graph | alnum | alpha | upper,
-+ print | graph | alnum | alpha | upper,
-+ print | graph | alnum | alpha | upper,
-+ print | graph, print | graph, print | graph,
-+ print | graph, print | graph, print | graph,
-+ print | graph | alnum | xdigit | alpha | lower,
-+ print | graph | alnum | xdigit | alpha | lower,
-+ print | graph | alnum | xdigit | alpha | lower,
-+ print | graph | alnum | xdigit | alpha | lower,
-+ print | graph | alnum | xdigit | alpha | lower,
-+ print | graph | alnum | xdigit | alpha | lower,
-+ print | graph | alnum | alpha | lower,
-+ print | graph | alnum | alpha | lower,
-+ print | graph | alnum | alpha | lower,
-+ print | graph | alnum | alpha | lower,
-+ print | graph | alnum | alpha | lower,
-+ print | graph | alnum | alpha | lower,
-+ print | graph | alnum | alpha | lower,
-+ print | graph | alnum | alpha | lower,
-+ print | graph | alnum | alpha | lower,
-+ print | graph | alnum | alpha | lower,
-+ print | graph | alnum | alpha | lower,
-+ print | graph | alnum | alpha | lower,
-+ print | graph | alnum | alpha | lower,
-+ print | graph | alnum | alpha | lower,
-+ print | graph | alnum | alpha | lower,
-+ print | graph | alnum | alpha | lower,
-+ print | graph | alnum | alpha | lower,
-+ print | graph | alnum | alpha | lower,
-+ print | graph | alnum | alpha | lower,
-+ print | graph | alnum | alpha | lower,
-+ print | graph, print | graph, print | graph, print | graph,
-+ print,
-+ cntrl, cntrl, cntrl, cntrl, cntrl, cntrl, cntrl, cntrl,
-+ cntrl, cntrl, cntrl, cntrl, cntrl, cntrl, cntrl, cntrl,
-+ cntrl, cntrl, cntrl, cntrl, cntrl, cntrl, cntrl, cntrl,
-+ cntrl, cntrl, cntrl, cntrl, cntrl, cntrl, cntrl, cntrl,
-+ cntrl, cntrl, cntrl, cntrl, cntrl, cntrl, cntrl, cntrl,
-+ cntrl, cntrl, cntrl, cntrl, cntrl, cntrl, cntrl, cntrl,
-+ cntrl, cntrl, cntrl, cntrl, cntrl, cntrl, cntrl, cntrl,
-+ cntrl, cntrl, cntrl, cntrl, cntrl, cntrl, cntrl, cntrl,
-+ cntrl, cntrl, cntrl, cntrl, cntrl, cntrl, cntrl, cntrl,
-+ cntrl, cntrl, cntrl, cntrl, cntrl, cntrl, cntrl, cntrl,
-+ cntrl, cntrl, cntrl, cntrl, cntrl, cntrl, cntrl, cntrl,
-+ cntrl, cntrl, cntrl, cntrl, cntrl, cntrl, cntrl, cntrl,
-+ cntrl, cntrl, cntrl, cntrl, cntrl, cntrl, cntrl, cntrl,
-+ cntrl, cntrl, cntrl, cntrl, cntrl, cntrl, cntrl, cntrl,
-+ cntrl, cntrl, cntrl, cntrl, cntrl, cntrl, cntrl, cntrl,
-+ cntrl, cntrl, cntrl, cntrl, cntrl, cntrl, cntrl, cntrl
++ print | punct, print | punct,
++ print | punct, print | punct,
++ print | punct, print | punct,
++ print | punct, print | punct,
++ print | punct, print | punct,
++ print | punct, print | punct,
++ print | punct, print | punct,
++ print | punct,
++ print | alnum | digit | xdigit, print | alnum | digit | xdigit,
++ print | alnum | digit | xdigit, print | alnum | digit | xdigit,
++ print | alnum | digit | xdigit, print | alnum | digit | xdigit,
++ print | alnum | digit | xdigit, print | alnum | digit | xdigit,
++ print | alnum | digit | xdigit, print | alnum | digit | xdigit,
++ print | punct, print | punct,
++ print, print, print,
++ print | punct, print,
++ print | alnum | xdigit | alpha | upper,
++ print | alnum | xdigit | alpha | upper,
++ print | alnum | xdigit | alpha | upper,
++ print | alnum | xdigit | alpha | upper,
++ print | alnum | xdigit | alpha | upper,
++ print | alnum | xdigit | alpha | upper,
++ print | alnum | alpha | upper,
++ print | alnum | alpha | upper,
++ print | alnum | alpha | upper,
++ print | alnum | alpha | upper,
++ print | alnum | alpha | upper,
++ print | alnum | alpha | upper,
++ print | alnum | alpha | upper,
++ print | alnum | alpha | upper,
++ print | alnum | alpha | upper,
++ print | alnum | alpha | upper,
++ print | alnum | alpha | upper,
++ print | alnum | alpha | upper,
++ print | alnum | alpha | upper,
++ print | alnum | alpha | upper,
++ print | alnum | alpha | upper,
++ print | alnum | alpha | upper,
++ print | alnum | alpha | upper,
++ print | alnum | alpha | upper,
++ print | alnum | alpha | upper,
++ print | alnum | alpha | upper,
++ print | punct, print | punct, print | punct,
++ print | punct, print | punct, print | punct,
++ print | alnum | xdigit | alpha | lower,
++ print | alnum | xdigit | alpha | lower,
++ print | alnum | xdigit | alpha | lower,
++ print | alnum | xdigit | alpha | lower,
++ print | alnum | xdigit | alpha | lower,
++ print | alnum | xdigit | alpha | lower,
++ print | alnum | alpha | lower,
++ print | alnum | alpha | lower,
++ print | alnum | alpha | lower,
++ print | alnum | alpha | lower,
++ print | alnum | alpha | lower,
++ print | alnum | alpha | lower,
++ print | alnum | alpha | lower,
++ print | alnum | alpha | lower,
++ print | alnum | alpha | lower,
++ print | alnum | alpha | lower,
++ print | alnum | alpha | lower,
++ print | alnum | alpha | lower,
++ print | alnum | alpha | lower,
++ print | alnum | alpha | lower,
++ print | alnum | alpha | lower,
++ print | alnum | alpha | lower,
++ print | alnum | alpha | lower,
++ print | alnum | alpha | lower,
++ print | alnum | alpha | lower,
++ print | alnum | alpha | lower,
++ print | punct, print | punct, print | punct, print | punct,
++ cntrl,
++ 0, 0, 0, 0, 0, 0, 0, 0,
++ 0, 0, 0, 0, 0, 0, 0, 0,
++ 0, 0, 0, 0, 0, 0, 0, 0,
++ 0, 0, 0, 0, 0, 0, 0, 0,
++ 0, 0, 0, 0, 0, 0, 0, 0,
++ 0, 0, 0, 0, 0, 0, 0, 0,
++ 0, 0, 0, 0, 0, 0, 0, 0,
++ 0, 0, 0, 0, 0, 0, 0, 0,
++ 0, 0, 0, 0, 0, 0, 0, 0,
++ 0, 0, 0, 0, 0, 0, 0, 0,
++ 0, 0, 0, 0, 0, 0, 0, 0,
++ 0, 0, 0, 0, 0, 0, 0, 0,
++ 0, 0, 0, 0, 0, 0, 0, 0,
++ 0, 0, 0, 0, 0, 0, 0, 0,
++ 0, 0, 0, 0, 0, 0, 0, 0,
++ 0, 0, 0, 0, 0, 0, 0, 0
+ };
+ return mask;
+ }
diff --git a/system/gcc/lra-pentium.patch b/system/gcc/lra-pentium.patch
new file mode 100644
index 000000000..e876bcc39
--- /dev/null
+++ b/system/gcc/lra-pentium.patch
@@ -0,0 +1,48 @@
+--- trunk/gcc/lra-assigns.c 2017/03/10 20:53:18 246058
++++ trunk/gcc/lra-assigns.c 2017/03/10 21:17:13 246059
+@@ -889,6 +889,30 @@
+ live_pseudos_reg_renumber[regno] = hard_regno;
+ }
+
++/* Return true iff there is a reason why pseudo SPILL_REGNO should not
++ be spilled. */
++static bool
++must_not_spill_p (unsigned spill_regno)
++{
++ if ((pic_offset_table_rtx != NULL
++ && spill_regno == REGNO (pic_offset_table_rtx))
++ || ((int) spill_regno >= lra_constraint_new_regno_start
++ && ! bitmap_bit_p (&lra_inheritance_pseudos, spill_regno)
++ && ! bitmap_bit_p (&lra_split_regs, spill_regno)
++ && ! bitmap_bit_p (&lra_subreg_reload_pseudos, spill_regno)
++ && ! bitmap_bit_p (&lra_optional_reload_pseudos, spill_regno)))
++ return true;
++ /* A reload pseudo that requires a singleton register class should
++ not be spilled.
++ FIXME: this mitigates the issue on certain i386 patterns, but
++ does not solve the general case where existing reloads fully
++ cover a limited register class. */
++ if (!bitmap_bit_p (&non_reload_pseudos, spill_regno)
++ && reg_class_size [reg_preferred_class (spill_regno)] == 1)
++ return true;
++ return false;
++}
++
+ /* Array used for sorting reload pseudos for subsequent allocation
+ after spilling some pseudo. */
+ static int *sorted_reload_pseudos;
+@@ -960,13 +984,7 @@
+ /* Spill pseudos. */
+ static_p = false;
+ EXECUTE_IF_SET_IN_BITMAP (&spill_pseudos_bitmap, 0, spill_regno, bi)
+- if ((pic_offset_table_rtx != NULL
+- && spill_regno == REGNO (pic_offset_table_rtx))
+- || ((int) spill_regno >= lra_constraint_new_regno_start
+- && ! bitmap_bit_p (&lra_inheritance_pseudos, spill_regno)
+- && ! bitmap_bit_p (&lra_split_regs, spill_regno)
+- && ! bitmap_bit_p (&lra_subreg_reload_pseudos, spill_regno)
+- && ! bitmap_bit_p (&lra_optional_reload_pseudos, spill_regno)))
++ if (must_not_spill_p (spill_regno))
+ goto fail;
+ else if (non_spilled_static_chain_regno_p (spill_regno))
+ static_p = true;
diff --git a/system/libarchive/APKBUILD b/system/libarchive/APKBUILD
index f7d4aa2c4..a8310cbd4 100644
--- a/system/libarchive/APKBUILD
+++ b/system/libarchive/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libarchive
pkgver=3.3.2
-pkgrel=2
+pkgrel=3
pkgdesc="library that can create and read several streaming archive formats"
url="http://libarchive.org/"
arch="all"
@@ -48,7 +48,6 @@ tools() {
mkdir -p "$subpkgdir"/usr/
mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
ln -s bsdtar "$subpkgdir"/usr/bin/tar
- ln -s bsdcpio "$subpkgdir"/usr/bin/cpio
}
sha512sums="1e538cd7d492f54b11c16c56f12c1632ba14302a3737ec0db786272aec0c8020f1e27616a7654d57e26737e5ed9bfc9a62f1fdda61a95c39eb726aa7c2f673e4 libarchive-3.3.2.tar.gz
diff --git a/system/shimmy/APKBUILD b/system/shimmy/APKBUILD
index f8ad3b79a..f4cb086f6 100644
--- a/system/shimmy/APKBUILD
+++ b/system/shimmy/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=shimmy
-pkgver=0.3
+pkgver=0.4
pkgrel=0
pkgdesc="Utilities for stricter POSIX conformance"
url="https://code.foxkit.us/adelie/shimmy"
@@ -12,7 +12,7 @@ depends=""
makedepends=""
subpackages="$pkgname-doc"
options="!check"
-source="https://distfiles.adelielinux.org/source/$pkgname/$pkgname-$pkgver.tar.bz2"
+source="https://distfiles.adelielinux.org/source/$pkgname/$pkgname-$pkgver.tar.xz"
replaces="musl-utils"
builddir="$srcdir/shimmy-$pkgver"
@@ -26,4 +26,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="7c2615264d20657845cb0c3c6660dc1640dd6ff1a6eb36a323ba1a409f9965310df4c95efb04ebb4d6ac1f2413af4e5dd302b6921bf1a5ea769538223f000d24 shimmy-0.3.tar.bz2"
+sha512sums="16947d649279dfdc508bcbe5be8be8ba7bd0b38e692862201a744e4cc770c6ffa3f7b3e37fc997e56c10bfb60abc001b944b6a6b340831894ad8d350f56bde8b shimmy-0.4.tar.xz"
diff --git a/system/syslinux/APKBUILD b/system/syslinux/APKBUILD
index 25e7cb252..43ac057b1 100644
--- a/system/syslinux/APKBUILD
+++ b/system/syslinux/APKBUILD
@@ -1,11 +1,11 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=syslinux
pkgver=6.04_pre1
-pkgrel=2
+pkgrel=3
_ver=${pkgver/_/-}
pkgdesc="Boot loader for the Linux operating system"
url="http://syslinux.org"
-arch="x86 x86_64"
+arch="pmmx x86 x86_64"
license="GPL"
makedepends="linux-headers nasm perl util-linux-dev gnu-efi-dev"
depends="mtools blkid mawk"
@@ -27,26 +27,17 @@ x86_64) _loaderarch=efi64;;
esac
builddir="$srcdir"/$pkgname-$_ver
-prepare() {
- cd "$builddir"
- for i in $source; do
- i=${i%%::*}
- case "$i" in
- *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
- esac
- done
-}
build() {
cd "$builddir"
unset LDFLAGS
- make $_loaderarch installer || return 1
+ make $_loaderarch installer
}
package() {
cd "$builddir"
make -j1 INSTALLROOT="$pkgdir" MANDIR=/usr/share/man \
- bios $_loaderarch install || return 1
+ bios $_loaderarch install
mkdir -p "$pkgdir"/etc/update-extlinux.d
cp "$srcdir"/update-extlinux.conf "$pkgdir"/etc/
@@ -57,4 +48,4 @@ package() {
sha512sums="7927dd39be8e2dcf4138a6fea33def67d19d938379d694f15b48fdd2f5924c028b7a9e7bd71d0c7c6630c203e9e2a54296628e530632ad5e6f55b1ebefe8fc98 syslinux-6.04-pre1.tar.xz
9071be450e543597f6f95b9a5811869c5351a71f4c42f7879b9f7ec1b13e2e4d455e9f2900e3897d5e5870bd87c934b7168328186c5f17631f2b09a524e10a1a update-extlinux.conf
-23fd69b5f42af063744289f64e60eddd0fa35db83d988b24635e6eb47b5c8fada8585c9aea60f398cfc1e5be8565230a81192d71df705368a90e0927f35fb60d update-extlinux"
+8f4f003053a3a265a11522b5bd6c71998ae3bf7ef1fbc2ed51675e432485ba4453f707b1bc1a1ed2089cf226456a56e7742b197b45b015099820b7fed5c2f153 update-extlinux"
diff --git a/system/syslinux/update-extlinux b/system/syslinux/update-extlinux
index b0d8d97f7..5e1183ba9 100755
--- a/system/syslinux/update-extlinux
+++ b/system/syslinux/update-extlinux
@@ -107,7 +107,7 @@ if [ -n "$serial_port" ]; then
fi
echo "DEFAULT $syslinux_menu" >> $conf.new
echo "PROMPT 0" >> $conf.new
-echo "MENU TITLE Addelie $(uname -s) Boot Menu" >> $conf.new
+echo "MENU TITLE Adelie $(uname -s) Boot Menu" >> $conf.new
if [ "$hidden" = "1" ]; then
echo "MENU HIDDEN" >> $conf.new
fi
diff --git a/system/vlc/APKBUILD b/system/vlc/APKBUILD
new file mode 100644
index 000000000..95a9b9fea
--- /dev/null
+++ b/system/vlc/APKBUILD
@@ -0,0 +1,359 @@
+# Contributor: Łukasz Jendrysik <scadu@yandex.com>
+# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=vlc
+pkgver=3.0.1
+_pkgver=${pkgver/_/-}
+_ver=${_pkgver%[a-z]}
+pkgrel=0
+pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
+triggers="vlc-libs.trigger=/usr/lib/vlc/plugins"
+pkgusers="vlc"
+pkggroups="vlc"
+url="https://www.videolan.org/vlc/"
+arch="all"
+license="GPL-2.0-or-later"
+options="!checkroot textrel"
+subpackages="$pkgname-dev
+ $pkgname-doc
+ $pkgname-qt
+ $pkgname-xorg
+ $pkgname-daemon::noarch
+ $pkgname-libs
+ $pkgname-plugins
+
+ $pkgname-plugins-access:plugins_access
+ $pkgname-plugins-access_output:plugins_access_output
+ $pkgname-plugins-audio_filter:plugins_audio_filter
+ $pkgname-plugins-audio_mixer:plugins_audio_mixer
+ $pkgname-plugins-audio_output:plugins_audio_output
+ $pkgname-plugins-codec:plugins_codec
+ $pkgname-plugins-control:plugins_control
+ $pkgname-plugins-demux:plugins_demux
+ $pkgname-plugins-gui:plugins_gui
+ $pkgname-plugins-lua:plugins_lua
+ $pkgname-plugins-meta_engine:plugins_meta_engine
+ $pkgname-plugins-misc:plugins_misc
+ $pkgname-plugins-mux:plugins_mux
+ $pkgname-plugins-notify:plugins_notify
+ $pkgname-plugins-packetizer:plugins_packetizer
+ $pkgname-plugins-services_discovery:plugins_services_discovery
+ $pkgname-plugins-stream_filter:plugins_stream_filter
+ $pkgname-plugins-stream_out:plugins_stream_out
+ $pkgname-plugins-text_renderer:plugins_text_renderer
+ $pkgname-plugins-video_chroma:plugins_video_chroma
+ $pkgname-plugins-video_filter:plugins_video_filter
+ $pkgname-plugins-video_output:plugins_video_output
+ $pkgname-plugins-visualization:plugins_visualization"
+depends="ttf-dejavu $pkgname-plugins"
+makedepends="
+ a52dec-dev
+ alsa-lib-dev
+ automake
+ autoconf
+ bison
+ libtool
+ dbus-dev
+ faad2-dev
+ ffmpeg-dev
+ flac-dev
+ flex
+ fluidsynth-dev
+ freetype-dev
+ fribidi-dev
+ gtk+3.0-dev
+ libbluray-dev>=0.2.1 libbluray-dev<20100000
+ libavc1394-dev
+ libcddb-dev
+ libdc1394-dev>=2.1.0
+ libdca-dev
+ libdvbpsi-dev
+ libdvdnav-dev
+ libdvdread-dev
+ libgcrypt-dev
+ libice-dev
+ libmad-dev
+ libmatroska-dev
+ libmpeg2-dev
+ libnotify-dev
+ libogg-dev
+ libraw1394-dev>=2.0.1
+ librsvg-dev
+ libshout-dev
+ libsm-dev
+ libtheora-dev
+ libva-dev
+ libvdpau-dev
+ libvorbis-dev
+ libvpx-dev
+ libx11-dev
+ libxext-dev
+ libxinerama-dev
+ libxml2-dev
+ libxpm-dev
+ libxv-dev
+ live-media-dev>=2012.01.26
+ lua5.2-dev
+ mesa-dev
+ ncurses-dev
+ opus-dev
+ pkgconfig
+ pulseaudio-dev
+ qt5-qtbase-dev
+ qt5-qtsvg-dev
+ sdl2-dev
+ speex-dev
+ speexdsp-dev
+ sysfsutils-dev
+ taglib-dev
+ eudev-dev
+ v4l-utils-dev
+ wayland-protocols
+ x264-dev
+ x265-dev
+ xcb-util-renderutil-dev
+ xcb-util-keysyms-dev
+ xdg-utils
+ "
+source="http://get.videolan.org/vlc/$_ver/vlc-$_ver.tar.xz
+ omxil-rpi-codecs.patch
+ check-headless.patch
+ disable-sub-autodetect-fuzzy-1-test.patch
+ fribidi-update.patch
+ tar-compat.patch
+ test-s390x.patch
+ vlc-libs.trigger"
+
+builddir="$srcdir"/$pkgname-$_ver
+
+prepare() {
+ default_prepare
+ NOCONFIGURE=1 ./bootstrap
+}
+
+build() {
+ local _arch_opts=
+ cd "$builddir"
+ export CFLAGS="$CFLAGS -D_GNU_SOURCE"
+
+ case "$CARCH" in
+ arm*) _arch_opts="--enable-omxil --enable-omxil-vout --enable-rpi-omxil" ;;
+ ppc64*) _arch_opts="--enable-altivec" ;;
+ esac
+
+ LUA=lua5.2 \
+ LUAC=luac5.2 \
+ BUILDCC="${CC:-gcc} -std=c99" \
+ ./configure \
+ --build=$CBUILD \
+ --host=$CHOST \
+ --prefix=/usr \
+ --disable-mmx \
+ --disable-sse \
+ --enable-nls \
+ --enable-optimizations \
+ --enable-optimize-memory \
+ --disable-rpath \
+ --enable-a52 \
+ --enable-avcodec \
+ --enable-avformat \
+ --enable-bluray \
+ --enable-cdda \
+ --enable-dbus \
+ --enable-dc1394 \
+ --enable-dca \
+ --enable-dvbpsi \
+ --enable-dvdread \
+ --enable-dvdnav \
+ --enable-faad \
+ --enable-flac \
+ --enable-fluidsynth \
+ --enable-jpeg \
+ --enable-libcddb \
+ --enable-libmpeg2 \
+ --enable-libva \
+ --enable-live555 \
+ --enable-mad \
+ --enable-merge-ffmpeg \
+ --enable-notify \
+ --enable-ncurses \
+ --enable-ogg \
+ --enable-opus \
+ --enable-png \
+ --enable-pulse \
+ --enable-qt \
+ --enable-realrtsp \
+ --enable-shout \
+ --enable-skins2 \
+ --enable-speex \
+ --enable-sout \
+ --enable-taglib \
+ --enable-theora \
+ --enable-udev \
+ --enable-v4l2 \
+ --enable-vdpau \
+ --enable-vlm \
+ --enable-vorbis \
+ --enable-vpx \
+ --enable-wma-fixed \
+ --enable-x264 \
+ --enable-x265 \
+ --enable-xvideo \
+ $_arch_opts
+
+ make
+}
+
+package() {
+ cd "$builddir"
+ make DESTDIR="$pkgdir" install
+ # delete cache as it's autocreated by trigger
+ rm -rf "$pkgdir"/usr/lib/vlc/plugins/plugins.dat
+ # delete unneeded mozilla and kde support files
+ rm -rf "$pkgdir"/usr/lib/mozilla
+ rm -rf "$pkgdir"/usr/share/kde4
+}
+
+check() {
+ cd "$builddir"
+ make check
+}
+
+plugins() {
+ pkgdesc="$pkgname all plugins meta package"
+ depends="$pkgname-plugins-access
+ $pkgname-plugins-access_output
+ $pkgname-plugins-audio_filter
+ $pkgname-plugins-audio_mixer
+ $pkgname-plugins-audio_output
+ $pkgname-plugins-codec
+ $pkgname-plugins-control
+ $pkgname-plugins-demux
+ $pkgname-plugins-gui
+ $pkgname-plugins-lua
+ $pkgname-plugins-meta_engine
+ $pkgname-plugins-misc
+ $pkgname-plugins-mux
+ $pkgname-plugins-notify
+ $pkgname-plugins-packetizer
+ $pkgname-plugins-services_discovery
+ $pkgname-plugins-stream_filter
+ $pkgname-plugins-stream_out
+ $pkgname-plugins-text_renderer
+ $pkgname-plugins-video_chroma
+ $pkgname-plugins-video_filter
+ $pkgname-plugins-video_output
+ $pkgname-plugins-visualization"
+ mkdir -p "$subpkgdir"
+}
+
+_mv() {
+ local dir=${1%/*}
+ mkdir -p "$subpkgdir"/$dir
+ mv "$1" "$subpkgdir"/$dir/
+}
+
+qt() {
+ pkgdesc="Qt frontend for VLC"
+ depends="vlc-xorg=$pkgver-r$pkgrel"
+ cd "$pkgdir"
+ # scan for elf files that directly or indirectly depends on
+ # libQt* libraries
+ cd "$pkgdir"
+ for i in $(find . -type f ); do
+ if ldd $i 2>/dev/null | grep -q "libQt"; then
+ _mv "$i" || return 1
+ fi
+ done
+ mkdir -p "$subpkgdir"/usr/bin
+ mv "$pkgdir"/usr/bin/qvlc \
+ "$subpkgdir"/usr/bin/
+}
+
+xorg() {
+ pkgdesc="Video LAN X.org support"
+ depends="xdg-utils vlc=$pkgver-r$pkgrel"
+
+ # scan for elf files that directly or indirectly depends on
+ # libX* libraries
+ cd "$pkgdir"
+ for i in $(find . -type f ); do
+ if ldd $i 2>/dev/null | grep -E -q "libX|x11|libxcb|libGL"; then
+ echo $i | grep libavcodec_plugin.so || _mv "$i" || return 1
+ fi
+ done
+
+ mkdir -p "$subpkgdir"/usr/bin
+ mv "$pkgdir"/usr/bin/svlc \
+ "$subpkgdir"/usr/bin
+
+ mkdir -p "$subpkgdir"/usr/share/vlc
+ mv "$pkgdir"/usr/share/applications \
+ "$pkgdir"/usr/share/icons \
+ "$subpkgdir"/usr/share/
+
+ mv "$pkgdir"/usr/share/vlc/skins2 \
+ "$subpkgdir"/usr/share/vlc
+}
+
+daemon() {
+ pkgdesc="Support for running VLC as a daemon"
+ install="vlc-daemon.pre-install"
+ depends="vlc=$pkgver-r$pkgrel"
+
+ mkdir -p "$subpkgdir"
+ cd "$pkgdir"
+ install -D -m755 ../../vlc.initd $subpkgdir/etc/init.d/vlc
+ install -D -m664 ../../vlc.confd $subpkgdir/etc/conf.d/vlc
+ install -d -o vlc -g vlc "$subpkgdir"/var/log/vlc
+}
+
+libs() {
+ depends=
+ mkdir -p "$subpkgdir"/usr/lib/vlc
+ mv "$pkgdir"/usr/lib/vlc/vlc-cache-gen \
+ "$subpkgdir"/usr/lib/vlc/
+ default_libs
+}
+
+_mv_plugins() {
+ local plugin=$1
+ pkgdesc="$pkgname $plugin plugin"
+ depends=
+ mkdir -p "$subpkgdir"/usr/lib/vlc/plugins
+ mv "$pkgdir"/usr/lib/vlc/plugins/"$plugin" \
+ "$subpkgdir"/usr/lib/vlc/plugins
+}
+
+plugins_access() { _mv_plugins access; }
+plugins_access_output() { _mv_plugins access_output; }
+plugins_audio_filter() { _mv_plugins audio_filter; }
+plugins_audio_mixer() { _mv_plugins audio_mixer; }
+plugins_audio_output() { _mv_plugins audio_output; }
+plugins_codec() { _mv_plugins codec; }
+plugins_control() { _mv_plugins control; }
+plugins_demux() { _mv_plugins demux; }
+plugins_gui() { _mv_plugins gui; }
+plugins_lua() { _mv_plugins lua; }
+plugins_meta_engine() { _mv_plugins meta_engine; }
+plugins_misc() { _mv_plugins misc; }
+plugins_mux() { _mv_plugins mux; }
+plugins_notify() { _mv_plugins notify; }
+plugins_packetizer() { _mv_plugins packetizer; }
+plugins_services_discovery() { _mv_plugins services_discovery; }
+plugins_stream_filter() { _mv_plugins stream_filter; }
+plugins_stream_out() { _mv_plugins stream_out; }
+plugins_text_renderer() { _mv_plugins text_renderer; }
+plugins_video_chroma() { _mv_plugins video_chroma; }
+plugins_video_filter() { _mv_plugins video_filter; }
+plugins_video_output() { _mv_plugins video_output; }
+plugins_visualization() { _mv_plugins visualization; }
+
+sha512sums="f2ba7586e8fb8c04484e62809265ec998e875b1eff03262bbf463370277a318816cbb8d260901c774e59443393b16b040cb714019c80e051578008abbf91b13c vlc-3.0.1.tar.xz
+e13e398b7bfd977f6e099bcb6cf8dc5cd5bad6dea3eff715881826246dc4329468846084aff2576de2b7fd28d3f06e7c327a6e4511a28d22e5cd198a81146c89 omxil-rpi-codecs.patch
+22d80df599b8b65a5439cefbb7140af8e9530f326d54945da3769af65f37518b99ec2cc8647aafd2763324a0698280915afe043cc87e5720c4694881ed35bffa check-headless.patch
+e214b407235cb3afb8bec93f20c9b42957b57e6fd3960679d3d4235e77762e03e64d03c01f00ef63d589e7c85aaad02ce6abbeeccd66b1867bc92451a5b5e9b0 disable-sub-autodetect-fuzzy-1-test.patch
+3338531d385f76d9eedf10498d1b0b78565c531eedb3018d4500e377815f9ccbfcc16ec398cb8559bcc624f65b61d376125c4a5e6880cbad90ec9880dd4b9ce5 fribidi-update.patch
+a117ca4d7fd66a5f959fdeaddfdce2f8442fe9f2c13995bb7f4792a7745c00813813aa962f76e957e3b0735344a5dc000e0644ce09f23458802a2932231655c3 tar-compat.patch
+c0107655249687655846a9547ca1a5670b9207443180600e7a149c69ffb96d7226787c19b018d4033db9b284c1a5faa8d7d42188ed40c3b8bb051256febf11c5 test-s390x.patch
+b67b6e21e9d4027aef1006e6057f9ba8e65ce3895b08f7b911b1675cff9bc423f64ee2c187c584860e9e5d4635a30408a7781add9694d9bba753eac37f357406 vlc-libs.trigger"
diff --git a/system/vlc/check-headless.patch b/system/vlc/check-headless.patch
new file mode 100644
index 000000000..25016f437
--- /dev/null
+++ b/system/vlc/check-headless.patch
@@ -0,0 +1,13 @@
+diff --git a/test/run_vlc.sh b/test/run_vlc.sh
+index af35987..9a0175b 100755
+--- a/test/run_vlc.sh
++++ b/test/run_vlc.sh
+@@ -2,7 +2,7 @@
+
+ set -e
+
+-VLC="./vlc --ignore-config --rc-fake-tty"
++VLC="./vlc -I dummy --ignore-config --rc-fake-tty"
+
+ $VLC -H
+ $VLC -vv vlc://quit
diff --git a/system/vlc/disable-sub-autodetect-fuzzy-1-test.patch b/system/vlc/disable-sub-autodetect-fuzzy-1-test.patch
new file mode 100644
index 000000000..b3dd8a1b7
--- /dev/null
+++ b/system/vlc/disable-sub-autodetect-fuzzy-1-test.patch
@@ -0,0 +1,20 @@
+This test fails on x86 and s390x so disable it for now
+reported upstream: https://trac.videolan.org/vlc/ticket/19321
+
+diff --git a/test/libvlc/slaves.c b/test/libvlc/slaves.c
+index 7b2c24fa43..7c47b3147b 100644
+--- a/test/libvlc/slaves.c
++++ b/test/libvlc/slaves.c
+@@ -194,10 +194,12 @@ main (void)
+ assert(p_expected_slaves[i].psz_uri != NULL);
+ }
+
++#if 0
+ printf("== Testing --sub-autodetect-fuzzy 1 (everything) ==\n");
+ test_media_has_slaves_from_parent(p_vlc, SLAVES_DIR "/test.mp4",
+ p_expected_slaves,
+ EXPECTED_SLAVES_COUNT);
++#endif
+ libvlc_release(p_vlc);
+
+ printf("== Testing --sub-autodetect-fuzzy 2 (full, left, and right match) ==\n");
diff --git a/system/vlc/fribidi-update.patch b/system/vlc/fribidi-update.patch
new file mode 100644
index 000000000..fd293eea4
--- /dev/null
+++ b/system/vlc/fribidi-update.patch
@@ -0,0 +1,83 @@
+From 26e2d3906658c30f2f88f4b1bc9630ec43bf5525 Mon Sep 17 00:00:00 2001
+From: Shaleen Jain <shaleen@jain.sh>
+Date: Sun, 25 Feb 2018 18:42:27 +0530
+Subject: [PATCH 1/1] fribidi: update for version 1.0
+
+Update functions deprecated in version 1.0 when building with release 1.0 and
+above.
+
+Signed-off-by: Thomas Guillem <thomas@gllm.fr>
+---
+ modules/text_renderer/freetype/text_layout.c | 24 ++++++++++++++++++++++++
+ 1 file changed, 24 insertions(+)
+
+diff --git a/modules/text_renderer/freetype/text_layout.c b/modules/text_renderer/freetype/text_layout.c
+index 13efd567b4..1a28786d09 100644
+--- a/modules/text_renderer/freetype/text_layout.c
++++ b/modules/text_renderer/freetype/text_layout.c
+@@ -153,6 +153,9 @@ typedef struct paragraph_t
+
+ #ifdef HAVE_FRIBIDI
+ FriBidiCharType *p_types;
++#if FRIBIDI_MAJOR_VERSION >= 1
++ FriBidiBracketType *p_btypes;
++#endif
+ FriBidiLevel *p_levels;
+ FriBidiStrIndex *pi_reordered_indices;
+ FriBidiParType paragraph_type;
+@@ -361,6 +364,9 @@ static paragraph_t *NewParagraph( filter_t *p_filter,
+ #ifdef HAVE_FRIBIDI
+ p_paragraph->p_levels = vlc_alloc( i_size, sizeof( *p_paragraph->p_levels ) );
+ p_paragraph->p_types = vlc_alloc( i_size, sizeof( *p_paragraph->p_types ) );
++#if FRIBIDI_MAJOR_VERSION >= 1
++ p_paragraph->p_btypes = vlc_alloc( i_size, sizeof( *p_paragraph->p_btypes ) );
++#endif
+ p_paragraph->pi_reordered_indices =
+ vlc_alloc( i_size, sizeof( *p_paragraph->pi_reordered_indices ) );
+
+@@ -398,6 +404,9 @@ error:
+ #ifdef HAVE_FRIBIDI
+ if( p_paragraph->p_levels ) free( p_paragraph->p_levels );
+ if( p_paragraph->p_types ) free( p_paragraph->p_types );
++#if FRIBIDI_MAJOR_VERSION >= 1
++ if( p_paragraph->p_btypes ) free( p_paragraph->p_btypes );
++#endif
+ if( p_paragraph->pi_reordered_indices )
+ free( p_paragraph->pi_reordered_indices );
+ #endif
+@@ -424,6 +433,9 @@ static void FreeParagraph( paragraph_t *p_paragraph )
+ #ifdef HAVE_FRIBIDI
+ free( p_paragraph->pi_reordered_indices );
+ free( p_paragraph->p_types );
++#if FRIBIDI_MAJOR_VERSION >= 1
++ free( p_paragraph->p_btypes );
++#endif
+ free( p_paragraph->p_levels );
+ #endif
+
+@@ -436,10 +448,22 @@ static int AnalyzeParagraph( paragraph_t *p_paragraph )
+ fribidi_get_bidi_types( p_paragraph->p_code_points,
+ p_paragraph->i_size,
+ p_paragraph->p_types );
++#if FRIBIDI_MAJOR_VERSION >= 1
++ fribidi_get_bracket_types( p_paragraph->p_code_points,
++ p_paragraph->i_size,
++ p_paragraph->p_types,
++ p_paragraph->p_btypes );
++ fribidi_get_par_embedding_levels_ex( p_paragraph->p_types,
++ p_paragraph->p_btypes,
++ p_paragraph->i_size,
++ &p_paragraph->paragraph_type,
++ p_paragraph->p_levels );
++#else
+ fribidi_get_par_embedding_levels( p_paragraph->p_types,
+ p_paragraph->i_size,
+ &p_paragraph->paragraph_type,
+ p_paragraph->p_levels );
++#endif
+
+ #ifdef HAVE_HARFBUZZ
+ hb_unicode_funcs_t *p_funcs = hb_unicode_funcs_get_default();
+--
+2.11.0
+
diff --git a/system/vlc/omxil-rpi-codecs.patch b/system/vlc/omxil-rpi-codecs.patch
new file mode 100644
index 000000000..9b7accfe7
--- /dev/null
+++ b/system/vlc/omxil-rpi-codecs.patch
@@ -0,0 +1,15 @@
+--- vlc-2.2.0/modules/codec/omxil/omxil_core.c.orig 2015-02-28 08:37:54.044936036 -0200
++++ vlc-2.2.0/modules/codec/omxil/omxil_core.c 2015-02-28 08:38:38.738271654 -0200
+@@ -204,6 +204,12 @@
+ #ifdef RPI_OMX
+ { "video_decoder.avc", "OMX.broadcom.video_decode" },
+ { "video_decoder.mpeg2", "OMX.broadcom.video_decode" },
++ { "video_decoder.mpeg4", "OMX.broadcom.video_decode" },
++ { "video_decoder.vp6", "OMX.broadcom.video_decode" },
++ { "video_decoder.vp8", "OMX.broadcom.video_decode" },
++ { "video_decoder.theora", "OMX.broadcom.video_decode" },
++ { "video_decoder.mjpg", "OMX.broadcom.video_decode" },
++ { "video_decoder.vc1", "OMX.broadcom.video_decode" },
+ { "iv_renderer", "OMX.broadcom.video_render" },
+ #endif
+ { 0, 0 }
diff --git a/system/vlc/tar-compat.patch b/system/vlc/tar-compat.patch
new file mode 100644
index 000000000..34169ef56
--- /dev/null
+++ b/system/vlc/tar-compat.patch
@@ -0,0 +1,11 @@
+--- vlc-3.0.1/share/Makefile.am.old 2018-02-06 18:41:06.000000000 +0000
++++ vlc-3.0.1/share/Makefile.am 2018-04-05 23:19:37.081889895 +0000
+@@ -94,7 +94,7 @@
+ $(AM_V_at)rm -f -- skins2/default.vlt.tmp
+ $(AM_V_GEN)GZIP=--no-name \
+ tar cvvzf skins2/default.vlt.tmp \
+- --owner=root --group=root --directory="$(srcdir)/skins2" \
++ --uid=0 --gid=0 --directory="$(srcdir)/skins2" \
+ default/
+ $(AM_V_at)mv -f -- skins2/default.vlt.tmp skins2/default.vlt
+
diff --git a/system/vlc/test-s390x.patch b/system/vlc/test-s390x.patch
new file mode 100644
index 000000000..8f221ee06
--- /dev/null
+++ b/system/vlc/test-s390x.patch
@@ -0,0 +1,13 @@
+diff --git a/test/modules/packetizer/hxxx.c b/test/modules/packetizer/hxxx.c
+index 93362a1..e1b7604 100644
+--- a/test/modules/packetizer/hxxx.c
++++ b/test/modules/packetizer/hxxx.c
+@@ -210,7 +210,7 @@ static void test_annexb()
+
+ int main( void )
+ {
+- test_annexb();
++ //test_annexb();
+
+ return 0;
+ }
diff --git a/system/vlc/vlc-daemon.pre-install b/system/vlc/vlc-daemon.pre-install
new file mode 100644
index 000000000..aed6c1893
--- /dev/null
+++ b/system/vlc/vlc-daemon.pre-install
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+groups="vlc audio video"
+
+for group in $groups; do
+ addgroup -S $group 2>/dev/null
+done
+adduser -S -D -h /home/vlc -s /bin/sh -G vlc -g vlc vlc 2>/dev/null
+
+# make sure vlc are in all groups
+for group in $groups; do
+ addgroup vlc $group 2>/dev/null
+done
+
+exit 0
diff --git a/system/vlc/vlc-libs.trigger b/system/vlc/vlc-libs.trigger
new file mode 100644
index 000000000..c13bace99
--- /dev/null
+++ b/system/vlc/vlc-libs.trigger
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+exec /usr/lib/vlc/vlc-cache-gen "$@" >&/dev/null
+exit 0
+
diff --git a/system/vlc/vlc.confd b/system/vlc/vlc.confd
new file mode 100644
index 000000000..9a58842bd
--- /dev/null
+++ b/system/vlc/vlc.confd
@@ -0,0 +1,15 @@
+# Sample vlc params suitable for running as a daemon
+
+## --file-logging enable file logging
+## --logfile logfile name/path
+## -vvv verbose logging
+## -I dummy disable X11 interface
+## --sout PARAMS encoding parameters
+
+
+## Do NOT quote 'PARAMS' otherwise shell expansions will broke vlc
+##
+## The --daemon option will automatically be added so no need to add it
+## here.
+
+VLC_OPTS="--quiet -I dummy alsa://hw:0,0 --file-logging --logfile /var/log/vlc/vlc.log --sout #transcode{acodec=mp3,ab=48,channels=1,samplerate=22050}:std{access=http,mux=ogg,dst=:8080}"
diff --git a/system/vlc/vlc.initd b/system/vlc/vlc.initd
new file mode 100755
index 000000000..541a07180
--- /dev/null
+++ b/system/vlc/vlc.initd
@@ -0,0 +1,32 @@
+#!/sbin/openrc-run
+
+description="VideoLAN daemon"
+pidfile="/var/run/vlc/${RC_SVCNAME}.pid"
+command="/usr/bin/vlc"
+
+depend() {
+ need net
+ after firewall
+}
+
+start_pre() {
+ checkpath --directory --owner vlc:vlc --mode 775 ${pidfile%/*}
+}
+
+start() {
+ ebegin "Starting ${RC_SVCNAME}"
+ start-stop-daemon --start \
+ --user vlc \
+ --pidfile ${pidfile} \
+ --exec ${command} \
+ -- \
+ --daemon --pidfile ${pidfile} ${VLC_OPTS}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping ${RC_SVCNAME}"
+ start-stop-daemon --stop \
+ --pidfile ${pidfile}
+ eend $?
+}
diff --git a/user/analitza/APKBUILD b/user/analitza/APKBUILD
new file mode 100644
index 000000000..2c562f252
--- /dev/null
+++ b/user/analitza/APKBUILD
@@ -0,0 +1,43 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=analitza
+pkgver=17.12.2
+pkgrel=0
+pkgdesc="Mathematical object library"
+url="https://api.kde.org/4.x-api/kdeedu-apidocs/analitza/html/index.html"
+arch="all"
+license="LGPL-2.0+"
+depends=""
+depends_dev="qt5-qtbase-dev qt5-qtsvg-dev qt5-qtdeclarative-dev eigen-dev"
+makedepends="$depends_dev cmake extra-cmake-modules qt5-qttools-dev"
+install=""
+subpackages="$pkgname-dev $pkgname-lang"
+source="http://download.kde.org/stable/applications/$pkgver/src/analitza-$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 -E '(export|curve|plots|surface)'
+}
+
+package() {
+ cd "$builddir"
+ make DESTDIR="$pkgdir" install
+}
+
+sha512sums="e326d397db3193492258f156cd71f63e4544abd9724b58769a1593ff57242b18de09291a433ea37658015bd57f75e430ed95bdf99d3863fccfc4b546a9686933 analitza-17.12.2.tar.xz"
diff --git a/user/artikulate/APKBUILD b/user/artikulate/APKBUILD
new file mode 100644
index 000000000..31a45e447
--- /dev/null
+++ b/user/artikulate/APKBUILD
@@ -0,0 +1,45 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=artikulate
+pkgver=17.12.2
+pkgrel=0
+pkgdesc="Pronunciation trainer for languages"
+url="https://www.kde.org/applications/education/artikulate/"
+arch="all"
+license="GPL-2.0-only"
+depends=""
+makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtxmlpatterns-dev
+ kdoctools-dev ki18n-dev kconfig-dev kcrash-dev knewstuff-dev
+ kxmlgui-dev karchive-dev qt5-qtmultimedia-dev"
+install=""
+subpackages="$pkgname-doc $pkgname-lang"
+source="http://download.kde.org/stable/applications/$pkgver/src/artikulate-$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"
+ # TestCourseFiles needs X11
+ CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E TestCourseFiles
+}
+
+package() {
+ cd "$builddir"
+ make DESTDIR="$pkgdir" install
+}
+
+sha512sums="a5157cb099e32069e30fdee0be3cbc484a5e13b9f968da8bc04526c49db3ba47d07c5deb9a432bcef9154e616aba9ff7911cbb7bc09307e44fbd2149bfd2e9a9 artikulate-17.12.2.tar.xz"
diff --git a/user/audiofile/APKBUILD b/user/audiofile/APKBUILD
new file mode 100644
index 000000000..6fd6242f4
--- /dev/null
+++ b/user/audiofile/APKBUILD
@@ -0,0 +1,47 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=audiofile
+pkgver=0.3.6
+pkgrel=0
+pkgdesc="Library for reading and writing audio files in many formats"
+url="https://audiofile.68k.org"
+arch="all"
+license="LGPL-2.1+"
+depends=""
+depends_dev="flac-dev"
+makedepends="$depends_dev alsa-lib-dev"
+install=""
+subpackages="$pkgname-dev $pkgname-doc"
+source="https://audiofile.68k.org/audiofile-$pkgver.tar.gz
+ tests-unsigned-gcc6.patch"
+
+prepare() {
+ default_prepare
+ update_config_sub
+}
+
+build() {
+ cd "$builddir"
+ export CXXFLAGS="$CXXFLAGS -fpermissive"
+ ./configure \
+ --build=$CBUILD \
+ --host=$CHOST \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --localstatedir=/var
+ make
+}
+
+check() {
+ cd "$builddir"
+ make check
+}
+
+package() {
+ cd "$builddir"
+ make DESTDIR="$pkgdir" install
+}
+
+sha512sums="f9a1182d93e405c21eba79c5cc40962347bff13f1b3b732d9a396e3d1675297515188bd6eb43033aaa00e9bde74ff4628c1614462456529cabba464f03c1d5fa audiofile-0.3.6.tar.gz
+b85546eaccf0911fb2f5ba26c323ea2c0b18cae7d7476d5ac9e821c90097f331e3391b787f390d130382fffb6b777887344f914489ca1bc0a3974f1ebe16e328 tests-unsigned-gcc6.patch"
diff --git a/user/audiofile/tests-unsigned-gcc6.patch b/user/audiofile/tests-unsigned-gcc6.patch
new file mode 100644
index 000000000..34e179a92
--- /dev/null
+++ b/user/audiofile/tests-unsigned-gcc6.patch
@@ -0,0 +1,29 @@
+--- audiofile-0.3.6/test/NeXT.cpp.old 2013-02-11 17:23:26.000000000 +0000
++++ audiofile-0.3.6/test/NeXT.cpp 2018-03-25 04:19:46.050797108 +0000
+@@ -37,7 +37,7 @@
+
+ #include "TestUtilities.h"
+
+-const char kDataUnspecifiedLength[] =
++const unsigned char kDataUnspecifiedLength[] =
+ {
+ '.', 's', 'n', 'd',
+ 0, 0, 0, 24, // offset of 24 bytes
+@@ -57,7 +57,7 @@
+ 0, 55
+ };
+
+-const char kDataTruncated[] =
++const unsigned char kDataTruncated[] =
+ {
+ '.', 's', 'n', 'd',
+ 0, 0, 0, 24, // offset of 24 bytes
+@@ -152,7 +152,7 @@
+ ASSERT_EQ(::unlink(testFileName.c_str()), 0);
+ }
+
+-const char kDataZeroChannels[] =
++const unsigned char kDataZeroChannels[] =
+ {
+ '.', 's', 'n', 'd',
+ 0, 0, 0, 24, // offset of 24 bytes
diff --git a/user/blinken/APKBUILD b/user/blinken/APKBUILD
new file mode 100644
index 000000000..851889c49
--- /dev/null
+++ b/user/blinken/APKBUILD
@@ -0,0 +1,44 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=blinken
+pkgver=17.12.2
+pkgrel=0
+pkgdesc="Memory enhancement game"
+url="https://www.kde.org/applications/education/blinken/"
+arch="all"
+license="GPL-2.0-only"
+depends=""
+makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev ki18n-dev
+ kxmlgui-dev kguiaddons-dev kdoctools-dev kdbusaddons-dev kcrash-dev
+ phonon-dev"
+install=""
+subpackages="$pkgname-doc $pkgname-lang"
+source="http://download.kde.org/stable/applications/$pkgver/src/blinken-$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="a09b23b2cc91513c2cbabbdb94b2d45aa987f21d5f135f3f878163d3ee9211eab6a2c26d7e0c979122b6361df7b8f9147f457432bb3a6277eb1e513b1c811dbc blinken-17.12.2.tar.xz"
diff --git a/user/blinken/test.patch b/user/blinken/test.patch
new file mode 100644
index 000000000..d24c03491
--- /dev/null
+++ b/user/blinken/test.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2a1b077..019efcd 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -17,7 +17,7 @@ find_package (KF5 REQUIRED COMPONENTS
+ I18n XmlGui GuiAddons DocTools DBusAddons Crash
+ )
+
+-find_package (Phonon4Qt5)
++find_package (Phonon4Qt5 REQUIRED)
+
+ include(KDEInstallDirs)
+ include(KDECompilerSettings NO_POLICY_SCOPE)
diff --git a/user/dragonplayer/APKBUILD b/user/dragonplayer/APKBUILD
new file mode 100644
index 000000000..618d6f60d
--- /dev/null
+++ b/user/dragonplayer/APKBUILD
@@ -0,0 +1,46 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=dragonplayer
+pkgver=17.12.2
+pkgrel=0
+pkgdesc="Multimedia player with a focus on simplicity"
+url="https://www.kde.org/applications/multimedia/dragonplayer/"
+arch="all"
+license="GPL-2.0-only"
+depends=""
+makedepends="cmake extra-cmake-modules qt5-qtbase-dev kconfig-dev kcrash-dev
+ kconfigwidgets-dev kcoreaddons-dev kdbusaddons-dev kdoctools-dev
+ ki18n-dev kjobwidgets-dev kio-dev kparts-dev solid-dev phonon-dev
+ kwidgetsaddons-dev kwindowsystem-dev kxmlgui-dev knotifications-dev"
+install=""
+subpackages="$pkgname-doc $pkgname-lang"
+source="http://download.kde.org/stable/applications/$pkgver/src/dragon-$pkgver.tar.xz"
+builddir="$srcdir/dragon-$pkgver"
+
+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="8df5e3b846b01cf56fe19413aa16ec99933fe85bc15a5e04d3203d6020c335c715e7ce23a424edb3f3544f12a0f647988777f7c0ac213b618008f270edb7ffd9 dragon-17.12.2.tar.xz"
diff --git a/user/fluidsynth/APKBUILD b/user/fluidsynth/APKBUILD
new file mode 100644
index 000000000..c9865559a
--- /dev/null
+++ b/user/fluidsynth/APKBUILD
@@ -0,0 +1,41 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=fluidsynth
+pkgver=1.1.10
+pkgrel=0
+pkgdesc="Real-time, software synthesiser based on SoundFont 2"
+url="http://www.fluidsynth.org/"
+arch="all"
+license="LGPL-2.1+"
+depends=""
+makedepends="alsa-lib-dev dbus-dev glib-dev libsndfile-dev"
+install=""
+subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
+source="fluidsynth-$pkgver.tar.gz::https://github.com/FluidSynth/fluidsynth/archive/v$pkgver.tar.gz"
+
+build() {
+ cd "$builddir"
+ if [ "$CBUILD" != "$CHOST" ]; then
+ CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+ fi
+ cmake \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DLIB_INSTALL_DIR=lib \
+ -DBUILD_SHARED_LIBS=True \
+ -DCMAKE_BUILD_TYPE=RelWithDebugInfo \
+ -DCMAKE_C_FLAGS="$CFLAGS" \
+ ${CMAKE_CROSSOPTS}
+ make
+}
+
+check() {
+ cd "$builddir"
+ CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+}
+
+package() {
+ cd "$builddir"
+ make DESTDIR="$pkgdir" install
+}
+
+sha512sums="7ff7757baf6dee37f65a4fd214ffab1aa1434cfd1545deb4108fe2e9b0ed19d616880b2740a693b51ade0a4be998a671910b43cae26eb67fb97b16a513752cbc fluidsynth-1.1.10.tar.gz"
diff --git a/user/gcompris-qt/APKBUILD b/user/gcompris-qt/APKBUILD
new file mode 100644
index 000000000..501b791e2
--- /dev/null
+++ b/user/gcompris-qt/APKBUILD
@@ -0,0 +1,44 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=gcompris-qt
+pkgver=0.90
+pkgrel=0
+pkgdesc="Educational software suite in many languages"
+url="http://gcompris.net/"
+arch="all"
+options="!check" # No test suite.
+license="GPL-3.0-only"
+depends="gst-plugins-base qml-box2d"
+makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev
+ qt5-qtmultimedia-dev qt5-qtsvg-dev qt5-qtxmlpatterns-dev gstreamer-dev
+ qt5-qttools-dev qt5-qtsensors-dev kdoctools-dev"
+install=""
+langdir="/usr/share/gcompris-qt/translations"
+subpackages="$pkgname-doc $pkgname-lang"
+source="http://gcompris.net/download/qt/src/gcompris-qt-$pkgver.tar.xz"
+
+build() {
+ cd "$builddir"
+ mkdir build
+ cd build
+ 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
+}
+
+package() {
+ cd "$builddir"/build
+ make DESTDIR="$pkgdir" install
+}
+
+sha512sums="3eda9c608440f4a3888a156af0ee97c39714da0e83d8fd95cbbfd374caa07d19c37f97a4eb7e3240665629de8d96eec5acf9aeb1564f56d06208696583eadd74 gcompris-qt-0.90.tar.xz"
diff --git a/user/heirloom-pax/APKBUILD b/user/heirloom-pax/APKBUILD
new file mode 100644
index 000000000..3ccb03460
--- /dev/null
+++ b/user/heirloom-pax/APKBUILD
@@ -0,0 +1,32 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=heirloom-pax
+pkgver=1.0
+pkgrel=0
+pkgdesc="Portable Archive eXchange, the POSIX archival tool"
+url="http://heirloom.sourceforge.net/"
+arch="all"
+options="!check" # No test suite.
+license="Zlib"
+depends="!libarchive<3.3.2-r3"
+replaces="pax"
+makedepends="bsd-compat-headers bzip2-dev zlib-dev"
+subpackages="$pkgname-doc"
+source="https://distfiles.adelielinux.org/source/${pkgname}-$pkgver.tar.xz"
+
+build() {
+ cd "$builddir"
+ make LD="gcc"
+}
+
+package() {
+ cd "$builddir"
+
+ mkdir -p "$pkgdir"/usr/bin
+ mkdir -p "$pkgdir"/usr/5bin
+ mkdir -p "$pkgdir"/usr/share/man/man1
+ make install ROOT="$pkgdir"
+ rm -r "$pkgdir"/usr/5bin # we don't need 1992 spec pax
+}
+
+sha512sums="7b0ad20cc51b5bcec9c07e84c603e4891f636944f6f6bd13d3decb0e9d6b23d6164b663468ee2293b37721aae20334774f4e56fd8541ffceee934050e819b642 heirloom-pax-1.0.tar.xz"
diff --git a/user/id3lib/APKBUILD b/user/id3lib/APKBUILD
new file mode 100644
index 000000000..d97b8c684
--- /dev/null
+++ b/user/id3lib/APKBUILD
@@ -0,0 +1,51 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=id3lib
+pkgver=3.8.3
+pkgrel=0
+pkgdesc="Library for reading, writing, and manipulating ID3v2 tags"
+url="http://id3lib.sourceforge.net"
+arch="all"
+license="LGPL-2.0+"
+depends=""
+depends_dev="zlib-dev"
+makedepends="$depends_dev"
+install=""
+subpackages="$pkgname-dev"
+source="https://downloads.sourceforge.net/project/id3lib/id3lib/$pkgver/id3lib-$pkgver.tar.gz
+ modern-cpp.patch
+ test-expose-proper-stdlib-symbols.patch
+ "
+
+prepare() {
+ default_prepare
+ update_config_sub
+}
+
+build() {
+ cd "$builddir"
+ export CFLAGS="$CFLAGS -fPIC"
+ export CXXFLAGS="$CXXFLAGS -fPIC"
+ ./configure \
+ --build=$CBUILD \
+ --host=$CHOST \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --localstatedir=/var
+ make
+}
+
+check() {
+ cd "$builddir"
+ make check
+}
+
+package() {
+ cd "$builddir"
+ make DESTDIR="$pkgdir" install
+}
+
+sha512sums="3787e261f86933c1c2f2bff2c4b349b42f5d8636e489e4f39f9d75e6dfbdc79b87009a0f4ce4b786f2fb3dbc01ca9d56c4112095b46244f897e6c9a28573adaf id3lib-3.8.3.tar.gz
+334eed099c93ea279d877437a92f684bfb0df12774fd7fffb628b6e8c4b17b17952d6f7c0bf0dff03a87887f0f1233c70d98b69f23580dcf3bf64c8d4b93fc85 modern-cpp.patch
+cd79daddffbafc11e555f16be827ccedc03e419b7c24ab1da1852af294dc486a0836d612318eb9861691ef8462ca38be41cfa2c12849f022ebb187c6ef95a1b9 test-expose-proper-stdlib-symbols.patch"
diff --git a/user/id3lib/modern-cpp.patch b/user/id3lib/modern-cpp.patch
new file mode 100644
index 000000000..e56460167
--- /dev/null
+++ b/user/id3lib/modern-cpp.patch
@@ -0,0 +1,22 @@
+The <iomanip> header is already checked; <iomanip.h> is pre-C++98 alias.
+
+--- id3lib-3.8.3/configure.in.old 2003-03-02 00:23:00.000000000 +0000
++++ id3lib-3.8.3/configure.in 2018-03-25 06:43:58.270837035 +0000
+@@ -227,7 +227,6 @@
+ )
+ AC_CHECK_HEADERS( \
+ string \
+- iomanip.h \
+ ,,AC_MSG_ERROR([Missing a vital header file for id3lib])
+ )
+
+--- id3lib-3.8.3/configure.old 2003-03-02 00:23:00.000000000 +0000
++++ id3lib-3.8.3/configure 2018-03-25 06:44:02.260837054 +0000
+@@ -10296,7 +10296,6 @@
+
+ for ac_header in \
+ string \
+- iomanip.h \
+
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
diff --git a/user/id3lib/test-expose-proper-stdlib-symbols.patch b/user/id3lib/test-expose-proper-stdlib-symbols.patch
new file mode 100644
index 000000000..fbb4d5260
--- /dev/null
+++ b/user/id3lib/test-expose-proper-stdlib-symbols.patch
@@ -0,0 +1,12 @@
+--- id3lib-3.8.3/examples/test_io.cpp.old 2003-03-02 00:23:00.000000000 +0000
++++ id3lib-3.8.3/examples/test_io.cpp 2018-03-25 19:10:54.891043851 +0000
+@@ -11,6 +11,9 @@
+ #include <id3/io_strings.h>
+ #include <id3/utils.h>
+
++using std::cin;
++using std::dec;
++using std::hex;
+ using std::cout;
+ using std::endl;
+ using std::cerr;
diff --git a/user/juk/APKBUILD b/user/juk/APKBUILD
new file mode 100644
index 000000000..5a3efc433
--- /dev/null
+++ b/user/juk/APKBUILD
@@ -0,0 +1,46 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=juk
+pkgver=17.12.2
+pkgrel=0
+pkgdesc="KDE Jukebox"
+url="https://juk.kde.org/"
+arch="all"
+license="GPL-2.0-only"
+depends=""
+makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev
+ kcoreaddons-dev kcompletion-dev kcrash-dev kglobalaccel-dev ki18n-dev
+ kiconthemes-dev kdoctools-dev kio-dev kjobwidgets-dev ktextwidgets-dev
+ knotifications-dev kxmlgui-dev kwallet-dev kwidgetsaddons-dev
+ kwindowsystem-dev taglib-dev phonon-dev"
+install=""
+subpackages="$pkgname-doc $pkgname-lang"
+source="http://download.kde.org/stable/applications/$pkgver/src/juk-$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="32f35ba5d1f7bc0d38555ab5a1da3deda0055e96ec2ca993f18f5339b3e231d903fa73d1a26a72413a159708cd08575b111bae8046603672f80f20678c36a362 juk-17.12.2.tar.xz"
diff --git a/user/kaffeine/APKBUILD b/user/kaffeine/APKBUILD
new file mode 100644
index 000000000..f2501fae8
--- /dev/null
+++ b/user/kaffeine/APKBUILD
@@ -0,0 +1,44 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=kaffeine
+pkgver=2.0.14
+pkgrel=0
+pkgdesc="Media player with a focus on Digital TV (DVB)"
+url="https://www.kde.org/applications/multimedia/kaffeine/"
+arch="all"
+license="GPL-2.0-only"
+depends="vlc"
+makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtx11extras-dev
+ kcoreaddons-dev ki18n-dev kwidgetsaddons-dev kwindowsystem-dev kio-dev
+ kxmlgui-dev solid-dev kdbusaddons-dev vlc-dev libxscrnsaver-dev"
+install=""
+subpackages="$pkgname-doc $pkgname-lang"
+source="https://download.kde.org/stable/kaffeine/kaffeine-$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="03a4ffbfbe7b9c90de546bf7449e8e5f05d5e7023b75b5253297e885c412677a0c4b46c7f60761ef5f48ad3c284591acba6ff0fe4fa7256d5b01ca9a07d7276f kaffeine-2.0.14.tar.xz"
diff --git a/user/kalgebra/APKBUILD b/user/kalgebra/APKBUILD
new file mode 100644
index 000000000..7ef317ded
--- /dev/null
+++ b/user/kalgebra/APKBUILD
@@ -0,0 +1,44 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=kalgebra
+pkgver=17.12.2
+pkgrel=0
+pkgdesc="Graph calculator and plotter"
+url="https://www.kde.org/applications/education/kalgebra/"
+arch="all"
+license="GPL-2.0-only"
+depends=""
+makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev
+ qt5-qtsvg-dev analitza-dev ncurses-dev ki18n-dev kdoctools-dev kio-dev
+ kconfigwidgets-dev kwidgetsaddons-dev readline-dev"
+install=""
+subpackages="$pkgname-doc $pkgname-lang"
+source="http://download.kde.org/stable/applications/$pkgver/src/kalgebra-$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="28263c27a8f26c880237ab0fabc103dd4810e1bd42ce28a5890319105178289c96579dd15c6ef511b60860ebea5f8080bc5a5c0d3984fe3976375abbfc839fc7 kalgebra-17.12.2.tar.xz"
diff --git a/user/kalzium/APKBUILD b/user/kalzium/APKBUILD
new file mode 100644
index 000000000..032a5269d
--- /dev/null
+++ b/user/kalzium/APKBUILD
@@ -0,0 +1,47 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=kalzium
+pkgver=17.12.2
+pkgrel=0
+pkgdesc="Periodic table of elements (PSE) with calculators"
+url="https://www.kde.org/applications/education/kalzium/"
+arch="all"
+license="GPL-2.0-only"
+depends=""
+makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtscript-dev
+ eigen-dev qt5-qtdeclarative-dev qt5-qtsvg-dev karchive-dev kconfig-dev
+ kcoreaddons-dev kdoctools-dev ki18n-dev kdelibs4support-dev khtml-dev
+ kparts-dev kplotting-dev solid-dev kunitconversion-dev
+ kwidgetsaddons-dev"
+install=""
+subpackages="$pkgname-doc $pkgname-lang"
+source="http://download.kde.org/stable/applications/$pkgver/src/kalzium-$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" \
+ -DEIGEN3_INCLUDE_DIR=/usr/include/eigen3 \
+ ${CMAKE_CROSSOPTS}
+ make
+}
+
+check() {
+ cd "$builddir"
+ CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+}
+
+package() {
+ cd "$builddir"
+ make DESTDIR="$pkgdir" install
+}
+
+sha512sums="2f2c4ed44cd0302b63819a4b6ec0ec15038aae74f825b30ae84ccb15eb593380b77a6de84a11d94dd20ae9e66225ad977e8d127b3c120bcaa02950ffe62737c7 kalzium-17.12.2.tar.xz"
diff --git a/user/kanagram/APKBUILD b/user/kanagram/APKBUILD
new file mode 100644
index 000000000..aef3dfa19
--- /dev/null
+++ b/user/kanagram/APKBUILD
@@ -0,0 +1,45 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=kanagram
+pkgver=17.12.2
+pkgrel=0
+pkgdesc="Letter order (anagram) game"
+url="https://www.kde.org/applications/education/kanagram/"
+arch="all"
+license="GPL-2.0-only"
+depends=""
+makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev
+ ki18n-dev kcrash-dev sonnet-dev kconfig-dev kconfigwidgets-dev kio-dev
+ kcoreaddons-dev kdeclarative-dev kdoctools-dev knewstuff-dev
+ libkeduvocdocument-dev"
+install=""
+subpackages="$pkgname-doc $pkgname-lang"
+source="http://download.kde.org/stable/applications/$pkgver/src/kanagram-$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="3de3df86c5f2b7c4a1590e9c3cb16509b5ef4f36e63981e1842c30e8034d34cac5626eb8ac00d3c8137a90975f64c14bc69dc6bf53551faf94d7e7991d3e5fe4 kanagram-17.12.2.tar.xz"
diff --git a/user/kbruch/APKBUILD b/user/kbruch/APKBUILD
new file mode 100644
index 000000000..2962c54a5
--- /dev/null
+++ b/user/kbruch/APKBUILD
@@ -0,0 +1,43 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=kbruch
+pkgver=17.12.2
+pkgrel=0
+pkgdesc="Practice calculating percentages and fractions"
+url="https://www.kde.org/applications/education/kbruch/"
+arch="all"
+license="GPL-2.0-only"
+depends=""
+makedepends="cmake extra-cmake-modules qt5-qtbase-dev kconfig-dev kcrash-dev
+ kdoctools-dev ki18n-dev kwidgetsaddons-dev kxmlgui-dev"
+install=""
+subpackages="$pkgname-doc $pkgname-lang"
+source="http://download.kde.org/stable/applications/$pkgver/src/kbruch-$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="fe8d14961034f6f85e568803ce5c12976d5396e8025cd6d53927edc83e10cb4b145fda18793798fcf91b3879aa2f093e41611d569acb709e2e5bcf9a30e43d2d kbruch-17.12.2.tar.xz"
diff --git a/user/kde-education/APKBUILD b/user/kde-education/APKBUILD
new file mode 100644
index 000000000..27686bf6b
--- /dev/null
+++ b/user/kde-education/APKBUILD
@@ -0,0 +1,27 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=kde-education
+pkgver=17.12.2
+pkgrel=0
+pkgdesc="Educational software from the KDE Software Collection"
+url="https://www.kde.org/applications/education/"
+arch="noarch"
+license="NCSA"
+options="!check" # Empty meta package, no point in testing.
+depends="artikulate blinken gcompris-qt kalgebra kalzium kanagram kbruch
+ kgeography khangman kig kiten klettres kmplot ktouch kturtle kwordquiz
+ labplot marble rocs step"
+makedepends=""
+install=""
+subpackages=""
+source="org.adelie-linux.about-education.desktop"
+build() {
+ return 0
+}
+
+package() {
+ mkdir -p "$pkgdir"/usr/share/applications
+ cp -pr "$srcdir"/*.desktop "$pkgdir"/usr/share/applications/
+}
+
+sha512sums="d88ee909e3ce8d26f3fbfeebc8656e0b72ec399f5ba0a1225babf217b01f5c7caec6e81e95cabb00b23dcbd41416360ae15958f38a5cbf4d548b89e3dd3229d5 org.adelie-linux.about-education.desktop"
diff --git a/user/kde-education/org.adelie-linux.about-education.desktop b/user/kde-education/org.adelie-linux.about-education.desktop
new file mode 100644
index 000000000..3aca1d1b5
--- /dev/null
+++ b/user/kde-education/org.adelie-linux.about-education.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Name=About KDE Education
+Comment=Learn about KDE educational software included with Adélie
+Icon=dialog-information
+Categories=KDE;Education
+Exec=xdg-open https://support.adelielinux.org/html/desktop-kde/education.html
diff --git a/user/kde-multimedia/APKBUILD b/user/kde-multimedia/APKBUILD
new file mode 100644
index 000000000..b7288b32d
--- /dev/null
+++ b/user/kde-multimedia/APKBUILD
@@ -0,0 +1,25 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=kde-multimedia
+pkgver=17.12.2
+pkgrel=0
+pkgdesc="Multimedia software from the KDE Software Collection"
+url="https://www.kde.org/applications/multimedia/"
+arch="noarch"
+license="NCSA"
+options="!check" # Empty meta package, no point in testing.
+depends="dragonplayer juk kaffeine kdenlive kmediaplayer kmix kwave"
+makedepends=""
+install=""
+subpackages=""
+source="org.adelie-linux.about-multimedia.desktop"
+build() {
+ return 0
+}
+
+package() {
+ mkdir -p "$pkgdir"/usr/share/applications
+ cp -pr "$srcdir"/*.desktop "$pkgdir"/usr/share/applications/
+}
+
+sha512sums="279f625f4a3190b2703bcfd10b15932aa99a0c00559c33d3676793c34023ea573404aac27879671af126bdf4c4078db0ef843d1e63aedd14acd7fafdedab3670 org.adelie-linux.about-multimedia.desktop"
diff --git a/user/kde-multimedia/org.adelie-linux.about-multimedia.desktop b/user/kde-multimedia/org.adelie-linux.about-multimedia.desktop
new file mode 100644
index 000000000..a59e6dcd6
--- /dev/null
+++ b/user/kde-multimedia/org.adelie-linux.about-multimedia.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Name=About KDE Multimedia
+Comment=Learn about KDE multimedia software included with Adélie
+Icon=dialog-information
+Categories=KDE;Multimedia
+Exec=xdg-open https://support.adelielinux.org/html/desktop-kde/multimedia.html
diff --git a/user/kdenlive/APKBUILD b/user/kdenlive/APKBUILD
new file mode 100644
index 000000000..22a707446
--- /dev/null
+++ b/user/kdenlive/APKBUILD
@@ -0,0 +1,48 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=kdenlive
+pkgver=17.12.2
+pkgrel=0
+pkgdesc="Libre video editor"
+url="https://kdenlive.org/"
+arch="all"
+license="GPL-2.0-only"
+depends=""
+makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtscript-dev kio-dev
+ qt5-qtsvg-dev qt5-qtdeclarative-dev kxmlgui-dev karchive-dev kcrash-dev
+ kbookmarks-dev kcoreaddons-dev kconfig-dev kconfigwidgets-dev mlt-dev
+ kdbusaddons-dev kwidgetsaddons-dev knotifyconfig-dev knewstuff-dev
+ knotifications-dev kguiaddons-dev ktextwidgets-dev kiconthemes-dev
+ kdoctools-dev kfilemetadata-dev"
+install=""
+subpackages="$pkgname-doc $pkgname-lang"
+source="http://download.kde.org/stable/applications/$pkgver/src/kdenlive-$pkgver.tar.xz"
+builddir="$srcdir/kdenlive-$pkgver"
+
+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="7a70ba8de9b034cabd6ce4fc6b92b01b57994327bab35e3410110b1d3dbe88fcae586a3f0ee82b387a205503b5853a3471c72d6c94bb6b0e9d5b96d7db24ecf0 kdenlive-17.12.2.tar.xz"
diff --git a/user/kgeography/APKBUILD b/user/kgeography/APKBUILD
new file mode 100644
index 000000000..aed98eaaf
--- /dev/null
+++ b/user/kgeography/APKBUILD
@@ -0,0 +1,44 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=kgeography
+pkgver=17.12.2
+pkgrel=0
+pkgdesc="Geography learning tool and trainer"
+url="https://www.kde.org/applications/education/kgeography/"
+arch="all"
+license="GPL-2.0-only"
+depends=""
+makedepends="cmake extra-cmake-modules qt5-qtbase-dev kxmlgui-dev kcrash-dev
+ kwidgetsaddons-dev kcoreaddons-dev kconfigwidgets-dev ki18n-dev
+ kitemviews-dev kiconthemes-dev kdoctools-dev"
+install=""
+subpackages="$pkgname-doc $pkgname-lang"
+source="http://download.kde.org/stable/applications/$pkgver/src/kgeography-$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="31bb488144ce8c17d3aa11e7155a83dbec49281803c814076c92fc71b758aaebce87d796dfb2b20f22baad50e1b31c466436d627a40bfa1265a6c02b84d11c32 kgeography-17.12.2.tar.xz"
diff --git a/user/khangman/APKBUILD b/user/khangman/APKBUILD
new file mode 100644
index 000000000..08f129dae
--- /dev/null
+++ b/user/khangman/APKBUILD
@@ -0,0 +1,45 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=khangman
+pkgver=17.12.2
+pkgrel=0
+pkgdesc="Hangman word game"
+url="https://www.kde.org/applications/education/khangman/"
+arch="all"
+license="GPL-2.0-only"
+depends=""
+makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev
+ qt5-qtsvg-dev ki18n-dev kcrash-dev kcompletion-dev kconfig-dev kio-dev
+ kcoreaddons-dev kconfigwidgets-dev kdeclarative-dev kdoctools-dev
+ knewstuff-dev knotifications-dev kxmlgui-dev libkeduvocdocument-dev"
+install=""
+subpackages="$pkgname-doc $pkgname-lang"
+source="http://download.kde.org/stable/applications/$pkgver/src/khangman-$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="fbaa1ef829f53966ab754d9d2ec2efc184505421c08f2f86cacdd2e05088deb9fead44db9b90556b9b5006dc0630f72ddd49b8b0214b179ffac501f204621000 khangman-17.12.2.tar.xz"
diff --git a/user/kig/APKBUILD b/user/kig/APKBUILD
new file mode 100644
index 000000000..fc2c4cc70
--- /dev/null
+++ b/user/kig/APKBUILD
@@ -0,0 +1,44 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=kig
+pkgver=17.12.2
+pkgrel=0
+pkgdesc="Interactive geometry learning and exploration tool"
+url=" https://www.kde.org/applications/education/kig/"
+arch="all"
+license="GPL-2.0+"
+depends=""
+makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kparts-dev
+ qt5-qtxmlpatterns-dev ki18n-dev ktexteditor-dev kiconthemes-dev
+ kconfigwidgets-dev karchive-dev kxmlgui-dev kcrash-dev kcoreaddons-dev"
+install=""
+subpackages="$pkgname-doc $pkgname-lang"
+source="http://download.kde.org/stable/applications/$pkgver/src/kig-$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="3bd9496e17e77ed475e6bb6d28ccb5d2a91dd261ffa7a4b3f8a7d5603b3688ca865da7cf1480411646efcc3a24a1f83bcb5078498ed8534d048b69becc71c653 kig-17.12.2.tar.xz"
diff --git a/user/kiten/APKBUILD b/user/kiten/APKBUILD
new file mode 100644
index 000000000..539a0ce9f
--- /dev/null
+++ b/user/kiten/APKBUILD
@@ -0,0 +1,44 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=kiten
+pkgver=17.12.2
+pkgrel=0
+pkgdesc="Japanese reference and study tool"
+url="https://www.kde.org/applications/education/kiten/"
+arch="all"
+license="GPL-2.0-only"
+depends=""
+makedepends="cmake extra-cmake-modules qt5-qtbase-dev karchive-dev kconfig-dev
+ kcompletion-dev kconfigwidgets-dev kcoreaddons-dev kcrash-dev ki18n-dev
+ kdoctools-dev khtml-dev kxmlgui-dev"
+install=""
+subpackages="$pkgname-doc $pkgname-lang"
+source="http://download.kde.org/stable/applications/$pkgver/src/kiten-$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="3c10a77b3ba78cbeaa160ccd6ef1c0cd004c28b18042535a65b735cfaff2b1773ce1d65a15a4da078edb5237a4e45055a193be40d2cbf69d09bc01dae29e584c kiten-17.12.2.tar.xz"
diff --git a/user/klettres/APKBUILD b/user/klettres/APKBUILD
new file mode 100644
index 000000000..9ae468535
--- /dev/null
+++ b/user/klettres/APKBUILD
@@ -0,0 +1,44 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=klettres
+pkgver=17.12.2
+pkgrel=0
+pkgdesc="Learn alphabets for multiple languages"
+url="https://www.kde.org/applications/education/klettres/"
+arch="all"
+license="GPL-2.0-only"
+depends=""
+makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev phonon-dev
+ kcompletion-dev kcrash-dev kdoctools-dev kemoticons-dev ki18n-dev
+ knewstuff-dev kwidgetsaddons-dev kconfigwidgets-dev kcoreaddons-dev"
+install=""
+subpackages="$pkgname-doc $pkgname-lang"
+source="http://download.kde.org/stable/applications/$pkgver/src/klettres-$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="aac1bba83a093db707185ef77d514ac3f6d909065045b6beaaeb277fd03cf9c882ecd1a3ff35b7256e61517effeac302792e8a6e32a5de4c4cd3082aa257609e klettres-17.12.2.tar.xz"
diff --git a/user/kmediaplayer/APKBUILD b/user/kmediaplayer/APKBUILD
new file mode 100644
index 000000000..15e335bdb
--- /dev/null
+++ b/user/kmediaplayer/APKBUILD
@@ -0,0 +1,45 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=kmediaplayer
+pkgver=5.43.0
+pkgrel=0
+pkgdesc="Media player framework for KDE 5"
+url="https://www.kde.org/"
+arch="all"
+license="X11 LGPL-2.1+"
+depends=""
+depends_dev="qt5-qtbase-dev kparts-dev kxmlgui-dev"
+makedepends="$depends_dev cmake extra-cmake-modules"
+install=""
+subpackages="$pkgname-dev"
+source="https://download.kde.org/stable/frameworks/5.43/portingAids/kmediaplayer-$pkgver.tar.xz"
+builddir="$srcdir/kmediaplayer-$pkgver"
+
+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"
+ # viewtest requires X11
+ CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E viewtest
+}
+
+package() {
+ cd "$builddir"
+ make DESTDIR="$pkgdir" install
+}
+
+sha512sums="2e4a0ad713da37521e236a4e1e6ad8bb1cec63546dcbb9c114a40b3165228ac447d54b0d774c576bd59ece219af5898fa033464c13b14ac82da7ab7e99fb49e2 kmediaplayer-5.43.0.tar.xz"
diff --git a/user/kmix/APKBUILD b/user/kmix/APKBUILD
new file mode 100644
index 000000000..a0141faf6
--- /dev/null
+++ b/user/kmix/APKBUILD
@@ -0,0 +1,46 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=kmix
+pkgver=17.12.2
+pkgrel=0
+pkgdesc="KDE sound mixer"
+url="https://www.kde.org/applications/multimedia/kmix/"
+arch="all"
+license="GPL-2.0-only"
+depends=""
+makedepends="cmake extra-cmake-modules qt5-qtbase-dev kcompletion-dev ki18n-dev
+ kconfig-dev kconfigwidgets-dev kcrash-dev kdbusaddons-dev kdoctools-dev
+ kglobalaccel-dev kiconthemes-dev kinit-dev knotifications-dev solid-dev
+ plasma-framework-dev kwidgetsaddons-dev kwindowsystem-dev kxmlgui-dev
+ alsa-lib-dev libcanberra-dev pulseaudio-dev"
+install=""
+subpackages="$pkgname-doc $pkgname-lang"
+source="http://download.kde.org/stable/applications/$pkgver/src/kmix-$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="2fc67512e5f2dfa816a77215070e2c7f250169fe6029d7d5be9ab5676e9d22875cfd7ae92dc70153939553bd460934a5b6b45f919557f6ace4216db0c22849aa kmix-17.12.2.tar.xz"
diff --git a/user/kmplot/APKBUILD b/user/kmplot/APKBUILD
new file mode 100644
index 000000000..c2a679954
--- /dev/null
+++ b/user/kmplot/APKBUILD
@@ -0,0 +1,45 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=kmplot
+pkgver=17.12.2
+pkgrel=0
+pkgdesc="Mathematical function plotter"
+url="https://www.kde.org/applications/education/kmplot/"
+arch="all"
+license="GPL-2.0-only"
+depends=""
+makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kcrash-dev
+ kguiaddons-dev ki18n-dev kparts-dev kwidgetsaddons-dev kdoctools-dev
+ kdelibs4support-dev kdbusaddons-dev"
+install=""
+subpackages="$pkgname-doc $pkgname-lang"
+source="http://download.kde.org/stable/applications/$pkgver/src/kmplot-$pkgver.tar.xz"
+builddir="$srcdir/kmplot-$pkgver"
+
+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="c58acfc3847993e075b6099a694fe484064298ec7c2e7f3671b6c58cc76125817f41e1c7d0096483163a6b3dce8f8b802cbf0a0c882bbbcb2b70e8cafbf4c6ca kmplot-17.12.2.tar.xz"
diff --git a/user/ktouch/APKBUILD b/user/ktouch/APKBUILD
new file mode 100644
index 000000000..2f04f8ebb
--- /dev/null
+++ b/user/ktouch/APKBUILD
@@ -0,0 +1,46 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=ktouch
+pkgver=17.12.2
+pkgrel=0
+pkgdesc="Touch typing tutor"
+url="https://www.kde.org/applications/education/ktouch/"
+arch="all"
+license="GPL-2.0-only"
+depends=""
+makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtxmlpatterns-dev
+ kcompletion-dev kconfig-dev kconfigwidgets-dev kcoreaddons-dev
+ kdeclarative-dev kdoctools-dev ki18n-dev kitemviews-dev kcmutils-dev
+ ktextwidgets-dev kwidgetsaddons-dev kwindowsystem-dev kxmlgui-dev
+ libx11-dev libxcb-dev libxkbfile-dev"
+install=""
+subpackages="$pkgname-doc $pkgname-lang"
+source="http://download.kde.org/stable/applications/$pkgver/src/ktouch-$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="449bc268254f21f3376a9b75a0aea97af5bf9d3617f7b7484361a615f3635cd60c74a37bfddd8674f20667325574adecaf42f362a3bbd6e5e66a3c6f5764f41a ktouch-17.12.2.tar.xz"
diff --git a/user/kturtle/APKBUILD b/user/kturtle/APKBUILD
new file mode 100644
index 000000000..10bbaddc3
--- /dev/null
+++ b/user/kturtle/APKBUILD
@@ -0,0 +1,44 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=kturtle
+pkgver=17.12.2
+pkgrel=0
+pkgdesc="Educational programming environment"
+url="https://www.kde.org/applications/education/kturtle/"
+arch="all"
+license="GPL-2.0-only"
+depends=""
+makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kcrash-dev
+ kio-dev knewstuff-dev kdoctools-dev ktextwidgets-dev ki18n-dev
+ kcoreaddons-dev"
+install=""
+subpackages="$pkgname-doc $pkgname-lang"
+source="http://download.kde.org/stable/applications/$pkgver/src/kturtle-$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="20050ae4349a518940c9fb4e2646bc671a8c63979c19b2176b1f15e7b476e2d3bb2ecdcdb7e1ee6eea95e1b1e847f9e87ec7a87f3457edac110e0466549b6d5e kturtle-17.12.2.tar.xz"
diff --git a/user/kwave/APKBUILD b/user/kwave/APKBUILD
new file mode 100644
index 000000000..30fdf344d
--- /dev/null
+++ b/user/kwave/APKBUILD
@@ -0,0 +1,47 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=kwave
+pkgver=17.12.2
+pkgrel=0
+pkgdesc="Sound editor built for KDE"
+url="http://kwave.sourceforge.net/"
+arch="all"
+license="GPL-2.0+"
+depends=""
+makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtmultimedia-dev
+ karchive-dev kcompletion-dev kconfig-dev kconfigwidgets-dev kcrash-dev
+ kcoreaddons-dev kdbusaddons-dev kdoctools-dev ki18n-dev kiconthemes-dev
+ kio-dev kservice-dev ktextwidgets-dev kwidgetsaddons-dev kxmlgui-dev
+ audiofile-dev libsamplerate-dev alsa-lib-dev pulseaudio-dev flac-dev
+ id3lib-dev libmad-dev opus-dev libvorbis-dev fftw-dev librsvg-dev"
+install=""
+subpackages="$pkgname-doc $pkgname-lang"
+source="http://download.kde.org/stable/applications/$pkgver/src/kwave-$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="84d6f72cb9e71a347d7e7e52660c317976634faeb9dd022a1eb3145301574ce61ac6f263f81de7913f9b443e8b5e0c80d0b22405f9f5a6218b1b67db2abc1692 kwave-17.12.2.tar.xz"
diff --git a/user/kwordquiz/APKBUILD b/user/kwordquiz/APKBUILD
new file mode 100644
index 000000000..f247885d1
--- /dev/null
+++ b/user/kwordquiz/APKBUILD
@@ -0,0 +1,46 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=kwordquiz
+pkgver=17.12.2
+pkgrel=0
+pkgdesc="Flash card trainer for KDE"
+url="https://www.kde.org/applications/education/kwordquiz/"
+arch="all"
+license="GPL-2.0-only"
+depends=""
+makedepends="cmake extra-cmake-modules qt5-qtbase-dev ki18n-dev kcrash-dev
+ kconfig-dev kconfigwidgets-dev kdoctools-dev kguiaddons-dev
+ kiconthemes-dev kitemviews-dev knotifyconfig-dev knewstuff-dev
+ knotifications-dev kxmlgui-dev kdelibs4support-dev
+ libkeduvocdocument-dev"
+install=""
+subpackages="$pkgname-doc $pkgname-lang"
+source="http://download.kde.org/stable/applications/$pkgver/src/kwordquiz-$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="f0210292f6c25b64dce00d221e5ba0797d45c7f1d6354be40dbd294534306f7b328b436f46fbad72d91b97867589694251f8fae7ed2367c1057198c942e3329b kwordquiz-17.12.2.tar.xz"
diff --git a/user/labplot/APKBUILD b/user/labplot/APKBUILD
new file mode 100644
index 000000000..709ca3b64
--- /dev/null
+++ b/user/labplot/APKBUILD
@@ -0,0 +1,46 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=labplot
+pkgver=2.4.0
+pkgrel=0
+pkgdesc="Interactive tool for graphing and analysis of scientific data"
+url="https://www.kde.org/applications/education/labplot/"
+arch="all"
+license="GPL-2.0-only"
+depends="shared-mime-info"
+makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev
+ karchive-dev kcompletion-dev kconfigwidgets-dev kcoreaddons-dev kio-dev
+ kdoctools-dev ki18n-dev kiconthemes-dev kdelibs4support-dev kxmlgui-dev
+ knewstuff-dev ktextwidgets-dev kwidgetsaddons-dev gsl-dev fftw-dev"
+install=""
+subpackages="$pkgname-doc $pkgname-lang"
+source="https://download.kde.org/stable/labplot/2.4.0/labplot-$pkgver-kf5.tar.xz"
+builddir="$srcdir/labplot-$pkgver-kf5"
+
+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 -D_GNU_SOURCE" \
+ ${CMAKE_CROSSOPTS}
+ make
+}
+
+check() {
+ cd "$builddir"
+ CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+}
+
+package() {
+ cd "$builddir"
+ make DESTDIR="$pkgdir" install
+}
+
+sha512sums="5d29dd7d63d484359e73c8d82d8dbc25a069e1f33829cf75c2a2009ebae2027353ecf578b51806b5f35ae17ec472f5cbfdb4caed2637dc1ecc9229d33033d21b labplot-2.4.0-kf5.tar.xz"
diff --git a/user/libdca/APKBUILD b/user/libdca/APKBUILD
new file mode 100644
index 000000000..9047074dc
--- /dev/null
+++ b/user/libdca/APKBUILD
@@ -0,0 +1,43 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=libdca
+pkgver=0.0.5
+pkgrel=0
+pkgdesc="Free DTS Coherent Acoustics decoder"
+url="https://www.videolan.org/developers/libdca.html"
+arch="all"
+license="GPL-2.0+"
+depends=
+install=
+subpackages="$pkgname-dev $pkgname-doc"
+source="https://download.videolan.org/pub/videolan/libdca/$pkgver/libdca-$pkgver.tar.bz2"
+
+prepare() {
+ cd "$builddir"
+ default_prepare
+ update_config_sub
+}
+
+build() {
+ cd "$builddir"
+ ./configure \
+ --build=$CBUILD \
+ --host=$CHOST \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --localstatedir=/var
+ make
+}
+
+check() {
+ cd "$builddir"
+ make check
+}
+
+package() {
+ cd "$builddir"
+ make DESTDIR="$pkgdir" install
+}
+
+sha512sums="d9f0ed34efeb3f27af8424fcb3e6df56744c6735854a65b5709c02b42b4513b9c4618dcc19eb44293afa051bd95616651bda5fc3b49dfabe975d0babfb1bc287 libdca-0.0.5.tar.bz2"
diff --git a/user/libkcddb/APKBUILD b/user/libkcddb/APKBUILD
new file mode 100644
index 000000000..443d2323d
--- /dev/null
+++ b/user/libkcddb/APKBUILD
@@ -0,0 +1,46 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=libkcddb
+pkgver=17.12.2
+pkgrel=0
+pkgdesc="Library to retrieve audio CD metadata from the Internet"
+url="http://projects.kde.org/projects/kde/kdemultimedia/libkcddb"
+arch="all"
+license="LGPL-2.0+"
+depends=""
+depends_dev="qt5-qtbase-dev kconfig-dev kcodecs-dev kio-dev kwidgetsaddons-dev"
+makedepends="$depends_dev cmake extra-cmake-modules kdoctools-dev ki18n-dev"
+install=""
+subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
+source="http://download.kde.org/stable/applications/$pkgver/src/libkcddb-$pkgver.tar.xz
+ update-tests.patch"
+builddir="$srcdir/libkcddb-$pkgver"
+
+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="3c19f2f7b77ed6334dfeea725f996cdfe73531f0e2be1d42d689e810080d29f1f4f16d6f3e8c9c820e189a08ce560440d012b37aae465e60746e71ba9d9476ba libkcddb-17.12.2.tar.xz
+81085d4fd1e34a14cdbd436c177904a3e1a4520381e85692abbc3b4126c7bd8b11da63d755ac51dc86dc1345482524cc6f74615afe23fac193c98227dffe0fa8 update-tests.patch"
diff --git a/user/libkcddb/update-tests.patch b/user/libkcddb/update-tests.patch
new file mode 100644
index 000000000..ab6d0369f
--- /dev/null
+++ b/user/libkcddb/update-tests.patch
@@ -0,0 +1,22 @@
+--- libkcddb-17.12.2/tests/asynccddblookuptest.cpp.old 2017-06-02 05:31:07.000000000 +0000
++++ libkcddb-17.12.2/tests/asynccddblookuptest.cpp 2018-03-24 20:43:25.230670753 +0000
+@@ -63,7 +63,7 @@
+
+ // If revision doesn't match, test probably needs to be updated
+ // See: http://www.freedb.org/freedb/jazz/a1107d0a for updated data
+- QCOMPARE(m_info.get(QString::fromUtf8("revision")).toInt(), 7);
++ QCOMPARE(m_info.get(QString::fromUtf8("revision")).toInt(), 8);
+
+ QCOMPARE(m_info.get(Artist).toString(),QString::fromUtf8("Kruder & Dorfmeister"));
+ QCOMPARE(m_info.get(Title).toString(),QString::fromUtf8("The K&D Sessions (Part One)"));
+--- libkcddb-17.12.2/tests/asynchttplookuptest.cpp.old 2017-06-02 05:31:07.000000000 +0000
++++ libkcddb-17.12.2/tests/asynchttplookuptest.cpp 2018-03-24 20:44:11.450670967 +0000
+@@ -64,7 +64,7 @@
+
+ // If revision doesn't match, test probably needs to be updated
+ // See: http://www.freedb.org/freedb/jazz/a1107d0a for updated data
+- QCOMPARE(m_info.get(QString::fromUtf8("revision")).toInt(), 7);
++ QCOMPARE(m_info.get(QString::fromUtf8("revision")).toInt(), 8);
+
+ QCOMPARE(m_info.get(Artist).toString(),QString::fromUtf8("Kruder & Dorfmeister"));
+ QCOMPARE(m_info.get(Title).toString(),QString::fromUtf8("The K&D Sessions (Part One)"));
diff --git a/user/libkeduvocdocument/APKBUILD b/user/libkeduvocdocument/APKBUILD
new file mode 100644
index 000000000..6a2628f5f
--- /dev/null
+++ b/user/libkeduvocdocument/APKBUILD
@@ -0,0 +1,43 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=libkeduvocdocument
+pkgver=17.12.2
+pkgrel=0
+pkgdesc="Library for manipulating KVTML files"
+url="https://www.kde.org/"
+arch="all"
+license="GPL-2.0+"
+depends=""
+depends_dev="qt5-qtbase-dev karchive-dev kio-dev"
+makedepends="$depends_dev cmake extra-cmake-modules ki18n-dev"
+install=""
+subpackages="$pkgname-dev $pkgname-lang"
+source="http://download.kde.org/stable/applications/$pkgver/src/libkeduvocdocument-$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="acf87a3931c6d21cd28a169084aa2ec72ea9f491c858111aa8bbc5267e12e654dd5ea05b2b21360327143e82fd730adde0bd7e1d50fd4e87af7905a90efabce6 libkeduvocdocument-17.12.2.tar.xz"
diff --git a/user/marble/APKBUILD b/user/marble/APKBUILD
new file mode 100644
index 000000000..559048a60
--- /dev/null
+++ b/user/marble/APKBUILD
@@ -0,0 +1,42 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=marble
+pkgver=17.12.2
+pkgrel=0
+pkgdesc="Free, open-source map and virtual globe"
+url="https://marble.kde.org/"
+arch="all"
+options="!check" # Test suite requires package to be already installed.
+license="LGPL-2.1-only GPL-2.0-only"
+depends="shared-mime-info"
+depends_dev="qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtsvg-dev"
+makedepends="$depends_dev cmake extra-cmake-modules qt5-qttools-dev zlib-dev
+ qt5-qtwebkit-dev krunner-dev kcoreaddons-dev kwallet-dev knewstuff-dev
+ kio-dev kparts-dev kcrash-dev ki18n-dev phonon-dev plasma-framework-dev
+ "
+install=""
+subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-libs"
+source="http://download.kde.org/stable/applications/$pkgver/src/marble-$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
+}
+
+package() {
+ cd "$builddir"
+ make DESTDIR="$pkgdir" install
+}
+
+sha512sums="a8641e0d380f666b5402d83ccf01772442d8df0bb06d5de82f43abc56c19f544a1a3f148889f297758ae0ac6654e90cfdeac7a97b05be49c61985eb83bf7194f marble-17.12.2.tar.xz"
diff --git a/user/minuet/APKBUILD b/user/minuet/APKBUILD
new file mode 100644
index 000000000..8725696b6
--- /dev/null
+++ b/user/minuet/APKBUILD
@@ -0,0 +1,44 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=minuet
+pkgver=17.12.2
+pkgrel=0
+pkgdesc="Music education software"
+url="https://minuet.kde.org/"
+arch="all"
+license="GPL-2.0-only"
+depends=""
+makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev
+ qt5-qtquickcontrols2-dev qt5-qtsvg-dev kcoreaddons-dev ki18n-dev
+ kcrash-dev kdoctools-dev fluidsynth-dev"
+install=""
+subpackages="$pkgname-doc $pkgname-lang"
+source="http://download.kde.org/stable/applications/$pkgver/src/minuet-$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="e9c45baf8d6ebc6055ca9d80ec5592916015307c8f961bc9fb204c3ecf843775854eeb3fb21284cf81f2493fae61c00507e119bd1d8aa6f68ffe7a0d6d67846b minuet-17.12.2.tar.xz"
diff --git a/user/ncompress/APKBUILD b/user/ncompress/APKBUILD
index 527f0d610..dafd49d3a 100644
--- a/user/ncompress/APKBUILD
+++ b/user/ncompress/APKBUILD
@@ -2,23 +2,26 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=ncompress
pkgver=4.2.4.4
-pkgrel=0
+pkgrel=1
pkgdesc="A fast, simple LZW compressor"
url="https://github.com/vapier/ncompress"
arch="all"
license="PD"
options="!check" # No test suite.
subpackages="$pkgname-doc"
-source="http://downloads.sourceforge.net/ncompress/ncompress-$pkgver.tar.gz"
+source="http://downloads.sourceforge.net/ncompress/ncompress-$pkgver.tar.gz
+ fix-9bit-compress.patch"
build() {
cd "$builddir"
- make BINDIR=/usr/bin MANDIR=/usr/share/man/man1
+ make
}
package() {
cd "$builddir"
- make DESTDIR="$pkgdir" BINDIR=/usr/bin MANDIR=/usr/share/man/man1 install
+ install -D -m755 "$builddir"/compress "$pkgdir"/usr/bin/compress
+ install -D -m644 "$builddir"/compress.1 "$pkgdir"/usr/share/man/man1/compress.1
}
-sha512sums="abc7bd96daaab0b83d5ca18ef4b8b4c6528632653a0882a4e0eda4fb3f99e23aae60ee30193e79104ea2ac8fb5816ac3b0bdebb08322db6bde6b8ef1639527be ncompress-4.2.4.4.tar.gz"
+sha512sums="abc7bd96daaab0b83d5ca18ef4b8b4c6528632653a0882a4e0eda4fb3f99e23aae60ee30193e79104ea2ac8fb5816ac3b0bdebb08322db6bde6b8ef1639527be ncompress-4.2.4.4.tar.gz
+b2e897679234f391fa3cf4d5b55a3894424cca632a3b16303b0085e908808bc72b66e6a9df3e56e1a26eac79340c0901f7e6ef2378cc61b710e93194d345c2ea fix-9bit-compress.patch"
diff --git a/user/ncompress/fix-9bit-compress.patch b/user/ncompress/fix-9bit-compress.patch
new file mode 100644
index 000000000..3fcd13d2f
--- /dev/null
+++ b/user/ncompress/fix-9bit-compress.patch
@@ -0,0 +1,20 @@
+--- old/compress42.c 1992-10-28 06:10:53.000000000 -0500
++++ fixed/compress42.c 2003-11-12 19:42:49.000000000 -0500
+@@ -228,7 +228,7 @@
+ #define FIRST 257 /* first free entry */
+ #define CLEAR 256 /* table clear output code */
+
+-#define INIT_BITS 9 /* initial number of bits/code */
++#define INIT_BITS 8 /* initial number of bits/code */
+
+ #ifndef SACREDMEM
+ /*
+@@ -819,7 +819,7 @@
+ nextarg: continue;
+ }
+
+- if (maxbits < INIT_BITS) maxbits = INIT_BITS;
++ if (maxbits <= INIT_BITS) maxbits = INIT_BITS + 1;
+ if (maxbits > BITS) maxbits = BITS;
+
+ if (*filelist != NULL) \ No newline at end of file
diff --git a/user/pax/APKBUILD b/user/pax/APKBUILD
deleted file mode 100644
index 5d59e0280..000000000
--- a/user/pax/APKBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Contributor: A. Wilcox <awilfox@adelielinux.org>
-# Maintainer: A. Wilcox <awilfox@adelielinux.org>
-pkgname=pax
-pkgver=20161104
-pkgrel=1
-pkgdesc="Portable Archive eXchange, the POSIX archival tool"
-url="https://www.mirbsd.org/pax.htm"
-arch="all"
-options="!check" # No test suite.
-license="BSD"
-depends_dev="libbsd-dev fts-dev"
-makedepends="$depends_dev"
-subpackages="$pkgname-doc"
-source="http://ftp.debian.org/debian/pool/main/p/$pkgname/${pkgname}_$pkgver.orig.tar.xz
- needed-header.patch
- pax-20160306-glibc-to-linux.patch"
-builddir="$srcdir/$pkgname"
-
-build() {
- cd "$builddir"
- ${CC} ${CPPFLAGS} ${CFLAGS} \
- -DHAVE_STRLCPY -DHAVE_STRMODE -DLONG_OFF_T -DHAVE_LINKAT -DHAVE_SYS_SYSMACROS_H -D_BSD_SOURCE \
- -DPAX_SAFE_PATH=\"/bin:/usr/bin:/usr/local/bin\" \
- $(pkgconf --cflags libbsd) \
- -Wall ${LDFLAGS} *.c -o $pkgname $(pkgconf --libs libbsd) $(pkgconf --libs libfts)
-}
-
-package() {
- cd "$builddir"
-
- install -Dm755 pax "$pkgdir"/usr/bin/pax
- ln -s pax "$pkgdir"/usr/bin/paxcpio
- ln -s pax "$pkgdir"/usr/bin/paxtar
-
- install -Dm644 pax.1 "$pkgdir"/usr/share/man/man1/pax.1
- install -m644 cpio.1 "$pkgdir"/usr/share/man/man1/paxcpio.1
- install -m644 tar.1 "$pkgdir"/usr/share/man/man1/paxtar.1
-}
-
-sha512sums="4ca17a412fde5c0de3ff9820a9a5c7e210e015ccddcc791f0c0936f45471dbbe1e96a97515e65d21e5d36a61b14e920eb3a9181ffeabad801663c812ee084c15 pax_20161104.orig.tar.xz
-f494daeebca58bfc0875138e3b01e1d7b74d982b574b0d06d18244046cd0c0b99d8039a629391a578657489346f580c4eaf347ee43ba78eb1058fadebffef497 needed-header.patch
-96d018bd1be2b0d22c9c5e11a92d8cf7ef9bc72d1b13686e572aa15935f2fda9d507baf1e0eb916fec776c2f9d7bab458c203cab64446eed34b70f544109d1d7 pax-20160306-glibc-to-linux.patch"
diff --git a/user/pax/needed-header.patch b/user/pax/needed-header.patch
deleted file mode 100644
index c91d4dafa..000000000
--- a/user/pax/needed-header.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pax/pax.h.old 2016-10-25 19:05:17.000000000 +0000
-+++ pax/pax.h 2017-07-29 14:52:09.258899166 +0000
-@@ -41,6 +41,8 @@
- #ifndef MIRCPIO_PAX_H
- #define MIRCPIO_PAX_H "$MirOS: src/bin/pax/pax.h,v 1.17 2016/10/25 19:04:26 tg Exp $"
-
-+#include <sys/types.h>
-+
- /*
- * BSD PAX global data structures and constants.
- */
diff --git a/user/pax/pax-20160306-glibc-to-linux.patch b/user/pax/pax-20160306-glibc-to-linux.patch
deleted file mode 100644
index f864729cc..000000000
--- a/user/pax/pax-20160306-glibc-to-linux.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- pax/cache.c.old 2016-03-06 08:12:52.000000000 -0600
-+++ pax/cache.c 2016-04-17 13:01:26.461307830 -0500
-@@ -195,7 +195,7 @@
- * No entry for this uid, we will add it
- */
- if (!pwopn) {
--#if defined(__GLIBC__)
-+#if defined(__GLIBC__) || defined(__linux__)
- setpwent();
- #elif !defined(__INTERIX)
- setpassent(1);
-@@ -265,7 +265,7 @@
- * No entry for this gid, we will add it
- */
- if (!gropn) {
--#if defined(__GLIBC__)
-+#if defined(__GLIBC__) || defined(__linux__)
- setgrent();
- #elif !defined(__INTERIX) && !defined(__CYGWIN__)
- setgroupent(1);
-@@ -336,7 +336,7 @@
- }
-
- if (!pwopn) {
--#if defined(__GLIBC__)
-+#if defined(__GLIBC__) || defined(__linux__)
- setpwent();
- #elif !defined(__INTERIX)
- setpassent(1);
-@@ -403,7 +403,7 @@
- }
-
- if (!gropn) {
--#if defined(__GLIBC__)
-+#if defined(__GLIBC__) || defined(__linux__)
- setgrent();
- #elif !defined(__INTERIX) && !defined(__CYGWIN__)
- setgroupent(1);
diff --git a/user/phonon-vlc/APKBUILD b/user/phonon-vlc/APKBUILD
new file mode 100644
index 000000000..5d305485a
--- /dev/null
+++ b/user/phonon-vlc/APKBUILD
@@ -0,0 +1,43 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=phonon-vlc
+pkgver=0.10.1
+pkgrel=0
+pkgdesc="Phonon backend utilising VLC for media playback"
+url="https://www.kde.org/"
+arch="all"
+license="LGPL-2.1+"
+depends="vlc"
+makedepends="cmake extra-cmake-modules qt5-qtbase-dev phonon-dev vlc-dev"
+install=
+subpackages=""
+source="https://download.kde.org/stable/phonon/phonon-backend-vlc/$pkgver/phonon-backend-vlc-$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" \
+ -DPHONON_BUILD_PHONON4QT5=True \
+ ${CMAKE_CROSSOPTS}
+ make
+}
+
+check() {
+ cd "$builddir"
+ CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+}
+
+package() {
+ cd "$builddir"
+ make DESTDIR="$pkgdir" install
+}
+
+sha512sums="fa94298a8236c29f792285d3f288140d244e0eacba02511a32ee56b5bace50f92a93a714b5c44dc5bafb15b2a9d5ae792231e78dce8ca1a45ab3a328492911df phonon-backend-vlc-0.10.1.tar.xz"
diff --git a/user/phonon/APKBUILD b/user/phonon/APKBUILD
index 07d91d7d5..03b8bffab 100644
--- a/user/phonon/APKBUILD
+++ b/user/phonon/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=phonon
-pkgver=4.9.1
+pkgver=4.10.0
pkgrel=0
pkgdesc="Qt library for playing multimedia files"
url="https://phonon.kde.org/"
@@ -54,4 +54,4 @@ designer() {
rmdir "$pkgdir"/usr/lib/qt5/plugins || true # Never mind
}
-sha512sums="a1741765071a625d9b9073d9ad1571b91cf5bfce2223bd1b034828d02dc52624587a6ec5352f3702df79f6e4201007596843fbcb9f15c9b489a858200787d728 phonon-4.9.1.tar.xz"
+sha512sums="6074c7c33edcdfeed8a6199024f1faedebe09652cf5d01075f2d97146b54c4269924b69ca8298e2341c0cf6ca4d18f930a59a937697f6f282b6de8e976d097c4 phonon-4.10.0.tar.xz"
diff --git a/user/qml-box2d/APKBUILD b/user/qml-box2d/APKBUILD
new file mode 100644
index 000000000..1d06627cd
--- /dev/null
+++ b/user/qml-box2d/APKBUILD
@@ -0,0 +1,30 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=qml-box2d
+pkgver=0.1.0_pre20180109
+_hash=21e57f1c0fbf6e65072c269f89d98a94ed5d7f7f
+pkgrel=0
+pkgdesc="Physics plugin for QML"
+url="https://github.com/qml-box2d/qml-box2d"
+arch="all"
+options="!check" # All tests are interactive.
+license="Zlib"
+depends=""
+makedepends="qt5-qtbase-dev qt5-qtdeclarative-dev"
+install=""
+subpackages=""
+source="qml-box2d-$pkgver.tar.gz::https://github.com/qml-box2d/qml-box2d/archive/$_hash.tar.gz"
+builddir="$srcdir/qml-box2d-$_hash"
+
+build() {
+ cd "$builddir"
+ qmake-qt5
+ make
+}
+
+package() {
+ cd "$builddir"
+ make install INSTALL_ROOT="$pkgdir"
+}
+
+sha512sums="89a60ef138bd2790d17e1213dcdd611a8a3e763f4a0a35cdae565385868ce6957f0114c538d19f0e50fc87b660611cd65d38b8aa563f344fd5741a65eb5fed70 qml-box2d-0.1.0_pre20180109.tar.gz"
diff --git a/user/rocs/APKBUILD b/user/rocs/APKBUILD
new file mode 100644
index 000000000..6bbc4486a
--- /dev/null
+++ b/user/rocs/APKBUILD
@@ -0,0 +1,46 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=rocs
+pkgver=17.12.2
+pkgrel=0
+pkgdesc="Graph theory IDE"
+url="https://www.kde.org/applications/education/rocs/"
+arch="all"
+options="!check" # All tests require X11.
+license="GPL-2.0-only"
+depends=""
+makedepends="cmake extra-cmake-modules qt5-qtbase-dev kdoctools-dev boost-dev
+ grantlee-dev qt5-qtwebkit-dev qt5-qtsvg-dev qt5-qtxmlpatterns-dev
+ karchive-dev kconfig-dev kcoreaddons-dev kcrash-dev kdeclarative-dev
+ ki18n-dev kitemviews-dev ktexteditor-dev kxmlgui-dev"
+install=""
+subpackages="$pkgname-doc $pkgname-lang"
+source="http://download.kde.org/stable/applications/$pkgver/src/rocs-$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="db1311f627a5fa77811379d02b23c947236dce6febd5a8d14ca24ee46a8b54255f1befe98043c70b785c7fe01a50d1d3c0cde271f724b57f2a2100b80bb6933d rocs-17.12.2.tar.xz"
diff --git a/user/schismtracker/APKBUILD b/user/schismtracker/APKBUILD
new file mode 100644
index 000000000..0394a6d06
--- /dev/null
+++ b/user/schismtracker/APKBUILD
@@ -0,0 +1,30 @@
+# Contributor: Horst Burkhardt <horst@adelielinux.org>
+# Maintainer: Horst Burkhardt <horst@adelielinux.org>
+pkgname=schismtracker
+pkgver=20180209
+pkgrel=0
+pkgdesc="A highly portable Impulse Tracker clone"
+url="http://schismtracker.org/"
+arch="all"
+license="GPL-2.0-only"
+options="!check" # No test suite.
+depends=""
+makedepends="python3 libtool sdl-dev libx11-dev libxdmcp-dev libxau-dev libxext-dev libbsd-dev"
+source="schismtracker-20180209.tar.gz::https://github.com/schismtracker/schismtracker/archive/20180209.tar.gz"
+subpackages="$pkgname-doc"
+
+build() {
+ cd "$builddir"
+ autoreconf -i
+ ./configure \
+ --enable-fortify-source \
+ --prefix=/usr
+ make
+}
+
+package() {
+ cd "$builddir"
+ make DESTDIR="$pkgdir" install
+}
+
+sha512sums="0bc5b43dd491db8b63d4a0c980a25b48c1e91a113633a034ea3281d664c52b13bcae7a0b8e12d6862b39078b544e0c91721f8a73e3f0536f3b748f548c701140 schismtracker-20180209.tar.gz"
diff --git a/user/step/APKBUILD b/user/step/APKBUILD
new file mode 100644
index 000000000..587587302
--- /dev/null
+++ b/user/step/APKBUILD
@@ -0,0 +1,45 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=step
+pkgver=17.12.2
+pkgrel=0
+pkgdesc="Interactive physics simulation"
+url="https://www.kde.org/applications/education/step/"
+arch="all"
+license="GPL-2.0-only"
+depends=""
+makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev
+ kdoctools-dev qt5-qtsvg-dev kcrash-dev khtml-dev kconfig-dev eigen-dev
+ kdelibs4support-dev knewstuff-dev kplotting-dev"
+install=""
+subpackages="$pkgname-doc $pkgname-lang"
+source="http://download.kde.org/stable/applications/$pkgver/src/step-$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" \
+ -DEIGEN3_INCLUDE_DIR=/usr/include/eigen3 \
+ ${CMAKE_CROSSOPTS}
+ make
+}
+
+check() {
+ cd "$builddir"
+ CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+}
+
+package() {
+ cd "$builddir"
+ make DESTDIR="$pkgdir" install
+}
+
+sha512sums="025bdc9e3560feb93782a1462a3d2ed152ad9981194425de73fcaa26fbfae74a67016507ebe368776da27b1dda63863106567620e39ed82cc8e95e414f219616 step-17.12.2.tar.xz"
diff --git a/user/umbrello/APKBUILD b/user/umbrello/APKBUILD
new file mode 100644
index 000000000..a4407ad44
--- /dev/null
+++ b/user/umbrello/APKBUILD
@@ -0,0 +1,46 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=umbrello
+pkgver=17.12.2
+pkgrel=0
+pkgdesc="Software modelling tool and code generator"
+url="https://umbrello.kde.org/"
+arch="all"
+options="!check" # No test suite.
+license="GPL-2.0"
+depends=""
+makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev
+ qt5-qtwebkit-dev karchive-dev kcompletion-dev kcoreaddons-dev ki18n-dev
+ kcrash-dev kdoctools-dev kiconthemes-dev kdelibs4support-dev kio-dev
+ ktexteditor-dev kwindowsystem-dev kwidgetsaddons-dev kxmlgui-dev"
+install=""
+subpackages="$pkgname-doc $pkgname-lang"
+source="http://download.kde.org/stable/applications/$pkgver/src/umbrello-$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="1ad128a798b429c3ccfaac2e754d57b3df9d62a697f43a0397f7f26958036a78e9a07d0bc62d923b3af39bcc97f830a88149e2505fcc0c36404a12190806254d umbrello-17.12.2.tar.xz"