[jhbuild/wip/conditions: 5/5] 3.12: add some patches for upstream-fixed issues

[Ryan Lortie <desrt src gnome org>]

commit 1dc0b8ef87ab77340f5228746ae76589544bf652
Author: Ryan Lortie <desrt desrt ca>
Date:   Wed Mar 5 22:42:18 2014 -0500

    3.12: add some patches for upstream-fixed issues
    
    farstream and libpwquality each have FreeBSD build issues fixed upstream
    but no signs of a tarball any time soon.  Take those patches locally
    until the next releases.

 modulesets/gnome-suites-core-deps-3.12.modules |    8 +++-
 patches/farstream.netinet-in.patch             |   42 ++++++++++++++++++++++++
 patches/libpwquality.libintl-link.patch        |   37 +++++++++++++++++++++
 3 files changed, 85 insertions(+), 2 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.12.modules b/modulesets/gnome-suites-core-deps-3.12.modules
index 99be5f5..e70d016 100644
--- a/modulesets/gnome-suites-core-deps-3.12.modules
+++ b/modulesets/gnome-suites-core-deps-3.12.modules
@@ -502,7 +502,9 @@
     <branch repo="freedesktop.org"
             module="farstream/releases/farstream/farstream-${version}.tar.gz"
             version="0.2.2"
-            hash="sha256:ffd3c536372781713956eeb28644a6e9ee6e3bab034bee65af6bbb61213cb080"/>
+            hash="sha256:ffd3c536372781713956eeb28644a6e9ee6e3bab034bee65af6bbb61213cb080">
+      <patch file="farstream.netinet-in.patch" strip="1"/>
+    </branch>
     <dependencies>
       <dep package="libnice"/>
     </dependencies>
@@ -1382,7 +1384,9 @@
     <branch repo="libpwquality"
             module="https://fedorahosted.org/releases/l/i/libpwquality/libpwquality-1.2.2.tar.bz2"; 
version="1.2.2"
             hash="sha256:9689627283b43d20ca74ca822404ee486242e3e528fa95bf7016d37ff46e0696"
-            size="362081"/>
+            size="362081">
+      <patch file="libpwquality.libintl-link.patch" strip="1"/>
+    </branch>
     <dependencies>
       <dep package="cracklib"/>
     </dependencies>
diff --git a/patches/farstream.netinet-in.patch b/patches/farstream.netinet-in.patch
new file mode 100644
index 0000000..304e747
--- /dev/null
+++ b/patches/farstream.netinet-in.patch
@@ -0,0 +1,42 @@
+From 8b99315a911e82aaaac31566c33d0a2d7f3483b1 Mon Sep 17 00:00:00 2001
+From: Ryan Lortie <desrt desrt ca>
+Date: Thu, 13 Feb 2014 22:03:09 -0500
+Subject: [PATCH] transmitters: include <netinet/in.h> for IPPROTO_*
+
+POSIX says that we need <netinet/in.h> for IPPROTO_* to be defined, so
+make sure we include it.
+
+It also ensures that we get a definition of 'struct sockaddr' which
+appears in the rawudp header as an argument type.
+---
+ transmitters/multicast/fs-multicast-transmitter.c | 1 +
+ transmitters/rawudp/fs-rawudp-transmitter.h       | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/transmitters/multicast/fs-multicast-transmitter.c 
b/transmitters/multicast/fs-multicast-transmitter.c
+index 24eeb78..61a4a75 100644
+--- a/transmitters/multicast/fs-multicast-transmitter.c
++++ b/transmitters/multicast/fs-multicast-transmitter.c
+@@ -54,6 +54,7 @@
+ # define close closesocket
+ #else /*G_OS_WIN32*/
+ # include <sys/socket.h>
++# include <netinet/in.h>
+ # include <arpa/inet.h>
+ #endif /*G_OS_WIN32*/
+ 
+diff --git a/transmitters/rawudp/fs-rawudp-transmitter.h b/transmitters/rawudp/fs-rawudp-transmitter.h
+index 23ec312..6fd8302 100644
+--- a/transmitters/rawudp/fs-rawudp-transmitter.h
++++ b/transmitters/rawudp/fs-rawudp-transmitter.h
+@@ -34,6 +34,7 @@
+ # include <ws2tcpip.h>
+ #else /*G_OS_WIN32*/
+ # include <arpa/inet.h>
++# include <netinet/in.h>
+ #endif /*G_OS_WIN32*/
+ 
+ G_BEGIN_DECLS
+-- 
+1.8.5.3
+
diff --git a/patches/libpwquality.libintl-link.patch b/patches/libpwquality.libintl-link.patch
new file mode 100644
index 0000000..db0ccf3
--- /dev/null
+++ b/patches/libpwquality.libintl-link.patch
@@ -0,0 +1,37 @@
+diff -r -u libpwquality-1.2.2/src/Makefile.am libpwquality-1.2.2+/src/Makefile.am
+--- libpwquality-1.2.2/src/Makefile.am 2014-03-05 22:36:14.323988295 -0500
++++ libpwquality-1.2.2+/src/Makefile.am        2014-03-05 22:37:26.324056066 -0500
+@@ -25,13 +25,13 @@
+ libpwquality_la_LDFLAGS = -no-undefined $(libpwquality_version_script) \
+       -version-info @PWQUALITY_LT_CURRENT@:@PWQUALITY_LT_REVISION@:@PWQUALITY_LT_AGE@
+ 
+-libpwquality_la_LIBADD = @LIBCRACK@
++libpwquality_la_LIBADD = @LIBCRACK@ $(LIBINTL)
+ 
+ libpwquality_la_SOURCES = generate.c check.c settings.c error.c
+ 
+ if HAVE_PAM
+   pam_pwquality_la_LDFLAGS = -no-undefined -avoid-version -module
+-  pam_pwquality_la_LIBADD = libpwquality.la @PAM_LIBS@
++  pam_pwquality_la_LIBADD = libpwquality.la @PAM_LIBS@ $(LIBINTL)
+   pam_pwquality_la_SOURCES = pam_pwquality.c
+ else
+   pam_pwquality_la_LDFLAGS =
+diff -r -u libpwquality-1.2.2/src/Makefile.in libpwquality-1.2.2+/src/Makefile.in
+--- libpwquality-1.2.2/src/Makefile.in 2013-06-19 11:41:37.000000000 -0400
++++ libpwquality-1.2.2+/src/Makefile.in        2014-03-05 22:38:01.938157558 -0500
+@@ -308,12 +308,12 @@
+ libpwquality_la_LDFLAGS = -no-undefined $(libpwquality_version_script) \
+       -version-info @PWQUALITY_LT_CURRENT@:@PWQUALITY_LT_REVISION@:@PWQUALITY_LT_AGE@
+ 
+-libpwquality_la_LIBADD = @LIBCRACK@
++libpwquality_la_LIBADD = @LIBCRACK@ $(LIBINTL)
+ libpwquality_la_SOURCES = generate.c check.c settings.c error.c
+ @HAVE_PAM_FALSE pam_pwquality_la_LDFLAGS = 
+ @HAVE_PAM_TRUE pam_pwquality_la_LDFLAGS = -no-undefined -avoid-version -module
+ @HAVE_PAM_FALSE pam_pwquality_la_LIBADD = 
+- HAVE_PAM_TRUE@pam_pwquality_la_LIBADD = libpwquality.la @PAM_LIBS@
++ HAVE_PAM_TRUE@pam_pwquality_la_LIBADD = libpwquality.la @PAM_LIBS@ $(LIBINTL)
+ @HAVE_PAM_FALSE pam_pwquality_la_SOURCES = 
+ @HAVE_PAM_TRUE pam_pwquality_la_SOURCES = pam_pwquality.c
+ pwscore_SOURCES = pwscore.c