qt4: Drop old version 4.7.3
(From OE-Core rev: 4e95c177c4d0ee593945fd020f8d0c22810d8956) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
77bbc22db4
commit
b04b8a4e4d
|
@ -1,60 +0,0 @@
|
|||
LICENSE = "LGPLv2.1 | GPLv3"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
|
||||
file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \
|
||||
file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
|
||||
|
||||
FILESPATH =. "${FILE_DIRNAME}/qt-${PV}:"
|
||||
|
||||
SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
|
||||
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://blacklist-diginotar-certs.diff \
|
||||
file://fix-translations.patch \
|
||||
file://g++.conf \
|
||||
file://linux.conf \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "49b96eefb1224cc529af6fe5608654fe"
|
||||
SRC_URI[sha256sum] = "d02b6fd69d089c01f4a787aa18175d074ccaecf8980a5956e328c2991905937e"
|
||||
|
||||
S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
|
||||
|
||||
FILES_${QT_BASE_NAME}-tools += "${bindir}/qml"
|
||||
|
||||
do_configure_prepend() {
|
||||
for pro in $(find ${S} -name "*.pro") ; do
|
||||
sed -i \
|
||||
-e 's:$$QT_BUILD_TREE/bin/lrelease:${OE_QMAKE_LRELEASE}:g' \
|
||||
-e 's:qtPrepareTool(LRELEASE, lrelease):LRELEASE = ${OE_QMAKE_LRELEASE}:g' $pro
|
||||
done
|
||||
|
||||
sed -i s:SEDME:${S}: ${WORKDIR}/linux.conf
|
||||
sed -i \
|
||||
-e /QMAKE_MOC\ /d \
|
||||
-e /QMAKE_UIC\ /d \
|
||||
-e /QMAKE_UIC3\ /d \
|
||||
-e /QMAKE_RCC\ /d \
|
||||
${S}/configure
|
||||
}
|
||||
|
||||
QT_GLFLAGS ?= ""
|
||||
QT_CONFIG_FLAGS += " -xmlpatterns -no-rpath -qt3support -reduce-relocations -silent ${QT_GLFLAGS}"
|
||||
|
||||
do_compile() {
|
||||
# Fixup missing wsegl header in some SGX SDKs
|
||||
if ! [ -e ${STAGING_INCDIR}/wsegl.h ] ; then
|
||||
cp src/3rdparty/powervr/wsegl.h src/plugins/gfxdrivers/powervr/QWSWSEGL/
|
||||
fi
|
||||
|
||||
unset CFLAGS CXXFLAGS
|
||||
install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${S}/bin/rcc
|
||||
install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${S}/bin/moc
|
||||
install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${S}/bin/uic
|
||||
install -m 0755 ${STAGING_BINDIR_NATIVE}/lrelease4 ${S}/bin/lrelease
|
||||
|
||||
oe_runmake ${EXTRA_ENV}
|
||||
}
|
|
@ -1,47 +0,0 @@
|
|||
From b1ba119f6a824dc01bd42ee00dba4a1653867b72 Mon Sep 17 00:00:00 2001
|
||||
From: Matthias Günther <matgnt@gmail.com>
|
||||
Date: Wed, 12 May 2010 16:52:45 +0200
|
||||
Subject: [PATCH 1/9] Added Openembedded "-crossarch" option
|
||||
|
||||
Original Author: Michael Lauer <mickey@vanille-media.de>
|
||||
Upstream-Status: Pending
|
||||
|
||||
---
|
||||
configure | 7 ++++++-
|
||||
1 files changed, 6 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index facd192..9d15136 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -954,7 +954,7 @@ while [ "$#" -gt 0 ]; do
|
||||
shift
|
||||
VAL=$1
|
||||
;;
|
||||
- -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-host-arch|-mysql_config)
|
||||
+ -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)
|
||||
VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
|
||||
shift
|
||||
VAL="$1"
|
||||
@@ -1443,6 +1443,9 @@ while [ "$#" -gt 0 ]; do
|
||||
xplatform)
|
||||
XPLATFORM="$VAL"
|
||||
;;
|
||||
+ crossarch)
|
||||
+ CROSSARCH="$VAL"
|
||||
+ ;;
|
||||
debug-and-release)
|
||||
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
|
||||
CFG_DEBUG_RELEASE="$VAL"
|
||||
@@ -2918,6 +2921,8 @@ elif [ "$PLATFORM_MAC" = "yes" ] || [ -z "$CFG_ARCH" ]; then
|
||||
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"
|
||||
--
|
||||
1.7.0.4
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
fix phony translation linking error
|
||||
|
||||
| .../usr/lib/crt1.o: In function `_start':
|
||||
| .../../sysdeps/i386/elf/start.S:115: undefined reference to `main'
|
||||
| collect2: ld returned 1 exit status
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
|
||||
|
||||
diff --git a/translations/translations.pro b/translations/translations.pro
|
||||
index cdaf04a..24fa668 100644
|
||||
--- a/translations/translations.pro
|
||||
+++ b/translations/translations.pro
|
||||
@@ -20,7 +20,7 @@ updateqm.name = LRELEASE ${QMAKE_FILE_IN}
|
||||
updateqm.CONFIG += no_link
|
||||
QMAKE_EXTRA_COMPILERS += updateqm
|
||||
|
||||
-isEmpty(vcproj) {
|
||||
+!isEmpty(vcproj) {
|
||||
QMAKE_LINK = @: IGNORE THIS LINE
|
||||
OBJECTS_DIR =
|
||||
win32:CONFIG -= embed_manifest_exe
|
||||
@@ -30,7 +30,7 @@ isEmpty(vcproj) {
|
||||
phony_src.input = PHONY_DEPS
|
||||
phony_src.output = phony.c
|
||||
phony_src.variable_out = GENERATED_SOURCES
|
||||
- phony_src.commands = echo int main() { return 0; } > phony.c
|
||||
+ phony_src.commands = echo \"int main() { return 0; }\" > phony.c
|
||||
phony_src.name = CREATE phony.c
|
||||
phony_src.CONFIG += combine
|
||||
QMAKE_EXTRA_COMPILERS += phony_src
|
|
@ -1,60 +0,0 @@
|
|||
#
|
||||
# qmake configuration for common gcc
|
||||
#
|
||||
|
||||
QMAKE_CC = $(OE_QMAKE_CC)
|
||||
QMAKE_CFLAGS += -pipe $(OE_QMAKE_CFLAGS)
|
||||
QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $(OE_QMAKE_CFLAGS)
|
||||
QMAKE_CFLAGS_DEPS += -M
|
||||
QMAKE_CFLAGS_WARN_ON += -Wall -W
|
||||
QMAKE_CFLAGS_WARN_OFF += -w
|
||||
QMAKE_CFLAGS_RELEASE +=
|
||||
QMAKE_CFLAGS_DEBUG += -g
|
||||
QMAKE_CFLAGS_SHLIB += -fPIC
|
||||
QMAKE_CFLAGS_STATIC_LIB += -fPIC
|
||||
QMAKE_CFLAGS_YACC += -Wno-unused -Wno-parentheses
|
||||
QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden
|
||||
QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
|
||||
QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE}
|
||||
|
||||
QMAKE_CXX = $(OE_QMAKE_CXX)
|
||||
QMAKE_CXXFLAGS += $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS)
|
||||
QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS
|
||||
QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON
|
||||
QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF
|
||||
QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_RELEASE
|
||||
QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
|
||||
QMAKE_CXXFLAGS_DEBUG += $$QMAKE_CFLAGS_DEBUG
|
||||
QMAKE_CXXFLAGS_SHLIB += $$QMAKE_CFLAGS_SHLIB
|
||||
QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
|
||||
QMAKE_CXXFLAGS_YACC += $$QMAKE_CFLAGS_YACC
|
||||
QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden
|
||||
QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
|
||||
QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
|
||||
|
||||
QMAKE_LINK = $(OE_QMAKE_LINK)
|
||||
QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK)
|
||||
QMAKE_LINK_C = $(OE_QMAKE_LINK)
|
||||
QMAKE_LINK_C_SHLIB = $(OE_QMAKE_LINK)
|
||||
QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS)
|
||||
QMAKE_LFLAGS_RELEASE +=
|
||||
QMAKE_LFLAGS_DEBUG +=
|
||||
QMAKE_LFLAGS_APP +=
|
||||
QMAKE_LFLAGS_SHLIB += -shared
|
||||
QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB
|
||||
QMAKE_LFLAGS_SONAME += -Wl,-soname,
|
||||
QMAKE_LFLAGS_THREAD +=
|
||||
QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined
|
||||
QMAKE_LFLAGS_RPATH = -Wl,-rpath-link,
|
||||
|
||||
QMAKE_PCH_OUTPUT_EXT = .gch
|
||||
|
||||
# -Bsymbolic-functions (ld) support
|
||||
QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Wl,-Bsymbolic-functions
|
||||
QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,
|
||||
|
||||
# some linking helper...
|
||||
CONFIG += rpath_libdirs
|
||||
|
||||
# for the SDK
|
||||
isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG)
|
|
@ -1,31 +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 pad.
|
||||
|
||||
Original Author: Holger Hans Peter Freyther <zecke@selfish.org>
|
||||
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
|
||||
+++ qt-everywhere-opensource-src-4.7.0/configure 2010-09-22 15:44:35.179981232 -0400
|
||||
@@ -4921,10 +4921,10 @@
|
||||
psql)
|
||||
if [ "$CFG_SQL_psql" != "no" ]; then
|
||||
# Be careful not to use native pg_config when cross building.
|
||||
- if [ "$XPLATFORM_MINGW" != "yes" ] && "$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 [ "$XPLATFORM_MINGW" != "yes" ] && "$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"
|
||||
# But, respect PSQL_LIBS if set
|
|
@ -1,66 +0,0 @@
|
|||
#
|
||||
# qmake configuration for common linux
|
||||
#
|
||||
|
||||
QMAKE_CFLAGS_THREAD += -D_REENTRANT
|
||||
QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD
|
||||
|
||||
QMAKE_INCDIR =
|
||||
QMAKE_LIBDIR =
|
||||
QMAKE_INCDIR_X11 =
|
||||
QMAKE_LIBDIR_X11 =
|
||||
QMAKE_INCDIR_QT = $(OE_QMAKE_INCDIR_QT)
|
||||
QMAKE_LIBDIR_QT = $(OE_QMAKE_LIBDIR_QT)
|
||||
QMAKE_INCDIR_OPENGL =
|
||||
QMAKE_LIBDIR_OPENGL =
|
||||
QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_INCDIR_OPENGL
|
||||
QMAKE_LIBDIR_OPENGL_ES1 = $$QMAKE_LIBDIR_OPENGL
|
||||
QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
|
||||
QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL
|
||||
QMAKE_INCDIR_EGL =
|
||||
QMAKE_LIBDIR_EGL =
|
||||
QMAKE_INCDIR_OPENVG =
|
||||
QMAKE_LIBDIR_OPENVG =
|
||||
|
||||
|
||||
QMAKE_LIBS =
|
||||
QMAKE_LIBS_DYNLOAD = -ldl
|
||||
QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11)
|
||||
QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM)
|
||||
QMAKE_LIBS_NIS = -lnsl
|
||||
QMAKE_LIBS_EGL = -lEGL
|
||||
QMAKE_LIBS_OPENGL = -lGLU -lGL
|
||||
QMAKE_LIBS_OPENGL_QT = -lGL
|
||||
QMAKE_LIBS_OPENGL_ES1 = -lGLES_CM
|
||||
QMAKE_LIBS_OPENGL_ES2 = -lGLESv2
|
||||
QMAKE_LIBS_OPENVG = -lOpenVG
|
||||
QMAKE_LIBS_THREAD = -lpthread
|
||||
|
||||
QMAKE_MOC = $(OE_QMAKE_MOC)
|
||||
QMAKE_UIC = $(OE_QMAKE_UIC)
|
||||
QMAKE_UIC3 = $(OE_QMAKE_UIC3)
|
||||
QMAKE_RCC = $(OE_QMAKE_RCC)
|
||||
QMAKE_QDBUSCPP2XML = $(OE_QMAKE_QDBUSCPP2XML)
|
||||
QMAKE_QDBUSXML2CPP = $(OE_QMAKE_QDBUSXML2CPP)
|
||||
|
||||
QMAKE_AR = $(OE_QMAKE_AR) cqs
|
||||
QMAKE_OBJCOPY = objcopy
|
||||
QMAKE_RANLIB =
|
||||
|
||||
QMAKE_TAR = tar -cf
|
||||
QMAKE_GZIP = gzip -9f
|
||||
|
||||
QMAKE_COPY = cp -f
|
||||
QMAKE_COPY_FILE = $(COPY)
|
||||
QMAKE_COPY_DIR = $(COPY) -r
|
||||
QMAKE_MOVE = mv -f
|
||||
QMAKE_DEL_FILE = rm -f
|
||||
QMAKE_DEL_DIR = rmdir
|
||||
QMAKE_STRIP = $(OE_QMAKE_STRIP)
|
||||
QMAKE_STRIPFLAGS_LIB += --strip-unneeded
|
||||
QMAKE_CHK_DIR_EXISTS = test -d
|
||||
QMAKE_MKDIR = mkdir -p
|
||||
QMAKE_INSTALL_FILE = install -m 644 -p
|
||||
QMAKE_INSTALL_PROGRAM = install -m 755 -p
|
||||
|
||||
include(unix.conf)
|
|
@ -1,10 +0,0 @@
|
|||
require qt-${PV}.inc
|
||||
require qt4-embedded.inc
|
||||
|
||||
PR = "${INC_PR}.2"
|
||||
|
||||
QT_CONFIG_FLAGS_append_armv6-vfp = " -no-neon "
|
||||
|
||||
QT_CONFIG_FLAGS += " \
|
||||
-exceptions \
|
||||
"
|
|
@ -1,15 +0,0 @@
|
|||
require qt4-native.inc
|
||||
|
||||
PR = "${INC_PR}.1"
|
||||
|
||||
SRC_URI += "file://blacklist-diginotar-certs.diff"
|
||||
|
||||
# Find the g++.conf/linux.conf in the right directory.
|
||||
FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:"
|
||||
|
||||
EXTRA_OECONF += " -no-fast -silent -no-rpath"
|
||||
|
||||
TOBUILD := "src/tools/bootstrap ${TOBUILD}"
|
||||
|
||||
SRC_URI[md5sum] = "49b96eefb1224cc529af6fe5608654fe"
|
||||
SRC_URI[sha256sum] = "d02b6fd69d089c01f4a787aa18175d074ccaecf8980a5956e328c2991905937e"
|
|
@ -1,8 +0,0 @@
|
|||
require qt4-tools-nativesdk.inc
|
||||
|
||||
PR = "${INC_PR}.0"
|
||||
|
||||
SRC_URI += "file://blacklist-diginotar-certs.diff"
|
||||
|
||||
SRC_URI[md5sum] = "49b96eefb1224cc529af6fe5608654fe"
|
||||
SRC_URI[sha256sum] = "d02b6fd69d089c01f4a787aa18175d074ccaecf8980a5956e328c2991905937e"
|
|
@ -1,12 +0,0 @@
|
|||
require qt4-x11-free.inc
|
||||
require qt-${PV}.inc
|
||||
|
||||
PR = "${INC_PR}.2"
|
||||
|
||||
QT_CONFIG_FLAGS_append_armv6-vfp = " -no-neon "
|
||||
|
||||
QT_CONFIG_FLAGS += " \
|
||||
-no-embedded \
|
||||
-xrandr \
|
||||
-x11"
|
||||
|
Loading…
Reference in New Issue