summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/recipes-qt/qt4/files/0001-cross-compile.patch36
-rw-r--r--meta/recipes-qt/qt4/files/0002-fix-resinit-declaration.patch22
-rw-r--r--meta/recipes-qt/qt4/files/0010-no-simpledecoration-example.patch14
-rw-r--r--meta/recipes-qt/qt4/files/blacklist-fraudulent-comodo-certificates-patch.diff134
-rw-r--r--meta/recipes-qt/qt4/files/g++.conf53
-rw-r--r--meta/recipes-qt/qt4/files/hack-out-pg_config.patch30
-rw-r--r--meta/recipes-qt/qt4/files/linux.conf54
-rw-r--r--meta/recipes-qt/qt4/files/mips-relocate.patch28
-rw-r--r--meta/recipes-qt/qt4/files/qthelp-lib-qtclucene.patch86
-rw-r--r--meta/recipes-qt/qt4/qt-4.6.3.inc57
-rw-r--r--meta/recipes-qt/qt4/qt4-embedded_4.6.3.bb9
-rw-r--r--meta/recipes-qt/qt4/qt4-tools-native_4.6.3.bb11
-rw-r--r--meta/recipes-qt/qt4/qt4-tools-nativesdk_4.6.3.bb6
-rw-r--r--meta/recipes-qt/qt4/qt4-x11-free-4.6.3/linux.conf54
-rw-r--r--meta/recipes-qt/qt4/qt4-x11-free_4.6.3.bb6
15 files changed, 0 insertions, 600 deletions
diff --git a/meta/recipes-qt/qt4/files/0001-cross-compile.patch b/meta/recipes-qt/qt4/files/0001-cross-compile.patch
deleted file mode 100644
index 053be06e54..0000000000
--- a/meta/recipes-qt/qt4/files/0001-cross-compile.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1Add configure option "crossarch" for cross compiling
2
3Ported from OE by: Yu Ke <ke.yu@intel.com>
4
5Index: qt-embedded-linux-opensource-src-4.4.3/configure
6===================================================================
7--- qt-embedded-linux-opensource-src-4.4.3.orig/configure 2009-03-26 17:02:45.000000000 +0100
8+++ qt-embedded-linux-opensource-src-4.4.3/configure 2009-03-26 17:03:43.000000000 +0100
9@@ -726,7 +726,7 @@
10 UNKNOWN_ARG=yes
11 fi
12 ;;
13- -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-host-arch|-mysql_config)
14+ -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-host-arch|-mysql_config|-crossarch)
15 VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
16 shift
17 VAL="$1"
18@@ -1143,6 +1143,9 @@
19 xplatform)
20 XPLATFORM="$VAL"
21 ;;
22+ crossarch)
23+ CROSSARCH="$VAL"
24+ ;;
25 debug-and-release)
26 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
27 CFG_DEBUG_RELEASE="$VAL"
28@@ -2405,6 +2408,8 @@
29 CFG_ARCH=$CFG_HOST_ARCH
30 fi
31
32+CFG_ARCH="$CROSSARCH"
33+
34 if [ -d "$relpath/src/corelib/arch/$CFG_ARCH" ]; then
35 if [ "$OPT_VERBOSE" = "yes" ]; then
36 echo " '$CFG_ARCH' is supported"
diff --git a/meta/recipes-qt/qt4/files/0002-fix-resinit-declaration.patch b/meta/recipes-qt/qt4/files/0002-fix-resinit-declaration.patch
deleted file mode 100644
index be4d5c0e22..0000000000
--- a/meta/recipes-qt/qt4/files/0002-fix-resinit-declaration.patch
+++ /dev/null
@@ -1,22 +0,0 @@
1From acfeb18aa94bad6b2066e91cd15570889baaa252 Mon Sep 17 00:00:00 2001
2From: Michael Krelin <hacker@klever.net>
3Date: Sat, 2 Jun 2007 16:04:01 +0200
4Subject: [PATCH] fix resinit declaration
5
6---
7 src/qt3support/network/q3dns.cpp | 2 +-
8 1 files changed, 1 insertions(+), 1 deletions(-)
9
10Index: qt-embedded-linux-opensource-src-4.4.3/src/qt3support/network/q3dns.cpp
11===================================================================
12--- qt-embedded-linux-opensource-src-4.4.3.orig/src/qt3support/network/q3dns.cpp 2008-09-27 11:01:28.000000000 +0200
13+++ qt-embedded-linux-opensource-src-4.4.3/src/qt3support/network/q3dns.cpp 2009-03-26 17:04:05.000000000 +0100
14@@ -44,7 +44,7 @@
15 # include <netinet/in.h>
16 # include <arpa/nameser.h>
17 # include <resolv.h>
18-extern "C" int res_init();
19+extern "C" int res_init() throw();
20 #endif
21
22 // POSIX Large File Support redefines open -> open64
diff --git a/meta/recipes-qt/qt4/files/0010-no-simpledecoration-example.patch b/meta/recipes-qt/qt4/files/0010-no-simpledecoration-example.patch
deleted file mode 100644
index e52736926f..0000000000
--- a/meta/recipes-qt/qt4/files/0010-no-simpledecoration-example.patch
+++ /dev/null
@@ -1,14 +0,0 @@
1
2Ported from OE by: Yu Ke <ke.yu@intel.com>
3
4--- /tmp/qws.pro 2009-12-10 19:30:08.000000000 +0100
5+++ qt-everywhere-opensource-src-4.6.0/examples/qws/qws.pro 2009-12-10 19:30:21.000000000 +0100
6@@ -1,7 +1,7 @@
7 TEMPLATE = subdirs
8 # no /dev/fbX
9 !qnx:!vxworks:SUBDIRS = framebuffer
10-SUBDIRS += mousecalibration simpledecoration
11+SUBDIRS += mousecalibration
12
13 # install
14 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS README *.pro
diff --git a/meta/recipes-qt/qt4/files/blacklist-fraudulent-comodo-certificates-patch.diff b/meta/recipes-qt/qt4/files/blacklist-fraudulent-comodo-certificates-patch.diff
deleted file mode 100644
index 00faf75932..0000000000
--- a/meta/recipes-qt/qt4/files/blacklist-fraudulent-comodo-certificates-patch.diff
+++ /dev/null
@@ -1,134 +0,0 @@
1Security advisory: Fraudulent certificates
2
3Background:
4
5Recently a group of people managed to get fraudulent SSL certificates signed
6by a Certificate Authority (CA).
7
8These certificates potentially enable their owners to pretend to be other
9entities on the Web; the attackers can present valid certificates for e.g.
10mail.google.com, login.yahoo.com and login.live.com, among others.
11
12The patch below solves this problem by blacklisting those fake certificates
13and aborting an SSL handshake with entities that present these certificates.
14The patch applies to all 4.6 and 4.7 versions, and should be applied to all Qt
154.6.x and 4.7.x versions; upcoming Qt releases will contain a fix for this
16problem.
17
18More technical background:
19
20In order to trick a user into establishing an SSL connection to a site using
21one of those fake certificates, in addition to controlling the certificate, an
22attacker would need to either control the DNS server used by the victim, or
23have control over a proxy that the victim uses. That way, the attacker could
24trick the victim to connect to the attacker?s site and then present the user
25with a valid certificate.
26
27One obvious question now is: Should those certificates not just be revoked,
28which would solve the problem?
29
30First, they have been revoked by the affected Certificate Authority (see above
31link).
32
33However, the problem in this case, and probably part of the reason why most
34browser vendors release new versions blacklisting those certificates, is that
35by default browsers do not treat invalid responses from an OCSP server (a
36server used for checking the revocation status of a certificate) as fatal, and
37will allow the SSL connection to proceed anyway. Qt itself does not support
38OCSP yet, which makes blacklisting the certificates the only valid option (now
39would be a good moment to vote on the task for implementing OCSP in Qt); since
40Qt is relying on the system root certificates since version 4.7, it cannot
41control the root certificates that Qt trusts automatically anymore.
42
43http://www.comodo.com/Comodo-Fraud-Incident-2011-03-23.html
44http://qt.nokia.com/files/qt-patches/blacklist-fraudulent-comodo-certificates-patch.diff/view
45
46diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp
47index 618ac79..a5cdf01 100644
48--- a/src/network/ssl/qsslcertificate.cpp
49+++ b/src/network/ssl/qsslcertificate.cpp
50@@ -219,17 +219,19 @@ bool QSslCertificate::isNull() const
51 Returns true if this certificate is valid; otherwise returns
52 false.
53
54- Note: Currently, this function only checks that the current
55+ Note: Currently, this function checks that the current
56 data-time is within the date-time range during which the
57- certificate is considered valid. No other checks are
58- currently performed.
59+ certificate is considered valid, and checks that the
60+ certificate is not in a blacklist of fraudulent certificates.
61
62 \sa isNull()
63 */
64 bool QSslCertificate::isValid() const
65 {
66 const QDateTime currentTime = QDateTime::currentDateTime();
67- return currentTime >= d->notValidBefore && currentTime <= d->notValidAfter;
68+ return currentTime >= d->notValidBefore &&
69+ currentTime <= d->notValidAfter &&
70+ ! QSslCertificatePrivate::isBlacklisted(*this);
71 }
72
73 /*!
74@@ -798,6 +800,30 @@ QList<QSslCertificate> QSslCertificatePrivate::certificatesFromDer(const QByteAr
75 return certificates;
76 }
77
78+// These certificates are known to be fraudulent and were created during the comodo
79+// compromise. See http://www.comodo.com/Comodo-Fraud-Incident-2011-03-23.html
80+static const char *certificate_blacklist[] = {
81+ "04:7e:cb:e9:fc:a5:5f:7b:d0:9e:ae:36:e1:0c:ae:1e",
82+ "f5:c8:6a:f3:61:62:f1:3a:64:f5:4f:6d:c9:58:7c:06",
83+ "d7:55:8f:da:f5:f1:10:5b:b2:13:28:2b:70:77:29:a3",
84+ "39:2a:43:4f:0e:07:df:1f:8a:a3:05:de:34:e0:c2:29",
85+ "3e:75:ce:d4:6b:69:30:21:21:88:30:ae:86:a8:2a:71",
86+ "e9:02:8b:95:78:e4:15:dc:1a:71:0a:2b:88:15:44:47",
87+ "92:39:d5:34:8f:40:d1:69:5a:74:54:70:e1:f2:3f:43",
88+ "b0:b7:13:3e:d0:96:f9:b5:6f:ae:91:c8:74:bd:3a:c0",
89+ "d8:f3:5f:4e:b7:87:2b:2d:ab:06:92:e3:15:38:2f:b0",
90+ 0
91+};
92+
93+bool QSslCertificatePrivate::isBlacklisted(const QSslCertificate &certificate)
94+{
95+ for (int a = 0; certificate_blacklist[a] != 0; a++) {
96+ if (certificate.serialNumber() == certificate_blacklist[a])
97+ return true;
98+ }
99+ return false;
100+}
101+
102 #ifndef QT_NO_DEBUG_STREAM
103 QDebug operator<<(QDebug debug, const QSslCertificate &certificate)
104 {
105diff --git a/src/network/ssl/qsslcertificate_p.h b/src/network/ssl/qsslcertificate_p.h
106index cdceb0f..1ce33d3 100644
107--- a/src/network/ssl/qsslcertificate_p.h
108+++ b/src/network/ssl/qsslcertificate_p.h
109@@ -96,6 +96,7 @@ public:
110 static QSslCertificate QSslCertificate_from_X509(X509 *x509);
111 static QList<QSslCertificate> certificatesFromPem(const QByteArray &pem, int count = -1);
112 static QList<QSslCertificate> certificatesFromDer(const QByteArray &der, int count = -1);
113+ static bool isBlacklisted(const QSslCertificate &certificate);
114
115 friend class QSslSocketBackendPrivate;
116
117diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
118index 0866534..2427193 100644
119--- a/src/network/ssl/qsslsocket_openssl.cpp
120+++ b/src/network/ssl/qsslsocket_openssl.cpp
121@@ -1193,6 +1193,13 @@ bool QSslSocketBackendPrivate::startHandshake()
122 X509 *x509 = q_SSL_get_peer_certificate(ssl);
123 configuration.peerCertificate = QSslCertificatePrivate::QSslCertificate_from_X509(x509);
124 q_X509_free(x509);
125+ if (QSslCertificatePrivate::isBlacklisted(configuration.peerCertificate)) {
126+ q->setErrorString(QSslSocket::tr("The peer certificate is blacklisted"));
127+ q->setSocketError(QAbstractSocket::SslHandshakeFailedError);
128+ emit q->error(QAbstractSocket::SslHandshakeFailedError);
129+ plainSocket->disconnectFromHost();
130+ return false;
131+ }
132
133 // Start translating errors.
134 QList<QSslError> errors;
diff --git a/meta/recipes-qt/qt4/files/g++.conf b/meta/recipes-qt/qt4/files/g++.conf
deleted file mode 100644
index 4cd76e62ea..0000000000
--- a/meta/recipes-qt/qt4/files/g++.conf
+++ /dev/null
@@ -1,53 +0,0 @@
1#
2# qmake configuration for common gcc
3#
4
5QMAKE_CC = $(OE_QMAKE_CC)
6QMAKE_CFLAGS += -pipe $(OE_QMAKE_CFLAGS)
7QMAKE_CFLAGS_DEPS += -M
8QMAKE_CFLAGS_WARN_ON += -Wall -W
9QMAKE_CFLAGS_WARN_OFF += -w
10QMAKE_CFLAGS_RELEASE +=
11QMAKE_CFLAGS_DEBUG += -g
12QMAKE_CFLAGS_SHLIB += -fPIC
13QMAKE_CFLAGS_STATIC_LIB += -fPIC
14QMAKE_CFLAGS_YACC += -Wno-unused -Wno-parentheses
15QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden
16QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
17QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE}
18
19QMAKE_CXX = $(OE_QMAKE_CXX)
20QMAKE_CXXFLAGS += $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS)
21QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS
22QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON
23QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF
24QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_RELEASE
25QMAKE_CXXFLAGS_DEBUG += $$QMAKE_CFLAGS_DEBUG
26QMAKE_CXXFLAGS_SHLIB += $$QMAKE_CFLAGS_SHLIB
27QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
28QMAKE_CXXFLAGS_YACC += $$QMAKE_CFLAGS_YACC
29QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden
30QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
31QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
32
33QMAKE_LINK = $(OE_QMAKE_LINK)
34QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK)
35QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS)
36QMAKE_LFLAGS_RELEASE +=
37QMAKE_LFLAGS_DEBUG +=
38QMAKE_LFLAGS_APP +=
39QMAKE_LFLAGS_SHLIB += -shared
40QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB
41QMAKE_LFLAGS_SONAME += -Wl,-soname,
42QMAKE_LFLAGS_THREAD +=
43QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined
44QMAKE_RPATH = -Wl,-rpath-link,
45
46QMAKE_PCH_OUTPUT_EXT = .gch
47
48# -Bsymbolic-functions (ld) support
49QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Wl,-Bsymbolic-functions
50QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,
51
52# for the SDK
53isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG)
diff --git a/meta/recipes-qt/qt4/files/hack-out-pg_config.patch b/meta/recipes-qt/qt4/files/hack-out-pg_config.patch
deleted file mode 100644
index 650ed7745e..0000000000
--- a/meta/recipes-qt/qt4/files/hack-out-pg_config.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1Hack to not use the pg_config of the host system which will add /usr/include
2
3pg_config is a native binary so using that when cross compiling
4will always fail. The commented out fix would do, but for OE
5our -platform and -xplatform is the same so we are actually not
6really cross compiling. Just comment out the test, we are passing
7the location to the postgres headers and if they are okay we
8will padd.
9
10Ported from OE by: Yu Ke <ke.yu@intel.com>
11
12Index: qt-embedded-linux-opensource-src-4.5.2/configure
13===================================================================
14--- qt-embedded-linux-opensource-src-4.5.2.orig/configure 2009-08-10 03:03:04.000000000 +0200
15+++ qt-embedded-linux-opensource-src-4.5.2/configure 2009-08-10 03:58:11.000000000 +0200
16@@ -4401,10 +4402,10 @@
17 ;;
18 psql)
19 if [ "$CFG_SQL_psql" != "no" ]; then
20- if "$WHICH" pg_config >/dev/null 2>&1; then
21- QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null`
22- QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null`
23- fi
24+# if [ "$QT_CROSS_COMPILE" = "no" ] && "$WHICH" pg_config >/dev/null 2>&1; then
25+# QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null`
26+# QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null`
27+# fi
28 [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL"
29 [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL"
30 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
diff --git a/meta/recipes-qt/qt4/files/linux.conf b/meta/recipes-qt/qt4/files/linux.conf
deleted file mode 100644
index 90b8d65aba..0000000000
--- a/meta/recipes-qt/qt4/files/linux.conf
+++ /dev/null
@@ -1,54 +0,0 @@
1#
2# qmake configuration for common linux
3#
4
5QMAKE_CFLAGS_THREAD += -D_REENTRANT
6QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD
7
8QMAKE_INCDIR =
9QMAKE_LIBDIR =
10QMAKE_INCDIR_X11 =
11QMAKE_LIBDIR_X11 =
12QMAKE_INCDIR_QT = $(OE_QMAKE_INCDIR_QT)
13QMAKE_LIBDIR_QT = $(OE_QMAKE_LIBDIR_QT)
14QMAKE_INCDIR_OPENGL =
15QMAKE_LIBDIR_OPENGL =
16
17
18QMAKE_LIBS =
19QMAKE_LIBS_DYNLOAD = -ldl
20QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11)
21QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM)
22QMAKE_LIBS_NIS = -lnsl
23QMAKE_LIBS_OPENGL = -lGLU -lGL
24QMAKE_LIBS_OPENGL_QT = -lGL
25QMAKE_LIBS_THREAD = -lpthread
26
27QMAKE_MOC = $(OE_QMAKE_MOC)
28QMAKE_UIC = $(OE_QMAKE_UIC)
29QMAKE_UIC3 = $(OE_QMAKE_UIC3)
30QMAKE_RCC = $(OE_QMAKE_RCC)
31QMAKE_QDBUSCPP2XML = $(OE_QMAKE_QDBUSCPP2XML)
32QMAKE_QDBUSXML2CPP = $(OE_QMAKE_QDBUSXML2CPP)
33
34QMAKE_AR = $(OE_QMAKE_AR) cqs
35QMAKE_OBJCOPY = objcopy
36QMAKE_RANLIB =
37
38QMAKE_TAR = tar -cf
39QMAKE_GZIP = gzip -9f
40
41QMAKE_COPY = cp -f
42QMAKE_COPY_FILE = $(COPY)
43QMAKE_COPY_DIR = $(COPY) -r
44QMAKE_MOVE = mv -f
45QMAKE_DEL_FILE = rm -f
46QMAKE_DEL_DIR = rmdir
47QMAKE_STRIP = $(OE_QMAKE_STRIP)
48QMAKE_STRIPFLAGS_LIB += --strip-unneeded
49QMAKE_CHK_DIR_EXISTS = test -d
50QMAKE_MKDIR = mkdir -p
51QMAKE_INSTALL_FILE = install -m 644 -p
52QMAKE_INSTALL_PROGRAM = install -m 755 -p
53
54include(unix.conf)
diff --git a/meta/recipes-qt/qt4/files/mips-relocate.patch b/meta/recipes-qt/qt4/files/mips-relocate.patch
deleted file mode 100644
index 2fde9a0dcf..0000000000
--- a/meta/recipes-qt/qt4/files/mips-relocate.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1Disable the LDFLAGS "-Bsymbolic-functions" for mips
2
3"-Bsymbolic-functions" flag makes ld to bind the global function symbol of shared library at compiling time, thus reduce the runtime relocation cost.
4
5However, 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.
6
7So this patch disable this flag for QT4 mips. If future binutils version fix this issue, this patch can be safely removed.
8
9Signed-off-by: Yu Ke <ke.yu@intel.com>
10
11diff --git a/configure b/configure
12index ca14279..5db9926 100755
13--- a/configure
14+++ b/configure
15@@ -3035,6 +3035,13 @@ if [ "$CFG_REDUCE_RELOCATIONS" != "no" ]; then
16 fi
17 fi
18
19+# Temporily disable -Bsymbolic-functions for mips, because libQtWebKit can not pass the build
20+# if has -Bsymbolic-functions and binutil 2.20
21+# -Bsymbolic-functions is OK in binutil 2.19
22+if [ "$CFG_ARCH" = "mips" ]; then
23+ CFG_REDUCE_RELOCATIONS=no
24+fi
25+
26 # auto-detect GNU make support
27 if [ "$CFG_USE_GNUMAKE" = "auto" ] && "$MAKE" -v | grep "GNU Make" >/dev/null 2>&1; then
28 CFG_USE_GNUMAKE=yes
diff --git a/meta/recipes-qt/qt4/files/qthelp-lib-qtclucene.patch b/meta/recipes-qt/qt4/files/qthelp-lib-qtclucene.patch
deleted file mode 100644
index 1d250d8a98..0000000000
--- a/meta/recipes-qt/qt4/files/qthelp-lib-qtclucene.patch
+++ /dev/null
@@ -1,86 +0,0 @@
1qt-embedded: fix linker error in do_compile
2
3This patch ensures that we link to libQtCLucene where required (i.e. when
4linking to libQtHelp) avoiding a linker error.
5
6Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
7
8Index: qt-everywhere-opensource-src-4.6.3/demos/qtdemo/qtdemo.pro
9===================================================================
10--- qt-everywhere-opensource-src-4.6.3.orig/demos/qtdemo/qtdemo.pro 2011-01-11 16:06:47.382828004 +0000
11+++ qt-everywhere-opensource-src-4.6.3/demos/qtdemo/qtdemo.pro 2011-01-11 16:10:06.906828001 +0000
12@@ -76,3 +76,10 @@
13 sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES qtdemo.pro images xml *.ico *.icns *.rc *.plist
14 sources.path = $$[QT_INSTALL_DEMOS]/qtdemo
15
16+qclucene = QtCLucene$${QT_LIBINFIX}
17+if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
18+ mac:qclucene = $${qclucene}_debug
19+ win32:qclucene = $${qclucene}d
20+}
21+linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene
22+LIBS_PRIVATE += -l$$qclucene
23Index: qt-everywhere-opensource-src-4.6.3/examples/help/contextsensitivehelp/contextsensitivehelp.pro
24===================================================================
25--- qt-everywhere-opensource-src-4.6.3.orig/examples/help/contextsensitivehelp/contextsensitivehelp.pro 2011-01-11 16:05:56.598828002 +0000
26+++ qt-everywhere-opensource-src-4.6.3/examples/help/contextsensitivehelp/contextsensitivehelp.pro 2011-01-11 16:09:57.762828002 +0000
27@@ -18,3 +18,11 @@
28 INSTALLS += target sources
29
30 symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
31+
32+qclucene = QtCLucene$${QT_LIBINFIX}
33+if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
34+ mac:qclucene = $${qclucene}_debug
35+ win32:qclucene = $${qclucene}d
36+}
37+linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene
38+LIBS_PRIVATE += -l$$qclucene
39Index: qt-everywhere-opensource-src-4.6.3/tools/assistant/tools/assistant/assistant.pro
40===================================================================
41--- qt-everywhere-opensource-src-4.6.3.orig/tools/assistant/tools/assistant/assistant.pro 2011-01-11 14:56:50.902828001 +0000
42+++ qt-everywhere-opensource-src-4.6.3/tools/assistant/tools/assistant/assistant.pro 2011-01-11 16:09:39.914828003 +0000
43@@ -85,3 +85,11 @@
44 DEFINES += USE_STATIC_SQLITE_PLUGIN
45 }
46 }
47+
48+qclucene = QtCLucene$${QT_LIBINFIX}
49+if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
50+ mac:qclucene = $${qclucene}_debug
51+ win32:qclucene = $${qclucene}d
52+}
53+linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene
54+LIBS_PRIVATE += -l$$qclucene
55Index: qt-everywhere-opensource-src-4.6.3/tools/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro
56===================================================================
57--- qt-everywhere-opensource-src-4.6.3.orig/tools/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro 2011-01-11 14:56:50.918828002 +0000
58+++ qt-everywhere-opensource-src-4.6.3/tools/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro 2011-01-11 16:09:44.538828001 +0000
59@@ -12,3 +12,11 @@
60 main.cpp
61
62 HEADERS += ../shared/helpgenerator.h
63+
64+qclucene = QtCLucene$${QT_LIBINFIX}
65+if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
66+ mac:qclucene = $${qclucene}_debug
67+ win32:qclucene = $${qclucene}d
68+}
69+linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene
70+LIBS_PRIVATE += -l$$qclucene
71Index: qt-everywhere-opensource-src-4.6.3/tools/assistant/tools/qhelpgenerator/qhelpgenerator.pro
72===================================================================
73--- qt-everywhere-opensource-src-4.6.3.orig/tools/assistant/tools/qhelpgenerator/qhelpgenerator.pro 2011-01-11 14:56:50.930828002 +0000
74+++ qt-everywhere-opensource-src-4.6.3/tools/assistant/tools/qhelpgenerator/qhelpgenerator.pro 2011-01-11 16:09:50.274828003 +0000
75@@ -12,3 +12,11 @@
76 main.cpp
77
78 HEADERS += ../shared/helpgenerator.h
79+
80+qclucene = QtCLucene$${QT_LIBINFIX}
81+if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
82+ mac:qclucene = $${qclucene}_debug
83+ win32:qclucene = $${qclucene}d
84+}
85+linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene
86+LIBS_PRIVATE += -l$$qclucene
diff --git a/meta/recipes-qt/qt4/qt-4.6.3.inc b/meta/recipes-qt/qt4/qt-4.6.3.inc
deleted file mode 100644
index 37a15f1c1e..0000000000
--- a/meta/recipes-qt/qt4/qt-4.6.3.inc
+++ /dev/null
@@ -1,57 +0,0 @@
1LICENSE = "LGPLv2.1 | GPLv3"
2LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
3 file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \
4 file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
5
6SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
7 file://blacklist-fraudulent-comodo-certificates-patch.diff \
8 file://0001-cross-compile.patch \
9 file://0002-fix-resinit-declaration.patch \
10 file://0004-no-qmake.patch \
11 file://0006-freetype-host-includes.patch \
12 file://0008-qt-lib-infix.patch \
13 file://0009-support-2bpp.patch \
14 file://0010-no-simpledecoration-example.patch \
15 file://fix-config-tests.patch \
16 file://qt-config.patch \
17 file://g++.conf \
18 file://linux.conf \
19 file://hack-out-pg_config.patch \
20 file://mips-relocate.patch \
21 "
22
23SRC_URI[md5sum] = "5c69f16d452b0bb3d44bc3c10556c072"
24SRC_URI[sha256sum] = "f4e0ada8d4d516bbb8600a3ee7d9046c9c79e38cd781df9ffc46d8f16acd1768"
25
26S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
27
28do_configure_prepend() {
29 for pro in $(find ${S} -name "*.pro") ; do
30 sed -i 's:$$QT_BUILD_TREE/bin/lrelease:${OE_QMAKE_LRELEASE}:g' $pro
31 done
32
33 sed -i s:SEDME:${S}: ${WORKDIR}/linux.conf
34 sed -i \
35 -e /QMAKE_MOC\ /d \
36 -e /QMAKE_UIC\ /d \
37 -e /QMAKE_UIC3\ /d \
38 -e /QMAKE_RCC\ /d \
39 ${S}/configure
40}
41
42do_configure_append() {
43 sed -e '/QMAKE_TARGET /d' -e '/TARGET /d' -i ${S}/translations/Makefile
44}
45
46QT_GLFLAGS ?= ""
47QT_CONFIG_FLAGS += " -no-rpath -qt3support -reduce-relocations -silent ${QT_GLFLAGS}"
48
49do_compile() {
50 # Fixup missing wsegl header in some SGX SDKs
51 if ! [ -e ${STAGING_INCDIR}/wsegl.h ] ; then
52 cp src/3rdparty/powervr/wsegl.h src/plugins/gfxdrivers/powervr/QWSWSEGL/
53 fi
54
55 unset CFLAGS CXXFLAGS
56 oe_runmake ${EXTRA_ENV}
57}
diff --git a/meta/recipes-qt/qt4/qt4-embedded_4.6.3.bb b/meta/recipes-qt/qt4/qt4-embedded_4.6.3.bb
deleted file mode 100644
index 5e289d2727..0000000000
--- a/meta/recipes-qt/qt4/qt4-embedded_4.6.3.bb
+++ /dev/null
@@ -1,9 +0,0 @@
1require qt-${PV}.inc
2require qt4-embedded.inc
3
4SRC_URI += "file://qthelp-lib-qtclucene.patch"
5
6PR = "${INC_PR}.2"
7
8QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
9
diff --git a/meta/recipes-qt/qt4/qt4-tools-native_4.6.3.bb b/meta/recipes-qt/qt4/qt4-tools-native_4.6.3.bb
deleted file mode 100644
index dae8cd19e3..0000000000
--- a/meta/recipes-qt/qt4/qt4-tools-native_4.6.3.bb
+++ /dev/null
@@ -1,11 +0,0 @@
1require qt4-tools-native.inc
2
3PR = "${INC_PR}.0"
4
5EXTRA_OECONF += " -no-fast -silent -no-rpath"
6
7TOBUILD := "src/tools/bootstrap ${TOBUILD}"
8
9SRC_URI[md5sum] = "5c69f16d452b0bb3d44bc3c10556c072"
10SRC_URI[sha256sum] = "f4e0ada8d4d516bbb8600a3ee7d9046c9c79e38cd781df9ffc46d8f16acd1768"
11
diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.6.3.bb b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.6.3.bb
deleted file mode 100644
index d64542b5fe..0000000000
--- a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.6.3.bb
+++ /dev/null
@@ -1,6 +0,0 @@
1require qt4-tools-nativesdk.inc
2
3PR = "${INC_PR}.0"
4
5SRC_URI[md5sum] = "5c69f16d452b0bb3d44bc3c10556c072"
6SRC_URI[sha256sum] = "f4e0ada8d4d516bbb8600a3ee7d9046c9c79e38cd781df9ffc46d8f16acd1768"
diff --git a/meta/recipes-qt/qt4/qt4-x11-free-4.6.3/linux.conf b/meta/recipes-qt/qt4/qt4-x11-free-4.6.3/linux.conf
deleted file mode 100644
index 68ae80b929..0000000000
--- a/meta/recipes-qt/qt4/qt4-x11-free-4.6.3/linux.conf
+++ /dev/null
@@ -1,54 +0,0 @@
1#
2# qmake configuration for common linux
3#
4
5QMAKE_CFLAGS_THREAD += -D_REENTRANT
6QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD
7
8QMAKE_INCDIR =
9QMAKE_LIBDIR =
10QMAKE_INCDIR_X11 =
11QMAKE_LIBDIR_X11 =
12QMAKE_INCDIR_QT = $(OE_QMAKE_INCDIR_QT)
13QMAKE_LIBDIR_QT = $(OE_QMAKE_LIBDIR_QT)
14QMAKE_INCDIR_OPENGL =
15QMAKE_LIBDIR_OPENGL =
16
17
18QMAKE_LIBS = -Wl,-rpath-link,SEDME/lib -lglib-2.0
19QMAKE_LIBS_DYNLOAD = -ldl
20QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11)
21QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM)
22QMAKE_LIBS_NIS = -lnsl
23QMAKE_LIBS_OPENGL = -lGLU -lGL
24QMAKE_LIBS_OPENGL_QT = -lGL
25QMAKE_LIBS_THREAD = -lpthread
26
27QMAKE_MOC = $(OE_QMAKE_MOC)
28QMAKE_UIC = $(OE_QMAKE_UIC)
29QMAKE_UIC3 = $(OE_QMAKE_UIC3)
30QMAKE_RCC = $(OE_QMAKE_RCC)
31QMAKE_QDBUSCPP2XML = $(OE_QMAKE_QDBUSCPP2XML)
32QMAKE_QDBUSXML2CPP = $(OE_QMAKE_QDBUSXML2CPP)
33
34QMAKE_AR = $(OE_QMAKE_AR) cqs
35QMAKE_OBJCOPY = ${OBJCOPY}
36QMAKE_RANLIB =
37
38QMAKE_TAR = tar -cf
39QMAKE_GZIP = gzip -9f
40
41QMAKE_COPY = cp -f
42QMAKE_COPY_FILE = $(COPY)
43QMAKE_COPY_DIR = $(COPY) -r
44QMAKE_MOVE = mv -f
45QMAKE_DEL_FILE = rm -f
46QMAKE_DEL_DIR = rmdir
47QMAKE_STRIP = $(OE_QMAKE_STRIP)
48QMAKE_STRIPFLAGS_LIB += --strip-unneeded
49QMAKE_CHK_DIR_EXISTS = test -d
50QMAKE_MKDIR = mkdir -p
51QMAKE_INSTALL_FILE = install -m 644 -p
52QMAKE_INSTALL_PROGRAM = install -m 755 -p
53
54include(unix.conf)
diff --git a/meta/recipes-qt/qt4/qt4-x11-free_4.6.3.bb b/meta/recipes-qt/qt4/qt4-x11-free_4.6.3.bb
deleted file mode 100644
index 9126284b2e..0000000000
--- a/meta/recipes-qt/qt4/qt4-x11-free_4.6.3.bb
+++ /dev/null
@@ -1,6 +0,0 @@
1require qt-${PV}.inc
2require qt4-x11-free.inc
3
4PR = "${INC_PR}.1"
5
6QT_CONFIG_FLAGS += " -xrandr "
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 01:08:28 +0000