Merge branch 'master' into i486

21 files changed, 90 insertions, 111 deletions

diff --git a/blacklist b/blacklist
index 968c8aa8..ec3160a4 100644
--- a/blacklist
+++ b/blacklist
@@ -4,6 +4,7 @@ i686 cuda # cuda 9.0 is 64-bit only
 i686 delve # currently no 32-bit support, see <a href="https://github.com/derekparker/delve/issues/20">upstream</a>
 i686 dotnet-core # not available for 32-bit on linux, see <a href="https://github.com/dotnet/core/blob/master/release-notes/download-archives/2.0.5-download.md">here</a>
 i686 firefox-developer-edition # llvm segfaults, virtual memory issues (blacklisting may be temporary)
+i686 julia # /build/julia/src/julia/src/atomics.h:9:4: error: #error Julia can only be built for architectures above Pentium 4. Pass -march=pentium4, or set MARCH=pentium4 and ensure that -march is not passed separately with an older architecture.
 i686 linux-hardened # not <a href="https://mirror.archlinux32.org/irc-logs/%23archlinux-ports/2017-06-28.html#04:04:01">really useful</a> on i686 + hard to maintain
 i486 linux-pae # not useful - use i686 instead
 i686 libretro-citra # do not build, see FS32#23
diff --git a/community/dart/PKGBUILD b/community/dart/PKGBUILD
index 88e30efe..452a714f 100644
--- a/community/dart/PKGBUILD
+++ b/community/dart/PKGBUILD
@@ -1,2 +1,2 @@
 source=("$pkgname-$pkgver-32.zip::http://storage.googleapis.com/dart-archive/channels/stable/release/latest/sdk/dartsdk-linux-ia32-release.zip")
-sha512sums=('7e2ba689f4e222d545720c34f0581df5b4e64f39eaf71e3af294ce20869652d71981ae5e95153fe87e049e1fbf8375870209b3b6eae2da8688b75a80f255033b')
+sha512sums=('7723a38f9ed4b9f7d0d2b2098bfacc2eaeb2fa1d75591efd82f8d2e211625c37e10839251f89cd342008cc912e3921ef473a63e7ee74b6cd1853bd1999759fd1')
diff --git a/community/freebasic/PKGBUILD b/community/freebasic/PKGBUILD
new file mode 100644
index 00000000..953b0e82
--- /dev/null
+++ b/community/freebasic/PKGBUILD
@@ -0,0 +1,9 @@
+source_i686=("http://downloads.sourceforge.net/fbc/FreeBASIC-${pkgver}-linux-x86.tar.xz")
+md5sums_i686=('50aec8fcfa577dc7a76cffc6dfe50476')
+
+eval "$(
+  declare -f prepare | \
+    sed '
+      /CARCH/ a [[ "$CARCH" = "i686" ]] && _arch=x86
+    '
+)"
diff --git a/community/gap/PKGBUILD b/community/gap/PKGBUILD
new file mode 100644
index 00000000..b9a33e53
--- /dev/null
+++ b/community/gap/PKGBUILD
@@ -0,0 +1,6 @@
+eval "$(
+  declare -f package_gap-packages | \
+    sed '
+      /chrpath/ s/x86_64-pc-linux-gnu-default64/i686-pc-linux-gnu-default32/
+    '
+)"
diff --git a/community/grim/PKGBUILD b/community/grim/PKGBUILD
deleted file mode 100644
index 4c7f6cf1..00000000
--- a/community/grim/PKGBUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-# temporary fix for type mismatch
-source+=('bced8c88165bd15cf97d3b55a9241b0a6ee1fe3c.patch')
-sha256sums+=('9614a426ac697cacbb7e08f6d5a12466071052d7ae14ef31a05e51d50f510de1')
-prepare() {
-  cd "$pkgname"
-  patch -p1 -i '../bced8c88165bd15cf97d3b55a9241b0a6ee1fe3c.patch'
-}
diff --git a/community/grim/bced8c88165bd15cf97d3b55a9241b0a6ee1fe3c.patch b/community/grim/bced8c88165bd15cf97d3b55a9241b0a6ee1fe3c.patch
deleted file mode 100644
index 48afa84f..00000000
--- a/community/grim/bced8c88165bd15cf97d3b55a9241b0a6ee1fe3c.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From aa679f0501a30fb5a452d35f7ef9d7ed2c3fa2f9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= <jpokorny@fedoraproject.org>
-Date: Sat, 3 Nov 2018 15:16:08 +0100
-Subject: [PATCH] Fix i686 build -Werror=incompatible-pointer-types complaint
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This was caused with jpeg_mem_dest expecting pointer to unsigned long
-and being fed with pointer to size_t, which may amount to different
-data-width types.  There's also a simple overflow check for such
-cases now.
-
-Signed-off-by: Jan Pokorný <jpokorny@fedoraproject.org>
----
- cairo_jpg.c         | 17 +++++++++--------
- include/cairo_jpg.h |  2 +-
- 2 files changed, 10 insertions(+), 9 deletions(-)
-
-diff --git a/cairo_jpg.c b/cairo_jpg.c
-index e905e4e..3a37a37 100644
---- a/cairo_jpg.c
-+++ b/cairo_jpg.c
-@@ -7,7 +7,9 @@
- #include <stdlib.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <assert.h>
- #include <fcntl.h>
-+#include <limits.h>
- #include <unistd.h>
- #include <cairo.h>
- #include <jpeglib.h>
-@@ -15,7 +17,7 @@
- #include "cairo_jpg.h"
- 
- cairo_status_t cairo_surface_write_to_jpeg_mem(cairo_surface_t *sfc,
--		unsigned char **data, size_t *len, int quality) {
-+		unsigned char **data, unsigned long *len, int quality) {
- 	struct jpeg_compress_struct cinfo;
- 	struct jpeg_error_mgr jerr;
- 	JSAMPROW row_pointer[1];
-@@ -91,18 +93,17 @@ cairo_status_t cairo_surface_write_to_jpeg_stream(cairo_surface_t *sfc,
- 		cairo_write_func_t write_func, void *closure, int quality) {
- 	cairo_status_t e;
- 	unsigned char *data = NULL;
--	size_t len = 0;
-+	unsigned long len = 0;
- 
- 	e = cairo_surface_write_to_jpeg_mem(sfc, &data, &len, quality);
--	if (e != CAIRO_STATUS_SUCCESS) {
--		return e;
-+	if (e == CAIRO_STATUS_SUCCESS) {
-+		assert(sizeof(unsigned long) <= sizeof(size_t)
-+			|| !(len >> (sizeof(size_t) * CHAR_BIT)));
-+		e = write_func(closure, data, len);
-+		free(data);
- 	}
- 
--	e = write_func(closure, data, len);
--
--	free(data);
- 	return e;
--
- }
- 
- cairo_status_t cairo_surface_write_to_jpeg(cairo_surface_t *sfc,
-diff --git a/include/cairo_jpg.h b/include/cairo_jpg.h
-index a2d0328..7e09e55 100644
---- a/include/cairo_jpg.h
-+++ b/include/cairo_jpg.h
-@@ -3,7 +3,7 @@
- 
- #include <cairo.h>
- 
--cairo_status_t cairo_surface_write_to_jpeg_mem(cairo_surface_t *sfc, unsigned char **data, size_t *len, int quality);
-+cairo_status_t cairo_surface_write_to_jpeg_mem(cairo_surface_t *sfc, unsigned char **data, unsigned long *len, int quality);
- cairo_status_t cairo_surface_write_to_jpeg_stream(cairo_surface_t *sfc, cairo_write_func_t write_func, void *closure, int quality);
- cairo_status_t cairo_surface_write_to_jpeg(cairo_surface_t *sfc, const char *filename, int quality);
- 
diff --git a/community/hq/PKGBUILD b/community/hq/PKGBUILD
new file mode 100644
index 00000000..4e22d247
--- /dev/null
+++ b/community/hq/PKGBUILD
@@ -0,0 +1,7 @@
+# see upstream https://github.com/coderobe/hq/pull/1
+source+=('hq-ia32.patch')
+md5sums+=('3cecc7f3b1bbe96f6c3a1609730ba574')
+prepare() {
+  cd "${pkgname}"
+  patch -Np1 -i ../hq-ia32.patch
+}
diff --git a/community/hq/hq-ia32.patch b/community/hq/hq-ia32.patch
new file mode 100644
index 00000000..07a924e0
--- /dev/null
+++ b/community/hq/hq-ia32.patch
@@ -0,0 +1,12 @@
+diff -rauN hq/main.cpp hq-ia32-patch/main.cpp
+--- hq/main.cpp	2018-11-25 17:00:49.731669567 +0100
++++ hq-ia32-patch/main.cpp	2018-11-25 17:01:32.498826389 +0100
+@@ -51,7 +51,7 @@
+ static const string afmt_s = "\033[";
+ static const string afmt_e = "m";
+ static const vector<char> collapsible = {' ', '\t', '\n', '\r'};
+-static const vector<unsigned long> breaking = {
++static const vector<myhtml_tag_id_t> breaking = {
+   MyHTML_TAG_BR,
+   MyHTML_TAG_P
+ };
diff --git a/community/teamspeak3-server/PKGBUILD b/community/teamspeak3-server/PKGBUILD
new file mode 100644
index 00000000..3d518c16
--- /dev/null
+++ b/community/teamspeak3-server/PKGBUILD
@@ -0,0 +1,2 @@
+sha256sums_i686=('f5ff4d313865ca8ab4a9c63f447f584a9363a313624950f683ec4d6f59d55059')
+
diff --git a/core/linux/PKGBUILD b/core/linux/PKGBUILD
index 6310e45b..f0b8eb50 100644
--- a/core/linux/PKGBUILD
+++ b/core/linux/PKGBUILD
@@ -1,12 +1,12 @@
-# upstream git revision: 45f74c7ee0c0d228f516a775817769db3192f978
+# upstream git revision: 2e669a90e89f01c68b7b0faf7f6084aabca61c3f
 
 source_i686=('config.i686')
 source_i486=('config.i486')
 # fail if upstream's .config changes
 for ((i=0; i<${#sha256sums[@]}; i++)); do
-  if [ "${sha256sums[${i}]}" = '986918689166b88f03579bda4a5a964ec4a1db18423b89981ba58da7e35e8e89' ]; then
-    sha256sums_i686=('bd4295f9ccd4e19755c589e711791b7937de3f5685a29de2b30f6b193acc0bc9')
-    sha256sums_i486=('124ae6377726257edae0312eba64fe70758d321c7997e90e021ad3676441c1fe')
+  if [ "${sha256sums[${i}]}" = 'e7fa30bb2de12d1a2488423e27c00f26d55668e310e69aaf93673c1afd89dbaf' ]; then
+    sha256sums_i686=('4af6c8a227ff11512fc11c8654d8148224caef9fcfd26f7927a319abb38a18e9')
+    sha256sums_i486=('3ef8623d68b0615003e0603b63cc6f74c4904926c5b920155d6cd06650cb3c8c')
   fi
 done
 
diff --git a/core/linux/config.i486 b/core/linux/config.i486
index ad6b63d2..ab8bc501 100644
--- a/core/linux/config.i486
+++ b/core/linux/config.i486
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.2-arch1 Kernel Configuration
+# Linux/x86 4.19.4-arch1 Kernel Configuration
 #
 
 #
@@ -1529,6 +1529,7 @@ CONFIG_L2TP_V3=y
 CONFIG_L2TP_IP=m
 CONFIG_L2TP_ETH=m
 CONFIG_STP=m
+CONFIG_GARP=m
 CONFIG_MRP=m
 CONFIG_BRIDGE=m
 CONFIG_BRIDGE_IGMP_SNOOPING=y
@@ -1546,7 +1547,7 @@ CONFIG_NET_DSA_TAG_MTK=y
 CONFIG_NET_DSA_TAG_TRAILER=y
 CONFIG_NET_DSA_TAG_QCA=y
 CONFIG_VLAN_8021Q=m
-# CONFIG_VLAN_8021Q_GVRP is not set
+CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q_MVRP=y
 # CONFIG_DECNET is not set
 CONFIG_LLC=m
diff --git a/core/linux/config.i686 b/core/linux/config.i686
index 0715271b..950853bd 100644
--- a/core/linux/config.i686
+++ b/core/linux/config.i686
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.2-arch1 Kernel Configuration
+# Linux/x86 4.19.4-arch1 Kernel Configuration
 #
 
 #
@@ -1560,6 +1560,7 @@ CONFIG_L2TP_V3=y
 CONFIG_L2TP_IP=m
 CONFIG_L2TP_ETH=m
 CONFIG_STP=m
+CONFIG_GARP=m
 CONFIG_MRP=m
 CONFIG_BRIDGE=m
 CONFIG_BRIDGE_IGMP_SNOOPING=y
@@ -1576,7 +1577,7 @@ CONFIG_NET_DSA_TAG_LAN9303=y
 CONFIG_NET_DSA_TAG_MTK=y
 CONFIG_NET_DSA_TAG_QCA=y
 CONFIG_VLAN_8021Q=m
-# CONFIG_VLAN_8021Q_GVRP is not set
+CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q_MVRP=y
 # CONFIG_DECNET is not set
 CONFIG_LLC=m
diff --git a/extra/devtools/PKGBUILD b/extra/devtools/PKGBUILD
index 72c50e60..b7ba566a 100644
--- a/extra/devtools/PKGBUILD
+++ b/extra/devtools/PKGBUILD
@@ -1,6 +1,6 @@
 # we override almost everything
 
-pkgver=20181005
+pkgver=20181205
 pkgrel=1
 pkgdesc='Tools for Arch Linux 32 package maintainers and build slave operators'
 license=('GPL')
@@ -9,7 +9,7 @@ source=(
   "https://sources.archlinux32.org/sources/${pkgname}32-v${pkgver}.tar.gz"{,.sig}
 )
 if [ "${md5sums[0]}" = 'ed3c757184e633faeea09747a7b91bb1' ]; then
-  sha512sums=('1521c467ffdd8c40c72346e87969a04e02906685ece6b60056da13348b760c07fa1f74b94937a06a7731e8b173b7ad5c0ef921627e6db2c1e521465b021de251'
+  sha512sums=('144ad44f36d39cfb8c32e95716c41559b88ad58150517b6c777850432d78dcda2c84c4c47505353aaefbccb818831e460259aaa85424f2dfd70b4c47ba4ec360'
               'SKIP')
   validpgpkeys=('DE9F7688CACF04FEB81A6C590AEEC90755DA7B5A')
   unset md5sums
diff --git a/extra/firefox/PKGBUILD b/extra/firefox/PKGBUILD
index c897dbef..81c26086 100644
--- a/extra/firefox/PKGBUILD
+++ b/extra/firefox/PKGBUILD
@@ -6,10 +6,7 @@ eval "$(
   declare -f prepare | \
     sed '
       $ i export MOZ_SOURCE_CHANGESET="DEVEDITION_${pkgver//./_}_RELEASE"
-    '
-  declare -f prepare | \
-    sed '
-      /}/ i LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
+      $ i LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
     '
 )"
 for ((i=0; i<${#source[@]}; i++)); do
diff --git a/extra/linux-pae/PKGBUILD b/extra/linux-pae/PKGBUILD
index f5cec029..a0f1cfa8 100644
--- a/extra/linux-pae/PKGBUILD
+++ b/extra/linux-pae/PKGBUILD
@@ -4,7 +4,7 @@
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 
 pkgbase=linux-pae           # Build stock -ARCH kernel
-pkgver='4.19.3'
+pkgver='4.19.6'
 _srcname=linux-${pkgver}
 pkgrel='1'
 arch=('i686')
@@ -24,9 +24,9 @@ validpgpkeys=(
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
   '647F28654894E3BD457199BE38DBBDC86092693E'  # Greg Kroah-Hartman
 )
-sha256sums=('1e3c5712d4d0fdf307cf6b69d220f8e54def487e41efb0fbabe652a7a9986420'
+sha256sums=('644e61beb66211c0c5c13f91d96de1725055e6eea4cda7bb37ce9929ba8f09c3'
             'SKIP'
-            '810322ec067dc4f3d2c833ce632f3e7098ee121e3ba2a7ba294bc0a91df7be7a'
+            'd5581f427d5e9846161f1224b0bf04c22c3c5dac6c8b6bff99f1230cab68d3c5'
             'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
             '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
             'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
diff --git a/extra/linux-pae/config b/extra/linux-pae/config
index 4d722be8..b086737f 100644
--- a/extra/linux-pae/config
+++ b/extra/linux-pae/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.3-1 Kernel Configuration
+# Linux/x86 4.19.6-1 Kernel Configuration
 #
 
 #
diff --git a/extra/linux-zen/PKGBUILD b/extra/linux-zen/PKGBUILD
index 02919902..c725625d 100644
--- a/extra/linux-zen/PKGBUILD
+++ b/extra/linux-zen/PKGBUILD
@@ -1,9 +1,9 @@
-# upstream git revision: 45f74c7ee0c0d228f516a775817769db3192f978
+# upstream git revision: 2e669a90e89f01c68b7b0faf7f6084aabca61c3f
 
 # fail if upstream's .config changes
 for ((i=0; i<${#sha256sums[@]}; i++)); do
-  if [ "${sha256sums[${i}]}" = '6b281ab7860bf994a286c257b76c7afc3adc2eafa5fa282ff4219ca28fedf8e8' ]; then
-    sha256sums[${i}]='5b71e434cda59aa7d2f21e92c9c6d8fd8ffae99c847a66e397638802eef3339f'
+  if [ "${sha256sums[${i}]}" = '4e4da53c86f21f5949519c57884d322a486107ea1559a5ff9f2318c08cafcdf1' ]; then
+    sha256sums[${i}]='42961d0de8c847b7958f8b8ea49278c22edb4887d24d1f90e88008ac65102fcb'
   fi
 done
 
diff --git a/extra/linux-zen/config b/extra/linux-zen/config
index ade44cab..3f21f6e7 100644
--- a/extra/linux-zen/config
+++ b/extra/linux-zen/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.2-zen1 Kernel Configuration
+# Linux/x86 4.19.4-zen1 Kernel Configuration
 #
 
 #
@@ -17,6 +17,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 # General setup
 #
 CONFIG_ZEN_INTERACTIVE=y
+# CONFIG_SCHED_MUQSS is not set
 CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_COMPILE_TEST is not set
 CONFIG_LOCALVERSION="-zen"
@@ -375,6 +376,8 @@ CONFIG_NR_CPUS=8
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
 CONFIG_SCHED_MC_PRIO=y
+CONFIG_RQ_NONE=y
+CONFIG_SHARERQ=0
 CONFIG_X86_LOCAL_APIC=y
 CONFIG_X86_IO_APIC=y
 CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
@@ -1585,6 +1588,7 @@ CONFIG_L2TP_V3=y
 CONFIG_L2TP_IP=m
 CONFIG_L2TP_ETH=m
 CONFIG_STP=m
+CONFIG_GARP=m
 CONFIG_MRP=m
 CONFIG_BRIDGE=m
 CONFIG_BRIDGE_IGMP_SNOOPING=y
@@ -1601,7 +1605,7 @@ CONFIG_NET_DSA_TAG_LAN9303=y
 CONFIG_NET_DSA_TAG_MTK=y
 CONFIG_NET_DSA_TAG_QCA=y
 CONFIG_VLAN_8021Q=m
-# CONFIG_VLAN_8021Q_GVRP is not set
+CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q_MVRP=y
 # CONFIG_DECNET is not set
 CONFIG_LLC=m
diff --git a/extra/llvm/PKGBUILD b/extra/llvm/PKGBUILD
new file mode 100644
index 00000000..4aaafe29
--- /dev/null
+++ b/extra/llvm/PKGBUILD
@@ -0,0 +1,19 @@
+# temporary, ocaml is broken on 32-bit, we work around the llvm issue
+# in binutils LTO plugins for now:
+makedepends=(${makedepends[@]/ocaml=$_ocaml_ver/})
+makedepends=(${makedepends[@]/ocaml-ctypes/})
+makedepends=(${makedepends[@]/ocaml-findlib/})
+
+eval "$(
+  declare -f build | \
+    sed '
+      s/ninja all ocaml_doc/ninja all/
+    '
+)"
+
+eval "$(
+  declare -f package_llvm | \
+    sed '
+      /ocaml/d
+    '
+)"
diff --git a/extra/swt/PKGBUILD b/extra/swt/PKGBUILD
index af68d686..2422d820 100644
--- a/extra/swt/PKGBUILD
+++ b/extra/swt/PKGBUILD
@@ -1 +1,3 @@
 source=(${source[@]/x86_64/x86})
+sha256sums[0]='7bf74a16b060c3ad7a2d60368c7376ffaee3ed6b235803dfe7d15a1df2f9aae4'
+
diff --git a/extra/thunderbird/PKGBUILD b/extra/thunderbird/PKGBUILD
index a0a94a98..33e3f300 100644
--- a/extra/thunderbird/PKGBUILD
+++ b/extra/thunderbird/PKGBUILD
@@ -3,4 +3,9 @@ eval "$(
     sed '
       /cd mozilla-unified/a sed -i "s/\\(cargo_rustc_flags += -C lto\\)/#\\1/" config/rules.mk
     '
+  declare -f prepare | \
+    sed '
+      $ i LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
+      s/ac_add_options --enable-linker=gold/ac_add_options --enable-linker=bfd/
+    '
 )"