Commit Graph

38 Commits

Author SHA1 Message Date
Khem Raj
c16daba217 qtbase: Fix build with clang
This patch is a backport from upstream qt5 fixes building with clang
from meta-clang

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2015-08-26 17:12:26 +02:00
Jonathan Liu
c0cc4ff882 qtbase: replace host paths with qmake built-in properties in qconfig.pri
This avoids qconfig.pri in the Qt SDK incorrectly including paths from
the build host that may not exist on the SDK host. As the paths are
now correct, qmake can correctly detect system include paths and use
-isystem instead of -I for Qt's include directories which allows the
suppression of warnings from library headers when building Qt
applications.

Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2015-08-26 17:12:26 +02:00
Samuli Piippo
a68699f666 qtbase: PACKAGECONFIGs for libinput
Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2015-08-25 11:56:33 +02:00
Jonathan Liu
08d5a648f9 qtbase: add PACKAGECONFIG for libproxy
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2015-08-25 11:56:33 +02:00
Martin Jansa
44d180c093 qtbase: refresh patches
* based on b5.5.0 branches in https://github.com/meta-qt5/qtbase

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2015-08-25 11:56:33 +02:00
Denys Dmytriyenko
380ecfd7fb qtbase_git: ensure fonts go into own subdir by creating it first
Sometimes, when ${OE_QMAKE_PATH_LIBS} is empty, "cp -a" ends up copying
font files there w/o preserving "fonts" directory, failing the following
chown command.

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2015-08-24 14:38:10 +02:00
Andreas Müller
055a45440d add libx11-locale to qtbase-plugins RRECOMMENDS
fixes:

| Qt Warning: Could not find a location of the system's Compose files. Consider setting the QTCOMPOSE environment variable

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2015-08-24 14:38:09 +02:00
Martin Jansa
18741e4838 recipes-git: upgrade to 5.5
* based on my WIP patch + fixes from John Mullen
* I was trying to get rhid of 0003-Add-external-hostbindir-option.patch
  and 0010-Add-external-hostbindir-option-for-native-sdk.patch by using
  upstream configure parameter added in some previous version, but I've
  failed, so now good-old -external-hostbindir parameter is back

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2015-08-18 12:07:34 +02:00
Khem Raj
d9d1d04760 qtbase: Fix build with musl
This is a generic fix to accomodate musl which is adhering to posix
and doesnt have legacy to carry, so lets invert the conditional so the
special legacy case of glibc is checked and else part then covers rest
of cases which are newer glibc/uclibc and musl

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2015-07-02 12:23:26 +02:00
Martin Jansa
82b211aa42 qt5: upgrade to latest revision in 5.4 branches
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2015-06-04 12:24:48 +02:00
Martin Jansa
48ee17af94 qt5: merge .inc and _git.bb files
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2015-05-28 21:16:50 +02:00
Martin Jansa
04240161ef git-recipes: upgrade to latest revision in 5.4 branch
* this gets us close to 5.4.2 for people who want to test it in advance
* I plan to apply this to fido branch (as well as final upgrade to 5.4.2
  recipes
* I'm preparing similar patch for 5.5 revisions, which will be applied
  only in master branch

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2015-04-29 00:07:14 +02:00
Andre McCurdy
8723582545 qt5: add QT_GIT to define git repo for Qt core components
Replace duplicated git URIs with a single definition in layer.conf.

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2015-03-17 13:07:34 +01:00
Frederico Cadete
22c431e7a1 qt5-git, *qtbase*, qt5everywheredemo: Fetch from code.qt.io
* Gitorious disabled the git:// protocol, breaking fetches.
* Also, this service is scheduled to stop in May 2015, so move to
  code.qt.io.
* qt5everywheredemo needs different SRCREV because this repo was
  recreated in code.qt.io and SRCREV
  9a868f96ee63c21ceda890d8dfc9d33f093d1b6d doesn't exist on code.qt.io

  It was initial commit in gitorious repo:
  commit 9a868f96ee63c21ceda890d8dfc9d33f093d1b6d
  Author: Sergio Ahumada <sergio.ahumada@digia.com>
  Date:   Wed Jul 3 12:09:40 2013 +0200

      Initial commit

  This is exactly matching with this commit in code.qt.io:
  commit c17fe9e0ec0882ac4c4dc1168095f569acab5d09
  Author: Kimmo Ollila <kimmo.ollila@digia.com>
  Date:   Wed Jun 19 13:02:05 2013 +0300

       Fixed radio crash on application close

Signed-off-by: Frederico Cadete <frederico@cadete.eu>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2015-03-12 12:47:53 +01:00
Martin Jansa
acbb72d884 recipes-git: update to latest revisions in 5.4 branch
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2015-02-27 19:56:34 +01:00
Martin Jansa
f90537a7de qtdeclarative, *qtbase*: upgrade to latest revision in 5.4 branch
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2015-02-19 15:55:34 +01:00
Andreas Müller
ce88fc4221 qtbase: build qmake for target with paths aligned
Proper qmake operation was tested with qt5-creator.

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2015-02-18 16:52:01 +01:00
Andreas Müller
b4be9ded11 qtbase: remove patches required for native(-sdk) only
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2015-02-18 16:46:09 +01:00
Martin Jansa
77f262d7c7 qt5-git: Update to 5.4.0+, latest revision in 5.4 branch
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-12-11 13:24:22 +01:00
Jonathan Liu
6566f728ab recipes: upgrade from 5.3.2 to 5.4.0
MJ: nativesdk-qtbase, nativesdk-qttools, qtbase-native: Drop unnecessary LICENSE/LIC_FILES_CHKSUM
MJ: qtwebkit: move leveldb dependency to .inc

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Jonathan Liu <net147@gmail.com>
2014-12-11 13:24:22 +01:00
Martin Jansa
54c44443c3 qt5-git: Update to rc1+, latest revision in 5.4 branch
* qtwebengine LIC_FILES_CHKSUM updated because of Copyright
  year update in chromium's LICENSE
  < // Copyright (c) 2013 The Chromium Authors. All rights reserved.
  and shortened the entry for qtwebengine LIC_FILES_CHKSUM, because
  it was including also few #include lines which were changed recently

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-12-09 11:06:30 +01:00
Martin Jansa
69b7d8f725 qt5: upgrade git recipes to 5.4-beta1
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-10-30 14:15:29 +01:00
Martin Jansa
be2d4815ef qt5: upgrade git recipes to 5.4-alpha1
* introduce 2nd set of qtwayland and qtwebengine recipes, because newer
  revision isn't compatible with 5.3.2 release

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-10-04 04:25:11 +02:00
Martin Jansa
5111e23ae2 qtbase: restore QOpenGLPaintDevice-sub-area-support.patch from 5.3.0
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-07-22 22:24:26 +02:00
Martin Jansa
b26453cd28 recipes: upgrade from 5.3.0 to 5.3.1
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-07-06 19:45:44 +02:00
Martin Jansa
0d9ca1b1bd recipes-git: upgrade to latest SRCREV in stable branch
* this will be close to 5.3.1 release

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-06-25 16:03:00 +02:00
Martin Jansa
b4e270f9e2 qtbase: Refresh patches to match with stable* branches on github.com/meta-qt5
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-06-10 12:11:52 +02:00
Martin Jansa
cf2c7816fd recipes-git: Upgrade to latest origin/stable
* qtbase: Fix undefined reference to qt_blend_argb32_on_argb32_ssse3

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-06-10 12:11:51 +02:00
Martin Jansa
6374736f37 recipes-git: Upgrade from latest origin/release to latest origin/stable
* there wont be 5.2.2 release, so start preparation for 5.3.0
* probably latest 5.3.0-beta1 snapshot was released yesterday, so this
  should be reasonably close
* probably wont be merged before creating new release branch for Yocto 1.6
* qtbase: Fix build with X.h included from egl.h
* nativesdk-qt*: Add git recipes
  5.2.1 isn't compatible with qtbase-native from git
* qtbase: upgrade to latest stable revision
  * 0006-configure-make-pulseaudio-alsa-freetype-a-configurab.patch
    was upstreamed in:
    0c3301f configure: make pulseaudio and alsa configurable options
  * 0005-qt_module-Fix-pkgconfig-replacement.patch
    is hopefully resolved in:
    eaefbe3 snuff -L/-I with system paths when installing meta files
    a33afed de-duplicate setup of libdir replacement in prl files
    aa20e7f reshuffle code for clarity
    ee86ce8 don't attempt to replace include paths in meta files
    but this needs to be double checked
* recipes-git: Upgrade to latest origin/stable
* qt5-git.inc: update LICENSE.LGPL checksum
  * only year was updated:
    - The Qt Toolkit is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
    + The Qt Toolkit is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
* qtbase: add 2 patches to fix build issues
* LIC_FILES_CHKSUM: update other git recipes
* qtlocation: bump SRCREV and add to qt5-versions
* qt5-versions.inc: Add line for qttools and fix it for nativesdk-qttools
* qtquick1: fix LIC_FILES_CHKSUM
* qttools: update LIC_FILES_CHKSUM and patches
  * new qtdiag needs to be disabled as well because it depends on gui which isn't enabled
    in qtbase-native, disable qtpaths as well

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-06-10 12:11:51 +02:00
Martin Jansa
818cc2d11b qtbase: move 0015-Fix-linuxfb-argument-mmsize-parsing.patch to 5.2.1 recipe
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-03-07 01:39:24 +01:00
Martin Jansa
fbf9216fb9 qt5-git: bump SRCREVs to latest in 'release' branch
* in some components there was just
  Bump MODULE_VERSION to 5.2.2
  commit but bump them all for consistencty

* we're testing newer revisions in order to narrow some QML issues
  we're seeing in runtime

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-03-05 19:31:03 +01:00
Martin Jansa
4b7182a3be qt5: Upgrade from 5.2.0 to 5.2.1
* qtwayland: Use default LICENSE and LIC_FILES_CHKSUM
  * license texts were added in qtwayland commit 26bdc66fe6c4499332b2ead886a806d09aa07a8a
* qtdeclarative, qtserialport: Update QT_MODULE_BRANCH
  * SHA-1 of v5.2.1 tag is only in release branch

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-02-19 11:56:32 +01:00
Martin Jansa
c908fe4ebd qt5: upgrade to 5.2.0
* drop 0027-Fix-misaligned-selection-region-with-text-when-cente.patch
  resolved in upstream commit 5d8a882c11201a29475c5ea71cfb76c9de6573f5
* drop 0020-Use-BGRA-extension-in-bindTexture.patch
  resolved in upstream commit e1325cf26e146b68725cc1a0a02b274ce3dfbe5c
* drop 0008-wayland-scanner-disable-silent-rules.patch
  resolved upstream in:
  commit 2ff2a7c32d76b9e58b800f12469f112cfdb6ad3c
  Author: Jan Arne Petersen <jan.petersen@kdab.com>
  Date:   Fri Jul 19 14:35:19 2013 +0200
  Fix wayland-scanner to work with CONFIG+=silent

* squash to match more with structure of
  https://github.com/meta-qt5/qtbase/tree/stable

* qtmodules: bump SRCREVs for 5.2.0 tags
  now all modules using qt5-git should be newer than any 5.1.* version
* qtbase: fix paths in packageconfig *.pc files
  include- and lib-paths contained build-sysroot paths
* qtwebkit: Explicitly add ICU libraries to LIBS
  fails to build without this
* qtjsbackend: remove for git versions
  Found in [1]:
  Qt Qml is now using its own built-in Javascript engine and does not depend on
  V8 anymore. As such the QtJSBackend shared library has disappeared.
  [1] http://blog.qt.digia.com/blog/2013/09/30/qt-5-2-alpha-available/
* qt5: Upgrade 5.1.1 recipes to 5.2.0 to match git recipes
  qtjsbackend is now completely gone
  it allows to share more .patch files and configuration in .inc again

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-01-12 15:01:37 +01:00
Martin Jansa
3e95350611 qtbase_git: restore 0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch in SRC_URI
* commit 105ad2a18e
  Author: Eric B<C3><A9>nard <eric@eukrea.com>
  Date:   Mon Oct 7 22:54:12 2013 +0200
  Subject: qtbase: update to 5.1.1
  removed it from SRC_URI in qtbase.inc, but it's still needed for
  qtbase_git

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-10 12:36:47 +02:00
Martin Jansa
507c7466ea qt5: bump SRCREVs in git recipes to 5.1.0+
* patches will now be closer to 5.1.0 release

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-07-25 12:14:12 +02:00
Martin Jansa
26097532fb qt5-*.inc: let module.inc to define LICENSE
* it was working for LIC_FILES_CHKSUM, but not LICENSE
* we need to change order of includes, first version.inc then module.inc

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-07 11:01:59 +02:00
Martin Jansa
996f91828c qt5: Add recipes for missing versions
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-07 11:01:55 +02:00
Martin Jansa
cd2ac1d786 qt5-git: rename recipes and include file
* some modules weren't released yet, so we still need some recipes with
  PV = "4.999+5.0.0-beta1+git${SRCPV}"
  so having 5.0.2 in .inc filename is a bit misleading
* .inc file still sets default PV (now "5.0.2+git${SRCPV}"), all modules
  where SRCREV corresponds to different versions need to set PV inside

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-05 12:56:34 +02:00