diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2014-05-28 11:49:29 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-06-03 16:45:05 +0100 |
| commit | 32a9c7101c7212c69d40893ee597eaf34955b641 (patch) | |
| tree | 1c4b8481fa993ec959f68dba8c73b614598e79c3 /meta/recipes-qt/qt4/qt4-4.8.5/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch | |
| parent | d9c7a02240ce37d5b2569d9177e8ba534b9295ce (diff) | |
| download | openembedded-core-contrib-32a9c7101c7212c69d40893ee597eaf34955b641.tar.gz | |
qt4: upgrade to version 4.8.6
* Remove patches merged upstream
* Add a qtscript translation package for an additional .qm file added in
this release
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.5/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch')
| -rw-r--r-- | meta/recipes-qt/qt4/qt4-4.8.5/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.5/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch b/meta/recipes-qt/qt4/qt4-4.8.5/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch deleted file mode 100644 index 1a8f2b7f94..0000000000 --- a/meta/recipes-qt/qt4/qt4-4.8.5/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch +++ /dev/null @@ -1,28 +0,0 @@ -From ac93237bc90ea7773c0ef5275962baba01d4a9c7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= <jeremy.laine@m4x.org> -Date: Wed, 26 Sep 2012 20:27:44 +0200 -Subject: [PATCH 05/21] configure: set LFLAGS to pick up zlib from staging - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure b/configure -index cc04b27..5a7c4ee 100755 ---- a/configure -+++ b/configure -@@ -690,7 +690,7 @@ fi - # initalize variables - #------------------------------------------------------------------------------- - --SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS" -+SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS LFLAGS" - for varname in $SYSTEM_VARIABLES; do - qmakevarname="${varname}" - # use LDFLAGS for autoconf compat, but qmake uses QMAKE_LFLAGS --- -1.8.0 - |