aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleg Titov <oleg.titov@gmail.com>2021-01-18 22:49:31 +0000
committerAndy Postnikov <apostnikov@gmail.com>2021-01-18 22:49:31 +0000
commit6a0e642b9c7c42282f127b672c6eebe75f37db84 (patch)
tree0a55c5acca1e09779ac2b15c64ed3b3430de228a
parent30f03638a8048becaf0fc6243b156bd6f1539b67 (diff)
downloadaports-6a0e642b9c7c42282f127b672c6eebe75f37db84.tar.gz
aports-6a0e642b9c7c42282f127b672c6eebe75f37db84.tar.bz2
aports-6a0e642b9c7c42282f127b672c6eebe75f37db84.tar.xz
testing/libzim: upgrade to 6.3.0
Ref https://github.com/openzim/libzim/releases/tag/6.3.0
-rw-r--r--testing/docopt/APKBUILD37
-rw-r--r--testing/docopt/docopt.pc9
-rw-r--r--testing/libzim/APKBUILD9
-rw-r--r--testing/libzim/cython-not-cython3.patch11
-rw-r--r--testing/zim-tools/APKBUILD17
-rw-r--r--testing/zimwriterfs/APKBUILD29
6 files changed, 63 insertions, 49 deletions
diff --git a/testing/docopt/APKBUILD b/testing/docopt/APKBUILD
new file mode 100644
index 0000000000..ac1314fae2
--- /dev/null
+++ b/testing/docopt/APKBUILD
@@ -0,0 +1,37 @@
+# Contributor: Oleg Titov <oleg.titov@gmail.com>
+# Maintainer: Oleg Titov <oleg.titov@gmail.com>
+pkgname=docopt
+pkgver=0.6.3
+pkgrel=0
+pkgdesc="Command line arguments parser for C++11 and later"
+url="https://github.com/docopt/docopt.cpp/"
+arch="all"
+license="MIT"
+options="!check" # No test suite from upstream
+makedepends="cmake ninja"
+subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
+source="$pkgname-$pkgver.tar.gz::https://github.com/docopt/docopt.cpp/archive/v$pkgver.tar.gz
+ docopt.pc
+ "
+builddir="$srcdir/$pkgname.cpp-$pkgver"
+
+build() {
+ mkdir -p build
+
+ cmake -B build \
+ -DCMAKE_BUILD_TYPE=None \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -GNinja
+
+ ninja -C build
+}
+
+package() {
+ DESTDIR="$pkgdir" ninja -C build install
+ install -Dm644 "$srcdir/docopt.pc" "$pkgdir/usr/lib/pkgconfig/docopt.pc"
+ install -Dm644 -t "$pkgdir/usr/share/doc/$pkgname/" README.rst
+}
+
+sha512sums="01f881684d416d25f27120e7707473ee7337c09d1d3ce73bd1efd7763955c0bfa86c6d14655d989e37659af940b12c9ac0854571a758a71bf4a7f35e70277c40 docopt-0.6.3.tar.gz
+0d382418892e0d81c7cbf4eb17124c2fedbf492c727558be91354f1f5754b2ac799885d4fc7f943bf42d4cba68f9619223d626274c3b3e8ed56a86d5ac071246 docopt.pc"
diff --git a/testing/docopt/docopt.pc b/testing/docopt/docopt.pc
new file mode 100644
index 0000000000..67f4cc8082
--- /dev/null
+++ b/testing/docopt/docopt.pc
@@ -0,0 +1,9 @@
+prefix=/usr
+libdir=${prefix}/lib
+includedir=${prefix}/include/docopt
+
+Name: docopt
+Description: docopt headers and library
+Version: 0.6.3
+Libs: -L${libdir} -ldocopt
+Cflags: -I${includedir}
diff --git a/testing/libzim/APKBUILD b/testing/libzim/APKBUILD
index de32bd41eb..71ae050dad 100644
--- a/testing/libzim/APKBUILD
+++ b/testing/libzim/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Oleg Titov <oleg.titov@gmail.com>
# Maintainer: Oleg Titov <oleg.titov@gmail.com>
pkgname=libzim
-pkgver=6.1.8
+pkgver=6.3.0
pkgrel=0
pkgdesc="Reference implementation of the ZIM file format"
url="https://openzim.org/"
@@ -22,9 +22,7 @@ checkdepends="
python3-dev
"
subpackages="$pkgname-dev $pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/openzim/libzim/archive/$pkgver.tar.gz
- cython-not-cython3.patch
- "
+source="$pkgname-$pkgver.tar.gz::https://github.com/openzim/libzim/archive/$pkgver.tar.gz"
build() {
LDFLAGS="$LDFLAGS -lexecinfo"
@@ -42,5 +40,4 @@ package() {
install -Dm 644 -t "$pkgdir/usr/share/doc/$pkgname/" README.md
}
-sha512sums="f51b23b7bfda265a019bcbcaca9f27830ad74414dfd6b53d121066b097c1a8bc271783cc9c5954f861de23f3e2d74e161d5e21406975cb7f06452587614b9f80 libzim-6.1.8.tar.gz
-e2d2e749a6764c0002c123b988b24494ff76547542f17753d04b48f90785e4a92a5bb96a1840e0ebd661a727ecc1eb050679ae0ba1b3fda99410d09ac8e28f27 cython-not-cython3.patch"
+sha512sums="822e293bb1dc376256063326951571b705e5735132a137f5966d0f6ed0bb8c8289765680503b449c271ffce7e771da1f304d9ab9455cfc968a2d9943a5955090 libzim-6.3.0.tar.gz"
diff --git a/testing/libzim/cython-not-cython3.patch b/testing/libzim/cython-not-cython3.patch
deleted file mode 100644
index f445f38bdc..0000000000
--- a/testing/libzim/cython-not-cython3.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/test/pytest/meson.build b/test/pytest/meson.build
-index 3081d17..b417b67 100644
---- a/test/pytest/meson.build
-+++ b/test/pytest/meson.build
-@@ -1,5 +1,5 @@
-
--cython = find_program('cython3', required : false)
-+cython = find_program('cython', required : false)
- py3_dep = dependency('python3', required : false)
-
- if cython.found() and py3_dep.found()
diff --git a/testing/zim-tools/APKBUILD b/testing/zim-tools/APKBUILD
index b69791250a..0e8fa147f5 100644
--- a/testing/zim-tools/APKBUILD
+++ b/testing/zim-tools/APKBUILD
@@ -1,14 +1,25 @@
# Contributor: Oleg Titov <oleg.titov@gmail.com>
# Maintainer: Oleg Titov <oleg.titov@gmail.com>
pkgname=zim-tools
-pkgver=1.2.1
+pkgver=2.1.0
pkgrel=0
pkgdesc="Various ZIM command line tools"
url="https://github.com/openzim/zim-tools"
arch="all !mips !mips64" # blocked by libzim-dev
license="GPL-3.0-or-later"
options="!check" # No test suite from upstream
-makedepends="meson libzim-dev"
+makedepends="
+ cmake
+ docopt-dev
+ file-dev
+ gtest-dev
+ gumbo-parser-dev
+ libzim-dev
+ meson
+ zlib-dev
+ "
+replaces="zimwriterfs"
+provides="zimwriterfs=$pkgver-r$pkgrel"
subpackages="$pkgname-doc"
source="zim-tools-$pkgver.tar.gz::https://github.com/openzim/zim-tools/archive/$pkgver.tar.gz"
@@ -23,4 +34,4 @@ package() {
install -Dm644 README.md "$pkgdir/usr/share/doc/$pkgname/README.md"
}
-sha512sums="9658e706df18f01bdbd76580a6889009d107afff1c50d3c349f616b41cc11dbe886a53e3ddf6cab1dea6033483cc8c21774dbac40cb560450829f46dbca63c4c zim-tools-1.2.1.tar.gz"
+sha512sums="57f60fd346b06f0174cec797c7fe6353c959e49ec282e80fc0c728e197986ae099e0d5adb2e873dd73c9571ca8dbb8d22825e39042d1ea80f5ef2bc030301622 zim-tools-2.1.0.tar.gz"
diff --git a/testing/zimwriterfs/APKBUILD b/testing/zimwriterfs/APKBUILD
deleted file mode 100644
index ad3373f3dd..0000000000
--- a/testing/zimwriterfs/APKBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Contributor: Oleg Titov <oleg.titov@gmail.com>
-# Maintainer: Oleg Titov <oleg.titov@gmail.com>
-pkgname=zimwriterfs
-pkgver=1.3.10
-pkgrel=0
-pkgdesc="Console tool to create ZIM files"
-url="https://openzim.org/"
-arch="all !mips !mips64" # blocked by libzim-dev
-license="GPL-3.0-or-later"
-makedepends="meson gumbo-parser-dev file-dev libzim-dev"
-subpackages="$pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/openzim/zimwriterfs/archive/$pkgver.tar.gz"
-
-build() {
- abuild-meson . output
- meson compile ${JOBS:+-j ${JOBS}} -C output
-}
-
-check() {
- meson test --no-rebuild -v -C output
-}
-
-package() {
- DESTDIR="$pkgdir" meson install --no-rebuild -C output
-
- install -Dm 644 -t "$pkgdir/usr/share/doc/$pkgname" README.md
-}
-
-sha512sums="cc0d6c30e163c7597ac7020b2809b320df45375a8bd43672214ef1e575cd19070d034e3b8a5adbe141e1f91fab4a742761791caae13e9f0df269ec06cb603be2 zimwriterfs-1.3.10.tar.gz"