From a5d075a493c9af1c6814b6e1a50dd3660ffd8e04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 25 Sep 2020 07:51:18 +0700 Subject: [PATCH] zbar: split qt out --- common/shlibs | 2 +- srcpkgs/libzbar-qt | 1 + srcpkgs/zbar/template | 15 +++++++++++++-- 3 files changed, 15 insertions(+), 3 deletions(-) create mode 120000 srcpkgs/libzbar-qt 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/libzbar-qt b/srcpkgs/libzbar-qt new file mode 120000 index 00000000000..8660d16a458 --- /dev/null +++ b/srcpkgs/libzbar-qt @@ -0,0 +1 @@ +zbar \ No newline at end of file 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}"