From 9b7bd78a8d102ebdde7bac350c2326cd370a88c8 Mon Sep 17 00:00:00 2001
From: Michał Masłowski <mtjm@mtjm.eu>
Date: Wed, 26 Dec 2012 15:02:44 +0100
Subject: More simple build fixes.

---
 extra/nitrogen/PKGBUILD            |  2 +-
 extra/pidgin-encryption/PKGBUILD   |  7 +++++--
 extra/pidgin-encryption/glib.patch | 12 ++++++++++++
 extra/sharutils/PKGBUILD           |  7 +++++--
 extra/sharutils/gets.patch         | 16 ++++++++++++++++
 5 files changed, 39 insertions(+), 5 deletions(-)
 create mode 100644 extra/pidgin-encryption/glib.patch
 create mode 100644 extra/sharutils/gets.patch

diff --git a/extra/nitrogen/PKGBUILD b/extra/nitrogen/PKGBUILD
index 2da8a15e7..ae6a2f81b 100644
--- a/extra/nitrogen/PKGBUILD
+++ b/extra/nitrogen/PKGBUILD
@@ -18,7 +18,7 @@ md5sums=('dd779a252a222eb9d329d74b809cfe73')
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr
-  make
+  make LDADD="-lX11"
 }
 
 package() {
diff --git a/extra/pidgin-encryption/PKGBUILD b/extra/pidgin-encryption/PKGBUILD
index 396022ba6..3f843ccc3 100644
--- a/extra/pidgin-encryption/PKGBUILD
+++ b/extra/pidgin-encryption/PKGBUILD
@@ -12,11 +12,14 @@ license=('GPL')
 url="http://pidgin-encrypt.sourceforge.net/"
 depends=('pidgin' 'nss')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/pidgin-encrypt/$pkgname-$pkgver.tar.gz)
-md5sums=('d839eec602c21f913b32b742dc512f4b')
+source=(http://downloads.sourceforge.net/pidgin-encrypt/$pkgname-$pkgver.tar.gz
+        glib.patch)
+md5sums=('d839eec602c21f913b32b742dc512f4b'
+         '6183c2e70e11c9ef874b21a996c93d2f')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
+  patch -p1 -i "$srcdir/glib.patch"
   ./configure --prefix=/usr --disable-static
   make
 }
diff --git a/extra/pidgin-encryption/glib.patch b/extra/pidgin-encryption/glib.patch
new file mode 100644
index 000000000..9d156c32c
--- /dev/null
+++ b/extra/pidgin-encryption/glib.patch
@@ -0,0 +1,12 @@
+diff -ru pidgin-encryption-3.1.orig/rsa_nss.c pidgin-encryption-3.1/rsa_nss.c
+--- pidgin-encryption-3.1.orig/rsa_nss.c	2012-12-26 13:57:18.637297343 +0100
++++ pidgin-encryption-3.1/rsa_nss.c	2012-12-26 14:00:37.782680833 +0100
+@@ -24,7 +24,7 @@
+ #include <debug.h>
+ #include <gtkdialogs.h>
+ 
+-#include "glib/gmain.h"
++#include <glib.h>
+ 
+ #include <string.h>
+ #include <assert.h>
diff --git a/extra/sharutils/PKGBUILD b/extra/sharutils/PKGBUILD
index 9da40a390..93cfa635a 100644
--- a/extra/sharutils/PKGBUILD
+++ b/extra/sharutils/PKGBUILD
@@ -11,13 +11,16 @@ url='http://www.gnu.org/software/sharutils/'
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('perl' 'gettext' 'texinfo')
-source=("ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('e9c9f869f8ecb3bcb30cc323e02e0a1266aeb109')
+source=("ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+        gets.patch)
+sha1sums=('e9c9f869f8ecb3bcb30cc323e02e0a1266aeb109'
+          '435410f9a0f335d3a2dd8a6014cb64345a1b927c')
 
 install=install
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
+	patch -p1 -i "$srcdir/gets.patch"
 	./configure \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
diff --git a/extra/sharutils/gets.patch b/extra/sharutils/gets.patch
new file mode 100644
index 000000000..b1b0f16ca
--- /dev/null
+++ b/extra/sharutils/gets.patch
@@ -0,0 +1,16 @@
+diff -ru sharutils-4.11.1.orig/lib/stdio.in.h sharutils-4.11.1/lib/stdio.in.h
+--- sharutils-4.11.1.orig/lib/stdio.in.h	2012-12-26 14:49:54.935220358 +0100
++++ sharutils-4.11.1/lib/stdio.in.h	2012-12-26 14:50:29.151983394 +0100
+@@ -175,12 +175,6 @@
+                  "use gnulib module fflush for portable POSIX compliance");
+ #endif
+ 
+-/* It is very rare that the developer ever has full control of stdin,
+-   so any use of gets warrants an unconditional warning.  Assume it is
+-   always declared, since it is required by C89.  */
+-#undef gets
+-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+-
+ #if @GNULIB_FOPEN@
+ # if @REPLACE_FOPEN@
+ #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-- 
cgit v1.2.3-54-g00ecf