Qt4 cleanup

deleted file mode 100644
index 053be06..0000000
@@ -1,36 +0,0 @@
-Add configure option "crossarch" for cross compiling
-
-Ported from OE by: Yu Ke <[email protected]>
-
-Index: qt-embedded-linux-opensource-src-4.4.3/configure
-===================================================================
---- qt-embedded-linux-opensource-src-4.4.3.orig/configure	2009-03-26 17:02:45.000000000 +0100
-+++ qt-embedded-linux-opensource-src-4.4.3/configure	2009-03-26 17:03:43.000000000 +0100
-@@ -726,7 +726,7 @@
-             UNKNOWN_ARG=yes
-         fi
-         ;;
--    -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-host-arch|-mysql_config)
-+    -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-host-arch|-mysql_config|-crossarch)
-         VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
-         shift
-         VAL="$1"
-@@ -1143,6 +1143,9 @@
-     xplatform)
-         XPLATFORM="$VAL"
-         ;;
-+	crossarch)
-+		CROSSARCH="$VAL"
-+		;;
-     debug-and-release)
-         if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
-             CFG_DEBUG_RELEASE="$VAL"
-@@ -2405,6 +2408,8 @@
-     CFG_ARCH=$CFG_HOST_ARCH
- fi
- 
-+CFG_ARCH="$CROSSARCH"
-+
- if [ -d "$relpath/src/corelib/arch/$CFG_ARCH" ]; then
-     if [ "$OPT_VERBOSE" = "yes" ]; then
-         echo "    '$CFG_ARCH' is supported"

deleted file mode 100644
index be4d5c0..0000000
@@ -1,22 +0,0 @@
-From acfeb18aa94bad6b2066e91cd15570889baaa252 Mon Sep 17 00:00:00 2001
-From: Michael Krelin <[email protected]>
-Date: Sat, 2 Jun 2007 16:04:01 +0200
-Subject: [PATCH] fix resinit declaration
-
----
- src/qt3support/network/q3dns.cpp |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-Index: qt-embedded-linux-opensource-src-4.4.3/src/qt3support/network/q3dns.cpp
-===================================================================
---- qt-embedded-linux-opensource-src-4.4.3.orig/src/qt3support/network/q3dns.cpp	2008-09-27 11:01:28.000000000 +0200
-+++ qt-embedded-linux-opensource-src-4.4.3/src/qt3support/network/q3dns.cpp	2009-03-26 17:04:05.000000000 +0100
-@@ -44,7 +44,7 @@
- # include <netinet/in.h>
- # include <arpa/nameser.h>
- # include <resolv.h>
--extern "C" int res_init();
-+extern "C" int res_init() throw();
- #endif
- 
- // POSIX Large File Support redefines open -> open64

deleted file mode 100644
index e527369..0000000
@@ -1,14 +0,0 @@
-
-Ported from OE by: Yu Ke <[email protected]>
-
---- /tmp/qws.pro	2009-12-10 19:30:08.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.0/examples/qws/qws.pro	2009-12-10 19:30:21.000000000 +0100
-@@ -1,7 +1,7 @@
- TEMPLATE      = subdirs
- # no /dev/fbX
- !qnx:!vxworks:SUBDIRS = framebuffer
--SUBDIRS      += mousecalibration simpledecoration
-+SUBDIRS      += mousecalibration
- 
- # install
- sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS README *.pro

134 lines not on this page · raw message

53 lines not on this page · raw message

deleted file mode 100644
index 650ed77..0000000
@@ -1,30 +0,0 @@
-Hack to not use the pg_config of the host system which will add /usr/include
-
-pg_config is a native binary so using that when cross compiling
-will always fail.  The commented out fix would do, but for OE
-our -platform and -xplatform is the same so we are actually not
-really cross compiling. Just comment out the test, we are passing
-the location to the postgres headers and if they are okay we
-will padd.
-
-Ported from OE by: Yu Ke <[email protected]>
-
-Index: qt-embedded-linux-opensource-src-4.5.2/configure
-===================================================================
---- qt-embedded-linux-opensource-src-4.5.2.orig/configure	2009-08-10 03:03:04.000000000 +0200
-+++ qt-embedded-linux-opensource-src-4.5.2/configure	2009-08-10 03:58:11.000000000 +0200
-@@ -4401,10 +4402,10 @@
-             ;;
-         psql)
-             if [ "$CFG_SQL_psql" != "no" ]; then
--                if "$WHICH" pg_config >/dev/null 2>&1; then
--                    QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null`
--                    QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null`
--                fi
-+#                if [ "$QT_CROSS_COMPILE" = "no" ] && "$WHICH" pg_config >/dev/null 2>&1; then
-+#                    QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null`
-+#                    QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null`
-+#                fi
-                 [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL"
-                 [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL"
-                 if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/psql "PostgreSQL" $QT_LFLAGS_PSQL $L_FLAGS $QT_CFLAGS_PSQL $I_FLAGS $l_FLAGS $MAC_ARCHS_COMMANDLINE; then

54 lines not on this page · raw message

deleted file mode 100644
index 2fde9a0..0000000
@@ -1,28 +0,0 @@
-Disable the LDFLAGS "-Bsymbolic-functions" for mips
-
-"-Bsymbolic-functions" flag makes ld to bind the global function symbol of shared library at compiling time, thus reduce the runtime relocation cost.
-
-However, this flag in binutil 2.20 cause QT4 mips building failure, which is "final link failed: Bad value" error in libQtWebKit.so linking stage. If downgrad to binutil 2.19, this error disappears. further investigation showes commit http://sourceware.org/cgi-bin/cvsweb.cgi/src/ld/scripttempl/mips.sc.diff?r1=1.2&r2=1.3&cvsroot=src cause this error.
-
-So this patch disable this flag for QT4 mips. If future binutils version fix this issue, this patch can be safely removed.
-
-Signed-off-by: Yu Ke <[email protected]>
-
-diff --git a/configure b/configure
-index ca14279..5db9926 100755
---- a/configure
-+++ b/configure
-@@ -3035,6 +3035,13 @@ if [ "$CFG_REDUCE_RELOCATIONS" != "no" ]; then
-     fi
- fi
- 
-+# Temporily disable -Bsymbolic-functions for mips, because libQtWebKit can not pass the build
-+# if has -Bsymbolic-functions and binutil 2.20
-+# -Bsymbolic-functions is OK in binutil 2.19
-+if [ "$CFG_ARCH" = "mips" ]; then
-+    CFG_REDUCE_RELOCATIONS=no
-+fi
-+
- # auto-detect GNU make support
- if [ "$CFG_USE_GNUMAKE" = "auto" ] && "$MAKE" -v | grep "GNU Make" >/dev/null 2>&1; then
-    CFG_USE_GNUMAKE=yes

86 lines not on this page · raw message

57 lines not on this page · raw message

deleted file mode 100644
index 5e289d2..0000000
@@ -1,9 +0,0 @@
-require qt-${PV}.inc
-require qt4-embedded.inc
-
-SRC_URI += "file://qthelp-lib-qtclucene.patch"
-
-PR = "${INC_PR}.2"
-
-QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
-

deleted file mode 100644
index dae8cd1..0000000
@@ -1,11 +0,0 @@
-require qt4-tools-native.inc
-
-PR = "${INC_PR}.0"
-
-EXTRA_OECONF += " -no-fast -silent -no-rpath"
-
-TOBUILD := "src/tools/bootstrap ${TOBUILD}"
-
-SRC_URI[md5sum] = "5c69f16d452b0bb3d44bc3c10556c072"
-SRC_URI[sha256sum] = "f4e0ada8d4d516bbb8600a3ee7d9046c9c79e38cd781df9ffc46d8f16acd1768"
-

deleted file mode 100644
index d64542b..0000000
@@ -1,6 +0,0 @@
-require qt4-tools-nativesdk.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI[md5sum] = "5c69f16d452b0bb3d44bc3c10556c072"
-SRC_URI[sha256sum] = "f4e0ada8d4d516bbb8600a3ee7d9046c9c79e38cd781df9ffc46d8f16acd1768"

54 lines not on this page · raw message

deleted file mode 100644
index 9126284..0000000
@@ -1,6 +0,0 @@
-require qt-${PV}.inc
-require qt4-x11-free.inc
-
-PR = "${INC_PR}.1"
-
-QT_CONFIG_FLAGS += " -xrandr "

index a58b19f..ed50c6d 100644
@@ -6,6 +6,7 @@ Subject: [PATCH] no qmake
 qmake is already built in qt4-tools-native, so disable it
 
 Ported from OE by: Yu Ke <[email protected]>
+Upstream-Status: Inappropriate [configuration]
 
 ---
  configure |    2 +-

index 081d899..effc5f1 100644
@@ -3,9 +3,10 @@ From: Michael Krelin <[email protected]>
 Date: Mon, 4 Jun 2007 14:48:50 +0200
 Subject: [PATCH] freetype host includes
 
-Host include path should not be used in corss compiling case.
+Host include path should not be used in cross compiling case.
 
 Ported from OE by: Yu Ke <[email protected]>
+Upstream-Status: Pending
 
 ---
  config.tests/unix/freetype/freetype.pri |    2 +-

index a1b8912..d308a15 100644
@@ -1,6 +1,11 @@
-Add lib infix to distinguish different qt compile version: e.g. "E" for embedded, "" for X11
+Add lib infix for QtUiTools to distinguish different Qt edition: e.g. "E" for embedded, "" for X11
 
+Patch has been accepted upstream and should be included in the next major version (4.8.0), see:
+http://bugreports.qt.nokia.com/browse/QTBUG-7169
+
+Original Author: Jeremy Lainé <[email protected]>
 Ported from OE by: Yu Ke <[email protected]>
+Upstream-Status: Accepted
 
 --- /tmp/uitools.prf	2009-12-01 18:38:22.000000000 +0100
 +++ qt-everywhere-opensource-src-4.6.0/mkspecs/features/uitools.prf	2009-12-01 18:58:16.000000000 +0100

index cf44ea8..6f0890b 100644
@@ -1,5 +1,10 @@
 Add 2bpp support
 
+Submitted upstream but rejected as being "out of scope":
+http://bugreports.qt.nokia.com/browse/QTBUG-3468
+
+Upstream-Status: Denied
+Original author: Jeremy Lainé <[email protected]>
 Ported from OE by: Yu Ke <[email protected]>
 
 diff -urN qt-embedded-linux-opensource-src-4.4.3.orig/configure qt-embedded-linux-opensource-src-4.4.3/configure

index e4b256b..1d725b7 100644
@@ -1,3 +1,7 @@
+Pass through LDFLAGS to configure tests
+
+Upstream-Status: Inappropriate [configuration]
+
 Index: qt-everywhere-opensource-src-4.6.3/config.tests/unix/compile.test
 ===================================================================
 --- qt-everywhere-opensource-src-4.6.3.orig/config.tests/unix/compile.test	2010-06-02 06:03:18.000000000 +0400

index df19549..a8e5945 100644
@@ -1,3 +1,8 @@
+qt4-tools-native: set LFLAGS to pick up zlib from staging
+
+Original Author: Jeremy Lainé <[email protected]>
+Upstream-Status: Pending
+
 Index: qtopia-core-opensource-src-4.3.3/configure
 ===================================================================
 --- qtopia-core-opensource-src-4.3.3.orig/configure	2008-01-14 08:53:51.000000000 +0000

index c9259a1..45208ec 100644
@@ -1,3 +1,8 @@
+Use OE_QMAKE_* values to specify Qt utility paths
+
+Signed-off-by: Paul Eggleton <[email protected]>
+Upstream-Status: Inappropriate [configuration]
+
 Index: qt-everywhere-opensource-src-4.6.3/configure
 ===================================================================
 --- qt-everywhere-opensource-src-4.6.3.orig/configure	2011-01-10 15:47:37.100607001 +0000

index 2105455..1e0d14e 100644
@@ -2,7 +2,9 @@ Fix invocation in case of "ccache some-compiler-gcc". As the command "ccache som
 
 both visibility and relocs were affected.
 
+Original Author: Holger Hans Peter Freyther <[email protected]>
 Ported from OE by: Yu Ke <[email protected]>
+Upstream-Status: Pending
 
 Index: qt-x11-opensource-src-4.5.2/config.tests/unix/bsymbolic_functions.test
 ===================================================================

index cc73837..27d21e0 100644
@@ -4,6 +4,7 @@ qt4-tools-nativesdk patch to avoids building qmake in configure if it already ex
 (as it will, since we symlink it in from the native sysroot in do_configure)
 
 Signed-off-by: Paul Eggleton <[email protected]>
+Upstream-Status: Inappropriate [configuration]
 
 --- qt-everywhere-opensource-src-4.6.3.orig/configure	2011-01-10 12:01:56.260607001 +0000
 +++ qt-everywhere-opensource-src-4.6.3/configure	2011-01-10 12:02:20.584607015 +0000

index a31e7b3..2ab05ed 100644
@@ -1,5 +1,10 @@
+Allow to set a qt.conf from the outside using the environment. This allows
+to inject new prefixes and other paths into qmake. This is needed when using
+the same qmake binary to build qt/x11 and qt/embedded
 
+Original Author: Holger Freyther <[email protected]>
 Ported from OE by: Yu Ke <[email protected]>
+Upstream-Status: Pending
 
 --- /tmp/qlibraryinfo.cpp	2008-08-02 17:16:41.000000000 +0200
 +++ qt-embedded-linux-opensource-src-4.4.1/src/corelib/global/qlibraryinfo.cpp	2008-08-02 17:17:42.000000000 +0200

index 71a04a5..f302c5b 100644
@@ -1,8 +1,11 @@
 From b1ba119f6a824dc01bd42ee00dba4a1653867b72 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Matthias=20G=C3=BCnther?= <[email protected]>
+From: Matthias Günther <[email protected]>
 Date: Wed, 12 May 2010 16:52:45 +0200
 Subject: [PATCH 1/9] Added Openembedded "-crossarch" option
 
+Original Author: Michael Lauer <[email protected]>
+Upstream-Status: Pending
+
 ---
  configure |    7 ++++++-
  1 files changed, 6 insertions(+), 1 deletions(-)

index 5c588ff..39c5f4a 100644
@@ -1,3 +1,15 @@
+Hack to not use the pg_config of the host system which will add /usr/include
+
+pg_config is a native binary so using that when cross compiling
+will always fail.  The commented out fix would do, but for OE
+our -platform and -xplatform is the same so we are actually not
+really cross compiling. Just comment out the test, we are passing
+the location to the postgres headers and if they are okay we
+will pad.
+
+Original Author: Holger Hans Peter Freyther <[email protected]>
+Upstream-Status: Inappropriate [configuration]
+
 Index: qt-everywhere-opensource-src-4.7.0/configure
 ===================================================================
 --- qt-everywhere-opensource-src-4.7.0.orig/configure	2010-09-22 15:43:51.191162141 -0400

index 7f26b9b..c58679f 100644
@@ -9,6 +9,8 @@ SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.
            file://0004-no-qmake.patch \
            file://hack-out-pg2-4.7.0.patch \
            file://0006-freetype-host-includes.patch \
+           file://0008-qt-lib-infix.patch \
+           file://0009-support-2bpp.patch \
            file://0001-Added-Openembedded-crossarch-option.patch \
            file://g++.conf \
            file://linux.conf \

index b88b1e9..c3f6713 100644
@@ -1,7 +1,7 @@
 require qt-${PV}.inc
 require qt4-embedded.inc
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
 

index 359a756..75c6314 100644
@@ -1,7 +1,7 @@
 require qt4-x11-free.inc
 require qt-${PV}.inc
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 QT_CONFIG_FLAGS_append_armv6 = " -no-neon "