From 39c1e1f766b356a6d57477652c9ac51818400fd1 Mon Sep 17 00:00:00 2001
From: Jose V Beneyto <sepen@crux.nu>
Date: Thu, 20 Dec 2012 12:19:23 +0100
Subject: [PATCH] chromium: fixed build issues (thanks to Mikhail Kolesnik)

---
 chromium/.md5sum             |  1 +
 chromium/Pkgfile             |  7 +++++--
 chromium/use-siginfo_t.patch | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 chromium/use-siginfo_t.patch

diff --git a/chromium/.md5sum b/chromium/.md5sum
index bcf56c2ee..ce80f6880 100644
--- a/chromium/.md5sum
+++ b/chromium/.md5sum
@@ -1,3 +1,4 @@
 dab90271e918f48ed215648521d5a8a0  bison.patch
 2ee0e7ca8ec685d4031625bc005f4f45  chromium-21.0.1180.92.tar.bz2
 64968626706b07721983ac59fb3babbf  chromium.sh
+d1a2b0663cbf38ebc71cc75073a39b43  use-siginfo_t.patch
diff --git a/chromium/Pkgfile b/chromium/Pkgfile
index a8bcf842b..4dbaa3c7a 100644
--- a/chromium/Pkgfile
+++ b/chromium/Pkgfile
@@ -6,9 +6,9 @@
 
 name=chromium
 version=21.0.1180.92
-release=1
+release=2
 source=(http://gsdview.appspot.com/chromium-browser-official/$name-$version.tar.bz2 \
-        $name.sh bison.patch)
+        $name.sh bison.patch use-siginfo_t.patch)
 
 build() {
   cd $name-$version
@@ -16,6 +16,9 @@ build() {
   # https://bugs.webkit.org/show_bug.cgi?id=92264
   patch -d ./third_party/WebKit -p1 -i $SRC/bison.patch
 
+  # fix building issues
+  patch -p1 -i $SRC/use-siginfo_t.patch
+
   find third_party/WebKit/Source ui/base/ime \
     -type f -exec sed -e 's|<glib/.*\.h>|<glib.h>|g' -i {} \;
 
diff --git a/chromium/use-siginfo_t.patch b/chromium/use-siginfo_t.patch
new file mode 100644
index 000000000..1d11a390e
--- /dev/null
+++ b/chromium/use-siginfo_t.patch
@@ -0,0 +1,35 @@
+diff -upr chromium-20.0.1132.57.orig/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h chromium-20.0.1132.57/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h
+--- chromium-20.0.1132.57.orig/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h	2012-07-10 10:48:31.000000000 +0300
++++ chromium-20.0.1132.57/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h	2012-07-11 23:44:11.000000000 +0300
+@@ -243,14 +243,13 @@ struct kernel_rusage {
+   long               ru_nivcsw;
+ };
+ 
+-struct siginfo;
+ #if defined(__i386__) || defined(__arm__) || defined(__PPC__)
+ 
+ /* include/asm-{arm,i386,mips,ppc}/signal.h                                  */
+ struct kernel_old_sigaction {
+   union {
+     void             (*sa_handler_)(int);
+-    void             (*sa_sigaction_)(int, struct siginfo *, void *);
++    void             (*sa_sigaction_)(int, siginfo_t *, void *);
+   };
+   unsigned long      sa_mask;
+   unsigned long      sa_flags;
+@@ -287,13 +286,13 @@ struct kernel_sigaction {
+   unsigned long      sa_flags;
+   union {
+     void             (*sa_handler_)(int);
+-    void             (*sa_sigaction_)(int, struct siginfo *, void *);
++    void             (*sa_sigaction_)(int, siginfo_t *, void *);
+   };
+   struct kernel_sigset_t sa_mask;
+ #else
+   union {
+     void             (*sa_handler_)(int);
+-    void             (*sa_sigaction_)(int, struct siginfo *, void *);
++    void             (*sa_sigaction_)(int, siginfo_t *, void *);
+   };
+   unsigned long      sa_flags;
+   void               (*sa_restorer)(void);