From 2b79d541b4a7bcb8aec654d8c738f369e43c8377 Mon Sep 17 00:00:00 2001
From: Kevin Daudt <kdaudt@alpinelinux.org>
Date: Sat, 22 May 2021 11:05:02 +0000
Subject: [PATCH] community/zbar: upgrade to 0.23.90
Fixes build issue with autoconf.
See
https://github.com/mchehab/zbar/commit/89e7900d85dd54ef351a7ed582aec6a5a5d7fa37
---
community/zbar/APKBUILD | 10 +++++-----
community/zbar/zbar-tp_print.patch | 28 ----------------------------
2 files changed, 5 insertions(+), 33 deletions(-)
delete mode 100644 community/zbar/zbar-tp_print.patch
diff --git a/community/zbar/APKBUILD b/community/zbar/APKBUILD
index cc3777987e12..349287914cd5 100644
--- a/community/zbar/APKBUILD
+++ b/community/zbar/APKBUILD
@@ -3,8 +3,8 @@
# Contributor: Diego Queiroz <diego.queiroz@gmail.com>
# Maintainer: Diego Queiroz <diego.queiroz@gmail.com>
pkgname=zbar
-pkgver=0.23.1
-pkgrel=4
+pkgver=0.23.90
+pkgrel=0
pkgdesc="Port of ZBAR BAR CODE READER"
url="http://zbar.sourceforge.net/"
arch="all"
@@ -23,7 +23,6 @@ subpackages="
"
source="
$pkgname-$pkgver.tar.gz::https://github.com/mchehab/zbar/archive/$pkgver.tar.gz
- zbar-tp_print.patch
"
prepare() {
@@ -78,5 +77,6 @@ py() {
mv "$pkgdir"/usr/lib/python3* "$subpkgdir"/usr/lib
}
-sha512sums="ae7741cf750a10cf53dc11abcd482c3885507153ee37f6e3364ed5ed72184ebb009560b8c40d8090603a551fb681700a962838a59ce77d005d080ee49fbfa54b zbar-0.23.1.tar.gz
-ffaed0dcbb15d45d8c384bc2bb78c2afb64a883499ac80d60873e8c86a9c49fd35a497ec577e22f7ffbc530eed4182d0ee6eecea9747a1eafe2484819aa35ff3 zbar-tp_print.patch"
+sha512sums="
+d73d71873bec68ee021997512a9edbd223f5f5fe43c66c4dd3502224ba6009be2e5e1714766cb8e1056244673e87e0939ed0319116f61d7371b5ab79fb5e04eb zbar-0.23.90.tar.gz
+"
diff --git a/community/zbar/zbar-tp_print.patch b/community/zbar/zbar-tp_print.patch
deleted file mode 100644
index 9d6282dab41a..000000000000
--- a/community/zbar/zbar-tp_print.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/python/enum.c~ 2019-05-22 06:00:30.000000000 -0500
-+++ b/python/enum.c 2020-07-20 12:29:37.468767649 -0500
-@@ -76,6 +76,7 @@
- return(self->name);
- }
-
-+#if PY_MAJOR_VERSION < 3
- static int
- enumitem_print (zbarEnumItem *self,
- FILE *fp,
-@@ -83,6 +84,7 @@
- {
- return(self->name->ob_type->tp_print(self->name, fp, flags));
- }
-+#endif
-
- static PyObject*
- enumitem_repr (zbarEnumItem *self)
-@@ -115,7 +117,9 @@
- .tp_new = (newfunc)enumitem_new,
- .tp_dealloc = (destructor)enumitem_dealloc,
- .tp_str = (reprfunc)enumitem_str,
-+#if PY_MAJOR_VERSION < 3
- .tp_print = (printfunc)enumitem_print,
-+#endif
- .tp_repr = (reprfunc)enumitem_repr,
- };
-
--
GitLab