[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-342-g6c55c3e
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-342-g6c55c3e
|
From: jscheer <js...@us...> - 2014-07-28 15:06:17
|
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 6c55c3e416588ee5628adc1875c8612b33fd53be (commit)
from 7c1a9800752e4320ba556f3e89d5367e7edcbf22 (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 6c55c3e416588ee5628adc1875c8612b33fd53be
Author: Jeremie Scheer <jer...@ar...>
Date: Mon Jul 28 17:05:49 2014 +0200
[BUILDROOT] Fix last commit for Shiboken package by selecting needed Qt's options.
-----------------------------------------------------------------------
Summary of changes:
.../2013.11/219-shiboken-add_package.patch | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/patches/buildroot/2013.11/219-shiboken-add_package.patch b/patches/buildroot/2013.11/219-shiboken-add_package.patch
index ec3e418..0f6b916 100644
--- a/patches/buildroot/2013.11/219-shiboken-add_package.patch
+++ b/patches/buildroot/2013.11/219-shiboken-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 2014-07-16 11:19:11.000000000 +0200
-+++ buildroot/package/Config.in 2014-07-16 14:01:14.000000000 +0200
+--- buildroot.orig/package/Config.in 2014-07-28 15:48:16.000000000 +0200
++++ buildroot/package/Config.in 2014-07-28 17:03:50.000000000 +0200
@@ -434,6 +434,7 @@
source "package/python-setuptools/Config.in"
source "package/python-thrift/Config.in"
@@ -17,12 +17,15 @@ Index: buildroot/package/Config.in
Index: buildroot/package/shiboken/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/shiboken/Config.in 2014-07-16 13:59:35.000000000 +0200
-@@ -0,0 +1,10 @@
++++ buildroot/package/shiboken/Config.in 2014-07-28 17:02:53.000000000 +0200
+@@ -0,0 +1,13 @@
+config BR2_PACKAGE_SHIBOKEN
+ bool "Shiboken"
+ depends on BR2_PACKAGE_PYTHON
+ select BR2_PACKAGE_QT
++ select BR2_PACKAGE_QT_STL
++ select BR2_PACKAGE_QT_XML
++ select BR2_PACKAGE_QT_XMLPATTERNS
+ select BR2_PACKAGE_LIBXML2
+ select BR2_PACKAGE_LIBXSLT
+ help
@@ -32,7 +35,7 @@ Index: buildroot/package/shiboken/Config.in
Index: buildroot/package/shiboken/shiboken.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/shiboken/shiboken.mk 2014-07-28 15:20:26.000000000 +0200
++++ buildroot/package/shiboken/shiboken.mk 2014-07-28 16:53:10.000000000 +0200
@@ -0,0 +1,65 @@
+#############################################################
+#
@@ -102,7 +105,7 @@ Index: buildroot/package/shiboken/shiboken.mk
Index: buildroot/package/shiboken/shiboken-1.2.2-compile_module_with_host_shiboken_generator.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/shiboken/shiboken-1.2.2-compile_module_with_host_shiboken_generator.patch 2014-07-28 15:21:13.000000000 +0200
++++ buildroot/package/shiboken/shiboken-1.2.2-compile_module_with_host_shiboken_generator.patch 2014-07-28 16:53:10.000000000 +0200
@@ -0,0 +1,40 @@
+Compile shiboken module with previously generated x86 generator
+
@@ -147,7 +150,7 @@ Index: buildroot/package/shiboken/shiboken-1.2.2-compile_module_with_host_shibok
Index: buildroot/package/shiboken/shiboken-1.2.2-fix_pthread_cancel_compile.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/shiboken/shiboken-1.2.2-fix_pthread_cancel_compile.patch 2014-07-28 14:39:46.000000000 +0200
++++ buildroot/package/shiboken/shiboken-1.2.2-fix_pthread_cancel_compile.patch 2014-07-28 16:53:10.000000000 +0200
@@ -0,0 +1,56 @@
+Find pthread_cancel method when compiling ApiExtractor and generator
+
hooks/post-receive
--
armadeus
|