Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] zbar: fix qt option handling
@ 2019-06-14 17:33 voidlinux-github
  2019-06-14 18:42 ` [PR PATCH] [Updated] " voidlinux-github
                   ` (13 more replies)
  0 siblings, 14 replies; 15+ messages in thread
From: voidlinux-github @ 2019-06-14 17:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 359 bytes --]

There is a new pull request by hadrianw against master on the void-packages repository

https://github.com/hadrianw/void-packages master
https://github.com/void-linux/void-packages/pull/12456

zbar: fix qt option handling
The option in configure is called qt not qt5.

A patch file from https://github.com/void-linux/void-packages/pull/12456.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-12456.patch --]
[-- Type: application/text/x-diff, Size: 896 bytes --]

From f45d474e9b7727446ad32df4b61db61fa47579f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hadrian=20W=C4=99grzynowski?= <hadrian@hawski.com>
Date: Fri, 14 Jun 2019 19:10:02 +0200
Subject: [PATCH] zbar: fix qt option handling

---
 srcpkgs/zbar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zbar/template b/srcpkgs/zbar/template
index 7288518e4f1..3cf1c3f6911 100644
--- a/srcpkgs/zbar/template
+++ b/srcpkgs/zbar/template
@@ -3,7 +3,7 @@ pkgname=zbar
 version=0.10
 revision=7
 build_style=gnu-configure
-configure_args="ac_cv_header_wand_MagickWand_h=yes $(vopt_with qt qt5) --with-gtk"
+configure_args="ac_cv_header_wand_MagickWand_h=yes $(vopt_with qt) --with-gtk"
 hostmakedepends="automake pkg-config libtool gettext-devel python
  $(vopt_if qt 'qt5-qmake qt5-host-tools') glib-devel"
 makedepends="libmagick-devel libXv-devel pygtk-devel v4l-utils-devel

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PR PATCH] [Updated] zbar: fix qt option handling
  2019-06-14 17:33 [PR PATCH] zbar: fix qt option handling voidlinux-github
  2019-06-14 18:42 ` [PR PATCH] [Updated] " voidlinux-github
@ 2019-06-14 18:42 ` voidlinux-github
  2019-06-14 18:43 ` voidlinux-github
                   ` (11 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: voidlinux-github @ 2019-06-14 18:42 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 364 bytes --]

There is an updated pull request by hadrianw against master on the void-packages repository

https://github.com/hadrianw/void-packages master
https://github.com/void-linux/void-packages/pull/12456

zbar: fix qt option handling
The option in configure is called qt not qt5.

A patch file from https://github.com/void-linux/void-packages/pull/12456.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-12456.patch --]
[-- Type: application/text/x-diff, Size: 2137 bytes --]

From f45d474e9b7727446ad32df4b61db61fa47579f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hadrian=20W=C4=99grzynowski?= <hadrian@hawski.com>
Date: Fri, 14 Jun 2019 19:10:02 +0200
Subject: [PATCH 1/2] zbar: fix qt option handling

---
 srcpkgs/zbar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zbar/template b/srcpkgs/zbar/template
index 7288518e4f1..3cf1c3f6911 100644
--- a/srcpkgs/zbar/template
+++ b/srcpkgs/zbar/template
@@ -3,7 +3,7 @@ pkgname=zbar
 version=0.10
 revision=7
 build_style=gnu-configure
-configure_args="ac_cv_header_wand_MagickWand_h=yes $(vopt_with qt qt5) --with-gtk"
+configure_args="ac_cv_header_wand_MagickWand_h=yes $(vopt_with qt) --with-gtk"
 hostmakedepends="automake pkg-config libtool gettext-devel python
  $(vopt_if qt 'qt5-qmake qt5-host-tools') glib-devel"
 makedepends="libmagick-devel libXv-devel pygtk-devel v4l-utils-devel

From 4d75fd9ccc7c328b5dc108a2457840bb686021ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hadrian=20W=C4=99grzynowski?= <hadrian@hawski.com>
Date: Fri, 14 Jun 2019 20:42:14 +0200
Subject: [PATCH 2/2] zbar: fix xlint issues

---
 srcpkgs/zbar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zbar/template b/srcpkgs/zbar/template
index 3cf1c3f6911..d99aa0e667a 100644
--- a/srcpkgs/zbar/template
+++ b/srcpkgs/zbar/template
@@ -8,13 +8,13 @@ hostmakedepends="automake pkg-config libtool gettext-devel python
  $(vopt_if qt 'qt5-qmake qt5-host-tools') glib-devel"
 makedepends="libmagick-devel libXv-devel pygtk-devel v4l-utils-devel
  $(vopt_if qt qt5-x11extras-devel)"
-short_desc="A barcode reading library and application"
+depends="libzbar-${version}_${revision}"
+short_desc="Barcode reading library and application"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-2.1-or-later"
 homepage="https://zbar.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/zbar/${version}/${pkgname}-${version}.tar.bz2"
 checksum=234efb39dbbe5cef4189cc76f37afbe3cfcfb45ae52493bfe8e191318bdbadc6
-depends="libzbar-${version}_${revision}"
 
 build_options="qt"
 case "$XBPS_TARGET_MACHINE" in

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PR PATCH] [Updated] zbar: fix qt option handling
  2019-06-14 17:33 [PR PATCH] zbar: fix qt option handling voidlinux-github
@ 2019-06-14 18:42 ` voidlinux-github
  2019-06-14 18:42 ` voidlinux-github
                   ` (12 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: voidlinux-github @ 2019-06-14 18:42 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 364 bytes --]

There is an updated pull request by hadrianw against master on the void-packages repository

https://github.com/hadrianw/void-packages master
https://github.com/void-linux/void-packages/pull/12456

zbar: fix qt option handling
The option in configure is called qt not qt5.

A patch file from https://github.com/void-linux/void-packages/pull/12456.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-12456.patch --]
[-- Type: application/text/x-diff, Size: 2137 bytes --]

From f45d474e9b7727446ad32df4b61db61fa47579f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hadrian=20W=C4=99grzynowski?= <hadrian@hawski.com>
Date: Fri, 14 Jun 2019 19:10:02 +0200
Subject: [PATCH 1/2] zbar: fix qt option handling

---
 srcpkgs/zbar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zbar/template b/srcpkgs/zbar/template
index 7288518e4f1..3cf1c3f6911 100644
--- a/srcpkgs/zbar/template
+++ b/srcpkgs/zbar/template
@@ -3,7 +3,7 @@ pkgname=zbar
 version=0.10
 revision=7
 build_style=gnu-configure
-configure_args="ac_cv_header_wand_MagickWand_h=yes $(vopt_with qt qt5) --with-gtk"
+configure_args="ac_cv_header_wand_MagickWand_h=yes $(vopt_with qt) --with-gtk"
 hostmakedepends="automake pkg-config libtool gettext-devel python
  $(vopt_if qt 'qt5-qmake qt5-host-tools') glib-devel"
 makedepends="libmagick-devel libXv-devel pygtk-devel v4l-utils-devel

From 4d75fd9ccc7c328b5dc108a2457840bb686021ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hadrian=20W=C4=99grzynowski?= <hadrian@hawski.com>
Date: Fri, 14 Jun 2019 20:42:14 +0200
Subject: [PATCH 2/2] zbar: fix xlint issues

---
 srcpkgs/zbar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zbar/template b/srcpkgs/zbar/template
index 3cf1c3f6911..d99aa0e667a 100644
--- a/srcpkgs/zbar/template
+++ b/srcpkgs/zbar/template
@@ -8,13 +8,13 @@ hostmakedepends="automake pkg-config libtool gettext-devel python
  $(vopt_if qt 'qt5-qmake qt5-host-tools') glib-devel"
 makedepends="libmagick-devel libXv-devel pygtk-devel v4l-utils-devel
  $(vopt_if qt qt5-x11extras-devel)"
-short_desc="A barcode reading library and application"
+depends="libzbar-${version}_${revision}"
+short_desc="Barcode reading library and application"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-2.1-or-later"
 homepage="https://zbar.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/zbar/${version}/${pkgname}-${version}.tar.bz2"
 checksum=234efb39dbbe5cef4189cc76f37afbe3cfcfb45ae52493bfe8e191318bdbadc6
-depends="libzbar-${version}_${revision}"
 
 build_options="qt"
 case "$XBPS_TARGET_MACHINE" in

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: zbar: fix qt option handling
  2019-06-14 17:33 [PR PATCH] zbar: fix qt option handling voidlinux-github
  2019-06-14 18:42 ` [PR PATCH] [Updated] " voidlinux-github
  2019-06-14 18:42 ` voidlinux-github
@ 2019-06-14 18:43 ` voidlinux-github
  2019-06-14 18:43 ` voidlinux-github
                   ` (10 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: voidlinux-github @ 2019-06-14 18:43 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 258 bytes --]

New comment by hadrianw on void-packages repository

https://github.com/void-linux/void-packages/pull/12456#issuecomment-502221190
Comment:
Can I do something about ```ERROR: zbar-0.10_7: failed to install 'gettext-devel-0.20.1_1' dependency! (error 19)```?

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: zbar: fix qt option handling
  2019-06-14 17:33 [PR PATCH] zbar: fix qt option handling voidlinux-github
                   ` (2 preceding siblings ...)
  2019-06-14 18:43 ` voidlinux-github
@ 2019-06-14 18:43 ` voidlinux-github
  2019-06-15  8:00 ` voidlinux-github
                   ` (9 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: voidlinux-github @ 2019-06-14 18:43 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 261 bytes --]

New comment by hadrianw on void-packages repository

https://github.com/void-linux/void-packages/pull/12456#issuecomment-502221190
Comment:
Can I do something about

```ERROR: zbar-0.10_7: failed to install 'gettext-devel-0.20.1_1' dependency! (error 19)```?

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: zbar: fix qt option handling
  2019-06-14 17:33 [PR PATCH] zbar: fix qt option handling voidlinux-github
                   ` (3 preceding siblings ...)
  2019-06-14 18:43 ` voidlinux-github
@ 2019-06-15  8:00 ` voidlinux-github
  2019-06-15  8:04 ` voidlinux-github
                   ` (8 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: voidlinux-github @ 2019-06-15  8:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 366 bytes --]

New comment by Hoshpak on void-packages repository

https://github.com/void-linux/void-packages/pull/12456#issuecomment-502344942
Comment:
No, this is the outdated docker image on travis. You can either run local builds for the relevant architecture and confirm that it works fine or wait until a commiter finds the time to run local builds and merge it afterwards.

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: zbar: fix qt option handling
  2019-06-14 17:33 [PR PATCH] zbar: fix qt option handling voidlinux-github
                   ` (4 preceding siblings ...)
  2019-06-15  8:00 ` voidlinux-github
@ 2019-06-15  8:04 ` voidlinux-github
  2019-06-15 13:33 ` voidlinux-github
                   ` (7 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: voidlinux-github @ 2019-06-15  8:04 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 367 bytes --]

New comment by Hoshpak on void-packages repository

https://github.com/void-linux/void-packages/pull/12456#issuecomment-502344942
Comment:
No, this is the outdated docker image on travis. You can either run local builds for the relevant architectures and confirm that it works fine or wait until a commiter finds the time to run local builds and merge it afterwards.

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: zbar: fix qt option handling
  2019-06-14 17:33 [PR PATCH] zbar: fix qt option handling voidlinux-github
                   ` (5 preceding siblings ...)
  2019-06-15  8:04 ` voidlinux-github
@ 2019-06-15 13:33 ` voidlinux-github
  2019-06-15 17:36 ` voidlinux-github
                   ` (6 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: voidlinux-github @ 2019-06-15 13:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1262 bytes --]

New comment by hadrianw on void-packages repository

https://github.com/void-linux/void-packages/pull/12456#issuecomment-502367345
Comment:
I successfully built the package with a following script:
```
#!/bin/sh
set -x
set -e

function __BUILD__() {
	git clean -fdx -e /hostdir
	case "$1" in
		i686) bootstrap=i686;;
		*-musl) bootstrap=x86_64-musl;;
		*) bootstrap=x86_64;;
	esac
	shift
	./xbps-src binary-bootstrap "$bootstrap"
	./xbps-src -j4 "$@" pkg zbar
}

wget  -N "https://alpha.de.repo.voidlinux.org/static/xbps-static-latest.x86_64-musl.tar.xz"
mkdir -p xbps
tar xf xbps-static-latest.x86_64-musl.tar.xz -C xbps
export PATH="$PWD/xbps/usr/bin:$PATH"

(cd void-packages && git pull origin master) ||
git clone --depth 1 git@github.com:hadrianw/void-packages.git

cd void-packages

for arch in x86_64 x86_64-musl i686; do
	__BUILD__ "$arch" || failed="$failed $arch"
done
for arch in aarch64 armv7l armv6l-musl aarch64-musl; do
	source "common/cross-profiles/$arch.sh" &&
	__BUILD__ "$arch" -a "$arch" || failed="$failed $arch"
done

echo Failed:$failed
```

I attach the build log.
```hadrian@karton $ ./check.sh &> build.log```
[build.log](https://github.com/void-linux/void-packages/files/3293131/build.log)


^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: zbar: fix qt option handling
  2019-06-14 17:33 [PR PATCH] zbar: fix qt option handling voidlinux-github
                   ` (6 preceding siblings ...)
  2019-06-15 13:33 ` voidlinux-github
@ 2019-06-15 17:36 ` voidlinux-github
  2019-06-15 17:51 ` [PR PATCH] [Updated] " voidlinux-github
                   ` (5 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: voidlinux-github @ 2019-06-15 17:36 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 369 bytes --]

New comment by hadrianw on void-packages repository

https://github.com/void-linux/void-packages/pull/12456#issuecomment-502385524
Comment:
Also successfully built without qt option:
```hadrian@karton $ XBPS_PKG_OPTIONS=~qt ./check.sh &> build-without-qt.log```
[build-without-qt.log](https://github.com/void-linux/void-packages/files/3293381/build-without-qt.log)


^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PR PATCH] [Updated] zbar: fix qt option handling
  2019-06-14 17:33 [PR PATCH] zbar: fix qt option handling voidlinux-github
                   ` (8 preceding siblings ...)
  2019-06-15 17:51 ` [PR PATCH] [Updated] " voidlinux-github
@ 2019-06-15 17:51 ` voidlinux-github
  2019-06-15 17:52 ` voidlinux-github
                   ` (3 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: voidlinux-github @ 2019-06-15 17:51 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 364 bytes --]

There is an updated pull request by hadrianw against master on the void-packages repository

https://github.com/hadrianw/void-packages master
https://github.com/void-linux/void-packages/pull/12456

zbar: fix qt option handling
The option in configure is called qt not qt5.

A patch file from https://github.com/void-linux/void-packages/pull/12456.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-12456.patch --]
[-- Type: application/text/x-diff, Size: 2358 bytes --]

From f45d474e9b7727446ad32df4b61db61fa47579f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hadrian=20W=C4=99grzynowski?= <hadrian@hawski.com>
Date: Fri, 14 Jun 2019 19:10:02 +0200
Subject: [PATCH 1/2] zbar: fix qt option handling

---
 srcpkgs/zbar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zbar/template b/srcpkgs/zbar/template
index 7288518e4f1..3cf1c3f6911 100644
--- a/srcpkgs/zbar/template
+++ b/srcpkgs/zbar/template
@@ -3,7 +3,7 @@ pkgname=zbar
 version=0.10
 revision=7
 build_style=gnu-configure
-configure_args="ac_cv_header_wand_MagickWand_h=yes $(vopt_with qt qt5) --with-gtk"
+configure_args="ac_cv_header_wand_MagickWand_h=yes $(vopt_with qt) --with-gtk"
 hostmakedepends="automake pkg-config libtool gettext-devel python
  $(vopt_if qt 'qt5-qmake qt5-host-tools') glib-devel"
 makedepends="libmagick-devel libXv-devel pygtk-devel v4l-utils-devel

From 863f7d4118a98f164514a9133f17c265ce9b30ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hadrian=20W=C4=99grzynowski?= <hadrian@hawski.com>
Date: Fri, 14 Jun 2019 20:42:14 +0200
Subject: [PATCH 2/2] zbar: fix xlint issues

Also bump the revision number.
---
 srcpkgs/zbar/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zbar/template b/srcpkgs/zbar/template
index 3cf1c3f6911..100b3076b84 100644
--- a/srcpkgs/zbar/template
+++ b/srcpkgs/zbar/template
@@ -1,20 +1,20 @@
 # Template file for 'zbar'
 pkgname=zbar
 version=0.10
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="ac_cv_header_wand_MagickWand_h=yes $(vopt_with qt) --with-gtk"
 hostmakedepends="automake pkg-config libtool gettext-devel python
  $(vopt_if qt 'qt5-qmake qt5-host-tools') glib-devel"
 makedepends="libmagick-devel libXv-devel pygtk-devel v4l-utils-devel
  $(vopt_if qt qt5-x11extras-devel)"
-short_desc="A barcode reading library and application"
+depends="libzbar-${version}_${revision}"
+short_desc="Barcode reading library and application"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-2.1-or-later"
 homepage="https://zbar.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/zbar/${version}/${pkgname}-${version}.tar.bz2"
 checksum=234efb39dbbe5cef4189cc76f37afbe3cfcfb45ae52493bfe8e191318bdbadc6
-depends="libzbar-${version}_${revision}"
 
 build_options="qt"
 case "$XBPS_TARGET_MACHINE" in

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PR PATCH] [Updated] zbar: fix qt option handling
  2019-06-14 17:33 [PR PATCH] zbar: fix qt option handling voidlinux-github
                   ` (7 preceding siblings ...)
  2019-06-15 17:36 ` voidlinux-github
@ 2019-06-15 17:51 ` voidlinux-github
  2019-06-15 17:51 ` voidlinux-github
                   ` (4 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: voidlinux-github @ 2019-06-15 17:51 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 364 bytes --]

There is an updated pull request by hadrianw against master on the void-packages repository

https://github.com/hadrianw/void-packages master
https://github.com/void-linux/void-packages/pull/12456

zbar: fix qt option handling
The option in configure is called qt not qt5.

A patch file from https://github.com/void-linux/void-packages/pull/12456.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-12456.patch --]
[-- Type: application/text/x-diff, Size: 2358 bytes --]

From f45d474e9b7727446ad32df4b61db61fa47579f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hadrian=20W=C4=99grzynowski?= <hadrian@hawski.com>
Date: Fri, 14 Jun 2019 19:10:02 +0200
Subject: [PATCH 1/2] zbar: fix qt option handling

---
 srcpkgs/zbar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zbar/template b/srcpkgs/zbar/template
index 7288518e4f1..3cf1c3f6911 100644
--- a/srcpkgs/zbar/template
+++ b/srcpkgs/zbar/template
@@ -3,7 +3,7 @@ pkgname=zbar
 version=0.10
 revision=7
 build_style=gnu-configure
-configure_args="ac_cv_header_wand_MagickWand_h=yes $(vopt_with qt qt5) --with-gtk"
+configure_args="ac_cv_header_wand_MagickWand_h=yes $(vopt_with qt) --with-gtk"
 hostmakedepends="automake pkg-config libtool gettext-devel python
  $(vopt_if qt 'qt5-qmake qt5-host-tools') glib-devel"
 makedepends="libmagick-devel libXv-devel pygtk-devel v4l-utils-devel

From 863f7d4118a98f164514a9133f17c265ce9b30ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hadrian=20W=C4=99grzynowski?= <hadrian@hawski.com>
Date: Fri, 14 Jun 2019 20:42:14 +0200
Subject: [PATCH 2/2] zbar: fix xlint issues

Also bump the revision number.
---
 srcpkgs/zbar/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zbar/template b/srcpkgs/zbar/template
index 3cf1c3f6911..100b3076b84 100644
--- a/srcpkgs/zbar/template
+++ b/srcpkgs/zbar/template
@@ -1,20 +1,20 @@
 # Template file for 'zbar'
 pkgname=zbar
 version=0.10
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="ac_cv_header_wand_MagickWand_h=yes $(vopt_with qt) --with-gtk"
 hostmakedepends="automake pkg-config libtool gettext-devel python
  $(vopt_if qt 'qt5-qmake qt5-host-tools') glib-devel"
 makedepends="libmagick-devel libXv-devel pygtk-devel v4l-utils-devel
  $(vopt_if qt qt5-x11extras-devel)"
-short_desc="A barcode reading library and application"
+depends="libzbar-${version}_${revision}"
+short_desc="Barcode reading library and application"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-2.1-or-later"
 homepage="https://zbar.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/zbar/${version}/${pkgname}-${version}.tar.bz2"
 checksum=234efb39dbbe5cef4189cc76f37afbe3cfcfb45ae52493bfe8e191318bdbadc6
-depends="libzbar-${version}_${revision}"
 
 build_options="qt"
 case "$XBPS_TARGET_MACHINE" in

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: zbar: fix qt option handling
  2019-06-14 17:33 [PR PATCH] zbar: fix qt option handling voidlinux-github
                   ` (9 preceding siblings ...)
  2019-06-15 17:51 ` voidlinux-github
@ 2019-06-15 17:52 ` voidlinux-github
  2019-06-15 18:49 ` voidlinux-github
                   ` (2 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: voidlinux-github @ 2019-06-15 17:52 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 170 bytes --]

New comment by hadrianw on void-packages repository

https://github.com/void-linux/void-packages/pull/12456#issuecomment-502386693
Comment:
I bumped the revision number.

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: zbar: fix qt option handling
  2019-06-14 17:33 [PR PATCH] zbar: fix qt option handling voidlinux-github
                   ` (10 preceding siblings ...)
  2019-06-15 17:52 ` voidlinux-github
@ 2019-06-15 18:49 ` voidlinux-github
  2019-06-15 18:51 ` voidlinux-github
  2019-06-16 11:52 ` [PR PATCH] [Merged]: " voidlinux-github
  13 siblings, 0 replies; 15+ messages in thread
From: voidlinux-github @ 2019-06-15 18:49 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 373 bytes --]

New comment by hadrianw on void-packages repository

https://github.com/void-linux/void-packages/pull/12456#issuecomment-502390601
Comment:
For completeness - logs after revision bump.
[build.log](https://github.com/void-linux/void-packages/files/3293436/build.log)
[build-without-qt.log](https://github.com/void-linux/void-packages/files/3293437/build-without-qt.log)


^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: zbar: fix qt option handling
  2019-06-14 17:33 [PR PATCH] zbar: fix qt option handling voidlinux-github
                   ` (11 preceding siblings ...)
  2019-06-15 18:49 ` voidlinux-github
@ 2019-06-15 18:51 ` voidlinux-github
  2019-06-16 11:52 ` [PR PATCH] [Merged]: " voidlinux-github
  13 siblings, 0 replies; 15+ messages in thread
From: voidlinux-github @ 2019-06-15 18:51 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1416 bytes --]

New comment by hadrianw on void-packages repository

https://github.com/void-linux/void-packages/pull/12456#issuecomment-502390601
Comment:
For completeness - logs after revision bump.
[build.log](https://github.com/void-linux/void-packages/files/3293436/build.log)
[build-without-qt.log](https://github.com/void-linux/void-packages/files/3293437/build-without-qt.log)

Run through slightly improved script:
```
#!/bin/sh
set -x
set -e

function __BUILD__() {
        git clean -fdx -e /hostdir
        case "$1" in
                i686) bootstrap=i686;;
                *-musl) bootstrap=x86_64-musl;;
                *) bootstrap=x86_64;;
        esac
        shift
        ./xbps-src binary-bootstrap "$bootstrap"
        ./xbps-src -j4 "$@" pkg zbar
}

wget  -N "https://alpha.de.repo.voidlinux.org/static/xbps-static-latest.x86_64-musl.tar.xz"
mkdir -p xbps
tar xf xbps-static-latest.x86_64-musl.tar.xz -C xbps
export PATH="$PWD/xbps/usr/bin:$PATH"

(cd void-packages && git pull origin master) ||
git clone git@github.com:hadrianw/void-packages.git

cd void-packages

for arch in x86_64 x86_64-musl i686; do
        (__BUILD__ "$arch") || failed="$failed $arch"
done
for arch in aarch64 armv7l armv6l-musl aarch64-musl; do
        (source "common/cross-profiles/$arch.sh" &&
        __BUILD__ "$arch" -a "$arch") || failed="$failed $arch"
done

echo Failed:$failed
```

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PR PATCH] [Merged]: zbar: fix qt option handling
  2019-06-14 17:33 [PR PATCH] zbar: fix qt option handling voidlinux-github
                   ` (12 preceding siblings ...)
  2019-06-15 18:51 ` voidlinux-github
@ 2019-06-16 11:52 ` voidlinux-github
  13 siblings, 0 replies; 15+ messages in thread
From: voidlinux-github @ 2019-06-16 11:52 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 206 bytes --]

There's a merged pull request on the void-packages repository

zbar: fix qt option handling
https://github.com/void-linux/void-packages/pull/12456
Description: The option in configure is called qt not qt5.

^ permalink raw reply	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2019-06-16 11:52 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-14 17:33 [PR PATCH] zbar: fix qt option handling voidlinux-github
2019-06-14 18:42 ` [PR PATCH] [Updated] " voidlinux-github
2019-06-14 18:42 ` voidlinux-github
2019-06-14 18:43 ` voidlinux-github
2019-06-14 18:43 ` voidlinux-github
2019-06-15  8:00 ` voidlinux-github
2019-06-15  8:04 ` voidlinux-github
2019-06-15 13:33 ` voidlinux-github
2019-06-15 17:36 ` voidlinux-github
2019-06-15 17:51 ` [PR PATCH] [Updated] " voidlinux-github
2019-06-15 17:51 ` voidlinux-github
2019-06-15 17:52 ` voidlinux-github
2019-06-15 18:49 ` voidlinux-github
2019-06-15 18:51 ` voidlinux-github
2019-06-16 11:52 ` [PR PATCH] [Merged]: " voidlinux-github

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).