[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-44-g402adde
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-44-g402adde
|
From: jscheer <js...@us...> - 2010-10-06 13:48:47
|
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 402addedc2ccf7b6c8dd7ef9ee3e80cfc83845bc (commit)
from 9204956b330d6568692ea98bb55271950ef45f20 (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 402addedc2ccf7b6c8dd7ef9ee3e80cfc83845bc
Author: Jeremie Scheer <jer...@ar...>
Date: Wed Oct 6 15:47:44 2010 +0200
[BUILDROOT] Bugs correction for patches 132-qt-full_integration_with_cross_compiling.patch and 133-qwt-add_package.patch : seek Qt fonts in /usr/lib/fonts
-----------------------------------------------------------------------
Summary of changes:
...-qt-full_integration_with_cross_compiling.patch | 18 +++++++++---------
patches/buildroot/133-qwt-add_package.patch | 16 ++++++++--------
...-qt-full_integration_with_cross_compiling.patch | 18 +++++++++---------
.../buildroot/2010.05/133-qwt-add_package.patch | 16 ++++++++--------
4 files changed, 34 insertions(+), 34 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 251bc1f..53435fe 100644
--- a/patches/buildroot/132-qt-full_integration_with_cross_compiling.patch
+++ b/patches/buildroot/132-qt-full_integration_with_cross_compiling.patch
@@ -5,8 +5,8 @@ Signed-off-by: Jérémie Scheer <jer...@ar...>
Index: buildroot/package/qtopia4/Config.in
===================================================================
---- buildroot.orig/package/qtopia4/Config.in 2010-10-04 15:36:08.000000000 +0200
-+++ buildroot/package/qtopia4/Config.in 2010-10-04 15:36:39.000000000 +0200
+--- 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
@@ -325,4 +325,14 @@
Build the Qt Script Tools module.
if unsure, say n.
@@ -24,8 +24,8 @@ Index: buildroot/package/qtopia4/Config.in
endif # BR2_PACKAGE_QT
Index: buildroot/package/qtopia4/qtopia4.mk
===================================================================
---- buildroot.orig/package/qtopia4/qtopia4.mk 2010-10-04 15:36:02.000000000 +0200
-+++ buildroot/package/qtopia4/qtopia4.mk 2010-10-04 15:37:11.000000000 +0200
+--- 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
@@ -345,6 +345,14 @@
QT_CONFIGURE+= -no-stl
endif
@@ -41,12 +41,12 @@ Index: buildroot/package/qtopia4/qtopia4.mk
# ccache and precompiled headers don't play well together
ifeq ($(BR2_CCACHE),y)
QT_CONFIGURE += -no-pch
-@@ -482,12 +490,10 @@
- -no-nis \
+@@ -483,11 +491,11 @@
-no-accessibility \
-no-separate-debug-info \
-- -prefix /usr \
-+ -prefix $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm \
+ -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 \
-hostprefix $(STAGING_DIR)/usr \
-fast \
-no-rpath \
@@ -55,7 +55,7 @@ Index: buildroot/package/qtopia4/qtopia4.mk
)
touch $@
-@@ -560,8 +566,15 @@
+@@ -560,8 +568,15 @@
cp -dpf $(STAGING_DIR)/usr/lib/libQtScriptTools.so.* $(TARGET_DIR)/usr/lib/
endif
diff --git a/patches/buildroot/133-qwt-add_package.patch b/patches/buildroot/133-qwt-add_package.patch
index 53af43f..a004ac0 100644
--- a/patches/buildroot/133-qwt-add_package.patch
+++ b/patches/buildroot/133-qwt-add_package.patch
@@ -4,8 +4,8 @@ Signed-off-by: Jérémie Scheer <jer...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-09-29 16:56:33.000000000 +0200
-+++ buildroot/package/Config.in 2010-09-29 16:57:07.000000000 +0200
+--- buildroot.orig/package/Config.in 2010-10-06 15:04:04.000000000 +0200
++++ buildroot/package/Config.in 2010-10-06 15:07:30.000000000 +0200
@@ -357,6 +357,7 @@
comment "other GUIs"
source "package/qte/Config.in"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/qwt/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/qwt/Config.in 2010-09-29 16:58:58.000000000 +0200
++++ buildroot/package/qwt/Config.in 2010-10-06 15:07:30.000000000 +0200
@@ -0,0 +1,20 @@
+comment "Qwt requires Qt to be installed"
+ depends on !BR2_PACKAGE_QT
@@ -42,7 +42,7 @@ Index: buildroot/package/qwt/Config.in
Index: buildroot/package/qwt/qwt.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/qwt/qwt.mk 2010-09-29 17:00:04.000000000 +0200
++++ buildroot/package/qwt/qwt.mk 2010-10-06 15:09:15.000000000 +0200
@@ -0,0 +1,82 @@
+######################################################################
+#
@@ -85,10 +85,10 @@ Index: buildroot/package/qwt/qwt.mk
+ (export INSTALL_ROOT=$(STAGING_DIR); $(MAKE) -C $(QWT_TARGET_DIR) install)
+
+$(TARGET_DIR)/usr/lib/libqwt.so: $(STAGING_DIR)/usr/lib/libqwt.so
-+ cp -dpf $(STAGING_DIR)/usr/lib/libqwt.so.* $(TARGET_DIR)/usr/lib/
-+ -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libqwt.so.*
++ cp -dpf $(STAGING_DIR)/usr/lib/libqwt.so* $(TARGET_DIR)/usr/lib/
++ -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libqwt.so*
+
-+$(QWT_TARGET_DIR)/examples/.configured: $(TARGET_DIR)/usr/lib/libqwt.so
++$(QWT_TARGET_DIR)/examples/.configured:
+ -[ -f $(QWT_TARGET_DIR)/examples/Makefile ] && $(MAKE) -C $(QWT_TARGET_DIR)/examples distclean
+ $(QT_DIR)/bin/qmake $(QWT_TARGET_DIR)/examples/$(QWT_EXAMPLES_CONFIG_FILE)
+ touch $@
@@ -129,7 +129,7 @@ Index: buildroot/package/qwt/qwt.mk
Index: buildroot/package/qwt/qwt-5.2.1-change_install_dir_and_no_designer.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/qwt/qwt-5.2.1-change_install_dir_and_no_designer.patch 2010-09-29 17:00:52.000000000 +0200
++++ buildroot/package/qwt/qwt-5.2.1-change_install_dir_and_no_designer.patch 2010-10-06 15:07:30.000000000 +0200
@@ -0,0 +1,30 @@
+--- qwt-5.2.1/qwtconfig.pri.orig 2010-09-28 14:34:01.000000000 +0200
++++ qwt-5.2.1/qwtconfig.pri 2010-09-28 15:37:02.000000000 +0200
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 f14c745..0f528c1 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
@@ -5,8 +5,8 @@ Signed-off-by: Jérémie Scheer <jer...@ar...>
Index: buildroot/package/qt/Config.in
===================================================================
---- buildroot.orig/package/qt/Config.in 2010-10-04 15:50:09.000000000 +0200
-+++ buildroot/package/qt/Config.in 2010-10-04 15:52:44.000000000 +0200
+--- 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
@@ -372,4 +372,14 @@
Build the Qt Script Tools module.
if unsure, say n.
@@ -24,8 +24,8 @@ Index: buildroot/package/qt/Config.in
endif # BR2_PACKAGE_QT
Index: buildroot/package/qt/qt.mk
===================================================================
---- buildroot.orig/package/qt/qt.mk 2010-10-04 15:49:36.000000000 +0200
-+++ buildroot/package/qt/qt.mk 2010-10-04 15:59:03.000000000 +0200
+--- 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
@@ -362,6 +362,14 @@
QT_CONFIGURE+= -no-stl
endif
@@ -41,12 +41,12 @@ Index: buildroot/package/qt/qt.mk
# ccache and precompiled headers don't play well together
ifeq ($(BR2_CCACHE),y)
QT_CONFIGURE += -no-pch
-@@ -506,12 +514,10 @@
- -no-nis \
+@@ -507,11 +515,11 @@
-no-accessibility \
-no-separate-debug-info \
-- -prefix /usr \
-+ -prefix $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm \
+ -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 \
-hostprefix $(STAGING_DIR)/usr \
-fast \
-no-rpath \
@@ -55,7 +55,7 @@ Index: buildroot/package/qt/qt.mk
)
touch $@
-@@ -589,8 +595,15 @@
+@@ -589,8 +597,15 @@
cp -dpf $(STAGING_DIR)/usr/lib/libQtScriptTools.so.* $(TARGET_DIR)/usr/lib/
endif
diff --git a/patches/buildroot/2010.05/133-qwt-add_package.patch b/patches/buildroot/2010.05/133-qwt-add_package.patch
index 490bdd7..0507f83 100644
--- a/patches/buildroot/2010.05/133-qwt-add_package.patch
+++ b/patches/buildroot/2010.05/133-qwt-add_package.patch
@@ -4,8 +4,8 @@ Signed-off-by: Jérémie Scheer <jer...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-10-04 16:17:20.000000000 +0200
-+++ buildroot/package/Config.in 2010-10-04 16:22:39.000000000 +0200
+--- buildroot.orig/package/Config.in 2010-10-06 15:24:45.000000000 +0200
++++ buildroot/package/Config.in 2010-10-06 15:26:58.000000000 +0200
@@ -126,6 +126,7 @@
comment "other GUIs"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/qwt/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/qwt/Config.in 2010-10-04 16:23:25.000000000 +0200
++++ buildroot/package/qwt/Config.in 2010-10-06 15:26:58.000000000 +0200
@@ -0,0 +1,20 @@
+comment "Qwt requires Qt to be installed"
+ depends on !BR2_PACKAGE_QT
@@ -42,7 +42,7 @@ Index: buildroot/package/qwt/Config.in
Index: buildroot/package/qwt/qwt-5.2.1-change_install_dir_and_no_designer.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/qwt/qwt-5.2.1-change_install_dir_and_no_designer.patch 2010-10-04 16:24:24.000000000 +0200
++++ buildroot/package/qwt/qwt-5.2.1-change_install_dir_and_no_designer.patch 2010-10-06 15:26:58.000000000 +0200
@@ -0,0 +1,30 @@
+--- qwt-5.2.1/qwtconfig.pri.orig 2010-09-28 14:34:01.000000000 +0200
++++ qwt-5.2.1/qwtconfig.pri 2010-09-28 15:37:02.000000000 +0200
@@ -77,7 +77,7 @@ Index: buildroot/package/qwt/qwt-5.2.1-change_install_dir_and_no_designer.patch
Index: buildroot/package/qwt/qwt.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/qwt/qwt.mk 2010-10-04 16:24:00.000000000 +0200
++++ buildroot/package/qwt/qwt.mk 2010-10-06 15:35:59.000000000 +0200
@@ -0,0 +1,82 @@
+######################################################################
+#
@@ -120,10 +120,10 @@ Index: buildroot/package/qwt/qwt.mk
+ (export INSTALL_ROOT=$(STAGING_DIR); $(MAKE) -C $(QWT_TARGET_DIR) install)
+
+$(TARGET_DIR)/usr/lib/libqwt.so: $(STAGING_DIR)/usr/lib/libqwt.so
-+ cp -dpf $(STAGING_DIR)/usr/lib/libqwt.so.* $(TARGET_DIR)/usr/lib/
-+ -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libqwt.so.*
++ cp -dpf $(STAGING_DIR)/usr/lib/libqwt.so* $(TARGET_DIR)/usr/lib/
++ -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libqwt.so*
+
-+$(QWT_TARGET_DIR)/examples/.configured: $(TARGET_DIR)/usr/lib/libqwt.so
++$(QWT_TARGET_DIR)/examples/.configured:
+ -[ -f $(QWT_TARGET_DIR)/examples/Makefile ] && $(MAKE) -C $(QWT_TARGET_DIR)/examples distclean
+ $(QT_DIR)/bin/qmake $(QWT_TARGET_DIR)/examples/$(QWT_EXAMPLES_CONFIG_FILE)
+ touch $@
hooks/post-receive
--
armadeus
|
