[oe] [meta-qt5][PATCH 1/5] qtbase: remove patches required for native(-sdk) only

[Andreas Müller]

On Thu, Feb 19, 2015 at 3:47 PM, Martin Jansa <martin.jansa at gmail.com> wrote:
> On Wed, Feb 18, 2015 at 06:35:33PM +0100, Andreas Müller wrote:
>> On Wed, Feb 18, 2015 at 5:09 PM, Martin Jansa <martin.jansa at gmail.com> wrote:
>> > On Tue, Jan 27, 2015 at 06:53:49AM +0100, Andreas Müller wrote:
>> >> Signed-off-by: Andreas Müller <schnitzeltony at googlemail.com>
>> >
>> > Are you sure these are useful only for native(sdk) only?
>> >
>> > FYI: I'm updating your patches for latest revision in 5.4 branch, I'll
>> > update them together with 5.4.1 recipes (when 5.4.1 is released).
>> >
>> > Regards,
>> >
>> >> ---
>> >>  recipes-qt/qt5/qtbase.inc    | 2 --
>> >>  recipes-qt/qt5/qtbase_git.bb | 2 --
>> >>  2 files changed, 4 deletions(-)
>> >>
>> >> diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
>> >> index 5b2c08c..a8748ef 100644
>> >> --- a/recipes-qt/qt5/qtbase.inc
>> >> +++ b/recipes-qt/qt5/qtbase.inc
>> >> @@ -5,8 +5,6 @@ SRC_URI += "\
>> >>      file://0001-Add-linux-oe-g-platform.patch \
>> >>      file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
>> >>      file://0003-Add-external-hostbindir-option.patch \
>> >> -    file://0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \
>> >> -    file://0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \
>> >>      file://0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \
>> >>      file://0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch \
>> >>      file://0008-configure-bump-path-length-from-256-to-512-character.patch \
>> >> diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
>> >> index f67ea16..611e19a 100644
>> >> --- a/recipes-qt/qt5/qtbase_git.bb
>> >> +++ b/recipes-qt/qt5/qtbase_git.bb
>> >> @@ -10,8 +10,6 @@ SRC_URI += "\
>> >>      file://0001-Add-linux-oe-g-platform.patch \
>> >>      file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
>> >>      file://0003-Add-external-hostbindir-option.patch \
>> >> -    file://0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \
>> >> -    file://0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \
>> >>      file://0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \
>> >>      file://0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch \
>> >>      file://0008-configure-bump-path-length-from-256-to-512-character.patch \
>> >> --
>> >> 1.8.3.1
>> >>
>> >> --
>> >> _______________________________________________
>> >> Openembedded-devel mailing list
>> >> Openembedded-devel at lists.openembedded.org
>> >> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>> >
>> > --
>> > Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
>> >
>> First of all thanks for doing this: I have these patches on my TODO
>> but have other issues of higher priorities (ask my boss) to fix.
>
> In the end the fix was simple..
> 0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch
> wasn't refreshed in qtbase-git directory, now it builds fine, I'll push
> it to master soon.
>
>> Answering your question frankly: No I am not 100% sure these patches
>> can be removed from target build..
>>
>> * 0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch: If
>> I don't go wrong here configureapp is the windows-replacement for
>> configure script -> this patch is not needed AT ALL (except we build
>> for windows which we usually don't).
>
> Ah right, it was looking a bit different at 5.0.0 version and now after
> many rebases it really looks useless, will drop with 5.4.1 (and now in
> git recipe).
>
>> * 0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch:
>> Intention here was to keep target sysroot clean of host paths - as
>> this patch was part qt-creator series. Raphael Philipe reported
>> failures for -L/usr/lib when building qt5-creator I'd suggest to keep
>> this patch in.
>
> OK, thanks.
>
> I've refreshed b5.4-shared b5.4-native b5.4-nativesdk b5.4-target
> branches at https://github.com/meta-qt5/qtbase this will be used to
> refresh patches for 5.4.1 recipes.
>
> --
Ehm - I checked at github but I don't really look though the branch
systematics. As 5.4.1 is near and I have tons of KDE/Hawai/LxQt stuff
around for build test: Which branch should I use (qt/git-versions
enabled)?

Andreas