libzip: update to 1.4.0. (#10767)

This commit is contained in:
Piotr 2018-01-20 07:01:27 +01:00 committed by Juan RP
parent 4023674461
commit 10221b40e6
2 changed files with 39 additions and 4 deletions

View File

@ -0,0 +1,36 @@
From e9244b207c0fc883ff84c1fc46602feb1e2b0347 Mon Sep 17 00:00:00 2001
From: Thomas Klausner <tk@giga.or.at>
Date: Wed, 3 Jan 2018 11:41:57 +0100
Subject: [PATCH] Use 'cmake -E tar' to extract test data.
For easier cross-compilation (Github issue #21).
---
regress/CMakeLists.txt | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git regress/CMakeLists.txt regress/CMakeLists.txt
index e2ce232..3a0d4f7 100644
--- regress/CMakeLists.txt
+++ regress/CMakeLists.txt
@@ -51,15 +51,9 @@ ADD_CUSTOM_TARGET(cleanup
ADD_CUSTOM_TARGET(testinput
ALL
VERBATIM
- COMMAND ziptool ${CMAKE_CURRENT_SOURCE_DIR}/manyfiles-zip.zip cat 0 > manyfiles.zip
- COMMAND ziptool ${CMAKE_CURRENT_SOURCE_DIR}/manyfiles-zip.zip cat 1 > manyfiles-133000.zip
- COMMAND ziptool ${CMAKE_CURRENT_SOURCE_DIR}/manyfiles-zip.zip cat 2 > manyfiles-65536.zip
- COMMAND ziptool ${CMAKE_CURRENT_SOURCE_DIR}/manyfiles-zip.zip cat 3 > manyfiles-zip64-modulo.zip
- COMMAND ziptool ${CMAKE_CURRENT_SOURCE_DIR}/manyfiles-zip.zip cat 4 > manyfiles-zip64.zip
- COMMAND ziptool ${CMAKE_CURRENT_SOURCE_DIR}/manyfiles-zip.zip cat 5 > manyfiles-fewer.zip
- COMMAND ziptool ${CMAKE_CURRENT_SOURCE_DIR}/manyfiles-zip.zip cat 6 > manyfiles-more.zip
- COMMAND ziptool ${CMAKE_CURRENT_SOURCE_DIR}/bigzero-zip.zip cat 0 > bigzero.zip
- DEPENDS ziptool ${CMAKE_CURRENT_SOURCE_DIR}/manyfiles-zip.zip ${CMAKE_CURRENT_SOURCE_DIR}/bigzero-zip.zip
+ COMMAND cmake -E tar x ${CMAKE_CURRENT_SOURCE_DIR}/manyfiles-zip.zip
+ COMMAND cmake -E tar x ${CMAKE_CURRENT_SOURCE_DIR}/bigzero-zip.zip
+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/manyfiles-zip.zip ${CMAKE_CURRENT_SOURCE_DIR}/bigzero-zip.zip
)
SET_PROPERTY(DIRECTORY PROPERTY ADDITIONAL_MAKE_CLEAN_FILES
--
2.15.1

View File

@ -1,8 +1,8 @@
# Template file for 'libzip'
pkgname=libzip
version=1.3.2
version=1.4.0
revision=1
build_style=gnu-configure
build_style=cmake
hostmakedepends="perl"
makedepends="zlib-devel"
short_desc="C library for reading, creating, and modifying zip archives"
@ -10,7 +10,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-2"
homepage="https://libzip.org/"
distfiles="https://libzip.org/download/libzip-${version}.tar.gz"
checksum=ab4c34eb6c3a08b678cd0f2450a6c57a13e9618b1ba34ee45d00eb5327316457
checksum=759a89690e155ca52247638b9f97e16e48fbb6077abb7ce2d921dd5b81259940
libzip-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
@ -19,7 +19,6 @@ libzip-devel_package() {
vmove usr/share/man/man3
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
}
}