[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-45-g11622d9
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-45-g11622d9
|
From: jscheer <js...@us...> - 2010-10-06 15:00:33
|
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 11622d91f37fc77acc47ede98840a37cbf5d5f5b (commit)
from 402addedc2ccf7b6c8dd7ef9ee3e80cfc83845bc (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 11622d91f37fc77acc47ede98840a37cbf5d5f5b
Author: Jeremie Scheer <jer...@ar...>
Date: Wed Oct 6 16:59:50 2010 +0200
[BUILDROOT] Correct inversion of demos and examples directories in patch 132-qt-full_integration_with_cross_compiling.patch
-----------------------------------------------------------------------
Summary of changes:
...-qt-full_integration_with_cross_compiling.patch | 8 ++++----
...-qt-full_integration_with_cross_compiling.patch | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/patches/buildroot/132-qt-full_integration_with_cross_compiling.patch b/patches/buildroot/132-qt-full_integration_with_cross_compiling.patch
index 53435fe..2777acd 100644
--- a/patches/buildroot/132-qt-full_integration_with_cross_compiling.patch
+++ b/patches/buildroot/132-qt-full_integration_with_cross_compiling.patch
@@ -6,7 +6,7 @@ Signed-off-by: Jérémie Scheer <jer...@ar...>
Index: buildroot/package/qtopia4/Config.in
===================================================================
--- buildroot.orig/package/qtopia4/Config.in 2010-10-06 15:02:23.000000000 +0200
-+++ buildroot/package/qtopia4/Config.in 2010-10-06 15:02:24.000000000 +0200
++++ buildroot/package/qtopia4/Config.in 2010-10-06 15:12:26.000000000 +0200
@@ -325,4 +325,14 @@
Build the Qt Script Tools module.
if unsure, say n.
@@ -25,7 +25,7 @@ Index: buildroot/package/qtopia4/Config.in
Index: buildroot/package/qtopia4/qtopia4.mk
===================================================================
--- buildroot.orig/package/qtopia4/qtopia4.mk 2010-10-06 15:02:23.000000000 +0200
-+++ buildroot/package/qtopia4/qtopia4.mk 2010-10-06 15:06:31.000000000 +0200
++++ buildroot/package/qtopia4/qtopia4.mk 2010-10-06 16:49:51.000000000 +0200
@@ -345,6 +345,14 @@
QT_CONFIGURE+= -no-stl
endif
@@ -45,8 +45,8 @@ Index: buildroot/package/qtopia4/qtopia4.mk
-no-accessibility \
-no-separate-debug-info \
-prefix /usr \
-+ -examplesdir $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/demos \
-+ -demosdir $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/examples \
++ -examplesdir $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/examples \
++ -demosdir $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/demos \
-hostprefix $(STAGING_DIR)/usr \
-fast \
-no-rpath \
diff --git a/patches/buildroot/2010.05/132-qt-full_integration_with_cross_compiling.patch b/patches/buildroot/2010.05/132-qt-full_integration_with_cross_compiling.patch
index 0f528c1..816bb96 100644
--- a/patches/buildroot/2010.05/132-qt-full_integration_with_cross_compiling.patch
+++ b/patches/buildroot/2010.05/132-qt-full_integration_with_cross_compiling.patch
@@ -6,7 +6,7 @@ Signed-off-by: Jérémie Scheer <jer...@ar...>
Index: buildroot/package/qt/Config.in
===================================================================
--- buildroot.orig/package/qt/Config.in 2010-05-30 22:24:10.000000000 +0200
-+++ buildroot/package/qt/Config.in 2010-10-06 15:16:56.000000000 +0200
++++ buildroot/package/qt/Config.in 2010-10-06 15:38:23.000000000 +0200
@@ -372,4 +372,14 @@
Build the Qt Script Tools module.
if unsure, say n.
@@ -25,7 +25,7 @@ Index: buildroot/package/qt/Config.in
Index: buildroot/package/qt/qt.mk
===================================================================
--- buildroot.orig/package/qt/qt.mk 2010-05-30 22:24:10.000000000 +0200
-+++ buildroot/package/qt/qt.mk 2010-10-06 15:25:30.000000000 +0200
++++ buildroot/package/qt/qt.mk 2010-10-06 16:53:11.000000000 +0200
@@ -362,6 +362,14 @@
QT_CONFIGURE+= -no-stl
endif
@@ -45,8 +45,8 @@ Index: buildroot/package/qt/qt.mk
-no-accessibility \
-no-separate-debug-info \
-prefix /usr \
-+ -examplesdir $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/demos \
-+ -demosdir $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/examples \
++ -examplesdir $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/examples \
++ -demosdir $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/demos \
-hostprefix $(STAGING_DIR)/usr \
-fast \
-no-rpath \
hooks/post-receive
--
armadeus
|
