1.5.0

3 files changed, 8 insertions, 69 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e184ee216209..cb7786e444bc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sat Jan 20 08:44:48 UTC 2018
+# Mon Apr 30 17:34:24 UTC 2018
 pkgbase = mingw-w64-libzip
 	pkgdesc = A C library for reading, creating, and modifying zip archives (mingw-w64)
-	pkgver = 1.4.0
+	pkgver = 1.5.0
 	pkgrel = 1
 	url = http://www.nih.at/libzip/index.html
 	arch = any
@@ -14,10 +14,8 @@ pkgbase = mingw-w64-libzip
 	options = staticlibs
 	options = !buildflags
 	options = !strip
-	source = http://www.nih.at/libzip/libzip-1.4.0.tar.xz
-	source = libzip_cmake-fixes.patch
-	sha256sums = e508aba025f5f94b267d5120fc33761bcd98440ebe49dbfe2ed3df3afeacc7b1
-	sha256sums = 117dbe507e18381e380512ffe149c7340dcdaa1c17f2a34633501d982fa4dcce
+	source = http://www.nih.at/libzip/libzip-1.5.0.tar.xz
+	sha256sums = 5ddb9b41d31b2f99ad4d512003c610ae2db70e222833aba6f9332d5b48a153d9
 
 pkgname = mingw-w64-libzip
 
diff --git a/PKGBUILD b/PKGBUILD
index 1a9efc704889..0f5cc36c1db0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 
 pkgname=mingw-w64-libzip
-pkgver=1.4.0
+pkgver=1.5.0
 pkgrel=1
 pkgdesc="A C library for reading, creating, and modifying zip archives (mingw-w64)"
 url="http://www.nih.at/libzip/index.html"
@@ -9,10 +9,9 @@ arch=(any)
 depends=('mingw-w64-crt' 'mingw-w64-zlib' 'mingw-w64-bzip2')
 makedepends=('mingw-w64-cmake')
 options=('staticlibs' '!buildflags' '!strip')
-source=("http://www.nih.at/libzip/libzip-${pkgver}.tar.xz"
-        'libzip_cmake-fixes.patch')
-sha256sums=('e508aba025f5f94b267d5120fc33761bcd98440ebe49dbfe2ed3df3afeacc7b1'
-            '117dbe507e18381e380512ffe149c7340dcdaa1c17f2a34633501d982fa4dcce')
+source=("http://www.nih.at/libzip/libzip-${pkgver}.tar.xz")
+sha256sums=('5ddb9b41d31b2f99ad4d512003c610ae2db70e222833aba6f9332d5b48a153d9')
+
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
diff --git a/libzip_cmake-fixes.patch b/libzip_cmake-fixes.patch
deleted file mode 100644
index 20281307554d..000000000000
--- a/libzip_cmake-fixes.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 6444109a12480cc40d6169111ea6491332d754cb Mon Sep 17 00:00:00 2001
-From: Julien Schueller <schueller@phimeca.com>
-Date: Sun, 3 Sep 2017 09:54:27 +0200
-Subject: [PATCH 1/2] [cmake] install pkgconfig file
-
----
- CMakeLists.txt | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index eea9be1..6644816 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,5 +1,4 @@
- # TODO:
--# 1. pkgconfig file not yet built.
- # 2. installation not tested.
- # 3. Problems generating html pages.
- # 4. create usable libtool .la file
-@@ -124,7 +123,14 @@ ADD_SUBDIRECTORY(src)
- ADD_SUBDIRECTORY(regress)
- ADD_SUBDIRECTORY(examples)
- 
--# TODO: pkgconfig file
-+# pkgconfig file
-+SET(prefix ${CMAKE_INSTALL_PREFIX})
-+SET(exec_prefix ${prefix})
-+SET(libdir ${prefix}/lib)
-+SET(includedir ${prefix}/lib)
-+SET(LIBS -lz)
-+CONFIGURE_FILE(libzip.pc.in libzip.pc @ONLY)
-+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libzip.pc DESTINATION lib/pkgconfig)
- 
- # write out config file
- CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake-config.h.in
-
-From fdbe7ce30a5ee31b7e520d5cf1a6b19db7ffd962 Mon Sep 17 00:00:00 2001
-From: Julien Schueller <schueller@phimeca.com>
-Date: Sun, 3 Sep 2017 09:57:06 +0200
-Subject: [PATCH 2/2] [cmake] install man pages in share/man
-
----
- man/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt
-index 4934f8b..d43c10f 100644
---- a/man/CMakeLists.txt
-+++ b/man/CMakeLists.txt
-@@ -105,7 +105,7 @@ ENDif(CMAKE_SYSTEM_NAME MATCHES BSD)
- 
- # installation
- 
--SET(MAN_PATH man)
-+SET(MAN_PATH share/man)
- 
- FOREACH(MAN_PAGE ${MAN1_PAGES})
-   INSTALL(FILES ${MAN_PAGE}.${MANFMT} DESTINATION ${MAN_PATH}/man1