X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fandroid%2Fandroid-qt.patch;h=417cee5aabc14b9f106a6b14bdda476ed5af516f;hp=33ac8b2d8a958fd38faedb0aa0d5de188b5b8607;hb=b1181fe12749e653f74285f71edd09dd6fc859ff;hpb=11b9792eac7af42916f6e854400b5cc5ca942247

diff --git a/cross-compile/android/android-qt.patch b/cross-compile/android/android-qt.patch
index 33ac8b2..417cee5 100644
--- a/cross-compile/android/android-qt.patch
+++ b/cross-compile/android/android-qt.patch
@@ -1,61 +1,36 @@
-diff --git a/android/androidconfigbuild.sh b/android/androidconfigbuild.sh
-index 12ad414..b78f907 100755
---- a/android/androidconfigbuild.sh
-+++ b/android/androidconfigbuild.sh
-@@ -281,7 +281,7 @@ then
+diff --git a/qtbase/mkspecs/features/qt_common.prf b/qtbase/mkspecs/features/qt_common.prf
+--- a/qtbase/mkspecs/features/qt_common.prf	2014-05-16 18:41:54.964880350 +0200
++++ b/qtbase/mkspecs/features/qt_common.prf	2014-05-16 18:44:21.529590747 +0200
+@@ -77,7 +77,9 @@
+             QMAKE_CXXFLAGS_WARN_ON += -Wno-error=strict-overflow
  
- 	$SRC_DIR_QT/configure -v -opensource -qpa -arch $ANDROID_ARCHITECTURE \
- 		-no-phonon -freetype -fast -xplatform android-g++ \
--		-host-arch i386 $PLATFORM -host-little-endian \
-+		$PLATFORM \
- 		-little-endian -no-qt3support -no-largefile \
- 		-openssl -pch \
- 		-nomake demos -no-multimedia -nomake examples -confirm-license \
-diff --git a/mkspecs/android-g++/qmake.conf b/mkspecs/android-g++/qmake.conf
-index db28cb6..bc8802f 100644
---- a/mkspecs/android-g++/qmake.conf
-+++ b/mkspecs/android-g++/qmake.conf
-@@ -74,8 +74,8 @@ ANDROID_PLATFORM_PATH  = $$ANDROID_PLATFORM_ROOT_PATH/usr
- QMAKE_ANDROID_PLATFORM_INCDIR = $$NDK_ROOT/platforms/$$ANDROID_PLATFORM/arch-$$ANDROID_ARCHITECTURE/usr/include
- QMAKE_ANDROID_PLATFORM_LIBDIR = $$NDK_ROOT/platforms/$$ANDROID_PLATFORM/arch-$$ANDROID_ARCHITECTURE/usr/lib
+             # Work-around for bug https://code.google.com/p/android/issues/detail?id=58135
+-            android: QMAKE_CXXFLAGS_WARN_ON += -Wno-error=literal-suffix
++            contains(ver, "4\\.8") {
++                android: QMAKE_CXXFLAGS_WARN_ON += -Wno-error=literal-suffix
++            }
+         }
+     }
+     unset(ver)
+--- a/qttools/src/qdbus/qdbus.pro	2015-02-17 05:57:17.000000000 +0100
++++ b/qttools/src/qdbus/qdbus.pro	2015-04-29 15:55:19.740997627 +0200
+@@ -1,3 +1,5 @@
+ TEMPLATE = subdirs
+-SUBDIRS = qdbus
+-qtHaveModule(widgets): SUBDIRS += qdbusviewer
++!android:!ios:!qnx:!wince*:!winrt* {
++    SUBDIRS = qdbus
++    qtHaveModule(widgets): SUBDIRS += qdbusviewer
++}
+--- a/qttools/src/src.pro	2020-01-17 17:05:25.333379076 +0100
++++ b/qttools/src/src.pro	2020-01-17 17:05:32.037403499 +0100
+@@ -14,8 +14,7 @@ qtHaveModule(widgets) {
+ }
  
--ANDROID_SOURCES_CXX_STL_LIBDIR = $$NDK_ROOT/sources/cxx-stl$$ANDROID_CXXSTL_SUFFIX/gnu-libstdc++/libs/$$ANDROID_TARGET_ARCH
--ANDROID_SOURCES_CXX_STL_INCDIR = $$NDK_ROOT/sources/cxx-stl$$ANDROID_CXXSTL_SUFFIX/gnu-libstdc++/include $$ANDROID_SOURCES_CXX_STL_LIBDIR/include
-+ANDROID_SOURCES_CXX_STL_LIBDIR = $$NDK_ROOT/sources/cxx-stl/gnu-libstdc++/$$NDK_TOOLCHAIN_VERSION/libs/$$ANDROID_TARGET_ARCH
-+ANDROID_SOURCES_CXX_STL_INCDIR = $$NDK_ROOT/sources/cxx-stl/gnu-libstdc++/$$NDK_TOOLCHAIN_VERSION/include $$ANDROID_SOURCES_CXX_STL_LIBDIR/include
+ SUBDIRS += linguist \
+-    qdoc \
+-    qtplugininfo
++    qdoc
+ if(!android|android_app):!ios: SUBDIRS += qtpaths
  
- # modifications to g++.conf
- QMAKE_CC                = $$NDK_TOOLCHAIN_PATH/bin/$$NDK_TOOLS_PREFIX-gcc
-@@ -159,7 +159,7 @@ QMAKE_LFLAGS_NOUNDEF    =  -Wl,--no-undefined
- QMAKE_LFLAGS_RPATH      =  -Wl,-rpath=
- 
- 
--QMAKE_LIBS              = -lstdc++ -lsupc++ -llog -lz -lm -ldl -lc -lgcc
-+QMAKE_LIBS              = -lgnustl_shared -lstdc++ -lsupc++ -llog -lz -lm -ldl -lc -lgcc
- QMAKE_LIBS_X11          =
- QMAKE_LIBS_X11SM        =
- QMAKE_LIBS_QT_THREAD    =
-diff --git a/src/tools/moc/moc.cpp b/src/tools/moc/moc.cpp
-index 9309db1..1df9f06 100644
---- a/src/tools/moc/moc.cpp
-+++ b/src/tools/moc/moc.cpp
-@@ -525,12 +525,18 @@ void Moc::parse()
-             case NAMESPACE: {
-                 int rewind = index;
-                 if (test(IDENTIFIER)) {
-+		    QByteArray name = lexem();
-+		    if (index + 1 < symbols.size() && symbols.at(index).token == IDENTIFIER &&
-+			symbols.at(index).lexem() == "_GLIBCXX_VISIBILITY" &&
-+			symbols.at(index+1).token == LPAREN) {
-+		        until(RPAREN);
-+		    }
-                     if (test(EQ)) {
-                         // namespace Foo = Bar::Baz;
-                         until(SEMIC);
-                     } else if (!test(SEMIC)) {
-                         NamespaceDef def;
--                        def.name = lexem();
-+                        def.name = name;
-                         next(LBRACE);
-                         def.begin = index - 1;
-                         until(RBRACE);
+ mac {