Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 636680 - [qt overlay] qt5-build.eclass requires SRC_URI update for qt 5.10
Summary: [qt overlay] qt5-build.eclass requires SRC_URI update for qt 5.10
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Eclasses (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Qt Bug Alias
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2017-11-06 06:14 UTC by maurerpe
Modified: 2017-12-10 07:50 UTC (History)
0 users

See Also:
Package list:
Runtime testing required: ---


Attachments
qt5-build.class (qt5-build.eclass,25.08 KB, text/plain)
2017-11-06 06:14 UTC, maurerpe
Details

Note You need to log in before you can comment on or make changes to this bug.
Description maurerpe 2017-11-06 06:14:54 UTC
Created attachment 502776 [details]
qt5-build.class

Previous versions of QT all followed the same naming convention for the SRC_URI.  However, upstream has changed this convention for 5.10.

For example, qtbase for 5.9_beta3 is named:
qtbase-opensource-src-5.9-beta4.tar.xz
However qtbase for 5.10_beta3 is named:
qtbase-everywhere-src-5.10.tar.xz

For reference see the following links:
http://download.qt.io/development_releases/qt/5.9/5.9.0-beta3/submodules/
http://download.qt.io/development_releases/qt/5.10/5.10.0-beta3/submodules/

Note that the directory structure is the same, it is just the filenames that have changed.

This can be fixed with a simple change to the eclass starting at line 80:
from:
		MY_P=${QT5_MODULE}-opensource-src-${PV/_/-}
to:
		if [[ ${QT5_MINOR_VERSION} -ge 10 ]]; then
			MY_P=${QT5_MODULE}-everywhere-src-${PV/_*/}
		else
			MY_P=${QT5_MODULE}-opensource-src-${PV/_/-}
		fi

It is likely the final 5.10 release will have the same issue.  In which case, simply make the same change a few lines further down in the file.

I have tested this with qtcore and qtnetowrk (which both download qtbase) version 5.10.0_beta3.

Found while testing libressl compatibility in bug 562050.

Fixed eclass attached (based on the latest from the qt overlay on github).
Comment 1 Michael Palimaka (kensington) gentoo-dev 2017-11-06 11:15:58 UTC
Is the second MY_P conditionally necessary? I'm not sure what it'd match as that path should only match non-alpha/beta/rc releases.
Comment 2 maurerpe 2017-11-06 15:08:00 UTC
The second conditional would effect the final 5.10.0 release when it drops.  At this point we don't know for sure what format it will use, but I fully expect it will be the same as the development versions.  In that case, the second conditional will be necessary.
Comment 3 Davide Pesavento (RETIRED) gentoo-dev 2017-11-06 15:10:28 UTC
(In reply to maurerpe from comment #0)
> Created attachment 502776 [details]
> qt5-build.class
> 
> Fixed eclass attached (based on the latest from the qt overlay on github).

Please attach a diff next time.
Comment 4 Michael Palimaka (kensington) gentoo-dev 2017-12-10 07:50:35 UTC
Thanks, this has been fixed in git by Chiitoo.

https://gitweb.gentoo.org/proj/qt.git/commit/?id=12a98e5265ea65c6e604eb1a0d8cf7d78cfc8589