From 213aec804fb7803a798fb38d508679fe79645cd4 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Mon, 28 Jul 2014 15:49:06 -0700
Subject: [PATCH 1/2] Add autopoint to the list of `apt-get install`'s

Fixes #437.
---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index e30d6d6c..56ab3a10 100644
--- a/index.html
+++ b/index.html
@@ -702,7 +702,7 @@ USE_OSGPLUGIN(&lt;plugin2&gt;)
 
     <!-- http://www.debian.org/distrib/packages#search_packages -->
     <pre>apt-get install \
-    autoconf automake bash bison bzip2 cmake flex gettext \
+    autoconf automake autopoint bash bison bzip2 cmake flex gettext \
     git g++ gperf intltool libffi-dev libtool libltdl-dev \
     libssl-dev libxml-parser-perl make openssl patch perl \
     pkg-config python ruby scons sed unzip wget xz-utils</pre>

From 543c6ce9ef4edec7e5fe98ef0e429dc4c941438d Mon Sep 17 00:00:00 2001
From: Jason Gauci <jgmath2000@gmail.com>
Date: Tue, 29 Jul 2014 09:59:21 -0700
Subject: [PATCH 2/2] Fix return value in reimp.c

Modern clang does not like return; when an int is expected.
---
 src/mingw-utils-1-portability-fix.patch | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/mingw-utils-1-portability-fix.patch b/src/mingw-utils-1-portability-fix.patch
index 40daabb9..42237cb9 100644
--- a/src/mingw-utils-1-portability-fix.patch
+++ b/src/mingw-utils-1-portability-fix.patch
@@ -53,6 +53,15 @@ diff -r 62cf992c82c9 reimp/reimp.c
  {
    struct ar_hdr ar_hdr;
    struct imp_hdr imp_hdr;
+@@ -410,7 +410,7 @@
+           extract_member (get_ar_name (&ar_hdr),
+                           strtol (ar_hdr.ar_size, NULL, 10), f);
+         }
+-      return;
++      return 0;
+     }
+ 
+   sym = buf = xmalloc (imp_hdr.size);
 diff -r 62cf992c82c9 reimp/reimp.h
 --- a/reimp/reimp.h	Fri Nov 26 19:02:28 2010 +0100
 +++ b/reimp/reimp.h	Fri Nov 26 19:14:59 2010 +0100