6 files changed, 35 insertions, 37 deletions
diff --git a/extra/go/PKGBUILD b/community/go/PKGBUILD
index 8b5039f9..8b5039f9 100644
--- a/extra/go/PKGBUILD
+++ b/community/go/PKGBUILD
diff --git a/extra/chromium/PKGBUILD b/extra/chromium/PKGBUILD
new file mode 100644
index 00000000..2fcfd257
--- /dev/null
+++ b/extra/chromium/PKGBUILD
@@ -0,0 +1,7 @@
+# work around linker errors, see https://bbs.archlinux32.org/viewtopic.php?pid=4894#p4894
+eval "$(
+declare -f build | \
+  sed '
+    /_flags/ a _flags+=('fatal_linker_warnings=false')
+  '
+)"
diff --git a/extra/imagemagick6/ImageMagick-6.9.10-11-bug17.patch b/extra/imagemagick6/ImageMagick-6.9.10-11-bug17.patch
new file mode 100644
index 00000000..57e22254
--- /dev/null
+++ b/extra/imagemagick6/ImageMagick-6.9.10-11-bug17.patch
@@ -0,0 +1,17 @@
+diff -rauN ImageMagick-6.9.10-11/Magick++/lib/Magick++/Color.h ImageMagick-6.9.10-11-bug17-patch/Magick++/lib/Magick++/Color.h
+--- ImageMagick-6.9.10-11/Magick++/lib/Magick++/Color.h	2018-08-28 14:31:12.000000000 +0200
++++ ImageMagick-6.9.10-11-bug17-patch/Magick++/lib/Magick++/Color.h	2018-09-01 15:14:05.133038562 +0200
+@@ -122,11 +122,12 @@
+     {
+       return (static_cast<double>(quantum_)/QuantumRange);
+     }
+-#endif
++#else
+     static double scaleQuantumToDouble(const double quantum_)
+     {
+       return (quantum_/QuantumRange);
+     }
++#endif
+ 
+   protected:
+ 
diff --git a/extra/imagemagick6/PKGBUILD b/extra/imagemagick6/PKGBUILD
new file mode 100644
index 00000000..c16dae59
--- /dev/null
+++ b/extra/imagemagick6/PKGBUILD
@@ -0,0 +1,11 @@
+# see https://github.com/ImageMagick/ImageMagick6/issues/17
+
+source+=('ImageMagick-6.9.10-11-bug17.patch')
+sha256sums+=('59592dba2feebf4457e0d79e95bd212f41a6e6bbec0ed7d3aaf43328047e9c96')
+
+eval "$(
+  declare -f prepare | \
+    sed '
+      /patch/ a patch -Np1 -i ../ImageMagick-6.9.10-11-bug17.patch
+    '
+)"
diff --git a/extra/valgrind/PKGBUILD b/extra/valgrind/PKGBUILD
index 82e85edc..2e1090ae 100644
--- a/extra/valgrind/PKGBUILD
+++ b/extra/valgrind/PKGBUILD
@@ -1,16 +1,3 @@
-# Patch: https://bugsfiles.kde.org/attachment.cgi?id=107639
-# See: https://bugs.kde.org/show_bug.cgi?id=386115
-# and https://bugs.kde.org/show_bug.cgi?id=384230
-
-source+=('valgrind-3.13.0-ignore-redundant-addr16-prefix-in-rel-call.patch')
-md5sums+=('3df4e4b3724de72cc68b13c1aabdfd2e')
-sha512sums+=('fedf7b68e2246819a37c3d6126384e13103c4e22a68b4339ed41c7a1528a09f15fc32ea3cab7e4f87d7514b855582f68bfb8b864aaa0821759a3a6b12b5ad9e4')
-
-prepare() {
-  cd $pkgname-$pkgver
-  patch -Np1 -i "$srcdir/valgrind-3.13.0-ignore-redundant-addr16-prefix-in-rel-call.patch"
-}
-
 # remove multilib targets
 provides=("${provides[@]/$pkgname-multilib}")
 replaces=("${replaces[@]/$pkgname-multilib}")
diff --git a/extra/valgrind/valgrind-3.13.0-ignore-redundant-addr16-prefix-in-rel-call.patch b/extra/valgrind/valgrind-3.13.0-ignore-redundant-addr16-prefix-in-rel-call.patch
deleted file mode 100644
index 1b6eac64..00000000
--- a/extra/valgrind/valgrind-3.13.0-ignore-redundant-addr16-prefix-in-rel-call.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit 0a01a3771224300c0549e3cf26529a5995011092
-Author: Tom Hughes <tom@compton.nu>
-Date:   Thu Aug 31 15:58:11 2017 +0100
-
-    Ignore redundant addr16 prefix on relative call
-    
-    BZ#384230
-
-diff --git a/VEX/priv/guest_x86_toIR.c b/VEX/priv/guest_x86_toIR.c
-index 9f6a41abf..ad1f8d838 100644
---- a/VEX/priv/guest_x86_toIR.c
-+++ b/VEX/priv/guest_x86_toIR.c
-@@ -13067,6 +13067,11 @@ DisResult disInstr_X86_WRK (
-        goto decode_success;
-    }
- 
-+   /* 67 E8 = CALL with redundant addr16 prefix */
-+   if (insn[0] == 0x67 && insn[1] == 0xE8) {
-+      delta++;
-+   }
-+
-    /* ---------------------------------------------------- */
-    /* --- start of the baseline insn decoder            -- */
-    /* ---------------------------------------------------- */