[gtk-osx] Fix libgcrypt, glib-networking, and libsoup for clang

[John Ralls <jralls src gnome org>]

commit a740286efa94076496a433cd22a0e87443b8c875
Author: John Ralls <jralls ceridwen us>
Date:   Tue Oct 15 13:46:36 2013 -0700

    Fix libgcrypt, glib-networking, and libsoup for clang

 modulesets-stable/gtk-osx-unsupported.modules   |    8 +-
 modulesets-unstable/gtk-osx-unsupported.modules |    8 +-
 modulesets/gtk-osx-unsupported.modules          |    8 +-
 patches/libgcrypt-build-clang.patch             |   97 +++++++++++++++++++++++
 4 files changed, 109 insertions(+), 12 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-unsupported.modules b/modulesets-stable/gtk-osx-unsupported.modules
index d299d8c..647f7a2 100644
--- a/modulesets-stable/gtk-osx-unsupported.modules
+++ b/modulesets-stable/gtk-osx-unsupported.modules
@@ -100,7 +100,7 @@
   </autotools>
 
   <autotools id="glib-networking" autogen-sh="configure"
-            autogenargs="--without-ca-certificates">
+            autogenargs="--without-ca-certificates set_more_warnings=no">
     <branch module="glib-networking/2.34/glib-networking-2.34.0.tar.xz"
            version="2.34.0" hash="sha256:c56eb4161671bff9568f3a92a88531ca01217eb7ee8514bb6255730400f877f1"/>
     <dependencies>
@@ -109,7 +109,7 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libsoup" autogen-sh="configure" autogenargs="">
+  <autotools id="libsoup" autogen-sh="configure" autogenargs="set_more_warnings=no">
     <branch module="libsoup/2.40/libsoup-2.40.1.tar.xz"
             version="2.40.1" hash="sha256:77a55d57e7e8055acd2f44e0cc889b9ba48052e8b7f07e829157d57417ac650a" 
/>
     <dependencies>
@@ -135,8 +135,8 @@
   </autotools>
 
   <autotools id="libgcrypt" autogen-sh="configure" autogenargs="--disable-asm">
-    <branch repo='ftp.gnupg.org' version='1.5.0'
-           module='gcrypt/libgcrypt/libgcrypt-1.5.0.tar.bz2'/>
+    <branch repo='ftp.gnupg.org' version='1.5.3'
+           module='gcrypt/libgcrypt/libgcrypt-1.5.3.tar.bz2'/>
     <dependencies>
       <dep package="libgpg-error" />
     </dependencies>
diff --git a/modulesets-unstable/gtk-osx-unsupported.modules b/modulesets-unstable/gtk-osx-unsupported.modules
index ffc459c..3747792 100644
--- a/modulesets-unstable/gtk-osx-unsupported.modules
+++ b/modulesets-unstable/gtk-osx-unsupported.modules
@@ -90,8 +90,8 @@
  
 <!-- CVS version requires fig2dev, an X11 utility.   
      <branch repo='cvs.gnupg.org'  module='libgcrypt'/> -->
-    <branch repo='ftp.gnupg.org' version='1.4.4'
-           module='gcrypt/libgcrypt/libgcrypt-1.4.4.tar.bz2'/>
+    <branch repo='ftp.gnupg.org' version='1.5.3'
+           module='gcrypt/libgcrypt/libgcrypt-1.5.3.tar.bz2'/>
     <dependencies>
       <dep package="libgpg-error" />
     </dependencies>
@@ -113,7 +113,7 @@
     </dependencies>
   </autotools>
 
-  <autotools id="glib-networking" autogenargs="--without-ca-certificates">
+  <autotools id="glib-networking" autogenargs="--without-ca-certificates set_more_warnings=no">
     <branch/>
     <dependencies>
       <dep package="glib"/>
@@ -141,7 +141,7 @@
     </dependencies>
   </autotools>
 
- <autotools id="libsoup" autogenargs="--without-gnome --disable-tls-check">
+ <autotools id="libsoup" autogenargs="--without-gnome --disable-tls-check set_more_warnings=no">
     <branch />
     <after>
       <dep package="glib-networking"/>
diff --git a/modulesets/gtk-osx-unsupported.modules b/modulesets/gtk-osx-unsupported.modules
index 63454c9..0c267d3 100644
--- a/modulesets/gtk-osx-unsupported.modules
+++ b/modulesets/gtk-osx-unsupported.modules
@@ -90,7 +90,7 @@
     </dependencies>
   </autotools>
 
-  <autotools id="glib-networking" autogenargs="--without-ca-certificates">
+  <autotools id="glib-networking" autogenargs="--without-ca-certificates set_more_warnings=no">
     <branch revision="glib-2-34"/>
     <dependencies>
       <dep package="glib"/>
@@ -99,7 +99,7 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libsoup">
+  <autotools id="libsoup" autogenargs="set_more_warnings=no">
     <branch revision="gnome-3-6"/>
     <dependencies>
       <dep package="glib"/>
@@ -127,8 +127,8 @@
 
 <!-- CVS version requires fig2dev, an X11 utility.
      <branch repo='git.gnupg.org' tag="libgcrypt-1.4.4" module='libgcrypt'/> -->
-    <branch repo='ftp.gnupg.org' version='1.5.0'
-           module='gcrypt/libgcrypt/libgcrypt-1.5.0.tar.bz2'/>
+    <branch repo='ftp.gnupg.org' version='1.5.3'
+           module='gcrypt/libgcrypt/libgcrypt-1.5.3.tar.bz2'/>
     <dependencies>
       <dep package="libgpg-error" />
     </dependencies>
diff --git a/patches/libgcrypt-build-clang.patch b/patches/libgcrypt-build-clang.patch
new file mode 100644
index 0000000..5e6beb5
--- /dev/null
+++ b/patches/libgcrypt-build-clang.patch
@@ -0,0 +1,97 @@
+diff -c /Users/john/Development/gtk-sources/libgcrypt-1.5.3/cipher/rijndael.c\~ 
/Users/john/Development/gtk-sources/libgcrypt-1.5.3/cipher/rijndael.c
+--- a/cipher/rijndael.c        Tue Oct 15 11:09:37 2013
++++ b/cipher/rijndael.c 
+       Tue Oct 15 11:53:22 2013
+@@ -725,13 +725,13 @@
+                 "movdqa 0x90(%%esi), %%xmm1\n\t"
+                 aesenc_xmm1_xmm0
+                 "movdqa 0xa0(%%esi), %%xmm1\n\t"
+-                "cmp $10, %[rounds]\n\t"
++                "cmpl $10, %[rounds]\n\t"
+                 "jz .Lenclast%=\n\t"
+                 aesenc_xmm1_xmm0
+                 "movdqa 0xb0(%%esi), %%xmm1\n\t"
+                 aesenc_xmm1_xmm0
+                 "movdqa 0xc0(%%esi), %%xmm1\n\t"
+-                "cmp $12, %[rounds]\n\t"
++                "cmpl $12, %[rounds]\n\t"
+                 "jz .Lenclast%=\n\t"
+                 aesenc_xmm1_xmm0
+                 "movdqa 0xd0(%%esi), %%xmm1\n\t"
+@@ -780,13 +780,13 @@
+                 "movdqa 0x90(%%esi), %%xmm1\n\t"
+                 aesdec_xmm1_xmm0
+                 "movdqa 0xa0(%%esi), %%xmm1\n\t"
+-                "cmp $10, %[rounds]\n\t"
++                "cmpl $10, %[rounds]\n\t"
+                 "jz .Ldeclast%=\n\t"
+                 aesdec_xmm1_xmm0
+                 "movdqa 0xb0(%%esi), %%xmm1\n\t"
+                 aesdec_xmm1_xmm0
+                 "movdqa 0xc0(%%esi), %%xmm1\n\t"
+-                "cmp $12, %[rounds]\n\t"
++                "cmpl $12, %[rounds]\n\t"
+                 "jz .Ldeclast%=\n\t"
+                 aesdec_xmm1_xmm0
+                 "movdqa 0xd0(%%esi), %%xmm1\n\t"
+@@ -839,13 +839,13 @@
+                 "movdqa 0x90(%%esi), %%xmm1\n\t"
+                 aesenc_xmm1_xmm0
+                 "movdqa 0xa0(%%esi), %%xmm1\n\t"
+-                "cmp $10, %[rounds]\n\t"
++                "cmpl $10, %[rounds]\n\t"
+                 "jz .Lenclast%=\n\t"
+                 aesenc_xmm1_xmm0
+                 "movdqa 0xb0(%%esi), %%xmm1\n\t"
+                 aesenc_xmm1_xmm0
+                 "movdqa 0xc0(%%esi), %%xmm1\n\t"
+-                "cmp $12, %[rounds]\n\t"
++                "cmpl $12, %[rounds]\n\t"
+                 "jz .Lenclast%=\n\t"
+                 aesenc_xmm1_xmm0
+                 "movdqa 0xd0(%%esi), %%xmm1\n\t"
+@@ -857,7 +857,7 @@
+                 "movdqu %[src], %%xmm1\n\t"      /* Save input.  */
+                 "pxor %%xmm1, %%xmm0\n\t"        /* xmm0 = input ^ IV  */
+ 
+-                "cmp $1, %[decrypt]\n\t"
++                "cmpl $1, %[decrypt]\n\t"
+                 "jz .Ldecrypt_%=\n\t"
+                 "movdqa %%xmm0, %[iv]\n\t"       /* [encrypt] Store IV.  */
+                 "jmp .Lleave_%=\n"
+@@ -918,13 +918,13 @@
+                 "movdqa 0x90(%%esi), %%xmm1\n\t"
+                 aesenc_xmm1_xmm0
+                 "movdqa 0xa0(%%esi), %%xmm1\n\t"
+-                "cmp $10, %[rounds]\n\t"
++                "cmpl $10, %[rounds]\n\t"
+                 "jz .Lenclast%=\n\t"
+                 aesenc_xmm1_xmm0
+                 "movdqa 0xb0(%%esi), %%xmm1\n\t"
+                 aesenc_xmm1_xmm0
+                 "movdqa 0xc0(%%esi), %%xmm1\n\t"
+-                "cmp $12, %[rounds]\n\t"
++                "cmpl $12, %[rounds]\n\t"
+                 "jz .Lenclast%=\n\t"
+                 aesenc_xmm1_xmm0
+                 "movdqa 0xd0(%%esi), %%xmm1\n\t"
+@@ -1045,7 +1045,7 @@
+                 aesenc_xmm1_xmm3
+                 aesenc_xmm1_xmm4
+                 "movdqa 0xa0(%%esi), %%xmm1\n\t"
+-                "cmp $10, %[rounds]\n\t"
++                "cmpl $10, %[rounds]\n\t"
+                 "jz .Lenclast%=\n\t"
+                 aesenc_xmm1_xmm0
+                 aesenc_xmm1_xmm2
+@@ -1057,7 +1057,7 @@
+                 aesenc_xmm1_xmm3
+                 aesenc_xmm1_xmm4
+                 "movdqa 0xc0(%%esi), %%xmm1\n\t"
+-                "cmp $12, %[rounds]\n\t"
++                "cmpl $12, %[rounds]\n\t"
+                 "jz .Lenclast%=\n\t"
+                 aesenc_xmm1_xmm0
+                 aesenc_xmm1_xmm2
+
+Diff finished.  Tue Oct 15 11:53:31 2013