summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvan Shapovalov2018-06-06 01:11:30 +0300
committerIvan Shapovalov2018-06-06 01:11:30 +0300
commit6b61144b07d0511a31428ec07cbe16275280e0e6 (patch)
tree4378f7a502841f13ac2893a6f8a8dfd0fce2b2cb
parent09b66c9c059629fde432078d64c61f71a4e55259 (diff)
downloadaur-6b61144b07d0511a31428ec07cbe16275280e0e6.tar.gz
Drop zlib patch -- fixed in upstream
-rw-r--r--.SRCINFO6
-rw-r--r--0002-configure.ac-src-Makefile.am-check-for-and-link-with.patch40
-rw-r--r--PKGBUILD8
3 files changed, 5 insertions, 49 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 33bc11235c4..51393c59ef2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Wed May 9 00:11:38 UTC 2018
+# Tue Jun 5 22:11:10 UTC 2018
pkgbase = idevicerestore-git
pkgdesc = Restore/upgrade firmware of iOS devices
- pkgver = r546.cae1734
+ pkgver = r574.707856d
pkgrel = 1
epoch = 1
url = http://www.libimobiledevice.org
@@ -19,10 +19,8 @@ pkgbase = idevicerestore-git
depends = curl
source = git+https://git.libimobiledevice.org/idevicerestore.git
source = 0001-configure.ac-check-for-pthreads.patch
- source = 0002-configure.ac-src-Makefile.am-check-for-and-link-with.patch
sha256sums = SKIP
sha256sums = c259a9f977de42fbfde75ad0c9a4d813b7d39bf217ee416902409403cd6d7931
- sha256sums = 2c4a09389f3e02e44971eeec06f1979188678dc82989e3fd311677172fb3401f
pkgname = idevicerestore-git
diff --git a/0002-configure.ac-src-Makefile.am-check-for-and-link-with.patch b/0002-configure.ac-src-Makefile.am-check-for-and-link-with.patch
deleted file mode 100644
index e852ce421e0..00000000000
--- a/0002-configure.ac-src-Makefile.am-check-for-and-link-with.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 946e9161ae83d2c0fe5122fd53f2ace39a6b0a9a Mon Sep 17 00:00:00 2001
-From: Ivan Shapovalov <intelfx@intelfx.name>
-Date: Wed, 9 May 2018 03:09:09 +0300
-Subject: [PATCH] configure.ac, src/Makefile.am: check for and link with zlib
-
-Fixes building at least on Arch.
----
- configure.ac | 1 +
- src/Makefile.am | 3 ++-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 2b31499..006d85d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -41,6 +41,7 @@ PKG_CHECK_MODULES(libplist, libplist >= $LIBPLIST_VERSION)
- PKG_CHECK_MODULES(libzip, libzip >= $LIBZIP_VERSION)
- PKG_CHECK_MODULES(libcurl, libcurl >= $LIBCURL_VERSION)
- PKG_CHECK_MODULES(openssl, openssl >= $OPENSSL_VERSION)
-+PKG_CHECK_MODULES(zlib, zlib)
-
- GLOBAL_CFLAGS=""
- AC_LDADD=""
-diff --git a/src/Makefile.am b/src/Makefile.am
-index f169708..f5a84a9 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -15,7 +15,8 @@ AM_LDFLAGS =\
- $(libplist_LIBS) \
- $(libzip_LIBS) \
- $(openssl_LIBS) \
-- $(libcurl_LIBS)
-+ $(libcurl_LIBS) \
-+ $(zlib_LIBS)
-
- AM_LDADD = $(AC_LDADD)
-
---
-2.17.0
-
diff --git a/PKGBUILD b/PKGBUILD
index 1535047359d..fee6733c1bb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=idevicerestore-git
epoch=1
-pkgver=r572.b8b3035
+pkgver=r574.707856d
pkgrel=1
pkgdesc="Restore/upgrade firmware of iOS devices"
arch=('i686' 'x86_64')
@@ -12,11 +12,9 @@ license=('LGPL3')
depends=('libirecovery-git' 'libimobiledevice-git' 'libusbmuxd-git' 'libplist-git' 'libzip' 'openssl' 'curl')
makedepends=('git')
source=("git+https://git.libimobiledevice.org/idevicerestore.git"
- "0001-configure.ac-check-for-pthreads.patch"
- "0002-configure.ac-src-Makefile.am-check-for-and-link-with.patch")
+ "0001-configure.ac-check-for-pthreads.patch")
sha256sums=('SKIP'
- 'c259a9f977de42fbfde75ad0c9a4d813b7d39bf217ee416902409403cd6d7931'
- '2c4a09389f3e02e44971eeec06f1979188678dc82989e3fd311677172fb3401f')
+ 'c259a9f977de42fbfde75ad0c9a4d813b7d39bf217ee416902409403cd6d7931')
pkgver() {
cd idevicerestore