[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-409-gef25210
Brought to you by:
sszy
|
From: jscheer <js...@us...> - 2013-08-22 13:18:22
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via ef25210692a143f3320e98a48b42d53f0ec6ebbe (commit)
from 8e51724356155d6a51f396378107effc9f632a9e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit ef25210692a143f3320e98a48b42d53f0ec6ebbe
Author: Jeremie Scheer <jer...@ar...>
Date: Thu Aug 22 15:17:55 2013 +0200
[BUILDROOT] Update QT sources URL.
-----------------------------------------------------------------------
Summary of changes:
...-qt-full_integration_with_cross_compiling.patch | 23 +++++++++++++++----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/patches/buildroot/2013.05/132-qt-full_integration_with_cross_compiling.patch b/patches/buildroot/2013.05/132-qt-full_integration_with_cross_compiling.patch
index da81a2f..b66f797 100644
--- a/patches/buildroot/2013.05/132-qt-full_integration_with_cross_compiling.patch
+++ b/patches/buildroot/2013.05/132-qt-full_integration_with_cross_compiling.patch
@@ -4,8 +4,8 @@ Signed-off-by: Jérémie Scheer <jer...@ar...>
Index: buildroot/package/qt/Config.in
===================================================================
---- buildroot.orig/package/qt/Config.in 2012-02-29 23:19:47.000000000 +0100
-+++ buildroot/package/qt/Config.in 2012-09-05 15:29:54.000000000 +0200
+--- buildroot.orig/package/qt/Config.in 2013-05-31 22:29:04.000000000 +0200
++++ buildroot/package/qt/Config.in 2013-08-22 14:59:25.000000000 +0200
@@ -18,7 +18,13 @@
If unsure, say N.
@@ -23,9 +23,22 @@ Index: buildroot/package/qt/Config.in
If unsure, say N.
Index: buildroot/package/qt/qt.mk
===================================================================
---- buildroot.orig/package/qt/qt.mk 2012-02-29 23:19:47.000000000 +0100
-+++ buildroot/package/qt/qt.mk 2012-09-05 15:24:44.000000000 +0200
-@@ -57,9 +57,14 @@
+--- buildroot.orig/package/qt/qt.mk 2013-05-31 22:29:04.000000000 +0200
++++ buildroot/package/qt/qt.mk 2013-08-22 15:03:52.000000000 +0200
+@@ -11,9 +11,10 @@
+ #
+ ######################################################################
+
+-QT_VERSION = 4.8.4
++QT_VERSION_MAJOR = 4.8
++QT_VERSION = $(QT_VERSION_MAJOR).4
+ QT_SOURCE = qt-everywhere-opensource-src-$(QT_VERSION).tar.gz
+-QT_SITE = http://releases.qt-project.org/qt4/source
++QT_SITE = http://download.qt-project.org/archive/qt/$(QT_VERSION_MAJOR)/$(QT_VERSION)
+ QT_DEPENDENCIES = host-pkgconf
+ QT_INSTALL_STAGING = YES
+
+@@ -57,9 +58,14 @@
endif
ifeq ($(BR2_PACKAGE_QT_DEMOS),y)
hooks/post-receive
--
armadeus
|