Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 534304 - dev-qt/qtlockedfile and dev-qt/qtsingleapplication: add Qt 5 support
Summary: dev-qt/qtlockedfile and dev-qt/qtsingleapplication: add Qt 5 support
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: [OLD] Library (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Qt Bug Alias
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2015-01-02 09:41 UTC by Ben de Groot (RETIRED)
Modified: 2015-01-02 18:18 UTC (History)
0 users

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


Attachments
qtlockedfile-2.4.1_p20130904-r1.ebuild (qtlockedfile-2.4.1_p20130904-r1.ebuild,2.01 KB, text/plain)
2015-01-02 14:55 UTC, Michael Palimaka (kensington)
Details
qtlockedfile-2.4.1_p20130904-r1.ebuild (qtlockedfile-2.4.1_p20130904-r1.ebuild,1.98 KB, text/plain)
2015-01-02 14:56 UTC, Michael Palimaka (kensington)
Details
qtlockedfile-2.4.1_p20130904-r1.ebuild (qtlockedfile-2.4.1_p20130904-r1.ebuild,2.01 KB, text/plain)
2015-01-02 15:52 UTC, Michael Palimaka (kensington)
Details
qtlockedfile-2.4.1_p20130904-r1.ebuild (qtlockedfile-2.4.1_p20130904-r1.ebuild,2.04 KB, text/plain)
2015-01-02 16:22 UTC, Michael Palimaka (kensington)
Details
qtlockedfile5.prf (qtlockedfile5.prf,138 bytes, text/plain)
2015-01-02 16:23 UTC, Michael Palimaka (kensington)
Details
qtsingleapplication-2.6.1_p20130904-r2.ebuild (qtsingleapplication-2.6.1_p20130904-r2.ebuild,2.62 KB, text/plain)
2015-01-02 16:29 UTC, Michael Palimaka (kensington)
Details
qtsingleapplication5.prf (qtsingleapplication5.prf,159 bytes, text/plain)
2015-01-02 16:29 UTC, Michael Palimaka (kensington)
Details

Note You need to log in before you can comment on or make changes to this bug.
Description Ben de Groot (RETIRED) gentoo-dev 2015-01-02 09:41:54 UTC
As I'm trying to enable support for Qt5 in various applications, I come across the case of texmaker-4.4 bundling qtsingleapplication. This now depends unconditionally on Qt4, but should be buildable with just Qt5 as well. Please enable qt5-only support for this package.
Comment 1 Michael Palimaka (kensington) gentoo-dev 2015-01-02 14:26:32 UTC
Need qtlocked file too. I'll attach patches shortly for review.
Comment 2 Michael Palimaka (kensington) gentoo-dev 2015-01-02 14:55:33 UTC
Created attachment 392962 [details]
qtlockedfile-2.4.1_p20130904-r1.ebuild
Comment 3 Michael Palimaka (kensington) gentoo-dev 2015-01-02 14:56:50 UTC
Created attachment 392964 [details]
qtlockedfile-2.4.1_p20130904-r1.ebuild

Drop keywords to match qtcore:5.
Comment 4 Michael Palimaka (kensington) gentoo-dev 2015-01-02 15:52:03 UTC
Created attachment 392968 [details]
qtlockedfile-2.4.1_p20130904-r1.ebuild

Install .prf into qt5 mkspecs directory.
Comment 5 Davide Pesavento (RETIRED) gentoo-dev 2015-01-02 16:16:20 UTC
Or maybe don't drop keywords... we will unmask USE=qt5 progressively on each arch that has keyworded qt5 packages I guess, no?

Can qt4 and qt5 variants be co-installed?

Use dodoc -r instead of dohtml.
Comment 6 Michael Palimaka (kensington) gentoo-dev 2015-01-02 16:22:46 UTC
Created attachment 392972 [details]
qtlockedfile-2.4.1_p20130904-r1.ebuild

Restore keywords and avoid dohtml.
Comment 7 Michael Palimaka (kensington) gentoo-dev 2015-01-02 16:23:35 UTC
Created attachment 392974 [details]
qtlockedfile5.prf

I couldn't find any replacement for QMAKE_INCDIR_QT, so use QT_INSTALL_HEADERS directly.
Comment 8 Michael Palimaka (kensington) gentoo-dev 2015-01-02 16:29:04 UTC
Created attachment 392976 [details]
qtsingleapplication-2.6.1_p20130904-r2.ebuild
Comment 9 Michael Palimaka (kensington) gentoo-dev 2015-01-02 16:29:20 UTC
Created attachment 392978 [details]
qtsingleapplication5.prf
Comment 10 Michael Palimaka (kensington) gentoo-dev 2015-01-02 16:30:35 UTC
(In reply to Davide Pesavento from comment #5)
> Or maybe don't drop keywords... we will unmask USE=qt5 progressively on each
> arch that has keyworded qt5 packages I guess, no?
> 
> Use dodoc -r instead of dohtml.

Done

> Can qt4 and qt5 variants be co-installed?
Yep, the library name changes: libQtSolutions_LockedFile -> libQt5Solutions_LockedFile
Comment 11 Davide Pesavento (RETIRED) gentoo-dev 2015-01-02 16:46:55 UTC
(In reply to Michael Palimaka (kensington) from comment #7)
> Created attachment 392974 [details]
> qtlockedfile5.prf
> 
> I couldn't find any replacement for QMAKE_INCDIR_QT, so use
> QT_INSTALL_HEADERS directly.

Perfect, that's the correct variable. Actually it could be used for qt4 too, but since the last line of the file would be different anyway, there's no point in trying to unify.

The qtlockedfile changes look good to me, thanks a lot.
(nitpick: no need for a trailing slash in the insinto calls, but feel free to ignore me)
Comment 12 Michael Palimaka (kensington) gentoo-dev 2015-01-02 16:51:40 UTC
+  02 Jan 2015; Michael Palimaka <kensington@gentoo.org>
+  +files/qtlockedfile5.prf, +qtlockedfile-2.4.1_p20130904-r1.ebuild:
+  Add Qt 5 support wrt bug #534304.
Comment 13 Davide Pesavento (RETIRED) gentoo-dev 2015-01-02 17:02:12 UTC
Why eqmake is run on buildlib/buildlib.pro ?
Comment 14 Michael Palimaka (kensington) gentoo-dev 2015-01-02 17:21:58 UTC
(In reply to Davide Pesavento from comment #13)
> Why eqmake is run on buildlib/buildlib.pro ?

Right, that was leftover from some out-of-portage testing I was doing. I'll remove it.
Comment 15 Davide Pesavento (RETIRED) gentoo-dev 2015-01-02 18:12:17 UTC
The rest for qtsingleapplication looks good, I didn't check the deps on the code but they make sense.
Comment 16 Michael Palimaka (kensington) gentoo-dev 2015-01-02 18:18:05 UTC
Thanks, all done.

+  02 Jan 2015; Michael Palimaka <kensington@gentoo.org>
+  +files/qtsingleapplication5.prf,
+  +qtsingleapplication-2.6.1_p20130904-r2.ebuild:
+  Add Qt 5 support wrt bug #534304.