Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 524290 Details for
Bug 641920
media-gfx/zbar-0.20 version bump with Qt5 support (was: optionally depends on deprecated Qt4)
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
zbar-0.20.ebuild.patch
zbar-0.20.ebuild.patch (text/plain), 5.32 KB, created by
Andreas Sturmlechner
on 2018-03-18 19:53:40 UTC
(
hide
)
Description:
zbar-0.20.ebuild.patch
Filename:
MIME Type:
Creator:
Andreas Sturmlechner
Created:
2018-03-18 19:53:40 UTC
Size:
5.32 KB
patch
obsolete
>--- zbar-0.10_p20121015-r2.ebuild 2018-03-17 17:53:37.638495281 +0100 >+++ zbar-0.20.ebuild 2018-03-18 20:45:59.510225788 +0100 >@@ -5,30 +5,34 @@ > > PYTHON_COMPAT=( python2_7 ) > >-inherit autotools flag-o-matic java-pkg-opt-2 multilib-minimal \ >- python-single-r1 virtualx >+inherit autotools flag-o-matic java-pkg-opt-2 multilib-minimal python-single-r1 virtualx > > DESCRIPTION="Library and tools for reading barcodes from images or video" >-HOMEPAGE="http://zbar.sourceforge.net/" >-SRC_URI="https://dev.gentoo.org/~xmw/zbar-0.10_p20121015.zip" >+HOMEPAGE="https://github.com/procxx/zbar" >+SRC_URI="https://github.com/procxx/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" > > LICENSE="LGPL-2.1" > SLOT="0" >-KEYWORDS="amd64 ~arm x86" >-IUSE="gtk imagemagick java jpeg python qt4 static-libs test +threads v4l X xv" >+KEYWORDS="~amd64 ~arm ~x86" >+IUSE="gtk imagemagick java jpeg python qt5 static-libs test +threads v4l X xv" > REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) > test? ( X ${PYTHON_REQUIRED_USE} )" > >-CDEPEND="gtk? ( dev-libs/glib:2[${MULTILIB_USEDEP}] >- x11-libs/gtk+:2[${MULTILIB_USEDEP}] ) >+CDEPEND=" >+ gtk? ( >+ dev-libs/glib:2[${MULTILIB_USEDEP}] >+ x11-libs/gtk+:2[${MULTILIB_USEDEP}] >+ ) > imagemagick? ( virtual/imagemagick-tools ) > jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] ) > python? ( > ${PYTHON_DEPS} > gtk? ( >=dev-python/pygtk-2[${PYTHON_USEDEP}] ) > ) >- qt4? ( dev-qt/qtcore:4[${MULTILIB_USEDEP}] >- dev-qt/qtgui:4[${MULTILIB_USEDEP}] ) >+ qt5? ( >+ dev-qt/qtcore:5 >+ dev-qt/qtgui:5 >+ ) > X? ( > x11-libs/libXext[${MULTILIB_USEDEP}] > xv? ( x11-libs/libXv[${MULTILIB_USEDEP}] ) >@@ -36,13 +40,20 @@ > RDEPEND="${CDEPEND} > java? ( >=virtual/jre-1.4 )" > DEPEND="${CDEPEND} >- java? ( >=virtual/jdk-1.4 >- test? ( dev-java/junit:4 >- dev-java/hamcrest-core:1.3 ) ) >+ java? ( >+ >=virtual/jdk-1.4 >+ test? ( >+ dev-java/junit:4 >+ dev-java/hamcrest-core:1.3 >+ ) >+ ) > test? ( ${PYTHON_DEPS} ) > app-arch/unzip > sys-devel/gettext >- virtual/pkgconfig" >+ virtual/pkgconfig >+" >+ >+PATCHES=( "${FILESDIR}"/${PN}-0.10-errors.patch ) > > pkg_setup() { > if use python || use test; then >@@ -51,23 +62,11 @@ > java-pkg-opt-2_pkg_setup > } > >-src_unpack() { >- #vcs-snapshot doesn't work on .zip >- default >- mv * ${P} || die >-} >- > src_prepare() { >- eapply "${FILESDIR}"/${PN}-0.10-errors.patch \ >- "${FILESDIR}"/${PN}-0.10-python-crash.patch \ >- "${FILESDIR}"/${PN}-0.10-v4l2-uvcvideo.patch >- >- # fix use of deprecated qt4 function, bug 572488 >- sed -e 's:numBytes:byteCount:g' \ >- -i "${S}"/include/zbar/QZBarImage.h || die >+ default > > if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then >- eapply "${FILESDIR}/${P}-ImageMagick-7.diff" >+ eapply "${FILESDIR}/${PN}-0.10_p20121015-ImageMagick-7.diff" > fi > > use python && python_fix_shebang examples/upcrpc.py test/*.py >@@ -82,39 +81,54 @@ > } > > multilib_src_configure() { >- if multilib_is_native_abi && use java; then >- export JAVACFLAGS="$(java-pkg_javac-args)" >- export JAVA_CFLAGS="$(java-pkg_get-jni-cflags)" >- if use test ; then # bug 629078 >- java-pkg_append_ CLASSPATH . >- java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only junit-4 junit.jar) >- java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only hamcrest-core-1.3 hamcrest-core.jar) >- fi >- fi >- > append-cppflags -DNDEBUG > >+ local myeconfargs=( >+ $(multilib_native_use_with java) >+ $(use_with jpeg) >+ $(use_with gtk) >+ $(multilib_native_use_with python) >+ $(use_enable static-libs static) >+ $(use_enable threads pthread) >+ $(use_with X x) >+ $(use_with xv xv) >+ $(use_enable v4l video) >+ ) >+ > # different flags for image/graphics magick (bug 552350) >- myimagemagick="--without-imagemagick" >- has_version media-gfx/imagemagick && >- myimagemagick="$(multilib_native_use_with imagemagick)" >- mygraphicsmagick="--without-graphicsmagick" >- has_version media-gfx/graphicsmagick && >- mygraphicsmagick="$(multilib_native_use_with imagemagick graphicsmagick)" >+ if has_version media-gfx/imagemagick; then >+ myeconfargs+=( $(multilib_native_use_with imagemagick) ) >+ else >+ myeconfargs+=( --without-imagemagick ) >+ fi >+ if has_version media-gfx/graphicsmagick; then >+ myeconfargs+=( $(multilib_native_use_with imagemagick graphicsmagick) ) >+ else >+ myeconfargs+=( --without-graphicsmagick ) >+ fi >+ >+ if multilib_is_native_abi; then >+ if use java; then >+ export JAVACFLAGS="$(java-pkg_javac-args)" >+ export JAVA_CFLAGS="$(java-pkg_get-jni-cflags)" >+ if use test ; then # bug 629078 >+ java-pkg_append_ CLASSPATH . >+ java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only junit-4 junit.jar) >+ java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only hamcrest-core-1.3 hamcrest-core.jar) >+ fi >+ fi >+ if use qt5; then >+ myeconfargs+=( >+ $(use_with qt5 qt) >+ $(use_with qt5) >+ ) >+ else >+ myeconfargs+=( --without-qt ) >+ fi >+ fi >+ > ECONF_SOURCE=${S} \ >- econf \ >- $(multilib_native_use_with java) \ >- $(use_with jpeg) \ >- $(use_with gtk) \ >- ${myimagemagick} \ >- ${mygraphicsmagick} \ >- $(multilib_native_use_with python) \ >- $(use_with qt4 qt) \ >- $(use_enable static-libs static) \ >- $(use_enable threads pthread) \ >- $(use_with X x) \ >- $(use_with xv xv) \ >- $(use_enable v4l video) >+ econf "${myeconfargs[@]}" > > # work-around out-of-source build issue > mkdir gtk pygtk qt test || die >@@ -125,7 +139,7 @@ > } > > multilib_src_install_all() { >- dodoc HACKING NEWS README TODO >+ einstalldocs > find "${D}" -name '*.la' -delete || die > } >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 641920
: 524290