Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] zbar: split qt out
@ 2020-09-25  0:52 sgn
  2020-09-25  0:55 ` [PR PATCH] [Updated] " sgn
                   ` (5 more replies)
  0 siblings, 6 replies; 7+ messages in thread
From: sgn @ 2020-09-25  0:52 UTC (permalink / raw)
  To: ml

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

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

https://github.com/sgn/void-packages zbar-no-qt
https://github.com/void-linux/void-packages/pull/25074

zbar: split qt out
@pullmoll 

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-zbar-no-qt-25074.patch --]
[-- Type: text/x-diff, Size: 1762 bytes --]

From be7869c9dc20bb23b0edc68741cfea4c46529828 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 25 Sep 2020 07:51:18 +0700
Subject: [PATCH] zbar: split qt out

---
 common/shlibs         |  2 +-
 srcpkgs/zbar/template | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 23d24e49060..39ee28fd2fe 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3016,7 +3016,7 @@ libslopy.so.7.5 slop-7.5_1
 libbcunit.so.1 bcunit-3.0_1
 libzbar.so.0 libzbar-0.10_1
 libzbargtk.so.0 libzbar-0.10_1
-libzbarqt.so.0 libzbar-0.10_1
+libzbarqt.so.0 libzbar-0.10_10
 libargtable2.so.0 argtable-2.13_1
 libomxil-bellagio.so.0 libomxil-bellagio-0.9.3_1
 libomxdynamicloader.so.0 libomxil-bellagio-0.9.3_1
diff --git a/srcpkgs/zbar/template b/srcpkgs/zbar/template
index 4f8ba99653e..9cdc56c851a 100644
--- a/srcpkgs/zbar/template
+++ b/srcpkgs/zbar/template
@@ -1,7 +1,7 @@
 # Template file for 'zbar'
 pkgname=zbar
 version=0.10
-revision=9
+revision=10
 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
@@ -32,10 +32,21 @@ pre_configure() {
 libzbar_package() {
 	short_desc+=" - library files"
 	pkg_install() {
-		vmove "usr/lib/*.so.*"
+		vmove "usr/lib/libzbar.so.*"
+		vmove "usr/lib/libzbargtk.so.*"
 	}
 }
 
+if [ "$build_option_qt" ]; then
+	libzbar-qt_package() {
+		conflicts="libzbar<0.10_10"
+		short_desc+=" - Qt bindings"
+		pkg_install() {
+			vmove "usr/lib/libzbarqt.so.*"
+		}
+	}
+fi
+
 libzbar-devel_package() {
 	short_desc+=" - development files"
 	depends="libzbar>=${version}_${revision}"

^ permalink raw reply	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-09-27  4:22 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-25  0:52 [PR PATCH] zbar: split qt out sgn
2020-09-25  0:55 ` [PR PATCH] [Updated] " sgn
2020-09-25  1:08 ` ericonr
2020-09-25  1:11 ` sgn
2020-09-25  1:19 ` ericonr
2020-09-27  4:22 ` [PR PATCH] [Closed]: " sgn
2020-09-27  4:22 ` sgn

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).