mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-04-02 02:49:12 +00:00
qt4: drop 4.6 versions
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
This commit is contained in:
parent
13412161ab
commit
c6d80dc43e
Binary file not shown.
@ -1,56 +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"
|
||||
|
||||
SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
|
||||
file://0001-cross-compile.patch \
|
||||
file://0002-fix-resinit-declaration.patch \
|
||||
file://0004-no-qmake.patch \
|
||||
file://0006-freetype-host-includes.patch \
|
||||
file://0008-qt-lib-infix.patch \
|
||||
file://0009-support-2bpp.patch \
|
||||
file://0010-no-simpledecoration-example.patch \
|
||||
file://fix-config-tests.patch \
|
||||
file://qt-config.patch \
|
||||
file://g++.conf \
|
||||
file://linux.conf \
|
||||
file://hack-out-pg_config.patch \
|
||||
file://mips-relocate.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "5c69f16d452b0bb3d44bc3c10556c072"
|
||||
SRC_URI[sha256sum] = "f4e0ada8d4d516bbb8600a3ee7d9046c9c79e38cd781df9ffc46d8f16acd1768"
|
||||
|
||||
S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
|
||||
|
||||
do_configure_prepend() {
|
||||
for pro in $(find ${S} -name "*.pro") ; do
|
||||
sed -i 's:$$QT_BUILD_TREE/bin/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
|
||||
}
|
||||
|
||||
do_configure_append() {
|
||||
sed -e '/QMAKE_TARGET /d' -e '/TARGET /d' -i ${S}/translations/Makefile
|
||||
}
|
||||
|
||||
QT_GLFLAGS ?= ""
|
||||
QT_CONFIG_FLAGS += " -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
|
||||
oe_runmake ${EXTRA_ENV}
|
||||
}
|
||||
@ -1,20 +0,0 @@
|
||||
From c9ab62bd9a56643574b3ae6e59e0ca776d4860d2 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Krelin <hacker@klever.net>
|
||||
Date: Mon, 4 Jun 2007 14:48:50 +0200
|
||||
Subject: [PATCH] freetype host includes
|
||||
|
||||
---
|
||||
config.tests/unix/freetype/freetype.pri | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
Index: qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/freetype/freetype.pri
|
||||
===================================================================
|
||||
--- qt-embedded-linux-opensource-src-4.5.0.orig/config.tests/unix/freetype/freetype.pri 2009-02-25 22:32:32.000000000 +0100
|
||||
+++ qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/freetype/freetype.pri 2009-03-26 17:14:16.000000000 +0100
|
||||
@@ -1,5 +1,5 @@
|
||||
!cross_compile {
|
||||
- TRY_INCLUDEPATHS = /include /usr/include $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
|
||||
+ TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
|
||||
# LSB doesn't allow using headers from /include or /usr/include
|
||||
linux-lsb-g++:TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
|
||||
for(p, TRY_INCLUDEPATHS) {
|
||||
@ -1,32 +0,0 @@
|
||||
--- /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
|
||||
@@ -3,11 +3,11 @@
|
||||
|
||||
# Include the correct version of the UiLoader library
|
||||
symbian: QTUITOOLS_LINKAGE = -lQtUiTools.lib
|
||||
-else: QTUITOOLS_LINKAGE = -lQtUiTools
|
||||
+else: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}
|
||||
|
||||
CONFIG(debug, debug|release) {
|
||||
- mac: QTUITOOLS_LINKAGE = -lQtUiTools_debug
|
||||
- win32: QTUITOOLS_LINKAGE = -lQtUiToolsd
|
||||
+ mac: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}_debug
|
||||
+ win32: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}d
|
||||
}
|
||||
LIBS += $$QTUITOOLS_LINKAGE
|
||||
|
||||
--- /tmp/uitools.pro 2009-12-01 18:40:28.000000000 +0100
|
||||
+++ qt-everywhere-opensource-src-4.6.0/tools/designer/src/uitools/uitools.pro 2009-12-01 18:59:18.000000000 +0100
|
||||
@@ -1,5 +1,5 @@
|
||||
TEMPLATE = lib
|
||||
-TARGET = $$qtLibraryTarget(QtUiTools)
|
||||
+TARGET = QtUiTools
|
||||
QT += xml
|
||||
CONFIG += qt staticlib
|
||||
DESTDIR = ../../../../lib
|
||||
@@ -43,3 +43,5 @@
|
||||
QMAKE_PKGCONFIG_DESTDIR = pkgconfig
|
||||
QMAKE_PKGCONFIG_REQUIRES += QtXml
|
||||
}
|
||||
+
|
||||
+TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end
|
||||
@ -1,11 +0,0 @@
|
||||
--- /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
|
||||
@ -1,54 +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_LIBS = -Wl,-rpath-link,SEDME/lib -lglib-2.0
|
||||
QMAKE_LIBS_DYNLOAD = -ldl
|
||||
QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11)
|
||||
QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM)
|
||||
QMAKE_LIBS_NIS = -lnsl
|
||||
QMAKE_LIBS_OPENGL = -lGLU -lGL
|
||||
QMAKE_LIBS_OPENGL_QT = -lGL
|
||||
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,9 +0,0 @@
|
||||
require qt-${PV}.inc
|
||||
require qt4-embedded.inc
|
||||
|
||||
SRC_URI += "file://qthelp-lib-qtclucene.patch"
|
||||
|
||||
PR = "${INC_PR}.1"
|
||||
|
||||
QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
|
||||
|
||||
@ -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"
|
||||
|
||||
@ -1,6 +0,0 @@
|
||||
require qt4-tools-nativesdk.inc
|
||||
|
||||
PR = "${INC_PR}.0"
|
||||
|
||||
SRC_URI[md5sum] = "5c69f16d452b0bb3d44bc3c10556c072"
|
||||
SRC_URI[sha256sum] = "f4e0ada8d4d516bbb8600a3ee7d9046c9c79e38cd781df9ffc46d8f16acd1768"
|
||||
@ -1,90 +0,0 @@
|
||||
DESCRIPTION = "SDK tools for Qt/[X11|Mac|Embedded] version 4.x"
|
||||
DEPENDS = "zlib-native dbus-native"
|
||||
SECTION = "libs"
|
||||
HOMEPAGE = "http://www.trolltech.com"
|
||||
PRIORITY = "optional"
|
||||
LICENSE = "LGPLv2.1 GPLv3"
|
||||
|
||||
PR = "r1"
|
||||
|
||||
DEFAULT_PREFERENCE = "-1"
|
||||
inherit nativesdk
|
||||
|
||||
SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
|
||||
file://configure-lflags.patch \
|
||||
file://compile.test-lflags.patch \
|
||||
file://qt-config.patch \
|
||||
file://g++.conf \
|
||||
file://linux.conf"
|
||||
|
||||
S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
|
||||
|
||||
|
||||
# FIXME: make it work with "${STAGING_BINDIR_NATIVE}/pkg-config --cflags dbus-1"
|
||||
EXTRA_OECONF = "-prefix ${prefix} \
|
||||
-qt-libjpeg -qt-gif -system-zlib \
|
||||
-no-libjpeg -no-libpng \
|
||||
-no-accessibility \
|
||||
-no-cups \
|
||||
-no-exceptions \
|
||||
-no-nas-sound \
|
||||
-no-nis \
|
||||
-verbose -release -fast -static \
|
||||
-qt3support \
|
||||
-I${STAGING_DIR_NATIVE}/usr/include \
|
||||
-I${STAGING_DIR_NATIVE}/usr/include/freetype2 \
|
||||
-I${STAGING_DIR_NATIVE}/usr/include/dbus-1.0 \
|
||||
-I${STAGING_DIR_NATIVE}/usr/lib/dbus-1.0/include"
|
||||
|
||||
# yank default -e, otherwise we get the following error:
|
||||
# moc_qbuffer.cpp: No such file or directory
|
||||
EXTRA_OEMAKE = " "
|
||||
|
||||
do_configure() {
|
||||
(echo o; echo yes) | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
|
||||
}
|
||||
|
||||
TOBUILD = "\
|
||||
src/tools/bootstrap \
|
||||
src/tools/moc \
|
||||
src/corelib \
|
||||
src/sql \
|
||||
src/dbus \
|
||||
src/qt3support \
|
||||
src/xml \
|
||||
src/tools/uic \
|
||||
src/tools/rcc \
|
||||
src/network \
|
||||
src/gui \
|
||||
src/tools/uic3 \
|
||||
tools/linguist/lrelease \
|
||||
tools/linguist/lupdate \
|
||||
tools/qdbus \
|
||||
"
|
||||
|
||||
do_compile() {
|
||||
for i in ${TOBUILD}; do
|
||||
cd ${S}/$i && oe_runmake CC="${CC}" CXX="${CXX}"
|
||||
done
|
||||
}
|
||||
|
||||
do_install() {
|
||||
install -d ${D}${bindir}
|
||||
install -m 0755 bin/qmake ${D}${bindir}/qmake2
|
||||
for i in moc uic uic3 rcc lrelease lupdate qdbuscpp2xml qdbusxml2cpp; do
|
||||
install -m 0755 bin/${i} ${D}${bindir}/${i}4
|
||||
done
|
||||
|
||||
(cd ${D}${bindir}; \
|
||||
ln -s qmake2 qmake; \
|
||||
for i in moc uic uic3 rcc lrelease lupdate qdbuscpp2xml qdbusxml2cpp; do \
|
||||
ln -s ${i}4 ${i}; \
|
||||
done)
|
||||
|
||||
# make a symbolic link to mkspecs for compatibility with Nokia's SDK
|
||||
# and QTCreator
|
||||
(cd ${D}${bindir}/..; ln -s ${TARGET_SYS}/usr/share/qtopia/mkspecs mkspecs;)
|
||||
}
|
||||
|
||||
SRC_URI[md5sum] = "5c69f16d452b0bb3d44bc3c10556c072"
|
||||
SRC_URI[sha256sum] = "f4e0ada8d4d516bbb8600a3ee7d9046c9c79e38cd781df9ffc46d8f16acd1768"
|
||||
@ -1,54 +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_LIBS = -Wl,-rpath-link,SEDME/lib -lglib-2.0
|
||||
QMAKE_LIBS_DYNLOAD = -ldl
|
||||
QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11)
|
||||
QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM)
|
||||
QMAKE_LIBS_NIS = -lnsl
|
||||
QMAKE_LIBS_OPENGL = -lGLU -lGL
|
||||
QMAKE_LIBS_OPENGL_QT = -lGL
|
||||
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,6 +0,0 @@
|
||||
require qt-${PV}.inc
|
||||
require qt4-x11-free.inc
|
||||
|
||||
PR = "${INC_PR}.0"
|
||||
|
||||
QT_CONFIG_FLAGS += " -xrandr "
|
||||
Loading…
x
Reference in New Issue
Block a user