Merge branch 'master' into i486

25 files changed, 120 insertions, 67 deletions

diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD
index 2128d8f8..2ca8c08f 100644
--- a/extra/cmake/PKGBUILD
+++ b/extra/cmake/PKGBUILD
@@ -1,7 +1,10 @@
+# no Qt5 GUI on i486
+makedepends=(${makedepends[@]//qt5-base/})
+makedepends_i686+=(qt5-base)
+
 # 486-specific
 if [ "${CARCH}" = "i486" ]; then
   # no Qt5 GUI
-  makedepends=(${makedepends[@]//qt5-base/})
   eval "$(
     declare -f build | \
       sed '
diff --git a/extra/doxygen/PKGBUILD b/extra/doxygen/PKGBUILD
index 45a93ff5..72ebfd3a 100644
--- a/extra/doxygen/PKGBUILD
+++ b/extra/doxygen/PKGBUILD
@@ -1,7 +1,7 @@
 eval "$(
   declare -f package_doxygen | \
     sed '
-      2 a arch=('"${arch[@]}"')
+      2 a arch=('"${arch[*]}"')
     '
   declare -f package_doxygen-doc | \
     sed '
@@ -9,20 +9,24 @@ eval "$(
     '
 )"
 
-if [ "${CARCH}" = "i486" ]; then
-  # no qt5
-  makedepends=(${makedepends[@]//qt5-base/})
+# no qt5 on i486
+makedepends=(${makedepends[@]//qt5-base/})
+makedepends_i686+=(qt5-base)
 
-  # no TeX
-  makedepends=(${makedepends[@]//texlive-core/})
-  makedepends=(${makedepends[@]//texlive-latexextra/})
+# no TeX on i486
+makedepends=(${makedepends[@]//texlive-core/})
+makedepends=(${makedepends[@]//texlive-latexextra/})
+makedepends_i686+=(texlive-core texlive-latexextra)
 
-  # no Graphviz
-  makedepends=(${makedepends[@]//graphviz/})
+# no Graphviz on i486
+makedepends=(${makedepends[@]//graphviz/})
+makedepends_i686+=(graphviz)
 
-  # no ghostscript
-  makedepends=(${makedepends[@]//ghostscript/})
+# no ghostscript on i486
+makedepends=(${makedepends[@]//ghostscript/})
+makedepends_i686+=(ghostscript)
 
+if [ "${CARCH}" = "i486" ]; then
   eval "$(
     declare -f build | \
       sed '
diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD
index 36b2d040..b66cc8dc 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -1,7 +1,10 @@
+# no Gnome on i486
+makedepends=(${makedepends[@]//libgnome-keyring/})
+makedepends_i686+=(libgnome-keyring)
+
 # 486-specific
 if [ "${CARCH}" = "i486" ]; then
   # no Gnome
-  makedepends=(${makedepends[@]//libgnome-keyring/})
   eval "$(
     declare -f build | \
       sed '
diff --git a/extra/gtkmm3/PKGBUILD b/extra/gtkmm3/PKGBUILD
index de2bf047..8adb7dec 100644
--- a/extra/gtkmm3/PKGBUILD
+++ b/extra/gtkmm3/PKGBUILD
@@ -1,7 +1,7 @@
 eval "$(
   declare -f package_gtkmm3 | \
     sed '
-      2 a arch=('"${arch[@]}"')
+      2 a arch=('"${arch[*]}"')
     '
   declare -f package_gtkmm3-docs | \
     sed '
diff --git a/extra/hwloc/PKGBUILD b/extra/hwloc/PKGBUILD
index f271a407..f2d05b95 100644
--- a/extra/hwloc/PKGBUILD
+++ b/extra/hwloc/PKGBUILD
@@ -1,5 +1,3 @@
-# i486-specific
-if [ "${CARCH}" = "i486" ]; then
-  # no cairo
-  makedepends=(${makedepends[@]//cairo/})
-fi
+# no cairo on i486
+makedepends=(${makedepends[@]//cairo/})
+makedepends_i686+=(cairo)
diff --git a/extra/icedtea-web/PKGBUILD b/extra/icedtea-web/PKGBUILD
index e83c6850..245b3d72 100644
--- a/extra/icedtea-web/PKGBUILD
+++ b/extra/icedtea-web/PKGBUILD
@@ -1,7 +1,7 @@
 eval "$(
   declare -f package_icedtea-web | \
     sed '
-      2 a arch=('"${arch[@]}"')
+      2 a arch=('"${arch[*]}"')
     '
   declare -f package_icedtea-web-doc | \
     sed '
diff --git a/extra/java-openjfx/PKGBUILD b/extra/java-openjfx/PKGBUILD
index 1a215076..fda954ed 100644
--- a/extra/java-openjfx/PKGBUILD
+++ b/extra/java-openjfx/PKGBUILD
@@ -1,11 +1,11 @@
 eval "$(
   declare -f package_java-openjfx | \
     sed '
-      2 a arch=('"${arch[@]}"')
+      2 a arch=('"${arch[*]}"')
     '
   declare -f package_java-openjfx-src | \
     sed '
-      2 a arch=('"${arch[@]}"')
+      2 a arch=('"${arch[*]}"')
     '
   declare -f package_java-openjfx-doc | \
     sed '
diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD
index b36e427d..2112d4ad 100644
--- a/extra/java7-openjdk/PKGBUILD
+++ b/extra/java7-openjdk/PKGBUILD
@@ -1,7 +1,8 @@
+# gtk2 is an optdepend
+makedepends=(${makedepends[@]//gtk2/})
+makedepends_i686+=(gtk2)
+
 # i486-specific
 if [ "${CARCH}" = "i486" ]; then
   _JARCH=i386
-
-  # gtk2 is an optdepend
-  makedepends=(${makedepends[@]//gtk2/})
 fi
diff --git a/extra/jsoncpp/PKGBUILD b/extra/jsoncpp/PKGBUILD
index 7e334031..64e3d308 100644
--- a/extra/jsoncpp/PKGBUILD
+++ b/extra/jsoncpp/PKGBUILD
@@ -1,7 +1,10 @@
+# no graphviz on i486
+makedepends=(${makedepends[@]//graphviz/})
+makedepends_i686+=(graphviz)
+
 # 486-specific
 if [ "${CARCH}" = "i486" ]; then
   # no graphviz
-  makedepends=(${makedepends[@]//graphviz/})
   eval "$(
     declare -f build | \
       sed '
diff --git a/extra/libgit2/PKGBUILD b/extra/libgit2/PKGBUILD
new file mode 100644
index 00000000..87d81bff
--- /dev/null
+++ b/extra/libgit2/PKGBUILD
@@ -0,0 +1,10 @@
+# see also Gentoo, disable the TOOBIG test
+# https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99914da67e748f4eceec5a02e9ce603917d50004
+
+source+=('libgit2-0.27.7-disable-oom-tests-on-32bit.patch')
+sha256sums+=('2feabf58c149fb0c55f00d389f66c71a56ab90c7ae2fc492f8a06ec64765cbef')
+
+prepare() {
+  cd "$pkgname-$pkgver"
+  patch -Np1 -i ../libgit2-0.27.7-disable-oom-tests-on-32bit.patch
+}
diff --git a/extra/libgit2/libgit2-0.27.7-disable-oom-tests-on-32bit.patch b/extra/libgit2/libgit2-0.27.7-disable-oom-tests-on-32bit.patch
new file mode 100644
index 00000000..918e22ec
--- /dev/null
+++ b/extra/libgit2/libgit2-0.27.7-disable-oom-tests-on-32bit.patch
@@ -0,0 +1,21 @@
+diff -rauN libgit2-0.27.7/tests/buf/oom.c libgit2-0.27.7-disable-oom-tests-on-32bit-patch/tests/buf/oom.c
+--- libgit2-0.27.7/tests/buf/oom.c	2018-10-26 15:27:21.000000000 +0200
++++ libgit2-0.27.7-disable-oom-tests-on-32bit-patch/tests/buf/oom.c	2018-11-09 15:17:30.475788525 +0100
+@@ -32,6 +32,7 @@
+  */
+ void test_buf_oom__grow(void)
+ {
++#if defined(GIT_ARCH_64)
+ 	git_buf buf = GIT_BUF_INIT;
+ 
+ 	git_buf_clear(&buf);
+@@ -40,6 +41,9 @@
+ 	cl_assert(git_buf_oom(&buf));
+ 
+ 	git_buf_free(&buf);
++#else
++	cl_skip();
++#endif
+ }
+ 
+ void test_buf_oom__grow_by(void)
diff --git a/extra/libjpeg-turbo/PKGBUILD b/extra/libjpeg-turbo/PKGBUILD
index e33bc686..15f620d3 100644
--- a/extra/libjpeg-turbo/PKGBUILD
+++ b/extra/libjpeg-turbo/PKGBUILD
@@ -1,6 +1,9 @@
+# no Java on i486
+makedepends=(${makedepends[@]//jdk8-openjdk/})
+makedepends_i686+=(jdk8-openjdk)
+
 if [ "${CARCH}" = "i486" ]; then
   # no Java
-  makedepends=(${makedepends[@]//jdk8-openjdk/})
   eval "$(
     declare -f build | \
       sed '
diff --git a/extra/libpst/PKGBUILD b/extra/libpst/PKGBUILD
index 5b0e2fb4..c6e15492 100644
--- a/extra/libpst/PKGBUILD
+++ b/extra/libpst/PKGBUILD
@@ -1,7 +1,7 @@
 eval "$(
   declare -f package_libpst | \
     sed '
-      2 a arch=('"${arch[@]}"')
+      2 a arch=('"${arch[*]}"')
     '
   declare -f package_libpst-docs | \
     sed '
diff --git a/extra/libreoffice-fresh/PKGBUILD b/extra/libreoffice-fresh/PKGBUILD
index 2e2bb091..c7844f52 100644
--- a/extra/libreoffice-fresh/PKGBUILD
+++ b/extra/libreoffice-fresh/PKGBUILD
@@ -1,7 +1,5 @@
 # see https://bugs.archlinux.org/task/55764
 
-makedepends=("${makedepends[@]/java-environment/java-environment=7}")
-
 eval "$(
   declare -f build | \
     sed '
diff --git a/extra/libunwind/PKGBUILD b/extra/libunwind/PKGBUILD
index 8bf87ab2..a8d82b23 100644
--- a/extra/libunwind/PKGBUILD
+++ b/extra/libunwind/PKGBUILD
@@ -1,5 +1,3 @@
-# i486-specific
-if [ "${CARCH}" = "i486" ]; then
-  # no TeX for documentation
-  makedepends=(${makedepends[@]//texlive-core/})
-fi
+# no TeX for documentation on i486
+makedepends=(${makedepends[@]//texlive-core/})
+makedepends_i686+=(texlive-core)
diff --git a/extra/libxkbcommon/PKGBUILD b/extra/libxkbcommon/PKGBUILD
index 802fc9c2..d5c1d607 100644
--- a/extra/libxkbcommon/PKGBUILD
+++ b/extra/libxkbcommon/PKGBUILD
@@ -1,8 +1,11 @@
+# no documentation on i486
+makedepends=(${makedepends[@]//graphviz/})
+makedepends=(${makedepends[@]//doxygen/})
+makedepends_i686+=(graphviz doxygen)
+
 # i486-specific
 if [ "${CARCH}" = "i486" ]; then
   # no documentation
-  makedepends=(${makedepends[@]//graphviz/})
-  makedepends=(${makedepends[@]//doxygen/})
 
   eval "$(
     declare -f build | \
diff --git a/extra/linux-pae/PKGBUILD b/extra/linux-pae/PKGBUILD
index 15560cc3..49a3cf2d 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'
+pkgver='4.19.1'
 _srcname=linux-${pkgver}
 pkgrel='1'
 arch=('i686')
@@ -24,9 +24,9 @@ validpgpkeys=(
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
   '647F28654894E3BD457199BE38DBBDC86092693E'  # Greg Kroah-Hartman
 )
-sha256sums=('0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1'
+sha256sums=('64d637c65c0b210659ff1719bcc9e34c5576fc3a4df9aa67087fa00bc2e08829'
             'SKIP'
-            '86e74945180e3c4c3322c684d5e3d7f37b56cdf43d561f302732e13fc0695e96'
+            '757489db94f7d1417cfc92c56fc9de738567881c199b401e0f55ba2b846357f8'
             'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
             '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
             'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
diff --git a/extra/linux-pae/config b/extra/linux-pae/config
index 210479aa..b42c6d4a 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.0-1 Kernel Configuration
+# Linux/x86 4.19.1-1 Kernel Configuration
 #
 
 #
diff --git a/extra/nasm/PKGBUILD b/extra/nasm/PKGBUILD
index 36e81008..6e1fab99 100644
--- a/extra/nasm/PKGBUILD
+++ b/extra/nasm/PKGBUILD
@@ -6,11 +6,13 @@ prepare() {
   patch -Np1 -i "$srcdir/0001-Remove-invalid-pure_func-qualifiers.patch"
 }
 
+# remove ttf-liberation on i486 (X packages missing for installing the font)
+makedepends=(${makedepends[@]//ttf-liberation/})
+makedepends_i686+=(ttf-liberation)
+
 # i486-specific
 if [ "${CARCH}" = "i486" ]; then
   # remove ttf-liberation (X packages missing for installing the font)
-  makedepends=(${makedepends[@]//ttf-liberation/})
-
   eval "$(
     declare -f build | \
       sed "
diff --git a/extra/python/PKGBUILD b/extra/python/PKGBUILD
index 5521b6d6..43352eb3 100644
--- a/extra/python/PKGBUILD
+++ b/extra/python/PKGBUILD
@@ -16,7 +16,7 @@ eval "$(
 )"
 
 makedepends=(${makedepends[@]//xorg-server-xvfb/})
-makedepends_i686=(xorg-server-xvfb)
+makedepends_i686+=(xorg-server-xvfb)
 
 # skip xvfb stuff on i486
 if [ "$CARCH" = 'i486' ]; then
diff --git a/extra/python2/PKGBUILD b/extra/python2/PKGBUILD
index c012a42d..2da91370 100644
--- a/extra/python2/PKGBUILD
+++ b/extra/python2/PKGBUILD
@@ -20,7 +20,7 @@ eval "$(
 )"
 
 makedepends=(${makedepends[@]//xorg-server-xvfb/})
-makedepends_i686=(xorg-server-xvfb)
+makedepends_i686+=(xorg-server-xvfb)
 
 # skip xvfb stuff on i486
 if [ "$CARCH" = 'i486' ]; then
diff --git a/extra/qt5-base/PKGBUILD b/extra/qt5-base/PKGBUILD
index 5459bf68..4c9c9195 100644
--- a/extra/qt5-base/PKGBUILD
+++ b/extra/qt5-base/PKGBUILD
@@ -6,7 +6,7 @@ eval "$(
 )"
 
 makedepends=(${makedepends[@]/vulkan-headers/})
-makedepends_i686=(vulkan-headers)
+makedepends_i686+=(vulkan-headers)
 if [ "$CARCH" = 'i486' ]; then
   eval "$(
     declare -f build | \
diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD
index 941792d7..56a0d262 100644
--- a/extra/subversion/PKGBUILD
+++ b/extra/subversion/PKGBUILD
@@ -1,17 +1,25 @@
+# no Java bindings on i486
+makedepends=(${makedepends[@]//java-environment<10/})
+makedepends_i686+=('java-environment<10')
+
+# no Ruby bindings on i486
+makedepends=(${makedepends[@]//ruby/})
+checkdepends=(${checkdepends[@]//ruby-test-unit/})
+makedepends_i686+=(ruby)
+checkdepends_i686+=(ruby-test-unit)
+
+# no KDE gui on i486
+makedepends=(${makedepends[@]//kdelibs4support/})
+makedepends=(${makedepends[@]//kwallet/})
+makedepends_i686+=(kdelibs4support kwallet)
+
+# no Gnome gui on i486
+makedepends=(${makedepends[@]//libgnome-keyring/})
+makedepends_i686+=(libgnome-keyring)
+
 # i486-specific
 if [ "${CARCH}" = "i486" ]; then
-  # no Apache server integration
-  makedepends=(${makedepends[@]//apache/})
-  eval "$(
-    declare -f build | \
-      sed '
-        s@--with-apxs@@
-        s@--with-apache-libexecdir=/usr/lib/httpd/modules@@
-      '
-  )"
-
   # no Java bindings
-  makedepends=(${makedepends[@]//java-environment<10/})
   eval "$(
     declare -f build | \
       sed '
@@ -28,8 +36,6 @@ if [ "${CARCH}" = "i486" ]; then
   )"
 
   # no Ruby bindings
-  makedepends=(${makedepends[@]//ruby/})
-  checkdepends=(${checkdepends[@]//ruby-test-unit/})
   eval "$(
     declare -f build | \
       sed '
@@ -51,8 +57,6 @@ if [ "${CARCH}" = "i486" ]; then
   )"
 
   # no KDE gui
-  makedepends=(${makedepends[@]//kdelibs4support/})
-  makedepends=(${makedepends[@]//kwallet/})
   eval "$(
     declare -f build | \
       sed '
@@ -61,7 +65,6 @@ if [ "${CARCH}" = "i486" ]; then
   )"
 
   # no Gnome gui
-  makedepends=(${makedepends[@]//libgnome-keyring/})
   eval "$(
     declare -f build | \
       sed '
diff --git a/extra/wayland/PKGBUILD b/extra/wayland/PKGBUILD
index e4e996bc..e2df8a75 100644
--- a/extra/wayland/PKGBUILD
+++ b/extra/wayland/PKGBUILD
@@ -1,10 +1,13 @@
+# no documentation on i486
+makedepends=(${makedepends[@]//graphviz/})
+makedepends=(${makedepends[@]//doxygen/})
+makedepends=(${makedepends[@]//xmlto/})
+makedepends=(${makedepends[@]//docbook-xsl/})
+makedepends_i686+=(graphviz doxygen xmlto docbook-xsl)
+
 # i486-specific
 if [ "${CARCH}" = "i486" ]; then
   # no documentation
-  makedepends=(${makedepends[@]//graphviz/})
-  makedepends=(${makedepends[@]//doxygen/})
-  makedepends=(${makedepends[@]//xmlto/})
-  makedepends=(${makedepends[@]//docbook-xsl/})
 
   eval "$(
     declare -f build | \
diff --git a/extra/x265/PKGBUILD b/extra/x265/PKGBUILD
index 5e6e000e..29ddf3ba 100644
--- a/extra/x265/PKGBUILD
+++ b/extra/x265/PKGBUILD
@@ -8,7 +8,7 @@ eval "$(
 )"
 # thanks, debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=910963
 source+=('0003-detect512-is-needed-on-all-architectures.patch')
-sha256sums+=('+6baa25d11c81ad4ee49e9f2a367db4c770eb8cccf81f7bdaadb942621288a271')
+sha256sums+=('6baa25d11c81ad4ee49e9f2a367db4c770eb8cccf81f7bdaadb942621288a271')
 eval "$(
   declare -f prepare | \
     sed '