From 34fa0ca655d4ff090e30bd3373bf1eeab2f8596a Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Tue, 23 Oct 2018 12:00:09 +0200
Subject: community/dietlibc: remove obsolete patch

---
 community/dietlibc/PKGBUILD                           |  6 ------
 .../dietlib-i386-socketcall-also-with-pic.patch       | 19 -------------------
 2 files changed, 25 deletions(-)
 delete mode 100644 community/dietlibc/PKGBUILD
 delete mode 100644 community/dietlibc/dietlib-i386-socketcall-also-with-pic.patch

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
-- 
cgit v1.2.3-70-g09d2


From 8e27618ecf5bd879cd179f7a07b53a097f3f348b Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Tue, 23 Oct 2018 12:59:06 +0200
Subject: remove hard coded architectures from architecture hacking (e.g. use
 "${arch[@]}" instead of "i486 i686 pentium3 x86_64")

---
 community/glfw/PKGBUILD         | 4 ++--
 community/rxvt-unicode/PKGBUILD | 2 +-
 extra/doxygen/PKGBUILD          | 2 +-
 extra/gtkmm3/PKGBUILD           | 2 +-
 extra/icedtea-web/PKGBUILD      | 2 +-
 extra/java-openjfx/PKGBUILD     | 4 ++--
 extra/libpst/PKGBUILD           | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

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/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/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 '
-- 
cgit v1.2.3-70-g09d2


From 705ee6cd0d0d092abf83aa1b01104d3ccccd31f1 Mon Sep 17 00:00:00 2001
From: Andreas Baumann <mail@andreasbaumann.cc>
Date: Tue, 23 Oct 2018 20:22:00 +0200
Subject: community/v2ray: disabled testing, blocking

---
 community/v2ray/PKGBUILD | 3 +++
 1 file changed, 3 insertions(+)

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
-- 
cgit v1.2.3-70-g09d2


From 77a5faaa6ea7f89e6866424e4012884d8e0fb3fe Mon Sep 17 00:00:00 2001
From: Andreas Baumann <mail@andreasbaumann.cc>
Date: Thu, 25 Oct 2018 09:56:48 +0200
Subject: extra/libgit2: removed patch for _FILE_OFFSET_BITS=64 in test
 cmakefile

---
 extra/libgit2/PKGBUILD                            |  9 ---------
 extra/libgit2/libgit2-ssp-offset64-stat-buf.patch | 12 ------------
 2 files changed, 21 deletions(-)
 delete mode 100644 extra/libgit2/PKGBUILD
 delete mode 100644 extra/libgit2/libgit2-ssp-offset64-stat-buf.patch

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)
-- 
cgit v1.2.3-70-g09d2


From 3cf12639b379fd9ee33a5b62399504083824e41b Mon Sep 17 00:00:00 2001
From: Andreas Baumann <mail@andreasbaumann.cc>
Date: Fri, 26 Oct 2018 21:32:44 +0200
Subject: community/squashfs-tools: temporary fix for FS#60439 (sysmacros
 include)

---
 community/squashfs-tools/PKGBUILD                  | 10 +++++++++
 .../squashfs-tools-4.3-sysmacros.patch             | 24 ++++++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 community/squashfs-tools/PKGBUILD
 create mode 100644 community/squashfs-tools/squashfs-tools-4.3-sysmacros.patch

diff --git a/community/squashfs-tools/PKGBUILD b/community/squashfs-tools/PKGBUILD
new file mode 100644
index 00000000..df02d5af
--- /dev/null
+++ b/community/squashfs-tools/PKGBUILD
@@ -0,0 +1,10 @@
+# see FS#60439
+
+source+=(squashfs-tools-4.3-sysmacros.patch)
+sha512sums+=('ba228d0c8e86a6a07bab9992c2484d66b1b414eb7509e0705d1bf2721486e2e4f39ed0902e257ea592107bfa8b749ee95a8360919939913ad97130277171b9a0')
+
+prepare() {
+  cd "$srcdir"/squashfs${pkgver}
+  patch -p1 < ../squashfs-tools-4.3-sysmacros.patch
+}
+
diff --git a/community/squashfs-tools/squashfs-tools-4.3-sysmacros.patch b/community/squashfs-tools/squashfs-tools-4.3-sysmacros.patch
new file mode 100644
index 00000000..14246b4a
--- /dev/null
+++ b/community/squashfs-tools/squashfs-tools-4.3-sysmacros.patch
@@ -0,0 +1,24 @@
+diff -rauN squashfs4.3/squashfs-tools/mksquashfs.c squashfs4.3-sysmacros-patch/squashfs-tools/mksquashfs.c
+--- squashfs4.3/squashfs-tools/mksquashfs.c	2014-05-13 00:18:20.000000000 +0200
++++ squashfs4.3-sysmacros-patch/squashfs-tools/mksquashfs.c	2018-10-26 21:25:02.550480701 +0200
+@@ -59,6 +59,7 @@
+ #else
+ #include <endian.h>
+ #include <sys/sysinfo.h>
++#include <sys/sysmacros.h>
+ #endif
+ 
+ #include "squashfs_fs.h"
+diff -rauN squashfs4.3/squashfs-tools/unsquashfs.c squashfs4.3-sysmacros-patch/squashfs-tools/unsquashfs.c
+--- squashfs4.3/squashfs-tools/unsquashfs.c	2014-05-13 00:18:35.000000000 +0200
++++ squashfs4.3-sysmacros-patch/squashfs-tools/unsquashfs.c	2018-10-26 21:25:27.830242229 +0200
+@@ -37,6 +37,9 @@
+ #include <sys/resource.h>
+ #include <limits.h>
+ #include <ctype.h>
++#ifdef linux
++#include <sys/sysmacros.h>
++#endif
+ 
+ struct cache *fragment_cache, *data_cache;
+ struct queue *to_reader, *to_inflate, *to_writer, *from_writer;
-- 
cgit v1.2.3-70-g09d2


From 5d77a997cf30e0fcea36a2ea38cdf99405c4f210 Mon Sep 17 00:00:00 2001
From: Andreas Baumann <mail@andreasbaumann.cc>
Date: Sat, 27 Oct 2018 20:45:00 +0200
Subject: community/squid: correctly testing for -latomic on i486

---
 community/squid/PKGBUILD | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 community/squid/PKGBUILD

diff --git a/community/squid/PKGBUILD b/community/squid/PKGBUILD
new file mode 100644
index 00000000..53731943
--- /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
-- 
cgit v1.2.3-70-g09d2


From c727b6bde4f72da83e7691657434eee70557b60b Mon Sep 17 00:00:00 2001
From: Andreas Baumann <mail@andreasbaumann.cc>
Date: Sat, 27 Oct 2018 21:10:46 +0200
Subject: community/squid: fixed a double ==

---
 community/squid/PKGBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/community/squid/PKGBUILD b/community/squid/PKGBUILD
index 53731943..1a2bcc45 100644
--- a/community/squid/PKGBUILD
+++ b/community/squid/PKGBUILD
@@ -7,7 +7,7 @@ if [ "${CARCH}" = "i486" ]; then
   eval "$(
     declare -f build | \
       sed '
-        s|make|make LDFLAGS=="-Wl,--as-needed -latomic -Wl,--no-as-needed"|g
+        s|make|make LDFLAGS="-Wl,--as-needed -latomic -Wl,--no-as-needed"|g
       ';
   )"
 fi
-- 
cgit v1.2.3-70-g09d2


From 03f8786bc6ea253ed08726b5be3cfcd6a66cca30 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Mon, 29 Oct 2018 13:38:40 +0100
Subject: community/squashfs-tools: remove obsolete patch

---
 community/squashfs-tools/PKGBUILD                  | 10 ---------
 .../squashfs-tools-4.3-sysmacros.patch             | 24 ----------------------
 2 files changed, 34 deletions(-)
 delete mode 100644 community/squashfs-tools/PKGBUILD
 delete mode 100644 community/squashfs-tools/squashfs-tools-4.3-sysmacros.patch

diff --git a/community/squashfs-tools/PKGBUILD b/community/squashfs-tools/PKGBUILD
deleted file mode 100644
index df02d5af..00000000
--- a/community/squashfs-tools/PKGBUILD
+++ /dev/null
@@ -1,10 +0,0 @@
-# see FS#60439
-
-source+=(squashfs-tools-4.3-sysmacros.patch)
-sha512sums+=('ba228d0c8e86a6a07bab9992c2484d66b1b414eb7509e0705d1bf2721486e2e4f39ed0902e257ea592107bfa8b749ee95a8360919939913ad97130277171b9a0')
-
-prepare() {
-  cd "$srcdir"/squashfs${pkgver}
-  patch -p1 < ../squashfs-tools-4.3-sysmacros.patch
-}
-
diff --git a/community/squashfs-tools/squashfs-tools-4.3-sysmacros.patch b/community/squashfs-tools/squashfs-tools-4.3-sysmacros.patch
deleted file mode 100644
index 14246b4a..00000000
--- a/community/squashfs-tools/squashfs-tools-4.3-sysmacros.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -rauN squashfs4.3/squashfs-tools/mksquashfs.c squashfs4.3-sysmacros-patch/squashfs-tools/mksquashfs.c
---- squashfs4.3/squashfs-tools/mksquashfs.c	2014-05-13 00:18:20.000000000 +0200
-+++ squashfs4.3-sysmacros-patch/squashfs-tools/mksquashfs.c	2018-10-26 21:25:02.550480701 +0200
-@@ -59,6 +59,7 @@
- #else
- #include <endian.h>
- #include <sys/sysinfo.h>
-+#include <sys/sysmacros.h>
- #endif
- 
- #include "squashfs_fs.h"
-diff -rauN squashfs4.3/squashfs-tools/unsquashfs.c squashfs4.3-sysmacros-patch/squashfs-tools/unsquashfs.c
---- squashfs4.3/squashfs-tools/unsquashfs.c	2014-05-13 00:18:35.000000000 +0200
-+++ squashfs4.3-sysmacros-patch/squashfs-tools/unsquashfs.c	2018-10-26 21:25:27.830242229 +0200
-@@ -37,6 +37,9 @@
- #include <sys/resource.h>
- #include <limits.h>
- #include <ctype.h>
-+#ifdef linux
-+#include <sys/sysmacros.h>
-+#endif
- 
- struct cache *fragment_cache, *data_cache;
- struct queue *to_reader, *to_inflate, *to_writer, *from_writer;
-- 
cgit v1.2.3-70-g09d2


From d0a0b0a7564da67005570735027ab94b4283188e Mon Sep 17 00:00:00 2001
From: Andreas Baumann <mail@andreasbaumann.cc>
Date: Mon, 29 Oct 2018 18:14:19 +0100
Subject: extra/xfce4-diskperf-plugin: hotfix for FS#60632

---
 extra/xfce4-diskperf-plugin/PKGBUILD | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 extra/xfce4-diskperf-plugin/PKGBUILD

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 
+}
-- 
cgit v1.2.3-70-g09d2


From c980d934f2ffb085002debe9e4c863b5e5f48934 Mon Sep 17 00:00:00 2001
From: Andreas Baumann <mail@andreasbaumann.cc>
Date: Wed, 31 Oct 2018 19:25:42 +0100
Subject: extra/python2: disabled test "test_ssl"

---
 extra/python2/PKGBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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/
     '
 )"
-- 
cgit v1.2.3-70-g09d2