aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo <thinkabit.ukim@gmail.com>2020-04-16 10:58:05 -0300
committerLeo <thinkabit.ukim@gmail.com>2020-04-17 05:06:40 +0000
commitf708407abf8e38e57dd4cba7465f436d89412389 (patch)
treec4206edf831a2183c19ad86a1b63868826481cb2
parenteadb1f2dfed5febe6f886181b5449bd54de77e17 (diff)
downloadaports-f708407abf8e38e57dd4cba7465f436d89412389.tar.gz
aports-f708407abf8e38e57dd4cba7465f436d89412389.tar.bz2
aports-f708407abf8e38e57dd4cba7465f436d89412389.tar.xz
community/zziplib: upgrade to 0.13.71
-rw-r--r--community/zziplib/APKBUILD13
-rw-r--r--community/zziplib/fix-merge-conflict.patch18
2 files changed, 6 insertions, 25 deletions
diff --git a/community/zziplib/APKBUILD b/community/zziplib/APKBUILD
index 9d038d6122..3ed894b22c 100644
--- a/community/zziplib/APKBUILD
+++ b/community/zziplib/APKBUILD
@@ -2,18 +2,17 @@
# Contributor: Mika Havela <mika.havela@gmail.com>
# Maintainer: Mika Havela <mika.havela@gmail.com>
pkgname=zziplib
-pkgver=0.13.70
+pkgver=0.13.71
pkgrel=0
pkgdesc="Lightweight library to easily extract data from zip files"
+options="!check" # Some tests fail
url="https://github.com/gdraheim/zziplib"
arch="all"
license="LGPL-2.0-or-later MPL-1.1"
makedepends="cmake zlib-dev python3 bash"
checkdepends="zip"
subpackages="$pkgname-dev $pkgname-doc $pkgname-utils"
-source="zziplib-$pkgver.tar.gz::https://github.com/gdraheim/zziplib/archive/v$pkgver.tar.gz
- fix-merge-conflict.patch
- "
+source="zziplib-$pkgver.tar.gz::https://github.com/gdraheim/zziplib/archive/v$pkgver.tar.gz"
# secfixes:
# 0.13.69-r2:
@@ -30,9 +29,10 @@ build() {
-DCMAKE_INSTALL_LIBDIR=lib \
-DBUILD_SHARED_LIBS=True \
-DBUILD_STATIC_LIBS=False \
- -DBUILD_TESTS=ON \
+ -DBUILD_TESTS=OFF \
-DMSVC_STATIC_RUNTIME=OFF \
-DZZIPSDL=OFF \
+ -DZZIPTEST=OFF \
-DZZIPWRAP=OFF \
$CMAKE_CROSSOPTS .
make -C build
@@ -52,5 +52,4 @@ utils() {
mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
}
-sha512sums="5e6bed4993cac880063a64b56db42f362898434e9c61916747377440f1325f649c086a3c1beeb05fb647b4f8af3fcb0407b087fc23604cd73fdd2373f132e9a5 zziplib-0.13.70.tar.gz
-e010afb7b0028aeeab974872ece233ae80ec046e7b26b05aba5effd2f50419e410a8469e134c8fbca45172aa075869ef813217b57e0551d6ef8223f7e715afed fix-merge-conflict.patch"
+sha512sums="e035d0ac26dca78335ae3defc652543ff7b353a1a95d76ed1beeb21a08e16f287a62d488f528cfbb77d5b558581b68d439aa0823577524e9aa61a3cf5f208cb5 zziplib-0.13.71.tar.gz"
diff --git a/community/zziplib/fix-merge-conflict.patch b/community/zziplib/fix-merge-conflict.patch
deleted file mode 100644
index 2e3f9c9793..0000000000
--- a/community/zziplib/fix-merge-conflict.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/docs/zzipdoc/htm2dbk.py b/docs/zzipdoc/htm2dbk.py
-index 021a22a..d0f17cc 100644
---- a/docs/zzipdoc/htm2dbk.py
-+++ b/docs/zzipdoc/htm2dbk.py
-@@ -146,13 +146,8 @@ def htm2dbk_files(args):
- doc.filename = filename
- doc.add(f.read())
- f.close()
--<<<<<<< HEAD
-- except IOError as e:
-- print >> sys.stderr, "can not open "+filename
--=======
- except IOError:
- print("can not open "+filename, file=sys.stderr)
-->>>>>>> develop
- return doc.value()
-
- def html2docbook(text):