10 files changed, 147 insertions, 92 deletions
diff --git a/experimental/erlang/APKBUILD b/experimental/erlang/APKBUILD
deleted file mode 100644
index 82832e96e..000000000
--- a/experimental/erlang/APKBUILD
+++ /dev/null
@@ -1,57 +0,0 @@
-# Contributor: A. Wilcox <awilfox@adelielinux.org>
-# Maintainer: A. Wilcox <awilfox@adelielinux.org>
-pkgname=erlang
-pkgver=21.2
-pkgrel=0
-pkgdesc="Soft real-time system programming language"
-url="https://www.erlang.org/"
-arch="all"
-license="Apache-2.0"
-depends=""
-makedepends="libxml2-utils libxslt-dev m4 ncurses-dev openssl-dev perl
-	unixodbc-dev"
-subpackages="$pkgname-dev $pkgname-doc"
-source="http://erlang.org/download/otp_src_$pkgver.tar.gz
-	fix-wx-linking.patch
-	"
-builddir="$srcdir/otp_src_$pkgver"
-
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var \
-		--enable-shared-zlib \
-		--enable-ssl=dynamic-ssl-lib \
-		--enable-threads
-	make
-}
-
-check() {
-	local _header
-
-	cd "$builddir"
-	export ERL_TOP=$builddir
-
-	make release_tests
-
-	for _header in erl_fixed_size_int_types.h \
-		${CHOST}/erl_int_sizes_config.h \
-		erl_memory_trace_parser.h; do
-		cp erts/include/$_header erts/emulator/beam/
-	done
-	cd release/tests/test_server
-	$ERL_TOP/bin/erl -s ts install -s ts smoke_test batch -s init stop
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="5707ef0d49a9af12cd9d93c3e4fd200092773645838bbe0163782d0fa40562d2b48bdb07f0e650311bfec896ed9e3c9621b4d0ba114c578d7ca3209c2a96ac24  otp_src_21.2.tar.gz
-5f1b05d8be71d5e3d7e8c5ad019329af8f68174251b5b6e0a9ee9cb3da51a10983b8696e23b3954c19de5d54783ec16f38c80c74724341dbafb22fcac83c77d4  fix-wx-linking.patch"
diff --git a/experimental/erlang/fix-wx-linking.patch b/experimental/erlang/fix-wx-linking.patch
deleted file mode 100644
index eb5649164..000000000
--- a/experimental/erlang/fix-wx-linking.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- otp_src_21.2/lib/wx/configure.old	2018-12-10 20:11:00.000000000 +0000
-+++ otp_src_21.2/lib/wx/configure	2019-02-24 22:16:37.340000000 +0000
-@@ -5765,7 +5765,7 @@
- 			   // it isn't in too old wxWidgets versions
- 		   	   wxString test = wxString::FromUTF8((const char *)"foo");
- 		   	   wxStyledTextCtrl * foo = new wxStyledTextCtrl();
--		   	   wxGLCanvas * bar = new wxGLCanvas((wxWindow *) NULL, -1,
-+		   	   wxGLCanvas * bar = new wxGLCanvas((wxWindow *) NULL, -1, NULL,
- 			   	      wxDefaultPosition,wxDefaultSize,0);
- 			   return true;
-                   };
diff --git a/experimental/firefox-esr/APKBUILD b/experimental/firefox-esr/APKBUILD
index b13698697..ae94ce6e7 100644
--- a/experimental/firefox-esr/APKBUILD
+++ b/experimental/firefox-esr/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=firefox-esr
-pkgver=60.5.0
+pkgver=60.7.0
 pkgrel=0
 pkgdesc="Firefox web browser"
 url="https://www.mozilla.org/en-US/firefox/organizations/faq/"
@@ -15,7 +15,7 @@ depends_dev="alsa-lib-dev bzip2-dev dbus-glib-dev gconf-dev gtk+2.0-dev
 	pulseaudio-dev sqlite-dev startup-notification-dev wireless-tools-dev"
 makedepends="$depends_dev autoconf2.13 automake libtool
 	bsd-compat-headers cmd:which nss-static openssl-dev sed yasm zip
-	cargo clang llvm6-dev rust"
+	cargo clang llvm8-dev rust"
 subpackages=""
 _py2ver=2.7.15
 source="https://ftp.mozilla.org/pub/firefox/releases/${pkgver}esr/source/firefox-${pkgver}esr.source.tar.xz
@@ -33,12 +33,15 @@ source="https://ftp.mozilla.org/pub/firefox/releases/${pkgver}esr/source/firefox
 
 	bad-google-code.patch
 	cmsghdr.patch
+	disable-gecko-profiler.patch
 	endian-gfx.patch
 	endianness-js.patch
 	fix-bug-1261392.patch
 	fix-mutex-build.patch
+	fix-sandbox-membarrier.patch
 	proper-system-hunspell.patch
 	rust-config.patch
+	rust-1.33.0.patch
 	shut-up-warning.patch
 	skia.patch
 	stackwalk-x86-ppc.patch
@@ -50,6 +53,7 @@ source="https://ftp.mozilla.org/pub/firefox/releases/${pkgver}esr/source/firefox
 	https://www.python.org/ftp/python/$_py2ver/Python-$_py2ver.tar.xz"
 
 builddir="$srcdir"/firefox-$pkgver
+_mozappdir=/usr/lib/firefox
 ldpath="$_mozappdir"
 
 unpack() {
@@ -142,7 +146,7 @@ package() {
 	EOF
 }
 
-sha512sums="dd47e38a87a1339b733c06ea3f235576bf8dce414194ab308d0dda07bf15290afbbad92b8484732daa53cf6a48b57412f7f41e30ae0ac21144c8657b86047aec  firefox-60.5.0esr.source.tar.xz
+sha512sums="c2152857f5f1c816a12fcf5c450268025ee47ee9299ae3355650d86c7c97191b731123a4964154222ca5ba1edc44fee0d1d5f803ae9515841283ecaff6dc9a55  firefox-60.7.0esr.source.tar.xz
 76e3e6f64f4dd1206106b2b73cca3ccd312a8d907010c382ab9e2f0a497fed297abf0654d4dd90c563e6dde6403e3f9084ce927bb275fec95be87bed8adf9257  mozconfig
 0b3f1e4b9fdc868e4738b5c81fd6c6128ce8885b260affcb9a65ff9d164d7232626ce1291aaea70132b3e3124f5e13fef4d39326b8e7173e362a823722a85127  stab.h
 09bc32cf9ee81b9cc6bb58ddbc66e6cc5c344badff8de3435cde5848e5a451e0172153231db85c2385ff05b5d9c20760cb18e4138dfc99060a9e960de2befbd5  fix-fortify-inline.patch
@@ -153,13 +157,16 @@ bdcd1b402d2ec94957ba5d08cbad7b1a7f59c251c311be9095208491a05abb05a956c79f27908e1f
 e61664bc93eadce5016a06a4d0684b34a05074f1815e88ef2613380d7b369c6fd305fb34f83b5eb18b9e3138273ea8ddcfdcb1084fdcaa922a1e5b30146a3b18  mozilla-build-arm.patch
 6beba471b6a7fc229a9c105d58137f80cec07219e52bb9a666c787b37ca88635d6ec2eba651eccb5096429c2965709c9475c89839c255c3545f8c96c5d40f403  missing-header-s390x.patch
 ace7492f4fb0523c7340fdc09c831906f74fddad93822aff367135538dacd3f56288b907f5a04f53f94c76e722ba0bab73e28d83ec12d3e672554712e6b08613  bad-google-code.patch
-61c7117345b4bcb045ce0287aa368d90dffd7331347021ff345d5a7c46097ffd2575f38711309ce7bdbbbec15561e03fdabcb16235ed8a325ccc8c9d5bba35a6  cmsghdr.patch
+a8f3589dade59f05a78fb92c5a50785ad2eb3f2a49a88dba0198bf74d3dc9a35e5adc554a5a4235b3653602ef58371ab7afc5a0459b6e9d82c351862e1a2db85  cmsghdr.patch
+03597515a38f54aa973d2209ca7fbf7348f9843c4dd0481fae747ac06b35fc7e5c61b2e17ab6e3677e479901e8e12c58e961eb1cc861af7cfd2a8488d4dcde72  disable-gecko-profiler.patch
 11361b009d708e80afcf2eca8b02381be0c8314421eb439200c674cfa4e4bca15127f2d0dd11bf36f48d0e309d4424f949caf588f08458f8e9ba6812b83023ab  endian-gfx.patch
 363f1df1a78799783b4e9f887dc85d83ec83c6ec392aeacbd98dc89e543d0cd3b9d1964ce274142b44847a03c47f845cbf6fa7fa17a04b25bbaa37fc5d714730  endianness-js.patch
 a50b412edf9573a0bd04a43578b1c927967a616b73a5995eefb15bfa78fd2bd14e36ec05315a0703f6370ecd524e6bcb012e7285beb1245e9add9b8553acb79e  fix-bug-1261392.patch
 d5d3ec190b1916d5c06f466a72124a3d438d90ea40d54e894105a9faf2aa2a6ce9cc21a0a80bd4408f7be867e5a660ee3d8aed40c8d1fb511cfb947739f45240  fix-mutex-build.patch
+48d2af2b5e5c2a6e7038f2710d09142da5ae97a54e07b80823c1aba7fc07f367a84d131a1c513c4d9a8be0a56e362a2c86b8547ae138ba71ee218a30ed34d3cc  fix-sandbox-membarrier.patch
 1a88c21c39d5878e2018463fe08dd3a960cdf10e650e06ef3e4f089a431800b50267d8749a7acde196bb47c45aa66058a6ed4fb4d60de2ab69e8a48cd5a109bc  proper-system-hunspell.patch
 fd3b165e26ab931dd7eaf220d578c30b8772eab0a870710d59403c9823c2233ef941cd7eb25d1625d705de9e8a7138d0e8c4e227a185e9b687553132da96d81a  rust-config.patch
+7450eeb7ca48ce632fb7379aec6018012a0db5efd8afaee2708501e6c72273ba238922696da584a73b7fa82dc202470aba9ef5df20c230c9e21087436e68e4b8  rust-1.33.0.patch
 21100340ff03f4257fa6a4b59e206d4d1b71c074ebae392ba616f9e6e6d4988a22eec69b40534221f9453ec3a58397fa4ab99b87abdcb7d22fabb13f9cc577d2  shut-up-warning.patch
 8ef2bc4404601f66c7505f3e0a2f6d1d11e8f11e5a888dce4942cf27c86fbdbcdd66cb3d98738b7d9e25538793986140e75d51a893d22c70714ed98ef50a9894  skia.patch
 e196c998a4029e4fc134fbe4b7455abb4b93644f7f07b88faef4eda900de225e72b124b5a9ab3492cbe398e17f8390d29b769a2544744a106bba6a5def540973  stackwalk-x86-ppc.patch
diff --git a/experimental/firefox-esr/cmsghdr.patch b/experimental/firefox-esr/cmsghdr.patch
index 5fdc38353..2cf6821a4 100644
--- a/experimental/firefox-esr/cmsghdr.patch
+++ b/experimental/firefox-esr/cmsghdr.patch
@@ -1,10 +1,11 @@
-diff -Naur firefox-60.0.orig/media/audioipc/audioipc/src/cmsg.rs firefox-60.0/media/audioipc/audioipc/src/cmsg.rs
---- firefox-60.0.orig/media/audioipc/audioipc/src/cmsg.rs	2018-05-13 18:05:51.713781232 -0700
-+++ firefox-60.0/media/audioipc/audioipc/src/cmsg.rs	2018-05-13 17:33:39.536856530 -0700
-@@ -108,6 +108,7 @@
+diff -urw firefox-60.7.0-old/media/audioipc/audioipc/src/cmsg.rs firefox-60.7.0/media/audioipc/audioipc/src/cmsg.rs
+--- firefox-60.7.0-old/media/audioipc/audioipc/src/cmsg.rs	2019-05-24 13:35:24.210002353 +0000
++++ firefox-60.7.0/media/audioipc/audioipc/src/cmsg.rs	2019-05-24 13:36:34.400002547 +0000
+@@ -108,6 +108,8 @@
  
              let cmsghdr = cmsghdr {
                  cmsg_len: cmsg_len as _,
++                #[cfg(all(target_env = "musl", target_pointer_width = "64"))]
 +                __pad1: 0,
                  cmsg_level: level,
                  cmsg_type: kind,
diff --git a/experimental/firefox-esr/disable-gecko-profiler.patch b/experimental/firefox-esr/disable-gecko-profiler.patch
new file mode 100644
index 000000000..42bb22633
--- /dev/null
+++ b/experimental/firefox-esr/disable-gecko-profiler.patch
@@ -0,0 +1,13 @@
+--- a/toolkit/moz.configure
++++ b/toolkit/moz.configure
+@@ -35,10 +35,6 @@
+     if value:
+         return True
+ 
+-set_config('MOZ_GECKO_PROFILER', gecko_profiler_define)
+-set_define('MOZ_GECKO_PROFILER', gecko_profiler_define)
+-
+-
+ option('--enable-dmd', env='MOZ_DMD',
+        help='Enable Dark Matter Detector (heap profiler). '
+             'Also enables jemalloc, replace-malloc and profiling')
diff --git a/experimental/firefox-esr/fix-sandbox-membarrier.patch b/experimental/firefox-esr/fix-sandbox-membarrier.patch
new file mode 100644
index 000000000..841b17a91
--- /dev/null
+++ b/experimental/firefox-esr/fix-sandbox-membarrier.patch
@@ -0,0 +1,52 @@
+allow usage of SYS_membarrier, needed since musl-1.1.22
+
+--- a/security/sandbox/linux/SandboxFilter.cpp
++++ b/security/sandbox/linux/SandboxFilter.cpp
+@@ -283,6 +283,8 @@
+       case __NR_set_tid_address:
+         return Allow();
+ #endif
++      case __NR_membarrier:
++        return Allow();
+ 
+         // prctl
+       case __NR_prctl: {
+
+--- a/security/sandbox/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
++++ b/security/sandbox/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
+@@ -1385,6 +1385,10 @@
+ #define __NR_memfd_create (__NR_SYSCALL_BASE+385)
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier (__NR_SYSCALL_BASE+389)
++#endif
++
+ // ARM private syscalls.
+ #if !defined(__ARM_NR_BASE)
+ #define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000)
+
+--- a/security/sandbox/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
++++ b/security/sandbox/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
+@@ -1290,5 +1290,9 @@
+ #define __NR_memfd_create 319
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 324
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_64_LINUX_SYSCALLS_H_
+ 
+--- a/security/sandbox/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
++++ b/security/sandbox/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
+@@ -1490,5 +1490,9 @@
+ #define __NR_shutdown 373
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 375
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_32_LINUX_SYSCALLS_H_
+ 
diff --git a/experimental/firefox-esr/rust-1.33.0.patch b/experimental/firefox-esr/rust-1.33.0.patch
new file mode 100644
index 000000000..d74ade170
--- /dev/null
+++ b/experimental/firefox-esr/rust-1.33.0.patch
@@ -0,0 +1,26 @@
+Fix build error resulting from missing macro documentation when building with
+rust 1.33.0.
+
+diff -urw firefox-60.6.1-old/servo/components/style/lib.rs firefox-60.6.1/servo/components/style/lib.rs
+--- firefox-60.6.1-old/servo/components/style/lib.rs	2019-03-22 05:01:07.000000000 +0000
++++ firefox-60.6.1/servo/components/style/lib.rs	2019-04-18 18:17:26.229986934 +0000
+@@ -23,7 +23,6 @@
+ //! [cssparser]: ../cssparser/index.html
+ //! [selectors]: ../selectors/index.html
+ 
+-#![deny(missing_docs)]
+ 
+ extern crate app_units;
+ extern crate arrayvec;
+diff -urw firefox-60.6.1-old/servo/components/style_traits/lib.rs firefox-60.6.1/servo/components/style_traits/lib.rs
+--- firefox-60.6.1-old/servo/components/style_traits/lib.rs	2019-03-22 05:01:07.000000000 +0000
++++ firefox-60.6.1/servo/components/style_traits/lib.rs	2019-04-18 18:17:18.439987016 +0000
+@@ -9,7 +9,7 @@
+ #![crate_name = "style_traits"]
+ #![crate_type = "rlib"]
+ 
+-#![deny(unsafe_code, missing_docs)]
++#![deny(unsafe_code)]
+ 
+ extern crate app_units;
+ #[macro_use] extern crate bitflags;
diff --git a/experimental/lmms/APKBUILD b/experimental/lmms/APKBUILD
index 0ab893cb8..5a045f66e 100644
--- a/experimental/lmms/APKBUILD
+++ b/experimental/lmms/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=lmms
-pkgver=1.2.0_rc7
+pkgver=1.2.0
 pkgrel=0
 pkgdesc="Music production software"
 url="https://lmms.io/"
@@ -11,12 +11,11 @@ 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"
+	sdl-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
 	"
@@ -58,9 +57,8 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="e16b5bd050a0a5f3ac9312654cd3ce65e497258dead836fb222918af4eb71ea23175292b7943bff495e0b53445b70e80d26bebe059e46724f39f8e8f29d37dd6  lmms-1.2.0-rc7.tar.gz
+sha512sums="55b338b68013645175f79fb8e68278cc31defdc04e6c069b4f9adbdb6f8aaf52a60087bbbef56caeceac179e19754b1fd341df201adee4b1ff90de6bbd49ef22  lmms-1.2.0.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
deleted file mode 100644
index 6c83c5052..000000000
--- a/experimental/lmms/isinff.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/nim/APKBUILD b/experimental/nim/APKBUILD
new file mode 100644
index 000000000..c64968b44
--- /dev/null
+++ b/experimental/nim/APKBUILD
@@ -0,0 +1,37 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=nim
+pkgver=0.20.0
+pkgrel=0
+pkgdesc="Statically typed, compiled systems programming language"
+url="https://nim-lang.org/"
+arch="all"
+license=" "
+depends=""
+checkdepends="gc node"
+makedepends="openssl-dev pcre-dev"
+subpackages="$pkgname-doc"
+source="https://nim-lang.org/download/nim-$pkgver.tar.xz"
+
+build() {
+	sh build.sh
+	bin/nim --parallelBuild:${JOBS} c koch
+	./koch boot --parallelBuild:${JOBS} -d:release
+	PATH="./bin:$PATH" ./koch --stable tools
+}
+
+check() {
+	PATH="./bin:$PATH" ./koch test
+}
+
+package() {
+	PATH="./bin:$PATH" ./koch install "$pkgdir"
+	mkdir -p "$pkgdir"/usr/share/doc
+	mv "$pkgdir"/usr/share/nim/doc "$pkgdir"/usr/share/doc/nim
+
+	for _exec in bin/*; do
+		install -m755 _exec "$pkgdir"/usr/bin/
+	done
+}
+
+sha512sums="e41fc9f9337535d07ebdd14ae8195bf9c666a0a242516f24d50241e69d50e89fcb9ac1a0b1fbeee0bc75b0218aeb18698ff2ac87447005dad52dc18da80bb02d  nim-0.20.0.tar.xz"