[gedit/wip/3.14-osx: 3/6] [osx] Add lib soup dependency

From: Jesse van den Kieboom <jessevdk src gnome org>
To: commits-list gnome org
Cc:
Subject: [gedit/wip/3.14-osx: 3/6] [osx] Add lib soup dependency
Date: Tue, 26 Aug 2014 15:12:56 +0000 (UTC)
commit 21f2612527b49b6729e029c215311ee3125919a0
Author: Jesse van den Kieboom <jessevdk gmail com>
Date:   Tue Aug 26 14:32:21 2014 +0200

    [osx] Add lib soup dependency

 osx/build/modulesets/gedit.modules                 |   54 +++++++++++-
 .../patches/libgcrypt/libgcrypt-build-clang.patch  |   97 ++++++++++++++++++++
 osx/build/updater/gedit-overrides.modules          |   11 ++
 3 files changed, 160 insertions(+), 2 deletions(-)
---
diff --git a/osx/build/modulesets/gedit.modules b/osx/build/modulesets/gedit.modules
index 51c716c..bfd1bb2 100644
--- a/osx/build/modulesets/gedit.modules
+++ b/osx/build/modulesets/gedit.modules
@@ -9,6 +9,7 @@
   <repository type="tarball" name="fontconfig" 
href="http://www.freedesktop.org/software/fontconfig/release/"/>
   <repository type="tarball" name="ftp.gnome.org" default="yes" 
href="ftp://ftp.gnome.org/pub/gnome/sources/"/>
   <repository type="tarball" name="ftp.gnu.org" href="ftp://ftp.gnu.org/gnu/"/>
+  <repository type="tarball" name="ftp.gnupg.org" href="ftp://ftp.gnupg.org/"/>
   <repository type="git" name="git.github.com" href="https://github.com/"/>
 
   <repository type="git" name="git.gnome.org" href="git://git.gnome.org/"/>
@@ -23,6 +24,7 @@
   <repository type="tarball" name="sourceforge" href="http://downloads.sourceforge.net/sourceforge/"/>
   <repository type="tarball" name="sourceware.org" href="ftp://sourceware.org/pub/"/>
 
+  <repository type="tarball" name="sqlite" href="http://www.sqlite.org/"/>
   <repository type="tarball" name="tango.freedesktop.org" href="http://tango.freedesktop.org/releases/"/>
   <repository type="tarball" name="tarball.github.com" href="https://github.com/"/>
   <repository type="tarball" name="xmlsoft.org" href="ftp://xmlsoft.org/libxml2/"/>
@@ -30,7 +32,15 @@
     <branch module="libcroco/0.6/libcroco-0.6.8.tar.xz" version="0.6.8" 
hash="sha256:ea6e1b858c55219cefd7109756bff5bc1a774ba7a55f7d3ccd734d6b871b8570" repo="ftp.gnome.org"/>
   </autotools>
 
-  <autotools id="gnome-icon-theme" autogen-sh="configure">
+  <autotools id="libgpg-error" autogen-sh="configure" supports-non-srdir-builds="no">
+    <branch repo="ftp.gnupg.org" version="1.10" module="gcrypt/libgpg-error/libgpg-error-1.10.tar.bz2"/>
+  </autotools>
+
+  <autotools id="libtasn1" supports-non-srcdir-builds="no" autogen-sh="configure">
+    <branch repo="ftp.gnu.org" version="2.14" module="libtasn1/libtasn1-2.14.tar.gz"/>
+  </autotools>
+
+   <autotools id="gnome-icon-theme" autogen-sh="configure">
     <branch module="gnome-icon-theme/3.12/gnome-icon-theme-3.12.0.tar.xz" version="3.12.0" 
hash="sha256:359e720b9202d3aba8d477752c4cd11eced368182281d51ffd64c8572b4e503a" repo="ftp.gnome.org"/>
     <dependencies>
       <dep package="hicolor-icon-theme"/>
@@ -62,6 +72,24 @@
     </after>
   </autotools>
 
+  <autotools id="libgcrypt" autogen-sh="configure" autogenargs="--disable-asm">
+    <branch repo="ftp.gnupg.org" version="1.5.3" module="gcrypt/libgcrypt/libgcrypt-1.5.3.tar.bz2">
+      <patch file="libgcrypt/libgcrypt-build-clang.patch" strip="1"/>
+    </branch>
+    <dependencies>
+      <dep package="libgpg-error"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnutls" autogen-sh="configure" autogenargs="--with-libgcrypt --without-p11-kit">
+    <branch repo="ftp.gnu.org" version="2.12.20" module="gnutls/gnutls-2.12.20.tar.bz2"/>
+    <dependencies>
+      <dep package="libgcrypt"/>
+      <dep package="libtasn1"/>
+      <dep package="zlib"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="berkeleydb-nonsrctree" autogen-sh="configure" 
autogen-template="%(srcdir)s/dist/%(autogen-sh)s --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s">
 
     <branch module="berkeley-db/db-4.8.30.NC.tar.gz" version="4.8.30" repo="oracle">
@@ -192,7 +220,19 @@
     </dependencies>
   </autotools>
 
-<autotools id="pygobject3" autogenargs="--with-python=python3">
+<autotools id="sqlite" autogenargs="--disable-tcl --enable-threadsafe" autogen-sh="configure">
+    <branch module="sqlite-autoconf-3071401.tar.gz" version="3.7.14" repo="sqlite"/>
+  </autotools>
+
+<autotools id="glib-networking" autogen-sh="configure" autogenargs="--without-ca-certificates 
set_more_warnings=no">
+    <branch module="glib-networking/2.41/glib-networking-2.41.4.tar.xz" version="2.41.4" 
hash="sha256:930ad618865dcf81765d0f48cb6f13e22d76203efa59d30604aed0384ce80fd7" repo="ftp.gnome.org"/>
+    <dependencies>
+      <dep package="gnutls"/>
+      <dep package="libgcrypt"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="pygobject3" autogenargs="--with-python=python3">
     <branch module="pygobject" repo="git.gnome.org" tag="983276fb1cbc261d062ef93ba2266d08a5a6f423"/>
     <dependencies>
       <dep package="meta-gtk-osx-gtk3"/>
@@ -365,6 +405,15 @@
     </branch>
   </autotools>
 
+  <autotools id="libsoup" autogen-sh="configure" autogenargs="set_more_warnings=no">
+    <branch module="libsoup/2.46/libsoup-2.46.0.tar.xz" version="2.46.0" 
hash="sha256:fa3d5574c1a2df521242e2ca624a2b3057121798cab9f8f40525aa186a7b15a3" repo="ftp.gnome.org"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="glib-networking"/>
+      <dep package="sqlite"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="shared-mime-info" autogen-sh="configure" supports-non-srcdir-builds="no">
     <branch module="shared-mime-info-1.2.tar.xz" version="1.2" repo="hadess">
       <patch file="shared-mime-info/0001-Bug-70255-Build-fails-with-glib-2.38.patch" strip="1"/>
@@ -470,6 +519,7 @@
       <dep package="gsettings-desktop-schemas"/>
       <dep package="iso-codes"/>
       <dep package="shared-mime-info"/>
+      <dep package="libsoup"/>
     </dependencies>
   </metamodule>
 
diff --git a/osx/build/modulesets/patches/libgcrypt/libgcrypt-build-clang.patch 
b/osx/build/modulesets/patches/libgcrypt/libgcrypt-build-clang.patch
new file mode 100644
index 0000000..5e6beb5
--- /dev/null
+++ b/osx/build/modulesets/patches/libgcrypt/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
diff --git a/osx/build/updater/gedit-overrides.modules b/osx/build/updater/gedit-overrides.modules
index e8f34bd..a891d66 100644
--- a/osx/build/updater/gedit-overrides.modules
+++ b/osx/build/updater/gedit-overrides.modules
@@ -159,6 +159,16 @@
     </dependencies>
   </autotools>
 
+  <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>
+      <dep package="glib"/>
+      <dep package="glib-networking"/>
+      <dep package='sqlite'/>
+    </dependencies>
+  </autotools>
+
   <metamodule id="gedit-deps">
     <dependencies>
       <dep package="meta-gtk-osx-bootstrap"/>
@@ -170,6 +180,7 @@
       <dep package="gsettings-desktop-schemas"/>
       <dep package="iso-codes"/>
       <dep package="shared-mime-info"/>
+      <dep package="libsoup"/>
     </dependencies>
   </metamodule>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]