summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--experimental/lmms/APKBUILD66
-rw-r--r--experimental/lmms/isinff.patch11
-rw-r--r--experimental/lmms/thread.patch25
-rw-r--r--experimental/lmms/use-system-ecm.patch11
-rw-r--r--system/adelie-base/APKBUILD3
-rw-r--r--system/bsd-compat-headers/APKBUILD31
-rw-r--r--system/bsd-compat-headers/sys-cdefs.h (renamed from system/libc-dev/sys-cdefs.h)0
-rw-r--r--system/bsd-compat-headers/sys-queue.h (renamed from system/libc-dev/sys-queue.h)0
-rw-r--r--system/bsd-compat-headers/sys-tree.h (renamed from system/libc-dev/sys-tree.h)0
-rw-r--r--system/libc-dev/APKBUILD59
-rw-r--r--system/man-db/APKBUILD2
-rw-r--r--system/man-db/man-db.trigger2
-rw-r--r--system/musl/2000-pthread-internals-increase-DEFAULT_GUARD_SIZE-to-2-p.patch29
-rw-r--r--system/musl/APKBUILD30
-rw-r--r--system/musl/__stack_chk_fail_local.c2
-rw-r--r--system/musl/dcngettext-null-deref.patch82
-rw-r--r--system/musl/dynamic-binary-stack-size.patch97
-rw-r--r--system/musl/fgetspent_r.patch65
-rw-r--r--system/musl/fix-file-locking-race.patch54
-rw-r--r--system/musl/getaddrinfo-regression.patch51
-rw-r--r--system/musl/ppc64-atomic.patch74
-rw-r--r--system/openssh/APKBUILD33
-rw-r--r--system/openssh/CVE-2018-20685.patch33
-rw-r--r--system/ruby/APKBUILD4
-rw-r--r--user/accountsservice/APKBUILD49
-rw-r--r--user/accountsservice/disable-msgfmt15
-rw-r--r--user/adelie-kde-theme/APKBUILD19
-rw-r--r--user/adelie-kde-theme/adelie-kde-theme.js33
-rw-r--r--user/adelie-kde-theme/kdeglobals3
-rw-r--r--user/adelie-kde-theme/kscreenlockerrc13
-rw-r--r--user/adelie-kde-theme/kwinrc3
-rw-r--r--user/adelie-wallpapers/APKBUILD22
-rw-r--r--user/atkmm/APKBUILD37
-rw-r--r--user/audacious-plugins/APKBUILD15
-rw-r--r--user/baloo-widgets/APKBUILD44
-rw-r--r--user/cairomm/APKBUILD37
-rw-r--r--user/calligra/APKBUILD10
-rw-r--r--user/calligra/poppler-73.patch45
-rw-r--r--user/calligra/poppler2.patch114
-rw-r--r--user/calligra/poppler3.patch92
-rw-r--r--user/calligra/poppler4.patch76
-rw-r--r--user/cdrtools/APKBUILD5
-rw-r--r--user/cgmanager/APKBUILD38
-rw-r--r--user/comfortaa/APKBUILD23
-rw-r--r--user/convertlit/APKBUILD31
-rw-r--r--user/convertlit/lib.patch14
-rw-r--r--user/cracklib/APKBUILD47
-rw-r--r--user/cracklib/cracklib.trigger3
-rw-r--r--user/ctags/APKBUILD34
-rw-r--r--user/cups/APKBUILD2
-rw-r--r--user/djvulibre/APKBUILD38
-rw-r--r--user/dolphin/APKBUILD9
-rw-r--r--user/ebook-tools/APKBUILD39
-rw-r--r--user/evince/APKBUILD77
-rw-r--r--user/farstream/APKBUILD41
-rw-r--r--user/ffmpeg/APKBUILD14
-rw-r--r--user/ffmpegthumbs/APKBUILD42
-rw-r--r--user/fluxbox/APKBUILD4
-rw-r--r--user/fontforge/APKBUILD43
-rw-r--r--user/fontforge/python3.patch197
-rw-r--r--user/fortune-mod/APKBUILD54
-rw-r--r--user/free42/APKBUILD41
-rw-r--r--user/free42/free42.desktop9
-rw-r--r--user/free42/libx11.patch11
-rw-r--r--user/free42/patch.patch82
-rw-r--r--user/glibmm/APKBUILD37
-rw-r--r--user/gnu-ghostscript/APKBUILD21
-rw-r--r--user/gnu-ghostscript/do-not-use-sprintf.patch85
-rw-r--r--user/gnumeric/APKBUILD4
-rw-r--r--user/grfcodec/APKBUILD7
-rw-r--r--user/grfcodec/va_copy.patch16
-rw-r--r--user/gst-plugins-base/APKBUILD26
-rw-r--r--user/gtk+3.0/APKBUILD2
-rw-r--r--user/gtkmm+3.0/APKBUILD39
-rw-r--r--user/gxmessage/APKBUILD38
-rw-r--r--user/haveged/APKBUILD51
-rw-r--r--user/haveged/fix-cpu-cache-size-detection.patch15
-rw-r--r--user/haveged/haveged.confd5
-rw-r--r--user/haveged/haveged.initd11
-rw-r--r--user/hermit/APKBUILD22
-rw-r--r--user/kde/APKBUILD7
-rw-r--r--user/kdegraphics-thumbnailers/APKBUILD42
-rw-r--r--user/kgamma5/APKBUILD42
-rw-r--r--user/khotkeys/APKBUILD44
-rw-r--r--user/kio-extras/APKBUILD8
-rw-r--r--user/kmenuedit/APKBUILD42
-rw-r--r--user/ksshaskpass/APKBUILD42
-rw-r--r--user/libcanberra/APKBUILD11
-rw-r--r--user/libcdio/APKBUILD6
-rw-r--r--user/libgxps/APKBUILD39
-rw-r--r--user/libkexiv2/APKBUILD42
-rw-r--r--user/libmodplug/APKBUILD37
-rw-r--r--user/libmtp/APKBUILD37
-rw-r--r--user/libpwquality/APKBUILD46
-rw-r--r--user/libsecret/APKBUILD39
-rw-r--r--user/libsigc++/APKBUILD37
-rw-r--r--user/libspectre/APKBUILD37
-rw-r--r--user/libtommath/APKBUILD31
-rw-r--r--user/libuninameslist/APKBUILD44
-rw-r--r--user/mac-fdisk/APKBUILD2
-rw-r--r--user/mesa/APKBUILD40
-rw-r--r--user/mesa/glx_ro_text_segm.patch28
-rw-r--r--user/mesa/intel.patch85
-rw-r--r--user/mesa/python3-compat.patch119
-rw-r--r--user/musl-obstack/APKBUILD38
-rw-r--r--user/okular/APKBUILD9
-rw-r--r--user/oxygen-fonts/APKBUILD41
-rw-r--r--user/pangomm/APKBUILD37
-rw-r--r--user/pavucontrol/APKBUILD38
-rw-r--r--user/perl-term-readkey/APKBUILD34
-rw-r--r--user/php7/APKBUILD5
-rw-r--r--user/pidgin/APKBUILD36
-rw-r--r--user/plasma-workspace-wallpapers/APKBUILD41
-rw-r--r--user/postfix/APKBUILD96
-rw-r--r--user/postfix/honour-config-directory.patch11
-rw-r--r--user/postfix/postfix.initd85
-rw-r--r--user/postfix/postfix.pre-install5
-rw-r--r--user/pulseaudio/APKBUILD10
-rw-r--r--user/pulseaudio/disable-flat-volume.patch11
-rw-r--r--user/recode/APKBUILD39
-rw-r--r--user/rpm2targz/APKBUILD30
-rw-r--r--user/scons/APKBUILD33
-rw-r--r--user/scons/python3-bang.patch8
-rw-r--r--user/serf/APKBUILD41
-rw-r--r--user/serf/py3.patch24
-rw-r--r--user/socat/APKBUILD35
-rw-r--r--user/socat/netdb-internal.patch13
-rw-r--r--user/sound-theme-freedesktop/APKBUILD37
-rw-r--r--user/subversion/APKBUILD58
-rw-r--r--user/subversion/python3-bang.patch8
-rw-r--r--user/sword/APKBUILD38
-rw-r--r--user/user-manager/APKBUILD43
-rw-r--r--user/utf8proc/APKBUILD46
-rw-r--r--user/uwsgi/APKBUILD86
-rw-r--r--user/vlc/APKBUILD22
-rw-r--r--user/vlc/CVE-2018-19857.patch34
-rw-r--r--user/w3m/APKBUILD36
-rw-r--r--user/xorg-server/APKBUILD6
-rw-r--r--user/xorg-server/support-coffeelake.patch14
-rw-r--r--user/xterm/APKBUILD24
-rw-r--r--user/xterm/posix-ptmx.patch21
141 files changed, 3847 insertions, 921 deletions
diff --git a/experimental/lmms/APKBUILD b/experimental/lmms/APKBUILD
new file mode 100644
index 000000000..0ab893cb8
--- /dev/null
+++ b/experimental/lmms/APKBUILD
@@ -0,0 +1,66 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=lmms
+pkgver=1.2.0_rc7
+pkgrel=0
+pkgdesc="Music production software"
+url="https://lmms.io/"
+arch="all"
+license="GPL-2.0-only"
+depends=""
+makedepends="alsa-lib-dev cmake fftw-dev fltk-dev fluidsynth-dev lame-dev
+ libogg-dev libsamplerate-dev libsndfile-dev libvorbis-dev libxml2-dev
+ pulseaudio-dev qt5-qtbase-dev qt5-qttools-dev qt5-qtx11extras-dev
+ extra-cmake-modules xcb-util-dev xcb-util-keysyms-dev"
+subpackages="$pkgname-dev $pkgname-doc"
+source="lmms-${pkgver/_/-}.tar.gz::https://github.com/LMMS/lmms/archive/v${pkgver/_/-}.tar.gz
+ https://distfiles.adelielinux.org/source/qt5-x11embed-20171106.tar.xz
+ rpmalloc-1.3.1.tar.gz::https://github.com/rampantpixels/rpmalloc/archive/1.3.1.tar.gz
+ isinff.patch
+ thread.patch
+ use-system-ecm.patch
+ "
+builddir="$srcdir"/lmms-${pkgver/_/-}
+
+prepare() {
+ cd "$builddir"
+ rmdir src/3rdparty/qt5-x11embed
+ rmdir src/3rdparty/rpmalloc/rpmalloc
+ mv "$srcdir"/qt5-x11embed-20171106 src/3rdparty/qt5-x11embed
+ mv "$srcdir"/rpmalloc-1.3.1 src/3rdparty/rpmalloc/rpmalloc
+ default_prepare
+}
+
+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" \
+ -DWANT_QT5=ON \
+ ${CMAKE_CROSSOPTS}
+ make
+}
+
+check() {
+ cd "$builddir"
+ CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+}
+
+package() {
+ cd "$builddir"
+ make DESTDIR="$pkgdir" install
+}
+
+sha512sums="e16b5bd050a0a5f3ac9312654cd3ce65e497258dead836fb222918af4eb71ea23175292b7943bff495e0b53445b70e80d26bebe059e46724f39f8e8f29d37dd6 lmms-1.2.0-rc7.tar.gz
+d00b5dfb2931ae1614b419b06f795c5627e51eb2159612eb058484c2b1c6817532d4e321ce514518ce2009d8c7f886e384d6cc8b8428b05b268db3f28bb90e63 qt5-x11embed-20171106.tar.xz
+c9a42c635774285a8467eaa1931109528c08931c73873c366d0e4949921c8956a31db7422378cd548bbbaf24d0fcc41470ab6751e67238db53677832e5fb5db4 rpmalloc-1.3.1.tar.gz
+8896727616d361d22876ce353adeaa587a506f4fa649575f8444e89c5b86165c6e4c29b5862221530e5840023bd012bf6183666b958b7841dbf2cde1f2924353 isinff.patch
+e6b5b87af969bf8c1c24cef2748485d86d58139704efdebf0645c376c9c40de54b0ff08d9fd3b41865670539c7dac50e4178d06dfb779e1d8d4fc7cdd08c4a32 thread.patch
+70f1467340f7f5c9e94af702e036aa3355c036b13523a9d5183d5b0fb7c18f8878ec92c6d84a49837739b207bd0546ef5264a4e17f30ddf27b6f8eb9d09c4c76 use-system-ecm.patch"
diff --git a/experimental/lmms/isinff.patch b/experimental/lmms/isinff.patch
new file mode 100644
index 000000000..6c83c5052
--- /dev/null
+++ b/experimental/lmms/isinff.patch
@@ -0,0 +1,11 @@
+--- lmms-1.2.0-rc7/include/lmms_math.h.old 2018-09-25 07:47:51.000000000 +0000
++++ lmms-1.2.0-rc7/include/lmms_math.h 2019-01-20 19:22:47.190000000 +0000
+@@ -34,7 +34,7 @@
+ #include <cmath>
+ using namespace std;
+
+-#if defined (LMMS_BUILD_WIN32) || defined (LMMS_BUILD_APPLE) || defined(LMMS_BUILD_HAIKU) || defined (__FreeBSD__) || defined(__OpenBSD__)
++#if defined (LMMS_BUILD_WIN32) || defined (LMMS_BUILD_APPLE) || defined(LMMS_BUILD_HAIKU) || defined (__FreeBSD__) || defined(__OpenBSD__) || (defined(LMMS_BUILD_LINUX) && !defined(__GLIBC__))
+ #ifndef isnanf
+ #define isnanf(x) isnan(x)
+ #endif
diff --git a/experimental/lmms/thread.patch b/experimental/lmms/thread.patch
new file mode 100644
index 000000000..f8c293f4e
--- /dev/null
+++ b/experimental/lmms/thread.patch
@@ -0,0 +1,25 @@
+From c9c22e4a0e7c0de0cfaf8df101443d2d53fbdb31 Mon Sep 17 00:00:00 2001
+From: Lukas W <lukaswhl@gmail.com>
+Date: Fri, 24 Nov 2017 13:30:15 +0100
+Subject: [PATCH] shared_object: Use deleteLater in unref for thread safety
+
+This makes unref safe when it's not called from within the object's thread.
+
+Fixes #4009
+---
+ include/shared_object.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/shared_object.h b/include/shared_object.h
+index f39cb0e8bf..fe7a3d8e06 100644
+--- a/include/shared_object.h
++++ b/include/shared_object.h
+@@ -61,7 +61,7 @@ class sharedObject
+
+ if ( deleteObject )
+ {
+- delete object;
++ object->deleteLater();
+ }
+ }
+
diff --git a/experimental/lmms/use-system-ecm.patch b/experimental/lmms/use-system-ecm.patch
new file mode 100644
index 000000000..8fcafc8d3
--- /dev/null
+++ b/experimental/lmms/use-system-ecm.patch
@@ -0,0 +1,11 @@
+--- lmms-1.2.0-rc7/src/3rdparty/qt5-x11embed/CMakeLists.txt.old 2017-11-06 18:24:12.000000000 +0000
++++ lmms-1.2.0-rc7/src/3rdparty/qt5-x11embed/CMakeLists.txt 2019-01-20 19:14:20.430000000 +0000
+@@ -1,7 +1,7 @@
+ cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
+ project(qt5-x11embed)
+
+-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/ECM/find-modules")
++list(APPEND CMAKE_MODULE_PATH "/usr/share/ECM/find-modules")
+
+ find_package(Qt5Core COMPONENTS Private REQUIRED)
+ find_package(Qt5Widgets COMPONENTS Private REQUIRED)
diff --git a/system/adelie-base/APKBUILD b/system/adelie-base/APKBUILD
index 22eeeba55..4cda8968f 100644
--- a/system/adelie-base/APKBUILD
+++ b/system/adelie-base/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=adelie-base
pkgver=0.9.1
-pkgrel=1
+pkgrel=2
pkgdesc="The Adélie Linux Base System"
url="https://www.adelielinux.org/"
arch="noarch"
@@ -94,6 +94,7 @@ devkit() {
}
docs() {
+ depends=""
pkgdesc="Metapackage that will magically install all documentation for your system"
mkdir -p "$subpkgdir"
return 0
diff --git a/system/bsd-compat-headers/APKBUILD b/system/bsd-compat-headers/APKBUILD
new file mode 100644
index 000000000..f7f5036c0
--- /dev/null
+++ b/system/bsd-compat-headers/APKBUILD
@@ -0,0 +1,31 @@
+# Maintainer: Adelie Platform Group <adelie-devel@lists.adelielinux.org>
+pkgname=bsd-compat-headers
+pkgver=0.7.1
+pkgrel=1
+pkgdesc="Compatibility files for building BSD software"
+url=" "
+arch="noarch"
+options="!check" # Just header files.
+license="BSD-2-Clause AND BSD-3-Clause"
+depends=""
+makedepends=""
+subpackages=""
+source="sys-cdefs.h
+ sys-queue.h
+ sys-tree.h
+ "
+
+package() {
+ mkdir -p "$pkgdir"
+ case "$CLIBC" in
+ musl)
+ install -D "$srcdir"/sys-cdefs.h "$pkgdir"/usr/include/sys/cdefs.h
+ install -D "$srcdir"/sys-queue.h "$pkgdir"/usr/include/sys/queue.h
+ install -D "$srcdir"/sys-tree.h "$pkgdir"/usr/include/sys/tree.h
+ ;;
+ esac
+}
+
+sha512sums="8c3fddd73b696a38e633953715c79c47703739be27ee085fc6c960a57b6746ca05bf6406f7e6126cc1a13204254fd5830afb566624e1f298f4d6b58216013c28 sys-cdefs.h
+2f0d5e6e4dc3350285cf17009265dddcbe12431c111868eea39bc8cb038ab7c1f2acacbb21735c4e9d4a1fd106a8fc0f8611ea33987d4faba37dde5ce6da0750 sys-queue.h
+07cb70f2f0ddb31e23dd913c6f561fc9885667c5803fdf3a559676c99d08834b4104589bacb5d17b4a0b379c68c81a1cf3173832b3da33a7b936fa7b93706844 sys-tree.h"
diff --git a/system/libc-dev/sys-cdefs.h b/system/bsd-compat-headers/sys-cdefs.h
index 209a623c0..209a623c0 100644
--- a/system/libc-dev/sys-cdefs.h
+++ b/system/bsd-compat-headers/sys-cdefs.h
diff --git a/system/libc-dev/sys-queue.h b/system/bsd-compat-headers/sys-queue.h
index a38499a26..a38499a26 100644
--- a/system/libc-dev/sys-queue.h
+++ b/system/bsd-compat-headers/sys-queue.h
diff --git a/system/libc-dev/sys-tree.h b/system/bsd-compat-headers/sys-tree.h
index eaea56aae..eaea56aae 100644
--- a/system/libc-dev/sys-tree.h
+++ b/system/bsd-compat-headers/sys-tree.h
diff --git a/system/libc-dev/APKBUILD b/system/libc-dev/APKBUILD
deleted file mode 100644
index 4ead3c13b..000000000
--- a/system/libc-dev/APKBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: William Pitcock <nenolod@dereferenced.org>
-pkgname=libc-dev
-pkgver=0.7.1
-pkgrel=0
-pkgdesc="Meta package to pull in correct libc"
-url="http://alpinelinux.org"
-arch="noarch"
-license="BSD-2-Clause AND BSD-3-Clause"
-makedepends_build=" "
-makedepends_host=" "
-makedepends="$makedepends_build $makedepends_host"
-depends="$CLIBC-dev"
-subpackages="libc-utils:utils bsd-compat-headers:bsdcompat"
-source="sys-cdefs.h
- sys-queue.h
- sys-tree.h
- "
-
-prepare() {
- mkdir -p "$builddir"
- cd "$builddir"
-}
-
-build() {
- return 0
-}
-
-check() {
- return 0
-}
-
-package() {
- mkdir -p "$pkgdir"
-}
-
-utils() {
- depends="$CLIBC-utils"
-
- mkdir -p "$subpkgdir"
-}
-
-bsdcompat() {
- pkgdesc="BSD compatibility headers (cdefs, queue, tree)"
- depends=""
-
- mkdir -p "$subpkgdir"
- case "$CLIBC" in
- musl)
- install -D "$srcdir"/sys-cdefs.h "$subpkgdir"/usr/include/sys/cdefs.h
- install -D "$srcdir"/sys-queue.h "$subpkgdir"/usr/include/sys/queue.h
- install -D "$srcdir"/sys-tree.h "$subpkgdir"/usr/include/sys/tree.h
- ;;
- esac
-}
-
-sha512sums="8c3fddd73b696a38e633953715c79c47703739be27ee085fc6c960a57b6746ca05bf6406f7e6126cc1a13204254fd5830afb566624e1f298f4d6b58216013c28 sys-cdefs.h
-2f0d5e6e4dc3350285cf17009265dddcbe12431c111868eea39bc8cb038ab7c1f2acacbb21735c4e9d4a1fd106a8fc0f8611ea33987d4faba37dde5ce6da0750 sys-queue.h
-07cb70f2f0ddb31e23dd913c6f561fc9885667c5803fdf3a559676c99d08834b4104589bacb5d17b4a0b379c68c81a1cf3173832b3da33a7b936fa7b93706844 sys-tree.h"
diff --git a/system/man-db/APKBUILD b/system/man-db/APKBUILD
index e8b60b75f..0e0aa9724 100644
--- a/system/man-db/APKBUILD
+++ b/system/man-db/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=man-db
pkgver=2.8.4
-pkgrel=0
+pkgrel=1
pkgdesc="The man command and related utilities for examining on-line help files"
url="http://www.nongnu.org/man-db/"
arch="all"
diff --git a/system/man-db/man-db.trigger b/system/man-db/man-db.trigger
index fb76aa38c..f9de5961c 100644
--- a/system/man-db/man-db.trigger
+++ b/system/man-db/man-db.trigger
@@ -1,3 +1,3 @@
#!/bin/sh
-exec /usr/bin/mandb /usr/share/man
+exec /usr/bin/mandb /usr/share/man >/dev/null
diff --git a/system/musl/2000-pthread-internals-increase-DEFAULT_GUARD_SIZE-to-2-p.patch b/system/musl/2000-pthread-internals-increase-DEFAULT_GUARD_SIZE-to-2-p.patch
deleted file mode 100644
index b39664dac..000000000
--- a/system/musl/2000-pthread-internals-increase-DEFAULT_GUARD_SIZE-to-2-p.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 58dec23397e3fcc4300cc03839ce5e508389abbc Mon Sep 17 00:00:00 2001
-From: William Pitcock <nenolod@dereferenced.org>
-Date: Thu, 22 Jun 2017 22:04:51 +0000
-Subject: [PATCH] pthread internals: increase DEFAULT_GUARD_SIZE to 2 pages
- instead of 1 page.
-
-This is intended to be a proactive mitigation against any bugs similar to CVE-2017-1000366.
-
-Signed-off-by: William Pitcock <nenolod@dereferenced.org>
----
- src/internal/pthread_impl.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/internal/pthread_impl.h b/src/internal/pthread_impl.h
-index ae0ab1c5..ad4ea3fa 100644
---- a/src/internal/pthread_impl.h
-+++ b/src/internal/pthread_impl.h
-@@ -146,7 +146,7 @@ void __block_app_sigs(void *);
- void __restore_sigs(void *);
-
- #define DEFAULT_STACK_SIZE 81920
--#define DEFAULT_GUARD_SIZE 4096
-+#define DEFAULT_GUARD_SIZE 8192
-
- #define __ATTRP_C11_THREAD ((void*)(uintptr_t)-1)
-
---
-2.13.0
-
diff --git a/system/musl/APKBUILD b/system/musl/APKBUILD
index dbbfe640c..368ba8766 100644
--- a/system/musl/APKBUILD
+++ b/system/musl/APKBUILD
@@ -1,16 +1,14 @@
-# Contributor: William Pitcock <nenolod@dereferenced.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=musl
-pkgver=1.1.20
-pkgrel=5
+pkgver=1.1.21
+pkgrel=0
pkgdesc="System library (libc) implementation"
url="http://www.musl-libc.org/"
arch="all"
options="!check"
license="MIT"
depends=""
-depends_dev="!uclibc-dev"
-makedepends="$depends_dev"
+makedepends=""
subpackages="$pkgname-dev"
case "$BOOTSTRAP" in
nocc) pkgname="musl-dev"
@@ -25,14 +23,9 @@ nolibc) ;;
esac
source="http://www.musl-libc.org/releases/musl-$pkgver.tar.gz
amalgamation.patch
- 2000-pthread-internals-increase-DEFAULT_GUARD_SIZE-to-2-p.patch
3001-make-real-lastlog-h.patch
handle-aux-at_base.patch
- fix-file-locking-race.patch
- dcngettext-null-deref.patch
- getaddrinfo-regression.patch
- ppc64-atomic.patch
- dynamic-binary-stack-size.patch
+ fgetspent_r.patch
ldconfig
getent.c
@@ -103,8 +96,14 @@ package() {
rm "$pkgdir"/usr/include/utmpx.h # utmps
}
+dev() {
+ provides="libc-dev=$pkgver-r$pkgrel"
+ default_dev
+}
+
utils() {
depends="!uclibc-utils scanelf"
+ provides="libc-utils=$pkgver-r$pkgrel"
replaces="libiconv uclibc-utils"
license="BSD-2-Clause AND GPL-2.0+"
@@ -119,16 +118,11 @@ utils() {
install -D -m755 "$srcdir"/ldconfig "$subpkgdir"/sbin
}
-sha512sums="d3a7a30aa375ca50d7dcfbd618581d59e1aa5378417f50a0ca5510099336fd74cc9db468e05c93dda3067abd890f6bd47af226c3446bb833adf0a5054bff2e5d musl-1.1.20.tar.gz
+sha512sums="fa6c4cc012626c5e517e0e10926fc845e3aa5f863ffaceeb38ac5b9ce0af631a37f6b94f470997db09aa0d5e03f4f28a2db83484b0f98481bea2239c1989d363 musl-1.1.21.tar.gz
3162b778101a46d9fb3a38927e3c4969781ccdabb9bb72de10d48ea31691215ecba605faee945ed86144a7e31fc948c31c2fee2881dc07897be3e82b6c6ff1e6 amalgamation.patch
-2c8e1dde1834238097b2ee8a7bfb53471a0d9cff4a5e38b55f048b567deff1cdd47c170d0578a67b1a039f95a6c5fbb8cff369c75b6a3e4d7ed171e8e86ebb8c 2000-pthread-internals-increase-DEFAULT_GUARD_SIZE-to-2-p.patch
88ae443dbb8e0a4368235bdc3a1c5c7b718495afa75e06deb8e01becc76cb1f0d6964589e2204fc749c9c1b3190b8b9ac1ae2c0099cab8e2ce3ec877103d4332 3001-make-real-lastlog-h.patch
6a7ff16d95b5d1be77e0a0fbb245491817db192176496a57b22ab037637d97a185ea0b0d19da687da66c2a2f5578e4343d230f399d49fe377d8f008410974238 handle-aux-at_base.patch
-b967339d9048161583523e847be91779adb0e16cc225d6ff85ef51748269b2dab08a0b8e558ad01469135837a9df76a59bf9a31791dd4063d75bc5efe6e94861 fix-file-locking-race.patch
-a08d1b170356beea333ace1da12f8a8399ca80c5d9c32ff2fcd8562537a670214f566e4b1219a11b32129078e22fbf7009bb277b7de8550a89352a64b3b5090d dcngettext-null-deref.patch
-e3953a3a73ef11696dd3eb216e18b152ae35198d8bff686d157e27bc90fb558f9a0be518025a90534e9afd6ea1bf731ffdb6fcb202bb9368f2c8eec7ca886141 getaddrinfo-regression.patch
-aae9110eccb8cd7dcd3c957fcb01ed524598f79f7fa1a16b9993af40793545d1ec211e7e6aeabe7af7715d94cc26a473ea0acf6d6e66019bf65f03d4b8e24a4b ppc64-atomic.patch
-654f76c96ed0e69e19b1a20569e83751bb207a8c181b26742f505638095dde3f4dd3f785deb92c49a603bd15cd8d4932129f567de8cd2edffdd8551c4dfd6976 dynamic-binary-stack-size.patch
+ded41235148930f8cf781538f7d63ecb0c65ea4e8ce792565f3649ee2523592a76b2a166785f0b145fc79f5852fd1fb1729a7a09110b3b8f85cba3912e790807 fgetspent_r.patch
cce2f1eeb61e55674469c26871a573cce61d739c3defe9c8f56f2b774f6ba5435849ad542a6714120efddc98c297098e9c98a1a424ac593df2243d4aa479f9a9 ldconfig
378d70e65bcc65bb4e1415354cecfa54b0c1146dfb24474b69e418cdbf7ad730472cd09f6f103e1c99ba6c324c9560bccdf287f5889bbc3ef0bdf0e08da47413 getent.c
9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf iconv.c"
diff --git a/system/musl/__stack_chk_fail_local.c b/system/musl/__stack_chk_fail_local.c
deleted file mode 100644
index 2b403a6e0..000000000
--- a/system/musl/__stack_chk_fail_local.c
+++ /dev/null
@@ -1,2 +0,0 @@
-extern void __stack_chk_fail(void);
-void __attribute__((visibility ("hidden"))) __stack_chk_fail_local(void) { __stack_chk_fail(); }
diff --git a/system/musl/dcngettext-null-deref.patch b/system/musl/dcngettext-null-deref.patch
deleted file mode 100644
index bcc385e86..000000000
--- a/system/musl/dcngettext-null-deref.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 017e67ddde79fa2b6187a5e56b1e92bafc7c4cd2 Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@aerifal.cx>
-Date: Fri, 14 Sep 2018 13:00:41 -0400
-Subject: drop lazy plural forms init in dcngettext
-
-there is no good reason to wait to find and process the plural rules
-for a translated message file until a gettext form requesting plural
-rule processing is used. it just imposes additional synchronization,
-here in the form of clunky use of atomics.
-
-it looks like there may also have been a race condition where nplurals
-could be seen without plural_rule being seen, possibly leading to null
-pointer dereference. if so, this commit fixes it.
----
- src/locale/dcngettext.c | 35 +++++++++++++++++------------------
- 1 file changed, 17 insertions(+), 18 deletions(-)
-
-diff --git a/src/locale/dcngettext.c b/src/locale/dcngettext.c
-index 7fbe7196..8b891d00 100644
---- a/src/locale/dcngettext.c
-+++ b/src/locale/dcngettext.c
-@@ -100,8 +100,8 @@ struct msgcat {
- struct msgcat *next;
- const void *map;
- size_t map_size;
-- void *volatile plural_rule;
-- volatile int nplurals;
-+ const char *plural_rule;
-+ int nplurals;
- struct binding *binding;
- const struct __locale_map *lm;
- int cat;
-@@ -200,20 +200,7 @@ notrans:
- p->lm = lm;
- p->map = map;
- p->map_size = map_size;
-- do {
-- old_cats = cats;
-- p->next = old_cats;
-- } while (a_cas_p(&cats, old_cats, p) != old_cats);
-- }
--
-- const char *trans = __mo_lookup(p->map, p->map_size, msgid1);
-- if (!trans) goto notrans;
--
-- /* Non-plural-processing gettext forms pass a null pointer as
-- * msgid2 to request that dcngettext suppress plural processing. */
-- if (!msgid2) return (char *)trans;
-
-- if (!p->plural_rule) {
- const char *rule = "n!=1;";
- unsigned long np = 2;
- const char *r = __mo_lookup(p->map, p->map_size, "");
-@@ -237,10 +224,22 @@ notrans:
- rule = r+7;
- }
- }
-- a_store(&p->nplurals, np);
-- a_cas_p(&p->plural_rule, 0, (void *)rule);
-+ p->nplurals = np;
-+ p->plural_rule = rule;
-+
-+ do {
-+ old_cats = cats;
-+ p->next = old_cats;
-+ } while (a_cas_p(&cats, old_cats, p) != old_cats);
- }
-- if (p->nplurals) {
-+
-+ const char *trans = __mo_lookup(p->map, p->map_size, msgid1);
-+ if (!trans) goto notrans;
-+
-+ /* Non-plural-processing gettext forms pass a null pointer as
-+ * msgid2 to request that dcngettext suppress plural processing. */
-+
-+ if (msgid2 && p->nplurals) {
- unsigned long plural = __pleval(p->plural_rule, n);
- if (plural > p->nplurals) goto notrans;
- while (plural--) {
---
-cgit v1.2.1
-
diff --git a/system/musl/dynamic-binary-stack-size.patch b/system/musl/dynamic-binary-stack-size.patch
deleted file mode 100644
index e2e3f12d3..000000000
--- a/system/musl/dynamic-binary-stack-size.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 7b3348a98c139b4b4238384e52d4b0eb237e4833 Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@aerifal.cx>
-Date: Tue, 18 Sep 2018 23:54:18 -0400
-Subject: support setting of default thread stack size via PT_GNU_STACK header
-
-this facilitates building software that assumes a large default stack
-size without any patching to call pthread_setattr_default_np or
-pthread_attr_setstacksize at each thread creation site, using just
-LDFLAGS.
-
-normally the PT_GNU_STACK header is used only to reflect whether
-executable stack is desired, but with GNU ld at least, passing
--Wl,-z,stack-size=N will set a size on the program header. with this
-patch, that size will be incorporated into the default stack size
-(subject to increase-only rule and DEFAULT_STACK_MAX limit).
-
-both static and dynamic linking honor the program header. for dynamic
-linking, all libraries loaded at program start, including preloaded
-ones, are considered. dlopened libraries are not considered, for
-several reasons. extra logic would be needed to defer processing until
-the load of the new library is commited, synchronization woud be
-needed since other threads may be running concurrently, and the
-effectiveness woud be limited since the larger size would not apply to
-threads that already existed at the time of dlopen. programs that will
-dlopen code expecting a large stack need to declare the requirement
-themselves, or pthread_setattr_default_np can be used.
----
- ldso/dynlink.c | 12 ++++++++++++
- src/env/__init_tls.c | 5 +++++
- 2 files changed, 17 insertions(+)
-
-diff --git a/ldso/dynlink.c b/ldso/dynlink.c
-index e4829c3a..3ecbddfa 100644
---- a/ldso/dynlink.c
-+++ b/ldso/dynlink.c
-@@ -22,6 +22,7 @@
- #include "dynlink.h"
-
- static void error(const char *, ...);
-+extern size_t __default_stacksize;
-
- #define MAXP2(a,b) (-(-(a)&-(b)))
- #define ALIGN(x,y) ((x)+(y)-1 & -(y))
-@@ -609,6 +610,12 @@ static void *map_library(int fd, struct dso *dso)
- } else if (ph->p_type == PT_GNU_RELRO) {
- dso->relro_start = ph->p_vaddr & -PAGE_SIZE;
- dso->relro_end = (ph->p_vaddr + ph->p_memsz) & -PAGE_SIZE;
-+ } else if (ph->p_type == PT_GNU_STACK) {
-+ if (!runtime && ph->p_memsz > __default_stacksize) {
-+ __default_stacksize =
-+ ph->p_memsz < (8<<20) ?
-+ ph->p_memsz : (8<<20);
-+ }
- }
- if (ph->p_type != PT_LOAD) continue;
- nsegs++;
-@@ -1238,6 +1245,12 @@ static void kernel_mapped_dso(struct dso *p)
- } else if (ph->p_type == PT_GNU_RELRO) {
- p->relro_start = ph->p_vaddr & -PAGE_SIZE;
- p->relro_end = (ph->p_vaddr + ph->p_memsz) & -PAGE_SIZE;
-+ } else if (ph->p_type == PT_GNU_STACK) {
-+ if (!runtime && ph->p_memsz > __default_stacksize) {
-+ __default_stacksize =
-+ ph->p_memsz < (8<<20) ?
-+ ph->p_memsz : (8<<20);
-+ }
- }
- if (ph->p_type != PT_LOAD) continue;
- if (ph->p_vaddr < min_addr)
-diff --git a/src/env/__init_tls.c b/src/env/__init_tls.c
-index e0224243..96d0e284 100644
---- a/src/env/__init_tls.c
-+++ b/src/env/__init_tls.c
-@@ -8,6 +8,8 @@
- #include "atomic.h"
- #include "syscall.h"
-
-+extern size_t __default_stacksize;
-+
- int __init_tp(void *p)
- {
- pthread_t td = p;
-@@ -90,6 +91,11 @@ static void static_init_tls(size_t *aux)
- base = (size_t)_DYNAMIC - phdr->p_vaddr;
- if (phdr->p_type == PT_TLS)
- tls_phdr = phdr;
-+ if (phdr->p_type == PT_GNU_STACK &&
-+ phdr->p_memsz > __default_stacksize)
-+ __default_stacksize =
-+ phdr->p_memsz < (8<<20) ?
-+ phdr->p_memsz : (8<<20);
- }
-
- if (tls_phdr) {
---
-cgit v1.2.1
-
diff --git a/system/musl/fgetspent_r.patch b/system/musl/fgetspent_r.patch
new file mode 100644
index 000000000..360aa8fe1
--- /dev/null
+++ b/system/musl/fgetspent_r.patch
@@ -0,0 +1,65 @@
+From 3489f9e5ef055c80464252fe640fead8aeb1068e Mon Sep 17 00:00:00 2001
+From: Markus Wichmann <nullplan@gmx.net>
+Date: Sun, 20 Jan 2019 16:31:34 +0100
+Subject: [PATCH 5/5] Add fgetspent_r().
+
+Interface was defined by glibc, and seems to have been adopted by
+Solaris. Some freedesktop software appears to require it, and it adds
+little bloat.
+
+Added without feature test macros, since no other interface in shadow.h
+requires it, even the ones documented to have required it in the past.
+---
+ include/shadow.h | 1 +
+ src/passwd/fgetspent_r.c | 27 +++++++++++++++++++++++++++
+ 2 files changed, 28 insertions(+)
+ create mode 100644 src/passwd/fgetspent_r.c
+
+diff --git a/include/shadow.h b/include/shadow.h
+index 2b1be413..4edc90db 100644
+--- a/include/shadow.h
++++ b/include/shadow.h
+@@ -33,6 +33,7 @@ int putspent(const struct spwd *, FILE *);
+
+ struct spwd *getspnam(const char *);
+ int getspnam_r(const char *, struct spwd *, char *, size_t, struct spwd **);
++int fgetspent_r(FILE *f, struct spwd* sp, char *line, size_t size, struct spwd **spret);
+
+ int lckpwdf(void);
+ int ulckpwdf(void);
+diff --git a/src/passwd/fgetspent_r.c b/src/passwd/fgetspent_r.c
+new file mode 100644
+index 00000000..643637de
+--- /dev/null
++++ b/src/passwd/fgetspent_r.c
+@@ -0,0 +1,27 @@
++#include "pwf.h"
++#include <pthread.h>
++#include <limits.h>
++#include <stdio.h>
++
++int fgetspent_r(FILE *f, struct spwd *sp, char *line, size_t size, struct spwd **spret)
++{
++ int res = EIO;
++ int cs;
++ *spret = 0;
++ if (size > INT_MAX)
++ size = INT_MAX; //2GB ought to be enough for anyone
++ pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
++ if (!fgets(line, size, f))
++ goto out;
++ res = ERANGE;
++ if (line[strlen(line) - 1] != '\n')
++ goto out;
++ res = EILSEQ;
++ if ( __parsespent(line, sp) < 0)
++ goto out;
++ *spret = sp;
++ res = 0;
++out:
++ pthread_setcancelstate(cs, 0);
++ return res;
++}
+--
+2.19.1
+
diff --git a/system/musl/fix-file-locking-race.patch b/system/musl/fix-file-locking-race.patch
deleted file mode 100644
index 2ef91390a..000000000
--- a/system/musl/fix-file-locking-race.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 0db393d3a77bb9f300a356c6a5484fc2dddb161d Mon Sep 17 00:00:00 2001
-From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-Date: Tue, 18 Sep 2018 10:03:27 +0300
-Subject: fix race condition in file locking
-
-The condition occurs when
-- thread #1 is holding the lock
-- thread #2 is waiting for it on __futexwait
-- thread #1 is about to release the lock and performs a_swap
-- thread #3 enters the __lockfile function and manages to grab the lock
- before thread #1 calls __wake, resetting the MAYBE_WAITERS flag
-- thread #1 calls __wake
-- thread #2 wakes up but goes again to __futexwait as the lock is
- held by thread #3
-- thread #3 releases the lock but does not call __wake as the
- MAYBE_WAITERS flag is not set
-
-This condition results in thread #2 not being woken up. This patch fixes
-the problem by making the woken up thread ensure that the flag is
-properly set before going to sleep again.
-
-Mainainer's note: This fixes a regression introduced in commit
-c21f750727515602a9e84f2a190ee8a0a2aeb2a1.
----
- src/stdio/__lockfile.c | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/stdio/__lockfile.c b/src/stdio/__lockfile.c
-index 2ff75d8a..0dcb2a42 100644
---- a/src/stdio/__lockfile.c
-+++ b/src/stdio/__lockfile.c
-@@ -8,13 +8,13 @@ int __lockfile(FILE *f)
- int owner = f->lock, tid = __pthread_self()->tid;
- if ((owner & ~MAYBE_WAITERS) == tid)
- return 0;
-- for (;;) {
-- owner = a_cas(&f->lock, 0, tid);
-- if (!owner) return 1;
-- if (a_cas(&f->lock, owner, owner|MAYBE_WAITERS)==owner) break;
-+ owner = a_cas(&f->lock, 0, tid);
-+ if (!owner) return 1;
-+ while ((owner = a_cas(&f->lock, 0, tid|MAYBE_WAITERS))) {
-+ if ((owner & MAYBE_WAITERS) ||
-+ a_cas(&f->lock, owner, owner|MAYBE_WAITERS)==owner)
-+ __futexwait(&f->lock, owner|MAYBE_WAITERS, 1);
- }
-- while ((owner = a_cas(&f->lock, 0, tid|MAYBE_WAITERS)))
-- __futexwait(&f->lock, owner, 1);
- return 1;
- }
-
---
-cgit v1.2.1
-
diff --git a/system/musl/getaddrinfo-regression.patch b/system/musl/getaddrinfo-regression.patch
deleted file mode 100644
index 28d4558b8..000000000
--- a/system/musl/getaddrinfo-regression.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From f381c118b2d4f7d914481d3cdc830ce41369b002 Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@aerifal.cx>
-Date: Wed, 19 Sep 2018 18:03:22 -0400
-Subject: fix getaddrinfo regression with AI_ADDRCONFIG on some configurations
-
-despite not being documented to do so in the standard or Linux
-documentation, attempts to udp connect to 127.0.0.1 or ::1 generate
-EADDRNOTAVAIL when the loopback device is not configured and there is
-no default route for IPv6. this caused getaddrinfo with AI_ADDRCONFIG
-to fail with EAI_SYSTEM and EADDRNOTAVAIL on some no-IPv6
-configurations, rather than the intended behavior of detecting IPv6 as
-unsuppported and producing IPv4-only results.
-
-previously, only EAFNOSUPPORT was treated as unavailability of the
-address family being probed. instead, treat all errors related to
-inability to get an address or route as conclusive that the family
-being probed is unsupported, and only fail with EAI_SYSTEM on other
-errors.
-
-further improvements may be desirable, such as reporting EAI_AGAIN
-instead of EAI_SYSTEM for errors which are expected to be transient,
-but this patch should suffice to fix the serious regression.
----
- src/network/getaddrinfo.c | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/src/network/getaddrinfo.c b/src/network/getaddrinfo.c
-index ba26847a..e33bfa28 100644
---- a/src/network/getaddrinfo.c
-+++ b/src/network/getaddrinfo.c
-@@ -76,7 +76,16 @@ int getaddrinfo(const char *restrict host, const char *restrict serv, const stru
- close(s);
- if (!r) continue;
- }
-- if (errno != EAFNOSUPPORT) return EAI_SYSTEM;
-+ switch (errno) {
-+ case EADDRNOTAVAIL:
-+ case EAFNOSUPPORT:
-+ case EHOSTUNREACH:
-+ case ENETDOWN:
-+ case ENETUNREACH:
-+ break;
-+ default:
-+ return EAI_SYSTEM;
-+ }
- if (family == tf[i]) return EAI_NONAME;
- family = tf[1-i];
- }
---
-cgit v1.2.1
-
diff --git a/system/musl/ppc64-atomic.patch b/system/musl/ppc64-atomic.patch
deleted file mode 100644
index 6e96a9048..000000000
--- a/system/musl/ppc64-atomic.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 12817793301398241b6cb00c740f0d3ca41076e9 Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@aerifal.cx>
-Date: Fri, 14 Sep 2018 10:47:16 -0400
-Subject: fix broken atomic store on powerpc[64]
-
-in our memory model, all atomics are supposed to be full barriers;
-stores are not release-only. this is important because store is used
-as an unlock operation in places where it needs to acquire the waiter
-count to determine if a futex wake is needed. at least in the
-malloc-internal locks, but possibly elsewhere, soft deadlocks from
-missing futex wake (breakable by poking the threads to restart the
-syscall, e.g. by attaching a tracer) were reported to occur.
-
-once the malloc lock is replaced with Jens Gustedt's new lock
-implementation (see commit 47d0bcd4762f223364e5b58d5a381aaa0cbd7c38),
-malloc will not be affected by the issue, but it's not clear that
-other uses won't be. reducing the strength of the ordering properties
-required from a_store would require a thorough analysis of how it's
-used.
-
-to fix the problem, I'm removing the powerpc[64]-specific a_store
-definition; now, the top-level atomic.h will implement a_store using
-a_barrier on both sides of the store.
-
-it's not clear to me yet whether there might be issues with the other
-atomics. it's possible that a_post_llsc needs to be replaced with a
-full barrier to guarantee the formal semanics we want, but either way
-I think the difference is unlikely to impact the way we use them.
----
- arch/powerpc/atomic_arch.h | 8 --------
- arch/powerpc64/atomic_arch.h | 8 --------
- 2 files changed, 16 deletions(-)
-
-diff --git a/arch/powerpc/atomic_arch.h b/arch/powerpc/atomic_arch.h
-index 5b65cde7..c2673919 100644
---- a/arch/powerpc/atomic_arch.h
-+++ b/arch/powerpc/atomic_arch.h
-@@ -30,14 +30,6 @@ static inline void a_post_llsc()
- __asm__ __volatile__ ("isync" : : : "memory");
- }
-
--#define a_store a_store
--static inline void a_store(volatile int *p, int v)
--{
-- a_pre_llsc();
-- *p = v;
-- a_post_llsc();
--}
--
- #define a_clz_32 a_clz_32
- static inline int a_clz_32(uint32_t x)
- {
-diff --git a/arch/powerpc64/atomic_arch.h b/arch/powerpc64/atomic_arch.h
-index 17cababd..2bed82be 100644
---- a/arch/powerpc64/atomic_arch.h
-+++ b/arch/powerpc64/atomic_arch.h
-@@ -48,14 +48,6 @@ static inline void a_post_llsc()
- __asm__ __volatile__ ("isync" : : : "memory");
- }
-
--#define a_store a_store
--static inline void a_store(volatile int *p, int v)
--{
-- a_pre_llsc();
-- *p = v;
-- a_post_llsc();
--}
--
- #define a_crash a_crash
- static inline void a_crash()
- {
---
-cgit v1.2.1
-
diff --git a/system/openssh/APKBUILD b/system/openssh/APKBUILD
index 4394eb5c2..145fc5c86 100644
--- a/system/openssh/APKBUILD
+++ b/system/openssh/APKBUILD
@@ -4,7 +4,7 @@
pkgname=openssh
pkgver=7.9_p1
_myver=${pkgver%_*}${pkgver#*_}
-pkgrel=0
+pkgrel=2
pkgdesc="Port of OpenBSD's free SSH release"
url="http://www.openssh.org/portable.html"
arch="all"
@@ -20,12 +20,13 @@ subpackages="$pkgname-doc
$pkgname-client
$pkgname-keysign
$pkgname-sftp-server:sftp
- $pkgname-server-common:server_common:noarch
$pkgname-server
+ $pkgname-openrc
"
source="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$_myver.tar.gz
bsd-compatible-realpath.patch
+ CVE-2018-20685.patch
disable-forwarding-by-default.patch
fix-utmpx.patch
openssh7.4-peaktput.patch
@@ -36,6 +37,8 @@ source="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$_myver.tar
sshd.confd
"
# secfixes:
+# 7.9_p1-r2:
+# - CVE-2018-20685
# 7.9_p1:
# - CVE-2018-15473
# 7.7_p1:
@@ -131,30 +134,26 @@ sftp() {
"$subpkgdir"/usr/lib/ssh/
}
-server_common() {
- pkgdesc="OpenSSH server configuration files"
- depends=""
- for i in etc/ssh/sshd_config \
- etc/init.d/sshd \
- etc/conf.d/sshd; do
-
- install -d "$subpkgdir"/${i%/*}
- mv "$pkgdir"/$i \
- "$subpkgdir"/${i%/*}/
-
- done
-}
-
server() {
pkgdesc="OpenSSH server"
- depends="openssh-keygen openssh-server-common"
+ depends="openssh-keygen"
+ replaces="openssh-server-common"
cd "$builddir"
install -d "$subpkgdir"/usr/sbin
+ install -d "$subpkgdir"/etc/ssh
mv "$pkgdir"/usr/sbin/sshd "$subpkgdir"/usr/sbin/
+ mv "$pkgdir"/etc/ssh/sshd_config "$subpkgdir"/etc/ssh/
+}
+
+openrc() {
+ default_openrc
+ depends="openssh-server"
+ install_if="openssh-server=$pkgver-r$pkgrel openrc"
}
sha512sums="0412c9c429c9287f0794023951469c8e6ec833cdb55821bfa0300dd90d0879ff60484f620cffd93372641ab69bf0b032c2d700ccc680950892725fb631b7708e openssh-7.9p1.tar.gz
f2b8daa537ea3f32754a4485492cc6eb3f40133ed46c0a5a29a89e4bcf8583d82d891d94bf2e5eb1c916fa68ec094abf4e6cd641e9737a6c05053808012b3a73 bsd-compatible-realpath.patch
+b8907d3d6ebceeca15f6bc97551a7613c68df5c31e4e76d43b7c0bd9ad42dedcabc20a2cc5404b89f40850a4765b24892bde50eab1db55c96ad5cf23bb1f8d04 CVE-2018-20685.patch
8df35d72224cd255eb0685d2c707b24e5eb24f0fdd67ca6cc0f615bdbd3eeeea2d18674a6af0c6dab74c2d8247e2370d0b755a84c99f766a431bc50c40b557de disable-forwarding-by-default.patch
0c1e832cec420bc7b57558041d2288912a438db97050b87f6a57e94a2741a374cc5d141fe352968b0d1ba6accaff965794463fe9169d136678a8915a60d2f0b7 fix-utmpx.patch
398096a89aa104abeff31aa043ac406a6348e0fdd4d313b7888ee0b931d38fd71fc21bceee46145e88f03bc27e00890e068442faee2d33f86cfbc04d58ffa4b6 openssh7.4-peaktput.patch
diff --git a/system/openssh/CVE-2018-20685.patch b/system/openssh/CVE-2018-20685.patch
new file mode 100644
index 000000000..f2f1ecfc5
--- /dev/null
+++ b/system/openssh/CVE-2018-20685.patch
@@ -0,0 +1,33 @@
+From 6010c0303a422a9c5fa8860c061bf7105eb7f8b2 Mon Sep 17 00:00:00 2001
+From: "djm@openbsd.org" <djm@openbsd.org>
+Date: Fri, 16 Nov 2018 03:03:10 +0000
+Subject: [PATCH] upstream: disallow empty incoming filename or ones that refer
+ to the
+
+current directory; based on report/patch from Harry Sintonen
+
+OpenBSD-Commit-ID: f27651b30eaee2df49540ab68d030865c04f6de9
+---
+ scp.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/scp.c b/scp.c
+index 60682c687..4f3fdcd3d 100644
+--- a/scp.c
++++ b/scp.c
+@@ -1,4 +1,4 @@
+-/* $OpenBSD: scp.c,v 1.197 2018/06/01 04:31:48 dtucker Exp $ */
++/* $OpenBSD: scp.c,v 1.198 2018/11/16 03:03:10 djm Exp $ */
+ /*
+ * scp - secure remote copy. This is basically patched BSD rcp which
+ * uses ssh to do the data transfer (instead of using rcmd).
+@@ -1106,7 +1106,8 @@ sink(int argc, char **argv)
+ SCREWUP("size out of range");
+ size = (off_t)ull;
+
+- if ((strchr(cp, '/') != NULL) || (strcmp(cp, "..") == 0)) {
++ if (*cp == '\0' || strchr(cp, '/') != NULL ||
++ strcmp(cp, ".") == 0 || strcmp(cp, "..") == 0) {
+ run_err("error: unexpected filename: %s", cp);
+ exit(1);
+ }
diff --git a/system/ruby/APKBUILD b/system/ruby/APKBUILD
index 87ba80226..1ed293793 100644
--- a/system/ruby/APKBUILD
+++ b/system/ruby/APKBUILD
@@ -28,13 +28,13 @@
pkgname=ruby
pkgver=2.5.3
_abiver="${pkgver%.*}.0"
-pkgrel=0
+pkgrel=1
pkgdesc="An object-oriented language for quick and easy programming"
url="http://www.ruby-lang.org/"
arch="all"
license="Ruby AND BSD-2-Clause"
depends="ca-certificates"
-depends_dev="gmp-dev"
+depends_dev="ruby=$pkgver-r$pkgrel gmp-dev"
makedepends="$depends_dev zlib-dev openssl-dev db-dev libedit-dev
libffi-dev coreutils yaml-dev linux-headers autoconf"
install="$pkgname.post-upgrade"
diff --git a/user/accountsservice/APKBUILD b/user/accountsservice/APKBUILD
new file mode 100644
index 000000000..2ea23a416
--- /dev/null
+++ b/user/accountsservice/APKBUILD
@@ -0,0 +1,49 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=accountsservice
+pkgver=0.6.54
+pkgrel=0
+pkgdesc="D-Bus service for accessing user account information"
+url="https://www.freedesktop.org/wiki/Software/AccountsService/"
+arch="all"
+license="GPL-3.0+ AND GPL-2.0+"
+depends="dbus"
+makedepends="cmake dbus-dev glib-dev gobject-introspection-dev meson ninja
+ polkit-dev utmps-dev xmlto"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
+source="https://www.freedesktop.org/software/accountsservice/accountsservice-$pkgver.tar.xz
+ disable-msgfmt
+ "
+
+build() {
+ cd "$builddir"
+ CPPFLAGS="-D_PATH_WTMPX=\\\"/run/utmps/wtmp\\\"" meson \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --localstatedir=/var \
+ -Dadmin_group=wheel \
+ -Ddocbook=true \
+ -Dsystemd=false \
+ -Dsystemdsystemunitdir=no \
+ . output
+ mkdir -p output/data
+ # msgfmt(1) XML error
+ cp data/org.freedesktop.accounts.policy.in \
+ output/data/org.freedesktop.accounts.policy
+ patch -Np1 < "$srcdir"/disable-msgfmt
+ ninja -C output
+}
+
+check() {
+ cd "$builddir"
+ ninja -C output test
+}
+
+package() {
+ cd "$builddir"
+ DESTDIR="$pkgdir" ninja -C output install
+}
+
+sha512sums="5fbcccc286dba60efba905aa79b1b51a5478fe52bf2e256d40d9fc2d7a311aea4ce397365045659a4ef2ecb2cc079130fb1d0107749c3c906c394517056ac1c0 accountsservice-0.6.54.tar.xz
+d3cd21c871f66359aae0b4688aeb5f31ba124579212350870540344a489299413a13ad4b66872a9fb549ed3b3664dfbadd03c9b20df3714cb4d26e3f2cf107ce disable-msgfmt"
diff --git a/user/accountsservice/disable-msgfmt b/user/accountsservice/disable-msgfmt
new file mode 100644
index 000000000..3342f7eab
--- /dev/null
+++ b/user/accountsservice/disable-msgfmt
@@ -0,0 +1,15 @@
+--- accountsservice-0.6.54/output/build.ninja.old 2019-01-20 21:23:36.570000000 +0000
++++ accountsservice-0.6.54/output/build.ninja 2019-01-20 21:25:01.140000000 +0000
+@@ -60,9 +60,9 @@
+
+ # Build rules for targets
+
+-build data/org.freedesktop.accounts.policy: CUSTOM_COMMAND ../data/org.freedesktop.accounts.policy.in
+- COMMAND = /usr/bin/meson --internal msgfmthelper ../data/org.freedesktop.accounts.policy.in data/org.freedesktop.accounts.policy xml /usr/src/packages/user/accountsservice/src/accountsservice-0.6.54/po
+- description = Generating$ org.freedesktop.accounts.policy_data_merge$ with$ a$ custom$ command.
++#build data/org.freedesktop.accounts.policy: CUSTOM_COMMAND ../data/org.freedesktop.accounts.policy.in
++# COMMAND = /usr/bin/meson --internal msgfmthelper ../data/org.freedesktop.accounts.policy.in data/org.freedesktop.accounts.policy xml /usr/src/packages/user/accountsservice/src/accountsservice-0.6.54/po
++# description = Generating$ org.freedesktop.accounts.policy_data_merge$ with$ a$ custom$ command.
+
+ build src/accounts-generated.c: CUSTOM_COMMAND /usr/src/packages/user/accountsservice/src/accountsservice-0.6.54/data/org.freedesktop.Accounts.xml | /usr/bin/gdbus-codegen
+ COMMAND = /usr/bin/gdbus-codegen --c-generate-autocleanup all --interface-prefix org.freedesktop. --c-namespace Accounts --body --output src/accounts-generated.c /usr/src/packages/user/accountsservice/src/accountsservice-0.6.54/data/org.freedesktop.Accounts.xml
diff --git a/user/adelie-kde-theme/APKBUILD b/user/adelie-kde-theme/APKBUILD
index 047bfd4ca..5eb3e9509 100644
--- a/user/adelie-kde-theme/APKBUILD
+++ b/user/adelie-kde-theme/APKBUILD
@@ -2,22 +2,27 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=adelie-kde-theme
pkgver=1.0
-pkgrel=1
+pkgrel=2
pkgdesc="The Adélie Linux official KDE theme"
url="https://adelielinux.org/"
arch="noarch"
options="!check" # No test suite.
license="NCSA"
-depends="corindon-red papirus-icons"
+depends="adelie-wallpapers papirus-icons"
source="kdeglobals
- kwinrc"
+ kscreenlockerrc
+ adelie-kde-theme.js
+ "
builddir="$srcdir/"
package() {
cd "$builddir"
- install -D -m644 kwinrc "$pkgdir"/etc/xdg/kwinrc
- install -m 644 kdeglobals "$pkgdir"/etc/xdg/kdeglobals
+ install -D -m644 kdeglobals "$pkgdir"/etc/xdg/kdeglobals
+ install -m644 kscreenlockerrc "$pkgdir"/etc/xdg/kscreenlockerrc
+ install -D -m644 adelie-kde-theme.js \
+ "$pkgdir"/usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates/adelie-kde-theme.js
}
-sha512sums="f54683f11ff8fd800a936a2072626a5020d4519b7796a52a193be28a0961c64294441553ed14d7c91d12a336449e6735364509ac4f1bf8213af97d29708d4b4e kdeglobals
-b889ed3b4e79cc4c073947042f10505ab044c4740fea2391e1d8dfec1aaff75e65420a2872a787b321e4862dded6b2f6aea806b5027ba86be2808f79786efe93 kwinrc"
+sha512sums="ed5dfa83a4d2f6b171b3a3238dea626b9ca9e1afd72ae026ef680a5eef0c3fff4aaf7c82f4bf394c26d002fde7517a4c842f9bdb9059107200d17f48e432b940 kdeglobals
+b94c261d2ce098af1c1856f92b20485167be4f59b66fd3a47379d339a21b4c7a9c274dca2964bbc5f2adff74e514eb73e988db749e22d35817f37b10303fecca kscreenlockerrc
+05a4649938755b3b3c058d6a7507065e07ba29ac448d314db3fc93623008eb1903ae5bcc9c62d0b29b37dd0e85246bc2dbfc2792c69e0f387e99683275db09cd adelie-kde-theme.js"
diff --git a/user/adelie-kde-theme/adelie-kde-theme.js b/user/adelie-kde-theme/adelie-kde-theme.js
new file mode 100644
index 000000000..596d386b5
--- /dev/null
+++ b/user/adelie-kde-theme/adelie-kde-theme.js
@@ -0,0 +1,33 @@
+// Copyright 2016 Aurélien COUDERC <zecoucou@free.fr>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+// This script is provided by desktop-base
+// It is run by Plasma 5 on upgrade.
+// Plasma checks that the script is only run once for each version.
+desktops = desktops()
+
+for (desktop in desktops) {
+ // Only set up the wallpaper if the plugin is the default.
+ // Otherwise it means the user chose another plugin and we don’t want to override that.
+ if (desktops[desktop].wallpaperPlugin == 'org.kde.image') {
+ desktops[desktop].currentConfigGroup = Array('Wallpaper', 'org.kde.image', 'General')
+ if (!desktops[desktop].readConfig('Image')) {
+ // Only set up the wallpaper if the wallpaper image is empty (=default).
+ // Otherwise it means the user selected a picture and we don’t want to override that.
+ desktops[desktop].writeConfig('Image', 'Sunset');
+ }
+ }
+}
+
diff --git a/user/adelie-kde-theme/kdeglobals b/user/adelie-kde-theme/kdeglobals
index bb7802e93..2ec479dc2 100644
--- a/user/adelie-kde-theme/kdeglobals
+++ b/user/adelie-kde-theme/kdeglobals
@@ -3,3 +3,6 @@ ColorScheme=Steel
[Icons]
Theme=Papirus
+
+[WM]
+activeBackground=104,0,0
diff --git a/user/adelie-kde-theme/kscreenlockerrc b/user/adelie-kde-theme/kscreenlockerrc
new file mode 100644
index 000000000..54b5cbd92
--- /dev/null
+++ b/user/adelie-kde-theme/kscreenlockerrc
@@ -0,0 +1,13 @@
+[$Version]
+update_info=kscreenlocker.upd:0.1-autolock
+
+[Greeter]
+WallpaperPlugin=org.kde.image
+
+[Greeter][Wallpaper][org.kde.color][General]
+Color=128,0,0
+
+[Greeter][Wallpaper][org.kde.image][General]
+Color=128,0,0
+FillMode=1
+Image=LockScreen
diff --git a/user/adelie-kde-theme/kwinrc b/user/adelie-kde-theme/kwinrc
deleted file mode 100644
index 0c9b9c589..000000000
--- a/user/adelie-kde-theme/kwinrc
+++ /dev/null
@@ -1,3 +0,0 @@
-[org.kde.kdecoration2]
-library=org.kde.kwin.aurorae
-theme=__aurorae__svg__corindon-red
diff --git a/user/adelie-wallpapers/APKBUILD b/user/adelie-wallpapers/APKBUILD
new file mode 100644
index 000000000..dc66e9e5f
--- /dev/null
+++ b/user/adelie-wallpapers/APKBUILD
@@ -0,0 +1,22 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=adelie-wallpapers
+pkgver=1.0
+pkgrel=0
+pkgdesc="Wallpapers from the Adélie Linux team"
+url="https://www.adelielinux.org/"
+arch="noarch"
+options="!check" # No test suite.
+license="CC-BY-SA-4.0"
+depends=""
+makedepends=""
+subpackages=""
+source="https://distfiles.adelielinux.org/source/adelie-wallpapers-$pkgver.tar.xz"
+
+package() {
+ cd "$builddir"
+ mkdir -p "$pkgdir"
+ cp -r usr "$pkgdir"/
+}
+
+sha512sums="3815145eaf92524eb848ec179cefecd66b43873a9f17133b62baf2ce894d7f629585f6670e5e499d7d5779377c1819627256d7812bb4318b0bfd68466c9b1cff adelie-wallpapers-1.0.tar.xz"
diff --git a/user/atkmm/APKBUILD b/user/atkmm/APKBUILD
new file mode 100644
index 000000000..cbf9d21de
--- /dev/null
+++ b/user/atkmm/APKBUILD
@@ -0,0 +1,37 @@
+# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+pkgname=atkmm
+pkgver=2.28.0
+pkgrel=0
+pkgdesc="C++ interfaces to ATK"
+url="https://gnome.org"
+arch="all"
+license="LGPL-2.1+"
+depends=""
+makedepends="glibmm-dev atk-dev"
+subpackages="$pkgname-dev $pkgname-doc"
+source="https://download.gnome.org/sources/atkmm/${pkgver%.*}/atkmm-$pkgver.tar.xz"
+
+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="8457cff58648c3d3944d6a9fb400062985c70a714856a5d84d4553cb6b1202bdc47aa48c612851fea1cc1b7ab59381116c65d2a22212907e3c4b7090601946bc atkmm-2.28.0.tar.xz"
diff --git a/user/audacious-plugins/APKBUILD b/user/audacious-plugins/APKBUILD
index 8a4742252..61d848646 100644
--- a/user/audacious-plugins/APKBUILD
+++ b/user/audacious-plugins/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=audacious-plugins
pkgver=3.10
-pkgrel=0
+pkgrel=1
pkgdesc="Playlist-oriented media player (plugins)"
url="https://audacious-media-player.org/"
arch="all"
@@ -12,13 +12,12 @@ license="ISC"
depends="audacious"
install_if="audacious=$pkgver"
makedepends="audacious-dev>=${pkgver%.*}
- dbus-glib-dev libguess-dev libmowgli-dev libxml2-dev
- ffmpeg-dev libcddb-dev libcdio-dev libcdio-paranoia-dev mpg123-dev
- libcue-dev libmms-dev libsamplerate-dev libsndfile-dev libxcomposite-dev
- libnotify-dev libogg-dev libvorbis-dev pulseaudio-dev
- alsa-lib-dev curl-dev flac-dev lame-dev neon-dev sdl-dev wavpack-dev
- faad2-dev fluidsynth-dev qt5-qtmultimedia-dev
- automake autoconf"
+ alsa-lib-dev curl-dev dbus-glib-dev faad2-dev ffmpeg-dev flac-dev
+ fluidsynth-dev lame-dev libcddb-dev libcdio-dev libcdio-paranoia-dev
+ libcue-dev libguess-dev libmodplug-dev libmms-dev libmowgli-dev
+ libnotify-dev libogg-dev libsamplerate-dev libsndfile-dev libvorbis-dev
+ libxcomposite-dev libxml2-dev mpg123-dev neon-dev pulseaudio-dev
+ qt5-qtmultimedia-dev sdl-dev wavpack-dev"
subpackages="$pkgname-lang"
source="https://distfiles.audacious-media-player.org/$pkgname-$pkgver.tar.bz2"
diff --git a/user/baloo-widgets/APKBUILD b/user/baloo-widgets/APKBUILD
new file mode 100644
index 000000000..dcb6a2b8b
--- /dev/null
+++ b/user/baloo-widgets/APKBUILD
@@ -0,0 +1,44 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=baloo-widgets
+pkgver=18.12.1
+pkgrel=0
+pkgdesc="Widgets that utilise the Baloo desktop indexing engine"
+url="https://www.KDE.org/"
+arch="all"
+options="!check" # Requires /etc/fstab to exist, and udisks2 to be running.
+license="GPL-2.0+"
+depends=""
+depends_dev="qt5-qtbase-dev baloo-dev kio-dev"
+makedepends="$depends_dev cmake extra-cmake-modules kconfig-dev
+ kfilemetadata-dev ki18n-dev"
+subpackages="$pkgname-dev $pkgname-lang"
+source="https://download.kde.org/stable/applications/$pkgver/src/baloo-widgets-$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="449dfb83d9787e5a65dc59c7927a0d8586376933bf61b658d8338d4e9cd101c2b2d51ac0bc8f1a9fcf4f8827ec1cb557617f91a6ccceb351383320f13c61c2b1 baloo-widgets-18.12.1.tar.xz"
diff --git a/user/cairomm/APKBUILD b/user/cairomm/APKBUILD
new file mode 100644
index 000000000..601830296
--- /dev/null
+++ b/user/cairomm/APKBUILD
@@ -0,0 +1,37 @@
+# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+pkgname=cairomm
+pkgver=1.12.0
+pkgrel=0
+pkgdesc="C++ interfaces to Cairo"
+url="https://gnome.org"
+arch="all"
+license="LGPL-2.1+"
+depends=""
+makedepends="glibmm-dev libsigc++-dev cairo-dev"
+subpackages="$pkgname-dev $pkgname-doc"
+source="https://download.gnome.org/sources/cairomm/${pkgver%.*}/cairomm-$pkgver.tar.xz"
+
+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="750e05f079c2ee9786d1a1ddb66ff90405549a82aeb542d585f904f7147994a451950a77ecb563f290cf2358f7010360ab03d9aa3a319651615c48bd25aeb7e8 cairomm-1.12.0.tar.xz"
diff --git a/user/calligra/APKBUILD b/user/calligra/APKBUILD
index d5c1efb35..a17bf9711 100644
--- a/user/calligra/APKBUILD
+++ b/user/calligra/APKBUILD
@@ -31,6 +31,10 @@ source="https://download.kde.org/stable/calligra/$pkgver/calligra-$pkgver.tar.xz
https://download.kde.org/stable/calligra/$pkgver/calligraplan-$pkgver.tar.xz
c99-math.patch
poppler.patch
+ poppler2.patch
+ poppler3.patch
+ poppler4.patch
+ poppler-73.patch
"
prepare() {
@@ -77,4 +81,8 @@ package() {
sha512sums="ad1b689a5b36deafcf6985d4a0a1e8148d10e19fb4a0be8343c6e1d24146b9a8ffa0890ab5bbb21816b3134d21150b57f6159db1a30cc54c0fde5bf7bdf4537b calligra-3.1.0.tar.xz
a8ccc6ee2f0381b811926a296122464bdb79aad7c75ff0f7a554e4596165ff7fd7ef62c9af9232ea36542d6b538446c8920fe77cbbe7ffacdf6e6b99a1b68156 calligraplan-3.1.0.tar.xz
b03d2f33a0233638be06b4219328404eac4a77c508619c4037b3b53556b257fc4888cd690bb3755562040a198cbd51a323d13553fed3f2082398556a49482c6e c99-math.patch
-960614eb2d367443810cc356d004d43867a4fa4085b054ffd1522b94ef09e9338e723117c91148383d33d54104729750a199ab1b75569aaa7164a908afd3cd4c poppler.patch"
+960614eb2d367443810cc356d004d43867a4fa4085b054ffd1522b94ef09e9338e723117c91148383d33d54104729750a199ab1b75569aaa7164a908afd3cd4c poppler.patch
+53296af0b1ad39c523bc93a0040f1316dfb52e2077d277a83841a741c5cb48d81efb1f6328b2af2c8f1dc92db12c4d771a9a65028498d7802b2c30dd702b9455 poppler2.patch
+a22b78d9664284ee5de7a4299907ec37a7835cb6ae3af8e7c1ee0202cea8c1e544fbad7395e56115fb5fe13ec06aeff22e381431e20c6c151c93003cf8a45446 poppler3.patch
+df0e592f8c314581b1811776f8aa1c3dd32f05f966f23ef4dd023c41dad759aea8b674b32e2bd7bee36efe4ba0ce0bdd08f3fc30d10115330605d09d46883a28 poppler4.patch
+8440f1c36aba9cb54efa36fae73d605f57e78d055225c776791b14554d6be6f081f8cdc3fa65fb9c0b600a3b030d7776b45f631b9bc00d495ab16bfc35bd66f4 poppler-73.patch"
diff --git a/user/calligra/poppler-73.patch b/user/calligra/poppler-73.patch
new file mode 100644
index 000000000..aa71e20b4
--- /dev/null
+++ b/user/calligra/poppler-73.patch
@@ -0,0 +1,45 @@
+--- calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.cpp.old 2019-01-14 18:40:55.580000000 +0000
++++ calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.cpp 2019-01-14 18:53:05.000000000 +0000
+@@ -402,7 +402,7 @@
+
+ QString str;
+
+- const char * p = s->getCString();
++ const char * p = s->c_str();
+ int len = s->getLength();
+ CharCode code;
+ Unicode *u = nullptr;
+@@ -451,11 +451,11 @@
+ *d->body << " y=\"" << y << "px\"";
+
+ if (font && font->getFamily()) {
+- *d->body << " font-family=\"" << QString::fromLatin1(font->getFamily()->getCString()) << "\"";
+- //debugPdf << "font family:" << QString::fromLatin1( font->getFamily()->getCString() );
++ *d->body << " font-family=\"" << QString::fromLatin1(font->getFamily()->c_str()) << "\"";
++ //debugPdf << "font family:" << QString::fromLatin1( font->getFamily()->c_str() );
+ } else if (font && font->getName()) {
+- *d->body << " font-family=\"" << QString::fromLatin1(font->getName()->getCString()) << "\"";
+- //debugPdf << "font name:" << QString::fromLatin1( font->getName()->getCString() );
++ *d->body << " font-family=\"" << QString::fromLatin1(font->getName()->c_str()) << "\"";
++ //debugPdf << "font name:" << QString::fromLatin1( font->getName()->c_str() );
+ }
+ *d->body << " font-size=\"" << qMax(state->getFontSize(), state->getTransformedFontSize()) << "px\"";
+
+@@ -488,7 +488,7 @@
+ if (maskColors) {
+ for (int y = 0; y < height; y++) {
+ dest = (unsigned int *)(buffer + y * 4 * width);
+- Guchar * pix = imgStr->getLine();
++ unsigned char * pix = imgStr->getLine();
+ colorMap->getRGBLine(pix, dest, width);
+
+ for (int x = 0; x < width; x++) {
+@@ -507,7 +507,7 @@
+ } else {
+ for (int y = 0; y < height; y++) {
+ dest = (unsigned int *)(buffer + y * 4 * width);
+- Guchar * pix = imgStr->getLine();
++ unsigned char * pix = imgStr->getLine();
+ colorMap->getRGBLine(pix, dest, width);
+ }
+
diff --git a/user/calligra/poppler2.patch b/user/calligra/poppler2.patch
new file mode 100644
index 000000000..6f18c070f
--- /dev/null
+++ b/user/calligra/poppler2.patch
@@ -0,0 +1,114 @@
+From fa4c2961b8280456d4c1484565b973d312e0bd1c Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Thu, 25 Oct 2018 23:04:39 +0200
+Subject: Mark the functions as override
+
+So when poppler API breaks (as it often does) it stops compiling and
+someone has to fix it
+---
+ filters/karbon/pdf/SvgOutputDev.cpp | 13 +++--------
+ filters/karbon/pdf/SvgOutputDev.h | 43 +++++++++++++++++--------------------
+ 2 files changed, 23 insertions(+), 33 deletions(-)
+
+diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp
+index 5692824..1d07f16 100644
+--- a/filters/karbon/pdf/SvgOutputDev.cpp
++++ b/filters/karbon/pdf/SvgOutputDev.cpp
+@@ -387,7 +387,7 @@ QString SvgOutputDev::printStroke()
+ return stroke;
+ }
+
+-void SvgOutputDev::drawString(GfxState * state, GooString * s)
++void SvgOutputDev::drawString(GfxState * state, const GooString * s)
+ {
+ int render = state->getRender();
+ // check for invisible text -- this is used by Acrobat Capture
+@@ -478,9 +478,9 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s)
+ *d->body << "</text>" << endl;
+ }
+
+-void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str,
++void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
+ int width, int height, GfxImageColorMap *colorMap,
+- int *maskColors, GBool /*inlineImg*/)
++ GBool /*interpolate*/, int *maskColors, GBool inlineImg)
+ {
+ ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits());
+ imgStr->reset();
+@@ -547,10 +547,3 @@ void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str,
+ delete imgStr;
+ }
+
+-void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
+- int width, int height, GfxImageColorMap *colorMap,
+- GBool /*interpolate*/, int *maskColors, GBool inlineImg)
+-{
+- drawImage(state, ref, str, width, height, colorMap, maskColors, inlineImg);
+-}
+-
+diff --git a/filters/karbon/pdf/SvgOutputDev.h b/filters/karbon/pdf/SvgOutputDev.h
+index 2a44908..422027c 100644
+--- a/filters/karbon/pdf/SvgOutputDev.h
++++ b/filters/karbon/pdf/SvgOutputDev.h
+@@ -46,38 +46,35 @@ public:
+
+ GBool isOk();
+
+- virtual GBool upsideDown();
+- virtual GBool useDrawChar();
+- virtual GBool interpretType3Chars();
+- virtual void startPage(int pageNum, GfxState *state, XRef *xref);
+- virtual void endPage();
++ GBool upsideDown() override;
++ GBool useDrawChar() override;
++ GBool interpretType3Chars() override;
++ void startPage(int pageNum, GfxState *state, XRef *xref) override;
++ void endPage() override;
+
+ // path painting
+- virtual void stroke(GfxState * state);
+- virtual void fill(GfxState * state);
+- virtual void eoFill(GfxState *state);
++ void stroke(GfxState * state) override;
++ void fill(GfxState * state) override;
++ void eoFill(GfxState *state) override;
+
+ // text
+- virtual void drawString(GfxState * state, GooString * s);
++ void drawString(GfxState * state, const GooString * s) override;
+
+ // images
+- virtual void drawImage(GfxState *state, Object *ref, Stream *str,
++ void drawImage(GfxState *state, Object *ref, Stream *str,
+ int width, int height, GfxImageColorMap *colorMap,
+- int *maskColors, GBool inlineImg);
+- virtual void drawImage(GfxState *state, Object *ref, Stream *str,
+- int width, int height, GfxImageColorMap *colorMap,
+- GBool interpolate, int *maskColors, GBool inlineImg);
++ GBool interpolate, int *maskColors, GBool inlineImg) override;
+
+ // styles
+- virtual void updateAll(GfxState *state);
+- virtual void updateFillColor(GfxState *state);
+- virtual void updateStrokeColor(GfxState *state);
+- virtual void updateFillOpacity(GfxState *state);
+- virtual void updateStrokeOpacity(GfxState *state);
+- virtual void updateLineJoin(GfxState *state);
+- virtual void updateLineCap(GfxState *state);
+- virtual void updateMiterLimit(GfxState *state);
+- virtual void updateLineWidth(GfxState *state);
++ void updateAll(GfxState *state) override;
++ void updateFillColor(GfxState *state) override;
++ void updateStrokeColor(GfxState *state) override;
++ void updateFillOpacity(GfxState *state) override;
++ void updateStrokeOpacity(GfxState *state) override;
++ void updateLineJoin(GfxState *state) override;
++ void updateLineCap(GfxState *state) override;
++ void updateMiterLimit(GfxState *state) override;
++ void updateLineWidth(GfxState *state) override;
+
+ /// Dumps content to svg file
+ void dumpContent();
+--
+cgit v1.1
+
diff --git a/user/calligra/poppler3.patch b/user/calligra/poppler3.patch
new file mode 100644
index 000000000..54702b515
--- /dev/null
+++ b/user/calligra/poppler3.patch
@@ -0,0 +1,92 @@
+From 82d68cebf870ac97fd27b626a08c3fb4dd94ea3e Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Thu, 25 Oct 2018 23:06:34 +0200
+Subject: GBool -> bool
+
+It was just a typedef in poppler and it'll die in next versions
+---
+ filters/karbon/pdf/SvgOutputDev.cpp | 12 ++++++------
+ filters/karbon/pdf/SvgOutputDev.h | 10 +++++-----
+ 2 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp
+index 1d07f16..870a940 100644
+--- a/filters/karbon/pdf/SvgOutputDev.cpp
++++ b/filters/karbon/pdf/SvgOutputDev.cpp
+@@ -52,7 +52,7 @@ public:
+ QString defsData;
+ QTextStream * defs;
+ QTextStream * body;
+- GBool state;
++ bool state;
+ QSizeF pageSize;
+ QPen pen;
+ QBrush brush;
+@@ -75,22 +75,22 @@ SvgOutputDev::~SvgOutputDev()
+ delete d;
+ }
+
+-GBool SvgOutputDev::isOk()
++bool SvgOutputDev::isOk()
+ {
+ return d->state;
+ }
+
+-GBool SvgOutputDev::upsideDown()
++bool SvgOutputDev::upsideDown()
+ {
+ return gTrue;
+ }
+
+-GBool SvgOutputDev::useDrawChar()
++bool SvgOutputDev::useDrawChar()
+ {
+ return gFalse;
+ }
+
+-GBool SvgOutputDev::interpretType3Chars()
++bool SvgOutputDev::interpretType3Chars()
+ {
+ return gFalse;
+ }
+@@ -480,7 +480,7 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s)
+
+ void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
+ int width, int height, GfxImageColorMap *colorMap,
+- GBool /*interpolate*/, int *maskColors, GBool inlineImg)
++ bool /*interpolate*/, int *maskColors, bool inlineImg)
+ {
+ ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits());
+ imgStr->reset();
+diff --git a/filters/karbon/pdf/SvgOutputDev.h b/filters/karbon/pdf/SvgOutputDev.h
+index 422027c..df2805c 100644
+--- a/filters/karbon/pdf/SvgOutputDev.h
++++ b/filters/karbon/pdf/SvgOutputDev.h
+@@ -44,11 +44,11 @@ public:
+ explicit SvgOutputDev(const QString &fileName);
+ virtual ~SvgOutputDev();
+
+- GBool isOk();
++ bool isOk();
+
+- GBool upsideDown() override;
+- GBool useDrawChar() override;
+- GBool interpretType3Chars() override;
++ bool upsideDown() override;
++ bool useDrawChar() override;
++ bool interpretType3Chars() override;
+ void startPage(int pageNum, GfxState *state, XRef *xref) override;
+ void endPage() override;
+
+@@ -63,7 +63,7 @@ public:
+ // images
+ void drawImage(GfxState *state, Object *ref, Stream *str,
+ int width, int height, GfxImageColorMap *colorMap,
+- GBool interpolate, int *maskColors, GBool inlineImg) override;
++ bool interpolate, int *maskColors, bool inlineImg) override;
+
+ // styles
+ void updateAll(GfxState *state) override;
+--
+cgit v1.1
+
diff --git a/user/calligra/poppler4.patch b/user/calligra/poppler4.patch
new file mode 100644
index 000000000..9a13bcdec
--- /dev/null
+++ b/user/calligra/poppler4.patch
@@ -0,0 +1,76 @@
+From f099b8e143bbeb1de3c7e89f4764006c3de61ae4 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Fri, 2 Nov 2018 21:23:13 +0100
+Subject: Fix build with poppler 0.71
+
+Port away from removed API
+
+Differential Revision: https://phabricator.kde.org/D16607
+---
+ filters/karbon/pdf/PdfImport.cpp | 6 +++---
+ filters/karbon/pdf/SvgOutputDev.cpp | 10 +++++-----
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/filters/karbon/pdf/PdfImport.cpp b/filters/karbon/pdf/PdfImport.cpp
+index 48b08df..e910dae 100644
+--- a/filters/karbon/pdf/PdfImport.cpp
++++ b/filters/karbon/pdf/PdfImport.cpp
+@@ -88,9 +88,9 @@ KoFilter::ConversionStatus PdfImport::convert(const QByteArray& from, const QByt
+ SvgOutputDev * dev = new SvgOutputDev(m_chain->outputFile());
+ if (dev->isOk()) {
+ int rotate = 0;
+- GBool useMediaBox = gTrue;
+- GBool crop = gFalse;
+- GBool printing = gFalse;
++ bool useMediaBox = true;
++ bool crop = false;
++ bool printing = false;
+ pdfDoc->displayPages(dev, firstPage, lastPage, hDPI, vDPI, rotate, useMediaBox, crop, printing);
+ dev->dumpContent();
+ }
+diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp
+index 9063e69..80f01a5 100644
+--- a/filters/karbon/pdf/SvgOutputDev.cpp
++++ b/filters/karbon/pdf/SvgOutputDev.cpp
+@@ -39,7 +39,7 @@ class SvgOutputDev::Private
+ {
+ public:
+ Private(const QString &fname)
+- : svgFile(fname), defs(0), body(0), state(gTrue)
++ : svgFile(fname), defs(0), body(0), state(true)
+ , brush(Qt::SolidPattern) {}
+
+ ~Private() {
+@@ -62,7 +62,7 @@ SvgOutputDev::SvgOutputDev(const QString &fileName)
+ : d(new Private(fileName))
+ {
+ if (! d->svgFile.open(QIODevice::WriteOnly)) {
+- d->state = gFalse;
++ d->state = false;
+ return;
+ }
+
+@@ -82,17 +82,17 @@ bool SvgOutputDev::isOk()
+
+ bool SvgOutputDev::upsideDown()
+ {
+- return gTrue;
++ return true;
+ }
+
+ bool SvgOutputDev::useDrawChar()
+ {
+- return gFalse;
++ return false;
+ }
+
+ bool SvgOutputDev::interpretType3Chars()
+ {
+- return gFalse;
++ return false;
+ }
+
+ void SvgOutputDev::startPage(int pageNum, GfxState *state, XRef */*xref*/)
+--
+cgit v1.1
+
diff --git a/user/cdrtools/APKBUILD b/user/cdrtools/APKBUILD
index c9e6c1d70..0145aa351 100644
--- a/user/cdrtools/APKBUILD
+++ b/user/cdrtools/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=cdrtools
pkgver=3.01
-pkgrel=0
+pkgrel=1
pkgdesc="Highly portable CD/DVD/Blu-Ray command line recording software"
url="http://cdrecord.sourceforge.net/private/cdrecord.html"
arch="all"
@@ -26,6 +26,9 @@ check() {
package() {
cd "$builddir"
smake INS_BASE=/usr DESTDIR="$pkgdir" install
+
+ mv "$pkgdir"/usr/share/man/man3 "$pkgdir"/usr/share/man/man3sch
+ rename .3 .3sch "$pkgdir"/usr/share/man/man3sch/*.3
}
sha512sums="54f06496e47184e324fc9d8b1153d3c806ed43c3c57e2a8d79a79afe12aa5334e82fa500fe1b1bf49307ad7dfabe687f6e1ad914fc2f0c5c429d8e6a34c293eb cdrtools-3.01.tar.bz2"
diff --git a/user/cgmanager/APKBUILD b/user/cgmanager/APKBUILD
new file mode 100644
index 000000000..958ba8327
--- /dev/null
+++ b/user/cgmanager/APKBUILD
@@ -0,0 +1,38 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=cgmanager
+pkgver=0.41
+pkgrel=0
+pkgdesc="CGroup management daemon"
+url="https://linuxcontainers.org/cgmanager/introduction/"
+arch="all"
+license="LGPL-2.1+ AND GPL-2.0-only"
+depends=""
+makedepends="help2man libnih-dev linux-pam-dev"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc"
+source="https://linuxcontainers.org/downloads/cgmanager/cgmanager-$pkgver.tar.gz"
+
+build() {
+ cd "$builddir"
+ ./configure \
+ --build=$CBUILD \
+ --host=$CHOST \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --localstatedir=/var \
+ --with-init-script=openrc
+ make
+}
+
+check() {
+ cd "$builddir"
+ make check
+}
+
+package() {
+ cd "$builddir"
+ make DESTDIR="$pkgdir" install
+}
+
+sha512sums="e8ba64665a21d987cd835580c2b6bafbcb05e22ce7f6216762d04840957c2cd21fb571360e0206ae9143656beed88ff3396eb1f644052c05189093a665a705fd cgmanager-0.41.tar.gz"
diff --git a/user/comfortaa/APKBUILD b/user/comfortaa/APKBUILD
new file mode 100644
index 000000000..cca3023f9
--- /dev/null
+++ b/user/comfortaa/APKBUILD
@@ -0,0 +1,23 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=comfortaa
+pkgver=3.001
+pkgrel=0
+pkgdesc="Stylish, modern, free TrueType font"
+url="https://www.deviantart.com/aajohan/art/Comfortaa-font-105395949"
+arch="noarch"
+options="!check" # No testing fonts.
+license="OFL-1.1"
+depends="fontconfig"
+makedepends=""
+subpackages=""
+source="https://distfiles.adelielinux.org/source/comfortaa-$pkgver.zip"
+builddir="$srcdir/$pkgver"
+
+package() {
+ cd "$builddir"
+ mkdir -p "$pkgdir"/usr/share/fonts/X11/TTF/
+ install -D -m644 *.ttf "$pkgdir"/usr/share/fonts/X11/TTF/
+}
+
+sha512sums="caf998f9a1dd994f790a2ace1fcc8bf5632f21a61d849e6b5590d808d646556115ec08142397817d9dcfc1bb507d62ca52caf061e5c6048f89bc77f6e74c1f4b comfortaa-3.001.zip"
diff --git a/user/convertlit/APKBUILD b/user/convertlit/APKBUILD
new file mode 100644
index 000000000..49cce0d46
--- /dev/null
+++ b/user/convertlit/APKBUILD
@@ -0,0 +1,31 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=convertlit
+pkgver=1.8
+pkgrel=0
+pkgdesc="Tool to convert Microsoft Reader .LIT files to open formats"
+url="http://www.convertlit.com/"
+arch="all"
+options="!check" # No test suite.
+license="GPL-2.0"
+depends=""
+makedepends="libtommath-dev"
+subpackages=""
+source="http://www.convertlit.com/${pkgname}${pkgver/./}src.zip
+ lib.patch
+ "
+builddir="$srcdir/"
+
+build() {
+ cd "$builddir"
+ make -C lib
+ make -C clit18
+}
+
+package() {
+ cd "$builddir"
+ install -D -m755 clit18/clit "$pkgdir"/usr/bin/clit
+}
+
+sha512sums="0d4b7d525f5164a73a47a00e1c4e93ff50e738a4e6c541ded283c4779e6a67138f601c23a41344517ca5d7f8c9141b25cc6edc7f3967fbf9042e99f647354f36 convertlit18src.zip
+b54a826805f3ce13d75da3c0f8f635235efd8ae1550962b5e44a5c8c67325f996848a3be6f5ba989a849c66a2293a30ac117212786ff36b5c01743aa87f6ef29 lib.patch"
diff --git a/user/convertlit/lib.patch b/user/convertlit/lib.patch
new file mode 100644
index 000000000..222f29074
--- /dev/null
+++ b/user/convertlit/lib.patch
@@ -0,0 +1,14 @@
+--- src/clit18/Makefile.old 2004-07-04 16:52:14.000000000 +0000
++++ src/clit18/Makefile 2019-01-15 17:13:44.510000000 +0000
+@@ -1,9 +1,9 @@
+ all: clit
+
+-CFLAGS=-funsigned-char -Wall -O2 -I ../libtommath-0.30/ -I ../lib -I ../lib/des -I .
++CFLAGS=-funsigned-char -I ../lib -I ../lib/des -I .
+ clean:
+ rm -f *.o clit
+
+ clit: clit.o hexdump.o drm5.o explode.o transmute.o display.o utils.o manifest.o ../lib/openclit.a
+- gcc -o clit $^ ../libtommath-0.30/libtommath.a
++ $(CC) $(LDFLAGS) -o clit $^ -ltommath
+
diff --git a/user/cracklib/APKBUILD b/user/cracklib/APKBUILD
new file mode 100644
index 000000000..eba2a0c49
--- /dev/null
+++ b/user/cracklib/APKBUILD
@@ -0,0 +1,47 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=cracklib
+pkgver=2.9.6
+pkgrel=0
+pkgdesc="Library for checking passwords against dictionary words"
+url=" "
+arch="all"
+license="LGPL-2.0+"
+depends=""
+makedepends=""
+subpackages="$pkgname-dev $pkgname-lang"
+triggers="$pkgname.trigger=/usr/share/dict"
+source="https://github.com/cracklib/cracklib/releases/download/cracklib-$pkgver/cracklib-$pkgver.tar.gz
+ $pkgname.trigger
+ "
+
+prepare() {
+ cd "$builddir"
+ default_prepare
+}
+
+build() {
+ cd "$builddir"
+ ./configure \
+ --build=$CBUILD \
+ --host=$CHOST \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --localstatedir=/var
+ make
+}
+
+check() {
+ cd "$builddir"
+ make test
+}
+
+package() {
+ cd "$builddir"
+ make DESTDIR="$pkgdir" install
+ install -D -m644 dicts/cracklib-small "$pkgdir"/usr/share/dict/cracklib-small
+}
+
+sha512sums="2b09672e5b412d670e7ed911ebf0c0023fe2901ea05c9c02eefb7a58a13cddbc27a65d75bb20be9f8cebf4c90a9a56dfe1a3b656dff62b1d6048f5376e671786 cracklib-2.9.6.tar.gz
+deef4710a3bf78348adfe699ff995acc21a7671ab03c4dd28da7f38f4a83008af4c97c9c1d4e1e98a47c0148c84146b36477f41f98fb0ee028cc0fadebb85ab9 cracklib.trigger"
diff --git a/user/cracklib/cracklib.trigger b/user/cracklib/cracklib.trigger
new file mode 100644
index 000000000..677155080
--- /dev/null
+++ b/user/cracklib/cracklib.trigger
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+create-cracklib-dict /usr/share/dict/*
diff --git a/user/ctags/APKBUILD b/user/ctags/APKBUILD
new file mode 100644
index 000000000..bdc83ed14
--- /dev/null
+++ b/user/ctags/APKBUILD
@@ -0,0 +1,34 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=ctags
+pkgver=5.8
+pkgrel=0
+pkgdesc="Source code indexer for faster searching"
+url="http://ctags.sourceforge.net/"
+arch="all"
+options="!check" # No test suite.
+license="GPL-2.0-only"
+depends=""
+makedepends=""
+subpackages="$pkgname-doc"
+source="https://prdownloads.sourceforge.net/ctags/ctags-$pkgver.tar.gz"
+
+build() {
+ cd "$builddir"
+ ./configure \
+ --build=$CBUILD \
+ --host=$CHOST \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --localstatedir=/var
+ make
+}
+
+package() {
+ cd "$builddir"
+ install -D -m755 ctags "$pkgdir"/usr/bin/ctags
+ install -D -m644 ctags.1 "$pkgdir"/usr/share/man/man1/ctags.1
+}
+
+sha512sums="981912cd335978cde22864e977947fc75326572fb29518e559cc4a8ac1edc84b3604165218a666e36353f17da4f89f8e967acdb88696f816748eb946d79eaa15 ctags-5.8.tar.gz"
diff --git a/user/cups/APKBUILD b/user/cups/APKBUILD
index 3678dea12..156eb247c 100644
--- a/user/cups/APKBUILD
+++ b/user/cups/APKBUILD
@@ -8,7 +8,7 @@ arch="all"
license="GPL-2.0-only AND LGPL-2.0-only"
# cupsUTF8ToCharset(CUPS_EUC_JP) of utfdemo.txt: FAIL (UTF-8 to EUC-JP on line 1)
options="!check"
-depends="cups-client dbus gnu-ghostscript openssl poppler-utils"
+depends="cups-client dbus openssl poppler-utils"
depends_dev="gnutls-dev openssl-dev zlib-dev"
makedepends="$depends_dev libpaper-dev dbus-dev libjpeg-turbo-dev linux-headers
linux-pam-dev"
diff --git a/user/djvulibre/APKBUILD b/user/djvulibre/APKBUILD
new file mode 100644
index 000000000..a90485e6a
--- /dev/null
+++ b/user/djvulibre/APKBUILD
@@ -0,0 +1,38 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=djvulibre
+pkgver=3.5.27
+pkgrel=0
+pkgdesc="Format for distributing documents and images"
+url="http://djvu.sourceforge.net/"
+arch="all"
+license="GPL-2.0+"
+depends=""
+depends_dev=""
+makedepends="$depends_dev imagemagick libjpeg-turbo-dev tiff-dev"
+subpackages="$pkgname-dev $pkgname-doc"
+source="https://downloads.sourceforge.net/djvu/djvulibre-$pkgver.tar.gz"
+
+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="62abcaa2fe7edab536477929ba38b882453dab1a06e119a3f838b38d5c61f5d8c252e4769e6534582b826e49bcfb490513179580fab9c3afa84aa92053ccebee djvulibre-3.5.27.tar.gz"
diff --git a/user/dolphin/APKBUILD b/user/dolphin/APKBUILD
index d7a8e141f..3a8c70c45 100644
--- a/user/dolphin/APKBUILD
+++ b/user/dolphin/APKBUILD
@@ -1,19 +1,20 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=dolphin
-pkgver=18.08.3
+pkgver=18.12.1
pkgrel=0
pkgdesc="Lightweight desktop file manager"
url="https://www.kde.org/applications/system/dolphin/"
arch="all"
options="!check" # Tests require X11 and D-Bus session bus.
license="GPL-2.0-only"
-depends=""
+depends="ffmpegthumbs kdegraphics-thumbnailers"
makedepends="cmake extra-cmake-modules qt5-qtbase-dev kdoctools-dev kinit-dev
kcmutils-dev knewstuff-dev kcoreaddons-dev ki18n-dev kdbusaddons-dev
kbookmarks-dev kconfig-dev kio-dev kparts-dev solid-dev kiconthemes-dev
kcompletion-dev ktextwidgets-dev knotifications-dev kcrash-dev
- baloo-dev kfilemetadata-dev kdelibs4support-dev kactivities-dev"
+ baloo-dev kfilemetadata-dev kdelibs4support-dev kactivities-dev
+ baloo-widgets-dev"
subpackages="$pkgname-doc $pkgname-lang"
source="https://download.kde.org/stable/applications/$pkgver/src/dolphin-$pkgver.tar.xz"
@@ -43,4 +44,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="f3017ecb67009292972876f27ade398699622cd4253e608d78b9c8dd7693bce2a1d742af5f51885b28c1765496b31f83ac25fda40ba330821b460622adc7ad7c dolphin-18.08.3.tar.xz"
+sha512sums="5975c594051f9bcc860026075631bb14ea920069826c1f1994b10dbf606b0474e552324ecf0bdd252deb83c9245e3f1af80502fd122806be41fc37851b96ef3c dolphin-18.12.1.tar.xz"
diff --git a/user/ebook-tools/APKBUILD b/user/ebook-tools/APKBUILD
new file mode 100644
index 000000000..6c33ad3d5
--- /dev/null
+++ b/user/ebook-tools/APKBUILD
@@ -0,0 +1,39 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=ebook-tools
+pkgver=0.2.2
+pkgrel=0
+pkgdesc="Tools for manipulating various electronic book formats"
+url="https://sourceforge.net/projects/ebook-tools/"
+arch="all"
+license="MIT"
+depends="convertlit cmd:which"
+makedepends="libxml2-dev libzip-dev"
+subpackages="$pkgname-dev"
+source="https://downloads.sourceforge.net/ebook-tools/ebook-tools-$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 \
+ -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="b4518249835ed7cc672392bf2f8b1c62bc218e41c53663bb26ab34c9e43a99b6b7ae794babdb4bd775e467bb17918703a66ee57c8cf94cb7afc4ba2a7f74816a ebook-tools-0.2.2.tar.gz"
diff --git a/user/evince/APKBUILD b/user/evince/APKBUILD
new file mode 100644
index 000000000..9f9e7172e
--- /dev/null
+++ b/user/evince/APKBUILD
@@ -0,0 +1,77 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=evince
+pkgver=3.31.4
+pkgrel=0
+pkgdesc="GNOME document viewer"
+url="https://wiki.gnome.org/Apps/Evince"
+arch="all"
+license="GPL-2.0+ AND MIT AND BSD-3-Clause AND LGPL-2.0+ AND X11 AND LGPL-3.0-only AND Public-Domain AND LGPL-2.1+"
+depends="gst-plugins-base gst-plugins-good"
+makedepends="djvulibre-dev glib-dev gobject-introspection-dev
+ gsettings-desktop-schemas-dev gstreamer-dev gst-plugins-base-dev
+ gtk+3.0-dev itstool libarchive-dev libexecinfo-dev libgxps-dev
+ libsecret-dev libspectre-dev libxml2-dev libxml2-utils poppler-dev
+ tiff-dev zlib-dev"
+subpackages="$pkgname-doc $pkgname-lang"
+source="https://ftp.gnome.org/pub/gnome/sources/evince/3.31/evince-$pkgver.tar.xz"
+
+build() {
+ cd "$builddir"
+ ./configure \
+ --build=$CBUILD \
+ --host=$CHOST \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --localstatedir=/var \
+ --without-gspell \
+ --disable-nautilus \
+ --enable-introspection \
+ --enable-ps
+
+ # our msgfmt(1) can't do --desktop
+ cp data/org.gnome.Evince.desktop.in data/org.gnome.Evince.desktop
+ cp data/org.gnome.Evince-previewer.desktop.in \
+ data/org.gnome.Evince-previewer.desktop
+ cp backend/pdf/evince-pdfdocument.metainfo.xml.in \
+ backend/pdf/evince-pdfdocument.metainfo.xml
+ cp backend/pdf/pdfdocument.evince-backend.desktop.in \
+ backend/pdf/pdfdocument.evince-backend
+ cp backend/djvu/evince-djvudocument.metainfo.xml.in \
+ backend/djvu/evince-djvudocument.metainfo.xml
+ cp backend/djvu/djvudocument.evince-backend.desktop.in \
+ backend/djvu/djvudocument.evince-backend
+ cp backend/tiff/evince-tiffdocument.metainfo.xml.in \
+ backend/tiff/evince-tiffdocument.metainfo.xml
+ cp backend/tiff/tiffdocument.evince-backend.desktop.in \
+ backend/tiff/tiffdocument.evince-backend
+ cp backend/comics/evince-comicsdocument.metainfo.xml.in \
+ backend/comics/evince-comicsdocument.metainfo.xml
+ cp backend/comics/comicsdocument.evince-backend.desktop.in \
+ backend/comics/comicsdocument.evince-backend
+ cp backend/xps/evince-xpsdocument.metainfo.xml.in \
+ backend/xps/evince-xpsdocument.metainfo.xml
+ cp backend/xps/xpsdocument.evince-backend.desktop.in \
+ backend/xps/xpsdocument.evince-backend
+ cp backend/ps/evince-psdocument.metainfo.xml.in \
+ backend/ps/evince-psdocument.metainfo.xml
+ cp backend/ps/psdocument.evince-backend.desktop.in \
+ backend/ps/psdocument.evince-backend
+ cp org.gnome.Evince.appdata.xml.in org.gnome.Evince.appdata.xml
+
+ # we now return you to your regularly scheduled build
+ make
+}
+
+check() {
+ cd "$builddir"
+ make check
+}
+
+package() {
+ cd "$builddir"
+ make DESTDIR="$pkgdir" install
+}
+
+sha512sums="bed3950fb5ec58855a915c9e06b158924fd07b41c022e281cbada30174d8918c69a29f3408d27db2f1df70e2ba6bc2c35a6f0d5075627397682b9602a6f94a0f evince-3.31.4.tar.xz"
diff --git a/user/farstream/APKBUILD b/user/farstream/APKBUILD
new file mode 100644
index 000000000..f0d45c176
--- /dev/null
+++ b/user/farstream/APKBUILD
@@ -0,0 +1,41 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=farstream
+pkgver=0.2.8
+pkgrel=0
+pkgdesc="Audio/Video communications framework"
+url="https://www.freedesktop.org/wiki/Software/Farstream/"
+arch="all"
+options="!check" # Tests are really really brittle and depend on networking.
+license="LGPL-2.1+"
+depends="gst-plugins-base gst-plugins-good"
+depends_dev="glib-dev"
+makedepends="$depends_dev gobject-introspection-dev gstreamer-dev
+ gst-plugins-base-dev libnice-dev"
+subpackages="$pkgname-dev $pkgname-doc"
+source="https://freedesktop.org/software/farstream/releases/farstream/farstream-$pkgver.tar.gz"
+
+build() {
+ cd "$builddir"
+ ./configure \
+ --build=$CBUILD \
+ --host=$CHOST \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --localstatedir=/var \
+ --with-package-origin="${DISTRO_NAME-:Adélie Linux} (${DISTRO_URL-:https://www.adelielinux.org/})"
+ make
+}
+
+check() {
+ cd "$builddir"
+ make check
+}
+
+package() {
+ cd "$builddir"
+ make DESTDIR="$pkgdir" install
+}
+
+sha512sums="7ec5c57f8778f4107cb628dbf411e38b726152cf78920127dff4423239ff7e4980b6b4f938abba2aa21ab984b1e3053e7e648611322a0ce94df0af576df99a7e farstream-0.2.8.tar.gz"
diff --git a/user/ffmpeg/APKBUILD b/user/ffmpeg/APKBUILD
index 8d576a7ed..6d6c0627b 100644
--- a/user/ffmpeg/APKBUILD
+++ b/user/ffmpeg/APKBUILD
@@ -4,7 +4,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=ffmpeg
pkgver=4.1
-pkgrel=0
+pkgrel=1
pkgdesc="Record, convert, and stream audio and video"
url="https://ffmpeg.org/"
arch="all"
@@ -12,11 +12,12 @@ license="GPL-2.0-only"
options="!check textrels" # Test suite requires proper licensing headers on all files,
# which upstream does not provide.
subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
-makedepends="gnutls-dev lame-dev libvorbis-dev xvidcore-dev zlib-dev libvdpau-dev
- imlib2-dev libtheora-dev coreutils bzip2-dev perl-dev x264-dev
- pulseaudio-dev sdl2-dev libxfixes-dev libva-dev alsa-lib-dev rtmpdump-dev
- v4l-utils-dev yasm opus-dev x265-dev xz-dev freetype-dev speex-dev
- ladspa-dev libcdio-dev libcdio-paranoia-dev wavpack-dev libwebp-dev"
+makedepends="alsa-lib-dev bzip2-dev freetype-dev gnutls-dev imlib2-dev
+ ladspa-dev lame-dev libcdio-dev libcdio-paranoia-dev libmodplug-dev
+ libtheora-dev libva-dev libvdpau-dev libvorbis-dev libwebp-dev
+ libxfixes-dev opus-dev perl-dev pulseaudio-dev rtmpdump-dev sdl2-dev
+ speex-dev v4l-utils-dev wavpack-dev x264-dev x265-dev xvidcore-dev
+ xz-dev yasm zlib-dev"
source="https://ffmpeg.org/releases/ffmpeg-$pkgver.tar.xz
0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch
"
@@ -54,6 +55,7 @@ build() {
--enable-gnutls \
--enable-gpl \
--enable-libmp3lame \
+ --enable-libmodplug \
--enable-librtmp \
--enable-libvorbis \
--disable-libvpx \
diff --git a/user/ffmpegthumbs/APKBUILD b/user/ffmpegthumbs/APKBUILD
new file mode 100644
index 000000000..81197186d
--- /dev/null
+++ b/user/ffmpegthumbs/APKBUILD
@@ -0,0 +1,42 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=ffmpegthumbs
+pkgver=18.12.1
+pkgrel=0
+pkgdesc="KDE video thumbnail system using FFmpeg"
+url="https://www.KDE.org/"
+arch="all"
+license="GPL-2.0+"
+depends=""
+makedepends="cmake extra-cmake-modules qt5-qtbase-dev ffmpeg-dev kconfig-dev
+ ki18n-dev kio-dev"
+subpackages="$pkgname-lang"
+source="https://download.kde.org/stable/applications/$pkgver/src/ffmpegthumbs-$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="710c9f7a1b17d299268ed11fb99637d617a3d47deb51ba0bdda210023af859a434fd5ae15455bf3c8dc953888c2af5d697ae90f574ef679307b9f756f110507c ffmpegthumbs-18.12.1.tar.xz"
diff --git a/user/fluxbox/APKBUILD b/user/fluxbox/APKBUILD
index ca5245921..73c076d15 100644
--- a/user/fluxbox/APKBUILD
+++ b/user/fluxbox/APKBUILD
@@ -2,13 +2,13 @@
# Maintainer: Dan Theisen <djt@hxx.in>
pkgname=fluxbox
pkgver=1.3.7
-pkgrel=0
+pkgrel=1
pkgdesc="A lightweight and highly-configurable window manager"
url="http://www.fluxbox.org"
arch="all"
license="MIT"
options="!check" # This package has a broken testsuite
-depends=""
+depends="gxmessage"
makedepends="libxinerama-dev libxpm-dev libxrandr imlib2-dev libxrender-dev
libxrandr-dev libxinerama-dev freetype-dev libxft-dev xorgproto"
subpackages="$pkgname-doc"
diff --git a/user/fontforge/APKBUILD b/user/fontforge/APKBUILD
new file mode 100644
index 000000000..949fb702c
--- /dev/null
+++ b/user/fontforge/APKBUILD
@@ -0,0 +1,43 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=fontforge
+pkgver=2.0.20170731
+pkgrel=1
+pkgdesc="Open source font editor"
+url="https://fontforge.github.io/en-US/"
+arch="all"
+license="GPL-3.0+ AND BSD-3-Clause"
+depends="desktop-file-utils shared-mime-info"
+makedepends="freetype-dev giflib-dev glib-dev libjpeg-turbo-dev
+ libuninameslist-dev libpng-dev libx11-dev libxml2-dev pango-dev
+ python3-dev tiff-dev zlib-dev"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
+source="https://github.com/fontforge/fontforge/releases/download/${pkgver/2.0./}/fontforge-dist-${pkgver/2.0./}.tar.xz
+ python3.patch
+ "
+
+build() {
+ cd "$builddir"
+ PYTHON=python3 ./configure \
+ --build=$CBUILD \
+ --host=$CHOST \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --localstatedir=/var
+ make
+}
+
+check() {
+ cd "$builddir"
+ # skip test 53; it doesn't work.
+ make check TESTSUITEFLAGS="1-52 54"
+}
+
+package() {
+ cd "$builddir"
+ make DESTDIR="$pkgdir" install
+}
+
+sha512sums="26f7a40714460716a24dd0229fdb027f3766bcc48db64b8993436ddcb6277898f9f3b67ad4fc0be515b2b38e01370d1c7d9ee3c6ece1be862b7d8c9882411f11 fontforge-dist-20170731.tar.xz
+0ca2f3d10a54e4ccb0737ba8e4e768a75e536f70f8892bfe8c23daa5d542d58a1dd4991a982748dcb2c24ed5ae4cb336278a1c01eb434a0463b8b36133b0bb33 python3.patch"
diff --git a/user/fontforge/python3.patch b/user/fontforge/python3.patch
new file mode 100644
index 000000000..25bae415e
--- /dev/null
+++ b/user/fontforge/python3.patch
@@ -0,0 +1,197 @@
+From b6089f11bd7534c9aa38b875ef1e830fc3b898b4 Mon Sep 17 00:00:00 2001
+From: Jeremy Tan <jtanx@outlook.com>
+Date: Wed, 13 Sep 2017 17:22:18 +0800
+Subject: [PATCH] python: Use PyMem_Free wherever PyArg_ParseTuple+es is used
+
+https://docs.python.org/2.0/ext/parseTuple.html
+---
+ fontforge/python.c | 62 +++++++++++++++++++++++++++-------------------
+ 1 file changed, 38 insertions(+), 27 deletions(-)
+
+diff --git a/fontforge/python.c b/fontforge/python.c
+index 5d6820c40..c6d7aca2b 100644
+--- a/fontforge/python.c
++++ b/fontforge/python.c
+@@ -607,7 +607,13 @@ return( NULL );
+ }
+ }
+
+- if ( !SetPrefs((char *) prefname,&val,NULL)) {
++ bool succeeded = SetPrefs((char *) prefname,&val,NULL);
++ if (val.type == v_str && val.u.sval) {
++ PyMem_Free(val.u.sval);
++ val.u.sval = NULL;
++ }
++
++ if (!succeeded) {
+ PyErr_Format(PyExc_NameError, "Unknown preference item in SetPrefs: %s", prefname );
+ return( NULL );
+ }
+@@ -728,7 +734,7 @@ static PyObject *PyFF_UnicodeFromName(PyObject *UNUSED(self), PyObject *args) {
+ return( NULL );
+
+ ret = Py_BuildValue("i", UniFromName((char *) name, ui_none,&custom));
+- free(name);
++ PyMem_Free(name);
+ return( ret );
+ }
+
+@@ -1361,12 +1367,14 @@ Py_RETURN_NONE; /* Well, that was pointless */
+ if ( import==Py_None )
+ import=NULL;
+ else if ( !PyCallable_Check(import) ) {
++ PyMem_Free(name);
+ PyErr_Format(PyExc_TypeError, "First argument is not callable" );
+ return( NULL );
+ }
+ if ( export==Py_None )
+ export=NULL;
+ else if ( !PyCallable_Check(export) ) {
++ PyMem_Free(name);
+ PyErr_Format(PyExc_TypeError, "Second argument is not callable" );
+ return( NULL );
+ }
+@@ -1472,7 +1480,7 @@ static PyObject *PyFF_logError(PyObject *UNUSED(self), PyObject *args) {
+ if ( !PyArg_ParseTuple(args,"es","UTF-8", &msg) )
+ return( NULL );
+ LogError(msg);
+- free(msg);
++ PyMem_Free(msg);
+ Py_RETURN_NONE;
+ }
+
+@@ -1486,6 +1494,8 @@ static PyObject *PyFF_postError(PyObject *UNUSED(self), PyObject *args) {
+ return( NULL );
+ if( showPythonErrors )
+ ff_post_error(title,msg); /* Prints to stderr if no ui */
++ PyMem_Free(title);
++ PyMem_Free(msg);
+ Py_RETURN_NONE;
+ }
+
+@@ -1494,6 +1504,8 @@ static PyObject *PyFF_postNotice(PyObject *UNUSED(self), PyObject *args) {
+ if ( !PyArg_ParseTuple(args,"eses","UTF-8", &title, "UTF-8", &msg) )
+ return( NULL );
+ ff_post_notice(title,msg); /* Prints to stderr if no ui */
++ PyMem_Free(title);
++ PyMem_Free(msg);
+ Py_RETURN_NONE;
+ }
+
+@@ -1511,8 +1523,8 @@ return( NULL );
+ return( NULL );
+
+ ret = ff_open_filename(title,def,filter);
+- free(title);
+- free(def);
++ PyMem_Free(title);
++ PyMem_Free(def);
+ if ( ret==NULL )
+ Py_RETURN_NONE;
+ reto = DECODE_UTF8(ret,strlen(ret),NULL);
+@@ -1534,8 +1546,8 @@ return( NULL );
+ return( NULL );
+
+ ret = ff_save_filename(title,def,filter);
+- free(title);
+- free(def);
++ PyMem_Free(title);
++ PyMem_Free(def);
+ if ( ret==NULL )
+ Py_RETURN_NONE;
+ reto = DECODE_UTF8(ret,strlen(ret),NULL);
+@@ -1558,8 +1570,8 @@ return( NULL );
+ return( NULL );
+ if ( !PySequence_Check(answero) || STRING_CHECK(answero)) {
+ PyErr_Format(PyExc_TypeError, "Expected a tuple of strings for the third argument");
+- free(title);
+- free(quest);
++ PyMem_Free(title);
++ PyMem_Free(quest);
+ return( NULL );
+ }
+ cnt = PySequence_Size(answero);
+@@ -1568,16 +1580,16 @@ return( NULL );
+ cancel = cnt-1;
+ if ( cancel<0 || cancel>=cnt || def<0 || def>=cnt ) {
+ PyErr_Format(PyExc_ValueError, "Value out of bounds for 4th or 5th argument");
+- free(title);
+- free(quest);
++ PyMem_Free(title);
++ PyMem_Free(quest);
+ free(answers);
+ return( NULL );
+ }
+ for ( i=0; i<cnt; ++i ) {
+ PyObject *utf8_name = PYBYTES_UTF8(PySequence_GetItem(answero,i));
+ if ( utf8_name==NULL ) {
+- free(title);
+- free(quest);
++ PyMem_Free(title);
++ PyMem_Free(quest);
+ FreeStringArray( i, answers );
+ return( NULL );
+ }
+@@ -1587,8 +1599,8 @@ return( NULL );
+ answers[cnt] = NULL;
+
+ ret = ff_ask(title,(const char **) answers,def,cancel,quest);
+- free(title);
+- free(quest);
++ PyMem_Free(title);
++ PyMem_Free(quest);
+ FreeStringArray( cnt, answers );
+ return( Py_BuildValue("i",ret));
+ }
+@@ -1608,23 +1620,23 @@ return( NULL );
+ return( NULL );
+ if ( !PySequence_Check(answero) || STRING_CHECK(answero)) {
+ PyErr_Format(PyExc_TypeError, "Expected a tuple of strings for the third argument");
+- free(title);
+- free(quest);
++ PyMem_Free(title);
++ PyMem_Free(quest);
+ return( NULL );
+ }
+ cnt = PySequence_Size(answero);
+ answers = calloc(cnt+1, sizeof(char *));
+ if ( def<0 || def>=cnt ) {
+ PyErr_Format(PyExc_ValueError, "Value out of bounds for 4th argument");
+- free(title);
+- free(quest);
++ PyMem_Free(title);
++ PyMem_Free(quest);
+ return( NULL );
+ }
+ for ( i=0; i<cnt; ++i ) {
+ PyObject *utf8_name = PYBYTES_UTF8(PySequence_GetItem(answero,i));
+ if ( utf8_name==NULL ) {
+- free(title);
+- free(quest);
++ PyMem_Free(title);
++ PyMem_Free(quest);
+ FreeStringArray( i, answers );
+ return( NULL );
+ }
+@@ -1634,8 +1646,8 @@ return( NULL );
+ answers[cnt] = NULL;
+
+ ret = ff_choose(title,(const char **) answers,cnt,def,quest);
+- free(title);
+- free(quest);
++ PyMem_Free(title);
++ PyMem_Free(quest);
+ FreeStringArray( cnt, answers );
+ return( Py_BuildValue("i",ret));
+ }
+@@ -1654,8 +1666,8 @@ return( NULL );
+ return( NULL );
+
+ ret = ff_ask_string(title,def,quest);
+- free(title);
+- free(quest);
++ PyMem_Free(title);
++ PyMem_Free(quest);
+ free(def);
+ if ( ret==NULL )
+ Py_RETURN_NONE;
diff --git a/user/fortune-mod/APKBUILD b/user/fortune-mod/APKBUILD
new file mode 100644
index 000000000..2a4e1c873
--- /dev/null
+++ b/user/fortune-mod/APKBUILD
@@ -0,0 +1,54 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=fortune-mod
+pkgver=2.6.2
+pkgrel=0
+pkgdesc="Display random messages or quotations"
+url="https://www.shlomifish.org/humour/fortunes/"
+arch="all"
+options="!check" # Fails due to spaces in CMake files...
+license="BSD-4-Clause"
+depends=""
+checkdepends="perl-file-find-object perl-io-all perl-test-differences
+ perl-test-runvalgrind valgrind"
+makedepends="cmake recode-dev"
+subpackages="$pkgname-doc"
+source="https://github.com/shlomif/fortune-mod/archive/$pkgname-$pkgver.tar.gz"
+builddir="$srcdir/fortune-mod-fortune-mod-$pkgver/$pkgname"
+
+prepare() {
+ cd "$builddir"
+ default_prepare
+ mkdir build
+}
+
+build() {
+ cd "$builddir"/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" \
+ -DNO_OFFENSIVE=True \
+ -DLOCALDIR=/usr/share/games/fortunes \
+ ${CMAKE_CROSSOPTS} \
+ ..
+ make
+}
+
+check() {
+ cd "$builddir"/build
+ make check
+}
+
+package() {
+ cd "$builddir"/build
+ make DESTDIR="$pkgdir" install
+}
+
+sha512sums="e3a9cd949bc38ab3044d2b32e0a6d946d4e8e2824218927c5350c212053ba47372b9f65251cf7a9ffa263c7990aeff6929bc4273b6d57ff1c9e1ff0d6dd80aa8 fortune-mod-2.6.2.tar.gz"
diff --git a/user/free42/APKBUILD b/user/free42/APKBUILD
new file mode 100644
index 000000000..ba8814388
--- /dev/null
+++ b/user/free42/APKBUILD
@@ -0,0 +1,41 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=free42
+pkgver=2.0.22
+pkgrel=1
+pkgdesc="Scientific programmable calculator"
+url="http://thomasokken.com/free42/"
+arch="all"
+options="!check" # No test suite.
+license="GPL-2.0-only AND Public-Domain"
+depends=""
+makedepends="alsa-lib-dev gtk+2.0-dev libx11-dev libxmu-dev"
+subpackages=""
+source="https://distfiles.adelielinux.org/source/free42-nologo-$pkgver.tgz
+ free42.desktop
+ libx11.patch
+ patch.patch
+ "
+builddir="$srcdir/free42-nologo-$pkgver/gtk"
+
+build() {
+ cd "$builddir"
+ local SAVE_CFLAGS
+ SAVE_CFLAGS=$CFLAGS
+ unset CFLAGS
+ CC="gcc -D_WCHAR_T" ./build-intel-lib.sh
+ CFLAGS=$SAVE_CFLAGS
+ make BCD_MATH=1 AUDIO_ALSA=1
+}
+
+package() {
+ cd "$builddir"
+ install -D -m755 free42dec "$pkgdir"/usr/bin/free42dec
+ install -D -m644 "$srcdir"/free42.desktop \
+ "$pkgdir"/usr/share/applications/free42.desktop
+}
+
+sha512sums="865e8cce86a882aba10e7e756308e195a6675f0b6db4b881e7b7df67de95f5169ca801005e25dd0e61a70a5a0cd6a374b0cf58003251cdc9dc526a2506e18e1d free42-nologo-2.0.22.tgz
+f52700d234719f4ee7cdd369fc5f28ade190ff77ed1a824cd2cdaeef62419700de3d85a28fd6ae378f904e018813dc4145ca4cc9f2669fdf50f3e13baa7ec634 free42.desktop
+f8434fd1c20f0dd40de5773615eaf798329870231f7ce66785a1bc8e208fa0a64919f48ac3eea5ab9ceb818570ae93f61b0e81baec4261bbdfbf04237108ab6a libx11.patch
+7b48609bff5466d81f42ed65405cd09e98fa675c087837b22caebab2b97420a34d1156399c3b18608bcae42896c12aa63a6f87515f5677587dfff6ed135dc760 patch.patch"
diff --git a/user/free42/free42.desktop b/user/free42/free42.desktop
new file mode 100644
index 000000000..568afc69b
--- /dev/null
+++ b/user/free42/free42.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Version=1.1
+Name=Free42
+GenericName=Scientific Calculator
+Comment=HP-42S Calculator Simulator
+Icon=accessories-calculator
+Exec=/usr/bin/free42dec
+Categories=Utility;Calculator;Science;Math;
diff --git a/user/free42/libx11.patch b/user/free42/libx11.patch
new file mode 100644
index 000000000..54c4c6cc0
--- /dev/null
+++ b/user/free42/libx11.patch
@@ -0,0 +1,11 @@
+--- gtk/Makefile.old 2019-01-13 14:52:39.000000000 +0000
++++ gtk/Makefile 2019-01-17 01:38:40.500000000 +0000
+@@ -35,7 +35,7 @@
+ -D_WCHAR_T_DEFINED
+
+ LDFLAGS = -L/usr/X11R6/lib
+-LIBS = gcc111libbid.a -lXmu $(shell pkg-config --libs gtk+-2.0)
++LIBS = gcc111libbid.a -lXmu $(shell pkg-config --libs gtk+-2.0) -lX11
+
+ ifeq "$(shell uname -s)" "Linux"
+ LDFLAGS += -Wl,--hash-style=both
diff --git a/user/free42/patch.patch b/user/free42/patch.patch
new file mode 100644
index 000000000..e84b3f7b8
--- /dev/null
+++ b/user/free42/patch.patch
@@ -0,0 +1,82 @@
+--- gtk/intel-lib-linux.patch.old 2019-01-13 14:52:39.000000000 +0000
++++ gtk/intel-lib-linux.patch 2019-01-17 01:27:01.470000000 +0000
+@@ -1668,3 +1668,62 @@
+ }
+
+ + #endif /* FREE42_FPTEST */
++--- LIBRARY/makefile.iml_head.old 2011-07-12 15:26:21.000000000 +0000
+++++ LIBRARY/makefile.iml_head 2019-01-17 01:25:09.210000000 +0000
++@@ -177,7 +177,7 @@
++ # returned
++ # ==============================================================================
++
++-__INDICES__ = 1 2 3 4 5 6 7 8 9 10 11
+++__INDICES__ = 1 2 3 4 5 6 7 8 9 10 11 12 13
++
++ GetIndex = $(strip $(word 1,$(if $(word $(words $(__INDICES__)),$2), \
++ $(error "List too large. Adjust __INDICES__"), \
++@@ -344,9 +344,9 @@
++ endif
++ endif
++
++-ARCH_ALIAS := x86 ia64 EM64T x86_64 i686 amd64 Intel64 sun4u
++-ARCH_LIST := IA32 IA64 EFI2 EFI2 IA32 EFI2 EFI2 EFI2
++-ARCH_TYPE := IA32 IA64 EFI2 EFI2 IA32 EFI2 EFI2 EFI2
+++ARCH_ALIAS := x86 ia64 EM64T x86_64 i686 amd64 Intel64 sun4u ppc64 ppc armel aarch64
+++ARCH_LIST := IA32 IA64 EFI2 EFI2 IA32 EFI2 EFI2 EFI2 EFI2 EFI2 EFI2 EFI2
+++ARCH_TYPE := IA32 IA64 EFI2 EFI2 IA32 EFI2 EFI2 EFI2 EFI2 EFI2 EFI2 EFI2
++ ARCH_TYPES := IA32 IA64 EFI2
++
++ UARCH_LIST := SSE GSSE LRB LRB2
++@@ -363,6 +363,16 @@
++ $(error Invalid host architecture $(IML_HOST_ARCH))
++ endif
++
+++ifeq ($(_HOST_ARCH),ppc)
+++ BID_BIG_ENDIAN ?= true
+++ BID_BIG_ENDIAN := $(BID_BIG_ENDIAN)
+++endif
+++
+++ifeq ($(_HOST_ARCH),ppc64)
+++ BID_BIG_ENDIAN ?= true
+++ BID_BIG_ENDIAN := $(BID_BIG_ENDIAN)
+++endif
+++
++ IML_HOST_ARCH_TYPE ?= $(word $(HOST_ARCH_LIST_INDEX),$(ARCH_TYPE))
++ IML_HOST_ARCH_TYPE := $(IML_HOST_ARCH_TYPE)
++ HOST_ARCH_TYPE_INDEX := $(call GetIndex,$(IML_HOST_ARCH_TYPE),$(ARCH_TYPES))
++@@ -492,7 +502,7 @@
++ RM := $(call CselOs, RM, $(_OS_CHOICE), rm -f, del )
++ AR_CMD := $(call CselOsName,AR_CMD,$(_OS_CHOICE), ar rv, ar rv, libtool, lib -nologo)
++ AR_OUT := $(call CselOsName,AR_OUT,$(_OS_CHOICE), , , -o, /out:)$($(IML_TARGET_OS)__space)
++-LD_CMD := $(call CselOsName,LD_CMD,$(_OS_CHOICE),icc,icc,libtool,link /nologo)
+++LD_CMD := $(call CselOsName,LD_CMD,$(_OS_CHOICE),gcc,icc,libtool,link /nologo)
++ LD_OUT := $(call CselOs, LD_OUT, $(_OS_CHOICE), -o, /out:)$($(IML_TARGET_OS)__space)
++ LD_FLAGS := $(call CselOs, LD_FLAGS, $(_OS_CHOICE), -shared -nostdlib,)
++ RC := $(call CselOs, RC, $(_OS_CHOICE), RC_not_to_be_used_with_linux,rc)
++@@ -515,7 +525,7 @@
++
++ ifeq ($(origin CC_NAME),undefined)
++ ifeq ($(origin CC),default)
++- CC_NAME := $(call $(_OS_CHOICE)OsTypeSelect, icc, icl)
+++ CC_NAME := $(call $(_OS_CHOICE)OsTypeSelect, gcc, icl)
++ else
++ __TMP := $(strip $(subst /, ,$(firstword $(CC))))
++ CC_NAME := $(word $(words $(__TMP)), $(__TMP))
+--- gtk/intel-lib-linux.patch.old 2019-01-23 03:43:48.830000000 +0000
++++ gtk/intel-lib-linux.patch 2019-01-23 03:46:18.170000000 +0000
+@@ -1727,3 +1727,14 @@
+ else
+ __TMP := $(strip $(subst /, ,$(firstword $(CC))))
+ CC_NAME := $(word $(words $(__TMP)), $(__TMP))
++--- LIBRARY/src/bid_functions.h.old 2011-07-12 05:30:53.000000000 +0000
+++++ LIBRARY/src/bid_functions.h 2019-01-23 03:45:35.660000000 +0000
++@@ -42,7 +42,7 @@
++ #include <ctype.h>
++
++ // Fix system header issue on Sun solaris and define required type by ourselves
++-#if !defined(_WCHAR_T) && !defined(_WCHAR_T_DEFINED) && !defined(__QNX__)
+++#if !defined(_WCHAR_T) && !defined(_WCHAR_T_DEFINED) && !defined(__QNX__) && !defined(WCHAR_MAX)
++ typedef int wchar_t;
++ #endif
++
diff --git a/user/glibmm/APKBUILD b/user/glibmm/APKBUILD
new file mode 100644
index 000000000..e5dfbfd14
--- /dev/null
+++ b/user/glibmm/APKBUILD
@@ -0,0 +1,37 @@
+# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+pkgname=glibmm
+pkgver=2.58.0
+pkgrel=0
+pkgdesc="C++ interfaces for glib"
+url="https://gnome.org"
+arch="all"
+license="GPL-2.0+ AND LGPL-2.1+"
+depends="glib-networking"
+makedepends="glib-dev libsigc++-dev"
+subpackages="$pkgname-dev $pkgname-doc"
+source="https://download.gnome.org/sources/glibmm/${pkgver%.*}/glibmm-$pkgver.tar.xz"
+
+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="e376462cdf1a60ed7d7750115200162016f57797674bbf7291c11b8754a6e4394eb1e2948ce4e37247438120dba4e18f5cf9c543963c1e97d8561d174d5ae7df glibmm-2.58.0.tar.xz"
diff --git a/user/gnu-ghostscript/APKBUILD b/user/gnu-ghostscript/APKBUILD
index 633582fb6..14ce2c5f6 100644
--- a/user/gnu-ghostscript/APKBUILD
+++ b/user/gnu-ghostscript/APKBUILD
@@ -2,19 +2,19 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=gnu-ghostscript
pkgver=9.14.1
-pkgrel=0
+pkgrel=2
pkgdesc="PostScript utilities"
url="https://www.gnu.org/software/ghostscript/"
arch="all"
license="AGPL-3.0+ WITH PDF-exception"
depends=""
-makedepends="dbus-dev fontconfig-dev freetype-dev lcms2-dev libice-dev
+makedepends="cups-dev dbus-dev fontconfig-dev freetype-dev lcms2-dev libice-dev
libjpeg-turbo-dev libpaper-dev libpng-dev libx11-dev libxext-dev
libxt-dev tiff-dev zlib-dev"
-subpackages="$pkgname-doc"
-source="ftp://ftp.gnu.org/gnu/ghostscript/gnu-ghostscript-$pkgver.tar.xz"
-sha512sums="658f6ae14b29965c7959b9bd1463760d7fb03b35251446fc37101dbe7ee2866c74a0803e22b2f4488be3221d026578be1d6be7b562ff240036134fbf83edabf9 gnu-ghostscript-9.14.1.tar.xz"
-builddir="$srcdir/gnu-ghostscript-$pkgver"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
+source="ftp://ftp.gnu.org/gnu/ghostscript/gnu-ghostscript-$pkgver.tar.xz
+ do-not-use-sprintf.patch
+ "
build() {
cd "$builddir"
@@ -24,8 +24,11 @@ build() {
--prefix=/usr \
--sysconfdir=/etc \
--mandir=/usr/share/man \
- --localstatedir=/var
+ --localstatedir=/var \
+ --enable-dynamic \
+ --with-system-libtiff
make
+ make so
}
check() {
@@ -36,5 +39,9 @@ check() {
package() {
cd "$builddir"
make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" soinstall
+ install -D -m644 base/*.h "$pkgdir"/usr/include/ghostscript
}
+sha512sums="658f6ae14b29965c7959b9bd1463760d7fb03b35251446fc37101dbe7ee2866c74a0803e22b2f4488be3221d026578be1d6be7b562ff240036134fbf83edabf9 gnu-ghostscript-9.14.1.tar.xz
+1c4d79633ecece9f4de7a672f2888939be7d1e0ba24f3a66500fdfbb37e081e0f323a5efa0d1547fed51206e5a95d3b0659c0ea845d0bc333f281dfb88fcc040 do-not-use-sprintf.patch"
diff --git a/user/gnu-ghostscript/do-not-use-sprintf.patch b/user/gnu-ghostscript/do-not-use-sprintf.patch
new file mode 100644
index 000000000..e0e84b4fe
--- /dev/null
+++ b/user/gnu-ghostscript/do-not-use-sprintf.patch
@@ -0,0 +1,85 @@
+--- gnu-ghostscript-9.14.1/base/mkromfs.c.old 2014-07-02 14:46:25.000000000 +0000
++++ gnu-ghostscript-9.14.1/base/mkromfs.c 2019-01-14 19:08:34.441981516 +0000
+@@ -1937,7 +1937,7 @@
+ for (i = 0; i < len; ++i) {
+ int c = str[i];
+
+- sprintf(linebuf,
++ snprintf(linebuf, sizeof(linebuf),
+ (c < 32 || c >= 127 ? "%d," :
+ c == '\'' || c == '\\' ? "'\\%c'," : "'%c',"),
+ c);
+@@ -2228,7 +2228,7 @@
+ char line[LINE_SIZE + 1];
+
+ while ((rl(in, line, LINE_SIZE), line[0])) {
+- sprintf(linebuf, "%s", line );
++ snprintf(linebuf, sizeof(linebuf), "%s", line );
+ wl(linebuf);
+ }
+ mergefile(os_prefix, inname, in, config, false);
+--- gnu-ghostscript-9.14.1/cups/gdevcups.c.old 2014-07-02 15:13:25.000000000 +0000
++++ gnu-ghostscript-9.14.1/cups/gdevcups.c 2019-01-23 20:56:04.082290416 +0000
+@@ -1039,7 +1039,7 @@
+
+ for (i = 0; i < 16; i ++)
+ {
+- sprintf(name, "cupsInteger%d", i);
++ snprintf(name, sizeof(name), "cupsInteger%d", i);
+ if ((code = param_write_int(plist, strdup(name),
+ (int *)(cups->header.cupsInteger + i))) < 0)
+ return (code);
+@@ -1047,7 +1047,7 @@
+
+ for (i = 0; i < 16; i ++)
+ {
+- sprintf(name, "cupsReal%d", i);
++ snprintf(name, sizeof(name), "cupsReal%d", i);
+ if ((code = param_write_float(plist, strdup(name),
+ cups->header.cupsReal + i)) < 0)
+ return (code);
+@@ -1055,7 +1055,7 @@
+
+ for (i = 0; i < 16; i ++)
+ {
+- sprintf(name, "cupsString%d", i);
++ snprintf(name, sizeof(name), "cupsString%d", i);
+ param_string_from_string(s, cups->header.cupsString[i]);
+ if ((code = param_write_string(plist, strdup(name), &s)) < 0)
+ return (code);
+@@ -3166,19 +3166,19 @@
+
+ for (i = 0; i < 16; i ++)
+ {
+- sprintf(name, "cupsInteger%d", i);
++ snprintf(name, sizeof(name), "cupsInteger%d", i);
+ intoption(cupsInteger[i],strdup(name), unsigned)
+ }
+
+ for (i = 0; i < 16; i ++)
+ {
+- sprintf(name, "cupsReal%d", i);
++ snprintf(name, sizeof(name), "cupsReal%d", i);
+ floatoption(cupsReal[i], strdup(name))
+ }
+
+ for (i = 0; i < 16; i ++)
+ {
+- sprintf(name, "cupsString%d", i);
++ snprintf(name, sizeof(name), "cupsString%d", i);
+ stringoption(cupsString[i], strdup(name))
+ }
+
+@@ -4247,10 +4247,10 @@
+ */
+
+ if (pdev->HWResolution[0] != pdev->HWResolution[1])
+- sprintf(resolution, "%.0fx%.0fdpi", pdev->HWResolution[0],
++ snprintf(resolution, sizeof(resolution), "%.0fx%.0fdpi", pdev->HWResolution[0],
+ pdev->HWResolution[1]);
+ else
+- sprintf(resolution, "%.0fdpi", pdev->HWResolution[0]);
++ snprintf(resolution, sizeof(resolution), "%.0fdpi", pdev->HWResolution[0]);
+
+ for (i = 0, profile = cups->PPD->profiles;
+ i < cups->PPD->num_profiles;
diff --git a/user/gnumeric/APKBUILD b/user/gnumeric/APKBUILD
index 815de92d2..07c02e4ef 100644
--- a/user/gnumeric/APKBUILD
+++ b/user/gnumeric/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=gnumeric
pkgver=1.12.44
-pkgrel=0
+pkgrel=1
pkgdesc="GNOME spreadsheet software"
url="http://www.gnumeric.org/"
arch="all"
@@ -13,7 +13,7 @@ license="GPL-2.0-only OR GPL-3.0-only"
depends=""
makedepends="byacc gobject-introspection-dev goffice-dev gtk+3.0-dev intltool
itstool libgda-dev libxml2-utils perl-dev zlib-dev"
-subpackages="$pkgname-doc $pkgname-lang"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
langdir="/usr/lib/locale"
source="https://ftp.gnome.org/pub/GNOME/sources/gnumeric/1.12/gnumeric-$pkgver.tar.xz
cs.patch
diff --git a/user/grfcodec/APKBUILD b/user/grfcodec/APKBUILD
index c0e97d2ac..7ca60e872 100644
--- a/user/grfcodec/APKBUILD
+++ b/user/grfcodec/APKBUILD
@@ -11,7 +11,9 @@ license="GPL-2.0-only"
depends=""
makedepends="boost-dev"
subpackages="$pkgname-doc"
-source="https://binaries.openttd.org/extra/grfcodec/$pkgver/grfcodec-$pkgver-source.tar.xz"
+source="https://binaries.openttd.org/extra/grfcodec/$pkgver/grfcodec-$pkgver-source.tar.xz
+ va_copy.patch
+ "
build() {
cd "$builddir"
@@ -23,4 +25,5 @@ package() {
make prefix=/usr DESTDIR="$pkgdir" install
}
-sha512sums="543123c794bfdb5b6556f7a897bcd2f3bdd09be8ad6a4ff07b138e0cac62621a4801c732bb20099c1bb383ad5822fc4ade276d49acf2744c811edd10d7699480 grfcodec-6.0.6-source.tar.xz"
+sha512sums="543123c794bfdb5b6556f7a897bcd2f3bdd09be8ad6a4ff07b138e0cac62621a4801c732bb20099c1bb383ad5822fc4ade276d49acf2744c811edd10d7699480 grfcodec-6.0.6-source.tar.xz
+4e7034132f889ac62b82d08dae8c928c8a7efd5a0c3dc0d3f35d6c394fb78082a37a22678c5a428489bd26608d868054131a14fb10201d5ce478d46eb9c96890 va_copy.patch"
diff --git a/user/grfcodec/va_copy.patch b/user/grfcodec/va_copy.patch
new file mode 100644
index 000000000..04a549d60
--- /dev/null
+++ b/user/grfcodec/va_copy.patch
@@ -0,0 +1,16 @@
+--- grfcodec-6.0.6/src/sanity_defines.h.old 2015-05-09 10:59:46.000000000 +0000
++++ grfcodec-6.0.6/src/sanity_defines.h 2019-01-14 19:17:36.690000000 +0000
+@@ -77,10 +77,10 @@
+ ~apWrapper(){va_end(_ap);}
+ operator va_list&(){return _ap;}
+ operator const va_list&()const{return _ap;}
+-#ifdef __va_copy
++#ifdef va_copy
+ va_list&operator=(va_list&ap){
+- __va_copy(_ap,ap);
+- return _ap;
++ va_copy(_ap,ap);
++ return _ap;
+ }
+ #else
+ va_list const&operator=(va_list const&ap){
diff --git a/user/gst-plugins-base/APKBUILD b/user/gst-plugins-base/APKBUILD
index dd1215897..555fec878 100644
--- a/user/gst-plugins-base/APKBUILD
+++ b/user/gst-plugins-base/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=gst-plugins-base
pkgver=1.14.4
-pkgrel=0
+pkgrel=1
pkgdesc="GStreamer multimedia framework - Base plugins"
url="https://gstreamer.freedesktop.org/"
arch="all"
@@ -9,26 +9,10 @@ license="GPL LGPL"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
depends=""
replaces="gst-plugins-base1"
-makedepends="
- alsa-lib-dev
- cdparanoia-dev
- expat-dev
- glib-dev
- gobject-introspection-dev
- gstreamer-dev
- libice-dev
- libogg-dev
- libsm-dev
- libtheora-dev
- libvorbis-dev
- libx11-dev
- libxt-dev
- libxv-dev
- opus-dev
- orc-dev
- pango-dev
- perl
- "
+makedepends="alsa-lib-dev cdparanoia-dev expat-dev glib-dev
+ gobject-introspection-dev gstreamer-dev libice-dev libogg-dev libsm-dev
+ libtheora-dev libvorbis-dev libx11-dev libxt-dev libxv-dev mesa-dev
+ opus-dev orc-dev pango-dev perl"
checkdepends="orc-compiler"
source="https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-$pkgver.tar.xz"
ldpath="/usr/lib/gstreamer-1.0"
diff --git a/user/gtk+3.0/APKBUILD b/user/gtk+3.0/APKBUILD
index 765718db2..441c8252e 100644
--- a/user/gtk+3.0/APKBUILD
+++ b/user/gtk+3.0/APKBUILD
@@ -9,7 +9,7 @@ arch="all"
options="!check" # Test suite is known to fail upstream
license="LGPL-2.1+"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-depends="shared-mime-info gtk-update-icon-cache"
+depends="adwaita-icon-theme shared-mime-info gtk-update-icon-cache"
makedepends="at-spi2-atk-dev atk-dev cairo-dev cups-dev expat-dev
fontconfig-dev gdk-pixbuf-dev glib-dev gnutls-dev
gobject-introspection-dev libepoxy-dev libice-dev libx11-dev
diff --git a/user/gtkmm+3.0/APKBUILD b/user/gtkmm+3.0/APKBUILD
new file mode 100644
index 000000000..f8a441882
--- /dev/null
+++ b/user/gtkmm+3.0/APKBUILD
@@ -0,0 +1,39 @@
+# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+pkgname=gtkmm+3.0
+pkgver=3.24.0
+pkgrel=0
+pkgdesc="C++ interfaces for GTK+ 3"
+url="https://gnome.org"
+arch="all"
+options="!check" # Tests require X
+license="GPL-2.0+ AND LGPL-2.1+"
+depends=""
+makedepends="glibmm-dev pangomm-dev atkmm-dev gtk+3.0-dev"
+subpackages="$pkgname-dev $pkgname-doc"
+source="https://download.gnome.org/sources/gtkmm/${pkgver%.*}/gtkmm-$pkgver.tar.xz"
+builddir="$srcdir/gtkmm-$pkgver"
+
+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="94658fbf7eebbac2a864d6c7d3cd0e6ffd4ac213fd1d9986d721d4906c7a43a45d8757df475879ee37ef54ec5e3fac7d9a8e4a194b97b2be72a10743bf2e13ac gtkmm-3.24.0.tar.xz"
diff --git a/user/gxmessage/APKBUILD b/user/gxmessage/APKBUILD
new file mode 100644
index 000000000..70d3a9573
--- /dev/null
+++ b/user/gxmessage/APKBUILD
@@ -0,0 +1,38 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=gxmessage
+pkgver=3.4.3
+pkgrel=0
+pkgdesc="Display simple messages using GTK+"
+url=" "
+arch="all"
+license="GPL-3.0+"
+depends=""
+makedepends="gtk+3.0-dev intltool"
+subpackages="$pkgname-doc $pkgname-lang"
+langdir="/usr/lib/locale"
+source="https://downloads.sourceforge.net/gxmessage/gxmessage-$pkgver.tar.gz"
+
+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="4e3c455595db723e2d78060c4913f1a87b8f0c5cb6017427d48cd02652655592bf8aa1001adfbfecd5598cc0c613c78a74d71a59a7f1f0787acc29774328e93a gxmessage-3.4.3.tar.gz"
diff --git a/user/haveged/APKBUILD b/user/haveged/APKBUILD
new file mode 100644
index 000000000..7a40a3fc4
--- /dev/null
+++ b/user/haveged/APKBUILD
@@ -0,0 +1,51 @@
+# Contributor: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# Contributor: Danilo Godec <danilo.godec@agenda.si>
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: multiplexd <multi@in-addr.xyz>
+pkgname=haveged
+pkgver=1.9.4
+pkgrel=1
+pkgdesc="Entropy harvesting daemon using CPU timings"
+url="http://www.issihosts.com/haveged/"
+arch="all"
+license="GPL-3.0+"
+subpackages="$pkgname-doc $pkgname-openrc"
+makedepends="linux-headers"
+source="$pkgname-$pkgver.tar.gz::https://github.com/jirka-h/haveged/archive/$pkgver.tar.gz
+ fix-cpu-cache-size-detection.patch
+ haveged.initd
+ haveged.confd"
+
+build() {
+ cd "$builddir"
+
+ ./configure \
+ --build=$CBUILD \
+ --host=$CHOST \
+ --prefix=/usr \
+ --sysconfdir=/etc
+ make
+}
+
+check() {
+ cd "$builddir"
+ make check
+}
+
+package() {
+ cd "$builddir"
+
+ make DESTDIR="$pkgdir" install
+
+ rm "$pkgdir"/usr/lib/libhavege.la
+
+ install -Dm755 "$srcdir"/haveged.initd \
+ "$pkgdir"/etc/init.d/haveged
+ install -Dm644 "$srcdir"/haveged.confd \
+ "$pkgdir"/etc/conf.d/haveged
+}
+
+sha512sums="20017c7637779c0cfa414233bb67efb2976f92c08e4eb1b7ea41ccd483dad755629d8e05fb8560a2db811fc2ded7d05fa081ab10c59341cb4c206595a964641d haveged-1.9.4.tar.gz
+6279296b057f19daf25020ac14997268230af4b11510d6e5c4a86989c119d6b081d2501069af198772302d5cce1464514c749033a4928fb95671268825a84ba8 fix-cpu-cache-size-detection.patch
+5d1e4186580951d4e6e01193e9c8827ceddaf3c2e28a981fc9176cb446bed32b059304796a77d9db6fb761a21f8fd27dd3d31e06a0fb7a5985b4ea94978fcd64 haveged.initd
+57201472fc659aaab919562a00d474d3823d5becea62e8b13ef93eda05e1fd667721c968f224fcae871d13cfcd16d1924403d9181e0899fa214fa00bf4fefc75 haveged.confd"
diff --git a/user/haveged/fix-cpu-cache-size-detection.patch b/user/haveged/fix-cpu-cache-size-detection.patch
new file mode 100644
index 000000000..07da2b46d
--- /dev/null
+++ b/user/haveged/fix-cpu-cache-size-detection.patch
@@ -0,0 +1,15 @@
+Some ARM cpus does not report the cache size or say it is -1
+
+diff --git a/src/havegetune.c b/src/havegetune.c
+index f1a99f2..de39c53 100644
+--- a/src/havegetune.c
++++ b/src/havegetune.c
+@@ -795,6 +795,8 @@ static int vfs_configInfoCache(
+ ctype = vfs_configFile(pAnchor, path, vfs_configType);
+ strcpy(path+plen, "size");
+ size = vfs_configFile(pAnchor, path, vfs_configInt);
++ if (size == -1)
++ size = ctype == 'I' ? GENERIC_ICACHE : GENERIC_DCACHE;
+ cfg_cacheAdd(pAnchor, SRC_VFS_INDEX, pArgs[1], level, ctype, size);
+ }
+ }
diff --git a/user/haveged/haveged.confd b/user/haveged/haveged.confd
new file mode 100644
index 000000000..c4c1e0a3b
--- /dev/null
+++ b/user/haveged/haveged.confd
@@ -0,0 +1,5 @@
+# Config file for /etc/init.d/haveged
+
+# Any extra options you want to pass to haveged
+# on start-up should be put here.
+HAVEGED_OPTS="-w 1024"
diff --git a/user/haveged/haveged.initd b/user/haveged/haveged.initd
new file mode 100644
index 000000000..86660e9c3
--- /dev/null
+++ b/user/haveged/haveged.initd
@@ -0,0 +1,11 @@
+#!/sbin/openrc-run
+
+command="/usr/sbin/haveged"
+command_args="$HAVEGED_OPTS"
+command_background="yes"
+
+pidfile="/run/$RC_SVCNAME.pid"
+
+depend() {
+ need net
+}
diff --git a/user/hermit/APKBUILD b/user/hermit/APKBUILD
new file mode 100644
index 000000000..e2b1002d4
--- /dev/null
+++ b/user/hermit/APKBUILD
@@ -0,0 +1,22 @@
+# Contributor: Luis Ressel <aranea@aixah.de>
+# Maintainer: Luis Ressel <aranea@aixah.de>
+pkgname=hermit
+pkgver=2.0
+pkgrel=0
+pkgdesc="A monospace font designed to be clear, pragmatic and very readable"
+url="https://pcaro.es/p/hermit/"
+arch="noarch"
+options="!check" # No testing fonts
+license="OFL-1.1"
+depends="fontconfig"
+makedepends=""
+subpackages=""
+source="https://pcaro.es/d/otf-$pkgname-$pkgver.tar.gz"
+builddir="$srcdir"
+
+package() {
+ cd "$builddir"
+ install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ *.otf
+}
+
+sha512sums="ee41f8cbcdedfff568cd47ab7730c462ddd67d6170c05d35eaf64a7f954a4bb72d6ac99a383749f7032d9cf7b407b7a5ef3270b4209692c1572beb9744a21d42 otf-hermit-2.0.tar.gz"
diff --git a/user/kde/APKBUILD b/user/kde/APKBUILD
index 1538ef0f5..dbb054a1e 100644
--- a/user/kde/APKBUILD
+++ b/user/kde/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kde
pkgver=5
-pkgrel=0
+pkgrel=1
pkgdesc="The K Desktop Environment"
url="https://www.kde.org/"
arch="noarch"
@@ -9,7 +9,10 @@ license="NCSA"
options="!check" # Metapacakge
subpackages=""
depends="adelie-kde-theme kde-education kde-games kde-graphics kde-multimedia
- kde-system kde-utilities plasma-desktop"
+ kde-system kde-utilities plasma-desktop
+
+ kgamma5 khotkeys kmenuedit ksshaskpass plasma-workspace-wallpapers
+ user-manager"
source=""
package() {
diff --git a/user/kdegraphics-thumbnailers/APKBUILD b/user/kdegraphics-thumbnailers/APKBUILD
new file mode 100644
index 000000000..de17985db
--- /dev/null
+++ b/user/kdegraphics-thumbnailers/APKBUILD
@@ -0,0 +1,42 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=kdegraphics-thumbnailers
+pkgver=18.12.1
+pkgrel=0
+pkgdesc="KDE thumbnailing sofware"
+url="https://www.KDE.org/"
+arch="all"
+license="GPL-2.0-only AND LGPL-2.1+"
+depends=""
+makedepends="cmake extra-cmake-modules qt5-qtbase-dev kio-dev libkdcraw-dev
+ libkexiv2-dev"
+subpackages=""
+source="https://download.kde.org/stable/applications/$pkgver/src/kdegraphics-thumbnailers-$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="06cb7995dc9b09133ae9d60d418a266a72899f55f3e02bfd36e988c94264b100829f003c2e5169b558cbc4c84fa3e69481d7d9565d0b7cdba86ae55e5a8495e1 kdegraphics-thumbnailers-18.12.1.tar.xz"
diff --git a/user/kgamma5/APKBUILD b/user/kgamma5/APKBUILD
new file mode 100644
index 000000000..83ed6b482
--- /dev/null
+++ b/user/kgamma5/APKBUILD
@@ -0,0 +1,42 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=kgamma5
+pkgver=5.12.7
+pkgrel=0
+pkgdesc="Control monitor gamma from KDE 5"
+url="https://www.KDE.org/"
+arch="all"
+license="GPL-2.0+"
+depends=""
+makedepends="cmake extra-cmake-modules qt5-qtbase-dev kconfig-dev
+ kconfigwidgets-dev kdoctools-dev ki18n-dev"
+subpackages="$pkgname-doc $pkgname-lang"
+source="https://download.kde.org/stable/plasma/$pkgver/kgamma5-$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="074dffc56a333bf88bb1942b3021c690822a234e26d41ff1b2d3e81f7f86f6ac272cb80f6f2552cbc5098880de520aebb8549f2a004608b824ea0c48f4e01cc6 kgamma5-5.12.7.tar.xz"
diff --git a/user/khotkeys/APKBUILD b/user/khotkeys/APKBUILD
new file mode 100644
index 000000000..a77c93a0c
--- /dev/null
+++ b/user/khotkeys/APKBUILD
@@ -0,0 +1,44 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=khotkeys
+pkgver=5.12.7
+pkgrel=0
+pkgdesc="Hot key mapping for KDE Plasma 5"
+url="https://www.KDE.org/"
+arch="all"
+license="LGPL-2.0+"
+depends=""
+makedepends="cmake extra-cmake-modules qt5-qtbase-dev kcmutils-dev
+ kdbusaddons-dev kdelibs4support-dev kglobalaccel-dev ki18n-dev kio-dev
+ kxmlgui-dev libice-dev libx11-dev plasma-framework-dev
+ plasma-workspace-dev"
+subpackages="$pkgname-doc $pkgname-lang"
+source="https://download.kde.org/stable/plasma/$pkgver/khotkeys-$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="5cdfb182fc6c5edabc7bd979c86c423243ab390e25981359c68cfb1a258503fdf26b723399f4e3a688212c3a92703aaeb359b7c71ada216657282952dd4092b4 khotkeys-5.12.7.tar.xz"
diff --git a/user/kio-extras/APKBUILD b/user/kio-extras/APKBUILD
index 97d894c42..4ab45daa7 100644
--- a/user/kio-extras/APKBUILD
+++ b/user/kio-extras/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kio-extras
-pkgver=18.08.3
+pkgver=18.12.1
pkgrel=0
pkgdesc="KIO plugins for various data tasks"
url="https://www.kde.org/"
@@ -12,8 +12,8 @@ depends=""
depends_dev="qt5-qtbase-dev qt5-qtsvg-dev karchive-dev kconfig-dev kio-dev
kconfigwidgets-dev kcoreaddons-dev kdbusaddons-dev kdoctools-dev
kiconthemes-dev ki18n-dev solid-dev kbookmarks-dev kguiaddons-dev
- kdnssd-dev kpty-dev kactivities-dev phonon-dev libssh2-dev
- libtirpc-dev taglib-dev"
+ kdnssd-dev kpty-dev kactivities-dev phonon-dev libtirpc-dev
+ taglib-dev libmtp-dev gperf khtml-dev"
makedepends="$depends_dev cmake extra-cmake-modules shared-mime-info"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
source="https://download.kde.org/stable/applications/$pkgver/src/kio-extras-$pkgver.tar.xz"
@@ -44,4 +44,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="f79ab19abedd47baeffea4b1e99acc21611c9d435f0de14751594c97c373eaa493da07fd5d754b1f62f696e4f445b493861566845794d6d32e63e0354189d726 kio-extras-18.08.3.tar.xz"
+sha512sums="6546dde9b0c34f298bf400071cff47dcdd43b006a31203d03fdb9144b71489543b30a1aa178195d9c144237eb5837ff5848b1534f63fed12a22883c9d0aa7b05 kio-extras-18.12.1.tar.xz"
diff --git a/user/kmenuedit/APKBUILD b/user/kmenuedit/APKBUILD
new file mode 100644
index 000000000..0ec9952e0
--- /dev/null
+++ b/user/kmenuedit/APKBUILD
@@ -0,0 +1,42 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=kmenuedit
+pkgver=5.12.7
+pkgrel=0
+pkgdesc="Menu editor for Plasma 5"
+url="https://www.KDE.org/"
+arch="all"
+license="GPL-2.0+ AND GPL-2.0-only"
+depends=""
+makedepends="cmake extra-cmake-modules qt5-qtbase-dev kdbusaddons-dev ki18n-dev
+ kiconthemes-dev kio-dev kxmlgui-dev sonnet-dev kdelibs4support-dev"
+subpackages="$pkgname-doc $pkgname-lang"
+source="https://download.kde.org/stable/plasma/$pkgver/kmenuedit-$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="7bc5df0512b58bcc9e403449a3cafd7889a815d17d7387986750477e1420e71fce4d98980a789a16240ef6d2a7f316df9e0a1525c96b89df193aa601a2571062 kmenuedit-5.12.7.tar.xz"
diff --git a/user/ksshaskpass/APKBUILD b/user/ksshaskpass/APKBUILD
new file mode 100644
index 000000000..513a419e1
--- /dev/null
+++ b/user/ksshaskpass/APKBUILD
@@ -0,0 +1,42 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=ksshaskpass
+pkgver=5.12.7
+pkgrel=0
+pkgdesc="Plasma integration for SSH agents"
+url="https://www.KDE.org/"
+arch="all"
+license="GPL-2.0+"
+depends=""
+makedepends="cmake extra-cmake-modules qt5-qtbase-dev kcoreaddons-dev
+ kdoctools-dev ki18n-dev kwallet-dev kwidgetsaddons-dev"
+subpackages="$pkgname-doc $pkgname-lang"
+source="https://download.kde.org/stable/plasma/$pkgver/ksshaskpass-$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="0c613b5263721a510844b24f4311d906f229acdbb72967902973f995b88973f68f13fd098bf702d1281023f17eafb87de388589062da1b58923479e6fe831a7a ksshaskpass-5.12.7.tar.xz"
diff --git a/user/libcanberra/APKBUILD b/user/libcanberra/APKBUILD
index 9d2431be0..bd41ad019 100644
--- a/user/libcanberra/APKBUILD
+++ b/user/libcanberra/APKBUILD
@@ -2,16 +2,15 @@
# Maintainer: William Pitcock <nenolod@dereferenced.org>
pkgname=libcanberra
pkgver=0.30
-pkgrel=3
+pkgrel=4
pkgdesc="Event sound library for free desktops"
url="http://0pointer.de/lennart/projects/libcanberra/"
arch="all"
options="!check" # No test suite.
license="LGPL-2.1+"
-depends=""
-depends_dev="alsa-lib-dev gstreamer-dev gtk+2.0-dev gtk+3.0-dev libogg-dev
- libtool libvorbis-dev pulseaudio-dev"
-makedepends="$depends_dev lynx"
+depends="sound-theme-freedesktop"
+makedepends="alsa-lib-dev gstreamer-dev gtk+2.0-dev gtk+3.0-dev libogg-dev
+ libtool libvorbis-dev lynx pulseaudio-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-gtk2 $pkgname-gtk3
$pkgname-gstreamer $pkgname-pulse"
source="http://0pointer.de/lennart/projects/$pkgname/$pkgname-$pkgver.tar.xz"
@@ -42,6 +41,7 @@ package() {
gtk2() {
pkgdesc="Gtk+ 2.x Bindings for libcanberra"
+ install_if="$pkgname=$pkgver-r$pkgrel gtk+2.0"
mkdir -p "$subpkgdir"/usr/lib
mv "$pkgdir"/usr/lib/libcanberra-gtk.so.* \
"$subpkgdir"/usr/lib/
@@ -51,6 +51,7 @@ gtk2() {
gtk3() {
pkgdesc="Gtk+ 3.x Bindings for libcanberra"
+ install_if="$pkgname=$pkgver-r$pkgrel gtk+3.0"
mkdir -p "$subpkgdir"/usr/lib/gnome-settings-daemon-3.0/gtk-modules \
"$subpkgdir"/usr/bin \
"$subpkgdir"/usr/share/gnome/autostart \
diff --git a/user/libcdio/APKBUILD b/user/libcdio/APKBUILD
index c1e7bc351..031f11fae 100644
--- a/user/libcdio/APKBUILD
+++ b/user/libcdio/APKBUILD
@@ -1,14 +1,14 @@
-# Contributor: Carlo Landmeter
# Maintainer:
pkgname=libcdio
pkgver=2.0.0
-pkgrel=0
+pkgrel=1
pkgdesc="GNU Compact Disc Input and Control Library"
url="https://www.gnu.org/software/libcdio/"
arch="all"
license="GPL-3.0+"
depends=""
-makedepends="libcddb-dev ncurses-dev linux-headers"
+depends_dev="ncurses-dev"
+makedepends="$depends_dev libcddb-dev linux-headers"
subpackages="$pkgname-dev $pkgname-doc $pkgname-tools ${pkgname}++:_cpp"
source="https://ftp.gnu.org/gnu/libcdio/${pkgname}-${pkgver}.tar.bz2
disable-broken-test.patch"
diff --git a/user/libgxps/APKBUILD b/user/libgxps/APKBUILD
new file mode 100644
index 000000000..5deb16d48
--- /dev/null
+++ b/user/libgxps/APKBUILD
@@ -0,0 +1,39 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=libgxps
+pkgver=0.3.1
+pkgrel=0
+pkgdesc="GObject-based library for manipulating and rendering XPS documents"
+url="https://wiki.gnome.org/Projects/libgxps"
+arch="all"
+license="LGPL-2.1+"
+depends=""
+depends_dev="glib-dev"
+makedepends="$depends_dev meson cairo-dev freetype-dev gobject-introspection-dev
+ gtk+3.0-dev lcms2-dev libarchive-dev libjpeg-turbo-dev ninja tiff-dev"
+subpackages="$pkgname-dev"
+source="https://ftp.gnome.org/pub/gnome/sources/libgxps/0.3/libgxps-$pkgver.tar.xz"
+
+build() {
+ cd "$builddir"
+ meson \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --localstatedir=/var \
+ --buildtype=release \
+ . output
+ ninja -C output
+}
+
+check() {
+ cd "$builddir"
+ ninja -C output test
+}
+
+package() {
+ cd "$builddir"
+ DESTDIR="$pkgdir" ninja -C output install
+}
+
+sha512sums="80401bd3c9753c74e425c5c08510cac314ad255ebeda9676bd5396a217770c7f5d8733c64b649cc6fdaa43423bb1a4ad21e1e0e3f7903f486e75a1d678850239 libgxps-0.3.1.tar.xz"
diff --git a/user/libkexiv2/APKBUILD b/user/libkexiv2/APKBUILD
new file mode 100644
index 000000000..d9017d837
--- /dev/null
+++ b/user/libkexiv2/APKBUILD
@@ -0,0 +1,42 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=libkexiv2
+pkgver=18.12.1
+pkgrel=0
+pkgdesc="KDE integration with Exiv2 EXIF data library"
+url="https://www.KDE.org/"
+arch="all"
+license="GPL-2.0+"
+depends=""
+depends_dev="qt5-qtbase-dev"
+makedepends="$depends_dev cmake extra-cmake-modules exiv2-dev"
+subpackages="$pkgname-dev"
+source="https://download.kde.org/stable/applications/$pkgver/src/libkexiv2-$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="f89d105c4e081311851d649065640ed9b53761d8eaf273afc734a34dae52df9e834806a6d71299312f95e5c8267414efee1b30671b4469a1b6b604b0de90e6a0 libkexiv2-18.12.1.tar.xz"
diff --git a/user/libmodplug/APKBUILD b/user/libmodplug/APKBUILD
new file mode 100644
index 000000000..23046bebe
--- /dev/null
+++ b/user/libmodplug/APKBUILD
@@ -0,0 +1,37 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=libmodplug
+pkgver=0.8.8.5
+pkgrel=0
+pkgdesc="Library for MOD music files"
+url="http://modplug-xmms.sourceforge.net/"
+arch="all"
+license="GPL-2.0+"
+depends=""
+makedepends=""
+subpackages="$pkgname-dev"
+source="https://downloads.sourceforge.net/modplug-xmms/libmodplug-$pkgver.tar.gz"
+
+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="aa943b8df5e3fd41b497e55f5d2c493c28a4c90d444d041f74a58ab5f4702eab9bb36f337e4c795561e0006846a5fda0b42bcf96b33e1267b190f6005862b332 libmodplug-0.8.8.5.tar.gz"
diff --git a/user/libmtp/APKBUILD b/user/libmtp/APKBUILD
new file mode 100644
index 000000000..3f8e07b45
--- /dev/null
+++ b/user/libmtp/APKBUILD
@@ -0,0 +1,37 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=libmtp
+pkgver=1.1.16
+pkgrel=0
+pkgdesc="Library for accessing MTP (Media Transfer Protocol) devices"
+url="http://libmtp.sourceforge.net/"
+arch="all"
+license="LGPL-2.1+"
+depends=""
+makedepends="libgcrypt-dev libusb-dev"
+subpackages="$pkgname-dev"
+source="https://downloads.sourceforge.net/libmtp/libmtp-$pkgver.tar.gz"
+
+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="0540271930c1c932c5d06dcdd30142d407a4fadd022b195e8339d614fa3ec9b050605bf013b28ac6451f4dfcddf7add949c928acb1382802ab5fd6311c1628a0 libmtp-1.1.16.tar.gz"
diff --git a/user/libpwquality/APKBUILD b/user/libpwquality/APKBUILD
new file mode 100644
index 000000000..8b0c98a81
--- /dev/null
+++ b/user/libpwquality/APKBUILD
@@ -0,0 +1,46 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=libpwquality
+pkgver=1.4.0
+pkgrel=0
+pkgdesc="Password quality checking library"
+url=" "
+arch="all"
+license="BSD-3-Clause OR GPL-2.0+"
+depends=""
+makedepends="cracklib-dev linux-pam-dev python3-dev"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-lang py3-pwquality:py3"
+source="https://github.com/libpwquality/libpwquality/releases/download/libpwquality-$pkgver/libpwquality-$pkgver.tar.bz2"
+
+build() {
+ cd "$builddir"
+ ./configure \
+ --build=$CBUILD \
+ --host=$CHOST \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --localstatedir=/var \
+ --enable-pam \
+ --with-python-binary=python3
+ make
+}
+
+check() {
+ cd "$builddir"
+ make check
+}
+
+package() {
+ cd "$builddir"
+ make DESTDIR="$pkgdir" install
+}
+
+py3() {
+ pkgdesc="$pkgdesc (Python 3 bindings)"
+ depends="python3"
+ mkdir -p "$subpkgdir"/usr/lib
+ mv "$pkgdir"/usr/lib/python3* "$subpkgdir"/usr/lib/
+}
+
+sha512sums="b8049f8b71bbfd4d345dbd4c4cffd29e9029b0fca4c95527af54d11a3b06e4708236b630df6c66738368298679c96cb3bf26b1b5d95cb3c5f7e1073cab8a98d9 libpwquality-1.4.0.tar.bz2"
diff --git a/user/libsecret/APKBUILD b/user/libsecret/APKBUILD
new file mode 100644
index 000000000..4fc79e95b
--- /dev/null
+++ b/user/libsecret/APKBUILD
@@ -0,0 +1,39 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=libsecret
+pkgver=0.18.7
+pkgrel=0
+pkgdesc="Library for storing and retrieving passphrases"
+url="https://wiki.gnome.org/Projects/Libsecret"
+arch="all"
+options="!check" # Test suites require DBus-Python.
+license="LGPL-2.1+ AND LGPL-2.0+"
+depends=""
+makedepends="docbook-xsl glib-dev gobject-introspection-dev libgcrypt-dev
+ libxslt"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
+source="https://ftp.acc.umu.se/pub/gnome/sources/libsecret/0.18/libsecret-$pkgver.tar.xz"
+
+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="a8890ec52dcfba585fd665ee89e81f4a1d6a04b67bcf4f3422f27973a4ef6fc1281bf54e92160d39dd696ae08a633bab5fe25c1124baf32eb5b414e98ddfa084 libsecret-0.18.7.tar.xz"
diff --git a/user/libsigc++/APKBUILD b/user/libsigc++/APKBUILD
new file mode 100644
index 000000000..624c2d4bc
--- /dev/null
+++ b/user/libsigc++/APKBUILD
@@ -0,0 +1,37 @@
+# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+pkgname=libsigc++
+pkgver=2.10.1
+pkgrel=0
+pkgdesc="Library for type-safe callbacks in C++"
+url="https://libsigcplusplus.github.io/libsigcplusplus/"
+arch="all"
+license="LGPL-2.1+"
+depends=""
+makedepends=""
+subpackages="$pkgname-dev $pkgname-doc"
+source="https://download.gnome.org/sources/libsigc++/${pkgver%.*}/libsigc++-$pkgver.tar.xz"
+
+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="e2bd7b1a97019be010dee1594271bbf7cae92b28e31dcb3c6d7d60643a0996233f0a75a9337b4afcb5b7dc453bfc3159d82f6daacfbcd8993a39ccecaf811bb2 libsigc++-2.10.1.tar.xz"
diff --git a/user/libspectre/APKBUILD b/user/libspectre/APKBUILD
new file mode 100644
index 000000000..2e43f6abc
--- /dev/null
+++ b/user/libspectre/APKBUILD
@@ -0,0 +1,37 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=libspectre
+pkgver=0.2.8
+pkgrel=0
+pkgdesc="Library for rendering PostScript documents"
+url="https://www.freedesktop.org/wiki/Software/libspectre/"
+arch="all"
+license="GPL-2.0+"
+depends=""
+makedepends="cairo-dev gnu-ghostscript-dev"
+subpackages="$pkgname-dev"
+source="https://libspectre.freedesktop.org/releases/libspectre-$pkgver.tar.gz"
+
+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="ebbe7f6adcbc7f7d6af61f24e23b114116c878755dbe90f1163546c1284a005b4d539be01986c1f940611e84141ca19768b8effc2abf1013606da7c93547da86 libspectre-0.2.8.tar.gz"
diff --git a/user/libtommath/APKBUILD b/user/libtommath/APKBUILD
new file mode 100644
index 000000000..41e3a1ea1
--- /dev/null
+++ b/user/libtommath/APKBUILD
@@ -0,0 +1,31 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=libtommath
+pkgver=1.1.0_rc1
+pkgrel=0
+pkgdesc="Theoretic multiple-precision integer library"
+url="https://www.libtom.net/LibTomMath/"
+arch="all"
+license="Unlicense"
+depends=""
+makedepends=""
+subpackages="$pkgname-dev"
+source="https://github.com/libtom/libtommath/releases/download/v${pkgver/_/-}/ltm-${pkgver/_/-}.tar.xz"
+builddir="$srcdir/$pkgname-${pkgver/_/-}"
+
+build() {
+ cd "$builddir"
+ make PREFIX=/usr -f makefile.shared
+}
+
+check() {
+ cd "$builddir"
+ make PREFIX=/usr -f makefile.shared test_standalone
+}
+
+package() {
+ cd "$builddir"
+ make PREFIX=/usr DESTDIR="$pkgdir" -f makefile.shared install
+}
+
+sha512sums="4cee5d59cd2eaf14591ee280dcdcdd5915f38584b7259b5752e7316cd1a9966f1c969ee3b64d136ae7044c5834cfc8c781db300ede503ec2e657083de3692fd2 ltm-1.1.0-rc1.tar.xz"
diff --git a/user/libuninameslist/APKBUILD b/user/libuninameslist/APKBUILD
new file mode 100644
index 000000000..1deffebdc
--- /dev/null
+++ b/user/libuninameslist/APKBUILD
@@ -0,0 +1,44 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=libuninameslist
+pkgver=20180701
+pkgrel=0
+pkgdesc="Library of Unicode names and annotation data"
+url=" "
+arch="all"
+license="BSD-3-Clause"
+depends=""
+makedepends="python3-dev"
+subpackages="$pkgname-dev $pkgname-doc py3-uninameslist:py3:noarch"
+source="https://github.com/fontforge/libuninameslist/releases/download/$pkgver/libuninameslist-dist-$pkgver.tar.gz"
+
+build() {
+ cd "$builddir"
+ PYTHON=python3 ./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
+}
+
+py3() {
+ pkgdesc="$pkgdesc (Python 3 bindings)"
+ depends="python3"
+ cd "$builddir"/py
+ python3 setup.py install --prefix=/usr --root="$subpkgdir"
+}
+
+sha512sums="839f8a0c3a81b4b19ce6ddfa08fa9ca99fdcefe2ef2b2c5515b276fab594fb5325ae9c83b58e19c559c033e880bd098687022c8ec3da028b143f4a72c471f19c libuninameslist-dist-20180701.tar.gz"
diff --git a/user/mac-fdisk/APKBUILD b/user/mac-fdisk/APKBUILD
index 471279968..1120b249b 100644
--- a/user/mac-fdisk/APKBUILD
+++ b/user/mac-fdisk/APKBUILD
@@ -6,7 +6,7 @@ _pkgver=0.1
pkgrel=2
pkgdesc="68K and PowerPC fixed disk partitioning utility"
url="https://adelielinux.org/"
-arch="all"
+arch="all !aarch64" # Literally does not support this arch.
license="GPL-2.0"
options="!check" # No test suite.
depends=""
diff --git a/user/mesa/APKBUILD b/user/mesa/APKBUILD
index 418e9e361..c36074f8a 100644
--- a/user/mesa/APKBUILD
+++ b/user/mesa/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=mesa
-pkgver=18.1.8
+pkgver=18.3.2
pkgrel=0
pkgdesc="Mesa DRI OpenGL library"
url="https://www.mesa3d.org"
@@ -15,26 +15,21 @@ subpackages="$pkgname-dev
$pkgname-dri-virtio:_dri
$pkgname-glapi $pkgname-egl $pkgname-gl $pkgname-gles
$pkgname-xatracker $pkgname-osmesa $pkgname-gbm
- $pkgname-libwayland-egl:_wayland
"
_llvmver=6
-depends_dev="libdrm-dev dri2proto libxext-dev libxdamage-dev libxcb-dev glproto
- dri3proto presentproto libxshmfence-dev"
-makedepends="$depends_dev expat-dev xextproto libxt-dev makedepend py3-mako
- flex bison llvm$_llvmver-dev eudev-dev libvdpau-dev python3 py-libxml2
- libxvmc-dev libxfixes-dev wayland-dev libelf-dev wayland-protocols
- autoconf automake libtool libxxf86vm-dev libx11-dev zlib-dev"
+depends_dev="libdrm-dev libxcb-dev libxdamage-dev libxext-dev libxshmfence-dev
+ xorgproto-dev"
+makedepends="$depends_dev byacc eudev-dev expat-dev flex libelf-dev
+ libvdpau-dev libx11-dev libxfixes-dev libxrandr-dev libxt-dev
+ libxvmc-dev libxxf86vm-dev llvm$_llvmver-dev makedepend python3
+ py3-libxml2 py3-mako zlib-dev"
source="https://mesa.freedesktop.org/archive/mesa-$pkgver.tar.xz
- glx_ro_text_segm.patch
musl-fixes.patch
musl-fix-includes.patch
amdgpu-pthread-header.patch
disk_cache-stack-overflow.patch
drmdeps.patch
- python3-compat.patch
- intel.patch
"
-replaces="mesa-dricore"
_dri_driverdir=/usr/lib/xorg/modules/dri
_dri_drivers="r200,radeon,nouveau,swrast"
@@ -73,22 +68,20 @@ build() {
cd "$builddir"
export CFLAGS="$CFLAGS -D_XOPEN_SOURCE=700"
- PYTHON2=python3 ./configure \
+ PYTHON=python3 ./configure \
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
--sysconfdir=/etc \
--with-dri-driverdir=$_dri_driverdir \
--disable-asm \
- --disable-xvmc \
- --enable-glx-rts \
--with-gallium-drivers=${_gallium_drivers} \
--with-dri-drivers=${_dri_drivers} \
--with-vulkan-drivers=${_vulkan_drivers} \
--with-llvm-prefix=/usr/lib/llvm$_llvmver \
--enable-llvm-shared-libs \
--enable-llvm \
- --with-platforms=x11,drm,wayland \
+ --with-platforms=x11,drm \
--enable-shared-glapi \
--enable-gbm \
--disable-glx-tls \
@@ -100,7 +93,6 @@ build() {
--enable-gles1 \
--enable-gles2 \
--enable-egl \
- --enable-texture-float \
--enable-xa \
--enable-vdpau \
$_arch_opts
@@ -238,19 +230,9 @@ _dri() {
esac
}
-_wayland() {
- pkgdesc="Mesa libwayland-egl library"
- mkdir -p "$subpkgdir"/usr/lib
- mv "$pkgdir"/usr/lib/libwayland-egl.so.* "$subpkgdir"/usr/lib/ \
- || return 1
-}
-
-sha512sums="ab89c6d27b765d3efdf61b24dc56d863ae590d83003d2eae4bfe25ecfbeda5bee0227f21d057523bb4eceeaf3d9955df48087ffb472c41b123c100e593056cb9 mesa-18.1.8.tar.xz
-c3d4804ebc24c7216e4c9d4995fb92e116be7f478024b44808ee134a4c93bb51d1f66fe5fb6eca254f124c4abf6f81272b027824b3e2650a9607818bf793035a glx_ro_text_segm.patch
+sha512sums="34b66520728d720b1f3d3d63f8ba5c255d57b9e8fe427264419e4163b474df662ff6db9ca8b81283866da415e34346a4c39fc37bebe2a0929be14480faf4db45 mesa-18.3.2.tar.xz
9f7a050f09571a2b17098d495b82e2e85b293fb7285e7d6d7c3c48cd4220a1bdcc61a7321ba78dd14860939ecabe7e89b32d6110f3728f793273e1e26b78a553 musl-fixes.patch
c7d91a660a033df91fac9c557039efc8669f0c26b2d35997d50753938b70d1af0bd110dcab3f8236eafab7d4be5dd7cd128a3e057e67e7e6a38a73fd6a7ef62e musl-fix-includes.patch
245d0d64d858dfadeeb544f31f7d0bb6ecb746a7fd5ec99755d679ae1a1eef4198d66473fb24d333eb6786bb8657012771e8285d67f165dc61a031df801947aa amdgpu-pthread-header.patch
f40ff04ac73c090c74d1955de6013c5aa41fb77f28b2b82d89cfc1880306a9ca1dde4581592db19f0a0ec6d85032f1ed5d953103ab0d075f9f0b7e459a028c45 disk_cache-stack-overflow.patch
-6800bc62aebfba22a2562c858c27391b47c5675020bd67f040da93ffe4d5d8ac828907a44c7cee6a4ebe63821b58c2515b4012f1f23473670b1de8670426a430 drmdeps.patch
-61ddf4f33f11b4fbaa334bec04d184236f01bc8cad4340cb74b66c92fc8c0c985d36507cf43b504d186dc108fc2e5ae348ed28ea8a680ba4dfdb74994fc440f7 python3-compat.patch
-baa0039c65b760ac60d55a112cc3fe9c59759e6f6e31c9c0dc46cfc1dcca91726706d6fb3328e11c043ba1f84f01dd56d0208ee153b05174fde74252d3d7d95c intel.patch"
+6800bc62aebfba22a2562c858c27391b47c5675020bd67f040da93ffe4d5d8ac828907a44c7cee6a4ebe63821b58c2515b4012f1f23473670b1de8670426a430 drmdeps.patch"
diff --git a/user/mesa/glx_ro_text_segm.patch b/user/mesa/glx_ro_text_segm.patch
deleted file mode 100644
index 8cad4876b..000000000
--- a/user/mesa/glx_ro_text_segm.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-2011-02-09 Jeremy Huddleston <jeremyhu@freedesktop.org
-
- #240956
- * configure.ac add support to enable readonly test segment on x86
-
---- ./configure.ac.orig 2008-11-17 23:19:38.000000000 +0100
-+++ ./configure.ac 2008-11-17 23:20:17.000000000 +0100
-@@ -499,6 +499,20 @@
- enable_xcb=no
- fi
-
-+
-+dnl readonly text segment on x86 hardened platforms
-+AC_ARG_ENABLE([glx_rts],
-+ [AS_HELP_STRING([--enable-glx-rts],
-+ [on x86, use a readonly text segment for libGL @<:@default=disabled@:>@])],
-+ [enable_glx_rts="$enableval"],
-+ [enable_glx_rts=no])
-+if test "x$enable_glx_rts" = xyes; then
-+ DEFINES="$DEFINES -DGLX_X86_READONLY_TEXT"
-+else
-+ enable_glx_rts=no
-+fi
-+
-+
- dnl
- dnl libGL configuration per driver
- dnl
diff --git a/user/mesa/intel.patch b/user/mesa/intel.patch
deleted file mode 100644
index 10871fc7c..000000000
--- a/user/mesa/intel.patch
+++ /dev/null
@@ -1,85 +0,0 @@
---- mesa-18.1.3/src/mesa/drivers/dri/i965/brw_bufmgr.h 2018-06-29 13:47:29.000000000 -0400
-+++ mesa-18.1.3/src/mesa/drivers/dri/i965/brw_bufmgr.h 2018-07-24 03:18:37.479847335 -0400
-@@ -37,6 +37,7 @@
- #include <stdbool.h>
- #include <stdint.h>
- #include <stdio.h>
-+#include <time.h>
- #include "util/u_atomic.h"
- #include "util/list.h"
-
---- mesa-18.1.3/src/intel/vulkan/anv_entrypoints_gen.py 2018-07-24 03:15:05.009848837 -0400
-+++ mesa-18.1.3/src/intel/vulkan/anv_entrypoints_gen.py 2018-07-24 03:12:21.739849990 -0400
-@@ -91,7 +91,7 @@
- % endfor
- """, output_encoding='utf-8')
-
--TEMPLATE_C = Template(u"""\
-+TEMPLATE_C = Template("""\
- /*
- * Copyright © 2015 Intel Corporation
- *
-@@ -145,7 +145,7 @@
- /* Hash table stats:
- * size ${len(strmap.sorted_strings)} entries
- * collisions entries:
--% for i in xrange(10):
-+% for i in range(10):
- * ${i}${'+' if i == 9 else ' '} ${strmap.collisions[i]}
- % endfor
- */
-@@ -388,7 +388,7 @@
-
- def bake(self):
- self.sorted_strings = \
-- sorted(self.strings.values(), key=lambda x: x.string)
-+ sorted(list(self.strings.values()), key=lambda x: x.string)
- offset = 0
- for entry in self.sorted_strings:
- entry.offset = offset
-@@ -507,7 +507,7 @@
- assert e.core_version is None
- e.extensions.append(ext)
-
-- return [e for e in entrypoints.itervalues() if e.enabled]
-+ return [e for e in list(entrypoints.values()) if e.enabled]
-
-
- def get_entrypoints_defines(doc):
---- mesa-18.1.3/src/intel/vulkan/anv_extensions.py 2018-06-29 13:47:29.000000000 -0400
-+++ mesa-18.1.3/src/intel/vulkan/anv_extensions.py 2018-07-24 03:07:13.599852168 -0400
-@@ -146,14 +146,32 @@
- patch = self.patch if self.patch is not None else 0
- return (self.major << 22) | (self.minor << 12) | patch
-
-- def __cmp__(self, other):
-+ def __lt__(self, other):
- # If only one of them has a patch version, "ignore" it by making
- # other's patch version match self.
- if (self.patch is None) != (other.patch is None):
- other = copy.copy(other)
- other.patch = self.patch
-
-- return self.__int_ver().__cmp__(other.__int_ver())
-+ return self.__int_ver() < other.__int_ver()
-+
-+ def __gt__(self, other):
-+ # If only one of them has a patch version, "ignore" it by making
-+ # other's patch version match self.
-+ if (self.patch is None) != (other.patch is None):
-+ other = copy.copy(other)
-+ other.patch = self.patch
-+
-+ return self.__int_ver() > other.__int_ver()
-+
-+ def __eq__(self, other):
-+ # If only one of them has a patch version, "ignore" it by making
-+ # other's patch version match self.
-+ if (self.patch is None) != (other.patch is None):
-+ other = copy.copy(other)
-+ other.patch = self.patch
-+
-+ return self.__int_ver() == other.__int_ver()
-
-
- MAX_API_VERSION = VkVersion('0.0.0')
diff --git a/user/mesa/python3-compat.patch b/user/mesa/python3-compat.patch
deleted file mode 100644
index 9dc213e9f..000000000
--- a/user/mesa/python3-compat.patch
+++ /dev/null
@@ -1,119 +0,0 @@
---- mesa-17.3.1/src/gallium/drivers/r600/egd_tables.py (original)
-+++ mesa-17.3.1/src/gallium/drivers/r600/egd_tables.py (refactored)
-@@ -60,7 +60,7 @@
- """
- fragments = [
- '"%s\\0" /* %s */' % (
-- te[0].encode('string_escape'),
-+ te[0].encode('unicode-escape'),
- ', '.join(str(idx) for idx in te[2])
- )
- for te in self.table
-@@ -217,10 +217,10 @@
- strings = StringTable()
- strings_offsets = IntTable("int")
-
-- print '/* This file is autogenerated by egd_tables.py from evergreend.h. Do not edit directly. */'
-- print
-- print CopyRight.strip()
-- print '''
-+ print('/* This file is autogenerated by egd_tables.py from evergreend.h. Do not edit directly. */')
-+ print()
-+ print(CopyRight.strip())
-+ print('''
- #ifndef EG_TABLES_H
- #define EG_TABLES_H
-
-@@ -242,20 +242,20 @@
- unsigned name_offset;
- unsigned op;
- };
--'''
--
-- print 'static const struct eg_packet3 packet3_table[] = {'
-+''')
-+
-+ print('static const struct eg_packet3 packet3_table[] = {')
- for pkt in packets:
-- print '\t{%s, %s},' % (strings.add(pkt[5:]), pkt)
-- print '};'
-- print
--
-- print 'static const struct eg_field egd_fields_table[] = {'
-+ print('\t{%s, %s},' % (strings.add(pkt[5:]), pkt))
-+ print('};')
-+ print()
-+
-+ print('static const struct eg_field egd_fields_table[] = {')
-
- fields_idx = 0
- for reg in regs:
- if len(reg.fields) and reg.own_fields:
-- print '\t/* %s */' % (fields_idx)
-+ print('\t/* %s */' % (fields_idx))
-
- reg.fields_idx = fields_idx
-
-@@ -266,34 +266,34 @@
- while value[1] >= len(values_offsets):
- values_offsets.append(-1)
- values_offsets[value[1]] = strings.add(strip_prefix(value[0]))
-- print '\t{%s, %s(~0u), %s, %s},' % (
-+ print('\t{%s, %s(~0u), %s, %s},' % (
- strings.add(field.name), field.s_name,
-- len(values_offsets), strings_offsets.add(values_offsets))
-+ len(values_offsets), strings_offsets.add(values_offsets)))
- else:
-- print '\t{%s, %s(~0u)},' % (strings.add(field.name), field.s_name)
-+ print('\t{%s, %s(~0u)},' % (strings.add(field.name), field.s_name))
- fields_idx += 1
-
-- print '};'
-- print
--
-- print 'static const struct eg_reg egd_reg_table[] = {'
-+ print('};')
-+ print()
-+
-+ print('static const struct eg_reg egd_reg_table[] = {')
- for reg in regs:
- if len(reg.fields):
-- print '\t{%s, %s, %s, %s},' % (strings.add(reg.name), reg.r_name,
-- len(reg.fields), reg.fields_idx if reg.own_fields else reg.fields_owner.fields_idx)
-+ print('\t{%s, %s, %s, %s},' % (strings.add(reg.name), reg.r_name,
-+ len(reg.fields), reg.fields_idx if reg.own_fields else reg.fields_owner.fields_idx))
- else:
-- print '\t{%s, %s},' % (strings.add(reg.name), reg.r_name)
-- print '};'
-- print
-+ print('\t{%s, %s},' % (strings.add(reg.name), reg.r_name))
-+ print('};')
-+ print()
-
- strings.emit(sys.stdout, "egd_strings")
-
-- print
-+ print()
-
- strings_offsets.emit(sys.stdout, "egd_strings_offsets")
-
-- print
-- print '#endif'
-+ print()
-+ print('#endif')
-
-
- def main():
---- mesa-18.1.3/m4/ax_check_python_mako_module.m4.old 2018-06-29 17:47:29.000000000 +0000
-+++ mesa-18.1.3/m4/ax_check_python_mako_module.m4 2018-07-09 01:55:22.740000000 +0000
-@@ -48,8 +48,8 @@
- except ImportError as err:
- sys.exit(err)
- else:
-- ver_req = map(int, '$1'.split('.'))
-- ver_act = map(int, mako.__version__.split('.'))
-+ ver_req = list(map(int, '$1'.split('.')))
-+ ver_act = list(map(int, mako.__version__.split('.')))
- sys.exit(int(ver_req > ver_act))
- " | $PYTHON2 -
-
diff --git a/user/musl-obstack/APKBUILD b/user/musl-obstack/APKBUILD
new file mode 100644
index 000000000..a7466fc96
--- /dev/null
+++ b/user/musl-obstack/APKBUILD
@@ -0,0 +1,38 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=musl-obstack
+pkgver=1.1
+pkgrel=0
+pkgdesc="Standalone library to implement obstack functionality"
+url=" "
+arch="all"
+license="GPL-2.0+"
+depends=""
+makedepends=""
+subpackages="$pkgname-dev"
+source="musl-obstack-$pkgver.tar.gz::https://github.com/pullmoll/musl-obstack/archive/v$pkgver.tar.gz"
+
+build() {
+ cd "$builddir"
+ ./bootstrap.sh
+ ./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="e3a9956133d72a00663cf8d9720e62002142e113e7d67e2338a2bce1bdfac9eefd4290db8add15eabafdf01065f7fe9bb6754faa36b88df819c53d44fa140757 musl-obstack-1.1.tar.gz"
diff --git a/user/okular/APKBUILD b/user/okular/APKBUILD
index 8d4150358..9c32937cf 100644
--- a/user/okular/APKBUILD
+++ b/user/okular/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=okular
-pkgver=18.08.3
-pkgrel=1
+pkgver=18.12.1
+pkgrel=0
pkgdesc="Universal document reader developed by KDE"
url="https://okular.kde.org/"
arch="all"
@@ -13,7 +13,8 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev
kconfigwidgets-dev kcoreaddons-dev kdoctools-dev kiconthemes-dev
kio-dev kjs-dev kparts-dev kwallet-dev kwindowsystem-dev khtml-dev
threadweaver-dev kactivities-dev poppler-qt5-dev tiff-dev qca-dev
- libjpeg-turbo-dev kpty-dev kirigami2-dev"
+ libjpeg-turbo-dev kpty-dev kirigami2-dev djvulibre-dev libkexiv2-dev
+ libspectre-dev ebook-tools-dev"
subpackages="$pkgname-doc $pkgname-lang"
source="https://download.kde.org/stable/applications/$pkgver/src/okular-$pkgver.tar.xz"
@@ -44,4 +45,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="a03775c10d56d8d2740a82d9e44e3fc59259408dde855cb8d5a1ad824502e78a442adfa2c795ea0ffdcc14bd3bef52e1a14da2967b854107027221bf8e32aec2 okular-18.08.3.tar.xz"
+sha512sums="7f2505ad65ceb5c2bb35f9c7273e886f3e19ff9232ba4b96f62b3c4c79578bd8d04644a037a9e42ce184d8e06c9b106c0cfe5c67706add3586fc68d6c026569d okular-18.12.1.tar.xz"
diff --git a/user/oxygen-fonts/APKBUILD b/user/oxygen-fonts/APKBUILD
new file mode 100644
index 000000000..2def092ef
--- /dev/null
+++ b/user/oxygen-fonts/APKBUILD
@@ -0,0 +1,41 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=oxygen-fonts
+pkgver=5.3.95
+pkgrel=0
+pkgdesc="Fonts for the KDE Oxygen style"
+url="https://www.KDE.org/"
+arch="noarch"
+license="OFL-1.1"
+depends=""
+makedepends="cmake extra-cmake-modules qt5-qtbase-dev fontforge-dev"
+subpackages=""
+source="https://download.kde.org/unstable/plasma/$pkgver/oxygen-fonts-$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="97e7cd7900f9628fdce1b41bb3a74373c4fa27a1f7f6269b47cd4ebda3aec0f40bb5540cbd7c50b94f91aae2d7963be1e942fb8b5d01c1ba445eaf1f143e149d oxygen-fonts-5.3.95.tar.xz"
diff --git a/user/pangomm/APKBUILD b/user/pangomm/APKBUILD
new file mode 100644
index 000000000..5b2ddd058
--- /dev/null
+++ b/user/pangomm/APKBUILD
@@ -0,0 +1,37 @@
+# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+pkgname=pangomm
+pkgver=2.42.0
+pkgrel=0
+pkgdesc="C++ interfaces for Pango"
+url="https://gnome.org"
+arch="all"
+license="LGPL-2.1+"
+depends=""
+makedepends="glibmm-dev cairomm-dev pango-dev"
+subpackages="$pkgname-dev $pkgname-doc"
+source="https://download.gnome.org/sources/pangomm/${pkgver%.*}/pangomm-$pkgver.tar.xz"
+
+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="2cebf76150414cde96b911eae947a6e1a073352927f01a44ddc276711151dffe0b9d8c54c3df16289d9002f982fa3e3386ddfe002be902f3086b44fff95fdb59 pangomm-2.42.0.tar.xz"
diff --git a/user/pavucontrol/APKBUILD b/user/pavucontrol/APKBUILD
new file mode 100644
index 000000000..113806f22
--- /dev/null
+++ b/user/pavucontrol/APKBUILD
@@ -0,0 +1,38 @@
+# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+pkgname=pavucontrol
+pkgver=3.0
+pkgrel=0
+pkgdesc="GTK-based utility for PulseAudio"
+url="https://freedesktop.org/software/pulseaudio/pavucontrol/"
+arch="all"
+license="GPL-2.0+"
+depends=""
+makedepends="gtkmm+3.0-dev intltool libcanberra-dev lynx pulseaudio-dev"
+subpackages="$pkgname-doc $pkgname-lang"
+langdir="/usr/lib/locale"
+source="http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-$pkgver.tar.xz"
+
+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="3562fc50e5f60c6b6280c2d524e13cf44114bf481e5ec98b8714c7c2f162d0332179ebcf4c5a78d86f511de857bdc3aa7415e1548e0c10d4582b5958c4cacae9 pavucontrol-3.0.tar.xz"
diff --git a/user/perl-term-readkey/APKBUILD b/user/perl-term-readkey/APKBUILD
new file mode 100644
index 000000000..6b789b097
--- /dev/null
+++ b/user/perl-term-readkey/APKBUILD
@@ -0,0 +1,34 @@
+# Contributor: Luis Ressel <aranea@aixah.de>
+# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
+pkgname=perl-term-readkey
+_pkgreal=TermReadKey
+pkgver=2.38
+pkgrel=0
+pkgdesc="Change terminal modes, and perform non-blocking reads"
+url="https://metacpan.org/release/TermReadKey"
+arch="all"
+license="Artistic-1.0-Perl OR GPL-1.0+"
+depends="perl"
+makedepends="perl-dev"
+subpackages="$pkgname-doc"
+source="https://search.cpan.org/CPAN/authors/id/J/JS/JSTOWE/$_pkgreal-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
+
+build() {
+ cd "$builddir"
+ PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+ make
+}
+
+check() {
+ cd "$builddir"
+ make test
+}
+
+package() {
+ cd "$builddir"
+ make DESTDIR="$pkgdir" install
+ find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
+}
+
+sha512sums="fb09f013f9f0d8a4397e39f6f3db7a6d023259219af8f76744094e396437a01b19141b3cdb39a158d3b518903fb010088bc37406763bfbeb3fcab810bb0bb157 TermReadKey-2.38.tar.gz"
diff --git a/user/php7/APKBUILD b/user/php7/APKBUILD
index 89ab74709..9da2b1de2 100644
--- a/user/php7/APKBUILD
+++ b/user/php7/APKBUILD
@@ -26,7 +26,7 @@
pkgname=php7
_pkgname=php
pkgver=7.2.11
-pkgrel=2
+pkgrel=3
_apiver=20170718
pkgdesc="The PHP7 language runtime engine"
url="https://php.net/"
@@ -34,7 +34,8 @@ arch="all"
options="!checkroot"
license="PHP-3.01 AND Zend-2.0 AND Custom:TSRM AND LGPL-2.1+ AND MIT AND Beerware AND Public-Domain AND BSD-3-Clause AND Apache-1.0 AND PostgreSQL AND BSD-2-Clause AND Zlib AND BSD-4-Clause"
depends=""
-depends_dev="$pkgname=$pkgver-r$pkgrel autoconf pcre-dev"
+depends_dev="$pkgname=$pkgver-r$pkgrel autoconf icu-dev libedit-dev libxml2-dev
+ pcre-dev zlib-dev"
makedepends="autoconf
apache-httpd-dev
aspell-dev
diff --git a/user/pidgin/APKBUILD b/user/pidgin/APKBUILD
index 55caf7b39..5921247b8 100644
--- a/user/pidgin/APKBUILD
+++ b/user/pidgin/APKBUILD
@@ -1,25 +1,22 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=pidgin
pkgver=2.13.0
-pkgrel=0
+pkgrel=1
pkgdesc="Multi-protocol instant messaging client"
url="http://pidgin.im/"
arch="all"
license="GPL-2.0-only"
-depends=
+depends="gst-plugins-base"
makedepends="gtk+-dev perl-dev libsm-dev startup-notification-dev gtkspell-dev
libxml2-dev libidn-dev gnutls-dev dbus-dev dbus-glib-dev gstreamer-dev
cyrus-sasl-dev ncurses-dev nss-dev tcl-dev tk-dev intltool
- "
-subpackages="$pkgname-dev $pkgname-doc $pkgname-lang
- libpurple-oscar:_oscar
- finch libpurple
- "
+ gst-plugins-base-dev farstream-dev"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-lang finch libpurple"
source="https://bitbucket.org/pidgin/main/downloads/$pkgname-$pkgver.tar.bz2"
build() {
cd "$builddir"
- LIBS="-ltinfo" ./configure \
+ LIBS="-lX11 -ltinfo" ./configure \
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
@@ -31,13 +28,14 @@ build() {
--disable-meanwhile \
--disable-nm \
--enable-perl \
+ --disable-python \
--disable-schemas-install \
--disable-screensaver \
--enable-tcl \
- --disable-vv \
+ --enable-vv \
--enable-gstreamer \
--enable-gstreamer-interfaces \
- --disable-farstream \
+ --enable-farstream \
--enable-cyrus-sasl \
--enable-nss
make
@@ -70,22 +68,4 @@ libpurple() {
"$subpkgdir"/usr/share/
}
-_mv_purple() {
- pkgdesc="$1"
- shift
- mkdir -p "$subpkgdir"/usr/lib/purple-2/
- for i; do
- mv "$pkgdir"/usr/lib/purple-2/${i}.* \
- "$subpkgdir"/usr/lib/purple-2/
- done
-}
-
-_bonjour() {
- _mv_purple "Bonjour (Zeroconf) plugin for libpurple" libbonjour
-}
-
-_oscar() {
- _mv_purple "AIM and ICQ plugins for libpurple" liboscar libaim libicq
-}
-
sha512sums="68b3d1eefee111544c7eb347386d0aea4f47c3e320d5963a4e0d833ed6af7b1be243a7bcd6a38c9234b58601d10a9aebf8541f1d97decfeca754fa78dc693047 pidgin-2.13.0.tar.bz2"
diff --git a/user/plasma-workspace-wallpapers/APKBUILD b/user/plasma-workspace-wallpapers/APKBUILD
new file mode 100644
index 000000000..d4d5fc2d3
--- /dev/null
+++ b/user/plasma-workspace-wallpapers/APKBUILD
@@ -0,0 +1,41 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=plasma-workspace-wallpapers
+pkgver=5.12.7
+pkgrel=0
+pkgdesc="Default wallpapers from KDE"
+url="https://www.KDE.org/"
+arch="noarch"
+license="LGPL-3.0-only"
+depends=""
+makedepends="cmake extra-cmake-modules"
+subpackages=""
+source="https://download.kde.org/stable/plasma/$pkgver/plasma-workspace-wallpapers-$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="7abda6e4cf223a72222ab2f2b3d8deb631b7ce1e6a415697c367acb53ae5f653fc8dbf6ddd631ff7a1888c2293d102bc0ba1753e50419138f7c9d7d2ea5f08a9 plasma-workspace-wallpapers-5.12.7.tar.xz"
diff --git a/user/postfix/APKBUILD b/user/postfix/APKBUILD
new file mode 100644
index 000000000..5269c55bd
--- /dev/null
+++ b/user/postfix/APKBUILD
@@ -0,0 +1,96 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: Dan Theisen <djt@hxx.in>
+pkgname=postfix
+pkgver=3.3.2
+pkgrel=1
+pkgdesc="Mail server (MTA) that is Sendmail outside and Qmail inside"
+url="http://www.postfix.org/"
+arch="all"
+options="!check suid" # No test suite.
+license="EPL-2.0 AND IPL-1.0"
+depends=""
+makedepends="cyrus-sasl-dev db-dev icu-dev linux-pam-dev lmdb-dev openldap-dev
+ openssl-dev pcre-dev perl postgresql-dev sqlite-dev"
+install="$pkgname.pre-install"
+subpackages="$pkgname-doc $pkgname-ldap $pkgname-lmdb $pkgname-openrc
+ $pkgname-pgsql $pkgname-sqlite"
+pkgusers="postfix"
+pkggroups="postfix postdrop"
+source="http://www.namesdir.com/mirrors/postfix-release/official/postfix-$pkgver.tar.gz
+ honour-config-directory.patch
+ postfix.initd
+ "
+
+build() {
+ cd "$builddir"
+ local CCARGS="-DHAS_LDAP -DHAS_LMDB -DHAS_PCRE -DHAS_PGSQL -I$(pg_config --includedir) -DHAS_SQLITE -DNO_NIS -DUSE_CYRUS_SASL -DUSE_SASL_AUTH -I/usr/include/sasl -DUSE_LDAP_SASL -DUSE_TLS -Wno-comment"
+ local AUXLIBS="-lpam $(pcre-config --libs) -lsasl2 -lssl -lcrypto"
+ make DEBUG="" shared=yes dynamicmaps=yes pie=yes \
+ config_directory="/etc/postfix" \
+ daemon_directory="/usr/libexec/postfix" \
+ meta_directory="/etc/postfix" \
+ shlib_directory="/usr/lib/postfix" \
+ CC="gcc" OPT="$CFLAGS" CCARGS="$CCARGS" AUXLIBS="$AUXLIBS" \
+ AUXLIBS_LDAP="-lldap -llber" AUXLIBS_LMDB="-llmdb" \
+ AUXLIBS_PCRE="$(pcre-config --libs)" \
+ AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq" \
+ AUXLIBS_SQLITE="$(pkgconf --libs sqlite3)" \
+ makefiles
+}
+
+package() {
+ cd "$builddir"
+ make install_root="$pkgdir" manpage_directory="/usr/share/man" \
+ command_directory="/usr/sbin" mailq_path="/usr/bin/mailq" \
+ newaliases_path="/usr/bin/newaliases" \
+ sendmail_path="/usr/sbin/sendmail" \
+ non-interactive-package
+
+ mkdir -p "$pkgdir"/etc/apk/protected_paths.d
+ cat > "$pkgdir"/etc/apk/protected_paths.d/postfix.list <<-EOF
+ !var/lib/postfix
+ !var/spool/postfix
+ EOF
+
+ chown -R root:postfix \
+ "$pkgdir"/var/lib/postfix
+ chown -R postfix:postfix \
+ "$pkgdir"/var/spool/postfix
+ chgrp postdrop "$pkgdir"/var/spool/postfix/{public,maildrop}
+ chmod 0750 "$pkgdir"/var/lib/postfix
+ chgrp postdrop "$pkgdir"/usr/sbin/postdrop "$pkgdir"/usr/sbin/postqueue
+ chmod 2755 "$pkgdir"/usr/sbin/postdrop "$pkgdir"/usr/sbin/postqueue
+
+ install -D -m755 "$srcdir"/postfix.initd "$pkgdir"/etc/init.d/postfix
+}
+
+_database() {
+ pkgdesc="Postfix mapping plugin for storing users in $2"
+
+ install -d "$subpkgdir"/etc/postfix/dynamicmaps.cf.d
+ grep $1 "$pkgdir"/etc/postfix/dynamicmaps.cf > \
+ "$subpkgdir"/etc/postfix/dynamicmaps.cf.d/$1
+ sed -i "/$1/d" "$pkgdir"/etc/postfix/dynamicmaps.cf
+ install -d "$subpkgdir"/usr/lib/postfix
+ mv "$pkgdir"/usr/lib/postfix/postfix-$1.so "$subpkgdir"/usr/lib/postfix/
+}
+
+ldap() {
+ _database "ldap" "LDAP"
+}
+
+lmdb() {
+ _database "lmdb" "LMDB"
+}
+
+pgsql() {
+ _database "pgsql" "PostgreSQL"
+}
+
+sqlite() {
+ _database "sqlite" "SQLite 3"
+}
+
+sha512sums="df67eb978751900d357597def16f744dae990f5cc4e48af8dca57f84b0140e05416712727c1760b8f557ed3564cd593620756561b0a6f31db4b54d928e15293f postfix-3.3.2.tar.gz
+63ea7fe461fca1306088e9984acfab6ab3e919dafa2b606d43fbca472969e6ec232800071f939f5a4482c01c6d7b53a86de9e7e893ab94f4cb135d16ff5763cc honour-config-directory.patch
+2ad1b053bbb51d4f480dbf5a01252e8e99a82ec14a75ff49336b2b190ea55bc02400542b109fa0cc4ebfe6b42eaabbc45f70f2ea581f1eb9c4189c439b825592 postfix.initd"
diff --git a/user/postfix/honour-config-directory.patch b/user/postfix/honour-config-directory.patch
new file mode 100644
index 000000000..a32c588ee
--- /dev/null
+++ b/user/postfix/honour-config-directory.patch
@@ -0,0 +1,11 @@
+--- postfix-3.3.2/postfix-install
++++ postfix-3.3.2/postfix-install
+@@ -832,7 +832,7 @@
+ # the wrong place when Postfix is being upgraded.
+
+ case "$mail_version" in
+-"") mail_version="`bin/postconf -dhx mail_version`" || exit 1
++"") mail_version="`bin/postconf -c $CONFIG_DIRECTORY -dhx mail_version`" || exit 1
+ esac
+
+ # Undo MAIL_VERSION expansion at the end of a parameter value. If
diff --git a/user/postfix/postfix.initd b/user/postfix/postfix.initd
new file mode 100644
index 000000000..9a1c1e21d
--- /dev/null
+++ b/user/postfix/postfix.initd
@@ -0,0 +1,85 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="reload abort flush"
+
+description_reload="Re-read configuration files. Running processes terminate at their earliest convenience."
+description_abort="Stop the Postfix mail system abruptly. Running processes are signaled to stop immediately."
+description_flush="Force delivery: attempt to deliver every message in the deferred mail queue."
+
+# Please read http://www.postfix.org/MULTI_INSTANCE_README.html for multi instance support
+CONF_DIR="/etc/postfix"
+CONF_OPT="${SVCNAME##*.}"
+if [ -n ${CONF_OPT} -a ${SVCNAME} != "postfix" ]; then
+ CONF_DIR="${CONF_DIR}.${CONF_OPT}"
+fi
+if [ "${CONF_DIR}" = "/etc/postfix" ]; then
+ CONF_PARAM=""
+ CONF_MESSAGE=""
+else
+ CONF_PARAM="-c ${CONF_DIR}"
+ CONF_MESSAGE="(${CONF_DIR})"
+fi
+
+depend() {
+ use logger dns ypbind amavisd antivirus postfix_greylist net saslauthd
+ if [ "${SVCNAME}" = "postfix" ]; then
+ provide mta
+ fi
+}
+
+start() {
+ if [ ! -z "${CONF_PARAM}" ]; then
+ einfo "Please consider updating your config for postmulti support."
+ fi
+ ebegin "Starting postfix ${CONF_MESSAGE}"
+ if [ ! -d ${CONF_DIR} ]; then
+ eend 1 "${CONF_DIR} does not exist"
+ return 1
+ fi
+ /usr/sbin/postfix ${CONF_PARAM} start >/dev/null 2>&1
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping postfix ${CONF_MESSAGE}"
+ /usr/sbin/postfix ${CONF_PARAM} stop >/dev/null 2>&1
+ eend
+}
+
+status() {
+ local _retval
+ einfon ""
+ /usr/sbin/postfix ${CONF_PARAM} status
+ _retval=$?
+ if [ x${_retval} = 'x0' ]; then
+ mark_service_started "${SVCNAME}"
+ eend 0
+ else
+ mark_service_stopped "${SVCNAME}"
+ eend 3
+ fi
+}
+
+reload() {
+ ebegin "Reloading postfix ${CONF_MESSAGE}"
+ /usr/sbin/postfix ${CONF_PARAM} reload >/dev/null 2>&1
+ eend $?
+}
+
+abort() {
+ ebegin "Aborting postfix ${CONF_MESSAGE}"
+
+ if service_started "${SVCNAME}"; then
+ mark_service_stopped "${SVCNAME}"
+ fi
+ /usr/sbin/postfix ${CONF_PARAM} abort >/dev/null 2>&1
+ eend $?
+}
+
+flush() {
+ ebegin "Flushing postfix ${CONF_MESSAGE}"
+ /usr/sbin/postfix ${CONF_PARAM} flush >/dev/null 2>&1
+ eend $?
+}
diff --git a/user/postfix/postfix.pre-install b/user/postfix/postfix.pre-install
new file mode 100644
index 000000000..73ebdba3f
--- /dev/null
+++ b/user/postfix/postfix.pre-install
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+groupadd -g 207 -r postfix
+groupadd -g 208 -r postdrop
+useradd -u 207 -c "Postfix Mail Server" -M -N -G postfix,mail -r -s /sbin/nologin postfix
diff --git a/user/pulseaudio/APKBUILD b/user/pulseaudio/APKBUILD
index 1a5bf62d3..9e3f7a565 100644
--- a/user/pulseaudio/APKBUILD
+++ b/user/pulseaudio/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=pulseaudio
pkgver=12.2
-pkgrel=1
+pkgrel=3
pkgdesc="A featureful, general-purpose sound server"
url="https://www.freedesktop.org/wiki/Software/PulseAudio"
pkgusers="pulse"
@@ -22,7 +22,9 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-bluez
$pkgname-zsh-completion:zshcomp:noarch"
source="https://freedesktop.org/software/pulseaudio/releases/pulseaudio-$pkgver.tar.xz
$pkgname.initd
- $pkgname.confd"
+ $pkgname.confd
+ disable-flat-volume.patch
+ "
build() {
cd "$builddir"
@@ -76,6 +78,7 @@ libs() {
"$subpkgdir"/usr/lib/
mv "$pkgdir"/usr/lib/libpulse.so.0* \
"$pkgdir"/usr/lib/libpulse-simple.so.0* \
+ "$pkgdir"/usr/lib/libpulse-mainloop-*.so.0* \
"$subpkgdir"/usr/lib/
mv "$pkgdir"/etc/pulse/client.conf \
"$subpkgdir"/etc/pulse/
@@ -130,4 +133,5 @@ zshcomp() {
sha512sums="877754c1838b3cb042dbc18a5f1cc3cf313ffcaee7a64703330406d1f86279c34f1107634ac3083b158365e6757fbacf5ec406bc3c5788d291de67b77a561a4e pulseaudio-12.2.tar.xz
34fe54ece5df60ce63a7955cd828a2716670fef71f40960698ae5518fdaf9cd599f4d8f8852e2c88d715600a9ad06a38984415e5eb320071012e5eb6e5c1b8b1 pulseaudio.initd
-75b54581591519d63a3362b155c0f9b0501a60763ab394693a456c44d0216138cf3a40bdd0f7442028663bc045e9ffee286f8f8eaf2ee3bb17379b43615fee0e pulseaudio.confd"
+75b54581591519d63a3362b155c0f9b0501a60763ab394693a456c44d0216138cf3a40bdd0f7442028663bc045e9ffee286f8f8eaf2ee3bb17379b43615fee0e pulseaudio.confd
+dcb50f7c4fd86b0311ab050f7f0340dcf54379a685903951f22e24df6aee5486ee5e02f866c9e53dd55a54ba302658ad282114ce37f169d185855dc37dae0349 disable-flat-volume.patch"
diff --git a/user/pulseaudio/disable-flat-volume.patch b/user/pulseaudio/disable-flat-volume.patch
new file mode 100644
index 000000000..8325c8d1f
--- /dev/null
+++ b/user/pulseaudio/disable-flat-volume.patch
@@ -0,0 +1,11 @@
+--- pulseaudio-12.2/src/daemon/daemon.conf.in.old 2018-07-13 19:06:14.000000000 +0000
++++ pulseaudio-12.2/src/daemon/daemon.conf.in 2019-01-22 00:30:56.700000000 +0000
+@@ -60,7 +60,7 @@
+ ; enable-lfe-remixing = no
+ ; lfe-crossover-freq = 0
+
+-; flat-volumes = yes
++flat-volumes = no
+
+ ifelse(@HAVE_SYS_RESOURCE_H@, 1, [dnl
+ ; rlimit-fsize = -1
diff --git a/user/recode/APKBUILD b/user/recode/APKBUILD
new file mode 100644
index 000000000..09b9a8121
--- /dev/null
+++ b/user/recode/APKBUILD
@@ -0,0 +1,39 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=recode
+pkgver=3.7.1
+pkgrel=0
+pkgdesc="Character set conversion utilities"
+url=" "
+arch="all"
+options="!check" # Requires unpackaged `cython`.
+license="GPL-3.0+"
+depends=""
+makedepends="help2man cmd:lex python3"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-libs"
+source="https://github.com/rrthomas/recode/releases/download/v$pkgver/recode-$pkgver.tar.gz"
+
+build() {
+ cd "$builddir"
+ ./configure \
+ --build=$CBUILD \
+ --host=$CHOST \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --localstatedir=/var \
+ ac_cv_path_PYTHON=/usr/bin/python3
+ make
+}
+
+check() {
+ cd "$builddir"
+ make check
+}
+
+package() {
+ cd "$builddir"
+ make DESTDIR="$pkgdir" install
+}
+
+sha512sums="3cb067fb7e1b0ec89c47e7177cb172bc8253042780101f6d8cb1de7bc0873d2af217e7b04a33ac23bdb8ffd41e43eac767307c4bd8a94355c188d5013f177b04 recode-3.7.1.tar.gz"
diff --git a/user/rpm2targz/APKBUILD b/user/rpm2targz/APKBUILD
new file mode 100644
index 000000000..ca2cd6a5a
--- /dev/null
+++ b/user/rpm2targz/APKBUILD
@@ -0,0 +1,30 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=rpm2targz
+pkgver=9.0.0.5g
+pkgrel=0
+pkgdesc="Convert Red Hat packages (RPM) to .tar.gz archives"
+url="http://www.slackware.com/config/packages.php"
+arch="all"
+license="BSD-1-Clause"
+depends="cmd:cpio xz"
+makedepends=""
+subpackages=""
+source="https://distfiles.adelielinux.org/source/rpm2targz-$pkgver.tar.xz"
+
+build() {
+ cd "$builddir"
+ make
+}
+
+check() {
+ cd "$builddir"
+ make check
+}
+
+package() {
+ cd "$builddir"
+ make DESTDIR="$pkgdir" install
+}
+
+sha512sums="a595d23581bd396a3a00b6eae4cf6edca1c65b52510a02c7b162afc3d89f45026663a271279bb519741b4a35a0ee653fbfb124c5a7d6d921b466dc9236cbf549 rpm2targz-9.0.0.5g.tar.xz"
diff --git a/user/scons/APKBUILD b/user/scons/APKBUILD
new file mode 100644
index 000000000..c3ebf5694
--- /dev/null
+++ b/user/scons/APKBUILD
@@ -0,0 +1,33 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=scons
+pkgver=3.0.4
+pkgrel=0
+pkgdesc="Python-based software building system"
+url="https://scons.org/"
+arch="noarch"
+license="MIT"
+depends="python3"
+makedepends="python3-dev"
+subpackages=""
+source="https://prdownloads.sourceforge.net/scons/scons-$pkgver.tar.gz
+ python3-bang.patch
+ "
+
+build() {
+ cd "$builddir"
+ python3 setup.py build
+}
+
+check() {
+ cd "$builddir"
+ python3 setup.py check
+}
+
+package() {
+ cd "$builddir"
+ python3 setup.py install --prefix=/usr --root="$pkgdir"
+}
+
+sha512sums="064a604939460fa85aa247776e5a2083ce98cac5f49f6035886d207f5cf167255756ee10cc00dd8228278d0d1efbed2afd8793bf3ca736a3ac970fabc3c4b627 scons-3.0.4.tar.gz
+cb8be26f0d8cae7974dffcb3008c67254e8904bb8bb91f9732dd01a9942e33d57527101ec4104a866061096b991a336d00b344da48cf835489fc5d26fb1f331e python3-bang.patch"
diff --git a/user/scons/python3-bang.patch b/user/scons/python3-bang.patch
new file mode 100644
index 000000000..e902e7418
--- /dev/null
+++ b/user/scons/python3-bang.patch
@@ -0,0 +1,8 @@
+--- scons-3.0.4/script/scons.old 2019-01-23 17:30:36.000000000 +0000
++++ scons-3.0.4/script/scons 2019-01-23 22:08:17.600000000 +0000
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#! /usr/bin/env python3
+ #
+ # SCons - a Software Constructor
+ #
diff --git a/user/serf/APKBUILD b/user/serf/APKBUILD
new file mode 100644
index 000000000..db2ae5425
--- /dev/null
+++ b/user/serf/APKBUILD
@@ -0,0 +1,41 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=serf
+pkgver=1.3.9
+pkgrel=0
+pkgdesc="High-performance HTTP library from Apache"
+url="https://serf.apache.org/"
+arch="all"
+license="Apache-2.0"
+depends=""
+makedepends="apr-dev apr-util-dev openssl-dev scons zlib-dev"
+subpackages="$pkgname-dev"
+source="https://www.apache.org/dist/serf/serf-$pkgver.tar.bz2
+ py3.patch
+ "
+
+build() {
+ cd "$builddir"
+ scons PREFIX=/usr -j "$JOBS"
+}
+
+check() {
+ cd "$builddir"
+ scons test
+}
+
+package() {
+ cd "$builddir"
+ local _header
+ install -D -m644 libserf-1.a "$pkgdir"/usr/lib/libserf-1.a
+ install -D -m755 libserf-1.so.1.3.0 "$pkgdir"/usr/lib/libserf-1.so.1.3.0
+ ln -s libserf-1.so.1.3.0 "$pkgdir"/usr/lib/libserf-1.so.1
+ ln -s libserf-1.so.1.3.0 "$pkgdir"/usr/lib/libserf-1.so
+ for _header in serf{_bucket_{types,util},}.h; do
+ install -D -m644 $_header "$pkgdir"/usr/include/serf-1/$_header
+ done
+ install -D -m644 serf-1.pc "$pkgdir"/usr/lib/pkgconfig/serf-1.pc
+}
+
+sha512sums="9f5418d991840a08d293d1ecba70cd9534a207696d002f22dbe62354e7b005955112a0d144a76c89c7f7ad3b4c882e54974441fafa0c09c4aa25c49c021ca75d serf-1.3.9.tar.bz2
+4f55a30f8e505e757c36debc8e19041dbf824c5708495d9e0338e4bac736445eff72ea60aa9a9bafdcdde9b26e2ffb6c79c39b4e6f6422cffc34d3986e49d1b1 py3.patch"
diff --git a/user/serf/py3.patch b/user/serf/py3.patch
new file mode 100644
index 000000000..12e7be1bc
--- /dev/null
+++ b/user/serf/py3.patch
@@ -0,0 +1,24 @@
+--- serf-1.3.9/SConstruct.old 2015-09-17 12:46:24.000000000 +0000
++++ serf-1.3.9/SConstruct 2019-01-23 22:11:30.900000000 +0000
+@@ -163,9 +163,9 @@
+ suffix='.def', src_suffix='.h')
+ })
+
+-match = re.search('SERF_MAJOR_VERSION ([0-9]+).*'
+- 'SERF_MINOR_VERSION ([0-9]+).*'
+- 'SERF_PATCH_VERSION ([0-9]+)',
++match = re.search(b'SERF_MAJOR_VERSION ([0-9]+).*'
++ b'SERF_MINOR_VERSION ([0-9]+).*'
++ b'SERF_PATCH_VERSION ([0-9]+)',
+ env.File('serf.h').get_contents(),
+ re.DOTALL)
+ MAJOR, MINOR, PATCH = [int(x) for x in match.groups()]
+@@ -183,7 +183,7 @@
+
+ unknown = opts.UnknownVariables()
+ if unknown:
+- print 'Warning: Used unknown variables:', ', '.join(unknown.keys())
++ print('Warning: Used unknown variables:', ', '.join(unknown.keys()))
+
+ apr = str(env['APR'])
+ apu = str(env['APU'])
diff --git a/user/socat/APKBUILD b/user/socat/APKBUILD
new file mode 100644
index 000000000..93b519d45
--- /dev/null
+++ b/user/socat/APKBUILD
@@ -0,0 +1,35 @@
+# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+pkgname=socat
+pkgver=1.7.3.2
+pkgrel=0
+pkgdesc="Multipurpose network relay"
+url="http://www.dest-unreach.org/socat/"
+arch="all"
+options="!check" # No testsuite
+license="GPL-2.0-only"
+depends=""
+makedepends="openssl-dev"
+subpackages="$pkgname-doc"
+source="http://www.dest-unreach.org/socat/download/socat-$pkgver.tar.gz
+ netdb-internal.patch"
+
+build() {
+ cd "$builddir"
+ ./configure \
+ --build=$CBUILD \
+ --host=$CHOST \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --localstatedir=/var
+ make
+}
+
+package() {
+ cd "$builddir"
+ make DESTDIR="$pkgdir" install
+}
+
+sha512sums="540658b2a3d1b87673196282e5c62b97681bd0f1d1e4759ff9d72909d11060235ee9e9521a973603c1b00376436a9444248e5fbc0ffac65f8edb9c9bc28e7972 socat-1.7.3.2.tar.gz
+22a6e0c2317a9317997c98114daac258ebbcc3d8e58e49a6ebf24781b98967afed47c63807282582fa0909076fe349281f05e4462faacb90e7aabc853903d6e6 netdb-internal.patch"
diff --git a/user/socat/netdb-internal.patch b/user/socat/netdb-internal.patch
new file mode 100644
index 000000000..d1ebc8e5b
--- /dev/null
+++ b/user/socat/netdb-internal.patch
@@ -0,0 +1,13 @@
+--- socat-1.7.2.4.orig/compat.h
++++ socat-1.7.2.4/compat.h
+@@ -656,6 +656,10 @@
+ # define NETDB_INTERNAL h_NETDB_INTERNAL
+ #endif
+
++#if !defined(NETDB_INTERNAL)
++# define NETDB_INTERNAL (-1)
++#endif
++
+ #ifndef INET_ADDRSTRLEN
+ # define INET_ADDRSTRLEN sizeof(struct sockaddr_in)
+ #endif
diff --git a/user/sound-theme-freedesktop/APKBUILD b/user/sound-theme-freedesktop/APKBUILD
new file mode 100644
index 000000000..ad1f9c0e4
--- /dev/null
+++ b/user/sound-theme-freedesktop/APKBUILD
@@ -0,0 +1,37 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=sound-theme-freedesktop
+pkgver=0.8
+pkgrel=0
+pkgdesc="Stereo sound theme"
+url="https://www.freedesktop.org/wiki/Specifications/sound-theme-spec/"
+arch="noarch"
+license="CC-BY-SA AND GPL-2.0+ AND CC-BY-3.0 AND GPL-2.0-only"
+depends=""
+makedepends="intltool"
+subpackages=""
+source="https://people.freedesktop.org/~mccann/dist/sound-theme-freedesktop-$pkgver.tar.bz2"
+
+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="f08e0414443f3a47bc433a69a7226d2b9383bc7c64e0711e8a605bd761ac69ea052a6db7f0037d88fbf0900efddaae6466ca96391eb71295ee1d0edbd0364621 sound-theme-freedesktop-0.8.tar.bz2"
diff --git a/user/subversion/APKBUILD b/user/subversion/APKBUILD
new file mode 100644
index 000000000..3d9a96a68
--- /dev/null
+++ b/user/subversion/APKBUILD
@@ -0,0 +1,58 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=subversion
+pkgver=1.10.4
+pkgrel=0
+pkgdesc="Version control system from 2000"
+url="https://subversion.apache.org/"
+arch="all"
+license="Apache-2.0"
+depends=""
+depends_dev="apr-dev apr-util-dev linux-headers"
+makedepends="apr-dev apr-util-dev cyrus-sasl-dev db-dev dbus-dev file-dev
+ kdelibs4support-dev kwallet-dev libsecret-dev lz4-dev openssl-dev
+ serf-dev sqlite-dev utf8proc-dev zlib-dev"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-gnome $pkgname-kwallet
+ $pkgname-lang"
+source="https://www-eu.apache.org/dist/subversion/subversion-$pkgver.tar.bz2
+ python3-bang.patch
+ "
+
+build() {
+ cd "$builddir"
+ ./configure \
+ --build=$CBUILD \
+ --host=$CHOST \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --localstatedir=/var \
+ --with-kwallet
+ make
+}
+
+check() {
+ cd "$builddir"
+ make check
+}
+
+package() {
+ cd "$builddir"
+ make DESTDIR="$pkgdir" -j1 install
+}
+
+gnome() {
+ pkgdesc="$pkgdesc (GNOME Keychain integration)"
+ mkdir -p "$subpkgdir"/usr/lib
+ mv "$pkgdir"/usr/lib/libsvn_auth_gnome* "$subpkgdir"/usr/lib/
+}
+
+kwallet() {
+ pkgdesc="$pkgdesc (KDE Wallet integration)"
+ install_if="$pkgname=$pkgver-r$pkgrel kwallet"
+ mkdir -p "$subpkgdir"/usr/lib
+ mv "$pkgdir"/usr/lib/libsvn_auth_kwallet* "$subpkgdir"/usr/lib/
+}
+
+sha512sums="c44a4a4a9533cd4f4cb6ddbc3ce98585a96da6c8e75497d087034b52f899797bb0972dfc0e79db99e81149e59e7fa765398c6ad35eba64f11f4ae9c3b3537434 subversion-1.10.4.tar.bz2
+1b96b791f70c2f6e05da8dbc9d42ccadf4603f25392c6676c4e30ecdb142ce74dd9b8dc27dc68b1cb461f4409d79c4c2aeed1d39a5a442d9349079a819358f5a python3-bang.patch"
diff --git a/user/subversion/python3-bang.patch b/user/subversion/python3-bang.patch
new file mode 100644
index 000000000..fa92ff098
--- /dev/null
+++ b/user/subversion/python3-bang.patch
@@ -0,0 +1,8 @@
+--- subversion-1.10.4/subversion/tests/cmdline/svneditor.py.old 2010-02-22 19:47:55.000000000 +0000
++++ subversion-1.10.4/subversion/tests/cmdline/svneditor.py 2019-01-23 23:08:14.830000000 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ #
+ # svneditor.py: a mock $SVN_EDITOR for the Subversion test suite
+ #
diff --git a/user/sword/APKBUILD b/user/sword/APKBUILD
new file mode 100644
index 000000000..db3e5574f
--- /dev/null
+++ b/user/sword/APKBUILD
@@ -0,0 +1,38 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=sword
+pkgver=1.8.1
+pkgrel=0
+pkgdesc="Cross-platform library for accessing and searching OSIS books"
+url="http://www.crosswire.org/sword/index.jsp"
+arch="all"
+license="GPL-2.0-only AND LGPL-2.1+ AND zlib"
+depends=""
+makedepends="clucene-dev curl-dev icu-dev zlib-dev"
+subpackages="$pkgname-dev"
+source="http://crosswire.org/ftpmirror/pub/sword/source/v1.8/sword-$pkgver.tar.gz"
+
+build() {
+ cd "$builddir"
+ CPPFLAGS="$CPPFLAGS -DU_USING_ICU_NAMESPACE" ./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
+ make DESTDIR="$pkgdir" install_config
+}
+
+sha512sums="5c08c070ea0c86b7d929bbf94c89730eb5a487986deb9edf01c08d1710356aecd1ab3bde4437a778e5fc1ceb05b63287612ec6161381c0986a36344c27d2ab36 sword-1.8.1.tar.gz"
diff --git a/user/user-manager/APKBUILD b/user/user-manager/APKBUILD
new file mode 100644
index 000000000..7864d7720
--- /dev/null
+++ b/user/user-manager/APKBUILD
@@ -0,0 +1,43 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=user-manager
+pkgver=5.12.7
+pkgrel=0
+pkgdesc="Manage user accounts from KDE"
+url="https://www.KDE.org/"
+arch="all"
+license="GPL-2.0+ AND LGPL-2.0+ AND GPL-2.0-only"
+depends="accountsservice"
+makedepends="cmake extra-cmake-modules qt5-qtbase-dev kauth-dev kcmutils-dev
+ kconfig-dev kconfigwidgets-dev kcoreaddons-dev ki18n-dev kiconthemes-dev
+ kio-dev kwidgetsaddons-dev libpwquality-dev"
+subpackages="$pkgname-lang"
+source="https://download.kde.org/stable/plasma/$pkgver/user-manager-$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="286b4adc7ff01c25f1f32bc64e9f119aa693d74e0468e575c792d5357df6066c18de233eb78acd5ed4288518902461ffa7408af8d559e8b5f4081893bdec7f8f user-manager-5.12.7.tar.xz"
diff --git a/user/utf8proc/APKBUILD b/user/utf8proc/APKBUILD
new file mode 100644
index 000000000..8be033ef7
--- /dev/null
+++ b/user/utf8proc/APKBUILD
@@ -0,0 +1,46 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=utf8proc
+pkgver=2.2.0
+pkgrel=0
+pkgdesc="C library for processing UTF-8 data"
+url=" "
+arch="all"
+license="MIT AND Unicode-DFS-2016"
+depends=""
+makedepends=""
+subpackages="$pkgname-dev"
+source="utf8proc-$pkgver.tar.gz::https://github.com/JuliaStrings/utf8proc/archive/v$pkgver.tar.gz"
+
+prepare() {
+ cd "$builddir"
+ default_prepare
+ mkdir build
+}
+
+build() {
+ cd "$builddir"/build
+ if [ "$CBUILD" != "$CHOST" ]; then
+ CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+ fi
+ cmake \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DBUILD_SHARED_LIBS=True \
+ -DCMAKE_BUILD_TYPE=RelWithDebugInfo \
+ -DCMAKE_C_FLAGS="$CFLAGS" \
+ ${CMAKE_CROSSOPTS} \
+ ..
+ make
+}
+
+check() {
+ cd "$builddir"/build
+ CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+}
+
+package() {
+ cd "$builddir"/build
+ make DESTDIR="$pkgdir" install
+}
+
+sha512sums="ae19287e33bc4807475063963557c4d1d2f7d95577d61882ba8df380883662860eeb868e7391ac1b8111614ca2c1855f631925ade6eaa827d07d28cc4cdbab9c utf8proc-2.2.0.tar.gz"
diff --git a/user/uwsgi/APKBUILD b/user/uwsgi/APKBUILD
new file mode 100644
index 000000000..1e10be30d
--- /dev/null
+++ b/user/uwsgi/APKBUILD
@@ -0,0 +1,86 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=uwsgi
+pkgver=2.0.17.1
+pkgrel=0
+pkgdesc="Web application server"
+url="https://projects.unbit.it/uwsgi"
+arch="all"
+options="!check" # Requires unpackaged `cppcheck`.
+license="GPL-2.0-only"
+depends=""
+makedepends="libxml2-dev openssl-dev zlib-dev
+ perl-dev php7-dev php7-embed python3-dev ruby-dev"
+subpackages=""
+# Keep psgi at the end for the CFLAGS hack.
+_plugins="asyncio cgi corerouter http php python rack psgi"
+for _plugin in $_plugins; do
+ subpackages="$subpackages $pkgname-$_plugin"
+done
+source="https://projects.unbit.it/downloads/uwsgi-$pkgver.tar.gz"
+
+build() {
+ cd "$builddir"
+
+ echo 'plugin_dir = /usr/lib/uwsgi/plugins' >> buildconf/core.ini
+ echo 'plugin_build_dir = .' >> buildconf/core.ini
+
+ python3 uwsgiconfig.py --build core
+
+ for _plugin in $_plugins; do
+ [ $_plugin != "psgi" ] || export CFLAGS="-D_GNU_SOURCE -include /usr/include/setjmp.h"
+ python3 uwsgiconfig.py --plugin plugins/$_plugin core
+ done
+}
+
+check() {
+ cd "$builddir"
+ python3 uwsgiconfig.py --check
+}
+
+package() {
+ cd "$builddir"
+ install -D -m755 "$builddir"/uwsgi "$pkgdir"/usr/bin/uwsgi
+}
+
+_plugpack() {
+ pkgdesc="$pkgdesc ($2 plugin)"
+ depends=""
+
+ install -D -m755 "$builddir"/$1_plugin.so \
+ "$subpkgdir"/usr/lib/uwsgi/plugins/$1_plugin.so
+}
+
+asyncio() {
+ _plugpack asyncio "Python asyncio"
+}
+
+cgi() {
+ _plugpack cgi "CGI"
+}
+
+corerouter() {
+ _plugpack corerouter "Core router"
+}
+
+http() {
+ _plugpack http "HTTP server"
+}
+
+php() {
+ _plugpack php "PHP"
+}
+
+psgi() {
+ _plugpack psgi "PSGI"
+}
+
+python() {
+ _plugpack python "Python 3"
+}
+
+rack() {
+ _plugpack rack "Ruby Rack"
+}
+
+sha512sums="10d357961fde3a3f5f8e77986cc647313f95a33243e24c2afc482fce21df68a8ae48f90e7b5b76d7edc3cf8fd474d99823d6d60ef7477349abc65a319222f11b uwsgi-2.0.17.1.tar.gz"
diff --git a/user/vlc/APKBUILD b/user/vlc/APKBUILD
index 1d8f2de92..a06e293ed 100644
--- a/user/vlc/APKBUILD
+++ b/user/vlc/APKBUILD
@@ -2,8 +2,8 @@
# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=vlc
-pkgver=3.0.4
-pkgrel=2
+pkgver=3.0.6
+pkgrel=1
pkgdesc="Multi-platform MPEG, VCD/DVD, and DivX player"
triggers="vlc-libs.trigger=/usr/lib/vlc/plugins"
pkgusers="vlc"
@@ -51,17 +51,15 @@ makedepends="autoconf automake bison eudev-dev flex libarchive-dev
xdg-utils
a52dec-dev alsa-lib-dev faad2-dev ffmpeg-dev flac-dev fluidsynth-dev
- libaacs-dev libavc1394-dev libbluray-dev>=0.2.1 libbluray-dev<20100000
- libcddb-dev libdc1394-dev>=2.1.0 libdca-dev libdvbpsi-dev libdvdnav-dev
- libdvdread-dev libmad-dev libmatroska-dev libmpeg2-dev libogg-dev
+ gstreamer-dev gst-plugins-base-dev libaacs-dev libavc1394-dev
+ libbluray-dev>=0.2.1 libbluray-dev<20100000 libcddb-dev libdc1394-dev
+ libdca-dev libdvbpsi-dev libdvdnav-dev libdvdread-dev libmad-dev
+ libmatroska-dev libmodplug-dev libmpeg2-dev libmtp-dev libogg-dev
libraw1394-dev>=2.0.1 librsvg-dev libshout-dev libtheora-dev libva-dev
- libvdpau-dev libvorbis-dev live-media-dev>=2012.01.26
- opus-dev pulseaudio-dev speex-dev speexdsp-dev taglib-dev v4l-utils-dev
- x264-dev x265-dev gstreamer-dev gst-plugins-base-dev
- "
+ libvdpau-dev libvorbis-dev live-media-dev opus-dev pulseaudio-dev
+ speex-dev speexdsp-dev taglib-dev v4l-utils-dev x264-dev x265-dev"
source="https://get.videolan.org/vlc/$pkgver/vlc-$pkgver.tar.xz
check-headless.patch
- CVE-2018-19857.patch
disable-sub-autodetect-fuzzy-1-test.patch
endian-fix.patch
fix-testing.patch
@@ -114,7 +112,6 @@ build() {
--enable-avcodec \
--enable-avformat \
--enable-bluray \
- --enable-cdda \
--enable-dc1394 \
--enable-dca \
--enable-dvbpsi \
@@ -298,9 +295,8 @@ plugins_video_filter() { _mv_plugins video_filter; }
plugins_video_output() { _mv_plugins video_output; }
plugins_visualization() { _mv_plugins visualization; }
-sha512sums="55c5a45a1573d559f8d62272dc446bebfb328bd48f938e634693a45032e1a3095148e634de5bc53a3a3c0e4858f7df3ed7e5dc91f3f5447e47d0ab5775171271 vlc-3.0.4.tar.xz
+sha512sums="7c72e98f30ce5c5a94d74e097fa9960442f89240079b042a729f8a33dd7fedee2538c86c99738ccef2eb27f29055f0221d4c70316e3312c5ebba9565eaa15c52 vlc-3.0.6.tar.xz
22d80df599b8b65a5439cefbb7140af8e9530f326d54945da3769af65f37518b99ec2cc8647aafd2763324a0698280915afe043cc87e5720c4694881ed35bffa check-headless.patch
-57a2b843b4b80d3887ca0141b9ea1a00752473861846a6c988553faa58650eb42cc2cd011503dce075c8a5dcabf834e449397c3cdbfdcb291ae7a41d218512da CVE-2018-19857.patch
e214b407235cb3afb8bec93f20c9b42957b57e6fd3960679d3d4235e77762e03e64d03c01f00ef63d589e7c85aaad02ce6abbeeccd66b1867bc92451a5b5e9b0 disable-sub-autodetect-fuzzy-1-test.patch
e063c727d952465bbea33f669db49190427521dc8e2291e9a5cbb0f5e8e879bd3ba76855e44bd4630948e30c4329d27bd928f95de20fe1050d5e839778a4d012 endian-fix.patch
63adb16b3a1927ee3de27ac339cbfbbaa346a69928c527f883259d1e03b5cb59f26a55feeda767837b448c455de584abcb53dc733b2845c0cc13621d72e7f6fd fix-testing.patch
diff --git a/user/vlc/CVE-2018-19857.patch b/user/vlc/CVE-2018-19857.patch
deleted file mode 100644
index a65dcef20..000000000
--- a/user/vlc/CVE-2018-19857.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 0cc5ea748ee5ff7705dde61ab15dff8f58be39d0 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
-Date: Sat, 1 Dec 2018 23:32:18 +0200
-Subject: [PATCH] caf: fix integer underflow
-
-Pointed-out-by: Hans Jerry Illikainen <hji@dyntopia.com>
----
- modules/demux/caf.c | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/modules/demux/caf.c b/modules/demux/caf.c
-index cc312a5a30..39b381f963 100644
---- a/modules/demux/caf.c
-+++ b/modules/demux/caf.c
-@@ -691,14 +691,13 @@ static int ReadKukiChunk( demux_t *p_demux, uint64_t i_size )
- demux_sys_t *p_sys = p_demux->p_sys;
- const uint8_t *p_peek;
-
-- /* vlc_stream_Peek can't handle sizes bigger than INT32_MAX, and also p_sys->fmt.i_extra is of type 'int'*/
-- if( i_size > INT32_MAX )
-+ if( i_size > SSIZE_MAX )
- {
- msg_Err( p_demux, "Magic Cookie chunk too big" );
- return VLC_EGENERIC;
- }
-
-- if( (unsigned int)vlc_stream_Peek( p_demux->s, &p_peek, (int)i_size ) < i_size )
-+ if( vlc_stream_Peek( p_demux->s, &p_peek, i_size ) < (ssize_t)i_size )
- {
- msg_Err( p_demux, "Couldn't peek extra data" );
- return VLC_EGENERIC;
---
-2.11.0
-
diff --git a/user/w3m/APKBUILD b/user/w3m/APKBUILD
new file mode 100644
index 000000000..134acd67d
--- /dev/null
+++ b/user/w3m/APKBUILD
@@ -0,0 +1,36 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=w3m
+pkgver=0.5.3_git20190105
+pkgrel=0
+pkgdesc="Text-based Web browser"
+url="http://w3m.sourceforge.net/"
+arch="all"
+options="!check" # No test suite.
+license="MIT AND X11"
+depends="compface"
+makedepends="compface-dev gc-dev gdk-pixbuf-dev glib-dev gtk+2.0-dev imlib2-dev
+ libbsd-dev libx11-dev ncurses-dev openssl-dev"
+subpackages="$pkgname-doc $pkgname-lang"
+source="w3m-$pkgver.tar.gz::https://github.com/tats/w3m/archive/v0.5.3+git20190105.tar.gz"
+builddir="$srcdir"/w3m-${pkgver/_/-}
+
+build() {
+ cd "$builddir"
+ LIBS="-lX11 -ltinfo" ./configure \
+ --build=$CBUILD \
+ --host=$CHOST \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --localstatedir=/var
+ make funcname.tab
+ make
+}
+
+package() {
+ cd "$builddir"
+ make DESTDIR="$pkgdir" install
+}
+
+sha512sums="b63b15d0bea82f50bcaa9fc0826c2d3c265a3ad73069b4a020812f28b552cdf08618ab877280c9f3a43bd64f51b80b7a526098e6395ea121c0981a3fcd2562b4 w3m-0.5.3_git20190105.tar.gz"
diff --git a/user/xorg-server/APKBUILD b/user/xorg-server/APKBUILD
index 181bbde15..e5f0041eb 100644
--- a/user/xorg-server/APKBUILD
+++ b/user/xorg-server/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=xorg-server
pkgver=1.20.3
-pkgrel=1
+pkgrel=2
pkgdesc="X.Org X11 server"
url="https://www.X.Org/"
arch="all"
@@ -27,6 +27,7 @@ makedepends="$depends_dev autoconf automake libtool util-macros
source="https://www.X.Org/releases/individual/xserver/$pkgname-$pkgver.tar.bz2
autoconfig-sis.patch
fix-musl-arm.patch
+ support-coffeelake.patch
"
# secfixes:
@@ -141,4 +142,5 @@ xwayland() {
sha512sums="ee44554f86df4297f54c5871fe7a18954eeef4338775a25f36d6577b279c4775f61128da71b86cfaeadcc080838d6749dede138d4db178866579da2056543fba xorg-server-1.20.3.tar.bz2
30a78f4278edd535c45ee3f80933427cb029a13abaa4b041f816515fdd8f64f00b9c6aef50d4eba2aaf0d4f333e730399864fd97fa18891273601c77a6637200 autoconfig-sis.patch
-b799e757a22a61ac283adbd7a8df1ad4eccce0bb6cac38a0c962ba8438bba3cf6637a65bb64859e7b32399fca672283a49960207e186c271ba574580de360d09 fix-musl-arm.patch"
+b799e757a22a61ac283adbd7a8df1ad4eccce0bb6cac38a0c962ba8438bba3cf6637a65bb64859e7b32399fca672283a49960207e186c271ba574580de360d09 fix-musl-arm.patch
+1deae020ffd7e3ea91d8d3d8118dbb80c5d08308d9a253deaa3afc42f93ff13d1a93d3aaca7acce5d45213dee9c072a15c3ed385432bc833f403e7c8472e9fd6 support-coffeelake.patch"
diff --git a/user/xorg-server/support-coffeelake.patch b/user/xorg-server/support-coffeelake.patch
new file mode 100644
index 000000000..99f12aada
--- /dev/null
+++ b/user/xorg-server/support-coffeelake.patch
@@ -0,0 +1,14 @@
+This PCI ID has been seen in the wild on the i7-9700K.
+
+diff --git a/hw/xfree86/dri2/pci_ids/i965_pci_ids.h b/hw/xfree86/dri2/pci_ids/i965_pci_ids.h
+index 82e4a549e..1ef1a0edf 100644
+--- a/hw/xfree86/dri2/pci_ids/i965_pci_ids.h
++++ b/hw/xfree86/dri2/pci_ids/i965_pci_ids.h
+@@ -174,6 +174,7 @@ CHIPSET(0x3EA4, cfl_gt1, "Intel(R) HD Graphics (Coffeelake 2x6 GT1)")
+ CHIPSET(0x3E91, cfl_gt2, "Intel(R) UHD Graphics 630 (Coffeelake 3x8 GT2)")
+ CHIPSET(0x3E92, cfl_gt2, "Intel(R) UHD Graphics 630 (Coffeelake 3x8 GT2)")
+ CHIPSET(0x3E96, cfl_gt2, "Intel(R) HD Graphics (Coffeelake 3x8 GT2)")
++CHIPSET(0x3E98, cfl_gt2, "Intel(R) UHD Graphics 630 (Coffeelake 3x8 GT2)")
+ CHIPSET(0x3E9A, cfl_gt2, "Intel(R) HD Graphics (Coffeelake 3x8 GT2)")
+ CHIPSET(0x3E9B, cfl_gt2, "Intel(R) UHD Graphics 630 (Coffeelake 3x8 GT2)")
+ CHIPSET(0x3E94, cfl_gt2, "Intel(R) HD Graphics (Coffeelake 3x8 GT2)")
diff --git a/user/xterm/APKBUILD b/user/xterm/APKBUILD
index 35177bf1a..ab8a22b7a 100644
--- a/user/xterm/APKBUILD
+++ b/user/xterm/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
pkgname=xterm
pkgver=341
-pkgrel=0
+pkgrel=1
pkgdesc="An X-based terminal emulator"
url="https://invisible-island.net/xterm/"
arch="all"
@@ -11,11 +11,13 @@ license="X11"
makedepends="libx11-dev libsm-dev libice-dev libxt-dev utmps-dev libxaw-dev
libxext-dev freetype-dev ncurses-dev pcre-dev"
subpackages="$pkgname-doc"
-source="ftp://ftp.invisible-island.net/xterm/xterm-$pkgver.tgz"
+source="ftp://ftp.invisible-island.net/xterm/xterm-$pkgver.tgz
+ posix-ptmx.patch
+ "
build() {
cd "$builddir"
- LIBS="-lutmps -lskarnet -ltinfow" ./configure \
+ LIBS="-ltinfow" ./configure \
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
@@ -23,7 +25,18 @@ build() {
--mandir=/usr/share/man \
--localstatedir=/var \
--with-pcre
- make
+ # This is NOT A TYPO!
+ #
+ # XTerm does not use ld(1) as a linker. It uses a shell script
+ # called 'plink.sh' which tries to Be Smart, but is actually
+ # Quite Dumb.
+ #
+ # It determines that the utmp symbols are in musl, and decides
+ # -lutmps really isn't necessary. However! There is some solace.
+ #
+ # -k is like -l, but is forced, even if it isn't "really needed".
+ # So we use -k for utmps.
+ make EXTRA_LOADFLAGS="-kutmps -lskarnet"
}
package() {
@@ -31,4 +44,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="336b8e8d3bfbc373ce1a0547571f705401142b54a8206050d2cdf961dfd99e01c9e78e10df443eb3278fb02116536cf55bc1501835978b9b390399614ab77494 xterm-341.tgz"
+sha512sums="336b8e8d3bfbc373ce1a0547571f705401142b54a8206050d2cdf961dfd99e01c9e78e10df443eb3278fb02116536cf55bc1501835978b9b390399614ab77494 xterm-341.tgz
+e29ef756243faa6f5ced3c74d6879b4fc8f9839501becae49af4f458d0f499bcda40a0eb66dada9cae8bf9789256daf3d1605ac1b5b4301654d8b5ac6eaca81d posix-ptmx.patch"
diff --git a/user/xterm/posix-ptmx.patch b/user/xterm/posix-ptmx.patch
new file mode 100644
index 000000000..351aba9ab
--- /dev/null
+++ b/user/xterm/posix-ptmx.patch
@@ -0,0 +1,21 @@
+--- xterm/main.c.old
++++ xterm/main.c
+@@ -2654,7 +2654,7 @@ get_pty(int *pty, char *from GCC_UNUSED)
+ close(opened_tty);
+ opened_tty = -1;
+ }
+-#elif defined(HAVE_POSIX_OPENPT) && defined(HAVE_PTSNAME) && defined(HAVE_GRANTPT_PTY_ISATTY)
++#elif defined(HAVE_POSIX_OPENPT) && defined(HAVE_PTSNAME)
+ if ((*pty = posix_openpt(O_RDWR)) >= 0) {
+ char *name = ptsname(*pty);
+ if (name != 0) {
+@@ -3735,7 +3735,7 @@ spawnXTerm(XtermWidget xw)
+ /*
+ * now in child process
+ */
+-#if defined(_POSIX_SOURCE) || defined(SVR4) || defined(__convex__) || defined(__SCO__) || defined(__QNX__)
++#if defined(_POSIX_VERSION) || defined(SVR4) || defined(__convex__) || defined(__SCO__) || defined(__QNX__)
+ int pgrp = setsid(); /* variable may not be used... */
+ #else
+ int pgrp = getpid();
+