summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago Santos <thiago.sousa.santos@collabora.com>2013-05-14 03:02:41 (GMT)
committerThiago Santos <thiago.sousa.santos@collabora.com>2013-05-14 03:02:41 (GMT)
commit45a5a2f91dc3483a54e075c8746ef64dee7d92ce (patch)
treeb598051f11536c7410b7aebc9f877a81094e4547
parent4028f4483bdbc98e0e4b0765d478bb05958c6a11 (diff)
downloadcerbero-qt5.tar.gz
cerbero-qt5.tar.xz
recipes: qt5: Add more fixes for path handling when building qt5qt5
-rw-r--r--recipes/qt5/0005-syncqt-remove-extra-trailing-from-include-headers-pa.patch30
-rw-r--r--recipes/qt5/qt5.recipe6
2 files changed, 34 insertions, 2 deletions
diff --git a/recipes/qt5/0005-syncqt-remove-extra-trailing-from-include-headers-pa.patch b/recipes/qt5/0005-syncqt-remove-extra-trailing-from-include-headers-pa.patch
new file mode 100644
index 0000000..6753b65
--- /dev/null
+++ b/recipes/qt5/0005-syncqt-remove-extra-trailing-from-include-headers-pa.patch
@@ -0,0 +1,30 @@
+From 86df910892b494e514e85e2e85b9e7de8456818e Mon Sep 17 00:00:00 2001
+From: Thiago Santos <thiago.sousa.santos@collabora.com>
+Date: Sun, 12 May 2013 19:48:23 -0700
+Subject: [PATCH 1/2] syncqt: remove extra trailing > from include headers
+ paths
+
+---
+ qtbase/bin/syncqt | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/qtbase/bin/syncqt b/qtbase/bin/syncqt
+index 35ca1c7..1f4f3ca 100644
+--- a/qtbase/bin/syncqt
++++ b/qtbase/bin/syncqt
+@@ -273,7 +273,11 @@ sub classNames {
+ } elsif($definition =~ m/^ *typedef +(.*) +([^ ]*);$/) {
+ push @symbols, $2;
+ } elsif($definition =~ m/^ *(template *<.*> *)?(class|struct) +([^ ]* +)?((?!$post_kw)[^<\s]+) ?(<[^>]*> ?)?\s*(?:$post_kw)?\s*((,|:)\s*(public|protected|private) *.*)? *\{\}$/o) {
+- push @symbols, $4;
++ my $classstr = $4;
++ if(substr($classstr, -1) eq ">"){
++ chop $classstr;
++ }
++ push @symbols, $classstr;
+ } elsif($definition =~ m/^ *Q_DECLARE_.*ITERATOR\((.*)\);$/) {
+ push @symbols, "Q" . $1 . "Iterator";
+ push @symbols, "QMutable" . $1 . "Iterator";
+--
+1.8.1.msysgit.1
+
diff --git a/recipes/qt5/qt5.recipe b/recipes/qt5/qt5.recipe
index 52f4c28..eec630c 100644
--- a/recipes/qt5/qt5.recipe
+++ b/recipes/qt5/qt5.recipe
@@ -13,7 +13,8 @@ class Recipe(recipe.Recipe):
patches = ["0001-Unify-win32-g-and-Unix-qmake-Makefiles.patch",
"0002-change-windows-drivers-for-mingw-style.patch",
"0003-fix-Unify-win32-g-and-Unix-qmake-Makefiles.patch",
- "0004-syncqt-force-replace-of-windows-root-path-starting-w.patch"]
+ "0004-syncqt-force-replace-of-windows-root-path-starting-w.patch",
+ "0005-syncqt-remove-extra-trailing-from-include-headers-pa.patch"];
strip = '1'
configure_tpl = "rm -r qtwebkit qtwebkit-examples-and-demos && " \
"./configure -prefix %(prefix)s "\
@@ -123,7 +124,8 @@ class Recipe(recipe.Recipe):
arch = self.config.target_arch
if arch == Architecture.X86:
arch = 'i686'
- self.configure_options += '-platform win32-g++ -c++11 -opengl desktop -no-xcb '\
+ self.configure_options += '-windows -platform win32-g++ '\
+ '-c++11 -opengl desktop -no-xcb '\
'-xplatform win32-g++ -device-option CROSS_COMPILE=%s-w64-mingw32- ' % arch
# self.new_env['OSTYPE'] = 'msys'
if self.config.target_platform == Platform.DARWIN: