Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 432846 Details for
Bug 562588
media-libs/libmygpo-qt-1.0.8: adding Qt5 support
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
libmygpo-qt-1.0.8.ebuild.diff
libmygpo-qt-1.0.8.ebuild.diff (text/plain), 1.72 KB, created by
Alexander
on 2016-05-01 15:41:01 UTC
(
hide
)
Description:
libmygpo-qt-1.0.8.ebuild.diff
Filename:
MIME Type:
Creator:
Alexander
Created:
2016-05-01 15:41:01 UTC
Size:
1.72 KB
patch
obsolete
>--- libmygpo-qt-1.0.8.ebuild 2016-05-01 21:34:46.776417275 +0600 >+++ libmygpo-qt-1.0.8.ebuild 2016-05-01 21:27:40.911138345 +0600 >@@ -2,7 +2,7 @@ > # Distributed under the terms of the GNU General Public License v2 > # $Id$ > >-EAPI=5 >+EAPI=6 > inherit cmake-utils > > DESCRIPTION="Qt/C++ library wrapping the gpodder.net webservice" >@@ -20,13 +20,22 @@ > > LICENSE="LGPL-2.1" > SLOT="0" >-IUSE="test" >+IUSE="qt4 +qt5 test" >+ >+RDEPEND=" >+ qt4? ( dev-qt/qtcore:4 >+ >=dev-libs/qjson-0.5[qt4] ) >+ qt5? ( >=dev-qt/qtcore-5.1:5 >+ >=dev-qt/qtgui-5.1:5 >+ >=dev-qt/qtnetwork-5.1:5 >+ >=dev-libs/qjson-0.5[qt5] ) >+ " > >-RDEPEND="dev-qt/qtcore:4 >- >=dev-libs/qjson-0.5" > DEPEND="${RDEPEND} >+ qt4? ( test? ( dev-qt/qttest:4 ) ) >+ qt5? ( test? ( dev-qt/qttest:5 ) ) > virtual/pkgconfig >- test? ( dev-qt/qttest:4 )" >+ " > > DOCS=( AUTHORS README ) > >@@ -35,11 +44,36 @@ > if ! use test ; then > sed -i -e '/find_package/s/QtTest//' CMakeLists.txt || die > fi >+ >+ epatch "${FILESDIR}"/${PN}-correct-package-name.patch >+ >+ # If qtchooser is installed, it may break the build, because moc,rcc and uic binaries for wrong qt version may be used. >+ # Setting QT_SELECT environment variable will enforce correct binaries. >+ if use qt4; then >+ export QT_SELECT=qt4 >+ elif use qt5; then >+ export QT_SELECT=qt5 >+ ewarn "Please note that Qt5 support is still experimental." >+ ewarn "If you find anything to not work with Qt5, please report a bug." >+ fi > } > > src_configure() { >+ local qt_flag="" >+ if use qt5 ; then >+ qt_flag="-DBUILD_WITH_QT4=OFF" >+ fi > local mycmakeargs=( > $(cmake-utils_use test MYGPO_BUILD_TESTS) >+ ${qt_flag} > ) >+ >+ use qt5 && append-cppflags -DBUILD_WITH_QT4=OFF >+ > cmake-utils_src_configure > } >+ >+src_test() { >+ cd "${CMAKE_BUILD_DIR}" || die >+ Xemake test >+}
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 562588
:
414142
|
414144
|
432844
| 432846 |
444918