Merge branch 'master' into i486

9 files changed, 42 insertions, 15 deletions

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/
+    '
 )"