Merge branch 'master' into i486

15 files changed, 31 insertions, 56 deletions

diff --git a/community/dietlibc/PKGBUILD b/community/dietlibc/PKGBUILD
deleted file mode 100644
index 93715837..00000000
--- a/community/dietlibc/PKGBUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-source+=('dietlib-i386-socketcall-also-with-pic.patch')
-sha256sums+=('2fabb9922b8a9d2ceafb8127e2dd8271b01e18ce61d61804cc1be8edd0f0d5e9')
-prepare() {
-  cd "$srcdir"/$pkgname-$pkgver
-  patch -p1 -i "${srcdir}"/dietlib-i386-socketcall-also-with-pic.patch
-}
diff --git a/community/dietlibc/dietlib-i386-socketcall-also-with-pic.patch b/community/dietlibc/dietlib-i386-socketcall-also-with-pic.patch
deleted file mode 100644
index 5714fab9..00000000
--- a/community/dietlibc/dietlib-i386-socketcall-also-with-pic.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/i386/syscalls.h b/i386/syscalls.h
-index c4c98629..94f9be53 100644
---- a/i386/syscalls.h
-+++ b/i386/syscalls.h
-@@ -368,7 +368,6 @@ sym: \
- .Lend##sym: ; \
- .size sym,.Lend##sym-sym
- 
--#ifndef __PIC__
- #define __socketcall(name,NAME) \
- .text; \
- .type name,@function; \
-@@ -381,6 +380,3 @@ __libc_##name: ; \
- 	jmp socketcall; \
- .Lend##name:; \
- .size name,.Lend##name-name
--#else
--#define __socketcall(name,NAME)
--#endif
diff --git a/community/glfw/PKGBUILD b/community/glfw/PKGBUILD
index bb9bc52c..c1005d82 100644
--- a/community/glfw/PKGBUILD
+++ b/community/glfw/PKGBUILD
@@ -1,11 +1,11 @@
 eval "$(
   declare -f package_glfw-x11 | \
     sed '
-      2 a arch=(i486 i686 pentium3 x86_64)
+      2 a arch=('"${arch[@]}"')
     '
   declare -f package_glfw-wayland | \
     sed '
-      2 a arch=(i486 i686 pentium3 x86_64)
+      2 a arch=('"${arch[@]}"')
     '
   declare -f package_glfw-doc | \
     sed '
diff --git a/community/rxvt-unicode/PKGBUILD b/community/rxvt-unicode/PKGBUILD
index 96c983d4..751b25c1 100644
--- a/community/rxvt-unicode/PKGBUILD
+++ b/community/rxvt-unicode/PKGBUILD
@@ -1,7 +1,7 @@
 eval "$(
   declare -f package_rxvt-unicode | \
     sed '
-      2 a arch=(i486 i686 pentium3 x86_64)
+      2 a arch=('"${arch[@]}"')
     '
   declare -f package_rxvt-unicode-terminfo | \
     sed '
diff --git a/community/squid/PKGBUILD b/community/squid/PKGBUILD
new file mode 100644
index 00000000..1a2bcc45
--- /dev/null
+++ b/community/squid/PKGBUILD
@@ -0,0 +1,13 @@
+# testing libatomic for __atomic_load_8 fails in configure.ac, following the idea in
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=830942
+# TODO: report upstream in squid project
+
+# i486-specific
+if [ "${CARCH}" = "i486" ]; then
+  eval "$(
+    declare -f build | \
+      sed '
+        s|make|make LDFLAGS="-Wl,--as-needed -latomic -Wl,--no-as-needed"|g
+      ';
+  )"
+fi
diff --git a/community/v2ray/PKGBUILD b/community/v2ray/PKGBUILD
index 1f0094e3..6d55fcd6 100644
--- a/community/v2ray/PKGBUILD
+++ b/community/v2ray/PKGBUILD
@@ -4,3 +4,6 @@ eval "$(
       s@/v2ray-custom-linux-64/@/v2ray-custom-linux-32/@
     '
 )"
+
+# tests hang or last forever
+unset check
diff --git a/extra/doxygen/PKGBUILD b/extra/doxygen/PKGBUILD
index 0095f04c..45a93ff5 100644
--- a/extra/doxygen/PKGBUILD
+++ b/extra/doxygen/PKGBUILD
@@ -1,7 +1,7 @@
 eval "$(
   declare -f package_doxygen | \
     sed '
-      2 a arch=(i486 i686 pentium3 x86_64)
+      2 a arch=('"${arch[@]}"')
     '
   declare -f package_doxygen-doc | \
     sed '
diff --git a/extra/gtkmm3/PKGBUILD b/extra/gtkmm3/PKGBUILD
index 1e89309a..de2bf047 100644
--- a/extra/gtkmm3/PKGBUILD
+++ b/extra/gtkmm3/PKGBUILD
@@ -1,7 +1,7 @@
 eval "$(
   declare -f package_gtkmm3 | \
     sed '
-      2 a arch=(i486 i686 pentium3 x86_64)
+      2 a arch=('"${arch[@]}"')
     '
   declare -f package_gtkmm3-docs | \
     sed '
diff --git a/extra/icedtea-web/PKGBUILD b/extra/icedtea-web/PKGBUILD
index d8c186ad..e83c6850 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=(i486 i686 pentium3 x86_64)
+      2 a arch=('"${arch[@]}"')
     '
   declare -f package_icedtea-web-doc | \
     sed '
diff --git a/extra/java-openjfx/PKGBUILD b/extra/java-openjfx/PKGBUILD
index c8a26318..1a215076 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=(i486 i686 pentium3 x86_64)
+      2 a arch=('"${arch[@]}"')
     '
   declare -f package_java-openjfx-src | \
     sed '
-      2 a arch=(i486 i686 pentium3 x86_64)
+      2 a arch=('"${arch[@]}"')
     '
   declare -f package_java-openjfx-doc | \
     sed '
diff --git a/extra/libgit2/PKGBUILD b/extra/libgit2/PKGBUILD
deleted file mode 100644
index e0b17681..00000000
--- a/extra/libgit2/PKGBUILD
+++ /dev/null
@@ -1,9 +0,0 @@
-# See: https://github.com/libgit2/libgit2/pull/4631
-
-source+=('libgit2-ssp-offset64-stat-buf.patch')
-sha256sums+=('4eceeb944c7ea2dd2f879a279d5eb0f80ae32675410a6601bcc07ccd0189e8cf')
-
-prepare() {
-  cd $pkgname-$pkgver
-  patch -Np1 -i "$srcdir/libgit2-ssp-offset64-stat-buf.patch"
-}
diff --git a/extra/libgit2/libgit2-ssp-offset64-stat-buf.patch b/extra/libgit2/libgit2-ssp-offset64-stat-buf.patch
deleted file mode 100644
index a6ee91d9..00000000
--- a/extra/libgit2/libgit2-ssp-offset64-stat-buf.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 775f33f2d..e73e7237c 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -9,6 +9,7 @@ SET(CLAR_FIXTURES "${CMAKE_CURRENT_SOURCE_DIR}/resources/")
- SET(CLAR_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
- ADD_DEFINITIONS(-DCLAR_FIXTURE_PATH=\"${CLAR_FIXTURES}\")
- ADD_DEFINITIONS(-DCLAR_TMPDIR=\"libgit2_tests\")
-+ADD_DEFINITIONS(-D_FILE_OFFSET_BITS=64)
- 
- INCLUDE_DIRECTORIES(${CLAR_PATH} ${libgit2_BINARY_DIR}/src)
- FILE(GLOB_RECURSE SRC_TEST ${CLAR_PATH}/*/*.c ${CLAR_PATH}/*/*.h)
diff --git a/extra/libpst/PKGBUILD b/extra/libpst/PKGBUILD
index 8ebd9181..5b0e2fb4 100644
--- a/extra/libpst/PKGBUILD
+++ b/extra/libpst/PKGBUILD
@@ -1,7 +1,7 @@
 eval "$(
   declare -f package_libpst | \
     sed '
-      2 a arch=(i486 i686 pentium3 x86_64)
+      2 a arch=('"${arch[@]}"')
     '
   declare -f package_libpst-docs | \
     sed '
diff --git a/extra/python2/PKGBUILD b/extra/python2/PKGBUILD
index 5b876d5a..c012a42d 100644
--- a/extra/python2/PKGBUILD
+++ b/extra/python2/PKGBUILD
@@ -14,7 +14,7 @@ eval "$(
     '
   declare -f check | \
     sed '
-      /xvfb-run/ s/-x test_idle/-x test_idle test_bytes test_str test_string test_unicode test_userstring test_tuple/
+      /xvfb-run/ s/-x test_idle/-x test_idle test_bytes test_str test_string test_unicode test_userstring test_tuple test_ssl/
       s/ -m test.regrtest/ -m test.regrtest -j1/
     '
 )"
diff --git a/extra/xfce4-diskperf-plugin/PKGBUILD b/extra/xfce4-diskperf-plugin/PKGBUILD
new file mode 100644
index 00000000..f42f1cb5
--- /dev/null
+++ b/extra/xfce4-diskperf-plugin/PKGBUILD
@@ -0,0 +1,5 @@
+# see https://bugs.archlinux.org/task/60632
+prepare() {
+  cd $pkgname-$pkgver
+  sed -i '/#include <sys\/types.h>/ a #include <sys\/sysmacros.h>/' panel-plugin/devperf.c 
+}