[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-410-gbd693c9

[jscheer <js...@us...>]

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  bd693c9af17ae4d1134d486eccdc2099bc5db970 (commit)
      from  ef25210692a143f3320e98a48b42d53f0ec6ebbe (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 bd693c9af17ae4d1134d486eccdc2099bc5db970
Author: Jeremie Scheer <jer...@ar...>
Date:   Thu Aug 22 18:18:18 2013 +0200

    [BUILDROOT] Fix Marble package compilation.

-----------------------------------------------------------------------

Summary of changes:
 ...atch.tobefixed => 188-marble-add_package.patch} |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)
 rename patches/buildroot/2013.05/{188-marble-add_package.patch.tobefixed => 188-marble-add_package.patch} (89%)

diff --git a/patches/buildroot/2013.05/188-marble-add_package.patch.tobefixed b/patches/buildroot/2013.05/188-marble-add_package.patch
similarity index 89%
rename from patches/buildroot/2013.05/188-marble-add_package.patch.tobefixed
rename to patches/buildroot/2013.05/188-marble-add_package.patch
index bcc006b..b11e9e1 100644
--- a/patches/buildroot/2013.05/188-marble-add_package.patch.tobefixed
+++ b/patches/buildroot/2013.05/188-marble-add_package.patch
@@ -4,9 +4,9 @@ Signed-off-by: Jérémie Scheer <jer...@ar...>
 
 Index: buildroot/package/Config.in
 ===================================================================
---- buildroot.orig/package/Config.in	2012-06-14 15:06:47.000000000 +0200
-+++ buildroot/package/Config.in	2012-06-14 15:07:36.000000000 +0200
-@@ -156,6 +156,7 @@
+--- buildroot.orig/package/Config.in	2013-08-22 17:52:32.000000000 +0200
++++ buildroot/package/Config.in	2013-08-22 18:15:49.000000000 +0200
+@@ -146,6 +146,7 @@
  comment "other GUIs"
  source "package/efl/Config.in"
  source "package/qt/Config.in"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
 Index: buildroot/package/marble/Config.in
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/marble/Config.in	2012-06-14 15:09:45.000000000 +0200
++++ buildroot/package/marble/Config.in	2013-08-22 17:52:32.000000000 +0200
 @@ -0,0 +1,11 @@
 +config BR2_PACKAGE_MARBLE
 +	bool "KDE Marble"
@@ -33,7 +33,7 @@ Index: buildroot/package/marble/Config.in
 Index: buildroot/package/marble/marble.mk
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/marble/marble.mk	2012-06-14 15:09:31.000000000 +0200
++++ buildroot/package/marble/marble.mk	2013-08-22 18:07:18.000000000 +0200
 @@ -0,0 +1,51 @@
 +#############################################################
 +#
@@ -54,7 +54,7 @@ Index: buildroot/package/marble/marble.mk
 +	(cd $(@D) && \
 +	rm -f CMakeCache.txt && \
 +	$(HOST_DIR)/usr/bin/cmake $(@D) \
-+		-DCMAKE_TOOLCHAIN_FILE="$(BASE_DIR)/toolchainfile.cmake" \
++		-DCMAKE_TOOLCHAIN_FILE="$(BASE_DIR)/host/usr/share/buildroot/toolchainfile.cmake" \
 +		$(MARBLE_CONF_OPT) \
 +	)
 +endef


hooks/post-receive
-- 
armadeus