Libgcrypt 1.7.5 & libgpg-error 1.26

ChatSecure · Jan 4, 2017 · 519d96c · 519d96c
1 parent e6539a1
commit 519d96c
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 61 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,6 +16,7 @@ DerivedData
 .idea/
 *.hmap
 *.xccheckout
+*.orig
 
 OTRKitDependencies/
 OTRKitDependencies-iOS/

diff --git a/scripts/build-all.sh b/scripts/build-all.sh
@@ -57,8 +57,8 @@ fi
 # Versions
 export MIN_IOS_VERSION="8.0"
 export MIN_OSX_VERSION="10.10"
-export LIBGPG_ERROR_VERSION="1.24"
-export LIBGCRYPT_VERSION="1.7.3"
+export LIBGPG_ERROR_VERSION="1.26"
+export LIBGCRYPT_VERSION="1.7.5"
 export LIBOTR_VERSION="4.1.1"
 
 BUILT_ARCHS=()

diff --git a/scripts/build-gpg-error.sh b/scripts/build-gpg-error.sh
@@ -26,11 +26,6 @@ pushd "libgpg-error-${LIBGPG_ERROR_VERSION}"
       fi
 	fi
 
-   # Copy over syscfg files
-
-   cp "${TOPDIR}/patches/lock-obj-pub.i386-apple-darwin.h" ./src/syscfg/
-   cp "${TOPDIR}/patches/lock-obj-pub.x86_64-apple-darwin.h" ./src/syscfg/
-
    ./configure --disable-shared --enable-static --with-pic --enable-threads=posix ${EXTRA_CONFIG} \
    --with-sysroot="${SDK_PATH}" \
    --prefix="${ROOTDIR}" \

diff --git a/scripts/patches/lock-obj-pub.i386-apple-darwin.h b/scripts/patches/lock-obj-pub.i386-apple-darwin.h
diff --git a/scripts/patches/lock-obj-pub.x86_64-apple-darwin.h b/scripts/patches/lock-obj-pub.x86_64-apple-darwin.h