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

[Ryan Lortie <desrt src gnome org>]

commit dec81b272b168bdded686ccb84e217e51534d690
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             |   25 ++++++++++++++++
 patches/libpwquality.libintl-link.patch        |   37 ++++++++++++++++++++++++
 3 files changed, 68 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..031b62a
--- /dev/null
+++ b/patches/farstream.netinet-in.patch
@@ -0,0 +1,25 @@
+diff -r -u farstream-0.2.2/transmitters/multicast/fs-multicast-transmitter.c 
farstream-0.2.2+/transmitters/multicast/fs-multicast-transmitter.c
+--- farstream-0.2.2/transmitters/multicast/fs-multicast-transmitter.c  2012-10-02 17:53:42.000000000 -0400
++++ farstream-0.2.2+/transmitters/multicast/fs-multicast-transmitter.c 2014-03-05 22:57:12.132051838 -0500
+@@ -55,6 +55,7 @@
+ #else /*G_OS_WIN32*/
+ # include <netdb.h>
+ # include <sys/socket.h>
++# include <netinet/in.h>
+ # include <netinet/ip.h>
+ # include <arpa/inet.h>
+ #endif /*G_OS_WIN32*/
+Only in farstream-0.2.2+/transmitters/multicast: fs-multicast-transmitter.c.orig
+Only in farstream-0.2.2+/transmitters/multicast: fs-multicast-transmitter.c.rej
+diff -r -u farstream-0.2.2/transmitters/rawudp/fs-rawudp-transmitter.h 
farstream-0.2.2+/transmitters/rawudp/fs-rawudp-transmitter.h
+--- farstream-0.2.2/transmitters/rawudp/fs-rawudp-transmitter.h        2012-10-02 17:53:42.000000000 -0400
++++ farstream-0.2.2+/transmitters/rawudp/fs-rawudp-transmitter.h       2014-03-05 22:55:58.766448109 -0500
+@@ -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
+Only in farstream-0.2.2+/transmitters/rawudp: fs-rawudp-transmitter.h.orig
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