Commit Graph

181 Commits

Author SHA1 Message Date
Paul Eggleton 0da7db18f1 qt4: ensure target packages don't include host binaries
Remove uic, rcc, moc and lrelease from packaged files. This fixes the
following QA warnings:

qt4-x11-free-4.7.3, wrong architecture, qt4-tools-dbg,
  ${WORKDIR}/packages-split/qt4-tools-dbg/usr/bin/.debug/uic
qt4-x11-free-4.7.3, wrong architecture, qt4-tools-dbg,
  ${WORKDIR}/packages-split/qt4-tools-dbg/usr/bin/.debug/rcc
qt4-x11-free-4.7.3, wrong architecture, qt4-tools-dbg,
  ${WORKDIR}/packages-split/qt4-tools-dbg/usr/bin/.debug/moc
qt4-x11-free-4.7.3, wrong architecture, qt4-tools,
  ${WORKDIR}/packages-split/qt4-tools/usr/bin/uic
qt4-x11-free-4.7.3, wrong architecture, qt4-tools,
  ${WORKDIR}/packages-split/qt4-tools/usr/bin/rcc
qt4-x11-free-4.7.3, wrong architecture, qt4-tools,
  ${WORKDIR}/packages-split/qt4-tools/usr/bin/moc
qt4-x11-free-4.7.3, wrong architecture, qt4-linguist,
  ${WORKDIR}/packages-split/qt4-linguist/usr/bin/lrelease

These utilities are all provided by qt4-tools-nativesdk in any case.

(From OE-Core rev: 69eeb3d2276e5b10d084b47d308ecfc8daf8b467)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-05 11:39:11 +01:00
Richard Purdie 8511d1ec1b Drop PRIORITY variable
As discussed on the mailing list, this variable isn't useful and if wanted
would be better implemented by distros using pn-X overrides.

This patch executes:

find . -regex ".*\.\(bb\|inc\)$" | xargs sed -i '/^PRIORITY = ".*"$/d'

against the tree removing the referenced. Thanks to Phil Blundell for
the command.

(From OE-Core rev: d122343362669c683acc4af295971a62cbc823fc)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-01 23:27:29 +01:00
Paul Eggleton 0aad8f3f60 qt4-tools-nativesdk: fix compile failure in src/dbus
[Qt #17962]   -- http://bugreports.qt.nokia.com/browse/QTBUG-17962
[YOCTO #1168] -- http://bugzilla.pokylinux.org/show_bug.cgi?id=1168

Fix "invalid conversion from 'const void*' to 'void*'" error compiling
src/dbus/qdbusintegrator.cpp. It is assumed that the use of "const" here
is incorrect as no other usage of Q_GLOBAL_STATIC_WITH_ARGS uses const
prefix on the first (TYPE) argument.

Patch was imported from the Qt bug tracker (see above reference); the
patch was rejected but for procedural rather than validity reasons.

Fixes [YOCTO #1168]

(From OE-Core rev: 17d5422460bf9074223475b15d128171d12b170a)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-22 22:13:09 +01:00
Paul Eggleton d827764c70 qt4-tools-nativesdk: drop freetype include as we build with -no-freetype
Freetype support is disabled so there's no need to point to the freetype
headers.

Prompted by OE commit 4931b37c8faf1eef7322cc82bf979885c770f4e0 from
Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>

(From OE-Core rev: bc5647504268ec4ef8a20dd1a6f9bdf7e6849ba7)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-22 22:13:09 +01:00
Paul Eggleton 4d7108f7af qt4-tools-nativesdk: fix unpack failure due to missing g++.conf
FILESPATHPKG was being used to in order to bring in linux.conf and
g++.conf in this recipe, however this probably never worked since
FILESPATHPKG always has the MACHINE appended to it and these are not
machine-specific files. The only reason it built was that these two files
could be found within the "files" subdir until we removed Qt 4.6.3.
Using FILESEXTRAPATHS (as qt4-tools-native does) solves this.

(From OE-Core rev: 49102f3728425cacfaeb384491b9355bfa2a4230)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-22 22:13:09 +01:00
Saul Wold 282b96763f qt4-tools-native: Fix the patch location
(From OE-Core rev: f9e51f78dbc5e600003cc563904a308df0d9bd7b)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-19 23:40:36 +01:00
Paul Eggleton 3ea694cf68 qt4: re-enable two 4.6.x patches in 4.7.3
Two patches that were being applied in 4.6.x are now applied for 4.7.3.
The functions of these two patches are:

* Add support for 2bpp (only affects qt4-embedded)
* Use correct infix on QtUiTools library (only affects qt4-embedded as
  qt4-x11-free does not define an infix)

(From OE-Core rev: 1eb0207a7ae8cbc31ecde313a020ed4f12f70dd8)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-18 14:32:48 +01:00
Paul Eggleton 18b0adee1e qt4: add comments and Upstream-Status to all patches
(From OE-Core rev: 5eed81039f33b846303a2032afcf832709b18210)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-18 14:32:48 +01:00
Paul Eggleton 0f574ccf07 qt4: remove Qt 4.6.3
We should only have one version of Qt4 supported in oe-core.

(From OE-Core rev: 95f348d81353ea105493d0cc360d63b6b7264ce5)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-18 14:32:47 +01:00
Paul Eggleton add4df47eb qt4: split out SQL driver config flags to QT_SQL_DRIVER_FLAGS
This allows meta-oe to override these options easily in order to enable more
SQL driver plugins.

(From OE-Core rev: 7f12a24771bca786095f823aeb2d322c52c266d2)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-16 15:32:19 +01:00
Paul Eggleton 0de1bd8d13 qt4: update from 4.7.2 to 4.7.3
The Comodo certificates patch has been merged upstream so it no longer
needs to be applied. Some PR values were reset and SRC_URI checksums
updated but other than this there are no recipe changes.

(From OE-Core rev: 57b3cbf2b7b8a716481cb3efb68b7e4c08af6703)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-16 15:32:19 +01:00
Ilya Yanok f8382175a1 qt4-tools-nativesdk: -arch is required for nativesdk build
We need to pass correct -arch option to configure to fix building in
case of SDK_ARCH != BUILD_ARCH.

(From OE-Core rev: af22757737f3b5e2d58eba8c5e01176ac26592c5)

Signed-off-by: Ilya Yanok <yanok@emcraft.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-13 10:29:02 +01:00
Paul Eggleton cdf878387a Remove machine-specific metadata for machines no longer in oe-core
(From OE-Core rev: 72567733033347b662d9baa07432985fd2da3efa)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-05 12:26:29 +01:00
Richard Purdie fc2cee5cc6 Rename poky-lsb override to linuxstdbase
(From OE-Core rev: 73a227a738da17229baac142ccd889c7929402ba)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-21 00:29:32 +01:00
Saul Wold 31bc011cf7 qt4-x11-free: add virtual/libgl for opengl dependency
(From OE-Core rev: e718a775409938af51c1f06d2574435cbf978188)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-12 10:12:21 -07:00
Denys Dmytriyenko e5a40cd6f8 qt4: security advisory - blacklist fraudulent comodo certificates
Security advisory: Blacklist fraudulent certificates. More info is in the
patch and at the following links:
http://www.comodo.com/Comodo-Fraud-Incident-2011-03-23.html
http://qt.nokia.com/files/qt-patches/blacklist-fraudulent-comodo-certificates-patch.diff/view

(Imported from OE rev 61eeeec1224c4f974f9185c2b93eeb19d13938af)

(From OE-Core rev: 14419f4a4bc629b171281d46750c6abfa84bf83b)

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-06 12:10:52 -07:00
Paul Eggleton ea738ee3d3 qt4: replace 4.7.1 with version 4.7.2
Qt 4.7.2 is a bugfix release for the 4.7 series - more details here:

  http://qt.nokia.com/developer/changes/changes-4.7.2/

This was prompted by the equivalent change in OE, however the change was
redone by hand. There are no changes to the recipes themselves other than
updating SRC_URI checksums and resetting PR.

(From OE-Core rev: e8a3686ec108f6095bafa5b601c9f763bc39c123)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-06 12:10:51 -07:00
Mei Lei 22c7a3a1c4 qemuppc: add libqtopengl4 for ppc
Modify some configs for ppc to enable the libqtopengl4 support.
This fixes [YOCTO #848]

(From OE-Core rev: cc6763b81fafddcb112a6126373c594e3ec4b140)

Signed-off-by: Mei Lei <lei.mei@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-04 17:28:07 +01:00
Paul Eggleton 4c8f498624 qt4: set RRECOMMENDS correctly for qt4 demos and examples packages
The demos and examples require a few optional plugins to operate correctly
(e.g. SQLite and JPEG support). The demos package requires the documentation
package to show descriptions for each demo/example, and assistant to show
the documentation.

Fixes [BUGID #492] and [BUGID #452].

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2011-02-01 17:46:32 +00:00
Paul Eggleton 7a0c927c99 qt4: Add qt4-tools-nativesdk based on qt4-tools-sdk from OpenEmbedded
Differences from OpenEmbedded qt4-tools-sdk:

* Convert to nativesdk and make fixes necessary to build
* Use .inc file in 4.6.3 version
* Add LIC_FILES_CHKSUM
* Fix LICENSE to match other Qt4 recipes
* Use http source URL to match other Qt4 recipes
* Whitespace fixes

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2011-02-01 16:25:11 +00:00
Paul Eggleton abb87d455d qt4-tools-native: update from OpenEmbedded
Differences from OE version:
* Add source checksums
* Correct LICENCE and move to .inc file
* Update HOMEPAGE
* Don't specify DEFAULT_PREFERENCE
* Remove S and SRC_URI from 4.7.1 (duplicates of .inc file values)
* Use http source URL to match other Qt4 recipes
* Don't add back tools previously disabled in poky

Differences from current (plus the above):
* Add Qt 4.7.1 recipe
* Specify -embedded to remove dependency on X (as we are only building tools)
* Disable some other options to reduce dependencies
* Specify -no-freetype / -no-fontconfig in .inc file rather than in .bb
* Use INC_PR
* Whitespace fixes
2011-02-01 16:14:01 +00:00
Paul Eggleton 51b5081892 qt4: add 4.7.1 version from meta-openembedded
Differences from meta-openembedded version:
* Change the order of includes so that embedded/x11 overrides take precedence
* Move contents of do_install_append from qt-${PV}.inc to do_install in
  qt4.inc as this is the same for 4.6.3 and 4.7.1 and gets in the way of
  do_install_append in qt-embedded.inc.
* Don't add qte.sh to SRC_URI in qt-4.7.1.inc (this is embedded-specific)
* Don't specify DEFAULT_PREFERENCE
* Use http source URL to match other Qt4 recipes

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2011-02-01 16:10:36 +00:00
Paul Eggleton 7263adda21 qt4: add qt4-embedded 4.6.3 from meta-openembedded
Changes from the meta-openembedded version:
* Change the order of includes so that embedded takes precedence (ensuring
  SRC_URI additions from qt-embedded.inc work)
* Specify -embedded in qt-embedded.inc
* Remove SRC_URI and S which should come from qt-${PV}.inc
* Remove QT_DIR_NAME and QT_LIBINFIX as these come from qt4e.bbclass
* Correct LICENSE
* Set DESCRIPTION instead of SUMMARY as SUMMARY will inherit by default
* Add qthelp-lib-qtclucene.patch (required to build)
* Whitespace fixes

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2011-02-01 16:10:11 +00:00
Paul Eggleton c5998e6def qt4: Bring in improvements from meta-openembedded
Differences from meta-openembedded version:
* SRC_URI and S now come from qt-${PV}.inc since these are version specific
* Source checksums are also now in qt-${PV}.inc
* Remove do_compile as this is handled in qt-${PV}.inc
* Move contents of do_install_append from qt-${PV}.inc to do_install in
  qt4.inc as this is the same for 4.6.3 and 4.7.1 and will get in the way of
  do_install_append in qt-embedded.inc.
* Don't enable PostgreSQL, MySQL or SQLite 2.x plugins as we don't currently
  have recipes for these DBMSs in Poky. These can be re-enabled easily when
  or if we do.
* Use INC_PR in qt4-x11-free_4.6.3.bb
* Don't always specify -embedded config option in qt4.inc
* Don't add qte.sh to SRC_URI in qt-4.6.3.inc (this is embedded-specific)

Differences from what we have currently in Poky (plus the above):
* Set DESCRIPTION based on embedded/X11
* Move out arch-specific settings to qt4-arch.inc
* Add qt4x11.bbclass which can be inherited by application recipes to select
  the X11 version (this makes more sense once the embedded version is added).
* Update HOMEPAGE

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2011-02-01 15:57:26 +00:00
Jingdong Lu 811a9f7a33 qt4: Enable accessibility and sm option for LSB.
LSB library checks will look for some symbols of qt4 libraries. Enable "accessibility" and "sm" in order to pass the LSB test.

Signed-off-by: Jingdong Lu<jingdong.lu@windriver.com>
2011-01-20 21:37:01 +00:00
Jingdong Lu 0e4df9592b Enable '-opengl' option for qt4 in order to generate libQtOpenGL.so
qt4-x11-free: Only build opengl for x86 platforms since only these have GL support at present

[sgw@linux.intel.com: merged and fixed Signed-off-bys]

Signed-off-by: Jingdong Lu <jingdong.lu@windriver.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
2010-12-10 21:57:08 -08:00
Richard Purdie f07b1a2756 Drop variables that do nothing
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-12-10 22:51:19 +00:00
Saul Wold 3d08b9f2c6 SRC_URI Checksums Additionals
Signed-off-by: Saul Wold <sgw@linux.intel.com>
2010-12-09 08:18:17 -08:00
Richard Purdie 5eee854f53 qt4-tools-native: Fix compile failures
fontconfig/freetype are not listed in the dependencies, neither are any of the
X components yet this recipe appears to be building the whole UI framework, not
just the tools.

It turns out this is a dependency for uic3 and qdbus. Since at this time we don't
require these, remove them from the build.

Its likely cross versions of those specific tools would need to be added due to
their dependency on the windowing system compilation.

[BUGID #390]

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-10-06 15:17:14 +01:00
Yu Ke b49bfb2244 QT4 mips: disable the LDFLAGS "-Bsymbolic-functions"
"-Bsymbolic-functions" flag makes ld to bind the global function symbol of shared library at compiling time, thus reduce the runtime relocation cost.

However, this flag in binutil 2.20 cause QT4 mips building failure, which is "final link failed: Bad value" error in libQtWebKit.so linking stage. If downgrad to binutil 2.19, this error disappears.

so before binutil new release is out, it is better to disable this flag for QT4 mips.

Fix [BUGID #271]

Signed-off-by: Yu Ke <ke.yu@intel.com>
2010-09-07 15:58:10 +01:00
Richard Purdie 29d6678fd5 Major layout change to the packages directory
Having one monolithic packages directory makes it hard to find things
and is generally overwhelming. This commit splits it into several
logical sections roughly based on function, recipes.txt gives more
information about the classifications used.

The opportunity is also used to switch from "packages" to "recipes"
as used in OpenEmbedded as the term "packages" can be confusing to
people and has many different meanings.

Not all recipes have been classified yet, this is just a first pass
at separating things out. Some packages are moved to meta-extras as
they're no longer actively used or maintained.

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-08-27 15:29:45 +01:00