summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-07 10:53:55 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-12 14:12:10 +0100
commitb04b8a4e4d720df61e3294781236890e1ab91748 (patch)
treeec4939d2859e4512077afbc4bfba56ddb00710d6
parent77bbc22db44950bc17b95cdb7e039671733574eb (diff)
downloadpoky-b04b8a4e4d720df61e3294781236890e1ab91748.tar.gz
qt4: Drop old version 4.7.3
(From OE-Core rev: 4e95c177c4d0ee593945fd020f8d0c22810d8956) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat
-rw-r--r--meta/recipes-qt/qt4/qt-4.7.3.inc60
-rw-r--r--meta/recipes-qt/qt4/qt-4.7.3/0001-Added-Openembedded-crossarch-option.patch47
-rw-r--r--meta/recipes-qt/qt4/qt-4.7.3/fix-translations.patch32
-rw-r--r--meta/recipes-qt/qt4/qt-4.7.3/g++.conf60
-rw-r--r--meta/recipes-qt/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch31
-rw-r--r--meta/recipes-qt/qt4/qt-4.7.3/linux.conf66
-rw-r--r--meta/recipes-qt/qt4/qt4-embedded_4.7.3.bb10
-rw-r--r--meta/recipes-qt/qt4/qt4-native_4.7.3.bb15
-rw-r--r--meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb8
-rw-r--r--meta/recipes-qt/qt4/qt4-x11-free_4.7.3.bb12
10 files changed, 0 insertions, 341 deletions
diff --git a/meta/recipes-qt/qt4/qt-4.7.3.inc b/meta/recipes-qt/qt4/qt-4.7.3.inc
deleted file mode 100644
index 16c7b08908..0000000000
--- a/meta/recipes-qt/qt4/qt-4.7.3.inc
+++ /dev/null
@@ -1,60 +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
6FILESPATH =. "${FILE_DIRNAME}/qt-${PV}:"
7
8SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
9 file://0004-no-qmake.patch \
10 file://hack-out-pg2-4.7.0.patch \
11 file://0006-freetype-host-includes.patch \
12 file://0008-qt-lib-infix.patch \
13 file://0009-support-2bpp.patch \
14 file://0001-Added-Openembedded-crossarch-option.patch \
15 file://blacklist-diginotar-certs.diff \
16 file://fix-translations.patch \
17 file://g++.conf \
18 file://linux.conf \
19 "
20
21SRC_URI[md5sum] = "49b96eefb1224cc529af6fe5608654fe"
22SRC_URI[sha256sum] = "d02b6fd69d089c01f4a787aa18175d074ccaecf8980a5956e328c2991905937e"
23
24S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
25
26FILES_${QT_BASE_NAME}-tools += "${bindir}/qml"
27
28do_configure_prepend() {
29 for pro in $(find ${S} -name "*.pro") ; do
30 sed -i \
31 -e 's:$$QT_BUILD_TREE/bin/lrelease:${OE_QMAKE_LRELEASE}:g' \
32 -e 's:qtPrepareTool(LRELEASE, lrelease):LRELEASE = ${OE_QMAKE_LRELEASE}:g' $pro
33 done
34
35 sed -i s:SEDME:${S}: ${WORKDIR}/linux.conf
36 sed -i \
37 -e /QMAKE_MOC\ /d \
38 -e /QMAKE_UIC\ /d \
39 -e /QMAKE_UIC3\ /d \
40 -e /QMAKE_RCC\ /d \
41 ${S}/configure
42}
43
44QT_GLFLAGS ?= ""
45QT_CONFIG_FLAGS += " -xmlpatterns -no-rpath -qt3support -reduce-relocations -silent ${QT_GLFLAGS}"
46
47do_compile() {
48 # Fixup missing wsegl header in some SGX SDKs
49 if ! [ -e ${STAGING_INCDIR}/wsegl.h ] ; then
50 cp src/3rdparty/powervr/wsegl.h src/plugins/gfxdrivers/powervr/QWSWSEGL/
51 fi
52
53 unset CFLAGS CXXFLAGS
54 install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${S}/bin/rcc
55 install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${S}/bin/moc
56 install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${S}/bin/uic
57 install -m 0755 ${STAGING_BINDIR_NATIVE}/lrelease4 ${S}/bin/lrelease
58
59 oe_runmake ${EXTRA_ENV}
60}
diff --git a/meta/recipes-qt/qt4/qt-4.7.3/0001-Added-Openembedded-crossarch-option.patch b/meta/recipes-qt/qt4/qt-4.7.3/0001-Added-Openembedded-crossarch-option.patch
deleted file mode 100644
index f302c5bd61..0000000000
--- a/meta/recipes-qt/qt4/qt-4.7.3/0001-Added-Openembedded-crossarch-option.patch
+++ /dev/null
@@ -1,47 +0,0 @@
1From b1ba119f6a824dc01bd42ee00dba4a1653867b72 Mon Sep 17 00:00:00 2001
2From: Matthias Günther <matgnt@gmail.com>
3Date: Wed, 12 May 2010 16:52:45 +0200
4Subject: [PATCH 1/9] Added Openembedded "-crossarch" option
5
6Original Author: Michael Lauer <mickey@vanille-media.de>
7Upstream-Status: Pending
8
9---
10 configure | 7 ++++++-
11 1 files changed, 6 insertions(+), 1 deletions(-)
12
13diff --git a/configure b/configure
14index facd192..9d15136 100755
15--- a/configure
16+++ b/configure
17@@ -954,7 +954,7 @@ while [ "$#" -gt 0 ]; do
18 shift
19 VAL=$1
20 ;;
21- -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-host-arch|-mysql_config)
22+ -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-host-arch|-mysql_config|-crossarch)
23 VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
24 shift
25 VAL="$1"
26@@ -1443,6 +1443,9 @@ while [ "$#" -gt 0 ]; do
27 xplatform)
28 XPLATFORM="$VAL"
29 ;;
30+ crossarch)
31+ CROSSARCH="$VAL"
32+ ;;
33 debug-and-release)
34 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
35 CFG_DEBUG_RELEASE="$VAL"
36@@ -2918,6 +2921,8 @@ elif [ "$PLATFORM_MAC" = "yes" ] || [ -z "$CFG_ARCH" ]; then
37 CFG_ARCH=$CFG_HOST_ARCH
38 fi
39
40+CFG_ARCH="$CROSSARCH"
41+
42 if [ -d "$relpath/src/corelib/arch/$CFG_ARCH" ]; then
43 if [ "$OPT_VERBOSE" = "yes" ]; then
44 echo " '$CFG_ARCH' is supported"
45--
461.7.0.4
47
diff --git a/meta/recipes-qt/qt4/qt-4.7.3/fix-translations.patch b/meta/recipes-qt/qt4/qt-4.7.3/fix-translations.patch
deleted file mode 100644
index 906d4e312f..0000000000
--- a/meta/recipes-qt/qt4/qt-4.7.3/fix-translations.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1fix phony translation linking error
2
3 | .../usr/lib/crt1.o: In function `_start':
4 | .../../sysdeps/i386/elf/start.S:115: undefined reference to `main'
5 | collect2: ld returned 1 exit status
6
7Upstream-Status: Pending
8
9Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
10
11diff --git a/translations/translations.pro b/translations/translations.pro
12index cdaf04a..24fa668 100644
13--- a/translations/translations.pro
14+++ b/translations/translations.pro
15@@ -20,7 +20,7 @@ updateqm.name = LRELEASE ${QMAKE_FILE_IN}
16 updateqm.CONFIG += no_link
17 QMAKE_EXTRA_COMPILERS += updateqm
18
19-isEmpty(vcproj) {
20+!isEmpty(vcproj) {
21 QMAKE_LINK = @: IGNORE THIS LINE
22 OBJECTS_DIR =
23 win32:CONFIG -= embed_manifest_exe
24@@ -30,7 +30,7 @@ isEmpty(vcproj) {
25 phony_src.input = PHONY_DEPS
26 phony_src.output = phony.c
27 phony_src.variable_out = GENERATED_SOURCES
28- phony_src.commands = echo int main() { return 0; } > phony.c
29+ phony_src.commands = echo \"int main() { return 0; }\" > phony.c
30 phony_src.name = CREATE phony.c
31 phony_src.CONFIG += combine
32 QMAKE_EXTRA_COMPILERS += phony_src
diff --git a/meta/recipes-qt/qt4/qt-4.7.3/g++.conf b/meta/recipes-qt/qt4/qt-4.7.3/g++.conf
deleted file mode 100644
index 80f925cc5e..0000000000
--- a/meta/recipes-qt/qt4/qt-4.7.3/g++.conf
+++ /dev/null
@@ -1,60 +0,0 @@
1#
2# qmake configuration for common gcc
3#
4
5QMAKE_CC = $(OE_QMAKE_CC)
6QMAKE_CFLAGS += -pipe $(OE_QMAKE_CFLAGS)
7QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $(OE_QMAKE_CFLAGS)
8QMAKE_CFLAGS_DEPS += -M
9QMAKE_CFLAGS_WARN_ON += -Wall -W
10QMAKE_CFLAGS_WARN_OFF += -w
11QMAKE_CFLAGS_RELEASE +=
12QMAKE_CFLAGS_DEBUG += -g
13QMAKE_CFLAGS_SHLIB += -fPIC
14QMAKE_CFLAGS_STATIC_LIB += -fPIC
15QMAKE_CFLAGS_YACC += -Wno-unused -Wno-parentheses
16QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden
17QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
18QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE}
19
20QMAKE_CXX = $(OE_QMAKE_CXX)
21QMAKE_CXXFLAGS += $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS)
22QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS
23QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON
24QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF
25QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_RELEASE
26QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
27QMAKE_CXXFLAGS_DEBUG += $$QMAKE_CFLAGS_DEBUG
28QMAKE_CXXFLAGS_SHLIB += $$QMAKE_CFLAGS_SHLIB
29QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
30QMAKE_CXXFLAGS_YACC += $$QMAKE_CFLAGS_YACC
31QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden
32QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
33QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
34
35QMAKE_LINK = $(OE_QMAKE_LINK)
36QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK)
37QMAKE_LINK_C = $(OE_QMAKE_LINK)
38QMAKE_LINK_C_SHLIB = $(OE_QMAKE_LINK)
39QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS)
40QMAKE_LFLAGS_RELEASE +=
41QMAKE_LFLAGS_DEBUG +=
42QMAKE_LFLAGS_APP +=
43QMAKE_LFLAGS_SHLIB += -shared
44QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB
45QMAKE_LFLAGS_SONAME += -Wl,-soname,
46QMAKE_LFLAGS_THREAD +=
47QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined
48QMAKE_LFLAGS_RPATH = -Wl,-rpath-link,
49
50QMAKE_PCH_OUTPUT_EXT = .gch
51
52# -Bsymbolic-functions (ld) support
53QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Wl,-Bsymbolic-functions
54QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,
55
56# some linking helper...
57CONFIG += rpath_libdirs
58
59# for the SDK
60isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG)
diff --git a/meta/recipes-qt/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch b/meta/recipes-qt/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch
deleted file mode 100644
index 39c5f4a32c..0000000000
--- a/meta/recipes-qt/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch
+++ /dev/null
@@ -1,31 +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 pad.
9
10Original Author: Holger Hans Peter Freyther <zecke@selfish.org>
11Upstream-Status: Inappropriate [configuration]
12
13Index: qt-everywhere-opensource-src-4.7.0/configure
14===================================================================
15--- qt-everywhere-opensource-src-4.7.0.orig/configure 2010-09-22 15:43:51.191162141 -0400
16+++ qt-everywhere-opensource-src-4.7.0/configure 2010-09-22 15:44:35.179981232 -0400
17@@ -4921,10 +4921,10 @@
18 psql)
19 if [ "$CFG_SQL_psql" != "no" ]; then
20 # Be careful not to use native pg_config when cross building.
21- if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then
22- QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null`
23- QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null`
24- fi
25+# if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then
26+# QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null`
27+# QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null`
28+# fi
29 [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL"
30 [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL"
31 # But, respect PSQL_LIBS if set
diff --git a/meta/recipes-qt/qt4/qt-4.7.3/linux.conf b/meta/recipes-qt/qt4/qt-4.7.3/linux.conf
deleted file mode 100644
index a54135513b..0000000000
--- a/meta/recipes-qt/qt4/qt-4.7.3/linux.conf
+++ /dev/null
@@ -1,66 +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 =
16QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_INCDIR_OPENGL
17QMAKE_LIBDIR_OPENGL_ES1 = $$QMAKE_LIBDIR_OPENGL
18QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
19QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL
20QMAKE_INCDIR_EGL =
21QMAKE_LIBDIR_EGL =
22QMAKE_INCDIR_OPENVG =
23QMAKE_LIBDIR_OPENVG =
24
25
26QMAKE_LIBS =
27QMAKE_LIBS_DYNLOAD = -ldl
28QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11)
29QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM)
30QMAKE_LIBS_NIS = -lnsl
31QMAKE_LIBS_EGL = -lEGL
32QMAKE_LIBS_OPENGL = -lGLU -lGL
33QMAKE_LIBS_OPENGL_QT = -lGL
34QMAKE_LIBS_OPENGL_ES1 = -lGLES_CM
35QMAKE_LIBS_OPENGL_ES2 = -lGLESv2
36QMAKE_LIBS_OPENVG = -lOpenVG
37QMAKE_LIBS_THREAD = -lpthread
38
39QMAKE_MOC = $(OE_QMAKE_MOC)
40QMAKE_UIC = $(OE_QMAKE_UIC)
41QMAKE_UIC3 = $(OE_QMAKE_UIC3)
42QMAKE_RCC = $(OE_QMAKE_RCC)
43QMAKE_QDBUSCPP2XML = $(OE_QMAKE_QDBUSCPP2XML)
44QMAKE_QDBUSXML2CPP = $(OE_QMAKE_QDBUSXML2CPP)
45
46QMAKE_AR = $(OE_QMAKE_AR) cqs
47QMAKE_OBJCOPY = objcopy
48QMAKE_RANLIB =
49
50QMAKE_TAR = tar -cf
51QMAKE_GZIP = gzip -9f
52
53QMAKE_COPY = cp -f
54QMAKE_COPY_FILE = $(COPY)
55QMAKE_COPY_DIR = $(COPY) -r
56QMAKE_MOVE = mv -f
57QMAKE_DEL_FILE = rm -f
58QMAKE_DEL_DIR = rmdir
59QMAKE_STRIP = $(OE_QMAKE_STRIP)
60QMAKE_STRIPFLAGS_LIB += --strip-unneeded
61QMAKE_CHK_DIR_EXISTS = test -d
62QMAKE_MKDIR = mkdir -p
63QMAKE_INSTALL_FILE = install -m 644 -p
64QMAKE_INSTALL_PROGRAM = install -m 755 -p
65
66include(unix.conf)
diff --git a/meta/recipes-qt/qt4/qt4-embedded_4.7.3.bb b/meta/recipes-qt/qt4/qt4-embedded_4.7.3.bb
deleted file mode 100644
index 801b45ab82..0000000000
--- a/meta/recipes-qt/qt4/qt4-embedded_4.7.3.bb
+++ /dev/null
@@ -1,10 +0,0 @@
1require qt-${PV}.inc
2require qt4-embedded.inc
3
4PR = "${INC_PR}.2"
5
6QT_CONFIG_FLAGS_append_armv6-vfp = " -no-neon "
7
8QT_CONFIG_FLAGS += " \
9 -exceptions \
10"
diff --git a/meta/recipes-qt/qt4/qt4-native_4.7.3.bb b/meta/recipes-qt/qt4/qt4-native_4.7.3.bb
deleted file mode 100644
index e90a7baca4..0000000000
--- a/meta/recipes-qt/qt4/qt4-native_4.7.3.bb
+++ /dev/null
@@ -1,15 +0,0 @@
1require qt4-native.inc
2
3PR = "${INC_PR}.1"
4
5SRC_URI += "file://blacklist-diginotar-certs.diff"
6
7# Find the g++.conf/linux.conf in the right directory.
8FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:"
9
10EXTRA_OECONF += " -no-fast -silent -no-rpath"
11
12TOBUILD := "src/tools/bootstrap ${TOBUILD}"
13
14SRC_URI[md5sum] = "49b96eefb1224cc529af6fe5608654fe"
15SRC_URI[sha256sum] = "d02b6fd69d089c01f4a787aa18175d074ccaecf8980a5956e328c2991905937e"
diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb
deleted file mode 100644
index e2a4539e1f..0000000000
--- a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb
+++ /dev/null
@@ -1,8 +0,0 @@
1require qt4-tools-nativesdk.inc
2
3PR = "${INC_PR}.0"
4
5SRC_URI += "file://blacklist-diginotar-certs.diff"
6
7SRC_URI[md5sum] = "49b96eefb1224cc529af6fe5608654fe"
8SRC_URI[sha256sum] = "d02b6fd69d089c01f4a787aa18175d074ccaecf8980a5956e328c2991905937e"
diff --git a/meta/recipes-qt/qt4/qt4-x11-free_4.7.3.bb b/meta/recipes-qt/qt4/qt4-x11-free_4.7.3.bb
deleted file mode 100644
index 413afb4a2d..0000000000
--- a/meta/recipes-qt/qt4/qt4-x11-free_4.7.3.bb
+++ /dev/null
@@ -1,12 +0,0 @@
1require qt4-x11-free.inc
2require qt-${PV}.inc
3
4PR = "${INC_PR}.2"
5
6QT_CONFIG_FLAGS_append_armv6-vfp = " -no-neon "
7
8QT_CONFIG_FLAGS += " \
9 -no-embedded \
10 -xrandr \
11 -x11"
12
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-19 18:34:56 +0000