Commit Graph

51 Commits

Author SHA1 Message Date
Enrico Scholz a9b6e16daa qt4: fixed dependency on icu
Commit 46dcec6fd455584d9b5d0d7ff1e5b36fbe5a2d62 added 'icu' to DEPENDS
in qt4-x11 only, but enabled icu globally in qt4.inc.

This breaks build of qt4-embedded because this recipe does not have
such a DEPENDS but uses qt4.inc:

| icu.cpp:42:28: fatal error: unicode/utypes.h: No such file or directory
|  #include <unicode/utypes.h>
|                             ^
| compilation terminated.
| make: *** [icu.o] Error 1

Patch moves the 'icu' dependency into qt4.inc.

(From OE-Core rev: adb6e64d69fc947f2c8fa708dcbe854fd2b574f8)

(From OE-Core rev: ec35d5b4b3d2eed7a141f2fd41d5ed7215e66dbf)

Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
Cc: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-12-12 17:02:36 +00:00
Ross Burton 84087e94cb qt4-x11-free: depend on ICU
ICU presence is auto-detected at configure time and until recently (e68850 and
d61230) was pulled into most builds through harfbuzz and beecrypt.  Now it's
floating and this leads to build failures.

As in all likelihood the majority of people were building this with ICU enabled,
add an explicit dependency.

(From OE-Core master rev: 46dcec6fd455584d9b5d0d7ff1e5b36fbe5a2d62)

(From OE-Core rev: 034d3e35cce9ee63f6139d19be9b3edec4f97a64)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-12-12 17:00:24 +00:00
Andreas Oberritter 02d5ea60b9 qt4-x11-free: fix post-processing of QtWebKit.pc
Previously it worked for qt4-embedded only. qt4-x11-free has X11
libs between -lwebcore and -ljscore.

(From OE-Core rev: 5110f3894902db6e9a35cce40b91943b3b2ee237)

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-07-13 18:23:36 +01:00
Jonathan Liu 0463e5c173 qt4: upgrade to 4.8.5
Removed patches integrated upstream.
Added INSANE_SKIP libdir for examples packages as it includes plugin
shared libraries outside of libdir.

(From OE-Core rev: f119566477243ce43b727492dc78b9cb3dd76de4)

Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-07-05 15:44:13 +01:00
Jonathan Liu ed4a919cae qt4: add eglibc-gconv-utf-16 to QtCore RRECOMMENDS when using glibc
This fixes the following warnings when running Qt applications:
QIconvCodec::convertFromUnicode: using Latin-1 for conversion, iconv_open failed
QIconvCodec::convertToUnicode: using Latin-1 for conversion, iconv_open failed

Qt's QString class stores strings internally using UTF-16 encoding.
The UTF-16 iconv module is needed to convert between the system's local
8-bit representation and QString's UTF-16 encoding.

For example, the following functions would be affected:
QString::fromLocal8Bit(...)
QString::toLocal8Bit(...)

If the UTF-16 iconv module couldn't be loaded, it would use Latin-1
encoding instead of the system's encoding for conversion.

[YOCTO #349]

(From OE-Core rev: 2e9c8007bca684149d72e96423f30433b6665fad)

Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-06-21 09:19:27 +01:00
Jonathan Liu f1b8e24c36 qt4: fix path to demos documentation
The qt4-demos-doc package is not created when building qt4-x11-free
because ${docdir}/qtopia/qch/qt.qch doesn't exist.

(From OE-Core rev: 3c73eeda461bf2ea23bf7969b8a8f9c574c75277)

Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-05-30 20:59:09 +01:00
Paul Barker b3a745c532 qt4: remove trailing slash from prefix
The trailing slashs on "Prefix=${prefix}/" and "-prefix ${prefix}/" are passed
through to the generated pkgconfig files and may be joined to paths like
"/include" yielding a final path with a double forward-slash (eg.
"/usr//include"). This may end up in the debugging symbols in other applications
or libraries which depend on qt4 which in turn causes the debugedit program to
fail with the message "canonicalization unexpectedly shrank by one character"
when it tries to replace the double forward-slash with a single forward-slash.
Thus the function split_and_strip_files fails and ultimately do_package fails.

As this slash is removed from the prefix it is added into the regular expression
used to fix up pkgconfig files later in the recipe.

This error was seen in vlc in meta-openembedded and should be solved by this
change in openembedded-core.

(From OE-Core rev: 61a7329a5c1f0b84f447256134f5a77917f07f38)

Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-05-09 08:51:13 +01:00
Phil Blundell 55d77f5d0d qt4: Fix sundry erroneous assumptions about ${prefix}
FILES_${QT_BASE_NAME}-tests was hard-coded to "/usr/tests/..." but Qt
actually installs these files into ${prefix}/tests.

Conversely, FILES_${PN}-dbg in qt4.inc was defined in terms of
${exec_prefix}/src, which appears commendable but doesn't actually match
where package.bbclass will put the sources since the latter is
hard-coded to /usr/src.

This fixes a large number of "installed but not shipped" warnings
when ${prefix} is set to something other than /usr.

(From OE-Core rev: c0cfd4f84c8f4843027332cfd6cf99c452c50dbb)

Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-05-02 17:41:54 +01:00
Andreas Oberritter 1c2d4455a5 qt4.inc: package keyboard drivers
* Fixes the following packaging error, if compiled with
  -plugin-kbd-linuxinput:

| WARNING: For recipe qt4-embedded, the following files/directories were installed but not shipped in any package:
| WARNING:   /usr/lib/qtopia/plugins/kbddrivers/.debug
| WARNING:   /usr/lib/qtopia/plugins/kbddrivers/.debug/libqlinuxinputkbddriver.so

* No PR bump, because -plugin-kbd-linuxinput is not enabled
  by default.

(From OE-Core rev: f477717a6e9b5820b6e6e505d64adb5d3a64abc7)

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-05 18:00:34 +00:00
Paul Eggleton e6053e55f4 qt4: use system SQLite
We've always been depending on external SQLite, however by default Qt
builds using its own internal copy of SQLite. Add the configure option
to actually use the external SQLite library and make it clearer which
version is in use.

Fixes [YOCTO #2514].

(From OE-Core rev: 33e0afd2fffdef4dccfce6383bc646f975972b1e)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-02-11 22:49:49 +00:00
Martin Jansa fadb407901 PACKAGES_DYNAMIC: use += instead of = in most cases
* to keep ${PN}-locale from
  bitbake.conf:PACKAGES_DYNAMIC = "^${PN}-locale-.*"

(From OE-Core rev: 73252b16b501c0986b0ca0895e4534895a9ba3db)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-19 18:02:26 +01:00
Martin Jansa 33b31640bf PACKAGES_DYNAMIC: use regexp not glob
* bitbake uses PACKAGES_DYNAMIC as regexp
  ^ could make matching faster (and it will be more clear that we're expecting regexp not glob)
  * made all those last '-' optional, use .* (or nothing)

(From OE-Core rev: 2f3ebdfa5f42dae51063b043cc4b0fbe20b40064)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-19 18:02:26 +01:00
Martin Jansa d4ad1b760d qt4.inc: move more options to separate variables
* make it easier to override them in bbappend
* convert pulseaudio to more common -pulseaudio/-no-pulseaudio form

(From OE-Core rev: 34e3687394c6fa18ef0443d63b8d7d0a68c441e0)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-02 17:19:26 +01:00
Mark Hatle 7cd145472d qt4: Update qt4.inc to remove staticdev deps in -dbg packages
It appears that the qt4.inc had a copy/paste error relating to creating
a list of staticdev packages, that caused them to show up as dependencies
in the -dbg package.

(From OE-Core rev: a7c5cec5fc63b4a26d84673460426b35669068dc)

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-09-12 15:13:36 +01:00
Paul Eggleton 07c93ba0ce qt4: make font packaging specific to embedded version
Qt 4's lib/fonts files are intended only for installation with
Qt Embedded [1] so only install and package them with the embedded
version.

Fixes [YOCTO #2809].

[1] http://lists.qt-project.org/pipermail/interest/2012-July/003062.html

(From OE-Core rev: 64369219e3e03cacfaef8df6e3eec507140bdd7d)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-31 08:02:10 +01:00
Paul Eggleton 72730329c8 qt4: allow recipes building commercial edition
To enable building the commercial edition of Qt (through additional
recipes that are *not* provided by OE-Core) we need to tweak a few
things:

* Don't make recipes that inherit qt4x11.bbclass depend on qt4-x11-free
  - instead add qt4-x11 to DEPENDS and then have qt4-x11-free include
  this in its PROVIDES. A commercial equivalent recipe should do the
  same.
* Add a QT_LICENSE_FILE variable that can be used to specify the license
  file required by the commercial edition.
* Add a QT_LICENSE_FLAGS variable which the recipe can set to select the
  license option being used. The default of "-opensource" retains the
  current behaviour; a commercial recipe should set it to "-commercial".

Fixes [YOCTO #2505].

(From OE-Core rev: 2be0058fc4acddab611637656183accd052b40eb)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-31 08:02:09 +01:00
Richard Purdie 73cf0335c4 Remove a number of unneeded import os/bb calls
The bb and os modules are always imported so having these extra import calls
are a waste of space/execution time. They also set a bad example for people
copy and pasting code so clean them up.

(From OE-Core rev: 7d674820958be3a7051ea619effe1a6061d9cbe2)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-19 12:24:50 +01:00
Richard Purdie bfd279de32 Convert tab indentation in python functions into four-space
(From OE-Core rev: 604d46c686d06d62d5a07b9c7f4fa170f99307d8)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-19 10:24:50 +01:00
Dongxiao Xu 649782175a qt4: move functions from python to shell style
In qt4's do_configure operation, it will refer to some variables that
are derived from 'd', however these variable values may be not correct
in multilib case since the extraction of these variables happens before
the multilib handler.

The fix is to move these python style functions back to shell style.

This fixes [YOCTO #2355]

[RP: Fix whitepace]
(From OE-Core rev: 977ba301a1063a84b865ddf7367c35827fbffc86)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-05-08 14:49:14 +01:00
Paul Eggleton 4c26382397 qt4: add RPROVIDES/RREPLACES for qmake2 recipe
OE-Classic and meta-oe provide a qmake2 recipe; since this has been
obsoleted by the recent change to provide qmake within the tools package
and (in the latter case) will soon be removed, add an RREPLACES to aid
upgrades and RPROVIDES to make it easy to install.

(From OE-Core rev: 9ba01c3b7ce3d9f822e1cc08cd032e019a15180f)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-19 14:37:42 +00:00
Saul Wold 82b6146ef2 qt4: package static libraries correctly to fix warnings
WARNING: QA Issue: non -staticdev package contains static .a library: qt4-demos path '/work/i586-poky-linux/qt4-x11-free-4.7.4-r39.7/packages-split/qt4-demos/usr/bin/qt4/demos/shared/libdemo_shared.a'
WARNING: QA Issue: non -staticdev package contains static .a library: qt4-examples path '/work/i586-poky-linux/qt4-x11-free-4.7.4-r39.7/packages-split/qt4-examples/usr/bin/qt4/examples/tools/plugandpaint/plugins/libpnp_basictools.a'
(From OE-Core rev: d4f1ef6b8297826230a68e535098709d07de1f48)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-15 13:33:51 +00:00
Andreas Oberritter 7b6cd925d4 qt4: fix deps in libQtWebkit.la and QtWebKit.pc
* Both files contain -L../../WebCore/release -L../../JavaScriptCore/release -lwebcore -ljscore
* These paths and libs don't get installed.
* When building a shared lib with libtool, that links
  with libQtWebKit, libtool adds these unneeded parameters
  to the linker command-line, thus linking fails.

(From OE-Core rev: 4c41a3204ef72f53813ddc86fe525fa9c6714daa)

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-13 11:45:10 +00:00
Richard Purdie b1aeaa8b0d meta: Replace bb.data.expand(xxx, d) -> d.expand(xxx)
sed \
 -e 's:bb.data.\(expand([^,()]*\), *\([^) ]*\) *):\2.\1):g' \
 -i `grep -ril bb.data.expand *`

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-05 10:23:53 -08:00
Richard Purdie 06f2f8ce0a meta: Convert getVar/getVarFlag(xxx, 1) -> (xxx, True)
Using "1" with getVar is bad coding style and "True" is preferred.
This patch is a sed over the meta directory of the form:

sed \
 -e 's:\(\.getVar([^,()]*, \)1 *):\1True):g' \
 -e 's:\(\.getVarFlag([^,()]*, [^,()]*, \)1 *):\1True):g' \
 -i `grep -ril getVar *`

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-05 10:22:56 -08:00
Paul Eggleton 01954b9c65 qt4: make pulseaudio support conditional upon DISTRO_FEATURES
Add a pulseaudio DISTRO_FEATURES item and disable pulseaudio support in
phonon within Qt4 if it is not present; otherwise it is a race condition
as to whether it is enabled or disabled or breaks the build.

Note that this adds pulseaudio to DISTRO_FEATURES_BACKFILL thus leaving
existing distro configurations unaffected.

(From OE-Core rev: b82c216c1ee8e2a009e87856b7adad08f7f50482)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-02 16:22:48 +00:00
Andreas Oberritter 13949f2100 qt4.inc: depend on tiff
* Fixes the following error with qt4-embedded-4.8.0 and possibly others:

| ../../../gui/image/qtiffhandler.cpp:48:20: fatal error: tiffio.h: No such file or directory

(From OE-Core rev: d0853052228128ccca2b744dae9c4dceae23067a)

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-02-28 12:27:51 +00:00
Paul Eggleton 6be627fd5f qt4: build qmake for the target
qmake was not being built at all (since we had the host version from
qt4-native) and the default is to build for the host machine within
configure. With a minor hack we can build qmake for the target as well,
which is useful if you want to build Qt 4 software on an actual device.
This is now installed as part of the tools package (together with uic,
moc etc.)

Additionally, add an environment setup script (installed in
/usr/share/qt4/environment-setup or /usr/share/qtopia/environment-setup
for the embedded version) as part of the mkspecs package since the
mkspecs will not work without the paths set up by this script. The code
to create this script was adapted from the qmake2 recipe in meta-oe.

Also move do_compile() from qt-${PV}.inc up to qt4.inc as both versions
have the exact same content.

(From OE-Core rev: 4306606489a2d922595d4c86a21c496bbd8a607e)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-02-28 12:27:25 +00:00
Paul Eggleton 670706d1d3 qt4: add version 4.8.0
Version 4.8.0 makes a few minor changes in the internal build system -
the following issues had to be worked around:

* The -qt-gif configure option has been removed. This is actually the
  default and has been for some time, so remove it from qt4.inc.
* The mkspecs have been refactored requiring us to copy our g++.conf
  file over the top of g++-unix.conf instead. Some modifications to this
  file were also necessary to remove some settings that are now in other
  conf files (and we don't modify those values in any case).
* The LD environment variable needs to be unset during configure, or
  else the configure script overrides our value of QMAKE_LINK which
  selects ${CXX} as our linker.
* QMAKE_CXX contains a reference to OE_QMAKE_CXX which the configure
  script does not expect and cannot expand and this results in webkit
  being disabled, so add a workaround for this.

(From OE-Core rev: 6b2a5d15ad20573502142b635e6cab9bcfb3b40a)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-04 12:08:31 +00:00
Philip Balister 23f1ede0a1 qt4.inc : Add uic, moc, rcc, and lrelease to tools package.
These binaries are needed in the target tools package so we can build
qt apps on the target. You also need to install qmake from meta-oe.

Tested by building gnuradio on the USRP e100 with qt support.

(This effectively reverses OE-core rev
69eeb3d2276e5b10d084b47d308ecfc8daf8b467, however test builds for
qemux86 and qemumips produced no packaging warnings such as those
described in that commit, and the architecture of the executables is
correct.)

(From OE-Core rev: c96db08915a554fb5e4bb2c360b919c8392b32c6)

Signed-off-by: Philip Balister <philip@balister.org>
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-12-13 12:28:12 +00:00
Paul Eggleton 1e459c83e5 qt4: various tidy-ups
* -reduce-relocations is already specified in qt4.inc, no need to add it
  in qt-${PV}.inc
* Add QT_GLFLAGS to QT_CONFIG_FLAGS in qt4.inc rather than spreading it
  through other inc files.
* Add "-xmlpatterns -no-rpath -qt3support -silent" to QT_CONFIG_FLAGS in
  qt4.inc rather than qt-${PV}.inc; these have been supported since at
  least 4.5.2 and therefore shouldn't be version-specific.
* Move "-no-fast -silent -no-rpath" to EXTRA_OECONF in qt4-native.inc
  rather than the versioned recipes for the same reason
* Remove redundant setting of LICENSE in qt4-embedded.inc

(From OE-Core rev: c9f714062c1100cedbcb2c16d16656e3f5442133)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-12-08 15:24:28 +00:00
Eric Bénard 4f408de16b qt4: fix sed to have correct *.pc files
it seems sed doesn't handle \? properly if the string in not between
quotes.

without this patch, we get something like (for example for QtDBusE.pc :
Libs: -L${libdir} -lQtDBusE
Libs.private: -L/home/ebenard/WORK/setup-scripts/build/tmp-angstrom_2010_x-eglibc/sysroots/board/
usr/lib -L/usr/lib  -L/home/ebenard/WORK/setup-scripts/build/tmp-angstrom_2010_x-eglibc/sysroots/board
/usr/lib -lQtXmlE -L/usr/lib -lQtCoreE -lpthread
Cflags: -DQT_SHARED -I/usr/include/qtopia -I${includedir}

with the patch we get what is expected :
Libs: -L${libdir} -lQtDBusE
Libs.private:     -lQtXmlE  -lQtCoreE -lpthread
Cflags: -DQT_SHARED -I/usr/include/qtopia -I${includedir}

(From OE-Core rev: 2e635b4fe6be9d5bfcdd837a523833b7eb0819a0)

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-29 13:46:28 +00:00
Richard Purdie 0a434ac101 getVar/setVar cleanups
Complete the bb.data.getVar/setVar replacements with accesses
directly to the data store object.

(From OE-Core rev: 2864ff6a4b3c3f9b3bbb6d2597243cc5d3715939)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-27 10:25:34 +00:00
Richard Purdie c8dee9b92d Convert to use direct access to the data store (instead of bb.data.*Var*())
This is the result of running the following over the metadata:

sed \
-e 's:bb.data.\(setVar([^,()]*,[^,()]*\), *\([^ )]*\) *):\2.\1):g' \
-e 's:bb.data.\(setVarFlag([^,()]*,[^,()]*,[^,()]*\), *\([^) ]*\) *):\2.\1):g' \
-e 's:bb.data.\(getVar([^,()]*\), *\([^(), ]*\) *,\([^)]*\)):\2.\1,\3):g' \
-e 's:bb.data.\(getVarFlag([^,()]*,[^,()]*\), *\([^(), ]*\) *,\([^)]*\)):\2.\1,\3):g' \
-e 's:bb.data.\(getVarFlag([^,()]*,[^,()]*\), *\([^() ]*\) *):\2.\1):g' \
-e 's:bb.data.\(getVar([^,()]*\), *\([^) ]*\) *):\2.\1):g' \
-i `grep -ril bb.data *`

(From OE-Core rev: b22831fd63164c4db9c0b72934d7d734a6585251)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-10 11:51:19 +00:00
Wenzong Fan c973a6e4c5 qt4-x11-free: Fix broken regexes in qt4-x11-free's recipe.
[YOCTO #1671]

qt4-x11-free's recipe includes a sed script to sanitize it's .prl files,
which are used by qmake to generate a list of libs and includes in the
Makefiles it generates. It however, fails to take into account the possibility
of trailing slashes, and thus leaves them in, and breaks gcc's syntax.
Update these regexes to account for them.

(From OE-Core rev: 8d580ed449c09a64483519d66e14a2e3b071806a)

Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-14 13:18:19 +01:00
Dmitry Eremin-Solenikov bad9759cf7 qt4: packaging fixup
Improve packaging:
* Add phrasebook packages to DYNAMIC_PACKAGES
* Correct phrasebook packages generation
* Include more files into -dbg packages
* Package fontdir and fonts README.

(From OE-Core rev: 4e3c29dd90f583cafe7a7fc863efb3720096d67b)

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-04 22:29:23 +01:00
Denis Carikli 3af27a3686 qt4.inc: package qtdemo's docs in a separate package
The documentation was 285M and doesn't fit on the NAND of many machines,
but in another had part of the documentation is needed for the
QT demos, so we split the documentation: so qt demo only RRECOMMAND
the documentation that it really needs.

Thanks to Eric Bénard for explaining me how to split it.

(From OE-Core rev: 97446651cd5128ca7a549df677c920e2463c46f9)

Signed-off-by: Denis Carikli <denis@eukrea.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-04 13:46:25 +01:00
Denis Carikli 4c938669e6 qt4.inc: Remove the optional documentation package from the demo's RRECOMMENDS
The documentation is 285M and doesn't fit on the NAND of many machines.

(From OE-Core rev: 64d6a6ceceb1f1a599b8140f30071f8bc8e60393)

Signed-off-by: Denis Carikli <denis@eukrea.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-04 13:46:25 +01:00
Simon Busch a459ac7160 meta: qt4: fix postprocessing of pkg-config files
When building qt4-embedded the generated and cleaned pkg-config files for qt are wrong.
The Cflags variable contains something like ${includedir}/qtopia/QtCore where
${includedir} is already /usr/include/qtopia/QtCore.

This patch reverts the fix up of the Cflags variable implemented in do_install.

(From OE-Core rev: b40b9c024be5e1ec81a31961158b3e6b529acfe0)

Signed-off-by: Simon Busch <morphis@gravedo.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-09-28 14:58:50 +01:00
Anders Darander 5f32d1fcc5 qt4: allow a reduction in build time
When reducing build time by adding QT_DISTRO_FLAGS from the set '-no-gui -nomake tools
-nomake examples -nomake demos -nomake docs', build failure can occur, due to not building
all tools.

* Make rm not error out when removing one of the, possibly, non-existing tools.
* Only try to rename qtdemo, if qtdemo exists.
* Check if the phrasebook path exists, and only then call do_split_packages()

(From OE-Core rev: 51ef8335df895603e75345a18aaefe2359b2387f)

Signed-off-by: Anders Darander <anders@chargestorm.se>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-19 09:29:18 -07:00
Yu Ke 16bbb3144c qt4.inc: expand the package name for multilib case
in the qt4.inc python annomyous code, there is case where package name
is set to "${QT_BASE_LIB}-tool", and  FILE_${QT_BASE_LIB}-tool is set to xxx.
here QT_BASE_NAME=qt4. multilib.bbclass will try to rename the FILE_qt4_tool to
FILE_lib64_qt4_tool. unfortunately, there is only FILE_${QT_BASE}-tool, no
FILE_qt4-tool, so FILE_lib64_qt4_tool will not be defined.

to fix this issue, this patch expand the QT_BASE_LIB when assigning the package
name.

FIX [YOCTO #1344]

(From OE-Core rev: b5d381133660fe338796b965131cee39cec01b96)

Signed-off-by: Yu Ke <ke.yu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-15 15:26:21 +01:00
Yu Ke c3a66d9919 qt4.inc: revise RRECOMMENDS
using ${QT_BASE_NAME}-dbg as RRECOMMENDS is not correct in qt4-x11-free
case, because ${QT_BASE_NAME}-dbg i.e. qt4-dbg does not exist

this patch fix it by using ${PN}

(From OE-Core rev: d72adf3c4cf3de09d2a0bc6d1b9e7c9fd127bd60)

Signed-off-by: Yu Ke <ke.yu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-15 15:26:21 +01:00
Paul Eggleton 5b4c0b327a qt4: delete unpackaged uic3 to avoid unpackaged file warning
All the other utilities get deleted as they should not be packaged,
delete this one as well.

(From OE-Core rev: 2c036c71cf0d978fac2ddc4abfb702d42af6bcda)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-15 15:26:18 +01:00
Paul Eggleton f9e9d8d45c qt4: package QML plugins and correct their install directory
QML components from Qt were installed to ${prefix} before and never got
packaged. This is now fixed and QML components are now installed into
${libdir}/${QT_DIR_NAME}/imports and packaged into qt4-*-qml-plugins
package.

Additionally qmlviewer and the examples/demos are now dependent upon
these plugins as needed.

Originally based on OE commit 4adf97be8c5b5f71ad92095a19968af534baa9e2
by Simon Busch <morphis@gravedo.de>

(From OE-Core rev: 49c43e2bea64f70a22a2741ea280bd1c13e5110a)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-15 15:26:18 +01:00
Richard Purdie e8755c782f qt4: Package debug source files
(From OE-Core rev: 0086e2e7f776b71378eb9cb69c0e59db4a5ffea7)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-07 10:57:48 +01:00
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
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
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
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 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