Patchwork [meta-oe,0/3] Qt4 tidy up

login
register
mail settings
Submitter Paul Eggleton
Date June 18, 2011, 6:57 p.m.
Message ID <cover.1308417391.git.paul.eggleton@linux.intel.com>
Download mbox
Permalink /patch/6121/
State Not Applicable
Headers show

Pull-request

git://git.openembedded.org/meta-openembedded-contrib paule/qt4-bbappend

Comments

Paul Eggleton - June 18, 2011, 6:57 p.m.
A few patches to tidy up Qt4 in meta-oe.

The following changes since commit c85efd2281af4556854107768d7583a8208b6647:

  rsyslog: add 5.8.0 (2011-06-17 19:45:58 +0200)

are available in the git repository at:
  git://git.openembedded.org/meta-openembedded-contrib paule/qt4-bbappend
  http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=paule/qt4-bbappend

Paul Eggleton (3):
  qt4: replace recipes with bbappends
  qmake2: remove qmake2 recipe
  qt4: remove qt4-tools-sdk

 .../recipes-qt/qt4/files/0001-cross-compile.patch  |   36 ---
 .../recipes-qt/qt4/files/0001-fix-mkspecs.patch    |  102 -------
 .../qt4/files/0002-fix-resinit-declaration.patch   |   22 --
 meta-oe/recipes-qt/qt4/files/0004-no-qmake.patch   |   26 --
 .../qt4/files/0006-freetype-host-includes.patch    |   24 --
 .../recipes-qt/qt4/files/0008-qt-lib-infix.patch   |   36 ---
 .../recipes-qt/qt4/files/0009-support-2bpp.patch   |  299 -------------------
 .../files/0010-no-simpledecoration-example.patch   |   14 -
 meta-oe/recipes-qt/qt4/files/common.pro            |  108 -------
 .../recipes-qt/qt4/files/compile.test-lflags.patch |   13 -
 .../recipes-qt/qt4/files/configure-lflags.patch    |   13 -
 meta-oe/recipes-qt/qt4/files/configure-paths.patch |   21 --
 .../recipes-qt/qt4/files/fix-config-tests.patch    |   36 ---
 meta-oe/recipes-qt/qt4/files/g++.conf              |   53 ----
 .../recipes-qt/qt4/files/hack-out-pg_config.patch  |   30 --
 meta-oe/recipes-qt/qt4/files/linux-oe-qmake.conf   |   82 -----
 meta-oe/recipes-qt/qt4/files/linux.conf            |   54 ----
 meta-oe/recipes-qt/qt4/files/mips-relocate.patch   |   28 --
 .../recipes-qt/qt4/files/qmake-exists-check.patch  |   18 --
 meta-oe/recipes-qt/qt4/files/qmake-hack.diff       |   15 -
 meta-oe/recipes-qt/qt4/files/qt-config.patch       |   24 --
 meta-oe/recipes-qt/qt4/files/qte.sh                |    7 -
 .../qt4/files/qthelp-lib-qtclucene.patch           |   86 ------
 meta-oe/recipes-qt/qt4/files/use-lflags-last.patch |   22 --
 .../recipes-qt/qt4/qmake2-sdk/linux-oe-qmake.conf  |    1 -
 meta-oe/recipes-qt/qt4/qmake2.inc                  |   69 -----
 meta-oe/recipes-qt/qt4/qmake2/linux-oe-qmake.conf  |    1 -
 meta-oe/recipes-qt/qt4/qmake2_2.10a.bb             |   60 ----
 meta-oe/recipes-qt/qt4/qt-4.7.2.inc                |   58 ----
 .../0001-Added-Openembedded-crossarch-option.patch |   44 ---
 meta-oe/recipes-qt/qt4/qt-4.7.2/g++.conf           |   60 ----
 .../qt4/qt-4.7.2/hack-out-pg2-4.7.0.patch          |   19 --
 meta-oe/recipes-qt/qt4/qt-4.7.2/linux.conf         |   66 ----
 meta-oe/recipes-qt/qt4/qt4-embedded.inc            |   34 ---
 .../qt4-embedded/0006-freetype-host-includes.patch |   20 --
 meta-oe/recipes-qt/qt4/qt4-embedded_4.7.2.bb       |   10 -
 meta-oe/recipes-qt/qt4/qt4-embedded_4.7.3.bbappend |    5 +
 meta-oe/recipes-qt/qt4/qt4-tools-native.inc        |   77 -----
 meta-oe/recipes-qt/qt4/qt4-tools-native_4.7.2.bb   |   13 -
 meta-oe/recipes-qt/qt4/qt4-tools-nativesdk.inc     |  111 -------
 .../recipes-qt/qt4/qt4-tools-nativesdk_4.7.2.bb    |    6 -
 meta-oe/recipes-qt/qt4/qt4-tools-sdk.inc           |   88 ------
 meta-oe/recipes-qt/qt4/qt4-tools-sdk_4.7.2.bb      |    8 -
 meta-oe/recipes-qt/qt4/qt4-x11-free.inc            |   20 --
 .../qt4/qt4-x11-free/0003-no-tools.patch           |   18 --
 .../qt4-x11-free/0006-freetype-host-includes.patch |   20 --
 .../qt4-x11-free/0007-openssl-host-includes.patch  |   20 --
 .../qt4/qt4-x11-free/0008-qt-lib-infix.patch       |   34 ---
 meta-oe/recipes-qt/qt4/qt4-x11-free_4.7.2.bb       |   12 -
 meta-oe/recipes-qt/qt4/qt4-x11-free_4.7.3.bbappend |    5 +
 meta-oe/recipes-qt/qt4/qt4.inc                     |  314 --------------------
 meta-oe/recipes-qt/qt4/qt4_arch.inc                |   25 --
 52 files changed, 10 insertions(+), 2377 deletions(-)
 delete mode 100644 meta-oe/recipes-qt/qt4/files/0001-cross-compile.patch
 delete mode 100644 meta-oe/recipes-qt/qt4/files/0001-fix-mkspecs.patch
 delete mode 100644 meta-oe/recipes-qt/qt4/files/0002-fix-resinit-declaration.patch
 delete mode 100644 meta-oe/recipes-qt/qt4/files/0004-no-qmake.patch
 delete mode 100644 meta-oe/recipes-qt/qt4/files/0006-freetype-host-includes.patch
 delete mode 100644 meta-oe/recipes-qt/qt4/files/0008-qt-lib-infix.patch
 delete mode 100644 meta-oe/recipes-qt/qt4/files/0009-support-2bpp.patch
 delete mode 100644 meta-oe/recipes-qt/qt4/files/0010-no-simpledecoration-example.patch
 delete mode 100644 meta-oe/recipes-qt/qt4/files/common.pro
 delete mode 100644 meta-oe/recipes-qt/qt4/files/compile.test-lflags.patch
 delete mode 100644 meta-oe/recipes-qt/qt4/files/configure-lflags.patch
 delete mode 100644 meta-oe/recipes-qt/qt4/files/configure-paths.patch
 delete mode 100644 meta-oe/recipes-qt/qt4/files/fix-config-tests.patch
 delete mode 100644 meta-oe/recipes-qt/qt4/files/g++.conf
 delete mode 100644 meta-oe/recipes-qt/qt4/files/hack-out-pg_config.patch
 delete mode 100644 meta-oe/recipes-qt/qt4/files/linux-oe-qmake.conf
 delete mode 100644 meta-oe/recipes-qt/qt4/files/linux.conf
 delete mode 100644 meta-oe/recipes-qt/qt4/files/mips-relocate.patch
 delete mode 100644 meta-oe/recipes-qt/qt4/files/qmake-exists-check.patch
 delete mode 100644 meta-oe/recipes-qt/qt4/files/qmake-hack.diff
 delete mode 100644 meta-oe/recipes-qt/qt4/files/qt-config.patch
 delete mode 100644 meta-oe/recipes-qt/qt4/files/qte.sh
 delete mode 100644 meta-oe/recipes-qt/qt4/files/qthelp-lib-qtclucene.patch
 delete mode 100644 meta-oe/recipes-qt/qt4/files/use-lflags-last.patch
 delete mode 100644 meta-oe/recipes-qt/qt4/qmake2-sdk/linux-oe-qmake.conf
 delete mode 100644 meta-oe/recipes-qt/qt4/qmake2.inc
 delete mode 100644 meta-oe/recipes-qt/qt4/qmake2/linux-oe-qmake.conf
 delete mode 100644 meta-oe/recipes-qt/qt4/qmake2_2.10a.bb
 delete mode 100644 meta-oe/recipes-qt/qt4/qt-4.7.2.inc
 delete mode 100644 meta-oe/recipes-qt/qt4/qt-4.7.2/0001-Added-Openembedded-crossarch-option.patch
 delete mode 100644 meta-oe/recipes-qt/qt4/qt-4.7.2/g++.conf
 delete mode 100644 meta-oe/recipes-qt/qt4/qt-4.7.2/hack-out-pg2-4.7.0.patch
 delete mode 100644 meta-oe/recipes-qt/qt4/qt-4.7.2/linux.conf
 delete mode 100644 meta-oe/recipes-qt/qt4/qt4-embedded.inc
 delete mode 100644 meta-oe/recipes-qt/qt4/qt4-embedded/0006-freetype-host-includes.patch
 delete mode 100644 meta-oe/recipes-qt/qt4/qt4-embedded_4.7.2.bb
 create mode 100644 meta-oe/recipes-qt/qt4/qt4-embedded_4.7.3.bbappend
 delete mode 100644 meta-oe/recipes-qt/qt4/qt4-tools-native.inc
 delete mode 100644 meta-oe/recipes-qt/qt4/qt4-tools-native_4.7.2.bb
 delete mode 100644 meta-oe/recipes-qt/qt4/qt4-tools-nativesdk.inc
 delete mode 100644 meta-oe/recipes-qt/qt4/qt4-tools-nativesdk_4.7.2.bb
 delete mode 100644 meta-oe/recipes-qt/qt4/qt4-tools-sdk.inc
 delete mode 100644 meta-oe/recipes-qt/qt4/qt4-tools-sdk_4.7.2.bb
 delete mode 100644 meta-oe/recipes-qt/qt4/qt4-x11-free.inc
 delete mode 100644 meta-oe/recipes-qt/qt4/qt4-x11-free/0003-no-tools.patch
 delete mode 100644 meta-oe/recipes-qt/qt4/qt4-x11-free/0006-freetype-host-includes.patch
 delete mode 100644 meta-oe/recipes-qt/qt4/qt4-x11-free/0007-openssl-host-includes.patch
 delete mode 100644 meta-oe/recipes-qt/qt4/qt4-x11-free/0008-qt-lib-infix.patch
 delete mode 100644 meta-oe/recipes-qt/qt4/qt4-x11-free_4.7.2.bb
 create mode 100644 meta-oe/recipes-qt/qt4/qt4-x11-free_4.7.3.bbappend
 delete mode 100644 meta-oe/recipes-qt/qt4/qt4.inc
 delete mode 100644 meta-oe/recipes-qt/qt4/qt4_arch.inc
Koen Kooi - June 19, 2011, 8:52 a.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 18-06-11 20:57, Paul Eggleton wrote:
> A few patches to tidy up Qt4 in meta-oe.
> 
> The following changes since commit c85efd2281af4556854107768d7583a8208b6647:
> 
>   rsyslog: add 5.8.0 (2011-06-17 19:45:58 +0200)
> 
> are available in the git repository at:
>   git://git.openembedded.org/meta-openembedded-contrib paule/qt4-bbappend
>   http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=paule/qt4-bbappend
> 
> Paul Eggleton (3):
>   qt4: replace recipes with bbappends
>   qmake2: remove qmake2 recipe
>   qt4: remove qt4-tools-sdk

Thanks, I queued them up for testing.


> 
>  .../recipes-qt/qt4/files/0001-cross-compile.patch  |   36 ---
>  .../recipes-qt/qt4/files/0001-fix-mkspecs.patch    |  102 -------
>  .../qt4/files/0002-fix-resinit-declaration.patch   |   22 --
>  meta-oe/recipes-qt/qt4/files/0004-no-qmake.patch   |   26 --
>  .../qt4/files/0006-freetype-host-includes.patch    |   24 --
>  .../recipes-qt/qt4/files/0008-qt-lib-infix.patch   |   36 ---
>  .../recipes-qt/qt4/files/0009-support-2bpp.patch   |  299 -------------------
>  .../files/0010-no-simpledecoration-example.patch   |   14 -
>  meta-oe/recipes-qt/qt4/files/common.pro            |  108 -------
>  .../recipes-qt/qt4/files/compile.test-lflags.patch |   13 -
>  .../recipes-qt/qt4/files/configure-lflags.patch    |   13 -
>  meta-oe/recipes-qt/qt4/files/configure-paths.patch |   21 --
>  .../recipes-qt/qt4/files/fix-config-tests.patch    |   36 ---
>  meta-oe/recipes-qt/qt4/files/g++.conf              |   53 ----
>  .../recipes-qt/qt4/files/hack-out-pg_config.patch  |   30 --
>  meta-oe/recipes-qt/qt4/files/linux-oe-qmake.conf   |   82 -----
>  meta-oe/recipes-qt/qt4/files/linux.conf            |   54 ----
>  meta-oe/recipes-qt/qt4/files/mips-relocate.patch   |   28 --
>  .../recipes-qt/qt4/files/qmake-exists-check.patch  |   18 --
>  meta-oe/recipes-qt/qt4/files/qmake-hack.diff       |   15 -
>  meta-oe/recipes-qt/qt4/files/qt-config.patch       |   24 --
>  meta-oe/recipes-qt/qt4/files/qte.sh                |    7 -
>  .../qt4/files/qthelp-lib-qtclucene.patch           |   86 ------
>  meta-oe/recipes-qt/qt4/files/use-lflags-last.patch |   22 --
>  .../recipes-qt/qt4/qmake2-sdk/linux-oe-qmake.conf  |    1 -
>  meta-oe/recipes-qt/qt4/qmake2.inc                  |   69 -----
>  meta-oe/recipes-qt/qt4/qmake2/linux-oe-qmake.conf  |    1 -
>  meta-oe/recipes-qt/qt4/qmake2_2.10a.bb             |   60 ----
>  meta-oe/recipes-qt/qt4/qt-4.7.2.inc                |   58 ----
>  .../0001-Added-Openembedded-crossarch-option.patch |   44 ---
>  meta-oe/recipes-qt/qt4/qt-4.7.2/g++.conf           |   60 ----
>  .../qt4/qt-4.7.2/hack-out-pg2-4.7.0.patch          |   19 --
>  meta-oe/recipes-qt/qt4/qt-4.7.2/linux.conf         |   66 ----
>  meta-oe/recipes-qt/qt4/qt4-embedded.inc            |   34 ---
>  .../qt4-embedded/0006-freetype-host-includes.patch |   20 --
>  meta-oe/recipes-qt/qt4/qt4-embedded_4.7.2.bb       |   10 -
>  meta-oe/recipes-qt/qt4/qt4-embedded_4.7.3.bbappend |    5 +
>  meta-oe/recipes-qt/qt4/qt4-tools-native.inc        |   77 -----
>  meta-oe/recipes-qt/qt4/qt4-tools-native_4.7.2.bb   |   13 -
>  meta-oe/recipes-qt/qt4/qt4-tools-nativesdk.inc     |  111 -------
>  .../recipes-qt/qt4/qt4-tools-nativesdk_4.7.2.bb    |    6 -
>  meta-oe/recipes-qt/qt4/qt4-tools-sdk.inc           |   88 ------
>  meta-oe/recipes-qt/qt4/qt4-tools-sdk_4.7.2.bb      |    8 -
>  meta-oe/recipes-qt/qt4/qt4-x11-free.inc            |   20 --
>  .../qt4/qt4-x11-free/0003-no-tools.patch           |   18 --
>  .../qt4-x11-free/0006-freetype-host-includes.patch |   20 --
>  .../qt4-x11-free/0007-openssl-host-includes.patch  |   20 --
>  .../qt4/qt4-x11-free/0008-qt-lib-infix.patch       |   34 ---
>  meta-oe/recipes-qt/qt4/qt4-x11-free_4.7.2.bb       |   12 -
>  meta-oe/recipes-qt/qt4/qt4-x11-free_4.7.3.bbappend |    5 +
>  meta-oe/recipes-qt/qt4/qt4.inc                     |  314 --------------------
>  meta-oe/recipes-qt/qt4/qt4_arch.inc                |   25 --
>  52 files changed, 10 insertions(+), 2377 deletions(-)
>  delete mode 100644 meta-oe/recipes-qt/qt4/files/0001-cross-compile.patch
>  delete mode 100644 meta-oe/recipes-qt/qt4/files/0001-fix-mkspecs.patch
>  delete mode 100644 meta-oe/recipes-qt/qt4/files/0002-fix-resinit-declaration.patch
>  delete mode 100644 meta-oe/recipes-qt/qt4/files/0004-no-qmake.patch
>  delete mode 100644 meta-oe/recipes-qt/qt4/files/0006-freetype-host-includes.patch
>  delete mode 100644 meta-oe/recipes-qt/qt4/files/0008-qt-lib-infix.patch
>  delete mode 100644 meta-oe/recipes-qt/qt4/files/0009-support-2bpp.patch
>  delete mode 100644 meta-oe/recipes-qt/qt4/files/0010-no-simpledecoration-example.patch
>  delete mode 100644 meta-oe/recipes-qt/qt4/files/common.pro
>  delete mode 100644 meta-oe/recipes-qt/qt4/files/compile.test-lflags.patch
>  delete mode 100644 meta-oe/recipes-qt/qt4/files/configure-lflags.patch
>  delete mode 100644 meta-oe/recipes-qt/qt4/files/configure-paths.patch
>  delete mode 100644 meta-oe/recipes-qt/qt4/files/fix-config-tests.patch
>  delete mode 100644 meta-oe/recipes-qt/qt4/files/g++.conf
>  delete mode 100644 meta-oe/recipes-qt/qt4/files/hack-out-pg_config.patch
>  delete mode 100644 meta-oe/recipes-qt/qt4/files/linux-oe-qmake.conf
>  delete mode 100644 meta-oe/recipes-qt/qt4/files/linux.conf
>  delete mode 100644 meta-oe/recipes-qt/qt4/files/mips-relocate.patch
>  delete mode 100644 meta-oe/recipes-qt/qt4/files/qmake-exists-check.patch
>  delete mode 100644 meta-oe/recipes-qt/qt4/files/qmake-hack.diff
>  delete mode 100644 meta-oe/recipes-qt/qt4/files/qt-config.patch
>  delete mode 100644 meta-oe/recipes-qt/qt4/files/qte.sh
>  delete mode 100644 meta-oe/recipes-qt/qt4/files/qthelp-lib-qtclucene.patch
>  delete mode 100644 meta-oe/recipes-qt/qt4/files/use-lflags-last.patch
>  delete mode 100644 meta-oe/recipes-qt/qt4/qmake2-sdk/linux-oe-qmake.conf
>  delete mode 100644 meta-oe/recipes-qt/qt4/qmake2.inc
>  delete mode 100644 meta-oe/recipes-qt/qt4/qmake2/linux-oe-qmake.conf
>  delete mode 100644 meta-oe/recipes-qt/qt4/qmake2_2.10a.bb
>  delete mode 100644 meta-oe/recipes-qt/qt4/qt-4.7.2.inc
>  delete mode 100644 meta-oe/recipes-qt/qt4/qt-4.7.2/0001-Added-Openembedded-crossarch-option.patch
>  delete mode 100644 meta-oe/recipes-qt/qt4/qt-4.7.2/g++.conf
>  delete mode 100644 meta-oe/recipes-qt/qt4/qt-4.7.2/hack-out-pg2-4.7.0.patch
>  delete mode 100644 meta-oe/recipes-qt/qt4/qt-4.7.2/linux.conf
>  delete mode 100644 meta-oe/recipes-qt/qt4/qt4-embedded.inc
>  delete mode 100644 meta-oe/recipes-qt/qt4/qt4-embedded/0006-freetype-host-includes.patch
>  delete mode 100644 meta-oe/recipes-qt/qt4/qt4-embedded_4.7.2.bb
>  create mode 100644 meta-oe/recipes-qt/qt4/qt4-embedded_4.7.3.bbappend
>  delete mode 100644 meta-oe/recipes-qt/qt4/qt4-tools-native.inc
>  delete mode 100644 meta-oe/recipes-qt/qt4/qt4-tools-native_4.7.2.bb
>  delete mode 100644 meta-oe/recipes-qt/qt4/qt4-tools-nativesdk.inc
>  delete mode 100644 meta-oe/recipes-qt/qt4/qt4-tools-nativesdk_4.7.2.bb
>  delete mode 100644 meta-oe/recipes-qt/qt4/qt4-tools-sdk.inc
>  delete mode 100644 meta-oe/recipes-qt/qt4/qt4-tools-sdk_4.7.2.bb
>  delete mode 100644 meta-oe/recipes-qt/qt4/qt4-x11-free.inc
>  delete mode 100644 meta-oe/recipes-qt/qt4/qt4-x11-free/0003-no-tools.patch
>  delete mode 100644 meta-oe/recipes-qt/qt4/qt4-x11-free/0006-freetype-host-includes.patch
>  delete mode 100644 meta-oe/recipes-qt/qt4/qt4-x11-free/0007-openssl-host-includes.patch
>  delete mode 100644 meta-oe/recipes-qt/qt4/qt4-x11-free/0008-qt-lib-infix.patch
>  delete mode 100644 meta-oe/recipes-qt/qt4/qt4-x11-free_4.7.2.bb
>  create mode 100644 meta-oe/recipes-qt/qt4/qt4-x11-free_4.7.3.bbappend
>  delete mode 100644 meta-oe/recipes-qt/qt4/qt4.inc
>  delete mode 100644 meta-oe/recipes-qt/qt4/qt4_arch.inc
> 

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFN/bi7MkyGM64RGpERAqpsAKCbOWApflc+cKt5VwRRfGQbDUDrOgCfTC+L
4CdDudnfuTkb4lkhBcs6syc=
=zWyB
-----END PGP SIGNATURE-----