From: voidlinux-github@inbox.vuxu.org
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] zbar: fix qt option handling
Date: Sat, 15 Jun 2019 19:51:54 +0200 [thread overview]
Message-ID: <20190615175154.e-Lg254cwVpl5eIsNJ56G00Io7f1yD4mXi-zCH4GlA8@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-12456@inbox.vuxu.org>
[-- 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
next prev parent reply other threads:[~2019-06-15 17:51 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-14 17:33 [PR PATCH] " 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 [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190615175154.e-Lg254cwVpl5eIsNJ56G00Io7f1yD4mXi-zCH4GlA8@z \
--to=voidlinux-github@inbox.vuxu.org \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).