From d5133e67e43c7022e7c6f4c2ad4d9d784153758b Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sun, 23 Dec 2007 22:35:09 +0000 Subject: Move Qt/X11 and Qt/Embedded (known as QtopiaCore) to a qt4 directory. We will see a great unification in this directory. Besides the name Qt/X11 and Qt/Emebedded (QtopiaCore) are the same package with a different configure script. The aim is to share configuring, compiling, staging and packaging between these modules and making it more easy to try a bleeding qt snapshot. --- packages/qt4/.mtn2git_empty | 0 packages/qt4/qt4-x11-free-4.1.2/.mtn2git_empty | 0 .../configurable-cpu-extensions.patch | 34 ++++ .../qt4/qt4-x11-free-4.1.2/cross-compile.patch | 159 +++++++++++++++ .../qt4-x11-free-4.1.2/fix-asm-constraints.patch | 16 ++ packages/qt4/qt4-x11-free-4.1.2/fix-mkspecs.patch | 102 ++++++++++ .../fix-resinit-declaration.patch | 16 ++ packages/qt4/qt4-x11-free-4.1.2/gcc4_1.patch | 50 +++++ packages/qt4/qt4-x11-free-4.1.2/no-qmake.patch | 16 ++ packages/qt4/qt4-x11-free-4.1.2/no-tools.patch | 16 ++ packages/qt4/qt4-x11-free-4.3.3/.mtn2git_empty | 0 .../qt4-x11-free-4.3.3/0001-cross-compile.patch | 183 +++++++++++++++++ .../0002-fix-resinit-declaration.patch | 25 +++ .../qt4/qt4-x11-free-4.3.3/0003-no-tools.patch | 25 +++ .../qt4/qt4-x11-free-4.3.3/0004-no-qmake.patch | 25 +++ .../qt4/qt4-x11-free-4.3.3/0005-fix-mkspecs.patch | 123 ++++++++++++ .../0006-freetype-host-includes.patch | 23 +++ .../0007-openssl-host-includes.patch | 23 +++ packages/qt4/qt4-x11-free_4.1.2.bb | 141 +++++++++++++ packages/qt4/qt4-x11-free_4.3.3.bb | 187 +++++++++++++++++ packages/qt4/qt4_arch.inc | 13 ++ packages/qt4/qte-functions.inc | 11 + packages/qt4/qtopia-core/.mtn2git_empty | 0 packages/qt4/qtopia-core/linux-oe-qmake.conf | 95 +++++++++ packages/qt4/qtopia-core_4.2.0.bb | 218 ++++++++++++++++++++ packages/qt4/qtopia-core_4.3.3.bb | 222 +++++++++++++++++++++ 26 files changed, 1723 insertions(+) create mode 100644 packages/qt4/.mtn2git_empty create mode 100644 packages/qt4/qt4-x11-free-4.1.2/.mtn2git_empty create mode 100644 packages/qt4/qt4-x11-free-4.1.2/configurable-cpu-extensions.patch create mode 100644 packages/qt4/qt4-x11-free-4.1.2/cross-compile.patch create mode 100644 packages/qt4/qt4-x11-free-4.1.2/fix-asm-constraints.patch create mode 100644 packages/qt4/qt4-x11-free-4.1.2/fix-mkspecs.patch create mode 100644 packages/qt4/qt4-x11-free-4.1.2/fix-resinit-declaration.patch create mode 100644 packages/qt4/qt4-x11-free-4.1.2/gcc4_1.patch create mode 100644 packages/qt4/qt4-x11-free-4.1.2/no-qmake.patch create mode 100644 packages/qt4/qt4-x11-free-4.1.2/no-tools.patch create mode 100644 packages/qt4/qt4-x11-free-4.3.3/.mtn2git_empty create mode 100644 packages/qt4/qt4-x11-free-4.3.3/0001-cross-compile.patch create mode 100644 packages/qt4/qt4-x11-free-4.3.3/0002-fix-resinit-declaration.patch create mode 100644 packages/qt4/qt4-x11-free-4.3.3/0003-no-tools.patch create mode 100644 packages/qt4/qt4-x11-free-4.3.3/0004-no-qmake.patch create mode 100644 packages/qt4/qt4-x11-free-4.3.3/0005-fix-mkspecs.patch create mode 100644 packages/qt4/qt4-x11-free-4.3.3/0006-freetype-host-includes.patch create mode 100644 packages/qt4/qt4-x11-free-4.3.3/0007-openssl-host-includes.patch create mode 100644 packages/qt4/qt4-x11-free_4.1.2.bb create mode 100644 packages/qt4/qt4-x11-free_4.3.3.bb create mode 100644 packages/qt4/qt4_arch.inc create mode 100644 packages/qt4/qte-functions.inc create mode 100644 packages/qt4/qtopia-core/.mtn2git_empty create mode 100644 packages/qt4/qtopia-core/linux-oe-qmake.conf create mode 100644 packages/qt4/qtopia-core_4.2.0.bb create mode 100644 packages/qt4/qtopia-core_4.3.3.bb (limited to 'packages/qt4') diff --git a/packages/qt4/.mtn2git_empty b/packages/qt4/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qt4/qt4-x11-free-4.1.2/.mtn2git_empty b/packages/qt4/qt4-x11-free-4.1.2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qt4/qt4-x11-free-4.1.2/configurable-cpu-extensions.patch b/packages/qt4/qt4-x11-free-4.1.2/configurable-cpu-extensions.patch new file mode 100644 index 0000000000..ab943db1ff --- /dev/null +++ b/packages/qt4/qt4-x11-free-4.1.2/configurable-cpu-extensions.patch @@ -0,0 +1,34 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qt-x11-opensource-src-4.1.1/configure~configurable-cpu-extensions ++++ qt-x11-opensource-src-4.1.1/configure +@@ -564,6 +564,12 @@ + VAL=$1 + fi + ;; ++ -nosse) ++ CFG_SSE="no" ++ ;; ++ -sse) ++ CFG_SSE="yes" ++ ;; + -iwmmxt) + CFG_IWMMXT="yes" + ;; +@@ -1759,13 +1765,6 @@ + fi + fi + +-# detect sse support +-if $unixtests/sse.test $XQMAKESPEC $OPT_VERBOSE; then +- CFG_HAVE_SSE=no +-else +- CFG_HAVE_SSE=yes +-fi +- + # check iwmmxt support + if [ "$CFG_IWMMXT" = "yes" ]; then + if ! $unixtests/iwmmxt.test $XQMAKESPEC $OPT_VERBOSE; then diff --git a/packages/qt4/qt4-x11-free-4.1.2/cross-compile.patch b/packages/qt4/qt4-x11-free-4.1.2/cross-compile.patch new file mode 100644 index 0000000000..7c8665c9c1 --- /dev/null +++ b/packages/qt4/qt4-x11-free-4.1.2/cross-compile.patch @@ -0,0 +1,159 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qt-x11-opensource-src-4.1.1/configure~cross-compile ++++ qt-x11-opensource-src-4.1.1/configure +@@ -534,7 +534,7 @@ + UNKNOWN_ARG=yes + fi + ;; +- -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk) ++ -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-crossarch) + VAR=`echo $1 | sed "s,^-\(.*\),\1,"` + shift + VAL=$1 +@@ -845,6 +845,9 @@ + xplatform) + XPLATFORM="$VAL" + ;; ++ crossarch) ++ CROSSARCH="$VAL" ++ ;; + debug-and-release) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_DEBUG_RELEASE="$VAL" +@@ -1698,131 +1701,7 @@ + echo "Determining system architecture... ($UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_MACHINE)" + fi + +-if [ "$PLATFORM" != "$XPLATFORM" -a "$CFG_EMBEDDED" != "no" ]; then +- case "$CFG_EMBEDDED" in +- x86) +- ARCH=i386 +- ;; +- x86_64) +- ARCH=x86_64 +- ;; +- ipaq|sharp) +- ARCH=arm +- ;; +- *) +- ARCH="$CFG_EMBEDDED" +- ;; +- esac +-else +- case "$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_MACHINE" in +- IRIX*:*:*) +- ARCH=`uname -p` +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " SGI ($ARCH)" +- fi +- ;; +- SunOS:5*:*) +- case "$UNAME_MACHINE" in +- sun4u) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " Sun SPARC (sparc)" +- fi +- ARCH=sparc +- ;; +- i86pc) +- case "$PLATFORM" in +- *-64) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 64-bit AMD 80x86 (x86_64)" +- fi +- ARCH=x86_64 +- ;; +- *) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 32-bit Intel 80x86 (i386)" +- fi +- ARCH=i386 +- ;; +- esac +- esac +- ;; +- Darwin:*:*) +- case "$UNAME_MACHINE" in +- Power?Macintosh) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 32-bit Apple PowerPC (powerpc)" +- fi +- ;; +- x86) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 32-bit Intel 80x86 (i386)" +- fi +- ;; +- esac +- ARCH=macosx +- ;; +- AIX:*:00????????00) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 64-bit IBM PowerPC (powerpc)" +- fi +- ARCH=powerpc +- ;; +- HP-UX:*:9000*) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " HP PA-RISC (parisc)" +- fi +- ARCH=parisc +- ;; +- *:*:i?86) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 32-bit Intel 80x86 (i386)" +- fi +- ARCH=i386 +- ;; +- *:*:x86_64|*:*:amd64) +- if [ "$PLATFORM" = "linux-g++-32" ]; then +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 32 bit on 64-bit AMD 80x86 (i386)" +- fi +- ARCH=i386 +- else +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 64-bit AMD 80x86 (x86_64)" +- fi +- ARCH=x86_64 +- fi +- ;; +- *:*:ppc) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 32-bit PowerPC (powerpc)" +- fi +- ARCH=powerpc +- ;; +- *:*:s390*) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " IBM S/390 (s390)" +- fi +- ARCH=s390 +- ;; +- *:*:*) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " Trying '$UNAME_MACHINE'..." +- fi +- ARCH="$UNAME_MACHINE" +- ;; +- esac +-fi +- +-if [ -d "$relpath/src/corelib/arch/$ARCH" ]; then +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " '$ARCH' is supported" +- fi +-else +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " '$ARCH' is unsupported, using 'generic'" +- fi +- ARCH=generic +-fi ++ARCH="$CROSSARCH" + + if [ "$OPT_VERBOSE" = "yes" ]; then + echo "System architecture: '$ARCH'" diff --git a/packages/qt4/qt4-x11-free-4.1.2/fix-asm-constraints.patch b/packages/qt4/qt4-x11-free-4.1.2/fix-asm-constraints.patch new file mode 100644 index 0000000000..93fc52d055 --- /dev/null +++ b/packages/qt4/qt4-x11-free-4.1.2/fix-asm-constraints.patch @@ -0,0 +1,16 @@ + +# +# Signed off by Michael 'Mickey' Lauer +# + +--- qt-x11-opensource-src-4.1.2/src/corelib/arch/arm/arch/qatomic.h~fix-asm-constraints ++++ qt-x11-opensource-src-4.1.2/src/corelib/arch/arm/arch/qatomic.h +@@ -32,7 +32,7 @@ + { + register int ret; + asm volatile("swpb %0,%1,[%2]" +- : "=r"(ret) ++ : "&=r"(ret) + : "r"(newval), "r"(ptr) + : "cc", "memory"); + return ret; diff --git a/packages/qt4/qt4-x11-free-4.1.2/fix-mkspecs.patch b/packages/qt4/qt4-x11-free-4.1.2/fix-mkspecs.patch new file mode 100644 index 0000000000..e927df9c7d --- /dev/null +++ b/packages/qt4/qt4-x11-free-4.1.2/fix-mkspecs.patch @@ -0,0 +1,102 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qt-x11-opensource-src-4.1.1/mkspecs/linux-g++/qmake.conf~fix-qmakespec ++++ qt-x11-opensource-src-4.1.1/mkspecs/linux-g++/qmake.conf +@@ -8,7 +8,7 @@ + QT += core gui + QMAKE_INCREMENTAL_STYLE = sublib + +-QMAKE_CC = gcc ++QMAKE_CC = $(OE_QMAKE_CC) + QMAKE_LEX = flex + QMAKE_LEXFLAGS = + QMAKE_YACC = yacc +@@ -16,19 +16,19 @@ + QMAKE_YACCFLAGS_MANGLE = -p $base -b $base + QMAKE_YACC_HEADER = $base.tab.h + QMAKE_YACC_SOURCE = $base.tab.c +-QMAKE_CFLAGS = -pipe ++QMAKE_CFLAGS = -pipe $(OE_QMAKE_CFLAGS) + QMAKE_CFLAGS_DEPS = -M + QMAKE_CFLAGS_WARN_ON = -Wall -W + QMAKE_CFLAGS_WARN_OFF = -w +-QMAKE_CFLAGS_RELEASE = -O2 ++QMAKE_CFLAGS_RELEASE = -O2 + QMAKE_CFLAGS_DEBUG = -g + QMAKE_CFLAGS_SHLIB = -fPIC + QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses + QMAKE_CFLAGS_THREAD = -D_REENTRANT + QMAKE_CFLAGS_HIDESYMS = -fvisibility=hidden + +-QMAKE_CXX = g++ +-QMAKE_CXXFLAGS = $$QMAKE_CFLAGS ++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 +@@ -41,37 +41,37 @@ + + QMAKE_INCDIR = + QMAKE_LIBDIR = +-QMAKE_INCDIR_X11 = /usr/X11R6/include +-QMAKE_LIBDIR_X11 = /usr/X11R6/lib +-QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] +-QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +-QMAKE_INCDIR_OPENGL = /usr/X11R6/include +-QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib ++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_LINK = g++ +-QMAKE_LINK_SHLIB = g++ +-QMAKE_LFLAGS = ++QMAKE_LINK = $(OE_QMAKE_LINK) ++QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK) ++QMAKE_LFLAGS = $(OE_QMAKE_LDFLAGS) + QMAKE_LFLAGS_RELEASE = + QMAKE_LFLAGS_DEBUG = + QMAKE_LFLAGS_SHLIB = -shared + QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB + QMAKE_LFLAGS_SONAME = -Wl,-soname, + QMAKE_LFLAGS_THREAD = +-QMAKE_RPATH = -Wl,-rpath, ++QMAKE_RPATH = -Wl,-rpath-link, + + QMAKE_LIBS = + QMAKE_LIBS_DYNLOAD = -ldl +-QMAKE_LIBS_X11 = -lXext -lX11 -lm +-QMAKE_LIBS_X11SM = -lSM -lICE ++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 = $$[QT_INSTALL_BINS]/moc +-QMAKE_UIC = $$[QT_INSTALL_BINS]/uic ++QMAKE_MOC = $(OE_QMAKE_MOC) ++QMAKE_UIC = $(OE_QMAKE_UIC) + +-QMAKE_AR = ar cqs ++QMAKE_AR = $(OE_QMAKE_AR) cqs + QMAKE_RANLIB = + + QMAKE_TAR = tar -cf +@@ -83,7 +83,7 @@ + QMAKE_MOVE = mv -f + QMAKE_DEL_FILE = rm -f + QMAKE_DEL_DIR = rmdir +-QMAKE_STRIP = strip ++QMAKE_STRIP = $(OE_QMAKE_STRIP) + QMAKE_STRIPFLAGS_LIB += --strip-unneeded + QMAKE_CHK_DIR_EXISTS = test -d + QMAKE_MKDIR = mkdir -p diff --git a/packages/qt4/qt4-x11-free-4.1.2/fix-resinit-declaration.patch b/packages/qt4/qt4-x11-free-4.1.2/fix-resinit-declaration.patch new file mode 100644 index 0000000000..fcd5de6f97 --- /dev/null +++ b/packages/qt4/qt4-x11-free-4.1.2/fix-resinit-declaration.patch @@ -0,0 +1,16 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qt-x11-opensource-src-4.1.1/src/qt3support/network/q3dns.cpp~fix-resinit-declaration ++++ qt-x11-opensource-src-4.1.1/src/qt3support/network/q3dns.cpp +@@ -30,7 +30,7 @@ + # include + # include + # include +-extern "C" int res_init(); ++extern "C" int res_init() throw(); + #endif + + // POSIX Large File Support redefines open -> open64 diff --git a/packages/qt4/qt4-x11-free-4.1.2/gcc4_1.patch b/packages/qt4/qt4-x11-free-4.1.2/gcc4_1.patch new file mode 100644 index 0000000000..392aaf4f5f --- /dev/null +++ b/packages/qt4/qt4-x11-free-4.1.2/gcc4_1.patch @@ -0,0 +1,50 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qt-x11-opensource-src-4.1.1/src/corelib/tools/qchar.h~gcc4_1.patch ++++ qt-x11-opensource-src-4.1.1/src/corelib/tools/qchar.h +@@ -219,7 +219,7 @@ + inline const char toLatin1() const; + inline const ushort unicode() const { return ucs; } + #ifdef Q_NO_PACKED_REFERENCE +- inline ushort &unicode() { return *(&ucs); } ++ inline ushort &unicode() { return *((ushort*)&ucs); } + #else + inline ushort &unicode() { return ucs; } + #endif +--- qt-x11-opensource-src-4.1.1/src/gui/kernel/qapplication_x11.cpp~gcc4_1.patch ++++ qt-x11-opensource-src-4.1.1/src/gui/kernel/qapplication_x11.cpp +@@ -1193,6 +1193,18 @@ + } + } + ++static void getXDefault(const char *group, const char *key, float *val) ++{ ++ char *str = XGetDefault(X11->display, group, key); ++ if (str) { ++ char *end = 0; ++ float v = strtod(str, &end); ++ if (str != end) ++ *val = v; ++ } ++} ++ ++ + static void getXDefault(const char *group, const char *key, bool *val) + { + char *str = XGetDefault(X11->display, group, key); +--- qt-x11-opensource-src-4.1.1/src/corelib/global/qglobal.h~gcc4_1.patch ++++ qt-x11-opensource-src-4.1.1/src/corelib/global/qglobal.h +@@ -720,8 +720,8 @@ + + #if defined(QT_COORD_TYPE) + typedef QT_COORD_TYPE qreal; +-#elif defined(__arm__) +-typedef float qreal; ++//#elif defined(__arm__) ++//typedef float qreal; + #else + typedef double qreal; + #endif diff --git a/packages/qt4/qt4-x11-free-4.1.2/no-qmake.patch b/packages/qt4/qt4-x11-free-4.1.2/no-qmake.patch new file mode 100644 index 0000000000..324f44303a --- /dev/null +++ b/packages/qt4/qt4-x11-free-4.1.2/no-qmake.patch @@ -0,0 +1,16 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qt-x11-opensource-src-4.1.1/configure~no-qmake ++++ qt-x11-opensource-src-4.1.1/configure +@@ -2548,7 +2548,7 @@ + fi + + # build qmake +-if true; then ###[ '!' -f "$outpath/bin/qmake" ]; ++if false; then ###[ '!' -f "$outpath/bin/qmake" ]; + echo "Creating qmake. Please wait..." + + OLD_QCONFIG_H= diff --git a/packages/qt4/qt4-x11-free-4.1.2/no-tools.patch b/packages/qt4/qt4-x11-free-4.1.2/no-tools.patch new file mode 100644 index 0000000000..2bda49c9c5 --- /dev/null +++ b/packages/qt4/qt4-x11-free-4.1.2/no-tools.patch @@ -0,0 +1,16 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qt-x11-opensource-src-4.1.1/src/src.pro~no-tools ++++ qt-x11-opensource-src-4.1.1/src/src.pro +@@ -3,7 +3,7 @@ + + # this order is important + win32:SUBDIRS += winmain +-SUBDIRS += tools/moc tools/rcc tools/uic corelib xml gui sql network svg ++SUBDIRS += corelib xml gui sql network svg + !embedded:contains(QT_CONFIG, opengl): SUBDIRS += opengl + contains(QT_CONFIG, qt3support): SUBDIRS += qt3support + !cross_compile { diff --git a/packages/qt4/qt4-x11-free-4.3.3/.mtn2git_empty b/packages/qt4/qt4-x11-free-4.3.3/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qt4/qt4-x11-free-4.3.3/0001-cross-compile.patch b/packages/qt4/qt4-x11-free-4.3.3/0001-cross-compile.patch new file mode 100644 index 0000000000..6e2b8e755e --- /dev/null +++ b/packages/qt4/qt4-x11-free-4.3.3/0001-cross-compile.patch @@ -0,0 +1,183 @@ +From 64210fec17ab819f21769e3e82bb26e9f2ccfdb4 Mon Sep 17 00:00:00 2001 +From: Michael Krelin +Date: Sun, 3 Jun 2007 18:30:37 +0200 +Subject: [PATCH] cross compile + +--- + configure | 137 ++---------------------------------------------------------- + 1 files changed, 5 insertions(+), 132 deletions(-) + +Index: qt-x11-opensource-src-4.3.2/configure +=================================================================== +--- qt-x11-opensource-src-4.3.2.orig/configure 2007-10-01 15:06:03.000000000 +0200 ++++ qt-x11-opensource-src-4.3.2/configure 2007-10-23 09:32:25.000000000 +0200 +@@ -735,7 +735,7 @@ + UNKNOWN_ARG=yes + fi + ;; +- -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-mysql_config) ++ -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-mysql_config|-crossarch) + VAR=`echo $1 | sed "s,^-\(.*\),\1,"` + shift + VAL="$1" +@@ -1124,6 +1124,9 @@ + xplatform) + XPLATFORM="$VAL" + ;; ++ crossarch) ++ CROSSARCH="$VAL" ++ ;; + debug-and-release) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_DEBUG_RELEASE="$VAL" +@@ -2119,149 +2122,7 @@ + echo "Determining system architecture... ($UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_MACHINE)" + fi + +-if [ "$PLATFORM" != "$XPLATFORM" -a "$CFG_EMBEDDED" != "no" ]; then +- case "$CFG_EMBEDDED" in +- x86) +- ARCH=i386 +- ;; +- x86_64) +- ARCH=x86_64 +- ;; +- ipaq|sharp) +- ARCH=arm +- ;; +- *) +- ARCH="$CFG_EMBEDDED" +- ;; +- esac +-else +- case "$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_MACHINE" in +- IRIX*:*:*) +- ARCH=`uname -p` +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " SGI ($ARCH)" +- fi +- ;; +- SunOS:5*:*) +- case "$UNAME_MACHINE" in +- sun4u*|sun4v*) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " Sun SPARC (sparc)" +- fi +- ARCH=sparc +- ;; +- i86pc) +- case "$PLATFORM" in +- *-64) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 64-bit AMD 80x86 (x86_64)" +- fi +- ARCH=x86_64 +- ;; +- *) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 32-bit Intel 80x86 (i386)" +- fi +- ARCH=i386 +- ;; +- esac +- esac +- ;; +- Darwin:*:*) +- case "$UNAME_MACHINE" in +- Power?Macintosh) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 32-bit Apple PowerPC (powerpc)" +- fi +- ;; +- x86) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 32-bit Intel 80x86 (i386)" +- fi +- ;; +- esac +- ARCH=macosx +- ;; +- AIX:*:00????????00) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 64-bit IBM PowerPC (powerpc)" +- fi +- ARCH=powerpc +- ;; +- HP-UX:*:9000*) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " HP PA-RISC (parisc)" +- fi +- ARCH=parisc +- ;; +- *:*:i?86) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 32-bit Intel 80x86 (i386)" +- fi +- ARCH=i386 +- ;; +- *:*:x86_64|*:*:amd64) +- if [ "$PLATFORM" = "linux-g++-32" -o "$PLATFORM" = "linux-icc-32" ]; then +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 32 bit on 64-bit AMD 80x86 (i386)" +- fi +- ARCH=i386 +- else +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 64-bit AMD 80x86 (x86_64)" +- fi +- ARCH=x86_64 +- fi +- ;; +- *:*:ppc) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 32-bit PowerPC (powerpc)" +- fi +- ARCH=powerpc +- ;; +- *:*:ppc64) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 64-bit PowerPC (powerpc)" +- fi +- ARCH=powerpc +- ;; +- *:*:s390*) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " IBM S/390 (s390)" +- fi +- ARCH=s390 +- ;; +- *:*:arm*) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " ARM (arm)" +- fi +- ARCH=arm +- ;; +- Linux:*:sparc*) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " Linux on SPARC" +- fi +- ARCH=sparc +- ;; +- *:*:*) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " Trying '$UNAME_MACHINE'..." +- fi +- ARCH="$UNAME_MACHINE" +- ;; +- esac +-fi +- +-if [ -d "$relpath/src/corelib/arch/$ARCH" ]; then +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " '$ARCH' is supported" +- fi +-else +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " '$ARCH' is unsupported, using 'generic'" +- fi +- ARCH=generic +-fi ++ARCH="$CROSSARCH" + + if [ "$OPT_VERBOSE" = "yes" ]; then + echo "System architecture: '$ARCH'" diff --git a/packages/qt4/qt4-x11-free-4.3.3/0002-fix-resinit-declaration.patch b/packages/qt4/qt4-x11-free-4.3.3/0002-fix-resinit-declaration.patch new file mode 100644 index 0000000000..e479a64a2b --- /dev/null +++ b/packages/qt4/qt4-x11-free-4.3.3/0002-fix-resinit-declaration.patch @@ -0,0 +1,25 @@ +From acfeb18aa94bad6b2066e91cd15570889baaa252 Mon Sep 17 00:00:00 2001 +From: Michael Krelin +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(-) + +diff --git a/src/qt3support/network/q3dns.cpp b/src/qt3support/network/q3dns.cpp +index 9bc7b16..bfc333e 100644 +--- a/src/qt3support/network/q3dns.cpp ++++ b/src/qt3support/network/q3dns.cpp +@@ -30,7 +30,7 @@ + # include + # include + # include +-extern "C" int res_init(); ++extern "C" int res_init() throw(); + #endif + + // POSIX Large File Support redefines open -> open64 +-- +1.5.0.7 + diff --git a/packages/qt4/qt4-x11-free-4.3.3/0003-no-tools.patch b/packages/qt4/qt4-x11-free-4.3.3/0003-no-tools.patch new file mode 100644 index 0000000000..5412c90377 --- /dev/null +++ b/packages/qt4/qt4-x11-free-4.3.3/0003-no-tools.patch @@ -0,0 +1,25 @@ +From 03cbda241413e4ae727b2a92ff452162aa7ad440 Mon Sep 17 00:00:00 2001 +From: Michael Krelin +Date: Sat, 2 Jun 2007 16:06:01 +0200 +Subject: [PATCH] no tools + +--- + src/src.pro | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/src.pro b/src/src.pro +index 6e08180..957d3dc 100644 +--- a/src/src.pro ++++ b/src/src.pro +@@ -3,7 +3,7 @@ TEMPLATE = subdirs + # this order is important + unset(SRC_SUBDIRS) + win32:SRC_SUBDIRS += src_winmain +-SRC_SUBDIRS += src_tools_moc src_tools_rcc src_tools_uic src_corelib src_xml src_gui src_sql src_network src_svg src_script ++SRC_SUBDIRS += src_corelib src_xml src_gui src_sql src_network src_svg src_script + contains(QT_CONFIG, opengl): SRC_SUBDIRS += src_opengl + contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_qt3support + !cross_compile { +-- +1.5.0.7 + diff --git a/packages/qt4/qt4-x11-free-4.3.3/0004-no-qmake.patch b/packages/qt4/qt4-x11-free-4.3.3/0004-no-qmake.patch new file mode 100644 index 0000000000..359f6df9d5 --- /dev/null +++ b/packages/qt4/qt4-x11-free-4.3.3/0004-no-qmake.patch @@ -0,0 +1,25 @@ +From f5a73ce944240de9013cc23288c115e8213add5e Mon Sep 17 00:00:00 2001 +From: Michael Krelin +Date: Sat, 2 Jun 2007 16:06:59 +0200 +Subject: [PATCH] no qmake + +--- + configure | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/configure b/configure +index b3c2a52..1901e57 100755 +--- a/configure ++++ b/configure +@@ -3271,7 +3271,7 @@ END { + } + + # build qmake +-if true; then ###[ '!' -f "$outpath/bin/qmake" ]; ++if false; then ###[ '!' -f "$outpath/bin/qmake" ]; + echo "Creating qmake. Please wait..." + + OLD_QCONFIG_H= +-- +1.5.0.7 + diff --git a/packages/qt4/qt4-x11-free-4.3.3/0005-fix-mkspecs.patch b/packages/qt4/qt4-x11-free-4.3.3/0005-fix-mkspecs.patch new file mode 100644 index 0000000000..93692699dc --- /dev/null +++ b/packages/qt4/qt4-x11-free-4.3.3/0005-fix-mkspecs.patch @@ -0,0 +1,123 @@ +From aa0377910cfd8d0fce6bdc9355994a4e267b1696 Mon Sep 17 00:00:00 2001 +From: Michael Krelin +Date: Sat, 2 Jun 2007 16:39:58 +0200 +Subject: [PATCH] fix mkspecs + +--- + mkspecs/common/g++.conf | 18 +++++++++--------- + mkspecs/common/linux.conf | 26 +++++++++++++------------- + 2 files changed, 22 insertions(+), 22 deletions(-) + +diff --git a/mkspecs/common/g++.conf b/mkspecs/common/g++.conf +index f5a5c8e..4007c7e 100644 +--- a/mkspecs/common/g++.conf ++++ b/mkspecs/common/g++.conf +@@ -2,12 +2,12 @@ + # qmake configuration for common gcc + # + +-QMAKE_CC = gcc +-QMAKE_CFLAGS += -pipe ++QMAKE_CC = $(OE_QMAKE_CC) ++QMAKE_CFLAGS += -pipe $(OE_QMAKE_CFLAGS) + QMAKE_CFLAGS_DEPS += -M + QMAKE_CFLAGS_WARN_ON += -Wall -W + QMAKE_CFLAGS_WARN_OFF += -w +-QMAKE_CFLAGS_RELEASE += -O2 ++QMAKE_CFLAGS_RELEASE += -O2 + QMAKE_CFLAGS_DEBUG += -g + QMAKE_CFLAGS_SHLIB += -fPIC + QMAKE_CFLAGS_STATIC_LIB += -fPIC +@@ -16,8 +16,8 @@ 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 = g++ +-QMAKE_CXXFLAGS += $$QMAKE_CFLAGS ++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 +@@ -30,9 +30,9 @@ 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 = g++ +-QMAKE_LINK_SHLIB = g++ +-QMAKE_LFLAGS += ++QMAKE_LINK = $(OE_QMAKE_LINK) ++QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK) ++QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS) + QMAKE_LFLAGS_RELEASE += + QMAKE_LFLAGS_DEBUG += + QMAKE_LFLAGS_APP += +@@ -40,7 +40,7 @@ QMAKE_LFLAGS_SHLIB += -shared + QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB + QMAKE_LFLAGS_SONAME += -Wl,-soname, + QMAKE_LFLAGS_THREAD += +-QMAKE_RPATH = -Wl,-rpath, ++QMAKE_RPATH = -Wl,-rpath-link, + + QMAKE_PCH_OUTPUT_EXT = .gch + +diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf +index 3796a87..52acf16 100644 +--- a/mkspecs/common/linux.conf ++++ b/mkspecs/common/linux.conf +@@ -7,26 +7,26 @@ QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD + + QMAKE_INCDIR = + QMAKE_LIBDIR = +-QMAKE_INCDIR_X11 = /usr/X11R6/include +-QMAKE_LIBDIR_X11 = /usr/X11R6/lib +-QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] +-QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +-QMAKE_INCDIR_OPENGL = /usr/X11R6/include +-QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib ++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 = + QMAKE_LIBS_DYNLOAD = -ldl +-QMAKE_LIBS_X11 = -lXext -lX11 -lm +-QMAKE_LIBS_X11SM = -lSM -lICE ++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 = $$[QT_INSTALL_BINS]/moc +-QMAKE_UIC = $$[QT_INSTALL_BINS]/uic ++QMAKE_MOC = $(OE_QMAKE_MOC) ++QMAKE_UIC = $(OE_QMAKE_UIC) + +-QMAKE_AR = ar cqs ++QMAKE_AR = $(OE_QMAKE_AR) cqs + QMAKE_RANLIB = + + QMAKE_TAR = tar -cf +@@ -38,11 +38,11 @@ QMAKE_COPY_DIR = $(COPY) -r + QMAKE_MOVE = mv -f + QMAKE_DEL_FILE = rm -f + QMAKE_DEL_DIR = rmdir +-QMAKE_STRIP = strip ++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) +\ No newline at end of file ++include(unix.conf) +-- +1.5.0.7 + diff --git a/packages/qt4/qt4-x11-free-4.3.3/0006-freetype-host-includes.patch b/packages/qt4/qt4-x11-free-4.3.3/0006-freetype-host-includes.patch new file mode 100644 index 0000000000..cc8e115fee --- /dev/null +++ b/packages/qt4/qt4-x11-free-4.3.3/0006-freetype-host-includes.patch @@ -0,0 +1,23 @@ +From c9ab62bd9a56643574b3ae6e59e0ca776d4860d2 Mon Sep 17 00:00:00 2001 +From: Michael Krelin +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(-) + +diff --git a/config.tests/unix/freetype/freetype.pri b/config.tests/unix/freetype/freetype.pri +index 84974bf..ab9a6f2 100644 +--- a/config.tests/unix/freetype/freetype.pri ++++ b/config.tests/unix/freetype/freetype.pri +@@ -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 + for(p, TRY_INCLUDEPATHS) { + p = $$join(p, "", "", "/freetype2") + exists($$p):INCLUDEPATH *= $$p +-- +1.5.0.7 + diff --git a/packages/qt4/qt4-x11-free-4.3.3/0007-openssl-host-includes.patch b/packages/qt4/qt4-x11-free-4.3.3/0007-openssl-host-includes.patch new file mode 100644 index 0000000000..35b71d9694 --- /dev/null +++ b/packages/qt4/qt4-x11-free-4.3.3/0007-openssl-host-includes.patch @@ -0,0 +1,23 @@ +From d45943adb443ad4b85ca4504952dee743c675e1e Mon Sep 17 00:00:00 2001 +From: Michael Krelin +Date: Mon, 4 Jun 2007 14:58:34 +0200 +Subject: [PATCH] openssl host includes + +--- + config.tests/unix/openssl/openssl.pri | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/config.tests/unix/openssl/openssl.pri b/config.tests/unix/openssl/openssl.pri +index 756e5fe..19b4061 100644 +--- a/config.tests/unix/openssl/openssl.pri ++++ b/config.tests/unix/openssl/openssl.pri +@@ -1,5 +1,5 @@ + !cross_compile { +- TRY_INCLUDEPATHS = /include /usr/include /usr/local/include $$QMAKE_INCDIR $$INCLUDEPATH ++ TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$INCLUDEPATH + for(p, TRY_INCLUDEPATHS) { + pp = $$join(p, "", "", "/openssl") + exists($$pp):INCLUDEPATH *= $$p +-- +1.5.0.7 + diff --git a/packages/qt4/qt4-x11-free_4.1.2.bb b/packages/qt4/qt4-x11-free_4.1.2.bb new file mode 100644 index 0000000000..77fa6dba12 --- /dev/null +++ b/packages/qt4/qt4-x11-free_4.1.2.bb @@ -0,0 +1,141 @@ +SECTION = "x11/libs" +PRIORITY = "optional" +HOMEPAGE = "http://www.trolltech.com" +LICENSE = "GPL QPL" +DEPENDS = "uicmoc4-native qmake2-native freetype jpeg virtual/libx11 xft libxext libxrender libxrandr libxcursor" +PROVIDES = "qt4x11" +PR = "r1" + +SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \ + file://cross-compile.patch;patch=1 \ + file://fix-resinit-declaration.patch;patch=1 \ + file://no-tools.patch;patch=1 \ + file://no-qmake.patch;patch=1 \ + file://gcc4_1.patch;patch=1 \ + file://configurable-cpu-extensions.patch;patch=1 \ + file://fix-mkspecs.patch;patch=1 \ + file://fix-asm-constraints.patch;patch=1" +S = "${WORKDIR}/qt-x11-opensource-src-${PV}" + +PARALLEL_MAKE = "" + +inherit qmake_base qt4x11 pkgconfig + +export QTDIR = "${S}" +STAGING_QT_DIR = "${STAGING_DIR}/${TARGET_SYS}/qt4" +EXTRA_OEMAKE = "-e" + +require qt4_arch.inc + +QT_ARCH := "${@qt_arch(d)}" + +# FIXME: +# * add missing options +QT_CONFIG_FLAGS = "-release -shared -qt-zlib -system-libjpeg -no-nas-sound -no-sm -no-libmng -qt-libpng -no-gif -no-xinerama \ + -no-tablet -no-xkb -no-nis -no-cups -no-opengl \ + -nosse \ + -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql -no-sql-sqlite -no-sql-sqlite2 \ + -verbose -stl -no-accessibility" + +EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake2 -after DEFINES+=QT_NO_XIM INCPATH+=${STAGING_INCDIR} \ + INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \ + QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \ + AR="${TARGET_PREFIX}ar cqs" \ + MOC="${STAGING_BINDIR_NATIVE}/moc4" UIC="${STAGING_BINDIR_NATIVE}/uic4" MAKE="make -e"' + +do_configure() { + echo "DEFINES -= QT_NO_CAST_TO_ASCII" >>src/qbase.pri + echo "DEFINES += QT_NO_XIM" >>src/qbase.pri + unset QMAKESPEC + ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake + ln -sf ./linux-g++ mkspecs/linux-gnueabi-g++ + #export QMAKESPEC="linux-oe-g++" + #rm -rf ./mkspecs + #ln -sf ${QMAKE_MKSPEC_PATH} ./mkspecs + echo yes | ./configure -prefix / -platform ${TARGET_OS}-g++ -crossarch ${QT_ARCH} ${QT_CONFIG_FLAGS} -fast \ + -L${STAGING_LIBDIR} -I${STAGING_INCDIR} -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/mysql +} + +# FIXME: Might want to compile the cross tools for the -dev packages as well... +do_compile() { + 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 + + oe_runmake ${EXTRA_ENV} +} + +PARTS = "3Support Core Designer DesignerComponents Gui Network Sql Svg Test Xml" + +do_stage() { + oe_runmake install INSTALL_ROOT=/ + install -d ${STAGING_QT_DIR} + install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${STAGING_QT_DIR}/bin/rcc + install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${STAGING_QT_DIR}/bin/moc + install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${STAGING_QT_DIR}/bin/uic + +} + +# FIXME: Might want to call oe_runmake install INSTALL_ROOT=${D}/${prefix} as well... +# FIXME: Might want to install everything into ${libdir}/qt4/* to match the usual packing... +do_install() { + install -d ${D}${libdir} + install -d ${D}${bindir} + for part in ${PARTS} + do + oe_libinstall -so -C lib libQt$part ${D}${libdir} + done + oe_libinstall -a -C lib libQtAssistantClient ${STAGING_QT_DIR} + cp -pPR include/* ${D}${incdir} + cp -pPR plugins ${D}${libdir} + cp -pPR bin/* ${D}${bindir} + + install -d ${D}${bindir}/qt4-examples + for binary in `find examples -perm 0755 -type f` + do + install -m 0755 $binary ${D}${bindir}/qt4-examples/ + done + install -d ${D}${bindir}/qt4-demos + for binary in `find demos -perm 0755 -type f` + do + install -m 0755 $binary ${D}${bindir}/qt4-demos/ + done +} + +PACKAGES =+ "libqtcore4 libqtgui4 libqtnetwork4 libqtsql4 libqtsvg4 libqttest4 libqtxml4 \ + libqtdesigner4 libqtdesignercomponents4 libqt3support4 \ + qt4-assistant qt4-common qt4-designer qt4-demos qt4-examples qt4-linguist \ + qt4-plugins-accessible qt4-plugins-codecs qt4-plugins-designer qt4-plugins-imageformats qt4-plugins-sqldrivers" + +ALLOW_EMPTY = "1" +FILES_${PN} = "" +RDEPENDS_${PN} = "${PACKAGES}" + +FILES_libqtcore4 = "${libdir}/libQtCore.so*" +FILES_libqtgui4 = "${libdir}/libQtGui.so*" +FILES_libqtnetwork4 = "${libdir}/libQtNetwork.so*" +FILES_libqtsql4 = "${libdir}/libQtSql.so*" +FILES_libqtsvg4 = "${libdir}/libQtSvg.so*" +FILES_libqttest4 = "${libdir}/libQtTest.so*" +FILES_libqtxml4 = "${libdir}/libQtXml.so*" +FILES_libqtdesigner4 = "${libdir}/libQtDesigner.so*" +FILES_libqtdesignercomponents4 = "${libdir}/libQtDesignerComponents.so*" +FILES_libqt3support4 = "${libdir}/libQt3Support.so*" + +FILES_qt4-plugins-accessible = "${libdir}/plugins/accessible/*.so" +FILES_qt4-plugins-codecs = "${libdir}/plugins/codecs/*.so" +FILES_qt4-plugins-designer = "${libdir}/plugins/designer/*.so" +FILES_qt4-plugins-imageformats = "${libdir}/plugins/imageformats/*.so" +FILES_qt4-plugins-sqldrivers = "${libdir}/plugins/sqldrivers/*.so" + +FILES_qt4-assistant = "${bindir}/*assistant*" +FILES_qt4-designer = "${bindir}/*designer*" +FILES_qt4-linguist = "${bindir}/*linguist* ${bindir}/lrelease ${bindir}/lupdate ${bindir}/qm2ts" + +FILES_qt4-common = "${bindir}/qtconfig" +FILES_qt4-examples = "${bindir}/qt4-examples/*" +FILES_qt4-demos = "${bindir}/qtdemo ${bindir}/qt4-demos/*" + +FILES_${PN}-dev += "${bindir}/rcc ${bindir}/uic* ${bindir}/moc ${bindir}/qmake ${bindir}/syncqt \ + ${bindir}/qt3to4 ${bindir}/findtr" diff --git a/packages/qt4/qt4-x11-free_4.3.3.bb b/packages/qt4/qt4-x11-free_4.3.3.bb new file mode 100644 index 0000000000..2fa53a4d54 --- /dev/null +++ b/packages/qt4/qt4-x11-free_4.3.3.bb @@ -0,0 +1,187 @@ +DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is the X11 version." +SECTION = "x11/libs" +PRIORITY = "optional" +HOMEPAGE = "http://www.trolltech.com" +LICENSE = "GPL QPL" +DEPENDS = "pkgconfig-native uicmoc4-native qmake2-native freetype jpeg virtual/libx11 \ + xft libxext libxrender libxrandr libxcursor dbus openssl" +RDEPENDS_${PN} = "${NONDEV_PACKAGES}" +PROVIDES = "qt4x11" +PR = "r6" + +SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \ + file://0001-cross-compile.patch;patch=1 \ + file://0002-fix-resinit-declaration.patch;patch=1 \ + file://0003-no-tools.patch;patch=1 \ + file://0004-no-qmake.patch;patch=1 \ + file://0005-fix-mkspecs.patch;patch=1 \ + file://0006-freetype-host-includes.patch;patch=1 \ + file://0007-openssl-host-includes.patch;patch=1" +S = "${WORKDIR}/qt-x11-opensource-src-${PV}" + +PARALLEL_MAKE = "" + +inherit qmake_base qt4x11 + +export QTDIR = "${S}" +STAGING_QT_DIR = "${STAGING_DIR}/${TARGET_SYS}/qt4" +EXTRA_OEMAKE = "-e" + +require qt4_arch.inc + +QT_ARCH := "${@qt_arch(d)}" + +# FIXME: +# * add missing options +QT_CONFIG_FLAGS = "-release -shared -qt-zlib -system-libjpeg -no-nas-sound -no-sm -no-libmng -qt-libpng -no-gif -no-xinerama \ + -no-tablet -no-xkb -no-nis -no-cups -no-opengl \ + -no-sse -no-sse2 -no-mmx -no-3dnow \ + -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql -no-sql-sqlite -no-sql-sqlite2 \ + -qdbus \ + -verbose -stl -no-accessibility \ + -pch -no-glib" + +EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake2 -after DEFINES+=QT_NO_XIM INCPATH+=${STAGING_INCDIR} \ + INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \ + QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \ + AR="${TARGET_PREFIX}ar cqs" \ + MOC="${STAGING_BINDIR_NATIVE}/moc4" UIC="${STAGING_BINDIR_NATIVE}/uic4" MAKE="make -e"' + +do_configure() { + echo "DEFINES -= QT_NO_CAST_TO_ASCII" >>src/qbase.pri + echo "DEFINES += QT_NO_XIM" >>src/qbase.pri + unset QMAKESPEC + ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake + ln -s linux-g++ mkspecs/${TARGET_OS}-oe-g++ + #export QMAKESPEC="linux-oe-g++" + #rm -rf ./mkspecs + #ln -sf ${QMAKE_MKSPEC_PATH} ./mkspecs + echo yes | ./configure -prefix / -platform ${TARGET_OS}-oe-g++ -crossarch ${QT_ARCH} ${QT_CONFIG_FLAGS} -fast \ + -L${STAGING_LIBDIR} -I${STAGING_INCDIR} -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/mysql +} + +# FIXME: Might want to compile the cross tools for the -dev packages as well... +do_compile() { + 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 + + oe_runmake ${EXTRA_ENV} +} + +PARTS = "3Support AssistantClient Core DBus Designer DesignerComponents Gui Network Script Sql Svg Test Xml" + +do_stage() { + oe_runmake install INSTALL_ROOT=/ + install -d ${STAGING_QT_DIR} + install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${STAGING_QT_DIR}/bin/rcc + install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${STAGING_QT_DIR}/bin/moc + install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${STAGING_QT_DIR}/bin/uic + sed -i -e 's,^QMAKE_RPATHDIR.*,QMAKE_RPATHDIR=${STAGING_QT_DIR}/lib,g' ${STAGING_QT_DIR}/mkspecs/qconfig.pri + for pcc in AssistantClient DBus Test UiTools ; do + sed -i -e 's,${S}/lib,${STAGING_QT_DIR}/lib,g' ${STAGING_QT_DIR}/lib/pkgconfig/Qt${pcc}.pc + done + install -d ${PKG_CONFIG_DIR}/ + for pc in ${STAGING_QT_DIR}/lib/pkgconfig/*.pc ; do + sed -i -e 's,$(OE_QMAKE_LIBS_X11),-lX11 -lXext,g' $pc + install -m 0644 $pc ${PKG_CONFIG_DIR}/ + done +} + +# FIXME: Might want to call oe_runmake install INSTALL_ROOT=${D}/${prefix} as well... +# FIXME: Might want to install everything into ${libdir}/qt4/* to match the usual packing... +do_install() { + install -d ${D}${libdir} + install -d ${D}${bindir} + install -d ${D}${includedir} + for part in ${PARTS} + do + oe_libinstall -so -C lib libQt$part ${D}${libdir} + done + oe_libinstall -a -C lib libQtUiTools ${D}${libdir} + cp -pPR include/* ${D}${includedir} + cp -pPR plugins ${D}${libdir} + cp -pPR bin/* ${D}${bindir} + + install -d ${D}${bindir}/qt4-examples + for binary in `find examples -perm 0755 -type f` + do + install -m 0755 $binary ${D}${bindir}/qt4-examples/ + done + install -d ${D}${bindir}/qt4-demos + for binary in `find demos -perm 0755 -type f` + do + install -m 0755 $binary ${D}${bindir}/qt4-demos/ + done + rm ${D}${bindir}/rcc ${D}${bindir}/uic ${D}${bindir}/moc +} + +NONDEV_PACKAGES = "libqtcore4 libqtgui4 libqtnetwork4 \ + libqtsql4 libqtsvg4 libqttest4 \ + libqtxml4 \ + libqtdesigner4 libqtdesignercomponents4 \ + libqt3support4 \ + libqtassistantclient4 libqtscript4 \ + libqtdbus4 \ + qt4-assistant qt4-common qt4-designer qt4-demos qt4-examples qt4-linguist \ + qt4-pixeltool qt4-dbus \ + qt4-plugins-accessible qt4-plugins-codecs qt4-plugins-designer qt4-plugins-imageformats qt4-plugins-sqldrivers \ + qt4-plugins-inputmethods qt4-plugins-iconengines" + +PACKAGES += "libqtcore4-dev libqtgui4-dev libqtnetwork4-dev libqtsql4-dev libqtsvg4-dev libqttest4-dev \ + libqtxml4-dev libqtdesigner4-dev libqtdesignercomponents4-dev libqt3support4-dev \ + libqtassistantclient4-dev libqtscript4-dev libqtdbus4-dev \ + ${NONDEV_PACKAGES}" + +ALLOW_EMPTY = "1" +FILES_${PN} = "" + +FILES_libqtcore4 = "${libdir}/libQtCore.so.*" +FILES_libqtcore4-dev = "${libdir}/libQtCore.so" +FILES_libqtgui4 = "${libdir}/libQtGui.so.*" +FILES_libqtgui4-dev = "${libdir}/libQtGui.so" +FILES_libqtnetwork4 = "${libdir}/libQtNetwork.so.*" +FILES_libqtnetwork4-dev = "${libdir}/libQtNetwork.so" +FILES_libqtsql4 = "${libdir}/libQtSql.so.*" +FILES_libqtsql4-dev = "${libdir}/libQtSql.so" +FILES_libqtsvg4 = "${libdir}/libQtSvg.so.*" +FILES_libqtsvg4-dev = "${libdir}/libQtSvg.so" +FILES_libqttest4 = "${libdir}/libQtTest.so.*" +FILES_libqttest4-dev = "${libdir}/libQtTest.so" +FILES_libqtxml4 = "${libdir}/libQtXml.so.*" +FILES_libqtxml4-dev = "${libdir}/libQtXml.so" +FILES_libqtdesigner4 = "${libdir}/libQtDesigner.so.*" +FILES_libqtdesigner4-dev = "${libdir}/libQtDesigner.so" +FILES_libqtdesignercomponents4 = "${libdir}/libQtDesignerComponents.so.*" +FILES_libqtdesignercomponents4-dev = "${libdir}/libQtDesignerComponents.so" +FILES_libqt3support4 = "${libdir}/libQt3Support.so.*" +FILES_libqt3support4-dev = "${libdir}/libQt3Support.so" +FILES_libqtassistantclient4 = "${libdir}/libQtAssistantClient.so.*" +FILES_libqtassistantclient4-dev = "${libdir}/libQtAssistantClient.so" +FILES_libqtscript4 = "${libdir}/libQtScript.so.*" +FILES_libqtscript4-dev = "${libdir}/libQtScript.so" +FILES_libqtdbus4 = "${libdir}/libQtDBus.so.*" +FILES_libqtdbus4-dev = "${libdir}/libQtDBus.so" + +FILES_qt4-plugins-accessible = "${libdir}/plugins/accessible/*.so" +FILES_qt4-plugins-codecs = "${libdir}/plugins/codecs/*.so" +FILES_qt4-plugins-designer = "${libdir}/plugins/designer/*.so" +FILES_qt4-plugins-imageformats = "${libdir}/plugins/imageformats/*.so" +FILES_qt4-plugins-sqldrivers = "${libdir}/plugins/sqldrivers/*.so" +FILES_qt4-plugins-inputmethods = "${libdir}/plugins/inputmethods/*.so" +FILES_qt4-plugins-iconengines = "${libdir}/plugins/iconengines/*.so" + +FILES_qt4-assistant = "${bindir}/*assistant*" +FILES_qt4-designer = "${bindir}/*designer*" +FILES_qt4-linguist = "${bindir}/*linguist* ${bindir}/lrelease ${bindir}/lupdate ${bindir}/qm2ts" +FILES_qt4-pixeltool = "${bindir}/pixeltool" +FILES_qt4-dbus = "${bindir}/qdbus ${bindir}/qdbusxml2cpp ${bindir}/qdbuscpp2xml ${bindir}/qdbusviewer" + +FILES_qt4-common = "${bindir}/qtconfig" +FILES_qt4-examples = "${bindir}/qt4-examples/*" +FILES_qt4-demos = "${bindir}/qtdemo ${bindir}/qt4-demos/*" + +FILES_${PN}-dev += "${bindir}/rcc ${bindir}/uic* ${bindir}/moc ${bindir}/qmake ${bindir}/syncqt \ + ${bindir}/qt3to4 ${bindir}/findtr" +FILES_${PN}-dbg += "${bindir}/*/.debug ${plugindir}/.debug" diff --git a/packages/qt4/qt4_arch.inc b/packages/qt4/qt4_arch.inc new file mode 100644 index 0000000000..6dcbd2bc4a --- /dev/null +++ b/packages/qt4/qt4_arch.inc @@ -0,0 +1,13 @@ +def qt_arch(d): + import bb, re + arch = bb.data.getVar('TARGET_ARCH', d, 1) + if re.match("^i.86$", arch): + arch = "i386" + elif re.match("^arm.*", arch): + arch = "arm" + elif arch == "x86_64": + arch = "x86" + elif arch == "mipsel": + arch = "mips" + return arch + diff --git a/packages/qt4/qte-functions.inc b/packages/qt4/qte-functions.inc new file mode 100644 index 0000000000..f0ffb0e612 --- /dev/null +++ b/packages/qt4/qte-functions.inc @@ -0,0 +1,11 @@ +def qte_arch(d): + import bb, re + arch = bb.data.getVar('TARGET_ARCH', d, 1) + if re.match("^i.86$", arch): + arch = "x86" + elif arch == "x86_64": + arch = "x86" + elif arch == "mipsel": + arch = "mips" + return arch + diff --git a/packages/qt4/qtopia-core/.mtn2git_empty b/packages/qt4/qtopia-core/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qt4/qtopia-core/linux-oe-qmake.conf b/packages/qt4/qtopia-core/linux-oe-qmake.conf new file mode 100644 index 0000000000..fc5ac6dc5c --- /dev/null +++ b/packages/qt4/qtopia-core/linux-oe-qmake.conf @@ -0,0 +1,95 @@ +# +# qmake configuration for linux-oe-g++ / OpenEmbedded Build System / http://openembedded.org +# + +MAKEFILE_GENERATOR = UNIX +TEMPLATE = app +CONFIG += qt warn_on release link_prl +QT += core gui network +QMAKE_INCREMENTAL_STYLE = sublib + +QMAKE_CC = $(OE_QMAKE_CC) +QMAKE_LEX = flex +QMAKE_LEXFLAGS = +QMAKE_YACC = yacc +QMAKE_YACCFLAGS = -d +QMAKE_YACCFLAGS_MANGLE = -p $base -b $base +QMAKE_YACC_HEADER = $base.tab.h +QMAKE_YACC_SOURCE = $base.tab.c +QMAKE_CFLAGS = -pipe $(OE_QMAKE_CFLAGS) $(CFLAGS_EXTRA) +QMAKE_CFLAGS_DEPS = -M +QMAKE_CFLAGS_WARN_ON = -Wall -W +QMAKE_CFLAGS_WARN_OFF = +QMAKE_CFLAGS_RELEASE = $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) +QMAKE_CFLAGS_DEBUG = -g +QMAKE_CFLAGS_SHLIB = -fPIC +QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses +QMAKE_CFLAGS_THREAD = -D_REENTRANT +QMAKE_CFLAGS_HIDESYMS = -fvisibility=hidden + +QMAKE_CXX = $(OE_QMAKE_CXX) +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS) $(CXXFLAGS_EXTRA) +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_DEBUG = $$QMAKE_CFLAGS_DEBUG +QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB +QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC +QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD +QMAKE_CXXFLAGS_HIDESYMS = $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden + +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_QTOPIA = $(OE_QMAKE_INCDIR_QTOPIA) +QMAKE_LIBDIR_QTOPIA = $(OE_QMAKE_LIBDIR_QTOPIA) + + +QMAKE_LINK = $(OE_QMAKE_LINK) +QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK) +QMAKE_LFLAGS = $(OE_QMAKE_LDFLAGS) $(LFLAGS_EXTRA) +QMAKE_LFLAGS_RELEASE = +QMAKE_LFLAGS_DEBUG = +QMAKE_LFLAGS_SHLIB = -shared +QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB +QMAKE_LFLAGS_SONAME = -Wl,-soname, +QMAKE_LFLAGS_THREAD = +QMAKE_RPATH = -Wl,-rpath-link, + +QMAKE_LIBS = $(LIBS_EXTRA) +QMAKE_LIBS_DYNLOAD = -ldl +QMAKE_LIBS_X11 = +QMAKE_LIBS_X11SM = +QMAKE_LIBS_QT = -lqte +QMAKE_LIBS_QT_THREAD = -lqte-mt +QMAKE_LIBS_QT_OPENGL = -lqgl +QMAKE_LIBS_THREAD = -lpthread +QMAKE_LIBS_QTOPIA = -lqpe -lqtopia +QMAKE_LIBS_THREAD = -lpthread + +QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_UIC = $$[QT_INSTALL_BINS]/uic + +QMAKE_AR = $(OE_QMAKE_AR) cqs +QMAKE_RANLIB = $(OE_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 +load(qt_config) diff --git a/packages/qt4/qtopia-core_4.2.0.bb b/packages/qt4/qtopia-core_4.2.0.bb new file mode 100644 index 0000000000..509230f3ea --- /dev/null +++ b/packages/qt4/qtopia-core_4.2.0.bb @@ -0,0 +1,218 @@ +DESCRIPTION = "Qtopia Core (aka: Qt/Embedded)" +SECTION = "libs" +LICENSE = "GPL" +PRIORITY = "optional" +HOMEPAGE = "http://www.trolltech.com" +DEPENDS = "glib-2.0 freetype dbus-glib tslib" + +PR = "r2" + +SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.tar.gz \ + file://linux-oe-qmake.conf" + +S = "${WORKDIR}/qtopia-core-opensource-src-${PV}" + +inherit pkgconfig + +# I'm not sure about the globals QTDIR and QTOPIADIR, or if they're even +# needed. On the same issue, I'm not sure what the best place for all the +# Qtopia Core related files is. For now, I've just put the libraries in +# ${libdir}, the includes in ${includedir} etc. Other possibilities are +# to sandbox everything (e.g., in /usr/local/Trolltech or /opt/Qtopia oslt), +# or to put libraries in /usr/lib/qtopia (or /usr/lib/qt4) etc. As said, +# I'm fine with this, but I'm also fine with another solution. + +# set QTDIR and QTOPIADIR globally (change QTOPIA dir to QTDIR?) +# This should be the default for other packages: +# export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt4" +# export QTOPIADIR = "${STAGING_DIR}/${HOST_SYS}/qtopia" +export QTDIR = "${S}" +export QTOPIADIR = "${S}" + +# Qmake gets confused by environment variables, as it builds both HOST +# and TARGET objects. The correct compiler settings come from the mkspec +# and are set with the OE_QMAKE_ variables +PARALLEL_MAKE = "" +EXTRA_OEMAKE = " MAKEFLAGS= " + +# This stuff could also be done by inheriting qmake, but I didn't want to +# bother with the qmake separation from the Qtopia configure. This separation +# is probably nothing more than a patch on the configure and setting some +# environment variables to use our own qmake/moc/uic, but that's something +# to figure out later. +export OE_QMAKE_CC="${CC}" +export OE_QMAKE_CFLAGS="${CFLAGS}" +export OE_QMAKE_CXX="${CXX}" +export OE_QMAKE_CXXFLAGS="-fno-exceptions ${CXXFLAGS}" +export OE_QMAKE_LDFLAGS="${LDFLAGS}" +export OE_QMAKE_LINK="${CXX}" +export OE_QMAKE_AR="${AR}" +export OE_QMAKE_RANLIB="${RANLIB}" +export OE_QMAKE_STRIP="echo" +export OE_QMAKE_RPATH="-Wl,-rpath-link," +export OE_QMAKE_INCDIR_QT="${QTDIR}/include" +export OE_QMAKE_LIBDIR_QT="${QTDIR}/lib" +export OE_QMAKE_INCDIR_QTOPIA="${QTOPIADIR}/include" +export OE_QMAKE_LIBDIR_QTOPIA="${QTOPIADIR}/lib" + +require qte-functions.inc +QT_ARCH := "${@qte_arch(d)}" + +# FIXME use info.bbclass once it has been commited +QT_ENDIAN = "-little-endian" + +# We don't build the examples and demos atm. They're quite big and not used +# frequently, only for testing maybe. Feel free to change and to package +# them separately. +QT_CONFIG_FLAGS = "-release \ + -no-cups -no-accessibility \ + -nomake demos -nomake examples -nomake tools \ + -qt-mouse-tslib" + +do_configure() { + # Install the OE build templates (something which might be done + # by inheriting qmake) + for template in linux-oe-g++ linux-uclibc-oe-g++ linux-gnueabi-oe-g++ + do + install -d ${S}/mkspecs/$template + install -m 0644 ${WORKDIR}/linux-oe-qmake.conf \ + ${S}/mkspecs/$template/qmake.conf + ln -sf ../linux-g++/qplatformdefs.h \ + ${S}/mkspecs/$template/qplatformdefs.h + done + + # The Qmake Makefile generation doesn't like these environment + # variables, as they mess up the HOST tools builds + unset CC + unset CXX + unset CFLAGS + unset CXXFLAGS + unset LDFLAGS + + # For rationale behind the installation locations, see remark above + echo yes | ./configure -v \ + -prefix ${prefix} \ + -bindir ${bindir} \ + -libdir ${libdir} \ + -docdir ${docdir}/qtopia \ + -headerdir ${includedir} \ + -plugindir ${datadir}/qtopia/plugins \ + -datadir ${datadir} \ + -translationdir ${datadir}/qtopia/translations \ + -sysconfdir ${sysconfdir} \ + -examplesdir ${bindir}/qtopia/examples \ + -demosdir ${bindir}/qtopia/demos \ + -embedded ${QT_ARCH} ${QT_ENDIAN} -fast \ + -xplatform linux-oe-g++ \ + ${QT_CONFIG_FLAGS} \ + -L${STAGING_LIBDIR} -I${STAGING_INCDIR} +} + +do_install() { + oe_runmake install INSTALL_ROOT=${D} + + # These are host binaries, we should only use them in staging + rm -rf ${D}/${bindir} + rm -rf ${D}/${datadir}/mkspecs + + touch ${D}/${libdir}/fonts/fontdir + + #TT is still new to pkgconfig, so fix it up + install -d ${D}${libdir}/pkgconfig + mv ${D}/${libdir}/*.pc ${D}${libdir}/pkgconfig/ +} + +# We might want to package all the libraries separately, so you can really +# fine-tune what to install. This is e.g. done in qt4-x11-free_4.1.2.bb. +# What should these packages be called? I'm tempted to call them the same +# as in qt4 version, as the API is supposed to be compatible, e.g. +# libqtcore4 and libqtgui4. This will however conflict if you have QT and +# Qtopia, but this is something you don't want anyway, I guess. +# Another solution is making virtual/libqtfoo4, and DEPENDing on that one +# and let both the PACKAGES in QT and Qtopia PROVIDE these. The packages +# themselves could then be called libqtopiafoo4. +# I'll postpone this discussion by not making separate Qtopia packages. + +# Also, I don't package the plugins and translations atm, I don't use them +# and I don't feel like thinking about a sensible separation. + +PACKAGES =+ " libqtcore libqtcore-dev libqtcore-dbg \ + libqtxml libqtxml-dev libqtxml-dbg \ + libqtgui libqtgui-dev libqtgui-dbg \ + libqtsql libqtsql-dev libqtsql-dbg \ + libqtnetwork libqtnetwork-dev libqtnetwork-dbg \ + libqtsvg libqtsvg-dev libqtsvg-dbg \ + libqt3support libqt3support-dev libqt3support-dbg \ + qtopia-core-plugins qtopia-core-plugins-dbg\ + " + +PACKAGES += " ${PN}-fonts " + +# The default included fonts are around 75MB and consist of a number of +# FreeType-renderable fonts as well as QPF (Qtopia Prerendered Fonts). +# As FreeType is generally slow on embedded platforms, and 75MB is +# quite huge, we downsize the fonts dir in the do_install. I've decided +# to include only the QPF (Helvetica and Fixed), amounting to 500KB. This +# also results in tremendously faster application startup time. +FILES_libqtcore += " ${libdir}/fonts/helvetic* ${libdir}/fonts/fixed* ${D}/${libdir}/fonts/fontdir" +FILES_${PN}-fonts = "${libdir}/fonts" + +FILES_qtopia-core-plugins += "${datadir}/qtopia/plugins/*/*.so" +FILES_qtopia-core-plugins-dbg += "${datadir}/qtopia/plugins/*/.debug/*.so" + +FILES_libqtcore += "${libdir}/libQtCore.so.*" +FILES_libqtxml += "${libdir}/libQtXml.so.*" +FILES_libqtgui += "${libdir}/libQtGui.so.*" +FILES_libqtsql += "${libdir}/libQtSql.so.*" +FILES_libqtnetwork += "${libdir}/libQtNetwork.so.*" +FILES_libqtsvg += "${libdir}/libQtSvg.so.*" +FILES_libqt3support += "${libdir}/libQt3Support.so.*" + +FILES_libqtcore-dev += "${libdir}/*QtCore.*" +FILES_libqtxml-dev += "${libdir}/*QtXml.*" +FILES_libqtgui-dev += "${libdir}/*QtGui.*" +FILES_libqtsql-dev += "${libdir}/*QtSql.*" +FILES_libqtnetwork-dev += "${libdir}/*QtNetwork.*" +FILES_libqtsvg-dev += "${libdir}/*QtSvg.*" +FILES_libqt3support-dev += "${libdir}/*Qt3Support.*" + +FILES_libqtcore-dbg += "${libdir}/.debug/libQtCore*" +FILES_libqtxml-dbg += "${libdir}/.debug/libQtXml*" +FILES_libqtgui-dbg += "${libdir}/.debug/libQtGui*" +FILES_libqtsql-dbg += "${libdir}/.debug/libQtSql*" +FILES_libqtnetwork-dbg += "${libdir}/.debug/libQtNetwork*" +FILES_libqtsvg-dbg += "${libdir}/.debug/libQtSvg*" +FILES_libqt3support-dbg += "${libdir}/.debug/libQt3Support*" + + +python populate_packages_prepend() { + translationdir = bb.data.expand('${datadir}/qtopia/translations/', d) + do_split_packages(d, translationdir, '^qt_(.*)\.qm$', 'qtopia-translation-%s', 'Qtopia translation for %s', extra_depends='' ) +} + + + +STAGE_TEMP = "${WORKDIR}/temp-staging" +do_stage() { + rm -rf ${STAGE_TEMP} + mkdir -p ${STAGE_TEMP} + oe_runmake install INSTALL_ROOT=${STAGE_TEMP} + + cp -pPRf ${STAGE_TEMP}/$includedir/* ${STAGING_INCDIR} + + for i in ${STAGE_TEMP}/${libdir}/*.la + do + oe_libinstall -C ${STAGE_TEMP}/${libdir} \ + -so $(basename $i .la) ${STAGING_LIBDIR} + done + + # Install qmake/moc/uic/rcc in staging (is this needed?) + install -m 0755 ${STAGE_TEMP}/${bindir}/rcc ${STAGING_BINDIR} + install -m 0755 ${STAGE_TEMP}/${bindir}/moc ${STAGING_BINDIR} + install -m 0755 ${STAGE_TEMP}/${bindir}/uic ${STAGING_BINDIR} + install -m 0755 ${STAGE_TEMP}/${bindir}/qmake ${STAGING_BINDIR} + # what about mkspecs? + + rm -rf ${STAGE_TEMP} +} + diff --git a/packages/qt4/qtopia-core_4.3.3.bb b/packages/qt4/qtopia-core_4.3.3.bb new file mode 100644 index 0000000000..2995988b42 --- /dev/null +++ b/packages/qt4/qtopia-core_4.3.3.bb @@ -0,0 +1,222 @@ +SUMMARY = "QtopiaCore" +SECTION = "libs" +LICENSE = "GPL" +PRIORITY = "optional" +HOMEPAGE = "http://www.trolltech.com" +DEPENDS = "freetype tslib" + +PR = "r0" + +SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.tar.gz \ + file://linux-oe-qmake.conf" + +S = "${WORKDIR}/qtopia-core-opensource-src-${PV}" + +inherit pkgconfig + +# Qmake gets confused by environment variables, as it builds both HOST +# and TARGET objects. The correct compiler settings come from the mkspec +# and are set with the OE_QMAKE_ variables +PARALLEL_MAKE = "" +EXTRA_OEMAKE = " MAKEFLAGS= " + +# This stuff could also be done by inheriting qmake, but I didn't want to +# bother with the qmake separation from the Qtopia configure. This separation +# is probably nothing more than a patch on the configure and setting some +# environment variables to use our own qmake/moc/uic, but that's something +# to figure out later. +export OE_QMAKE_CC="${CC}" +export OE_QMAKE_CFLAGS="${CFLAGS}" +export OE_QMAKE_CXX="${CXX}" +export OE_QMAKE_CXXFLAGS="-fno-exceptions ${CXXFLAGS}" +export OE_QMAKE_LDFLAGS="${LDFLAGS}" +export OE_QMAKE_LINK="${CXX}" +export OE_QMAKE_AR="${AR}" +export OE_QMAKE_RANLIB="${RANLIB}" +export OE_QMAKE_STRIP="echo" +export OE_QMAKE_RPATH="-Wl,-rpath-link," +export OE_QMAKE_INCDIR_QT="${QTDIR}/include" +export OE_QMAKE_LIBDIR_QT="${QTDIR}/lib" +export OE_QMAKE_INCDIR_QTOPIA="${QTOPIADIR}/include" +export OE_QMAKE_LIBDIR_QTOPIA="${QTOPIADIR}/lib" + +require qte-functions.inc +QT_ARCH := "${@qte_arch(d)}" + +# FIXME use info.bbclass once it has been commited +QT_ENDIAN = "-little-endian" + +# We don't build the examples and demos atm. They're quite big and not used +# frequently, only for testing maybe. Feel free to change and to package +# them separately. +QT_CONFIG_FLAGS = "-release \ + -no-cups -no-accessibility \ + -nomake demos -nomake examples -nomake tools -reduce-relocations \ + -qt-mouse-tslib -qt-gfx-transformed -embedded ${QT_ARCH}" + +do_configure() { + # Hack to honor our compiler flags + sed -i s/-O2//g ${S}/mkspecs/*/qmake.conf + sed -i s/-O2//g ${S}/mkspecs/*/*/qmake.conf + + + # Install the OE build templates (something which might be done + # by inheriting qmake) + for template in linux-oe-g++ linux-uclibc-oe-g++ linux-gnueabi-oe-g++ + do + install -d ${S}/mkspecs/$template + install -m 0644 ${WORKDIR}/linux-oe-qmake.conf ${S}/mkspecs/$template/qmake.conf + ln -sf ../linux-g++/qplatformdefs.h ${S}/mkspecs/$template/qplatformdefs.h + done + + # The Qmake Makefile generation doesn't like these environment + # variables, as they mess up the HOST tools builds + unset CC + unset CXX + unset CFLAGS + unset CXXFLAGS + unset LDFLAGS + + # For rationale behind the installation locations, see remark above + echo yes | ./configure -v \ + -prefix ${prefix} \ + -bindir ${bindir} \ + -libdir ${libdir} \ + -docdir ${docdir}/qtopia \ + -headerdir ${includedir} \ + -plugindir ${datadir}/qtopia/plugins \ + -datadir ${datadir} \ + -translationdir ${datadir}/qtopia/translations \ + -sysconfdir ${sysconfdir} \ + -examplesdir ${bindir}/qtopia/examples \ + -demosdir ${bindir}/qtopia/demos \ + -embedded ${QT_ARCH} ${QT_ENDIAN} -fast \ + -xplatform linux-oe-g++ \ + ${QT_CONFIG_FLAGS} \ + -L${STAGING_LIBDIR} -I${STAGING_INCDIR} +} + +# +# Fixup some pkgconfig files +# moc_location=/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/work/arm-oabi-angstrom-linux/qtopia-core-4.3.0-r2/qtopia-core-opensource-src-4.3.0/bin/moc +# uic_location=/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/work/arm-oabi-angstrom-linux/qtopia-core-4.3.0-r2/qtopia-core-opensource-src-4.3.0/bin/uic +# +# Libs: -L${libdir} -lQtNetwork -L/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/staging/arm-angstrom-linux/lib -L/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/work/arm-oabi-angstrom-linux/qtopia-core-4.3.0-r2/qtopia-core-opensource-src-4.3.0/lib $(LIBS_EXTRA) -lQtCore -L/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/staging/arm-angstrom-linux/lib -L/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/work/arm-oabi-angstrom-linux/qtopia-core-4.3.0-r2/qtopia-core-opensource-src-4.3.0/lib -lm -lrt -lpthread -ldl +# +do_compile_append() { + cd ${S}/lib/pkgconfig + sed -i s#"-L${S}/lib"##g *.pc + sed -i s#"moc_location=${S}/bin/moc"#moc_location=${STAGING_BINDIR}/moc4# *.pc + sed -i s#"uic_location=${S}/bin/uic"#uic_location=${STAGING_BINDIR}/uic4# *.pc +} + +do_stage_append() { + echo "Fixing up Qt" + cd ${STAGING_LIBDIR}/pkgconfig + sed -i s#"-L${S}/lib"##g Qt*.pc + sed -i s#"moc_location=${S}/bin/moc"#moc_location=${STAGING_BINDIR}/moc4# Qt*.pc + sed -i s#"uic_location=${S}/bin/uic"#uic_location=${STAGING_BINDIR}/uic4# Qt*.pc +} + +do_install() { + oe_runmake install INSTALL_ROOT=${D} + + # These are host binaries, we should only use them in staging + rm -rf ${D}/${bindir} + rm -rf ${D}/${datadir}/mkspecs + + touch ${D}/${libdir}/fonts/fontdir +} + +# We might want to package all the libraries separately, so you can really +# fine-tune what to install. This is e.g. done in qt4-x11-free_4.1.2.bb. +# What should these packages be called? I'm tempted to call them the same +# as in qt4 version, as the API is supposed to be compatible, e.g. +# libqtcore4 and libqtgui4. This will however conflict if you have QT and +# Qtopia, but this is something you don't want anyway, I guess. +# Another solution is making virtual/libqtfoo4, and DEPENDing on that one +# and let both the PACKAGES in QT and Qtopia PROVIDE these. The packages +# themselves could then be called libqtopiafoo4. +# I'll postpone this discussion by not making separate Qtopia packages. + +# Also, I don't package the plugins and translations atm, I don't use them +# and I don't feel like thinking about a sensible separation. + +PACKAGES =+ " libqtcore libqtcore-dev libqtcore-dbg \ + libqtxml libqtxml-dev libqtxml-dbg \ + libqtgui libqtgui-dev libqtgui-dbg \ + libqtsql libqtsql-dev libqtsql-dbg \ + libqtnetwork libqtnetwork-dev libqtnetwork-dbg \ + libqtsvg libqtsvg-dev libqtsvg-dbg \ + libqt3support libqt3support-dev libqt3support-dbg \ + qtopia-core-plugins qtopia-core-plugins-dbg \ + libqtscript libqtscript-dev libqtscript-dbg \ + " + +PACKAGES += " ${PN}-fonts " + +# The default included fonts are around 75MB and consist of a number of +# FreeType-renderable fonts as well as QPF (Qtopia Prerendered Fonts). +# As FreeType is generally slow on embedded platforms, and 75MB is +# quite huge, we downsize the fonts dir in the do_install. I've decided +# to include only the QPF (Helvetica and Fixed), amounting to 500KB. This +# also results in tremendously faster application startup time. +FILES_libqtcore += " ${libdir}/fonts/helvetic* ${libdir}/fonts/fixed* ${D}/${libdir}/fonts/fontdir" +FILES_${PN}-fonts = "${libdir}/fonts" + +FILES_qtopia-core-plugins += "${datadir}/qtopia/plugins/*/*.so" +FILES_qtopia-core-plugins-dbg += "${datadir}/qtopia/plugins/*/.debug/*.so" + +FILES_libqtcore += "${libdir}/libQtCore.so.*" +FILES_libqtxml += "${libdir}/libQtXml.so.*" +FILES_libqtgui += "${libdir}/libQtGui.so.*" +FILES_libqtsql += "${libdir}/libQtSql.so.*" +FILES_libqtnetwork += "${libdir}/libQtNetwork.so.*" +FILES_libqtsvg += "${libdir}/libQtSvg.so.*" +FILES_libqt3support += "${libdir}/libQt3Support.so.*" +FILES_libqtscript += "${libdir}/libQtScript.so.*" + +FILES_libqtcore-dev += "${libdir}/*QtCore.*" +FILES_libqtxml-dev += "${libdir}/*QtXml.*" +FILES_libqtgui-dev += "${libdir}/*QtGui.*" +FILES_libqtsql-dev += "${libdir}/*QtSql.*" +FILES_libqtnetwork-dev += "${libdir}/*QtNetwork.*" +FILES_libqtsvg-dev += "${libdir}/*QtSvg.*" +FILES_libqt3support-dev += "${libdir}/*Qt3Support.*" +FILES_libqtscript-dev += "${libdir}/*QtScript.*" + +FILES_libqtcore-dbg += "${libdir}/.debug/libQtCore*" +FILES_libqtxml-dbg += "${libdir}/.debug/libQtXml*" +FILES_libqtgui-dbg += "${libdir}/.debug/libQtGui*" +FILES_libqtsql-dbg += "${libdir}/.debug/libQtSql*" +FILES_libqtnetwork-dbg += "${libdir}/.debug/libQtNetwork*" +FILES_libqtsvg-dbg += "${libdir}/.debug/libQtSvg*" +FILES_libqt3support-dbg += "${libdir}/.debug/libQt3Support*" +FILES_libqtscript-dbg += "${libdir}/.debug/libQtScript*" + + +python populate_packages_prepend() { + translationdir = bb.data.expand('${datadir}/qtopia/translations/', d) + do_split_packages(d, translationdir, '^qt_(.*)\.qm$', 'qtopia-translation-%s', 'Qtopia translation for %s', extra_depends='' ) +} + + + +STAGE_TEMP = "${WORKDIR}/temp-staging" +do_stage() { + rm -rf ${STAGE_TEMP} + mkdir -p ${STAGE_TEMP} + oe_runmake install INSTALL_ROOT=${STAGE_TEMP} + + install -d ${STAGING_INCDIR}/qtopiacore4 + install -d ${STAGING_LIBDIR}/qtopiacore4 + cp -pPRf ${STAGE_TEMP}/$includedir/* ${STAGING_INCDIR}/qtopiacore4/ + + for i in ${STAGE_TEMP}/${libdir}/*.la + do + oe_libinstall -C ${STAGE_TEMP}/${libdir} -so $(basename $i .la) ${STAGING_LIBDIR}/qtopiacore4 + done + + rm -rf ${STAGE_TEMP} +} + -- cgit v1.2.3 From ced0b53cbc44fa1ab91666955b9cf17cfe2dcae7 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sun, 23 Dec 2007 23:41:53 +0000 Subject: packages/qt4/qt4_arch.inc: No tabs, 4 spaces are wonderful --- packages/qt4/qt4_arch.inc | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'packages/qt4') diff --git a/packages/qt4/qt4_arch.inc b/packages/qt4/qt4_arch.inc index 6dcbd2bc4a..63babd9a0a 100644 --- a/packages/qt4/qt4_arch.inc +++ b/packages/qt4/qt4_arch.inc @@ -1,13 +1,13 @@ def qt_arch(d): - import bb, re - arch = bb.data.getVar('TARGET_ARCH', d, 1) - if re.match("^i.86$", arch): - arch = "i386" - elif re.match("^arm.*", arch): - arch = "arm" - elif arch == "x86_64": - arch = "x86" - elif arch == "mipsel": - arch = "mips" - return arch + import bb, re + arch = bb.data.getVar('TARGET_ARCH', d, 1) + if re.match("^i.86$", arch): + arch = "i386" + elif re.match("^arm.*", arch): + arch = "arm" + elif arch == "x86_64": + arch = "x86" + elif arch == "mipsel": + arch = "mips" + return arch -- cgit v1.2.3 From 39dbfbe23ad2f6dc14244d27c08fd4979918bea4 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sun, 23 Dec 2007 23:43:30 +0000 Subject: packages/qt4: Move QtopiaCore over to the qt4_arch.inc --- packages/qt4/qte-functions.inc | 11 ----------- packages/qt4/qtopia-core_4.2.0.bb | 2 +- packages/qt4/qtopia-core_4.3.3.bb | 2 +- 3 files changed, 2 insertions(+), 13 deletions(-) delete mode 100644 packages/qt4/qte-functions.inc (limited to 'packages/qt4') diff --git a/packages/qt4/qte-functions.inc b/packages/qt4/qte-functions.inc deleted file mode 100644 index f0ffb0e612..0000000000 --- a/packages/qt4/qte-functions.inc +++ /dev/null @@ -1,11 +0,0 @@ -def qte_arch(d): - import bb, re - arch = bb.data.getVar('TARGET_ARCH', d, 1) - if re.match("^i.86$", arch): - arch = "x86" - elif arch == "x86_64": - arch = "x86" - elif arch == "mipsel": - arch = "mips" - return arch - diff --git a/packages/qt4/qtopia-core_4.2.0.bb b/packages/qt4/qtopia-core_4.2.0.bb index 509230f3ea..1e10fcde77 100644 --- a/packages/qt4/qtopia-core_4.2.0.bb +++ b/packages/qt4/qtopia-core_4.2.0.bb @@ -55,7 +55,7 @@ export OE_QMAKE_LIBDIR_QT="${QTDIR}/lib" export OE_QMAKE_INCDIR_QTOPIA="${QTOPIADIR}/include" export OE_QMAKE_LIBDIR_QTOPIA="${QTOPIADIR}/lib" -require qte-functions.inc +require qt4_arch.inc QT_ARCH := "${@qte_arch(d)}" # FIXME use info.bbclass once it has been commited diff --git a/packages/qt4/qtopia-core_4.3.3.bb b/packages/qt4/qtopia-core_4.3.3.bb index 2995988b42..0e94145df0 100644 --- a/packages/qt4/qtopia-core_4.3.3.bb +++ b/packages/qt4/qtopia-core_4.3.3.bb @@ -40,7 +40,7 @@ export OE_QMAKE_LIBDIR_QT="${QTDIR}/lib" export OE_QMAKE_INCDIR_QTOPIA="${QTOPIADIR}/include" export OE_QMAKE_LIBDIR_QTOPIA="${QTOPIADIR}/lib" -require qte-functions.inc +require qt4_arch.inc QT_ARCH := "${@qte_arch(d)}" # FIXME use info.bbclass once it has been commited -- cgit v1.2.3 From f53bfcb679b66b329fe13418d492d9c289472e6e Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Mon, 24 Dec 2007 01:17:45 +0000 Subject: package/qt4/qt4-x11-free,qtopia-core: Start sharing packaging The font and translations are a bit hairy and need further work. The idea is that at one point in time we can install Qt/X11 and Qt/Embedded side by side again. Headers and tools still need some time. --- packages/qt4/qt4-x11-free_4.3.3.bb | 73 ++---------------------- packages/qt4/qt_packaging.inc | 114 +++++++++++++++++++++++++++++++++++++ packages/qt4/qtopia-core_4.3.3.bb | 77 ++----------------------- 3 files changed, 123 insertions(+), 141 deletions(-) create mode 100644 packages/qt4/qt_packaging.inc (limited to 'packages/qt4') diff --git a/packages/qt4/qt4-x11-free_4.3.3.bb b/packages/qt4/qt4-x11-free_4.3.3.bb index 2fa53a4d54..b52b1c0394 100644 --- a/packages/qt4/qt4-x11-free_4.3.3.bb +++ b/packages/qt4/qt4-x11-free_4.3.3.bb @@ -5,7 +5,6 @@ HOMEPAGE = "http://www.trolltech.com" LICENSE = "GPL QPL" DEPENDS = "pkgconfig-native uicmoc4-native qmake2-native freetype jpeg virtual/libx11 \ xft libxext libxrender libxrandr libxcursor dbus openssl" -RDEPENDS_${PN} = "${NONDEV_PACKAGES}" PROVIDES = "qt4x11" PR = "r6" @@ -117,71 +116,7 @@ do_install() { rm ${D}${bindir}/rcc ${D}${bindir}/uic ${D}${bindir}/moc } -NONDEV_PACKAGES = "libqtcore4 libqtgui4 libqtnetwork4 \ - libqtsql4 libqtsvg4 libqttest4 \ - libqtxml4 \ - libqtdesigner4 libqtdesignercomponents4 \ - libqt3support4 \ - libqtassistantclient4 libqtscript4 \ - libqtdbus4 \ - qt4-assistant qt4-common qt4-designer qt4-demos qt4-examples qt4-linguist \ - qt4-pixeltool qt4-dbus \ - qt4-plugins-accessible qt4-plugins-codecs qt4-plugins-designer qt4-plugins-imageformats qt4-plugins-sqldrivers \ - qt4-plugins-inputmethods qt4-plugins-iconengines" - -PACKAGES += "libqtcore4-dev libqtgui4-dev libqtnetwork4-dev libqtsql4-dev libqtsvg4-dev libqttest4-dev \ - libqtxml4-dev libqtdesigner4-dev libqtdesignercomponents4-dev libqt3support4-dev \ - libqtassistantclient4-dev libqtscript4-dev libqtdbus4-dev \ - ${NONDEV_PACKAGES}" - -ALLOW_EMPTY = "1" -FILES_${PN} = "" - -FILES_libqtcore4 = "${libdir}/libQtCore.so.*" -FILES_libqtcore4-dev = "${libdir}/libQtCore.so" -FILES_libqtgui4 = "${libdir}/libQtGui.so.*" -FILES_libqtgui4-dev = "${libdir}/libQtGui.so" -FILES_libqtnetwork4 = "${libdir}/libQtNetwork.so.*" -FILES_libqtnetwork4-dev = "${libdir}/libQtNetwork.so" -FILES_libqtsql4 = "${libdir}/libQtSql.so.*" -FILES_libqtsql4-dev = "${libdir}/libQtSql.so" -FILES_libqtsvg4 = "${libdir}/libQtSvg.so.*" -FILES_libqtsvg4-dev = "${libdir}/libQtSvg.so" -FILES_libqttest4 = "${libdir}/libQtTest.so.*" -FILES_libqttest4-dev = "${libdir}/libQtTest.so" -FILES_libqtxml4 = "${libdir}/libQtXml.so.*" -FILES_libqtxml4-dev = "${libdir}/libQtXml.so" -FILES_libqtdesigner4 = "${libdir}/libQtDesigner.so.*" -FILES_libqtdesigner4-dev = "${libdir}/libQtDesigner.so" -FILES_libqtdesignercomponents4 = "${libdir}/libQtDesignerComponents.so.*" -FILES_libqtdesignercomponents4-dev = "${libdir}/libQtDesignerComponents.so" -FILES_libqt3support4 = "${libdir}/libQt3Support.so.*" -FILES_libqt3support4-dev = "${libdir}/libQt3Support.so" -FILES_libqtassistantclient4 = "${libdir}/libQtAssistantClient.so.*" -FILES_libqtassistantclient4-dev = "${libdir}/libQtAssistantClient.so" -FILES_libqtscript4 = "${libdir}/libQtScript.so.*" -FILES_libqtscript4-dev = "${libdir}/libQtScript.so" -FILES_libqtdbus4 = "${libdir}/libQtDBus.so.*" -FILES_libqtdbus4-dev = "${libdir}/libQtDBus.so" - -FILES_qt4-plugins-accessible = "${libdir}/plugins/accessible/*.so" -FILES_qt4-plugins-codecs = "${libdir}/plugins/codecs/*.so" -FILES_qt4-plugins-designer = "${libdir}/plugins/designer/*.so" -FILES_qt4-plugins-imageformats = "${libdir}/plugins/imageformats/*.so" -FILES_qt4-plugins-sqldrivers = "${libdir}/plugins/sqldrivers/*.so" -FILES_qt4-plugins-inputmethods = "${libdir}/plugins/inputmethods/*.so" -FILES_qt4-plugins-iconengines = "${libdir}/plugins/iconengines/*.so" - -FILES_qt4-assistant = "${bindir}/*assistant*" -FILES_qt4-designer = "${bindir}/*designer*" -FILES_qt4-linguist = "${bindir}/*linguist* ${bindir}/lrelease ${bindir}/lupdate ${bindir}/qm2ts" -FILES_qt4-pixeltool = "${bindir}/pixeltool" -FILES_qt4-dbus = "${bindir}/qdbus ${bindir}/qdbusxml2cpp ${bindir}/qdbuscpp2xml ${bindir}/qdbusviewer" - -FILES_qt4-common = "${bindir}/qtconfig" -FILES_qt4-examples = "${bindir}/qt4-examples/*" -FILES_qt4-demos = "${bindir}/qtdemo ${bindir}/qt4-demos/*" - -FILES_${PN}-dev += "${bindir}/rcc ${bindir}/uic* ${bindir}/moc ${bindir}/qmake ${bindir}/syncqt \ - ${bindir}/qt3to4 ${bindir}/findtr" -FILES_${PN}-dbg += "${bindir}/*/.debug ${plugindir}/.debug" +QT_BASE_NAME = "qt4" +QT_BASE_LIB = "libqt" +QT_LIBRARY_NAME = "libQt" +require qt_packaging.inc diff --git a/packages/qt4/qt_packaging.inc b/packages/qt4/qt_packaging.inc new file mode 100644 index 0000000000..01942866c7 --- /dev/null +++ b/packages/qt4/qt_packaging.inc @@ -0,0 +1,114 @@ +NONDEV_PACKAGES = "${QT_BASE_LIB}core4 ${QT_BASE_LIB}gui4 ${QT_BASE_LIB}network4 \ + ${QT_BASE_LIB}sql4 ${QT_BASE_LIB}svg4 ${QT_BASE_LIB}test4 ${QT_BASE_LIB}xml4 \ + ${QT_BASE_LIB}designer4 ${QT_BASE_LIB}designercomponents4 \ + ${QT_BASE_LIB}3support4 ${QT_BASE_LIB}assistantclient4 ${QT_BASE_LIB}script4 \ + ${QT_BASE_LIB}dbus4 \ + ${QT_BASE_NAME}-assistant ${QT_BASE_NAME}-common \ + ${QT_BASE_NAME}-designer \ + ${QT_BASE_NAME}-demos ${QT_BASE_NAME}-examples \ + ${QT_BASE_NAME}-linguist \ + ${QT_BASE_NAME}-pixeltool ${QT_BASE_NAME}-dbus \ + ${QT_BASE_NAME}-plugins-accessible \ + ${QT_BASE_NAME}-plugins-codecs \ + ${QT_BASE_NAME}-plugins-designer \ + ${QT_BASE_NAME}-plugins-imageformats \ + ${QT_BASE_NAME}-plugins-sqldrivers \ + ${QT_BASE_NAME}-plugins-inputmethods \ + ${QT_BASE_NAME}-plugins-iconengines \ + ${QT_BASE_NAME}-fonts " + +DEV_PACKAGES += "${QT_BASE_LIB}core4-dev ${QT_BASE_LIB}core4-dbg \ + ${QT_BASE_LIB}gui4-dev ${QT_BASE_LIB}gui4-dbg \ + ${QT_BASE_LIB}network4-dev ${QT_BASE_LIB}network4-dbg \ + ${QT_BASE_LIB}sql4-dev ${QT_BASE_LIB}sql4-dbg \ + ${QT_BASE_LIB}svg4-dev ${QT_BASE_LIB}svg4-dbg \ + ${QT_BASE_LIB}test4-dev ${QT_BASE_LIB}test4-dbg \ + ${QT_BASE_LIB}xml4-dev ${QT_BASE_LIB}xml4-dbg \ + ${QT_BASE_LIB}designer4-dev ${QT_BASE_LIB}designer4-dbg \ + ${QT_BASE_LIB}designercomponents4-dev ${QT_BASE_LIB}designercomponents4-dbg \ + ${QT_BASE_LIB}3support4-dev ${QT_BASE_LIB}3support4-dbg \ + ${QT_BASE_LIB}assistantclient4-dev ${QT_BASE_LIB}assistantclient4-dbg \ + ${QT_BASE_LIB}script4-dev ${QT_BASE_LIB}script4-dbg \ + ${QT_BASE_LIB}dbus4-dev ${QT_BASE_LIB}dbus4-dbg " + +PACKAGES += "${DEV_PACKAGES} ${NONDEV_PACKAGES}" + +ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY_${PN}-dev = "1" +FILES_${PN} = "" +FILES_${PN}-dev = "" +RDEPENDS_${PN} = "${NONDEV_PACKAGES}" +RDEPENDS_${PN}-dev = "${DEV_PACKAGES}" + + +FILES_${QT_BASE_LIB}core4 = "${libdir}/${QT_LIBRARY_NAME}Core.so.*" +FILES_${QT_BASE_LIB}core4-dev = "${libdir}/${QT_LIBRARY_NAME}Core.so" +FILES_${QT_BASE_LIB}core4-dbg = "${libdir}/.debug/${QT_LIBRARY_NAME}Core*" +FILES_${QT_BASE_LIB}gui4 = "${libdir}/${QT_LIBRARY_NAME}Gui.so.*" +FILES_${QT_BASE_LIB}gui4-dev = "${libdir}/${QT_LIBRARY_NAME}Gui.so" +FILES_${QT_BASE_LIB}gui4-dbg = "${libdir}/.debug/${QT_LIBRARY_NAME}Gui*" +FILES_${QT_BASE_LIB}network4 = "${libdir}/${QT_LIBRARY_NAME}Network.so.*" +FILES_${QT_BASE_LIB}network4-dev = "${libdir}/${QT_LIBRARY_NAME}Network.so" +FILES_${QT_BASE_LIB}network4-dbg = "${libdir}/.debug/${QT_LIBRARY_NAME}Network*" +FILES_${QT_BASE_LIB}sql4 = "${libdir}/${QT_LIBRARY_NAME}Sql.so.*" +FILES_${QT_BASE_LIB}sql4-dev = "${libdir}/${QT_LIBRARY_NAME}Sql.so" +FILES_${QT_BASE_LIB}sql4-dbg = "${libdir}/.debug/${QT_LIBRARY_NAME}Sql*" +FILES_${QT_BASE_LIB}svg4 = "${libdir}/${QT_LIBRARY_NAME}Svg.so.*" +FILES_${QT_BASE_LIB}svg4-dev = "${libdir}/${QT_LIBRARY_NAME}Svg.so" +FILES_${QT_BASE_LIB}svg4-dbg = "${libdir}/.debug/${QT_LIBRARY_NAME}Svg*" +FILES_${QT_BASE_LIB}test4 = "${libdir}/${QT_LIBRARY_NAME}Test.so.*" +FILES_${QT_BASE_LIB}test4-dev = "${libdir}/${QT_LIBRARY_NAME}Test.so" +FILES_${QT_BASE_LIB}test4-dbg = "${libdir}/.debug/${QT_LIBRARY_NAME}Test" +FILES_${QT_BASE_LIB}xml4 = "${libdir}/${QT_LIBRARY_NAME}Xml.so.*" +FILES_${QT_BASE_LIB}xml4-dev = "${libdir}/${QT_LIBRARY_NAME}Xml.so" +FILES_${QT_BASE_LIB}xml4-dbg = "${libdir}/.debug/${QT_LIBRARY_NAME}Xml*" +FILES_${QT_BASE_LIB}designer4 = "${libdir}/${QT_LIBRARY_NAME}Designer.so.*" +FILES_${QT_BASE_LIB}designer4-dev = "${libdir}/${QT_LIBRARY_NAME}Designer.so" +FILES_${QT_BASE_LIB}designer4-dbg = "${libdir}/.debug/${QT_LIBRARY_NAME}Designer*" +FILES_${QT_BASE_LIB}designercomponents4 = "${libdir}/${QT_LIBRARY_NAME}DesignerComponents.so.*" +FILES_${QT_BASE_LIB}designercomponents4-dev = "${libdir}/${QT_LIBRARY_NAME}DesignerComponents.so" +FILES_${QT_BASE_LIB}designercomponents4-dbg = "${libdir}/.debug/${QT_LIBRARY_NAME}DesignerComponents*" +FILES_${QT_BASE_LIB}3support4 = "${libdir}/${QT_LIBRARY_NAME}3Support.so.*" +FILES_${QT_BASE_LIB}3support4-dev = "${libdir}/${QT_LIBRARY_NAME}3Support.so" +FILES_${QT_BASE_LIB}3support4-dbg = "${libdir}/.debug/${QT_LIBRARY_NAME}3Support*" +FILES_${QT_BASE_LIB}assistantclient4 = "${libdir}/${QT_LIBRARY_NAME}AssistantClient.so.*" +FILES_${QT_BASE_LIB}assistantclient4-dev = "${libdir}/${QT_LIBRARY_NAME}AssistantClient.so" +FILES_${QT_BASE_LIB}assistantclient4-dbg = "${libdir}/.debug/${QT_LIBRARY_NAME}AssistantClient*" +FILES_${QT_BASE_LIB}script4 = "${libdir}/${QT_LIBRARY_NAME}Script.so.*" +FILES_${QT_BASE_LIB}script4-dev = "${libdir}/${QT_LIBRARY_NAME}Script.so" +FILES_${QT_BASE_LIB}script4-dbg = "${libdir}/.debug/${QT_LIBRARY_NAME}Script*" +FILES_${QT_BASE_LIB}dbus4 = "${libdir}/${QT_LIBRARY_NAME}DBus.so.*" +FILES_${QT_BASE_LIB}dbus4-dev = "${libdir}/${QT_LIBRARY_NAME}DBus.so" +FILES_${QT_BASE_LIB}dbus4-dbg = "${libdir}/.debug/${QT_LIBRARY_NAME}DBus*" + +FILES_${QT_BASE_NAME}-plugins-accessible = "${libdir}/plugins/accessible/*.so" +FILES_${QT_BASE_NAME}-plugins-codecs = "${libdir}/plugins/codecs/*.so" +FILES_${QT_BASE_NAME}-plugins-designer = "${libdir}/plugins/designer/*.so" +FILES_${QT_BASE_NAME}-plugins-imageformats = "${libdir}/plugins/imageformats/*.so" +FILES_${QT_BASE_NAME}-plugins-sqldrivers = "${libdir}/plugins/sqldrivers/*.so" +FILES_${QT_BASE_NAME}-plugins-inputmethods = "${libdir}/plugins/inputmethods/*.so" +FILES_${QT_BASE_NAME}-plugins-iconengines = "${libdir}/plugins/iconengines/*.so" + +FILES_${QT_BASE_NAME}-plugins += "${datadir}/qtopia/plugins/*/*.so" +FILES_${QT_BASE_NAME}-plugins-dbg += "${datadir}/qtopia/plugins/*/.debug/*.so" + +FILES_${QT_BASE_NAME}-assistant = "${bindir}/*assistant*" +FILES_${QT_BASE_NAME}-designer = "${bindir}/*designer*" +FILES_${QT_BASE_NAME}-linguist = "${bindir}/*linguist* ${bindir}/lrelease ${bindir}/lupdate ${bindir}/qm2ts" +FILES_${QT_BASE_NAME}-pixeltool = "${bindir}/pixeltool" +FILES_${QT_BASE_NAME}-dbus = "${bindir}/qdbus ${bindir}/qdbusxml2cpp ${bindir}/qdbuscpp2xml ${bindir}/qdbusviewer" + +FILES_${QT_BASE_NAME}-common = "${bindir}/qtconfig" +FILES_${QT_BASE_NAME}-examples = "${bindir}/${QT_BASE_NAME}-examples/*" +FILES_${QT_BASE_NAME}-demos = "${bindir}/qtdemo ${bindir}/${QT_BASE_NAME}-demos/*" + +FILES_${QT_BASE_NAME}-fonts = "${libdir}/fonts" + +FILES_${PN}-dev += "${bindir}/rcc ${bindir}/uic* ${bindir}/moc ${bindir}/qmake ${bindir}/syncqt \ + ${bindir}/qt3to4 ${bindir}/findtr" +FILES_${PN}-dbg += "${bindir}/*/.debug ${plugindir}/.debug" + +python populate_packages_prepend() { + translationdir = bb.data.expand('${datadir}/qtopia/translations/', d) + do_split_packages(d, translationdir, '^qt_(.*)\.qm$', 'qtopia-translation-%s', 'Qtopia translation for %s', extra_depends='' ) +} diff --git a/packages/qt4/qtopia-core_4.3.3.bb b/packages/qt4/qtopia-core_4.3.3.bb index 0e94145df0..3e66d9f1b0 100644 --- a/packages/qt4/qtopia-core_4.3.3.bb +++ b/packages/qt4/qtopia-core_4.3.3.bb @@ -128,78 +128,6 @@ do_install() { touch ${D}/${libdir}/fonts/fontdir } -# We might want to package all the libraries separately, so you can really -# fine-tune what to install. This is e.g. done in qt4-x11-free_4.1.2.bb. -# What should these packages be called? I'm tempted to call them the same -# as in qt4 version, as the API is supposed to be compatible, e.g. -# libqtcore4 and libqtgui4. This will however conflict if you have QT and -# Qtopia, but this is something you don't want anyway, I guess. -# Another solution is making virtual/libqtfoo4, and DEPENDing on that one -# and let both the PACKAGES in QT and Qtopia PROVIDE these. The packages -# themselves could then be called libqtopiafoo4. -# I'll postpone this discussion by not making separate Qtopia packages. - -# Also, I don't package the plugins and translations atm, I don't use them -# and I don't feel like thinking about a sensible separation. - -PACKAGES =+ " libqtcore libqtcore-dev libqtcore-dbg \ - libqtxml libqtxml-dev libqtxml-dbg \ - libqtgui libqtgui-dev libqtgui-dbg \ - libqtsql libqtsql-dev libqtsql-dbg \ - libqtnetwork libqtnetwork-dev libqtnetwork-dbg \ - libqtsvg libqtsvg-dev libqtsvg-dbg \ - libqt3support libqt3support-dev libqt3support-dbg \ - qtopia-core-plugins qtopia-core-plugins-dbg \ - libqtscript libqtscript-dev libqtscript-dbg \ - " - -PACKAGES += " ${PN}-fonts " - -# The default included fonts are around 75MB and consist of a number of -# FreeType-renderable fonts as well as QPF (Qtopia Prerendered Fonts). -# As FreeType is generally slow on embedded platforms, and 75MB is -# quite huge, we downsize the fonts dir in the do_install. I've decided -# to include only the QPF (Helvetica and Fixed), amounting to 500KB. This -# also results in tremendously faster application startup time. -FILES_libqtcore += " ${libdir}/fonts/helvetic* ${libdir}/fonts/fixed* ${D}/${libdir}/fonts/fontdir" -FILES_${PN}-fonts = "${libdir}/fonts" - -FILES_qtopia-core-plugins += "${datadir}/qtopia/plugins/*/*.so" -FILES_qtopia-core-plugins-dbg += "${datadir}/qtopia/plugins/*/.debug/*.so" - -FILES_libqtcore += "${libdir}/libQtCore.so.*" -FILES_libqtxml += "${libdir}/libQtXml.so.*" -FILES_libqtgui += "${libdir}/libQtGui.so.*" -FILES_libqtsql += "${libdir}/libQtSql.so.*" -FILES_libqtnetwork += "${libdir}/libQtNetwork.so.*" -FILES_libqtsvg += "${libdir}/libQtSvg.so.*" -FILES_libqt3support += "${libdir}/libQt3Support.so.*" -FILES_libqtscript += "${libdir}/libQtScript.so.*" - -FILES_libqtcore-dev += "${libdir}/*QtCore.*" -FILES_libqtxml-dev += "${libdir}/*QtXml.*" -FILES_libqtgui-dev += "${libdir}/*QtGui.*" -FILES_libqtsql-dev += "${libdir}/*QtSql.*" -FILES_libqtnetwork-dev += "${libdir}/*QtNetwork.*" -FILES_libqtsvg-dev += "${libdir}/*QtSvg.*" -FILES_libqt3support-dev += "${libdir}/*Qt3Support.*" -FILES_libqtscript-dev += "${libdir}/*QtScript.*" - -FILES_libqtcore-dbg += "${libdir}/.debug/libQtCore*" -FILES_libqtxml-dbg += "${libdir}/.debug/libQtXml*" -FILES_libqtgui-dbg += "${libdir}/.debug/libQtGui*" -FILES_libqtsql-dbg += "${libdir}/.debug/libQtSql*" -FILES_libqtnetwork-dbg += "${libdir}/.debug/libQtNetwork*" -FILES_libqtsvg-dbg += "${libdir}/.debug/libQtSvg*" -FILES_libqt3support-dbg += "${libdir}/.debug/libQt3Support*" -FILES_libqtscript-dbg += "${libdir}/.debug/libQtScript*" - - -python populate_packages_prepend() { - translationdir = bb.data.expand('${datadir}/qtopia/translations/', d) - do_split_packages(d, translationdir, '^qt_(.*)\.qm$', 'qtopia-translation-%s', 'Qtopia translation for %s', extra_depends='' ) -} - STAGE_TEMP = "${WORKDIR}/temp-staging" @@ -220,3 +148,8 @@ do_stage() { rm -rf ${STAGE_TEMP} } + +QT_BASE_NAME = "qtopiacore" +QT_BASE_LIB = "libqtopiacore" +QT_LIBRARY_NAME = "libQt" +require qt_packaging.inc -- cgit v1.2.3 From 32a24933810026b6a730a0377889fa73430501cc Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Mon, 24 Dec 2007 01:27:26 +0000 Subject: packages/qt4/qt4-x11-free, qtopia-core: Move boilerplate lines to a .inc file --- packages/qt4/qt4-x11-free.inc | 23 +++++++++++++++++++++++ packages/qt4/qt4-x11-free_4.3.3.bb | 33 ++++++--------------------------- packages/qt4/qtopia-core.inc | 17 +++++++++++++++++ packages/qt4/qtopia-core_4.3.3.bb | 22 +--------------------- 4 files changed, 47 insertions(+), 48 deletions(-) create mode 100644 packages/qt4/qt4-x11-free.inc create mode 100644 packages/qt4/qtopia-core.inc (limited to 'packages/qt4') diff --git a/packages/qt4/qt4-x11-free.inc b/packages/qt4/qt4-x11-free.inc new file mode 100644 index 0000000000..3dedb4f548 --- /dev/null +++ b/packages/qt4/qt4-x11-free.inc @@ -0,0 +1,23 @@ +DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is the X11 version." +SECTION = "x11/libs" +PRIORITY = "optional" +HOMEPAGE = "http://www.trolltech.com" +LICENSE = "GPL QPL" +DEPENDS = "pkgconfig-native uicmoc4-native qmake2-native freetype jpeg virtual/libx11 \ + xft libxext libxrender libxrandr libxcursor dbus openssl" +PROVIDES = "qt4x11" +PR = "r6" + +SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \ + file://0001-cross-compile.patch;patch=1 \ + file://0003-no-tools.patch;patch=1 \ + file://0004-no-qmake.patch;patch=1 \ + file://0005-fix-mkspecs.patch;patch=1" +S = "${WORKDIR}/qt-x11-opensource-src-${PV}" + +inherit qmake_base qt4x11 + +QT_BASE_NAME = "qt4" +QT_BASE_LIB = "libqt" +QT_LIBRARY_NAME = "libQt" +require qt_packaging.inc diff --git a/packages/qt4/qt4-x11-free_4.3.3.bb b/packages/qt4/qt4-x11-free_4.3.3.bb index b52b1c0394..b8876541b6 100644 --- a/packages/qt4/qt4-x11-free_4.3.3.bb +++ b/packages/qt4/qt4-x11-free_4.3.3.bb @@ -1,27 +1,4 @@ -DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is the X11 version." -SECTION = "x11/libs" -PRIORITY = "optional" -HOMEPAGE = "http://www.trolltech.com" -LICENSE = "GPL QPL" -DEPENDS = "pkgconfig-native uicmoc4-native qmake2-native freetype jpeg virtual/libx11 \ - xft libxext libxrender libxrandr libxcursor dbus openssl" -PROVIDES = "qt4x11" -PR = "r6" - -SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \ - file://0001-cross-compile.patch;patch=1 \ - file://0002-fix-resinit-declaration.patch;patch=1 \ - file://0003-no-tools.patch;patch=1 \ - file://0004-no-qmake.patch;patch=1 \ - file://0005-fix-mkspecs.patch;patch=1 \ - file://0006-freetype-host-includes.patch;patch=1 \ - file://0007-openssl-host-includes.patch;patch=1" -S = "${WORKDIR}/qt-x11-opensource-src-${PV}" - PARALLEL_MAKE = "" - -inherit qmake_base qt4x11 - export QTDIR = "${S}" STAGING_QT_DIR = "${STAGING_DIR}/${TARGET_SYS}/qt4" EXTRA_OEMAKE = "-e" @@ -116,7 +93,9 @@ do_install() { rm ${D}${bindir}/rcc ${D}${bindir}/uic ${D}${bindir}/moc } -QT_BASE_NAME = "qt4" -QT_BASE_LIB = "libqt" -QT_LIBRARY_NAME = "libQt" -require qt_packaging.inc +require qt4-x11-free.inc + +SRC_URI += " \ + file://0002-fix-resinit-declaration.patch;patch=1 \ + file://0006-freetype-host-includes.patch;patch=1 \ + file://0007-openssl-host-includes.patch;patch=1 " diff --git a/packages/qt4/qtopia-core.inc b/packages/qt4/qtopia-core.inc new file mode 100644 index 0000000000..cf8c0cc411 --- /dev/null +++ b/packages/qt4/qtopia-core.inc @@ -0,0 +1,17 @@ +SUMMARY = "QtopiaCore" +SECTION = "libs" +LICENSE = "GPL" +PRIORITY = "optional" +HOMEPAGE = "http://www.trolltech.com" +DEPENDS = "freetype tslib" + +SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.tar.gz \ + file://linux-oe-qmake.conf" +S = "${WORKDIR}/qtopia-core-opensource-src-${PV}" +inherit pkgconfig + + +QT_BASE_NAME = "qtopiacore" +QT_BASE_LIB = "libqtopiacore" +QT_LIBRARY_NAME = "libQt" +require qt_packaging.inc diff --git a/packages/qt4/qtopia-core_4.3.3.bb b/packages/qt4/qtopia-core_4.3.3.bb index 3e66d9f1b0..d1a811cc2d 100644 --- a/packages/qt4/qtopia-core_4.3.3.bb +++ b/packages/qt4/qtopia-core_4.3.3.bb @@ -1,19 +1,3 @@ -SUMMARY = "QtopiaCore" -SECTION = "libs" -LICENSE = "GPL" -PRIORITY = "optional" -HOMEPAGE = "http://www.trolltech.com" -DEPENDS = "freetype tslib" - -PR = "r0" - -SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.tar.gz \ - file://linux-oe-qmake.conf" - -S = "${WORKDIR}/qtopia-core-opensource-src-${PV}" - -inherit pkgconfig - # Qmake gets confused by environment variables, as it builds both HOST # and TARGET objects. The correct compiler settings come from the mkspec # and are set with the OE_QMAKE_ variables @@ -148,8 +132,4 @@ do_stage() { rm -rf ${STAGE_TEMP} } - -QT_BASE_NAME = "qtopiacore" -QT_BASE_LIB = "libqtopiacore" -QT_LIBRARY_NAME = "libQt" -require qt_packaging.inc +require qtopia-core.inc -- cgit v1.2.3 From 31e33a19636ee3c236526f232696fee13ecc76ef Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Mon, 24 Dec 2007 01:35:05 +0000 Subject: packages/qt4/qtopia-core,qt4-x11-free: Make it share the DEPENDS and inherits --- packages/qt4/qt4-x11-free.inc | 7 ++++--- packages/qt4/qt_depends.inc | 3 +++ packages/qt4/qtopia-core.inc | 8 +++++--- 3 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 packages/qt4/qt_depends.inc (limited to 'packages/qt4') diff --git a/packages/qt4/qt4-x11-free.inc b/packages/qt4/qt4-x11-free.inc index 3dedb4f548..1ea8930701 100644 --- a/packages/qt4/qt4-x11-free.inc +++ b/packages/qt4/qt4-x11-free.inc @@ -3,8 +3,7 @@ SECTION = "x11/libs" PRIORITY = "optional" HOMEPAGE = "http://www.trolltech.com" LICENSE = "GPL QPL" -DEPENDS = "pkgconfig-native uicmoc4-native qmake2-native freetype jpeg virtual/libx11 \ - xft libxext libxrender libxrandr libxcursor dbus openssl" +DEPENDS += "virtual/libx11 xft libxext libxrender libxrandr libxcursor" PROVIDES = "qt4x11" PR = "r6" @@ -15,9 +14,11 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz file://0005-fix-mkspecs.patch;patch=1" S = "${WORKDIR}/qt-x11-opensource-src-${PV}" -inherit qmake_base qt4x11 QT_BASE_NAME = "qt4" QT_BASE_LIB = "libqt" QT_LIBRARY_NAME = "libQt" require qt_packaging.inc +require qt_depends.inc + +inherit qt4x11 diff --git a/packages/qt4/qt_depends.inc b/packages/qt4/qt_depends.inc new file mode 100644 index 0000000000..daafa21512 --- /dev/null +++ b/packages/qt4/qt_depends.inc @@ -0,0 +1,3 @@ +inherit pkgconfig qmake_base + +DEPENDS += " uicmoc4-native qmake2-native freetype jpeg dbus openssl" diff --git a/packages/qt4/qtopia-core.inc b/packages/qt4/qtopia-core.inc index cf8c0cc411..dad062c9e0 100644 --- a/packages/qt4/qtopia-core.inc +++ b/packages/qt4/qtopia-core.inc @@ -1,17 +1,19 @@ -SUMMARY = "QtopiaCore" +SUMMARY = "Qt is a versatile cross-platform application framework -- this is the QtopiaCore/Embedded version." SECTION = "libs" LICENSE = "GPL" PRIORITY = "optional" HOMEPAGE = "http://www.trolltech.com" -DEPENDS = "freetype tslib" +DEPENDS += "tslib" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.tar.gz \ file://linux-oe-qmake.conf" S = "${WORKDIR}/qtopia-core-opensource-src-${PV}" -inherit pkgconfig QT_BASE_NAME = "qtopiacore" QT_BASE_LIB = "libqtopiacore" QT_LIBRARY_NAME = "libQt" require qt_packaging.inc +require qt_depends.inc + +inherit qtopia4core -- cgit v1.2.3 From 65a0e7358915f95d64d2df033843e83b82ffd83f Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Mon, 24 Dec 2007 12:41:20 +0000 Subject: packages/qt4/qt4-x11-free,qtopia-core: Unify configure and compile of Qt4 Adjust packaging to look into the directories we configured. --- packages/qt4/qt4-x11-free.inc | 1 + packages/qt4/qt4-x11-free_4.3.3.bb | 41 +--------------- packages/qt4/qt4_arch.inc | 10 ++++ packages/qt4/qt_configuration.inc | 67 ++++++++++++++++++++++++++ packages/qt4/qt_depends.inc | 2 +- packages/qt4/qt_packaging.inc | 17 +++---- packages/qt4/qtopia-core.inc | 1 + packages/qt4/qtopia-core_4.3.3.bb | 96 +------------------------------------- 8 files changed, 90 insertions(+), 145 deletions(-) create mode 100644 packages/qt4/qt_configuration.inc (limited to 'packages/qt4') diff --git a/packages/qt4/qt4-x11-free.inc b/packages/qt4/qt4-x11-free.inc index 1ea8930701..74773cd1d3 100644 --- a/packages/qt4/qt4-x11-free.inc +++ b/packages/qt4/qt4-x11-free.inc @@ -18,6 +18,7 @@ S = "${WORKDIR}/qt-x11-opensource-src-${PV}" QT_BASE_NAME = "qt4" QT_BASE_LIB = "libqt" QT_LIBRARY_NAME = "libQt" +QT_DIR_NAME = "qt4" require qt_packaging.inc require qt_depends.inc diff --git a/packages/qt4/qt4-x11-free_4.3.3.bb b/packages/qt4/qt4-x11-free_4.3.3.bb index b8876541b6..8b557a086c 100644 --- a/packages/qt4/qt4-x11-free_4.3.3.bb +++ b/packages/qt4/qt4-x11-free_4.3.3.bb @@ -1,50 +1,11 @@ -PARALLEL_MAKE = "" -export QTDIR = "${S}" STAGING_QT_DIR = "${STAGING_DIR}/${TARGET_SYS}/qt4" -EXTRA_OEMAKE = "-e" -require qt4_arch.inc -QT_ARCH := "${@qt_arch(d)}" # FIXME: # * add missing options -QT_CONFIG_FLAGS = "-release -shared -qt-zlib -system-libjpeg -no-nas-sound -no-sm -no-libmng -qt-libpng -no-gif -no-xinerama \ - -no-tablet -no-xkb -no-nis -no-cups -no-opengl \ - -no-sse -no-sse2 -no-mmx -no-3dnow \ - -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql -no-sql-sqlite -no-sql-sqlite2 \ - -qdbus \ - -verbose -stl -no-accessibility \ - -pch -no-glib" +QT_CONFIG_FLAGS += "-no-xinerama -no-tablet -no-xkb -no-opengl" -EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake2 -after DEFINES+=QT_NO_XIM INCPATH+=${STAGING_INCDIR} \ - INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \ - QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \ - AR="${TARGET_PREFIX}ar cqs" \ - MOC="${STAGING_BINDIR_NATIVE}/moc4" UIC="${STAGING_BINDIR_NATIVE}/uic4" MAKE="make -e"' - -do_configure() { - echo "DEFINES -= QT_NO_CAST_TO_ASCII" >>src/qbase.pri - echo "DEFINES += QT_NO_XIM" >>src/qbase.pri - unset QMAKESPEC - ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake - ln -s linux-g++ mkspecs/${TARGET_OS}-oe-g++ - #export QMAKESPEC="linux-oe-g++" - #rm -rf ./mkspecs - #ln -sf ${QMAKE_MKSPEC_PATH} ./mkspecs - echo yes | ./configure -prefix / -platform ${TARGET_OS}-oe-g++ -crossarch ${QT_ARCH} ${QT_CONFIG_FLAGS} -fast \ - -L${STAGING_LIBDIR} -I${STAGING_INCDIR} -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/mysql -} - -# FIXME: Might want to compile the cross tools for the -dev packages as well... -do_compile() { - 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 - - oe_runmake ${EXTRA_ENV} -} PARTS = "3Support AssistantClient Core DBus Designer DesignerComponents Gui Network Script Sql Svg Test Xml" diff --git a/packages/qt4/qt4_arch.inc b/packages/qt4/qt4_arch.inc index 63babd9a0a..60ede1db2b 100644 --- a/packages/qt4/qt4_arch.inc +++ b/packages/qt4/qt4_arch.inc @@ -1,3 +1,5 @@ +inherit siteinfo + def qt_arch(d): import bb, re arch = bb.data.getVar('TARGET_ARCH', d, 1) @@ -11,3 +13,11 @@ def qt_arch(d): arch = "mips" return arch +def qt_endian(d): + import bb + if bb.data.getVar('SITEINFO_ENDIANESS', d, True) == "le": + return "-little-endian" + elif bb.data.getVar('SITEINFO_ENDIANESS', d, True) == "be": + return "-big-endian" + else: + assert False diff --git a/packages/qt4/qt_configuration.inc b/packages/qt4/qt_configuration.inc new file mode 100644 index 0000000000..afa716d517 --- /dev/null +++ b/packages/qt4/qt_configuration.inc @@ -0,0 +1,67 @@ +require qt4_arch.inc +QT_ARCH := "${@qt_arch(d)}" +QT_ENDIAN = "${@qt_endian(d)}" + +QT_CONFIG_FLAGS = "-release -no-cups -no-accessibility -reduce-relocations \ + -shared -no-nas-sound -no-sm -no-nis \ + -qt-gif -system-libjpeg -system-libpng -system-zlib \ + -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql -no-sql-sqlite -no-sql-sqlite2 \ + -pch -qdbus -stl -glib" + +PARALLEL_MAKE = "" +EXTRA_OEMAKE = "-e" + +EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake2 -after \ + INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \ + QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \ + AR="${TARGET_PREFIX}ar cqs" \ + MOC="${STAGING_BINDIR_NATIVE}/moc4" UIC="${STAGING_BINDIR_NATIVE}/uic4" MAKE="make -e"' + +do_configure() { + unset QMAKESPEC + ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake + ln -s linux-g++ mkspecs/${TARGET_OS}-oe-g++ + + echo yes | ./configure -v \ + -prefix ${prefix} \ + -bindir ${bindir} \ + -libdir ${libdir} \ + -datadir ${datadir} \ + -sysconfdir ${sysconfdir} \ + -docdir ${docdir}/${QT_DIR_NAME} \ + -headerdir ${includedir} \ + -plugindir ${libdir}/${QT_DIR_NAME}/plugins \ + -translationdir ${datadir}/${QT_DIR_NAME}/translations \ + -examplesdir ${bindir}/${QT_DIR_NAME}/examples \ + -demosdir ${bindir}/${QT_DIR_NAME}/demos \ + -platform ${TARGET_OS}-oe-g++ \ + -xplatform ${TARGET_OS}-oe-g++ \ + -embedded ${QT_ARCH} ${QT_ENDIAN} -fast \ + -crossarch ${QT_ARCH} + ${QT_CONFIG_FLAGS} -fast \ + -L${STAGING_LIBDIR} -I${STAGING_INCDIR} + -I${STAGING_INCDIR}/freetype2 +} + +do_compile() { + 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 + + oe_runmake ${EXTRA_ENV} +} + +# +# Fixup some pkgconfig files +# moc_location=/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/work/arm-oabi-angstrom-linux/qtopia-core-4.3.0-r2/qtopia-core-opensource-src-4.3.0/bin/moc +# uic_location=/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/work/arm-oabi-angstrom-linux/qtopia-core-4.3.0-r2/qtopia-core-opensource-src-4.3.0/bin/uic +# +# Libs: -L${libdir} -lQtNetwork -L/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/staging/arm-angstrom-linux/lib -L/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/work/arm-oabi-angstrom-linux/qtopia-core-4.3.0-r2/qtopia-core-opensource-src-4.3.0/lib $(LIBS_EXTRA) -lQtCore -L/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/staging/arm-angstrom-linux/lib -L/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/work/arm-oabi-angstrom-linux/qtopia-core-4.3.0-r2/qtopia-core-opensource-src-4.3.0/lib -lm -lrt -lpthread -ldl +# +do_compile_append() { + cd ${S}/lib/pkgconfig + sed -i s#"-L${S}/lib"##g *.pc + sed -i s#"moc_location=${S}/bin/moc"#moc_location=${STAGING_BINDIR}/moc4# *.pc + sed -i s#"uic_location=${S}/bin/uic"#uic_location=${STAGING_BINDIR}/uic4# *.pc +} diff --git a/packages/qt4/qt_depends.inc b/packages/qt4/qt_depends.inc index daafa21512..289b625d0e 100644 --- a/packages/qt4/qt_depends.inc +++ b/packages/qt4/qt_depends.inc @@ -1,3 +1,3 @@ inherit pkgconfig qmake_base -DEPENDS += " uicmoc4-native qmake2-native freetype jpeg dbus openssl" +DEPENDS += " uicmoc4-native qmake2-native freetype jpeg libpng zlib dbus openssl glib-2.0" diff --git a/packages/qt4/qt_packaging.inc b/packages/qt4/qt_packaging.inc index 01942866c7..86ab0e784c 100644 --- a/packages/qt4/qt_packaging.inc +++ b/packages/qt4/qt_packaging.inc @@ -81,16 +81,13 @@ FILES_${QT_BASE_LIB}dbus4 = "${libdir}/${QT_LIBRARY_NAME}DBus. FILES_${QT_BASE_LIB}dbus4-dev = "${libdir}/${QT_LIBRARY_NAME}DBus.so" FILES_${QT_BASE_LIB}dbus4-dbg = "${libdir}/.debug/${QT_LIBRARY_NAME}DBus*" -FILES_${QT_BASE_NAME}-plugins-accessible = "${libdir}/plugins/accessible/*.so" -FILES_${QT_BASE_NAME}-plugins-codecs = "${libdir}/plugins/codecs/*.so" -FILES_${QT_BASE_NAME}-plugins-designer = "${libdir}/plugins/designer/*.so" -FILES_${QT_BASE_NAME}-plugins-imageformats = "${libdir}/plugins/imageformats/*.so" -FILES_${QT_BASE_NAME}-plugins-sqldrivers = "${libdir}/plugins/sqldrivers/*.so" -FILES_${QT_BASE_NAME}-plugins-inputmethods = "${libdir}/plugins/inputmethods/*.so" -FILES_${QT_BASE_NAME}-plugins-iconengines = "${libdir}/plugins/iconengines/*.so" - -FILES_${QT_BASE_NAME}-plugins += "${datadir}/qtopia/plugins/*/*.so" -FILES_${QT_BASE_NAME}-plugins-dbg += "${datadir}/qtopia/plugins/*/.debug/*.so" +FILES_${QT_BASE_NAME}-plugins-accessible = "${libdir}/${QT_DIR_NAME}/plugins/accessible/*.so" +FILES_${QT_BASE_NAME}-plugins-codecs = "${libdir}/${QT_DIR_NAME}/plugins/codecs/*.so" +FILES_${QT_BASE_NAME}-plugins-designer = "${libdir}/${QT_DIR_NAME}/plugins/designer/*.so" +FILES_${QT_BASE_NAME}-plugins-imageformats = "${libdir}/${QT_DIR_NAME}/plugins/imageformats/*.so" +FILES_${QT_BASE_NAME}-plugins-sqldrivers = "${libdir}/${QT_DIR_NAME}/plugins/sqldrivers/*.so" +FILES_${QT_BASE_NAME}-plugins-inputmethods = "${libdir}/${QT_DIR_NAME}/plugins/inputmethods/*.so" +FILES_${QT_BASE_NAME}-plugins-iconengines = "${libdir}/${QT_DIR_NAME}/plugins/iconengines/*.so" FILES_${QT_BASE_NAME}-assistant = "${bindir}/*assistant*" FILES_${QT_BASE_NAME}-designer = "${bindir}/*designer*" diff --git a/packages/qt4/qtopia-core.inc b/packages/qt4/qtopia-core.inc index dad062c9e0..28ab2fb614 100644 --- a/packages/qt4/qtopia-core.inc +++ b/packages/qt4/qtopia-core.inc @@ -13,6 +13,7 @@ S = "${WORKDIR}/qtopia-core-opensource-src-${PV}" QT_BASE_NAME = "qtopiacore" QT_BASE_LIB = "libqtopiacore" QT_LIBRARY_NAME = "libQt" +QT_DIR_NAME = "qtopia" require qt_packaging.inc require qt_depends.inc diff --git a/packages/qt4/qtopia-core_4.3.3.bb b/packages/qt4/qtopia-core_4.3.3.bb index d1a811cc2d..e7187b9309 100644 --- a/packages/qt4/qtopia-core_4.3.3.bb +++ b/packages/qt4/qtopia-core_4.3.3.bb @@ -1,99 +1,7 @@ -# Qmake gets confused by environment variables, as it builds both HOST -# and TARGET objects. The correct compiler settings come from the mkspec -# and are set with the OE_QMAKE_ variables -PARALLEL_MAKE = "" -EXTRA_OEMAKE = " MAKEFLAGS= " - -# This stuff could also be done by inheriting qmake, but I didn't want to -# bother with the qmake separation from the Qtopia configure. This separation -# is probably nothing more than a patch on the configure and setting some -# environment variables to use our own qmake/moc/uic, but that's something -# to figure out later. -export OE_QMAKE_CC="${CC}" -export OE_QMAKE_CFLAGS="${CFLAGS}" -export OE_QMAKE_CXX="${CXX}" -export OE_QMAKE_CXXFLAGS="-fno-exceptions ${CXXFLAGS}" -export OE_QMAKE_LDFLAGS="${LDFLAGS}" -export OE_QMAKE_LINK="${CXX}" -export OE_QMAKE_AR="${AR}" -export OE_QMAKE_RANLIB="${RANLIB}" -export OE_QMAKE_STRIP="echo" -export OE_QMAKE_RPATH="-Wl,-rpath-link," -export OE_QMAKE_INCDIR_QT="${QTDIR}/include" -export OE_QMAKE_LIBDIR_QT="${QTDIR}/lib" -export OE_QMAKE_INCDIR_QTOPIA="${QTOPIADIR}/include" -export OE_QMAKE_LIBDIR_QTOPIA="${QTOPIADIR}/lib" - -require qt4_arch.inc -QT_ARCH := "${@qte_arch(d)}" - -# FIXME use info.bbclass once it has been commited -QT_ENDIAN = "-little-endian" - -# We don't build the examples and demos atm. They're quite big and not used -# frequently, only for testing maybe. Feel free to change and to package -# them separately. -QT_CONFIG_FLAGS = "-release \ - -no-cups -no-accessibility \ - -nomake demos -nomake examples -nomake tools -reduce-relocations \ +QT_CONFIG_FLAGS += " \ + -nomake demos -nomake examples -nomake tools \ -qt-mouse-tslib -qt-gfx-transformed -embedded ${QT_ARCH}" -do_configure() { - # Hack to honor our compiler flags - sed -i s/-O2//g ${S}/mkspecs/*/qmake.conf - sed -i s/-O2//g ${S}/mkspecs/*/*/qmake.conf - - - # Install the OE build templates (something which might be done - # by inheriting qmake) - for template in linux-oe-g++ linux-uclibc-oe-g++ linux-gnueabi-oe-g++ - do - install -d ${S}/mkspecs/$template - install -m 0644 ${WORKDIR}/linux-oe-qmake.conf ${S}/mkspecs/$template/qmake.conf - ln -sf ../linux-g++/qplatformdefs.h ${S}/mkspecs/$template/qplatformdefs.h - done - - # The Qmake Makefile generation doesn't like these environment - # variables, as they mess up the HOST tools builds - unset CC - unset CXX - unset CFLAGS - unset CXXFLAGS - unset LDFLAGS - - # For rationale behind the installation locations, see remark above - echo yes | ./configure -v \ - -prefix ${prefix} \ - -bindir ${bindir} \ - -libdir ${libdir} \ - -docdir ${docdir}/qtopia \ - -headerdir ${includedir} \ - -plugindir ${datadir}/qtopia/plugins \ - -datadir ${datadir} \ - -translationdir ${datadir}/qtopia/translations \ - -sysconfdir ${sysconfdir} \ - -examplesdir ${bindir}/qtopia/examples \ - -demosdir ${bindir}/qtopia/demos \ - -embedded ${QT_ARCH} ${QT_ENDIAN} -fast \ - -xplatform linux-oe-g++ \ - ${QT_CONFIG_FLAGS} \ - -L${STAGING_LIBDIR} -I${STAGING_INCDIR} -} - -# -# Fixup some pkgconfig files -# moc_location=/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/work/arm-oabi-angstrom-linux/qtopia-core-4.3.0-r2/qtopia-core-opensource-src-4.3.0/bin/moc -# uic_location=/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/work/arm-oabi-angstrom-linux/qtopia-core-4.3.0-r2/qtopia-core-opensource-src-4.3.0/bin/uic -# -# Libs: -L${libdir} -lQtNetwork -L/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/staging/arm-angstrom-linux/lib -L/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/work/arm-oabi-angstrom-linux/qtopia-core-4.3.0-r2/qtopia-core-opensource-src-4.3.0/lib $(LIBS_EXTRA) -lQtCore -L/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/staging/arm-angstrom-linux/lib -L/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/work/arm-oabi-angstrom-linux/qtopia-core-4.3.0-r2/qtopia-core-opensource-src-4.3.0/lib -lm -lrt -lpthread -ldl -# -do_compile_append() { - cd ${S}/lib/pkgconfig - sed -i s#"-L${S}/lib"##g *.pc - sed -i s#"moc_location=${S}/bin/moc"#moc_location=${STAGING_BINDIR}/moc4# *.pc - sed -i s#"uic_location=${S}/bin/uic"#uic_location=${STAGING_BINDIR}/uic4# *.pc -} - do_stage_append() { echo "Fixing up Qt" cd ${STAGING_LIBDIR}/pkgconfig -- cgit v1.2.3 From 05e0305e11d49a2f33fc41d8c4dd1c327b149e7e Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Mon, 24 Dec 2007 12:45:42 +0000 Subject: packages/qt4/qtopia-core.inc: Use the same patches as Qt/X11 Do not build the tools, fix the mksepcs --- packages/qt4/qtopia-core.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'packages/qt4') diff --git a/packages/qt4/qtopia-core.inc b/packages/qt4/qtopia-core.inc index 28ab2fb614..3789cc7932 100644 --- a/packages/qt4/qtopia-core.inc +++ b/packages/qt4/qtopia-core.inc @@ -6,7 +6,9 @@ HOMEPAGE = "http://www.trolltech.com" DEPENDS += "tslib" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.tar.gz \ - file://linux-oe-qmake.conf" + file://0003-no-tools.patch;patch=1 \ + file://0004-no-qmake.patch;patch=1 \ + file://0005-fix-mkspecs.patch;patch=1" S = "${WORKDIR}/qtopia-core-opensource-src-${PV}" -- cgit v1.2.3 From 27a1ceee1dd5daa78fb14833f941182b15ff2e69 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Mon, 24 Dec 2007 13:07:37 +0000 Subject: packages/qt4/qt_configuration.inc: Put the header files somewhere else --- packages/qt4/qt_configuration.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/qt4') diff --git a/packages/qt4/qt_configuration.inc b/packages/qt4/qt_configuration.inc index afa716d517..921b110618 100644 --- a/packages/qt4/qt_configuration.inc +++ b/packages/qt4/qt_configuration.inc @@ -29,7 +29,7 @@ do_configure() { -datadir ${datadir} \ -sysconfdir ${sysconfdir} \ -docdir ${docdir}/${QT_DIR_NAME} \ - -headerdir ${includedir} \ + -headerdir ${includedir}/${QT_DIR_NAME} \ -plugindir ${libdir}/${QT_DIR_NAME}/plugins \ -translationdir ${datadir}/${QT_DIR_NAME}/translations \ -examplesdir ${bindir}/${QT_DIR_NAME}/examples \ -- cgit v1.2.3 From 737541febbf4c2fb236acce3731a60bd92edeaa4 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Mon, 24 Dec 2007 13:35:15 +0000 Subject: packages/qt4/qt4-x11-free,qtopia-core: Change the order, move the config flags to the .inc files --- packages/qt4/qt4-x11-free.inc | 3 ++- packages/qt4/qtopia-core.inc | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'packages/qt4') diff --git a/packages/qt4/qt4-x11-free.inc b/packages/qt4/qt4-x11-free.inc index 74773cd1d3..5b901a2e1b 100644 --- a/packages/qt4/qt4-x11-free.inc +++ b/packages/qt4/qt4-x11-free.inc @@ -15,11 +15,12 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz S = "${WORKDIR}/qt-x11-opensource-src-${PV}" +QT_CONFIG_FLAGS += "-no-xinerama -no-tablet -no-xkb -no-opengl" QT_BASE_NAME = "qt4" QT_BASE_LIB = "libqt" QT_LIBRARY_NAME = "libQt" QT_DIR_NAME = "qt4" -require qt_packaging.inc require qt_depends.inc +require qt_packaging.inc inherit qt4x11 diff --git a/packages/qt4/qtopia-core.inc b/packages/qt4/qtopia-core.inc index 3789cc7932..204378af07 100644 --- a/packages/qt4/qtopia-core.inc +++ b/packages/qt4/qtopia-core.inc @@ -12,11 +12,14 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.ta S = "${WORKDIR}/qtopia-core-opensource-src-${PV}" +QT_CONFIG_FLAGS += " \ + -nomake demos -nomake examples -nomake tools \ + -qt-mouse-tslib -qt-gfx-transformed -embedded ${QT_ARCH}" QT_BASE_NAME = "qtopiacore" QT_BASE_LIB = "libqtopiacore" QT_LIBRARY_NAME = "libQt" QT_DIR_NAME = "qtopia" -require qt_packaging.inc require qt_depends.inc +require qt_packaging.inc inherit qtopia4core -- cgit v1.2.3 From c2115e9154ae7a24f670951f2e76d07c7b563f27 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Mon, 24 Dec 2007 13:37:09 +0000 Subject: packages/qt4: Move the staging bits from qtopia-core to qt_staging.inc, use it in Qt4/X11 The qt4-x11-free_4.3.3 and qtopia-core_4.3.3 bbfiles are rather empty now. The next stop is to make it compile. --- packages/qt4/qt4-x11-free.inc | 1 + packages/qt4/qt4-x11-free_4.3.3.bb | 57 -------------------------------------- packages/qt4/qt_packaging.inc | 12 ++++++++ packages/qt4/qt_staging.inc | 25 +++++++++++++++++ packages/qt4/qtopia-core.inc | 1 + packages/qt4/qtopia-core_4.3.3.bb | 42 ---------------------------- 6 files changed, 39 insertions(+), 99 deletions(-) create mode 100644 packages/qt4/qt_staging.inc (limited to 'packages/qt4') diff --git a/packages/qt4/qt4-x11-free.inc b/packages/qt4/qt4-x11-free.inc index 5b901a2e1b..fe9138699f 100644 --- a/packages/qt4/qt4-x11-free.inc +++ b/packages/qt4/qt4-x11-free.inc @@ -22,5 +22,6 @@ QT_LIBRARY_NAME = "libQt" QT_DIR_NAME = "qt4" require qt_depends.inc require qt_packaging.inc +require qt_staging.inc inherit qt4x11 diff --git a/packages/qt4/qt4-x11-free_4.3.3.bb b/packages/qt4/qt4-x11-free_4.3.3.bb index 8b557a086c..7d30503c07 100644 --- a/packages/qt4/qt4-x11-free_4.3.3.bb +++ b/packages/qt4/qt4-x11-free_4.3.3.bb @@ -1,61 +1,4 @@ -STAGING_QT_DIR = "${STAGING_DIR}/${TARGET_SYS}/qt4" - - - -# FIXME: -# * add missing options -QT_CONFIG_FLAGS += "-no-xinerama -no-tablet -no-xkb -no-opengl" - - -PARTS = "3Support AssistantClient Core DBus Designer DesignerComponents Gui Network Script Sql Svg Test Xml" - -do_stage() { - oe_runmake install INSTALL_ROOT=/ - install -d ${STAGING_QT_DIR} - install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${STAGING_QT_DIR}/bin/rcc - install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${STAGING_QT_DIR}/bin/moc - install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${STAGING_QT_DIR}/bin/uic - sed -i -e 's,^QMAKE_RPATHDIR.*,QMAKE_RPATHDIR=${STAGING_QT_DIR}/lib,g' ${STAGING_QT_DIR}/mkspecs/qconfig.pri - for pcc in AssistantClient DBus Test UiTools ; do - sed -i -e 's,${S}/lib,${STAGING_QT_DIR}/lib,g' ${STAGING_QT_DIR}/lib/pkgconfig/Qt${pcc}.pc - done - install -d ${PKG_CONFIG_DIR}/ - for pc in ${STAGING_QT_DIR}/lib/pkgconfig/*.pc ; do - sed -i -e 's,$(OE_QMAKE_LIBS_X11),-lX11 -lXext,g' $pc - install -m 0644 $pc ${PKG_CONFIG_DIR}/ - done -} - -# FIXME: Might want to call oe_runmake install INSTALL_ROOT=${D}/${prefix} as well... -# FIXME: Might want to install everything into ${libdir}/qt4/* to match the usual packing... -do_install() { - install -d ${D}${libdir} - install -d ${D}${bindir} - install -d ${D}${includedir} - for part in ${PARTS} - do - oe_libinstall -so -C lib libQt$part ${D}${libdir} - done - oe_libinstall -a -C lib libQtUiTools ${D}${libdir} - cp -pPR include/* ${D}${includedir} - cp -pPR plugins ${D}${libdir} - cp -pPR bin/* ${D}${bindir} - - install -d ${D}${bindir}/qt4-examples - for binary in `find examples -perm 0755 -type f` - do - install -m 0755 $binary ${D}${bindir}/qt4-examples/ - done - install -d ${D}${bindir}/qt4-demos - for binary in `find demos -perm 0755 -type f` - do - install -m 0755 $binary ${D}${bindir}/qt4-demos/ - done - rm ${D}${bindir}/rcc ${D}${bindir}/uic ${D}${bindir}/moc -} - require qt4-x11-free.inc - SRC_URI += " \ file://0002-fix-resinit-declaration.patch;patch=1 \ file://0006-freetype-host-includes.patch;patch=1 \ diff --git a/packages/qt4/qt_packaging.inc b/packages/qt4/qt_packaging.inc index 86ab0e784c..d19c6f8295 100644 --- a/packages/qt4/qt_packaging.inc +++ b/packages/qt4/qt_packaging.inc @@ -109,3 +109,15 @@ python populate_packages_prepend() { translationdir = bb.data.expand('${datadir}/qtopia/translations/', d) do_split_packages(d, translationdir, '^qt_(.*)\.qm$', 'qtopia-translation-%s', 'Qtopia translation for %s', extra_depends='' ) } + + +do_install() { + oe_runmake install INSTALL_ROOT=${D} + + # These are host binaries, we should only use them in staging + rm -rf ${D}/${bindir} + rm -rf ${D}/${datadir}/mkspecs + + install -d ${D}/${libdir}/fonts + touch ${D}/${libdir}/fonts/fontdir +} diff --git a/packages/qt4/qt_staging.inc b/packages/qt4/qt_staging.inc new file mode 100644 index 0000000000..ecfe0bb321 --- /dev/null +++ b/packages/qt4/qt_staging.inc @@ -0,0 +1,25 @@ +# Fixing up some Qt .pc files +do_stage_append() { + cd ${STAGING_LIBDIR}/pkgconfig + sed -i s#"-L${S}/lib"##g Qt*.pc + sed -i s#"moc_location=${S}/bin/moc"#moc_location=${STAGING_BINDIR}/moc4# Qt*.pc + sed -i s#"uic_location=${S}/bin/uic"#uic_location=${STAGING_BINDIR}/uic4# Qt*.pc +} + +STAGE_TEMP = "${WORKDIR}/temp-staging" +do_stage() { + rm -rf ${STAGE_TEMP} + mkdir -p ${STAGE_TEMP} + oe_runmake install INSTALL_ROOT=${STAGE_TEMP} + + install -d ${STAGING_INCDIR}/${QT_DIR_NAME} + install -d ${STAGING_LIBDIR}/${QT_DIR_NAME} + cp -pPRf ${STAGE_TEMP}/$includedir/* ${STAGING_INCDIR}/${QT_DIR_NAME}/ + + for i in ${STAGE_TEMP}/${libdir}/*.la + do + oe_libinstall -C ${STAGE_TEMP}/${libdir} -so $(basename $i .la) ${STAGING_LIBDIR}/qtopiacore4 + done + + rm -rf ${STAGE_TEMP} +} diff --git a/packages/qt4/qtopia-core.inc b/packages/qt4/qtopia-core.inc index 204378af07..178d0a354a 100644 --- a/packages/qt4/qtopia-core.inc +++ b/packages/qt4/qtopia-core.inc @@ -21,5 +21,6 @@ QT_LIBRARY_NAME = "libQt" QT_DIR_NAME = "qtopia" require qt_depends.inc require qt_packaging.inc +require qt_staging.inc inherit qtopia4core diff --git a/packages/qt4/qtopia-core_4.3.3.bb b/packages/qt4/qtopia-core_4.3.3.bb index e7187b9309..65f0203ea0 100644 --- a/packages/qt4/qtopia-core_4.3.3.bb +++ b/packages/qt4/qtopia-core_4.3.3.bb @@ -1,43 +1 @@ -QT_CONFIG_FLAGS += " \ - -nomake demos -nomake examples -nomake tools \ - -qt-mouse-tslib -qt-gfx-transformed -embedded ${QT_ARCH}" - -do_stage_append() { - echo "Fixing up Qt" - cd ${STAGING_LIBDIR}/pkgconfig - sed -i s#"-L${S}/lib"##g Qt*.pc - sed -i s#"moc_location=${S}/bin/moc"#moc_location=${STAGING_BINDIR}/moc4# Qt*.pc - sed -i s#"uic_location=${S}/bin/uic"#uic_location=${STAGING_BINDIR}/uic4# Qt*.pc -} - -do_install() { - oe_runmake install INSTALL_ROOT=${D} - - # These are host binaries, we should only use them in staging - rm -rf ${D}/${bindir} - rm -rf ${D}/${datadir}/mkspecs - - touch ${D}/${libdir}/fonts/fontdir -} - - - -STAGE_TEMP = "${WORKDIR}/temp-staging" -do_stage() { - rm -rf ${STAGE_TEMP} - mkdir -p ${STAGE_TEMP} - oe_runmake install INSTALL_ROOT=${STAGE_TEMP} - - install -d ${STAGING_INCDIR}/qtopiacore4 - install -d ${STAGING_LIBDIR}/qtopiacore4 - cp -pPRf ${STAGE_TEMP}/$includedir/* ${STAGING_INCDIR}/qtopiacore4/ - - for i in ${STAGE_TEMP}/${libdir}/*.la - do - oe_libinstall -C ${STAGE_TEMP}/${libdir} -so $(basename $i .la) ${STAGING_LIBDIR}/qtopiacore4 - done - - rm -rf ${STAGE_TEMP} -} - require qtopia-core.inc -- cgit v1.2.3 From af05c21af95632ec2fb24f0a74d3333218790332 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Mon, 24 Dec 2007 13:45:00 +0000 Subject: packages/qt4/qtopia-core_4.2.0: Use the common ${PN}.inc as well --- packages/qt4/qtopia-core_4.2.0.bb | 219 +------------------------------------- 1 file changed, 1 insertion(+), 218 deletions(-) (limited to 'packages/qt4') diff --git a/packages/qt4/qtopia-core_4.2.0.bb b/packages/qt4/qtopia-core_4.2.0.bb index 1e10fcde77..bd54419686 100644 --- a/packages/qt4/qtopia-core_4.2.0.bb +++ b/packages/qt4/qtopia-core_4.2.0.bb @@ -1,218 +1 @@ -DESCRIPTION = "Qtopia Core (aka: Qt/Embedded)" -SECTION = "libs" -LICENSE = "GPL" -PRIORITY = "optional" -HOMEPAGE = "http://www.trolltech.com" -DEPENDS = "glib-2.0 freetype dbus-glib tslib" - -PR = "r2" - -SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.tar.gz \ - file://linux-oe-qmake.conf" - -S = "${WORKDIR}/qtopia-core-opensource-src-${PV}" - -inherit pkgconfig - -# I'm not sure about the globals QTDIR and QTOPIADIR, or if they're even -# needed. On the same issue, I'm not sure what the best place for all the -# Qtopia Core related files is. For now, I've just put the libraries in -# ${libdir}, the includes in ${includedir} etc. Other possibilities are -# to sandbox everything (e.g., in /usr/local/Trolltech or /opt/Qtopia oslt), -# or to put libraries in /usr/lib/qtopia (or /usr/lib/qt4) etc. As said, -# I'm fine with this, but I'm also fine with another solution. - -# set QTDIR and QTOPIADIR globally (change QTOPIA dir to QTDIR?) -# This should be the default for other packages: -# export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt4" -# export QTOPIADIR = "${STAGING_DIR}/${HOST_SYS}/qtopia" -export QTDIR = "${S}" -export QTOPIADIR = "${S}" - -# Qmake gets confused by environment variables, as it builds both HOST -# and TARGET objects. The correct compiler settings come from the mkspec -# and are set with the OE_QMAKE_ variables -PARALLEL_MAKE = "" -EXTRA_OEMAKE = " MAKEFLAGS= " - -# This stuff could also be done by inheriting qmake, but I didn't want to -# bother with the qmake separation from the Qtopia configure. This separation -# is probably nothing more than a patch on the configure and setting some -# environment variables to use our own qmake/moc/uic, but that's something -# to figure out later. -export OE_QMAKE_CC="${CC}" -export OE_QMAKE_CFLAGS="${CFLAGS}" -export OE_QMAKE_CXX="${CXX}" -export OE_QMAKE_CXXFLAGS="-fno-exceptions ${CXXFLAGS}" -export OE_QMAKE_LDFLAGS="${LDFLAGS}" -export OE_QMAKE_LINK="${CXX}" -export OE_QMAKE_AR="${AR}" -export OE_QMAKE_RANLIB="${RANLIB}" -export OE_QMAKE_STRIP="echo" -export OE_QMAKE_RPATH="-Wl,-rpath-link," -export OE_QMAKE_INCDIR_QT="${QTDIR}/include" -export OE_QMAKE_LIBDIR_QT="${QTDIR}/lib" -export OE_QMAKE_INCDIR_QTOPIA="${QTOPIADIR}/include" -export OE_QMAKE_LIBDIR_QTOPIA="${QTOPIADIR}/lib" - -require qt4_arch.inc -QT_ARCH := "${@qte_arch(d)}" - -# FIXME use info.bbclass once it has been commited -QT_ENDIAN = "-little-endian" - -# We don't build the examples and demos atm. They're quite big and not used -# frequently, only for testing maybe. Feel free to change and to package -# them separately. -QT_CONFIG_FLAGS = "-release \ - -no-cups -no-accessibility \ - -nomake demos -nomake examples -nomake tools \ - -qt-mouse-tslib" - -do_configure() { - # Install the OE build templates (something which might be done - # by inheriting qmake) - for template in linux-oe-g++ linux-uclibc-oe-g++ linux-gnueabi-oe-g++ - do - install -d ${S}/mkspecs/$template - install -m 0644 ${WORKDIR}/linux-oe-qmake.conf \ - ${S}/mkspecs/$template/qmake.conf - ln -sf ../linux-g++/qplatformdefs.h \ - ${S}/mkspecs/$template/qplatformdefs.h - done - - # The Qmake Makefile generation doesn't like these environment - # variables, as they mess up the HOST tools builds - unset CC - unset CXX - unset CFLAGS - unset CXXFLAGS - unset LDFLAGS - - # For rationale behind the installation locations, see remark above - echo yes | ./configure -v \ - -prefix ${prefix} \ - -bindir ${bindir} \ - -libdir ${libdir} \ - -docdir ${docdir}/qtopia \ - -headerdir ${includedir} \ - -plugindir ${datadir}/qtopia/plugins \ - -datadir ${datadir} \ - -translationdir ${datadir}/qtopia/translations \ - -sysconfdir ${sysconfdir} \ - -examplesdir ${bindir}/qtopia/examples \ - -demosdir ${bindir}/qtopia/demos \ - -embedded ${QT_ARCH} ${QT_ENDIAN} -fast \ - -xplatform linux-oe-g++ \ - ${QT_CONFIG_FLAGS} \ - -L${STAGING_LIBDIR} -I${STAGING_INCDIR} -} - -do_install() { - oe_runmake install INSTALL_ROOT=${D} - - # These are host binaries, we should only use them in staging - rm -rf ${D}/${bindir} - rm -rf ${D}/${datadir}/mkspecs - - touch ${D}/${libdir}/fonts/fontdir - - #TT is still new to pkgconfig, so fix it up - install -d ${D}${libdir}/pkgconfig - mv ${D}/${libdir}/*.pc ${D}${libdir}/pkgconfig/ -} - -# We might want to package all the libraries separately, so you can really -# fine-tune what to install. This is e.g. done in qt4-x11-free_4.1.2.bb. -# What should these packages be called? I'm tempted to call them the same -# as in qt4 version, as the API is supposed to be compatible, e.g. -# libqtcore4 and libqtgui4. This will however conflict if you have QT and -# Qtopia, but this is something you don't want anyway, I guess. -# Another solution is making virtual/libqtfoo4, and DEPENDing on that one -# and let both the PACKAGES in QT and Qtopia PROVIDE these. The packages -# themselves could then be called libqtopiafoo4. -# I'll postpone this discussion by not making separate Qtopia packages. - -# Also, I don't package the plugins and translations atm, I don't use them -# and I don't feel like thinking about a sensible separation. - -PACKAGES =+ " libqtcore libqtcore-dev libqtcore-dbg \ - libqtxml libqtxml-dev libqtxml-dbg \ - libqtgui libqtgui-dev libqtgui-dbg \ - libqtsql libqtsql-dev libqtsql-dbg \ - libqtnetwork libqtnetwork-dev libqtnetwork-dbg \ - libqtsvg libqtsvg-dev libqtsvg-dbg \ - libqt3support libqt3support-dev libqt3support-dbg \ - qtopia-core-plugins qtopia-core-plugins-dbg\ - " - -PACKAGES += " ${PN}-fonts " - -# The default included fonts are around 75MB and consist of a number of -# FreeType-renderable fonts as well as QPF (Qtopia Prerendered Fonts). -# As FreeType is generally slow on embedded platforms, and 75MB is -# quite huge, we downsize the fonts dir in the do_install. I've decided -# to include only the QPF (Helvetica and Fixed), amounting to 500KB. This -# also results in tremendously faster application startup time. -FILES_libqtcore += " ${libdir}/fonts/helvetic* ${libdir}/fonts/fixed* ${D}/${libdir}/fonts/fontdir" -FILES_${PN}-fonts = "${libdir}/fonts" - -FILES_qtopia-core-plugins += "${datadir}/qtopia/plugins/*/*.so" -FILES_qtopia-core-plugins-dbg += "${datadir}/qtopia/plugins/*/.debug/*.so" - -FILES_libqtcore += "${libdir}/libQtCore.so.*" -FILES_libqtxml += "${libdir}/libQtXml.so.*" -FILES_libqtgui += "${libdir}/libQtGui.so.*" -FILES_libqtsql += "${libdir}/libQtSql.so.*" -FILES_libqtnetwork += "${libdir}/libQtNetwork.so.*" -FILES_libqtsvg += "${libdir}/libQtSvg.so.*" -FILES_libqt3support += "${libdir}/libQt3Support.so.*" - -FILES_libqtcore-dev += "${libdir}/*QtCore.*" -FILES_libqtxml-dev += "${libdir}/*QtXml.*" -FILES_libqtgui-dev += "${libdir}/*QtGui.*" -FILES_libqtsql-dev += "${libdir}/*QtSql.*" -FILES_libqtnetwork-dev += "${libdir}/*QtNetwork.*" -FILES_libqtsvg-dev += "${libdir}/*QtSvg.*" -FILES_libqt3support-dev += "${libdir}/*Qt3Support.*" - -FILES_libqtcore-dbg += "${libdir}/.debug/libQtCore*" -FILES_libqtxml-dbg += "${libdir}/.debug/libQtXml*" -FILES_libqtgui-dbg += "${libdir}/.debug/libQtGui*" -FILES_libqtsql-dbg += "${libdir}/.debug/libQtSql*" -FILES_libqtnetwork-dbg += "${libdir}/.debug/libQtNetwork*" -FILES_libqtsvg-dbg += "${libdir}/.debug/libQtSvg*" -FILES_libqt3support-dbg += "${libdir}/.debug/libQt3Support*" - - -python populate_packages_prepend() { - translationdir = bb.data.expand('${datadir}/qtopia/translations/', d) - do_split_packages(d, translationdir, '^qt_(.*)\.qm$', 'qtopia-translation-%s', 'Qtopia translation for %s', extra_depends='' ) -} - - - -STAGE_TEMP = "${WORKDIR}/temp-staging" -do_stage() { - rm -rf ${STAGE_TEMP} - mkdir -p ${STAGE_TEMP} - oe_runmake install INSTALL_ROOT=${STAGE_TEMP} - - cp -pPRf ${STAGE_TEMP}/$includedir/* ${STAGING_INCDIR} - - for i in ${STAGE_TEMP}/${libdir}/*.la - do - oe_libinstall -C ${STAGE_TEMP}/${libdir} \ - -so $(basename $i .la) ${STAGING_LIBDIR} - done - - # Install qmake/moc/uic/rcc in staging (is this needed?) - install -m 0755 ${STAGE_TEMP}/${bindir}/rcc ${STAGING_BINDIR} - install -m 0755 ${STAGE_TEMP}/${bindir}/moc ${STAGING_BINDIR} - install -m 0755 ${STAGE_TEMP}/${bindir}/uic ${STAGING_BINDIR} - install -m 0755 ${STAGE_TEMP}/${bindir}/qmake ${STAGING_BINDIR} - # what about mkspecs? - - rm -rf ${STAGE_TEMP} -} - +require ${PN}.inc -- cgit v1.2.3 From c101c9c7cd3c506f0e7440fc6641bc34055c2459 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Mon, 24 Dec 2007 21:44:57 +0000 Subject: packages/qt4/qt4-x11-free.inc,qtopia-core.inc: Require the qt_configuration.inc as well (add fontconfig to the depends of the X11 build as well, I wish I would have an interactive mode for mtn...) --- packages/qt4/qt4-x11-free.inc | 3 ++- packages/qt4/qtopia-core.inc | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'packages/qt4') diff --git a/packages/qt4/qt4-x11-free.inc b/packages/qt4/qt4-x11-free.inc index fe9138699f..5eb702ce3b 100644 --- a/packages/qt4/qt4-x11-free.inc +++ b/packages/qt4/qt4-x11-free.inc @@ -3,7 +3,7 @@ SECTION = "x11/libs" PRIORITY = "optional" HOMEPAGE = "http://www.trolltech.com" LICENSE = "GPL QPL" -DEPENDS += "virtual/libx11 xft libxext libxrender libxrandr libxcursor" +DEPENDS += "virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor" PROVIDES = "qt4x11" PR = "r6" @@ -21,6 +21,7 @@ QT_BASE_LIB = "libqt" QT_LIBRARY_NAME = "libQt" QT_DIR_NAME = "qt4" require qt_depends.inc +require qt_configuration.inc require qt_packaging.inc require qt_staging.inc diff --git a/packages/qt4/qtopia-core.inc b/packages/qt4/qtopia-core.inc index 178d0a354a..09b93ff970 100644 --- a/packages/qt4/qtopia-core.inc +++ b/packages/qt4/qtopia-core.inc @@ -20,6 +20,7 @@ QT_BASE_LIB = "libqtopiacore" QT_LIBRARY_NAME = "libQt" QT_DIR_NAME = "qtopia" require qt_depends.inc +require qt_configuration.inc require qt_packaging.inc require qt_staging.inc -- cgit v1.2.3 From e1311f8ec38ad3db4488887fe993987c66b8f79c Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Tue, 25 Dec 2007 00:51:57 +0000 Subject: packages/qt4/qt_configuration.inc: Make use of the new QT_CONF_PATH, correct the configure line Generate a qt.conf in do_configure with the paths we pass to the ./configure script. --- packages/qt4/qt_configuration.inc | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) (limited to 'packages/qt4') diff --git a/packages/qt4/qt_configuration.inc b/packages/qt4/qt_configuration.inc index 921b110618..9388fb3933 100644 --- a/packages/qt4/qt_configuration.inc +++ b/packages/qt4/qt_configuration.inc @@ -17,17 +17,33 @@ EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake2 -after \ AR="${TARGET_PREFIX}ar cqs" \ MOC="${STAGING_BINDIR_NATIVE}/moc4" UIC="${STAGING_BINDIR_NATIVE}/uic4" MAKE="make -e"' +export QT_CONF_PATH="${WORKDIR}/qt.conf" + do_configure() { unset QMAKESPEC + unset QTDIR ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake ln -s linux-g++ mkspecs/${TARGET_OS}-oe-g++ + echo "[Paths]" > $QT_CONF_PATH + echo "Prefix=${prefix}" >> $QT_CONF_PATH + echo "Documentation=${docdir}/${QT_DIR_NAME}" >> $QT_CONF_PATH + echo "Headers=${includedir}/${QT_DIR_NAME}" >> $QT_CONF_PATH + echo "Libraries=${libdir}" >> $QT_CONF_PATH + echo "Binaries=${bindir}" >> $QT_CONF_PATH + echo "Plugins=${libdir}/${QT_DIR_NAME}/plugins" >> $QT_CONF_PATH + echo "Data=${datadir}/${QT_DIR_NAME}" >> $QT_CONF_PATH + echo "Translations=${datadir}/${QT_DIR_NAME}/translations" >> $QT_CONF_PATH + echo "Settings=${sysconfdir}/${QT_DIR_NAME}" >> $QT_CONF_PATH + echo "Examples=${bindir}/${QT_DIR_NAME}/examples" >> $QT_CONF_PATH + echo "Demos=${bindir}/${QT_DIR_NAME}/demos" >> $QT_CONF_PATH + echo yes | ./configure -v \ -prefix ${prefix} \ -bindir ${bindir} \ -libdir ${libdir} \ - -datadir ${datadir} \ - -sysconfdir ${sysconfdir} \ + -datadir ${datadir}/${QT_DIR_NAME} \ + -sysconfdir ${sysconfdir}/${QT_DIR_NAME} \ -docdir ${docdir}/${QT_DIR_NAME} \ -headerdir ${includedir}/${QT_DIR_NAME} \ -plugindir ${libdir}/${QT_DIR_NAME}/plugins \ @@ -37,9 +53,9 @@ do_configure() { -platform ${TARGET_OS}-oe-g++ \ -xplatform ${TARGET_OS}-oe-g++ \ -embedded ${QT_ARCH} ${QT_ENDIAN} -fast \ - -crossarch ${QT_ARCH} + -crossarch ${QT_ARCH} \ ${QT_CONFIG_FLAGS} -fast \ - -L${STAGING_LIBDIR} -I${STAGING_INCDIR} + -L${STAGING_LIBDIR} -I${STAGING_INCDIR} \ -I${STAGING_INCDIR}/freetype2 } -- cgit v1.2.3 From 29a60a1ea256d4bd3f91946afbb97079be696b3b Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Tue, 25 Dec 2007 00:56:32 +0000 Subject: packages/qt4/qt_packaging.inc: Only install Qtopia translations if they exist. --- packages/qt4/qt_packaging.inc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'packages/qt4') diff --git a/packages/qt4/qt_packaging.inc b/packages/qt4/qt_packaging.inc index d19c6f8295..46f578b64a 100644 --- a/packages/qt4/qt_packaging.inc +++ b/packages/qt4/qt_packaging.inc @@ -106,8 +106,11 @@ FILES_${PN}-dev += "${bindir}/rcc ${bindir}/uic* ${bindir}/moc ${b FILES_${PN}-dbg += "${bindir}/*/.debug ${plugindir}/.debug" python populate_packages_prepend() { - translationdir = bb.data.expand('${datadir}/qtopia/translations/', d) - do_split_packages(d, translationdir, '^qt_(.*)\.qm$', 'qtopia-translation-%s', 'Qtopia translation for %s', extra_depends='' ) + import os + if os.path.exists(bb.data.expand('${D}/${datadir}/qtopia/translationdir', d)): + + translationdir = bb.data.expand('${datadir}/qtopia/translations/', d) + do_split_packages(d, translationdir, '^qt_(.*)\.qm$', 'qtopia-translation-%s', 'Qtopia translation for %s', extra_depends='' ) } -- cgit v1.2.3 From 477305caf79f148776777c9b4b4bc028a4a5e56b Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Tue, 25 Dec 2007 22:38:41 +0000 Subject: packages/qt4/qt_configuration.inc: Keep PARALLEL_MAKE untouched the buildsystem should handle deps --- packages/qt4/qt_configuration.inc | 1 - 1 file changed, 1 deletion(-) (limited to 'packages/qt4') diff --git a/packages/qt4/qt_configuration.inc b/packages/qt4/qt_configuration.inc index 9388fb3933..e487988b41 100644 --- a/packages/qt4/qt_configuration.inc +++ b/packages/qt4/qt_configuration.inc @@ -8,7 +8,6 @@ QT_CONFIG_FLAGS = "-release -no-cups -no-accessibility -reduce-relocations \ -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql -no-sql-sqlite -no-sql-sqlite2 \ -pch -qdbus -stl -glib" -PARALLEL_MAKE = "" EXTRA_OEMAKE = "-e" EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake2 -after \ -- cgit v1.2.3 From 21a05ca95621f0539fff378d00491a355b9c163b Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Tue, 25 Dec 2007 22:42:16 +0000 Subject: packages/qt4/qt_configuration.inc: ccache and pch conflict with each other The time spent on recompiling outweights the time saved using pch. So disable pch and have better recompile times. --- packages/qt4/qt_configuration.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/qt4') diff --git a/packages/qt4/qt_configuration.inc b/packages/qt4/qt_configuration.inc index e487988b41..aa4f8c6c5e 100644 --- a/packages/qt4/qt_configuration.inc +++ b/packages/qt4/qt_configuration.inc @@ -6,7 +6,7 @@ QT_CONFIG_FLAGS = "-release -no-cups -no-accessibility -reduce-relocations \ -shared -no-nas-sound -no-sm -no-nis \ -qt-gif -system-libjpeg -system-libpng -system-zlib \ -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql -no-sql-sqlite -no-sql-sqlite2 \ - -pch -qdbus -stl -glib" + -no-pch -qdbus -stl -glib" EXTRA_OEMAKE = "-e" -- cgit v1.2.3 From 99e3469a161ffa1bdac23ee7b368d40a31b2ebab Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Tue, 25 Dec 2007 22:42:51 +0000 Subject: packages/qt4/qt4-x11-free,qtopia-core: Work on properly packaging Qt4 -QT_LIBRARY_NAME lost the lib prefix to make it usable with .pc files -Add headers to the -dev packages -Look in the right directory for the plugins remains -Get rid off the mkspecs before packaging -Attempt to package translations --- packages/qt4/qt4-x11-free.inc | 2 +- packages/qt4/qt_packaging.inc | 157 ++++++++++++++++++++++++------------------ packages/qt4/qtopia-core.inc | 2 +- 3 files changed, 91 insertions(+), 70 deletions(-) (limited to 'packages/qt4') diff --git a/packages/qt4/qt4-x11-free.inc b/packages/qt4/qt4-x11-free.inc index 5eb702ce3b..c758d4aab1 100644 --- a/packages/qt4/qt4-x11-free.inc +++ b/packages/qt4/qt4-x11-free.inc @@ -18,7 +18,7 @@ S = "${WORKDIR}/qt-x11-opensource-src-${PV}" QT_CONFIG_FLAGS += "-no-xinerama -no-tablet -no-xkb -no-opengl" QT_BASE_NAME = "qt4" QT_BASE_LIB = "libqt" -QT_LIBRARY_NAME = "libQt" +QT_LIBRARY_NAME = "Qt" QT_DIR_NAME = "qt4" require qt_depends.inc require qt_configuration.inc diff --git a/packages/qt4/qt_packaging.inc b/packages/qt4/qt_packaging.inc index 46f578b64a..2ab6fefbd0 100644 --- a/packages/qt4/qt_packaging.inc +++ b/packages/qt4/qt_packaging.inc @@ -2,7 +2,7 @@ NONDEV_PACKAGES = "${QT_BASE_LIB}core4 ${QT_BASE_LIB}gui4 ${QT_BASE_LIB}network4 ${QT_BASE_LIB}sql4 ${QT_BASE_LIB}svg4 ${QT_BASE_LIB}test4 ${QT_BASE_LIB}xml4 \ ${QT_BASE_LIB}designer4 ${QT_BASE_LIB}designercomponents4 \ ${QT_BASE_LIB}3support4 ${QT_BASE_LIB}assistantclient4 ${QT_BASE_LIB}script4 \ - ${QT_BASE_LIB}dbus4 \ + ${QT_BASE_LIB}dbus4 ${QT_BASE_LIB}opengl4 \ ${QT_BASE_NAME}-assistant ${QT_BASE_NAME}-common \ ${QT_BASE_NAME}-designer \ ${QT_BASE_NAME}-demos ${QT_BASE_NAME}-examples \ @@ -17,70 +17,95 @@ NONDEV_PACKAGES = "${QT_BASE_LIB}core4 ${QT_BASE_LIB}gui4 ${QT_BASE_LIB}network4 ${QT_BASE_NAME}-plugins-iconengines \ ${QT_BASE_NAME}-fonts " -DEV_PACKAGES += "${QT_BASE_LIB}core4-dev ${QT_BASE_LIB}core4-dbg \ - ${QT_BASE_LIB}gui4-dev ${QT_BASE_LIB}gui4-dbg \ - ${QT_BASE_LIB}network4-dev ${QT_BASE_LIB}network4-dbg \ - ${QT_BASE_LIB}sql4-dev ${QT_BASE_LIB}sql4-dbg \ - ${QT_BASE_LIB}svg4-dev ${QT_BASE_LIB}svg4-dbg \ - ${QT_BASE_LIB}test4-dev ${QT_BASE_LIB}test4-dbg \ - ${QT_BASE_LIB}xml4-dev ${QT_BASE_LIB}xml4-dbg \ - ${QT_BASE_LIB}designer4-dev ${QT_BASE_LIB}designer4-dbg \ - ${QT_BASE_LIB}designercomponents4-dev ${QT_BASE_LIB}designercomponents4-dbg \ - ${QT_BASE_LIB}3support4-dev ${QT_BASE_LIB}3support4-dbg \ - ${QT_BASE_LIB}assistantclient4-dev ${QT_BASE_LIB}assistantclient4-dbg \ - ${QT_BASE_LIB}script4-dev ${QT_BASE_LIB}script4-dbg \ - ${QT_BASE_LIB}dbus4-dev ${QT_BASE_LIB}dbus4-dbg " - -PACKAGES += "${DEV_PACKAGES} ${NONDEV_PACKAGES}" +DEV_PACKAGES += "${QT_BASE_LIB}core4-dev \ + ${QT_BASE_LIB}gui4-dev \ + ${QT_BASE_LIB}network4-dev \ + ${QT_BASE_LIB}sql4-dev \ + ${QT_BASE_LIB}svg4-dev \ + ${QT_BASE_LIB}test4-dev \ + ${QT_BASE_LIB}xml4-dev \ + ${QT_BASE_LIB}designer4-dev \ + ${QT_BASE_LIB}designercomponents4-dev \ + ${QT_BASE_LIB}3support4-dev \ + ${QT_BASE_LIB}assistantclient4-dev \ + ${QT_BASE_LIB}script4-dev \ + ${QT_BASE_LIB}dbus4-dev \ + ${QT_BASE_LIB}opengl4-dev \ + ${QT_BASE_LIB}uitools4-dev \ + ${QT_BASE_LIB}-documentation" + +DBG_PACKAGES += "${QT_BASE_LIB}core4-dbg \ + ${QT_BASE_LIB}gui4-dbg \ + ${QT_BASE_LIB}network4-dbg \ + ${QT_BASE_LIB}sql4-dbg \ + ${QT_BASE_LIB}svg4-dbg \ + ${QT_BASE_LIB}test4-dbg \ + ${QT_BASE_LIB}xml4-dbg \ + ${QT_BASE_LIB}designer4-dbg \ + ${QT_BASE_LIB}designercomponents4-dbg \ + ${QT_BASE_LIB}3support4-dbg \ + ${QT_BASE_LIB}assistantclient4-dbg \ + ${QT_BASE_LIB}script4-dbg \ + ${QT_BASE_LIB}dbus4-dbg \ + ${QT_BASE_LIB}opengl4-dbg " + + +PACKAGES += "${DEV_PACKAGES} ${NONDEV_PACKAGES} ${DBG_PACKAGES}" ALLOW_EMPTY_${PN} = "1" -ALLOW_EMPTY_${PN}-dev = "1" -FILES_${PN} = "" -FILES_${PN}-dev = "" +FILES_${PN} = "" +FILES_${PN}-dev = " ${includedir}/${QT_DIR_NAME}/Qt/*" +FILES_${PN}-dbg = "${bindir}/*/.debug ${libdir}/${QT_DIR_NAME}/plugins/*/.debug/*.so" RDEPENDS_${PN} = "${NONDEV_PACKAGES}" RDEPENDS_${PN}-dev = "${DEV_PACKAGES}" +RDEPENDS_${PN}-dbg = "${DBG_PACKAGES}" + + +FILES_${QT_BASE_LIB}core4 = "${libdir}/lib${QT_LIBRARY_NAME}Core.so.*" +FILES_${QT_BASE_LIB}core4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Core.so ${includedir}/${QT_DIR_NAME}/QtCore* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Core.pc" +FILES_${QT_BASE_LIB}core4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Core*" +FILES_${QT_BASE_LIB}gui4 = "${libdir}/lib${QT_LIBRARY_NAME}Gui.so.*" +FILES_${QT_BASE_LIB}gui4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Gui.so ${includedir}/${QT_DIR_NAME}/QtGui* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Gui.pc" +FILES_${QT_BASE_LIB}gui4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Gui*" +FILES_${QT_BASE_LIB}network4 = "${libdir}/lib${QT_LIBRARY_NAME}Network.so.*" +FILES_${QT_BASE_LIB}network4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Network.so ${includedir}/${QT_DIR_NAME}/QtNetwork* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Network.pc" +FILES_${QT_BASE_LIB}network4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Network*" +FILES_${QT_BASE_LIB}sql4 = "${libdir}/lib${QT_LIBRARY_NAME}Sql.so.*" +FILES_${QT_BASE_LIB}sql4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Sql.so ${includedir}/${QT_DIR_NAME}/QtSql* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Sql.pc" +FILES_${QT_BASE_LIB}sql4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Sql*" +FILES_${QT_BASE_LIB}svg4 = "${libdir}/lib${QT_LIBRARY_NAME}Svg.so.*" +FILES_${QT_BASE_LIB}svg4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Svg.so ${includedir}/${QT_DIR_NAME}/QtSvg* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Svg.pc" +FILES_${QT_BASE_LIB}svg4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Svg*" +FILES_${QT_BASE_LIB}test4 = "${libdir}/lib${QT_LIBRARY_NAME}Test.so.*" +FILES_${QT_BASE_LIB}test4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Test.so ${includedir}/${QT_DIR_NAME}/QtTest* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Test.pc" +FILES_${QT_BASE_LIB}test4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Test*" +FILES_${QT_BASE_LIB}xml4 = "${libdir}/lib${QT_LIBRARY_NAME}Xml.so.*" +FILES_${QT_BASE_LIB}xml4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Xml.so ${includedir}/${QT_DIR_NAME}/QtXml* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Xml.pc" +FILES_${QT_BASE_LIB}xml4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Xml*" +FILES_${QT_BASE_LIB}designer4 = "${libdir}/lib${QT_LIBRARY_NAME}Designer.so.*" +FILES_${QT_BASE_LIB}designer4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Designer.so ${includedir}/${QT_DIR_NAME}/QtDesigner* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Designer.pc" +FILES_${QT_BASE_LIB}designer4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Designer*" +FILES_${QT_BASE_LIB}designercomponents4 = "${libdir}/lib${QT_LIBRARY_NAME}DesignerComponents.so.*" +FILES_${QT_BASE_LIB}designercomponents4-dev = "${libdir}/lib${QT_LIBRARY_NAME}DesignerComponents.so" +FILES_${QT_BASE_LIB}designercomponents4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}DesignerComponents*" +FILES_${QT_BASE_LIB}3support4 = "${libdir}/lib${QT_LIBRARY_NAME}3Support.so.*" +FILES_${QT_BASE_LIB}3support4-dev = "${libdir}/lib${QT_LIBRARY_NAME}3Support.so ${includedir}/${QT_DIR_NAME}/Qt3Support* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}3Support.pc" +FILES_${QT_BASE_LIB}3support4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}3Support*" +FILES_${QT_BASE_LIB}assistantclient4 = "${libdir}/lib${QT_LIBRARY_NAME}AssistantClient.so.*" +FILES_${QT_BASE_LIB}assistantclient4-dev = "${libdir}/lib${QT_LIBRARY_NAME}AssistantClient.so ${includedir}/${QT_DIR_NAME}/QtAssistant* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}AssistantClient.pc" +FILES_${QT_BASE_LIB}assistantclient4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}AssistantClient*" +FILES_${QT_BASE_LIB}script4 = "${libdir}/lib${QT_LIBRARY_NAME}Script.so.*" +FILES_${QT_BASE_LIB}script4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Script.so ${includedir}/${QT_DIR_NAME}/QtScript* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Script.pc" +FILES_${QT_BASE_LIB}script4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Script*" +FILES_${QT_BASE_LIB}dbus4 = "${libdir}/lib${QT_LIBRARY_NAME}DBus.so.*" +FILES_${QT_BASE_LIB}dbus4-dev = "${libdir}/lib${QT_LIBRARY_NAME}DBus.sp ${includedir}/${QT_DIR_NAME}/QtDBus* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}DBus.pc" +FILES_${QT_BASE_LIB}dbus4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}DBus*" +FILES_${QT_BASE_LIB}opengl4 = "${libdir}/lib${QT_LIBRARY_NAME}OpenGL.so.*" +FILES_${QT_BASE_LIB}opengl4-dev = "${libdir}/lib${QT_LIBRARY_NAME}OpenGL.so ${includedir}/${QT_DIR_NAME}/QtOpenGL* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}OpenGL.pc" +FILES_${QT_BASE_LIB}opengl4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}OpenGL*" +FILES_${QT_BASE_LIB}uitools4-dev = "${libdir}/lib${QT_LIBRARY_NAME}* ${includedir}/${QT_DIR_NAME}/QtUiTools* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}UiTools.pc" -FILES_${QT_BASE_LIB}core4 = "${libdir}/${QT_LIBRARY_NAME}Core.so.*" -FILES_${QT_BASE_LIB}core4-dev = "${libdir}/${QT_LIBRARY_NAME}Core.so" -FILES_${QT_BASE_LIB}core4-dbg = "${libdir}/.debug/${QT_LIBRARY_NAME}Core*" -FILES_${QT_BASE_LIB}gui4 = "${libdir}/${QT_LIBRARY_NAME}Gui.so.*" -FILES_${QT_BASE_LIB}gui4-dev = "${libdir}/${QT_LIBRARY_NAME}Gui.so" -FILES_${QT_BASE_LIB}gui4-dbg = "${libdir}/.debug/${QT_LIBRARY_NAME}Gui*" -FILES_${QT_BASE_LIB}network4 = "${libdir}/${QT_LIBRARY_NAME}Network.so.*" -FILES_${QT_BASE_LIB}network4-dev = "${libdir}/${QT_LIBRARY_NAME}Network.so" -FILES_${QT_BASE_LIB}network4-dbg = "${libdir}/.debug/${QT_LIBRARY_NAME}Network*" -FILES_${QT_BASE_LIB}sql4 = "${libdir}/${QT_LIBRARY_NAME}Sql.so.*" -FILES_${QT_BASE_LIB}sql4-dev = "${libdir}/${QT_LIBRARY_NAME}Sql.so" -FILES_${QT_BASE_LIB}sql4-dbg = "${libdir}/.debug/${QT_LIBRARY_NAME}Sql*" -FILES_${QT_BASE_LIB}svg4 = "${libdir}/${QT_LIBRARY_NAME}Svg.so.*" -FILES_${QT_BASE_LIB}svg4-dev = "${libdir}/${QT_LIBRARY_NAME}Svg.so" -FILES_${QT_BASE_LIB}svg4-dbg = "${libdir}/.debug/${QT_LIBRARY_NAME}Svg*" -FILES_${QT_BASE_LIB}test4 = "${libdir}/${QT_LIBRARY_NAME}Test.so.*" -FILES_${QT_BASE_LIB}test4-dev = "${libdir}/${QT_LIBRARY_NAME}Test.so" -FILES_${QT_BASE_LIB}test4-dbg = "${libdir}/.debug/${QT_LIBRARY_NAME}Test" -FILES_${QT_BASE_LIB}xml4 = "${libdir}/${QT_LIBRARY_NAME}Xml.so.*" -FILES_${QT_BASE_LIB}xml4-dev = "${libdir}/${QT_LIBRARY_NAME}Xml.so" -FILES_${QT_BASE_LIB}xml4-dbg = "${libdir}/.debug/${QT_LIBRARY_NAME}Xml*" -FILES_${QT_BASE_LIB}designer4 = "${libdir}/${QT_LIBRARY_NAME}Designer.so.*" -FILES_${QT_BASE_LIB}designer4-dev = "${libdir}/${QT_LIBRARY_NAME}Designer.so" -FILES_${QT_BASE_LIB}designer4-dbg = "${libdir}/.debug/${QT_LIBRARY_NAME}Designer*" -FILES_${QT_BASE_LIB}designercomponents4 = "${libdir}/${QT_LIBRARY_NAME}DesignerComponents.so.*" -FILES_${QT_BASE_LIB}designercomponents4-dev = "${libdir}/${QT_LIBRARY_NAME}DesignerComponents.so" -FILES_${QT_BASE_LIB}designercomponents4-dbg = "${libdir}/.debug/${QT_LIBRARY_NAME}DesignerComponents*" -FILES_${QT_BASE_LIB}3support4 = "${libdir}/${QT_LIBRARY_NAME}3Support.so.*" -FILES_${QT_BASE_LIB}3support4-dev = "${libdir}/${QT_LIBRARY_NAME}3Support.so" -FILES_${QT_BASE_LIB}3support4-dbg = "${libdir}/.debug/${QT_LIBRARY_NAME}3Support*" -FILES_${QT_BASE_LIB}assistantclient4 = "${libdir}/${QT_LIBRARY_NAME}AssistantClient.so.*" -FILES_${QT_BASE_LIB}assistantclient4-dev = "${libdir}/${QT_LIBRARY_NAME}AssistantClient.so" -FILES_${QT_BASE_LIB}assistantclient4-dbg = "${libdir}/.debug/${QT_LIBRARY_NAME}AssistantClient*" -FILES_${QT_BASE_LIB}script4 = "${libdir}/${QT_LIBRARY_NAME}Script.so.*" -FILES_${QT_BASE_LIB}script4-dev = "${libdir}/${QT_LIBRARY_NAME}Script.so" -FILES_${QT_BASE_LIB}script4-dbg = "${libdir}/.debug/${QT_LIBRARY_NAME}Script*" -FILES_${QT_BASE_LIB}dbus4 = "${libdir}/${QT_LIBRARY_NAME}DBus.so.*" -FILES_${QT_BASE_LIB}dbus4-dev = "${libdir}/${QT_LIBRARY_NAME}DBus.so" -FILES_${QT_BASE_LIB}dbus4-dbg = "${libdir}/.debug/${QT_LIBRARY_NAME}DBus*" - FILES_${QT_BASE_NAME}-plugins-accessible = "${libdir}/${QT_DIR_NAME}/plugins/accessible/*.so" FILES_${QT_BASE_NAME}-plugins-codecs = "${libdir}/${QT_DIR_NAME}/plugins/codecs/*.so" FILES_${QT_BASE_NAME}-plugins-designer = "${libdir}/${QT_DIR_NAME}/plugins/designer/*.so" @@ -101,16 +126,12 @@ FILES_${QT_BASE_NAME}-demos = "${bindir}/qtdemo ${bindir}/${QT_BA FILES_${QT_BASE_NAME}-fonts = "${libdir}/fonts" -FILES_${PN}-dev += "${bindir}/rcc ${bindir}/uic* ${bindir}/moc ${bindir}/qmake ${bindir}/syncqt \ - ${bindir}/qt3to4 ${bindir}/findtr" -FILES_${PN}-dbg += "${bindir}/*/.debug ${plugindir}/.debug" -python populate_packages_prepend() { - import os - if os.path.exists(bb.data.expand('${D}/${datadir}/qtopia/translationdir', d)): +FILES_${QT_BASE_NAME}-documentation = "${docdir}/${QT_DIR_NAME}/html/*" - translationdir = bb.data.expand('${datadir}/qtopia/translations/', d) - do_split_packages(d, translationdir, '^qt_(.*)\.qm$', 'qtopia-translation-%s', 'Qtopia translation for %s', extra_depends='' ) +python populate_packages_prepend() { + translationdir = bb.data.expand('${datadir}/${QT_DIR_NAME}/translations/', d) + do_split_packages(d, translationdir, '^qt_(.*)\.qm$', '${QT_DIR_NAME}-translation-%s', '{PN} translation for %s', extra_depends='' ) } @@ -119,7 +140,7 @@ do_install() { # These are host binaries, we should only use them in staging rm -rf ${D}/${bindir} - rm -rf ${D}/${datadir}/mkspecs + rm -rf ${D}/${datadir}/${QT_DIR_NAME}/mkspecs install -d ${D}/${libdir}/fonts touch ${D}/${libdir}/fonts/fontdir diff --git a/packages/qt4/qtopia-core.inc b/packages/qt4/qtopia-core.inc index 09b93ff970..92d61b0776 100644 --- a/packages/qt4/qtopia-core.inc +++ b/packages/qt4/qtopia-core.inc @@ -17,7 +17,7 @@ QT_CONFIG_FLAGS += " \ -qt-mouse-tslib -qt-gfx-transformed -embedded ${QT_ARCH}" QT_BASE_NAME = "qtopiacore" QT_BASE_LIB = "libqtopiacore" -QT_LIBRARY_NAME = "libQt" +QT_LIBRARY_NAME = "Qt" QT_DIR_NAME = "qtopia" require qt_depends.inc require qt_configuration.inc -- cgit v1.2.3 From ddcaf124d81882345761e3c4c65202ed36bc6c02 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Tue, 25 Dec 2007 23:22:51 +0000 Subject: packages/qt4/qt_packaging.inc: Next round of typo fixing and trying -Don't install every library to libQtUiTools-dev :} -Try to put the .la and .prl into the -dev packages as well --- packages/qt4/qt_packaging.inc | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'packages/qt4') diff --git a/packages/qt4/qt_packaging.inc b/packages/qt4/qt_packaging.inc index 2ab6fefbd0..445cc5bcbd 100644 --- a/packages/qt4/qt_packaging.inc +++ b/packages/qt4/qt_packaging.inc @@ -62,48 +62,48 @@ RDEPENDS_${PN}-dbg = "${DBG_PACKAGES}" FILES_${QT_BASE_LIB}core4 = "${libdir}/lib${QT_LIBRARY_NAME}Core.so.*" -FILES_${QT_BASE_LIB}core4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Core.so ${includedir}/${QT_DIR_NAME}/QtCore* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Core.pc" +FILES_${QT_BASE_LIB}core4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Core.{la,prl,so} ${includedir}/${QT_DIR_NAME}/QtCore* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Core.pc" FILES_${QT_BASE_LIB}core4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Core*" FILES_${QT_BASE_LIB}gui4 = "${libdir}/lib${QT_LIBRARY_NAME}Gui.so.*" -FILES_${QT_BASE_LIB}gui4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Gui.so ${includedir}/${QT_DIR_NAME}/QtGui* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Gui.pc" +FILES_${QT_BASE_LIB}gui4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Gui.{la,prl,so} ${includedir}/${QT_DIR_NAME}/QtGui* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Gui.pc" FILES_${QT_BASE_LIB}gui4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Gui*" FILES_${QT_BASE_LIB}network4 = "${libdir}/lib${QT_LIBRARY_NAME}Network.so.*" -FILES_${QT_BASE_LIB}network4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Network.so ${includedir}/${QT_DIR_NAME}/QtNetwork* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Network.pc" +FILES_${QT_BASE_LIB}network4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Network.{la,prl,so} ${includedir}/${QT_DIR_NAME}/QtNetwork* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Network.pc" FILES_${QT_BASE_LIB}network4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Network*" FILES_${QT_BASE_LIB}sql4 = "${libdir}/lib${QT_LIBRARY_NAME}Sql.so.*" -FILES_${QT_BASE_LIB}sql4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Sql.so ${includedir}/${QT_DIR_NAME}/QtSql* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Sql.pc" +FILES_${QT_BASE_LIB}sql4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Sql.{la,prl,so} ${includedir}/${QT_DIR_NAME}/QtSql* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Sql.pc" FILES_${QT_BASE_LIB}sql4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Sql*" FILES_${QT_BASE_LIB}svg4 = "${libdir}/lib${QT_LIBRARY_NAME}Svg.so.*" -FILES_${QT_BASE_LIB}svg4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Svg.so ${includedir}/${QT_DIR_NAME}/QtSvg* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Svg.pc" +FILES_${QT_BASE_LIB}svg4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Svg.{la,prl,so} ${includedir}/${QT_DIR_NAME}/QtSvg* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Svg.pc" FILES_${QT_BASE_LIB}svg4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Svg*" FILES_${QT_BASE_LIB}test4 = "${libdir}/lib${QT_LIBRARY_NAME}Test.so.*" -FILES_${QT_BASE_LIB}test4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Test.so ${includedir}/${QT_DIR_NAME}/QtTest* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Test.pc" +FILES_${QT_BASE_LIB}test4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Test.{la,prl,so} ${includedir}/${QT_DIR_NAME}/QtTest* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Test.pc" FILES_${QT_BASE_LIB}test4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Test*" FILES_${QT_BASE_LIB}xml4 = "${libdir}/lib${QT_LIBRARY_NAME}Xml.so.*" -FILES_${QT_BASE_LIB}xml4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Xml.so ${includedir}/${QT_DIR_NAME}/QtXml* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Xml.pc" +FILES_${QT_BASE_LIB}xml4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Xml.{la,prl,so} ${includedir}/${QT_DIR_NAME}/QtXml* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Xml.pc" FILES_${QT_BASE_LIB}xml4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Xml*" FILES_${QT_BASE_LIB}designer4 = "${libdir}/lib${QT_LIBRARY_NAME}Designer.so.*" -FILES_${QT_BASE_LIB}designer4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Designer.so ${includedir}/${QT_DIR_NAME}/QtDesigner* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Designer.pc" +FILES_${QT_BASE_LIB}designer4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Designer.{la,prl,so} ${includedir}/${QT_DIR_NAME}/QtDesigner* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Designer.pc" FILES_${QT_BASE_LIB}designer4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Designer*" FILES_${QT_BASE_LIB}designercomponents4 = "${libdir}/lib${QT_LIBRARY_NAME}DesignerComponents.so.*" -FILES_${QT_BASE_LIB}designercomponents4-dev = "${libdir}/lib${QT_LIBRARY_NAME}DesignerComponents.so" +FILES_${QT_BASE_LIB}designercomponents4-dev = "${libdir}/lib${QT_LIBRARY_NAME}DesignerComponents.{la,prl,so}" FILES_${QT_BASE_LIB}designercomponents4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}DesignerComponents*" FILES_${QT_BASE_LIB}3support4 = "${libdir}/lib${QT_LIBRARY_NAME}3Support.so.*" -FILES_${QT_BASE_LIB}3support4-dev = "${libdir}/lib${QT_LIBRARY_NAME}3Support.so ${includedir}/${QT_DIR_NAME}/Qt3Support* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}3Support.pc" +FILES_${QT_BASE_LIB}3support4-dev = "${libdir}/lib${QT_LIBRARY_NAME}3Support.{la,prl,so} ${includedir}/${QT_DIR_NAME}/Qt3Support* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}3Support.pc" FILES_${QT_BASE_LIB}3support4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}3Support*" FILES_${QT_BASE_LIB}assistantclient4 = "${libdir}/lib${QT_LIBRARY_NAME}AssistantClient.so.*" -FILES_${QT_BASE_LIB}assistantclient4-dev = "${libdir}/lib${QT_LIBRARY_NAME}AssistantClient.so ${includedir}/${QT_DIR_NAME}/QtAssistant* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}AssistantClient.pc" +FILES_${QT_BASE_LIB}assistantclient4-dev = "${libdir}/lib${QT_LIBRARY_NAME}AssistantClient.{la,prl,so} ${includedir}/${QT_DIR_NAME}/QtAssistant* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}AssistantClient.pc" FILES_${QT_BASE_LIB}assistantclient4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}AssistantClient*" FILES_${QT_BASE_LIB}script4 = "${libdir}/lib${QT_LIBRARY_NAME}Script.so.*" -FILES_${QT_BASE_LIB}script4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Script.so ${includedir}/${QT_DIR_NAME}/QtScript* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Script.pc" +FILES_${QT_BASE_LIB}script4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Script.{la,prl,so} ${includedir}/${QT_DIR_NAME}/QtScript* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Script.pc" FILES_${QT_BASE_LIB}script4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Script*" FILES_${QT_BASE_LIB}dbus4 = "${libdir}/lib${QT_LIBRARY_NAME}DBus.so.*" -FILES_${QT_BASE_LIB}dbus4-dev = "${libdir}/lib${QT_LIBRARY_NAME}DBus.sp ${includedir}/${QT_DIR_NAME}/QtDBus* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}DBus.pc" +FILES_${QT_BASE_LIB}dbus4-dev = "${libdir}/lib${QT_LIBRARY_NAME}DBus.{la,prl,so} ${includedir}/${QT_DIR_NAME}/QtDBus* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}DBus.pc" FILES_${QT_BASE_LIB}dbus4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}DBus*" FILES_${QT_BASE_LIB}opengl4 = "${libdir}/lib${QT_LIBRARY_NAME}OpenGL.so.*" -FILES_${QT_BASE_LIB}opengl4-dev = "${libdir}/lib${QT_LIBRARY_NAME}OpenGL.so ${includedir}/${QT_DIR_NAME}/QtOpenGL* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}OpenGL.pc" +FILES_${QT_BASE_LIB}opengl4-dev = "${libdir}/lib${QT_LIBRARY_NAME}OpenGL.{la,prl,so} ${includedir}/${QT_DIR_NAME}/QtOpenGL* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}OpenGL.pc" FILES_${QT_BASE_LIB}opengl4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}OpenGL*" -FILES_${QT_BASE_LIB}uitools4-dev = "${libdir}/lib${QT_LIBRARY_NAME}* ${includedir}/${QT_DIR_NAME}/QtUiTools* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}UiTools.pc" +FILES_${QT_BASE_LIB}uitools4-dev = "${libdir}/lib${QT_LIBRARY_NAME}UiTools* ${includedir}/${QT_DIR_NAME}/QtUiTools* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}UiTools.pc" FILES_${QT_BASE_NAME}-plugins-accessible = "${libdir}/${QT_DIR_NAME}/plugins/accessible/*.so" -- cgit v1.2.3 From e2034407eb76c6a1437e59f2d5f4c95a312d72b4 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Tue, 25 Dec 2007 23:40:57 +0000 Subject: packages/qt4/qt_packaging.inc: Sadly the previous glob didn't work. Write .so, .la, .prl in the long form --- packages/qt4/qt_packaging.inc | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'packages/qt4') diff --git a/packages/qt4/qt_packaging.inc b/packages/qt4/qt_packaging.inc index 445cc5bcbd..eb361dd72f 100644 --- a/packages/qt4/qt_packaging.inc +++ b/packages/qt4/qt_packaging.inc @@ -62,46 +62,46 @@ RDEPENDS_${PN}-dbg = "${DBG_PACKAGES}" FILES_${QT_BASE_LIB}core4 = "${libdir}/lib${QT_LIBRARY_NAME}Core.so.*" -FILES_${QT_BASE_LIB}core4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Core.{la,prl,so} ${includedir}/${QT_DIR_NAME}/QtCore* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Core.pc" +FILES_${QT_BASE_LIB}core4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Core.la ${libdir}/lib${QT_LIBRARY_NAME}Core.prl ${libdir}/lib${QT_LIBRARY_NAME}Core.so ${includedir}/${QT_DIR_NAME}/QtCore* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Core.pc" FILES_${QT_BASE_LIB}core4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Core*" FILES_${QT_BASE_LIB}gui4 = "${libdir}/lib${QT_LIBRARY_NAME}Gui.so.*" -FILES_${QT_BASE_LIB}gui4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Gui.{la,prl,so} ${includedir}/${QT_DIR_NAME}/QtGui* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Gui.pc" +FILES_${QT_BASE_LIB}gui4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Gui.la ${libdir}/lib${QT_LIBRARY_NAME}Gui.prl ${libdir}/lib${QT_LIBRARY_NAME}Gui.so ${includedir}/${QT_DIR_NAME}/QtGui* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Gui.pc" FILES_${QT_BASE_LIB}gui4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Gui*" FILES_${QT_BASE_LIB}network4 = "${libdir}/lib${QT_LIBRARY_NAME}Network.so.*" -FILES_${QT_BASE_LIB}network4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Network.{la,prl,so} ${includedir}/${QT_DIR_NAME}/QtNetwork* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Network.pc" +FILES_${QT_BASE_LIB}network4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Network.la ${libdir}/lib${QT_LIBRARY_NAME}Network.prl ${libdir}/lib${QT_LIBRARY_NAME}Network.so ${includedir}/${QT_DIR_NAME}/QtNetwork* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Network.pc" FILES_${QT_BASE_LIB}network4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Network*" FILES_${QT_BASE_LIB}sql4 = "${libdir}/lib${QT_LIBRARY_NAME}Sql.so.*" -FILES_${QT_BASE_LIB}sql4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Sql.{la,prl,so} ${includedir}/${QT_DIR_NAME}/QtSql* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Sql.pc" +FILES_${QT_BASE_LIB}sql4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Sql.la ${libdir}/lib${QT_LIBRARY_NAME}Sql.prl ${libdir}/lib${QT_LIBRARY_NAME}Sql.so ${includedir}/${QT_DIR_NAME}/QtSql* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Sql.pc" FILES_${QT_BASE_LIB}sql4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Sql*" FILES_${QT_BASE_LIB}svg4 = "${libdir}/lib${QT_LIBRARY_NAME}Svg.so.*" -FILES_${QT_BASE_LIB}svg4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Svg.{la,prl,so} ${includedir}/${QT_DIR_NAME}/QtSvg* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Svg.pc" +FILES_${QT_BASE_LIB}svg4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Svg.la ${libdir}/lib${QT_LIBRARY_NAME}Svg.prl ${libdir}/lib${QT_LIBRARY_NAME}Svg.so ${includedir}/${QT_DIR_NAME}/QtSvg* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Svg.pc" FILES_${QT_BASE_LIB}svg4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Svg*" FILES_${QT_BASE_LIB}test4 = "${libdir}/lib${QT_LIBRARY_NAME}Test.so.*" -FILES_${QT_BASE_LIB}test4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Test.{la,prl,so} ${includedir}/${QT_DIR_NAME}/QtTest* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Test.pc" +FILES_${QT_BASE_LIB}test4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Test.la ${libdir}/lib${QT_LIBRARY_NAME}Test.prl ${libdir}/lib${QT_LIBRARY_NAME}Test.so ${includedir}/${QT_DIR_NAME}/QtTest* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Test.pc" FILES_${QT_BASE_LIB}test4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Test*" FILES_${QT_BASE_LIB}xml4 = "${libdir}/lib${QT_LIBRARY_NAME}Xml.so.*" -FILES_${QT_BASE_LIB}xml4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Xml.{la,prl,so} ${includedir}/${QT_DIR_NAME}/QtXml* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Xml.pc" +FILES_${QT_BASE_LIB}xml4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Xml.la ${libdir}/lib${QT_LIBRARY_NAME}Xml.prl ${libdir}/lib${QT_LIBRARY_NAME}Xml.so ${includedir}/${QT_DIR_NAME}/QtXml* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Xml.pc" FILES_${QT_BASE_LIB}xml4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Xml*" FILES_${QT_BASE_LIB}designer4 = "${libdir}/lib${QT_LIBRARY_NAME}Designer.so.*" -FILES_${QT_BASE_LIB}designer4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Designer.{la,prl,so} ${includedir}/${QT_DIR_NAME}/QtDesigner* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Designer.pc" +FILES_${QT_BASE_LIB}designer4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Designer.la ${libdir}/lib${QT_LIBRARY_NAME}Designer.prl ${libdir}/lib${QT_LIBRARY_NAME}Designer.so ${includedir}/${QT_DIR_NAME}/QtDesigner* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Designer.pc" FILES_${QT_BASE_LIB}designer4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Designer*" FILES_${QT_BASE_LIB}designercomponents4 = "${libdir}/lib${QT_LIBRARY_NAME}DesignerComponents.so.*" -FILES_${QT_BASE_LIB}designercomponents4-dev = "${libdir}/lib${QT_LIBRARY_NAME}DesignerComponents.{la,prl,so}" +FILES_${QT_BASE_LIB}designercomponents4-dev = "${libdir}/lib${QT_LIBRARY_NAME}DesignerComponents.la ${libdir}/lib${QT_LIBRARY_NAME}DesignerComponents.prl ${libdir}/lib${QT_LIBRARY_NAME}DesignerComponents.so" FILES_${QT_BASE_LIB}designercomponents4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}DesignerComponents*" FILES_${QT_BASE_LIB}3support4 = "${libdir}/lib${QT_LIBRARY_NAME}3Support.so.*" -FILES_${QT_BASE_LIB}3support4-dev = "${libdir}/lib${QT_LIBRARY_NAME}3Support.{la,prl,so} ${includedir}/${QT_DIR_NAME}/Qt3Support* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}3Support.pc" +FILES_${QT_BASE_LIB}3support4-dev = "${libdir}/lib${QT_LIBRARY_NAME}3Support.la ${libdir}/lib${QT_LIBRARY_NAME}3Support.prl ${libdir}/lib${QT_LIBRARY_NAME}3Support.so ${includedir}/${QT_DIR_NAME}/Qt3Support* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}3Support.pc" FILES_${QT_BASE_LIB}3support4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}3Support*" FILES_${QT_BASE_LIB}assistantclient4 = "${libdir}/lib${QT_LIBRARY_NAME}AssistantClient.so.*" -FILES_${QT_BASE_LIB}assistantclient4-dev = "${libdir}/lib${QT_LIBRARY_NAME}AssistantClient.{la,prl,so} ${includedir}/${QT_DIR_NAME}/QtAssistant* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}AssistantClient.pc" +FILES_${QT_BASE_LIB}assistantclient4-dev = "${libdir}/lib${QT_LIBRARY_NAME}AssistantClient.la ${libdir}/lib${QT_LIBRARY_NAME}AssistantClient.prl ${libdir}/lib${QT_LIBRARY_NAME}AssistantClient.so ${includedir}/${QT_DIR_NAME}/QtAssistant* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}AssistantClient.pc" FILES_${QT_BASE_LIB}assistantclient4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}AssistantClient*" FILES_${QT_BASE_LIB}script4 = "${libdir}/lib${QT_LIBRARY_NAME}Script.so.*" -FILES_${QT_BASE_LIB}script4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Script.{la,prl,so} ${includedir}/${QT_DIR_NAME}/QtScript* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Script.pc" +FILES_${QT_BASE_LIB}script4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Script.la ${libdir}/lib${QT_LIBRARY_NAME}Script.prl ${libdir}/lib${QT_LIBRARY_NAME}Script.so ${includedir}/${QT_DIR_NAME}/QtScript* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Script.pc" FILES_${QT_BASE_LIB}script4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Script*" FILES_${QT_BASE_LIB}dbus4 = "${libdir}/lib${QT_LIBRARY_NAME}DBus.so.*" -FILES_${QT_BASE_LIB}dbus4-dev = "${libdir}/lib${QT_LIBRARY_NAME}DBus.{la,prl,so} ${includedir}/${QT_DIR_NAME}/QtDBus* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}DBus.pc" +FILES_${QT_BASE_LIB}dbus4-dev = "${libdir}/lib${QT_LIBRARY_NAME}DBus.la ${libdir}/lib${QT_LIBRARY_NAME}DBus.prl ${libdir}/lib${QT_LIBRARY_NAME}DBus.so ${includedir}/${QT_DIR_NAME}/QtDBus* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}DBus.pc" FILES_${QT_BASE_LIB}dbus4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}DBus*" FILES_${QT_BASE_LIB}opengl4 = "${libdir}/lib${QT_LIBRARY_NAME}OpenGL.so.*" -FILES_${QT_BASE_LIB}opengl4-dev = "${libdir}/lib${QT_LIBRARY_NAME}OpenGL.{la,prl,so} ${includedir}/${QT_DIR_NAME}/QtOpenGL* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}OpenGL.pc" +FILES_${QT_BASE_LIB}opengl4-dev = "${libdir}/lib${QT_LIBRARY_NAME}OpenGL.la ${libdir}/lib${QT_LIBRARY_NAME}OpenGL.prl ${libdir}/lib${QT_LIBRARY_NAME}OpenGL.so ${includedir}/${QT_DIR_NAME}/QtOpenGL* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}OpenGL.pc" FILES_${QT_BASE_LIB}opengl4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}OpenGL*" FILES_${QT_BASE_LIB}uitools4-dev = "${libdir}/lib${QT_LIBRARY_NAME}UiTools* ${includedir}/${QT_DIR_NAME}/QtUiTools* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}UiTools.pc" -- cgit v1.2.3 From 3546c7ce48a6b59ae071228593a66caeb9394929 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 26 Dec 2007 00:01:41 +0000 Subject: packages/qt4/qt_packaging.inc: All Qt modules are roughly similar, have one python function to generate the files for the dev package --- packages/qt4/qt_packaging.inc | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) (limited to 'packages/qt4') diff --git a/packages/qt4/qt_packaging.inc b/packages/qt4/qt_packaging.inc index eb361dd72f..7d39591846 100644 --- a/packages/qt4/qt_packaging.inc +++ b/packages/qt4/qt_packaging.inc @@ -60,48 +60,55 @@ RDEPENDS_${PN} = "${NONDEV_PACKAGES}" RDEPENDS_${PN}-dev = "${DEV_PACKAGES}" RDEPENDS_${PN}-dbg = "${DBG_PACKAGES}" +def qt_default_dev(name): + return """${libdir}/lib${QT_LIBRARY_NAME}%(name)s.la + ${libdir}/lib${QT_LIBRARY_NAME}%(name)s.prl + ${libdir}/lib${QT_LIBRARY_NAME}%(name)s.so + ${includedir}/${QT_DIR_NAME}/Qt%(name)s* + ${libdir}/pkgconfig/${QT_LIBRARY_NAME}%(name)s.pc""" % locals() + FILES_${QT_BASE_LIB}core4 = "${libdir}/lib${QT_LIBRARY_NAME}Core.so.*" -FILES_${QT_BASE_LIB}core4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Core.la ${libdir}/lib${QT_LIBRARY_NAME}Core.prl ${libdir}/lib${QT_LIBRARY_NAME}Core.so ${includedir}/${QT_DIR_NAME}/QtCore* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Core.pc" +FILES_${QT_BASE_LIB}core4-dev = "${@qt_default_dev('Core')}" FILES_${QT_BASE_LIB}core4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Core*" FILES_${QT_BASE_LIB}gui4 = "${libdir}/lib${QT_LIBRARY_NAME}Gui.so.*" -FILES_${QT_BASE_LIB}gui4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Gui.la ${libdir}/lib${QT_LIBRARY_NAME}Gui.prl ${libdir}/lib${QT_LIBRARY_NAME}Gui.so ${includedir}/${QT_DIR_NAME}/QtGui* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Gui.pc" +FILES_${QT_BASE_LIB}gui4-dev = "${@qt_default_dev('Gui')}" FILES_${QT_BASE_LIB}gui4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Gui*" FILES_${QT_BASE_LIB}network4 = "${libdir}/lib${QT_LIBRARY_NAME}Network.so.*" -FILES_${QT_BASE_LIB}network4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Network.la ${libdir}/lib${QT_LIBRARY_NAME}Network.prl ${libdir}/lib${QT_LIBRARY_NAME}Network.so ${includedir}/${QT_DIR_NAME}/QtNetwork* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Network.pc" +FILES_${QT_BASE_LIB}network4-dev = "${@qt_default_dev('Network')}" FILES_${QT_BASE_LIB}network4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Network*" FILES_${QT_BASE_LIB}sql4 = "${libdir}/lib${QT_LIBRARY_NAME}Sql.so.*" -FILES_${QT_BASE_LIB}sql4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Sql.la ${libdir}/lib${QT_LIBRARY_NAME}Sql.prl ${libdir}/lib${QT_LIBRARY_NAME}Sql.so ${includedir}/${QT_DIR_NAME}/QtSql* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Sql.pc" +FILES_${QT_BASE_LIB}sql4-dev = "${@qt_default_dev('Sql')}" FILES_${QT_BASE_LIB}sql4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Sql*" FILES_${QT_BASE_LIB}svg4 = "${libdir}/lib${QT_LIBRARY_NAME}Svg.so.*" -FILES_${QT_BASE_LIB}svg4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Svg.la ${libdir}/lib${QT_LIBRARY_NAME}Svg.prl ${libdir}/lib${QT_LIBRARY_NAME}Svg.so ${includedir}/${QT_DIR_NAME}/QtSvg* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Svg.pc" +FILES_${QT_BASE_LIB}svg4-dev = "${@qt_default_dev('Svg')}" FILES_${QT_BASE_LIB}svg4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Svg*" FILES_${QT_BASE_LIB}test4 = "${libdir}/lib${QT_LIBRARY_NAME}Test.so.*" -FILES_${QT_BASE_LIB}test4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Test.la ${libdir}/lib${QT_LIBRARY_NAME}Test.prl ${libdir}/lib${QT_LIBRARY_NAME}Test.so ${includedir}/${QT_DIR_NAME}/QtTest* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Test.pc" +FILES_${QT_BASE_LIB}test4-dev = "${@qt_default_dev('Test')}" FILES_${QT_BASE_LIB}test4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Test*" FILES_${QT_BASE_LIB}xml4 = "${libdir}/lib${QT_LIBRARY_NAME}Xml.so.*" -FILES_${QT_BASE_LIB}xml4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Xml.la ${libdir}/lib${QT_LIBRARY_NAME}Xml.prl ${libdir}/lib${QT_LIBRARY_NAME}Xml.so ${includedir}/${QT_DIR_NAME}/QtXml* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Xml.pc" +FILES_${QT_BASE_LIB}xml4-dev = "${@qt_default_dev('Xml')}" FILES_${QT_BASE_LIB}xml4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Xml*" FILES_${QT_BASE_LIB}designer4 = "${libdir}/lib${QT_LIBRARY_NAME}Designer.so.*" -FILES_${QT_BASE_LIB}designer4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Designer.la ${libdir}/lib${QT_LIBRARY_NAME}Designer.prl ${libdir}/lib${QT_LIBRARY_NAME}Designer.so ${includedir}/${QT_DIR_NAME}/QtDesigner* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Designer.pc" +FILES_${QT_BASE_LIB}designer4-dev = "${@qt_default_dev('Designer')}" FILES_${QT_BASE_LIB}designer4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Designer*" FILES_${QT_BASE_LIB}designercomponents4 = "${libdir}/lib${QT_LIBRARY_NAME}DesignerComponents.so.*" -FILES_${QT_BASE_LIB}designercomponents4-dev = "${libdir}/lib${QT_LIBRARY_NAME}DesignerComponents.la ${libdir}/lib${QT_LIBRARY_NAME}DesignerComponents.prl ${libdir}/lib${QT_LIBRARY_NAME}DesignerComponents.so" +FILES_${QT_BASE_LIB}designercomponents4-dev = "${@qt_default_dev('DesignerComponents')}" FILES_${QT_BASE_LIB}designercomponents4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}DesignerComponents*" FILES_${QT_BASE_LIB}3support4 = "${libdir}/lib${QT_LIBRARY_NAME}3Support.so.*" -FILES_${QT_BASE_LIB}3support4-dev = "${libdir}/lib${QT_LIBRARY_NAME}3Support.la ${libdir}/lib${QT_LIBRARY_NAME}3Support.prl ${libdir}/lib${QT_LIBRARY_NAME}3Support.so ${includedir}/${QT_DIR_NAME}/Qt3Support* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}3Support.pc" +FILES_${QT_BASE_LIB}3support4-dev = "${@qt_default_dev('3Support')}" FILES_${QT_BASE_LIB}3support4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}3Support*" FILES_${QT_BASE_LIB}assistantclient4 = "${libdir}/lib${QT_LIBRARY_NAME}AssistantClient.so.*" -FILES_${QT_BASE_LIB}assistantclient4-dev = "${libdir}/lib${QT_LIBRARY_NAME}AssistantClient.la ${libdir}/lib${QT_LIBRARY_NAME}AssistantClient.prl ${libdir}/lib${QT_LIBRARY_NAME}AssistantClient.so ${includedir}/${QT_DIR_NAME}/QtAssistant* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}AssistantClient.pc" +FILES_${QT_BASE_LIB}assistantclient4-dev = "${@qt_default_dev('AssistantClient')} ${includedir}/${QT_DIR_NAME}/QtAssistant*" FILES_${QT_BASE_LIB}assistantclient4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}AssistantClient*" FILES_${QT_BASE_LIB}script4 = "${libdir}/lib${QT_LIBRARY_NAME}Script.so.*" -FILES_${QT_BASE_LIB}script4-dev = "${libdir}/lib${QT_LIBRARY_NAME}Script.la ${libdir}/lib${QT_LIBRARY_NAME}Script.prl ${libdir}/lib${QT_LIBRARY_NAME}Script.so ${includedir}/${QT_DIR_NAME}/QtScript* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Script.pc" +FILES_${QT_BASE_LIB}script4-dev = "${@qt_default_dev('Script')}" FILES_${QT_BASE_LIB}script4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Script*" FILES_${QT_BASE_LIB}dbus4 = "${libdir}/lib${QT_LIBRARY_NAME}DBus.so.*" -FILES_${QT_BASE_LIB}dbus4-dev = "${libdir}/lib${QT_LIBRARY_NAME}DBus.la ${libdir}/lib${QT_LIBRARY_NAME}DBus.prl ${libdir}/lib${QT_LIBRARY_NAME}DBus.so ${includedir}/${QT_DIR_NAME}/QtDBus* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}DBus.pc" +FILES_${QT_BASE_LIB}dbus4-dev = "${@qt_default_dev('DBus')}" FILES_${QT_BASE_LIB}dbus4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}DBus*" FILES_${QT_BASE_LIB}opengl4 = "${libdir}/lib${QT_LIBRARY_NAME}OpenGL.so.*" -FILES_${QT_BASE_LIB}opengl4-dev = "${libdir}/lib${QT_LIBRARY_NAME}OpenGL.la ${libdir}/lib${QT_LIBRARY_NAME}OpenGL.prl ${libdir}/lib${QT_LIBRARY_NAME}OpenGL.so ${includedir}/${QT_DIR_NAME}/QtOpenGL* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}OpenGL.pc" +FILES_${QT_BASE_LIB}opengl4-dev = "${@qt_default_dev('OpenGL')}" FILES_${QT_BASE_LIB}opengl4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}OpenGL*" FILES_${QT_BASE_LIB}uitools4-dev = "${libdir}/lib${QT_LIBRARY_NAME}UiTools* ${includedir}/${QT_DIR_NAME}/QtUiTools* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}UiTools.pc" -- cgit v1.2.3 From 6e03f54929969450bcc876200c6aabcb7123cbe3 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 26 Dec 2007 00:28:07 +0000 Subject: packages/qt4/qt_packaging.inc: Do not remove everything from the bindir, fix the glob -${PN}-doc already has the html documentation, no need for -documentation package -Package the demos and exmaples -.debug and translations are missing --- packages/qt4/qt_packaging.inc | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'packages/qt4') diff --git a/packages/qt4/qt_packaging.inc b/packages/qt4/qt_packaging.inc index 7d39591846..9c3d0b94d7 100644 --- a/packages/qt4/qt_packaging.inc +++ b/packages/qt4/qt_packaging.inc @@ -31,8 +31,7 @@ DEV_PACKAGES += "${QT_BASE_LIB}core4-dev \ ${QT_BASE_LIB}script4-dev \ ${QT_BASE_LIB}dbus4-dev \ ${QT_BASE_LIB}opengl4-dev \ - ${QT_BASE_LIB}uitools4-dev \ - ${QT_BASE_LIB}-documentation" + ${QT_BASE_LIB}uitools4-dev" DBG_PACKAGES += "${QT_BASE_LIB}core4-dbg \ ${QT_BASE_LIB}gui4-dbg \ @@ -128,14 +127,11 @@ FILES_${QT_BASE_NAME}-pixeltool = "${bindir}/pixeltool" FILES_${QT_BASE_NAME}-dbus = "${bindir}/qdbus ${bindir}/qdbusxml2cpp ${bindir}/qdbuscpp2xml ${bindir}/qdbusviewer" FILES_${QT_BASE_NAME}-common = "${bindir}/qtconfig" -FILES_${QT_BASE_NAME}-examples = "${bindir}/${QT_BASE_NAME}-examples/*" -FILES_${QT_BASE_NAME}-demos = "${bindir}/qtdemo ${bindir}/${QT_BASE_NAME}-demos/*" +FILES_${QT_BASE_NAME}-examples = "${bindir}/${QT_BASE_NAME}/examples/*" +FILES_${QT_BASE_NAME}-demos = "${bindir}/qtdemo ${bindir}/${QT_BASE_NAME}/demos/*" FILES_${QT_BASE_NAME}-fonts = "${libdir}/fonts" - -FILES_${QT_BASE_NAME}-documentation = "${docdir}/${QT_DIR_NAME}/html/*" - python populate_packages_prepend() { translationdir = bb.data.expand('${datadir}/${QT_DIR_NAME}/translations/', d) do_split_packages(d, translationdir, '^qt_(.*)\.qm$', '${QT_DIR_NAME}-translation-%s', '{PN} translation for %s', extra_depends='' ) @@ -146,7 +142,7 @@ do_install() { oe_runmake install INSTALL_ROOT=${D} # These are host binaries, we should only use them in staging - rm -rf ${D}/${bindir} + rm -rf ${D}/${bindir}/qmake rm -rf ${D}/${datadir}/${QT_DIR_NAME}/mkspecs install -d ${D}/${libdir}/fonts -- cgit v1.2.3 From 6d217fe3d65950bba512bdb5b606d1209f2d7506 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 26 Dec 2007 01:11:20 +0000 Subject: packages/qt4/: Share some more patches (no host includes, cross-compile) between Embedded and X11 -Use the CROSSARCH hack/patch on QtopiaCore as well -Do not search /usr/include for freetype and openssl on Qt as well -Do not build a qmake version (needed a diversion due different configure scripts) --- packages/qt4/files/.mtn2git_empty | 0 packages/qt4/files/0001-cross-compile.patch | 183 +++++++++++++++++++++ packages/qt4/files/0003-no-tools.patch | 25 +++ packages/qt4/files/0005-fix-mkspecs.patch | 123 ++++++++++++++ .../qt4-x11-free-4.3.3/0001-cross-compile.patch | 183 --------------------- .../qt4/qt4-x11-free-4.3.3/0003-no-tools.patch | 25 --- .../qt4/qt4-x11-free-4.3.3/0005-fix-mkspecs.patch | 123 -------------- packages/qt4/qtopia-core-4.3.3/.mtn2git_empty | 0 .../0006-freetype-host-includes.patch | 23 +++ .../0007-openssl-host-includes.patch | 23 +++ packages/qt4/qtopia-core.inc | 1 + packages/qt4/qtopia-core/0004-no-qmake.patch | 25 +++ packages/qt4/qtopia-core_4.3.3.bb | 3 + 13 files changed, 406 insertions(+), 331 deletions(-) create mode 100644 packages/qt4/files/.mtn2git_empty create mode 100644 packages/qt4/files/0001-cross-compile.patch create mode 100644 packages/qt4/files/0003-no-tools.patch create mode 100644 packages/qt4/files/0005-fix-mkspecs.patch delete mode 100644 packages/qt4/qt4-x11-free-4.3.3/0001-cross-compile.patch delete mode 100644 packages/qt4/qt4-x11-free-4.3.3/0003-no-tools.patch delete mode 100644 packages/qt4/qt4-x11-free-4.3.3/0005-fix-mkspecs.patch create mode 100644 packages/qt4/qtopia-core-4.3.3/.mtn2git_empty create mode 100644 packages/qt4/qtopia-core-4.3.3/0006-freetype-host-includes.patch create mode 100644 packages/qt4/qtopia-core-4.3.3/0007-openssl-host-includes.patch create mode 100644 packages/qt4/qtopia-core/0004-no-qmake.patch (limited to 'packages/qt4') diff --git a/packages/qt4/files/.mtn2git_empty b/packages/qt4/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qt4/files/0001-cross-compile.patch b/packages/qt4/files/0001-cross-compile.patch new file mode 100644 index 0000000000..6e2b8e755e --- /dev/null +++ b/packages/qt4/files/0001-cross-compile.patch @@ -0,0 +1,183 @@ +From 64210fec17ab819f21769e3e82bb26e9f2ccfdb4 Mon Sep 17 00:00:00 2001 +From: Michael Krelin +Date: Sun, 3 Jun 2007 18:30:37 +0200 +Subject: [PATCH] cross compile + +--- + configure | 137 ++---------------------------------------------------------- + 1 files changed, 5 insertions(+), 132 deletions(-) + +Index: qt-x11-opensource-src-4.3.2/configure +=================================================================== +--- qt-x11-opensource-src-4.3.2.orig/configure 2007-10-01 15:06:03.000000000 +0200 ++++ qt-x11-opensource-src-4.3.2/configure 2007-10-23 09:32:25.000000000 +0200 +@@ -735,7 +735,7 @@ + UNKNOWN_ARG=yes + fi + ;; +- -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-mysql_config) ++ -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-mysql_config|-crossarch) + VAR=`echo $1 | sed "s,^-\(.*\),\1,"` + shift + VAL="$1" +@@ -1124,6 +1124,9 @@ + xplatform) + XPLATFORM="$VAL" + ;; ++ crossarch) ++ CROSSARCH="$VAL" ++ ;; + debug-and-release) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_DEBUG_RELEASE="$VAL" +@@ -2119,149 +2122,7 @@ + echo "Determining system architecture... ($UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_MACHINE)" + fi + +-if [ "$PLATFORM" != "$XPLATFORM" -a "$CFG_EMBEDDED" != "no" ]; then +- case "$CFG_EMBEDDED" in +- x86) +- ARCH=i386 +- ;; +- x86_64) +- ARCH=x86_64 +- ;; +- ipaq|sharp) +- ARCH=arm +- ;; +- *) +- ARCH="$CFG_EMBEDDED" +- ;; +- esac +-else +- case "$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_MACHINE" in +- IRIX*:*:*) +- ARCH=`uname -p` +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " SGI ($ARCH)" +- fi +- ;; +- SunOS:5*:*) +- case "$UNAME_MACHINE" in +- sun4u*|sun4v*) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " Sun SPARC (sparc)" +- fi +- ARCH=sparc +- ;; +- i86pc) +- case "$PLATFORM" in +- *-64) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 64-bit AMD 80x86 (x86_64)" +- fi +- ARCH=x86_64 +- ;; +- *) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 32-bit Intel 80x86 (i386)" +- fi +- ARCH=i386 +- ;; +- esac +- esac +- ;; +- Darwin:*:*) +- case "$UNAME_MACHINE" in +- Power?Macintosh) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 32-bit Apple PowerPC (powerpc)" +- fi +- ;; +- x86) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 32-bit Intel 80x86 (i386)" +- fi +- ;; +- esac +- ARCH=macosx +- ;; +- AIX:*:00????????00) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 64-bit IBM PowerPC (powerpc)" +- fi +- ARCH=powerpc +- ;; +- HP-UX:*:9000*) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " HP PA-RISC (parisc)" +- fi +- ARCH=parisc +- ;; +- *:*:i?86) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 32-bit Intel 80x86 (i386)" +- fi +- ARCH=i386 +- ;; +- *:*:x86_64|*:*:amd64) +- if [ "$PLATFORM" = "linux-g++-32" -o "$PLATFORM" = "linux-icc-32" ]; then +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 32 bit on 64-bit AMD 80x86 (i386)" +- fi +- ARCH=i386 +- else +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 64-bit AMD 80x86 (x86_64)" +- fi +- ARCH=x86_64 +- fi +- ;; +- *:*:ppc) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 32-bit PowerPC (powerpc)" +- fi +- ARCH=powerpc +- ;; +- *:*:ppc64) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 64-bit PowerPC (powerpc)" +- fi +- ARCH=powerpc +- ;; +- *:*:s390*) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " IBM S/390 (s390)" +- fi +- ARCH=s390 +- ;; +- *:*:arm*) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " ARM (arm)" +- fi +- ARCH=arm +- ;; +- Linux:*:sparc*) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " Linux on SPARC" +- fi +- ARCH=sparc +- ;; +- *:*:*) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " Trying '$UNAME_MACHINE'..." +- fi +- ARCH="$UNAME_MACHINE" +- ;; +- esac +-fi +- +-if [ -d "$relpath/src/corelib/arch/$ARCH" ]; then +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " '$ARCH' is supported" +- fi +-else +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " '$ARCH' is unsupported, using 'generic'" +- fi +- ARCH=generic +-fi ++ARCH="$CROSSARCH" + + if [ "$OPT_VERBOSE" = "yes" ]; then + echo "System architecture: '$ARCH'" diff --git a/packages/qt4/files/0003-no-tools.patch b/packages/qt4/files/0003-no-tools.patch new file mode 100644 index 0000000000..5412c90377 --- /dev/null +++ b/packages/qt4/files/0003-no-tools.patch @@ -0,0 +1,25 @@ +From 03cbda241413e4ae727b2a92ff452162aa7ad440 Mon Sep 17 00:00:00 2001 +From: Michael Krelin +Date: Sat, 2 Jun 2007 16:06:01 +0200 +Subject: [PATCH] no tools + +--- + src/src.pro | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/src.pro b/src/src.pro +index 6e08180..957d3dc 100644 +--- a/src/src.pro ++++ b/src/src.pro +@@ -3,7 +3,7 @@ TEMPLATE = subdirs + # this order is important + unset(SRC_SUBDIRS) + win32:SRC_SUBDIRS += src_winmain +-SRC_SUBDIRS += src_tools_moc src_tools_rcc src_tools_uic src_corelib src_xml src_gui src_sql src_network src_svg src_script ++SRC_SUBDIRS += src_corelib src_xml src_gui src_sql src_network src_svg src_script + contains(QT_CONFIG, opengl): SRC_SUBDIRS += src_opengl + contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_qt3support + !cross_compile { +-- +1.5.0.7 + diff --git a/packages/qt4/files/0005-fix-mkspecs.patch b/packages/qt4/files/0005-fix-mkspecs.patch new file mode 100644 index 0000000000..93692699dc --- /dev/null +++ b/packages/qt4/files/0005-fix-mkspecs.patch @@ -0,0 +1,123 @@ +From aa0377910cfd8d0fce6bdc9355994a4e267b1696 Mon Sep 17 00:00:00 2001 +From: Michael Krelin +Date: Sat, 2 Jun 2007 16:39:58 +0200 +Subject: [PATCH] fix mkspecs + +--- + mkspecs/common/g++.conf | 18 +++++++++--------- + mkspecs/common/linux.conf | 26 +++++++++++++------------- + 2 files changed, 22 insertions(+), 22 deletions(-) + +diff --git a/mkspecs/common/g++.conf b/mkspecs/common/g++.conf +index f5a5c8e..4007c7e 100644 +--- a/mkspecs/common/g++.conf ++++ b/mkspecs/common/g++.conf +@@ -2,12 +2,12 @@ + # qmake configuration for common gcc + # + +-QMAKE_CC = gcc +-QMAKE_CFLAGS += -pipe ++QMAKE_CC = $(OE_QMAKE_CC) ++QMAKE_CFLAGS += -pipe $(OE_QMAKE_CFLAGS) + QMAKE_CFLAGS_DEPS += -M + QMAKE_CFLAGS_WARN_ON += -Wall -W + QMAKE_CFLAGS_WARN_OFF += -w +-QMAKE_CFLAGS_RELEASE += -O2 ++QMAKE_CFLAGS_RELEASE += -O2 + QMAKE_CFLAGS_DEBUG += -g + QMAKE_CFLAGS_SHLIB += -fPIC + QMAKE_CFLAGS_STATIC_LIB += -fPIC +@@ -16,8 +16,8 @@ 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 = g++ +-QMAKE_CXXFLAGS += $$QMAKE_CFLAGS ++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 +@@ -30,9 +30,9 @@ 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 = g++ +-QMAKE_LINK_SHLIB = g++ +-QMAKE_LFLAGS += ++QMAKE_LINK = $(OE_QMAKE_LINK) ++QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK) ++QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS) + QMAKE_LFLAGS_RELEASE += + QMAKE_LFLAGS_DEBUG += + QMAKE_LFLAGS_APP += +@@ -40,7 +40,7 @@ QMAKE_LFLAGS_SHLIB += -shared + QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB + QMAKE_LFLAGS_SONAME += -Wl,-soname, + QMAKE_LFLAGS_THREAD += +-QMAKE_RPATH = -Wl,-rpath, ++QMAKE_RPATH = -Wl,-rpath-link, + + QMAKE_PCH_OUTPUT_EXT = .gch + +diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf +index 3796a87..52acf16 100644 +--- a/mkspecs/common/linux.conf ++++ b/mkspecs/common/linux.conf +@@ -7,26 +7,26 @@ QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD + + QMAKE_INCDIR = + QMAKE_LIBDIR = +-QMAKE_INCDIR_X11 = /usr/X11R6/include +-QMAKE_LIBDIR_X11 = /usr/X11R6/lib +-QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] +-QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +-QMAKE_INCDIR_OPENGL = /usr/X11R6/include +-QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib ++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 = + QMAKE_LIBS_DYNLOAD = -ldl +-QMAKE_LIBS_X11 = -lXext -lX11 -lm +-QMAKE_LIBS_X11SM = -lSM -lICE ++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 = $$[QT_INSTALL_BINS]/moc +-QMAKE_UIC = $$[QT_INSTALL_BINS]/uic ++QMAKE_MOC = $(OE_QMAKE_MOC) ++QMAKE_UIC = $(OE_QMAKE_UIC) + +-QMAKE_AR = ar cqs ++QMAKE_AR = $(OE_QMAKE_AR) cqs + QMAKE_RANLIB = + + QMAKE_TAR = tar -cf +@@ -38,11 +38,11 @@ QMAKE_COPY_DIR = $(COPY) -r + QMAKE_MOVE = mv -f + QMAKE_DEL_FILE = rm -f + QMAKE_DEL_DIR = rmdir +-QMAKE_STRIP = strip ++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) +\ No newline at end of file ++include(unix.conf) +-- +1.5.0.7 + diff --git a/packages/qt4/qt4-x11-free-4.3.3/0001-cross-compile.patch b/packages/qt4/qt4-x11-free-4.3.3/0001-cross-compile.patch deleted file mode 100644 index 6e2b8e755e..0000000000 --- a/packages/qt4/qt4-x11-free-4.3.3/0001-cross-compile.patch +++ /dev/null @@ -1,183 +0,0 @@ -From 64210fec17ab819f21769e3e82bb26e9f2ccfdb4 Mon Sep 17 00:00:00 2001 -From: Michael Krelin -Date: Sun, 3 Jun 2007 18:30:37 +0200 -Subject: [PATCH] cross compile - ---- - configure | 137 ++---------------------------------------------------------- - 1 files changed, 5 insertions(+), 132 deletions(-) - -Index: qt-x11-opensource-src-4.3.2/configure -=================================================================== ---- qt-x11-opensource-src-4.3.2.orig/configure 2007-10-01 15:06:03.000000000 +0200 -+++ qt-x11-opensource-src-4.3.2/configure 2007-10-23 09:32:25.000000000 +0200 -@@ -735,7 +735,7 @@ - UNKNOWN_ARG=yes - fi - ;; -- -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-mysql_config) -+ -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-mysql_config|-crossarch) - VAR=`echo $1 | sed "s,^-\(.*\),\1,"` - shift - VAL="$1" -@@ -1124,6 +1124,9 @@ - xplatform) - XPLATFORM="$VAL" - ;; -+ crossarch) -+ CROSSARCH="$VAL" -+ ;; - debug-and-release) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_DEBUG_RELEASE="$VAL" -@@ -2119,149 +2122,7 @@ - echo "Determining system architecture... ($UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_MACHINE)" - fi - --if [ "$PLATFORM" != "$XPLATFORM" -a "$CFG_EMBEDDED" != "no" ]; then -- case "$CFG_EMBEDDED" in -- x86) -- ARCH=i386 -- ;; -- x86_64) -- ARCH=x86_64 -- ;; -- ipaq|sharp) -- ARCH=arm -- ;; -- *) -- ARCH="$CFG_EMBEDDED" -- ;; -- esac --else -- case "$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_MACHINE" in -- IRIX*:*:*) -- ARCH=`uname -p` -- if [ "$OPT_VERBOSE" = "yes" ]; then -- echo " SGI ($ARCH)" -- fi -- ;; -- SunOS:5*:*) -- case "$UNAME_MACHINE" in -- sun4u*|sun4v*) -- if [ "$OPT_VERBOSE" = "yes" ]; then -- echo " Sun SPARC (sparc)" -- fi -- ARCH=sparc -- ;; -- i86pc) -- case "$PLATFORM" in -- *-64) -- if [ "$OPT_VERBOSE" = "yes" ]; then -- echo " 64-bit AMD 80x86 (x86_64)" -- fi -- ARCH=x86_64 -- ;; -- *) -- if [ "$OPT_VERBOSE" = "yes" ]; then -- echo " 32-bit Intel 80x86 (i386)" -- fi -- ARCH=i386 -- ;; -- esac -- esac -- ;; -- Darwin:*:*) -- case "$UNAME_MACHINE" in -- Power?Macintosh) -- if [ "$OPT_VERBOSE" = "yes" ]; then -- echo " 32-bit Apple PowerPC (powerpc)" -- fi -- ;; -- x86) -- if [ "$OPT_VERBOSE" = "yes" ]; then -- echo " 32-bit Intel 80x86 (i386)" -- fi -- ;; -- esac -- ARCH=macosx -- ;; -- AIX:*:00????????00) -- if [ "$OPT_VERBOSE" = "yes" ]; then -- echo " 64-bit IBM PowerPC (powerpc)" -- fi -- ARCH=powerpc -- ;; -- HP-UX:*:9000*) -- if [ "$OPT_VERBOSE" = "yes" ]; then -- echo " HP PA-RISC (parisc)" -- fi -- ARCH=parisc -- ;; -- *:*:i?86) -- if [ "$OPT_VERBOSE" = "yes" ]; then -- echo " 32-bit Intel 80x86 (i386)" -- fi -- ARCH=i386 -- ;; -- *:*:x86_64|*:*:amd64) -- if [ "$PLATFORM" = "linux-g++-32" -o "$PLATFORM" = "linux-icc-32" ]; then -- if [ "$OPT_VERBOSE" = "yes" ]; then -- echo " 32 bit on 64-bit AMD 80x86 (i386)" -- fi -- ARCH=i386 -- else -- if [ "$OPT_VERBOSE" = "yes" ]; then -- echo " 64-bit AMD 80x86 (x86_64)" -- fi -- ARCH=x86_64 -- fi -- ;; -- *:*:ppc) -- if [ "$OPT_VERBOSE" = "yes" ]; then -- echo " 32-bit PowerPC (powerpc)" -- fi -- ARCH=powerpc -- ;; -- *:*:ppc64) -- if [ "$OPT_VERBOSE" = "yes" ]; then -- echo " 64-bit PowerPC (powerpc)" -- fi -- ARCH=powerpc -- ;; -- *:*:s390*) -- if [ "$OPT_VERBOSE" = "yes" ]; then -- echo " IBM S/390 (s390)" -- fi -- ARCH=s390 -- ;; -- *:*:arm*) -- if [ "$OPT_VERBOSE" = "yes" ]; then -- echo " ARM (arm)" -- fi -- ARCH=arm -- ;; -- Linux:*:sparc*) -- if [ "$OPT_VERBOSE" = "yes" ]; then -- echo " Linux on SPARC" -- fi -- ARCH=sparc -- ;; -- *:*:*) -- if [ "$OPT_VERBOSE" = "yes" ]; then -- echo " Trying '$UNAME_MACHINE'..." -- fi -- ARCH="$UNAME_MACHINE" -- ;; -- esac --fi -- --if [ -d "$relpath/src/corelib/arch/$ARCH" ]; then -- if [ "$OPT_VERBOSE" = "yes" ]; then -- echo " '$ARCH' is supported" -- fi --else -- if [ "$OPT_VERBOSE" = "yes" ]; then -- echo " '$ARCH' is unsupported, using 'generic'" -- fi -- ARCH=generic --fi -+ARCH="$CROSSARCH" - - if [ "$OPT_VERBOSE" = "yes" ]; then - echo "System architecture: '$ARCH'" diff --git a/packages/qt4/qt4-x11-free-4.3.3/0003-no-tools.patch b/packages/qt4/qt4-x11-free-4.3.3/0003-no-tools.patch deleted file mode 100644 index 5412c90377..0000000000 --- a/packages/qt4/qt4-x11-free-4.3.3/0003-no-tools.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 03cbda241413e4ae727b2a92ff452162aa7ad440 Mon Sep 17 00:00:00 2001 -From: Michael Krelin -Date: Sat, 2 Jun 2007 16:06:01 +0200 -Subject: [PATCH] no tools - ---- - src/src.pro | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/src.pro b/src/src.pro -index 6e08180..957d3dc 100644 ---- a/src/src.pro -+++ b/src/src.pro -@@ -3,7 +3,7 @@ TEMPLATE = subdirs - # this order is important - unset(SRC_SUBDIRS) - win32:SRC_SUBDIRS += src_winmain --SRC_SUBDIRS += src_tools_moc src_tools_rcc src_tools_uic src_corelib src_xml src_gui src_sql src_network src_svg src_script -+SRC_SUBDIRS += src_corelib src_xml src_gui src_sql src_network src_svg src_script - contains(QT_CONFIG, opengl): SRC_SUBDIRS += src_opengl - contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_qt3support - !cross_compile { --- -1.5.0.7 - diff --git a/packages/qt4/qt4-x11-free-4.3.3/0005-fix-mkspecs.patch b/packages/qt4/qt4-x11-free-4.3.3/0005-fix-mkspecs.patch deleted file mode 100644 index 93692699dc..0000000000 --- a/packages/qt4/qt4-x11-free-4.3.3/0005-fix-mkspecs.patch +++ /dev/null @@ -1,123 +0,0 @@ -From aa0377910cfd8d0fce6bdc9355994a4e267b1696 Mon Sep 17 00:00:00 2001 -From: Michael Krelin -Date: Sat, 2 Jun 2007 16:39:58 +0200 -Subject: [PATCH] fix mkspecs - ---- - mkspecs/common/g++.conf | 18 +++++++++--------- - mkspecs/common/linux.conf | 26 +++++++++++++------------- - 2 files changed, 22 insertions(+), 22 deletions(-) - -diff --git a/mkspecs/common/g++.conf b/mkspecs/common/g++.conf -index f5a5c8e..4007c7e 100644 ---- a/mkspecs/common/g++.conf -+++ b/mkspecs/common/g++.conf -@@ -2,12 +2,12 @@ - # qmake configuration for common gcc - # - --QMAKE_CC = gcc --QMAKE_CFLAGS += -pipe -+QMAKE_CC = $(OE_QMAKE_CC) -+QMAKE_CFLAGS += -pipe $(OE_QMAKE_CFLAGS) - QMAKE_CFLAGS_DEPS += -M - QMAKE_CFLAGS_WARN_ON += -Wall -W - QMAKE_CFLAGS_WARN_OFF += -w --QMAKE_CFLAGS_RELEASE += -O2 -+QMAKE_CFLAGS_RELEASE += -O2 - QMAKE_CFLAGS_DEBUG += -g - QMAKE_CFLAGS_SHLIB += -fPIC - QMAKE_CFLAGS_STATIC_LIB += -fPIC -@@ -16,8 +16,8 @@ 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 = g++ --QMAKE_CXXFLAGS += $$QMAKE_CFLAGS -+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 -@@ -30,9 +30,9 @@ 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 = g++ --QMAKE_LINK_SHLIB = g++ --QMAKE_LFLAGS += -+QMAKE_LINK = $(OE_QMAKE_LINK) -+QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK) -+QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS) - QMAKE_LFLAGS_RELEASE += - QMAKE_LFLAGS_DEBUG += - QMAKE_LFLAGS_APP += -@@ -40,7 +40,7 @@ QMAKE_LFLAGS_SHLIB += -shared - QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB - QMAKE_LFLAGS_SONAME += -Wl,-soname, - QMAKE_LFLAGS_THREAD += --QMAKE_RPATH = -Wl,-rpath, -+QMAKE_RPATH = -Wl,-rpath-link, - - QMAKE_PCH_OUTPUT_EXT = .gch - -diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf -index 3796a87..52acf16 100644 ---- a/mkspecs/common/linux.conf -+++ b/mkspecs/common/linux.conf -@@ -7,26 +7,26 @@ QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD - - QMAKE_INCDIR = - QMAKE_LIBDIR = --QMAKE_INCDIR_X11 = /usr/X11R6/include --QMAKE_LIBDIR_X11 = /usr/X11R6/lib --QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] --QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] --QMAKE_INCDIR_OPENGL = /usr/X11R6/include --QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib -+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 = - QMAKE_LIBS_DYNLOAD = -ldl --QMAKE_LIBS_X11 = -lXext -lX11 -lm --QMAKE_LIBS_X11SM = -lSM -lICE -+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 = $$[QT_INSTALL_BINS]/moc --QMAKE_UIC = $$[QT_INSTALL_BINS]/uic -+QMAKE_MOC = $(OE_QMAKE_MOC) -+QMAKE_UIC = $(OE_QMAKE_UIC) - --QMAKE_AR = ar cqs -+QMAKE_AR = $(OE_QMAKE_AR) cqs - QMAKE_RANLIB = - - QMAKE_TAR = tar -cf -@@ -38,11 +38,11 @@ QMAKE_COPY_DIR = $(COPY) -r - QMAKE_MOVE = mv -f - QMAKE_DEL_FILE = rm -f - QMAKE_DEL_DIR = rmdir --QMAKE_STRIP = strip -+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) -\ No newline at end of file -+include(unix.conf) --- -1.5.0.7 - diff --git a/packages/qt4/qtopia-core-4.3.3/.mtn2git_empty b/packages/qt4/qtopia-core-4.3.3/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qt4/qtopia-core-4.3.3/0006-freetype-host-includes.patch b/packages/qt4/qtopia-core-4.3.3/0006-freetype-host-includes.patch new file mode 100644 index 0000000000..cc8e115fee --- /dev/null +++ b/packages/qt4/qtopia-core-4.3.3/0006-freetype-host-includes.patch @@ -0,0 +1,23 @@ +From c9ab62bd9a56643574b3ae6e59e0ca776d4860d2 Mon Sep 17 00:00:00 2001 +From: Michael Krelin +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(-) + +diff --git a/config.tests/unix/freetype/freetype.pri b/config.tests/unix/freetype/freetype.pri +index 84974bf..ab9a6f2 100644 +--- a/config.tests/unix/freetype/freetype.pri ++++ b/config.tests/unix/freetype/freetype.pri +@@ -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 + for(p, TRY_INCLUDEPATHS) { + p = $$join(p, "", "", "/freetype2") + exists($$p):INCLUDEPATH *= $$p +-- +1.5.0.7 + diff --git a/packages/qt4/qtopia-core-4.3.3/0007-openssl-host-includes.patch b/packages/qt4/qtopia-core-4.3.3/0007-openssl-host-includes.patch new file mode 100644 index 0000000000..35b71d9694 --- /dev/null +++ b/packages/qt4/qtopia-core-4.3.3/0007-openssl-host-includes.patch @@ -0,0 +1,23 @@ +From d45943adb443ad4b85ca4504952dee743c675e1e Mon Sep 17 00:00:00 2001 +From: Michael Krelin +Date: Mon, 4 Jun 2007 14:58:34 +0200 +Subject: [PATCH] openssl host includes + +--- + config.tests/unix/openssl/openssl.pri | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/config.tests/unix/openssl/openssl.pri b/config.tests/unix/openssl/openssl.pri +index 756e5fe..19b4061 100644 +--- a/config.tests/unix/openssl/openssl.pri ++++ b/config.tests/unix/openssl/openssl.pri +@@ -1,5 +1,5 @@ + !cross_compile { +- TRY_INCLUDEPATHS = /include /usr/include /usr/local/include $$QMAKE_INCDIR $$INCLUDEPATH ++ TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$INCLUDEPATH + for(p, TRY_INCLUDEPATHS) { + pp = $$join(p, "", "", "/openssl") + exists($$pp):INCLUDEPATH *= $$p +-- +1.5.0.7 + diff --git a/packages/qt4/qtopia-core.inc b/packages/qt4/qtopia-core.inc index 92d61b0776..d21968cc4b 100644 --- a/packages/qt4/qtopia-core.inc +++ b/packages/qt4/qtopia-core.inc @@ -6,6 +6,7 @@ HOMEPAGE = "http://www.trolltech.com" DEPENDS += "tslib" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.tar.gz \ + file://0001-cross-compile.patch;patch=1 \ file://0003-no-tools.patch;patch=1 \ file://0004-no-qmake.patch;patch=1 \ file://0005-fix-mkspecs.patch;patch=1" diff --git a/packages/qt4/qtopia-core/0004-no-qmake.patch b/packages/qt4/qtopia-core/0004-no-qmake.patch new file mode 100644 index 0000000000..28f8d3ad9d --- /dev/null +++ b/packages/qt4/qtopia-core/0004-no-qmake.patch @@ -0,0 +1,25 @@ +From f5a73ce944240de9013cc23288c115e8213add5e Mon Sep 17 00:00:00 2001 +From: Michael Krelin +Date: Sat, 2 Jun 2007 16:06:59 +0200 +Subject: [PATCH] no qmake + +--- + configure | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/configure b/configure +index b3c2a52..1901e57 100755 +--- a/configure ++++ b/configure +@@ -3517,7 +3517,7 @@ END { + } + + # build qmake +-if true; then ###[ '!' -f "$outpath/bin/qmake" ]; ++if false; then ###[ '!' -f "$outpath/bin/qmake" ]; + echo "Creating qmake. Please wait..." + + OLD_QCONFIG_H= +-- +1.5.0.7 + diff --git a/packages/qt4/qtopia-core_4.3.3.bb b/packages/qt4/qtopia-core_4.3.3.bb index 65f0203ea0..b903e2b06a 100644 --- a/packages/qt4/qtopia-core_4.3.3.bb +++ b/packages/qt4/qtopia-core_4.3.3.bb @@ -1 +1,4 @@ require qtopia-core.inc +SRC_URI += " \ + file://0006-freetype-host-includes.patch;patch=1 \ + file://0007-openssl-host-includes.patch;patch=1 " -- cgit v1.2.3 From d4196e7143aa73ed373b4bc3d4194bbec4932cc5 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 26 Dec 2007 01:21:17 +0000 Subject: packages/qt4/files/0005-fix-mkspecs.patch: Remove the O2 we want OE to decide the tuning! --- packages/qt4/files/0005-fix-mkspecs.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/qt4') diff --git a/packages/qt4/files/0005-fix-mkspecs.patch b/packages/qt4/files/0005-fix-mkspecs.patch index 93692699dc..ab0e4a46d8 100644 --- a/packages/qt4/files/0005-fix-mkspecs.patch +++ b/packages/qt4/files/0005-fix-mkspecs.patch @@ -24,7 +24,7 @@ index f5a5c8e..4007c7e 100644 QMAKE_CFLAGS_WARN_ON += -Wall -W QMAKE_CFLAGS_WARN_OFF += -w -QMAKE_CFLAGS_RELEASE += -O2 -+QMAKE_CFLAGS_RELEASE += -O2 ++QMAKE_CFLAGS_RELEASE += QMAKE_CFLAGS_DEBUG += -g QMAKE_CFLAGS_SHLIB += -fPIC QMAKE_CFLAGS_STATIC_LIB += -fPIC -- cgit v1.2.3 From 701c1ca693343ff02d54556e1677ee9cc4d8f4ea Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 26 Dec 2007 02:20:31 +0000 Subject: qmake,Qt/X11,QtopiaCore: Allow OE to set the tuning options. Allow to add a default module -Do not hardcode O2, we have flags in OE to do such things and passing both didn't make sense -With QtopiaCore QtGui is using Tcp/Udp/Sockets for the QWS implementation. This means when building a gui application you will need the network module. Allow to add modules using environment variables. --- packages/qt4/files/0005-fix-mkspecs.patch | 44 +++++++++++++++++++------------ 1 file changed, 27 insertions(+), 17 deletions(-) (limited to 'packages/qt4') diff --git a/packages/qt4/files/0005-fix-mkspecs.patch b/packages/qt4/files/0005-fix-mkspecs.patch index ab0e4a46d8..faf0ba028a 100644 --- a/packages/qt4/files/0005-fix-mkspecs.patch +++ b/packages/qt4/files/0005-fix-mkspecs.patch @@ -8,10 +8,10 @@ Subject: [PATCH] fix mkspecs mkspecs/common/linux.conf | 26 +++++++++++++------------- 2 files changed, 22 insertions(+), 22 deletions(-) -diff --git a/mkspecs/common/g++.conf b/mkspecs/common/g++.conf -index f5a5c8e..4007c7e 100644 ---- a/mkspecs/common/g++.conf -+++ b/mkspecs/common/g++.conf +Index: qtopia-core-opensource-src-4.3.3/mkspecs/common/g++.conf +=================================================================== +--- qtopia-core-opensource-src-4.3.3.orig/mkspecs/common/g++.conf 2007-12-26 02:58:15.000000000 +0100 ++++ qtopia-core-opensource-src-4.3.3/mkspecs/common/g++.conf 2007-12-26 02:58:21.000000000 +0100 @@ -2,12 +2,12 @@ # qmake configuration for common gcc # @@ -24,11 +24,11 @@ index f5a5c8e..4007c7e 100644 QMAKE_CFLAGS_WARN_ON += -Wall -W QMAKE_CFLAGS_WARN_OFF += -w -QMAKE_CFLAGS_RELEASE += -O2 -+QMAKE_CFLAGS_RELEASE += ++QMAKE_CFLAGS_RELEASE += QMAKE_CFLAGS_DEBUG += -g QMAKE_CFLAGS_SHLIB += -fPIC QMAKE_CFLAGS_STATIC_LIB += -fPIC -@@ -16,8 +16,8 @@ QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden +@@ -16,8 +16,8 @@ QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE} @@ -39,7 +39,7 @@ index f5a5c8e..4007c7e 100644 QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF -@@ -30,9 +30,9 @@ QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden +@@ -30,9 +30,9 @@ QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE @@ -52,7 +52,7 @@ index f5a5c8e..4007c7e 100644 QMAKE_LFLAGS_RELEASE += QMAKE_LFLAGS_DEBUG += QMAKE_LFLAGS_APP += -@@ -40,7 +40,7 @@ QMAKE_LFLAGS_SHLIB += -shared +@@ -40,7 +40,7 @@ QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME += -Wl,-soname, QMAKE_LFLAGS_THREAD += @@ -61,11 +61,11 @@ index f5a5c8e..4007c7e 100644 QMAKE_PCH_OUTPUT_EXT = .gch -diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf -index 3796a87..52acf16 100644 ---- a/mkspecs/common/linux.conf -+++ b/mkspecs/common/linux.conf -@@ -7,26 +7,26 @@ QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD +Index: qtopia-core-opensource-src-4.3.3/mkspecs/common/linux.conf +=================================================================== +--- qtopia-core-opensource-src-4.3.3.orig/mkspecs/common/linux.conf 2007-12-26 02:58:15.000000000 +0100 ++++ qtopia-core-opensource-src-4.3.3/mkspecs/common/linux.conf 2007-12-26 02:58:21.000000000 +0100 +@@ -7,26 +7,26 @@ QMAKE_INCDIR = QMAKE_LIBDIR = @@ -103,7 +103,7 @@ index 3796a87..52acf16 100644 QMAKE_RANLIB = QMAKE_TAR = tar -cf -@@ -38,11 +38,11 @@ QMAKE_COPY_DIR = $(COPY) -r +@@ -38,11 +38,11 @@ QMAKE_MOVE = mv -f QMAKE_DEL_FILE = rm -f QMAKE_DEL_DIR = rmdir @@ -118,6 +118,16 @@ index 3796a87..52acf16 100644 -include(unix.conf) \ No newline at end of file +include(unix.conf) --- -1.5.0.7 - +Index: qtopia-core-opensource-src-4.3.3/mkspecs/linux-g++/qmake.conf +=================================================================== +--- qtopia-core-opensource-src-4.3.3.orig/mkspecs/linux-g++/qmake.conf 2007-12-26 02:58:15.000000000 +0100 ++++ qtopia-core-opensource-src-4.3.3/mkspecs/linux-g++/qmake.conf 2007-12-26 03:00:49.000000000 +0100 +@@ -5,7 +5,7 @@ + MAKEFILE_GENERATOR = UNIX + TEMPLATE = app + CONFIG += qt warn_on release incremental link_prl +-QT += core gui ++QT += core gui $$(OE_QMAKE_EXTRA_MODULES) + QMAKE_INCREMENTAL_STYLE = sublib + + include(../common/g++.conf) -- cgit v1.2.3 From 2e8033d5068925bdb7ce79ddba969a2078b1c44d Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 26 Dec 2007 11:07:10 +0000 Subject: packages/qt4/qt_packing.inc: Examples/Demos are in ${QT_DIR_NAME}, disable them due QA issues Disable packaging of the examples/demos as we need to get rid off the .debug directories inside the nested hierachy of the examples and demos. --- packages/qt4/qt_packaging.inc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'packages/qt4') diff --git a/packages/qt4/qt_packaging.inc b/packages/qt4/qt_packaging.inc index 9c3d0b94d7..472faa3da4 100644 --- a/packages/qt4/qt_packaging.inc +++ b/packages/qt4/qt_packaging.inc @@ -127,8 +127,8 @@ FILES_${QT_BASE_NAME}-pixeltool = "${bindir}/pixeltool" FILES_${QT_BASE_NAME}-dbus = "${bindir}/qdbus ${bindir}/qdbusxml2cpp ${bindir}/qdbuscpp2xml ${bindir}/qdbusviewer" FILES_${QT_BASE_NAME}-common = "${bindir}/qtconfig" -FILES_${QT_BASE_NAME}-examples = "${bindir}/${QT_BASE_NAME}/examples/*" -FILES_${QT_BASE_NAME}-demos = "${bindir}/qtdemo ${bindir}/${QT_BASE_NAME}/demos/*" +FILES_${QT_BASE_NAME}-examples = "${bindir}/${QT_DIR_NAME}/examples/*" +FILES_${QT_BASE_NAME}-demos = "${bindir}/qtdemo ${bindir}/${QT_DIR_NAME}/demos/*" FILES_${QT_BASE_NAME}-fonts = "${libdir}/fonts" @@ -143,6 +143,9 @@ do_install() { # These are host binaries, we should only use them in staging rm -rf ${D}/${bindir}/qmake + + # XXX, FIXME, TODO: package the demos and examples properly + rm -rf ${D}/${bindir}/${QT_DIR_NAME} rm -rf ${D}/${datadir}/${QT_DIR_NAME}/mkspecs install -d ${D}/${libdir}/fonts -- cgit v1.2.3 From 3fb18a16f604ff294bb1500a40e8a7c74424ae99 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 26 Dec 2007 11:18:09 +0000 Subject: packages/qt4/qt4-x11-free.inc,qtopia-core.inc: Bump the PR as the packaging did change --- packages/qt4/qt4-x11-free.inc | 2 +- packages/qt4/qtopia-core.inc | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'packages/qt4') diff --git a/packages/qt4/qt4-x11-free.inc b/packages/qt4/qt4-x11-free.inc index c758d4aab1..75f7344e24 100644 --- a/packages/qt4/qt4-x11-free.inc +++ b/packages/qt4/qt4-x11-free.inc @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.trolltech.com" LICENSE = "GPL QPL" DEPENDS += "virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor" PROVIDES = "qt4x11" -PR = "r6" +PR = "r7" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \ file://0001-cross-compile.patch;patch=1 \ diff --git a/packages/qt4/qtopia-core.inc b/packages/qt4/qtopia-core.inc index d21968cc4b..06837787cf 100644 --- a/packages/qt4/qtopia-core.inc +++ b/packages/qt4/qtopia-core.inc @@ -4,6 +4,7 @@ LICENSE = "GPL" PRIORITY = "optional" HOMEPAGE = "http://www.trolltech.com" DEPENDS += "tslib" +PR = "r1" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.tar.gz \ file://0001-cross-compile.patch;patch=1 \ -- cgit v1.2.3 From b83095b631a258a8067c8388d89abad9fc6fbec5 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 26 Dec 2007 11:29:32 +0000 Subject: packages/qt4/qt_staging.inc: Fix place of the include and library directory --- packages/qt4/qt_staging.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'packages/qt4') diff --git a/packages/qt4/qt_staging.inc b/packages/qt4/qt_staging.inc index ecfe0bb321..21f17590b5 100644 --- a/packages/qt4/qt_staging.inc +++ b/packages/qt4/qt_staging.inc @@ -12,13 +12,13 @@ do_stage() { mkdir -p ${STAGE_TEMP} oe_runmake install INSTALL_ROOT=${STAGE_TEMP} - install -d ${STAGING_INCDIR}/${QT_DIR_NAME} + install -d ${STAGING_INCDIR}/ install -d ${STAGING_LIBDIR}/${QT_DIR_NAME} - cp -pPRf ${STAGE_TEMP}/$includedir/* ${STAGING_INCDIR}/${QT_DIR_NAME}/ + cp -pPRf ${STAGE_TEMP}/$includedir/* ${STAGING_INCDIR}/ for i in ${STAGE_TEMP}/${libdir}/*.la do - oe_libinstall -C ${STAGE_TEMP}/${libdir} -so $(basename $i .la) ${STAGING_LIBDIR}/qtopiacore4 + oe_libinstall -C ${STAGE_TEMP}/${libdir} -so $(basename $i .la) ${STAGING_LIBDIR}/${QT_DIR_NAME} done rm -rf ${STAGE_TEMP} -- cgit v1.2.3 From d56b2bb2b2fc7c78ef3c405336187926464943ed Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Thu, 27 Dec 2007 01:53:46 +0000 Subject: Qt4/QtopiaCore4: Backport QT_LIBINFIX to add a suffix to libraries. Adapt qmake Add the 'E' suffix to QtopiaCore libraries. This allows to install both qtopiacore, qt/X11 at the same time. --- .../qt4/files/0008-backport-qt-lib-infix.patch | 137 +++++++++++++++++++++ packages/qt4/qt4-x11-free.inc | 1 - packages/qt4/qt_configuration.inc | 10 +- packages/qt4/qt_packaging.inc | 66 +++++----- packages/qt4/qt_staging.inc | 1 + packages/qt4/qtopia-core.inc | 4 +- packages/qt4/qtopia-core_4.3.3.bb | 3 +- 7 files changed, 180 insertions(+), 42 deletions(-) create mode 100644 packages/qt4/files/0008-backport-qt-lib-infix.patch (limited to 'packages/qt4') diff --git a/packages/qt4/files/0008-backport-qt-lib-infix.patch b/packages/qt4/files/0008-backport-qt-lib-infix.patch new file mode 100644 index 0000000000..79786e517e --- /dev/null +++ b/packages/qt4/files/0008-backport-qt-lib-infix.patch @@ -0,0 +1,137 @@ +diff --git a/configure b/configure +index c5bdc34..a52607f 100755 +--- a/configure ++++ b/configure +@@ -782,6 +782,11 @@ while [ "$#" -gt 0 ]; do + VAR=endian + VAL=`echo $1 | sed "s,^-\(.*\)-.*,\1,"` + ;; ++ -qtlibinfix) ++ VAR="qtlibinfix" ++ shift ++ VAL="$1" ++ ;; + -D?*|-D) + VAR="add_define" + if [ "$1" = "-D" ]; then +@@ -903,6 +908,9 @@ while [ "$#" -gt 0 ]; do + libdir) + QT_INSTALL_LIBS="$VAL" + ;; ++ qtlibinfix) ++ QT_LIBINFIX="$VAL" ++ ;; + translationdir) + QT_INSTALL_TRANSLATIONS="$VAL" + ;; +@@ -2606,6 +2614,8 @@ fi + -no-sse ............ Do not compile with use of SSE instructions. + -no-sse2 ........... Do not compile with use of SSE2 instructions. + ++ -qtlibinfix Renames all libQt*.so to libQt.so. ++ + -D ........ Add an explicit define to the preprocessor. + -I ........ Add an explicit include path. + -L ........ Add an explicit library path. +@@ -5273,6 +5283,8 @@ QT_MAJOR_VERSION = $QT_MAJOR_VERSION + QT_MINOR_VERSION = $QT_MINOR_VERSION + QT_PATCH_VERSION = $QT_PATCH_VERSION + ++QT_LIBINFIX = $QT_LIBINFIX ++ + EOF + if [ "$CFG_RPATH" = "yes" ]; then + echo "QMAKE_RPATHDIR += \"$QT_INSTALL_LIBS\"" >> "$QTCONFIG.tmp" +diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf +index 32a7fd5..48d584f 100644 +--- a/mkspecs/features/qt_functions.prf ++++ b/mkspecs/features/qt_functions.prf +@@ -28,7 +28,7 @@ defineTest(qtAddLibrary) { + INCLUDEPATH -= $$FRAMEWORK_INCLUDE + INCLUDEPATH = $$FRAMEWORK_INCLUDE $$INCLUDEPATH + } +- LINKAGE = -framework $${LIB_NAME} ++ LINKAGE = -framework $${LIB_NAME}$${QT_LIBINFIX} + } else:!qt_no_framework { #detection + for(frmwrk_dir, $$list($$QMAKE_LIBDIR_QT $$QMAKE_LIBDIR $$(DYLD_FRAMEWORK_PATH) /Library/Frameworks)) { + exists($${frmwrk_dir}/$${LIB_NAME}.framework) { +@@ -46,15 +46,15 @@ defineTest(qtAddLibrary) { + } + isEmpty(LINKAGE) { + CONFIG(debug, debug|release) { +- win32:LINKAGE = -l$${LIB_NAME}d +- mac:LINKAGE = -l$${LIB_NAME}_debug ++ win32:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}d ++ mac:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}_debug + } +- isEmpty(LINKAGE):LINKAGE = -l$${LIB_NAME} ++ isEmpty(LINKAGE):LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX} + } + !isEmpty(QMAKE_LSB) { + QMAKE_LFLAGS *= --lsb-libpath=$$$$QMAKE_LIBDIR_QT + QMAKE_LFLAGS *= -L/opt/lsb/lib +- QMAKE_LFLAGS *= --lsb-shared-libs=$${LIB_NAME} ++ QMAKE_LFLAGS *= --lsb-shared-libs=$${LIB_NAME}${QT_LIBINFIX} + } + LIBS += $$LINKAGE + export(LIBS) +diff --git a/src/qbase.pri b/src/qbase.pri +index 4db7e70..278e011 100644 +--- a/src/qbase.pri ++++ b/src/qbase.pri +@@ -138,7 +138,7 @@ DEFINES += QT_NO_CAST_TO_ASCII QT_ASCII_CAST_WARNINGS QT_44_API_QSQLQUERY_FINISH + contains(QT_CONFIG, qt3support):DEFINES *= QT3_SUPPORT + DEFINES *= QT_MOC_COMPAT #we don't need warnings from calling moc code in our generated code + +-TARGET = $$qtLibraryTarget($$TARGET) #do this towards the end ++TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end + + moc_dir.name = moc_location + moc_dir.variable = QMAKE_MOC +diff --git a/tools/assistant/lib/lib.pro b/tools/assistant/lib/lib.pro +index c121f28..83c3ed7 100644 +--- a/tools/assistant/lib/lib.pro ++++ b/tools/assistant/lib/lib.pro +@@ -52,7 +52,7 @@ mac:!static:contains(QT_CONFIG, qt_framework) { + } + } + +-TARGET = $$qtLibraryTarget($$TARGET) #done towards the end ++TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #done towards the end + + target.path=$$[QT_INSTALL_LIBS] + INSTALLS += target +diff --git a/tools/designer/src/components/component.pri b/tools/designer/src/components/component.pri +index 15c0cf2..78b075d 100644 +--- a/tools/designer/src/components/component.pri ++++ b/tools/designer/src/components/component.pri +@@ -1,2 +1,2 @@ + +-TARGET = $$qtLibraryTarget($$TARGET) ++TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) +diff --git a/tools/qdbus/src/src.pro b/tools/qdbus/src/src.pro +index 47ef100..0669a46 100644 +--- a/tools/qdbus/src/src.pro ++++ b/tools/qdbus/src/src.pro +@@ -70,7 +70,7 @@ mac:!static:contains(QT_CONFIG, qt_framework) { + } + } + +-TARGET = $$qtLibraryTarget($$TARGET) #done towards the end (after framework) ++TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #done towards the end (after framework) + + # Input + +diff --git a/tools/qtestlib/src/src.pro b/tools/qtestlib/src/src.pro +index 5120a29..7d2082e 100644 +--- a/tools/qtestlib/src/src.pro ++++ b/tools/qtestlib/src/src.pro +@@ -61,7 +61,7 @@ mac:!static:contains(QT_CONFIG, qt_framework) { + } + } + +-TARGET = $$qtLibraryTarget($$TARGET) #done towards the end (after framework) ++TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #done towards the end (after framework) + + # Input + HEADERS = qtest_global.h qtestcase.h qtestdata.h qtesteventloop.h diff --git a/packages/qt4/qt4-x11-free.inc b/packages/qt4/qt4-x11-free.inc index 75f7344e24..1647b07fd3 100644 --- a/packages/qt4/qt4-x11-free.inc +++ b/packages/qt4/qt4-x11-free.inc @@ -18,7 +18,6 @@ S = "${WORKDIR}/qt-x11-opensource-src-${PV}" QT_CONFIG_FLAGS += "-no-xinerama -no-tablet -no-xkb -no-opengl" QT_BASE_NAME = "qt4" QT_BASE_LIB = "libqt" -QT_LIBRARY_NAME = "Qt" QT_DIR_NAME = "qt4" require qt_depends.inc require qt_configuration.inc diff --git a/packages/qt4/qt_configuration.inc b/packages/qt4/qt_configuration.inc index aa4f8c6c5e..252a80a408 100644 --- a/packages/qt4/qt_configuration.inc +++ b/packages/qt4/qt_configuration.inc @@ -2,11 +2,11 @@ require qt4_arch.inc QT_ARCH := "${@qt_arch(d)}" QT_ENDIAN = "${@qt_endian(d)}" -QT_CONFIG_FLAGS = "-release -no-cups -no-accessibility -reduce-relocations \ - -shared -no-nas-sound -no-sm -no-nis \ - -qt-gif -system-libjpeg -system-libpng -system-zlib \ - -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql -no-sql-sqlite -no-sql-sqlite2 \ - -no-pch -qdbus -stl -glib" +QT_CONFIG_FLAGS += "-release -no-cups -no-accessibility -reduce-relocations \ + -shared -no-nas-sound -no-sm -no-nis \ + -qt-gif -system-libjpeg -system-libpng -system-zlib \ + -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql -no-sql-sqlite -no-sql-sqlite2 \ + -no-pch -qdbus -stl -glib" EXTRA_OEMAKE = "-e" diff --git a/packages/qt4/qt_packaging.inc b/packages/qt4/qt_packaging.inc index 472faa3da4..5f94cb46f5 100644 --- a/packages/qt4/qt_packaging.inc +++ b/packages/qt4/qt_packaging.inc @@ -60,56 +60,56 @@ RDEPENDS_${PN}-dev = "${DEV_PACKAGES}" RDEPENDS_${PN}-dbg = "${DBG_PACKAGES}" def qt_default_dev(name): - return """${libdir}/lib${QT_LIBRARY_NAME}%(name)s.la - ${libdir}/lib${QT_LIBRARY_NAME}%(name)s.prl - ${libdir}/lib${QT_LIBRARY_NAME}%(name)s.so + return """${libdir}/libQt%(name)s${QT_LIBINFIX}.la + ${libdir}/libQt%(name)s${QT_LIBINFIX}.prl + ${libdir}/libQt%(name)s${QT_LIBINFIX}.so ${includedir}/${QT_DIR_NAME}/Qt%(name)s* - ${libdir}/pkgconfig/${QT_LIBRARY_NAME}%(name)s.pc""" % locals() + ${libdir}/pkgconfig/Qt%(name)s${QT_LIBINFIX}.pc""" % locals() -FILES_${QT_BASE_LIB}core4 = "${libdir}/lib${QT_LIBRARY_NAME}Core.so.*" +FILES_${QT_BASE_LIB}core4 = "${libdir}/libQtCore${QT_LIBINFIX}.so.*" FILES_${QT_BASE_LIB}core4-dev = "${@qt_default_dev('Core')}" -FILES_${QT_BASE_LIB}core4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Core*" -FILES_${QT_BASE_LIB}gui4 = "${libdir}/lib${QT_LIBRARY_NAME}Gui.so.*" +FILES_${QT_BASE_LIB}core4-dbg = "${libdir}/.debug/libQtCore*" +FILES_${QT_BASE_LIB}gui4 = "${libdir}/libQtGui${QT_LIBINFIX}.so.*" FILES_${QT_BASE_LIB}gui4-dev = "${@qt_default_dev('Gui')}" -FILES_${QT_BASE_LIB}gui4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Gui*" -FILES_${QT_BASE_LIB}network4 = "${libdir}/lib${QT_LIBRARY_NAME}Network.so.*" +FILES_${QT_BASE_LIB}gui4-dbg = "${libdir}/.debug/libQtGui*" +FILES_${QT_BASE_LIB}network4 = "${libdir}/libQtNetwork${QT_LIBINFIX}.so.*" FILES_${QT_BASE_LIB}network4-dev = "${@qt_default_dev('Network')}" -FILES_${QT_BASE_LIB}network4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Network*" -FILES_${QT_BASE_LIB}sql4 = "${libdir}/lib${QT_LIBRARY_NAME}Sql.so.*" +FILES_${QT_BASE_LIB}network4-dbg = "${libdir}/.debug/libQtNetwork${QT_LIBINFIX}*" +FILES_${QT_BASE_LIB}sql4 = "${libdir}/libQtSql${QT_LIBINFIX}.so.*" FILES_${QT_BASE_LIB}sql4-dev = "${@qt_default_dev('Sql')}" -FILES_${QT_BASE_LIB}sql4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Sql*" -FILES_${QT_BASE_LIB}svg4 = "${libdir}/lib${QT_LIBRARY_NAME}Svg.so.*" +FILES_${QT_BASE_LIB}sql4-dbg = "${libdir}/.debug/libQtSql*" +FILES_${QT_BASE_LIB}svg4 = "${libdir}/libQtSvg${QT_LIBINFIX}.so.*" FILES_${QT_BASE_LIB}svg4-dev = "${@qt_default_dev('Svg')}" -FILES_${QT_BASE_LIB}svg4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Svg*" -FILES_${QT_BASE_LIB}test4 = "${libdir}/lib${QT_LIBRARY_NAME}Test.so.*" +FILES_${QT_BASE_LIB}svg4-dbg = "${libdir}/.debug/libQtSvg*" +FILES_${QT_BASE_LIB}test4 = "${libdir}/libQtTest${QT_LIBINFIX}.so.*" FILES_${QT_BASE_LIB}test4-dev = "${@qt_default_dev('Test')}" -FILES_${QT_BASE_LIB}test4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Test*" -FILES_${QT_BASE_LIB}xml4 = "${libdir}/lib${QT_LIBRARY_NAME}Xml.so.*" +FILES_${QT_BASE_LIB}test4-dbg = "${libdir}/.debug/libQtTest*" +FILES_${QT_BASE_LIB}xml4 = "${libdir}/libQtXml${QT_LIBINFIX}.so.*" FILES_${QT_BASE_LIB}xml4-dev = "${@qt_default_dev('Xml')}" -FILES_${QT_BASE_LIB}xml4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Xml*" -FILES_${QT_BASE_LIB}designer4 = "${libdir}/lib${QT_LIBRARY_NAME}Designer.so.*" +FILES_${QT_BASE_LIB}xml4-dbg = "${libdir}/.debug/libQtXml*" +FILES_${QT_BASE_LIB}designer4 = "${libdir}/libQtDesigner${QT_LIBINFIX}.so.*" FILES_${QT_BASE_LIB}designer4-dev = "${@qt_default_dev('Designer')}" -FILES_${QT_BASE_LIB}designer4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Designer*" -FILES_${QT_BASE_LIB}designercomponents4 = "${libdir}/lib${QT_LIBRARY_NAME}DesignerComponents.so.*" +FILES_${QT_BASE_LIB}designer4-dbg = "${libdir}/.debug/libQtDesigner*" +FILES_${QT_BASE_LIB}designercomponents4 = "${libdir}/libQtDesignerComponents${QT_LIBINFIX}.so.*" FILES_${QT_BASE_LIB}designercomponents4-dev = "${@qt_default_dev('DesignerComponents')}" -FILES_${QT_BASE_LIB}designercomponents4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}DesignerComponents*" -FILES_${QT_BASE_LIB}3support4 = "${libdir}/lib${QT_LIBRARY_NAME}3Support.so.*" +FILES_${QT_BASE_LIB}designercomponents4-dbg = "${libdir}/.debug/libQtDesignerComponents*" +FILES_${QT_BASE_LIB}3support4 = "${libdir}/libQt3Support${QT_LIBINFIX}.so.*" FILES_${QT_BASE_LIB}3support4-dev = "${@qt_default_dev('3Support')}" -FILES_${QT_BASE_LIB}3support4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}3Support*" -FILES_${QT_BASE_LIB}assistantclient4 = "${libdir}/lib${QT_LIBRARY_NAME}AssistantClient.so.*" +FILES_${QT_BASE_LIB}3support4-dbg = "${libdir}/.debug/libQt3Support*" +FILES_${QT_BASE_LIB}assistantclient4 = "${libdir}/libQtAssistantClient${QT_LIBINFIX}.so.*" FILES_${QT_BASE_LIB}assistantclient4-dev = "${@qt_default_dev('AssistantClient')} ${includedir}/${QT_DIR_NAME}/QtAssistant*" -FILES_${QT_BASE_LIB}assistantclient4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}AssistantClient*" -FILES_${QT_BASE_LIB}script4 = "${libdir}/lib${QT_LIBRARY_NAME}Script.so.*" +FILES_${QT_BASE_LIB}assistantclient4-dbg = "${libdir}/.debug/libQtAssistantClient*" +FILES_${QT_BASE_LIB}script4 = "${libdir}/libQtScript${QT_LIBINFIX}.so.*" FILES_${QT_BASE_LIB}script4-dev = "${@qt_default_dev('Script')}" -FILES_${QT_BASE_LIB}script4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Script*" -FILES_${QT_BASE_LIB}dbus4 = "${libdir}/lib${QT_LIBRARY_NAME}DBus.so.*" +FILES_${QT_BASE_LIB}script4-dbg = "${libdir}/.debug/libQtScript*" +FILES_${QT_BASE_LIB}dbus4 = "${libdir}/libQtDBus${QT_LIBINFIX}.so.*" FILES_${QT_BASE_LIB}dbus4-dev = "${@qt_default_dev('DBus')}" -FILES_${QT_BASE_LIB}dbus4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}DBus*" -FILES_${QT_BASE_LIB}opengl4 = "${libdir}/lib${QT_LIBRARY_NAME}OpenGL.so.*" +FILES_${QT_BASE_LIB}dbus4-dbg = "${libdir}/.debug/libQtDBus*" +FILES_${QT_BASE_LIB}opengl4 = "${libdir}/libQtOpenGL${QT_LIBINFIX}.so.*" FILES_${QT_BASE_LIB}opengl4-dev = "${@qt_default_dev('OpenGL')}" -FILES_${QT_BASE_LIB}opengl4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}OpenGL*" -FILES_${QT_BASE_LIB}uitools4-dev = "${libdir}/lib${QT_LIBRARY_NAME}UiTools* ${includedir}/${QT_DIR_NAME}/QtUiTools* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}UiTools.pc" +FILES_${QT_BASE_LIB}opengl4-dbg = "${libdir}/.debug/libQtOpenGL*" +FILES_${QT_BASE_LIB}uitools4-dev = "${libdir}/libQtUiTools* ${includedir}/${QT_DIR_NAME}/QtUiTools* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}UiTools.pc" FILES_${QT_BASE_NAME}-plugins-accessible = "${libdir}/${QT_DIR_NAME}/plugins/accessible/*.so" diff --git a/packages/qt4/qt_staging.inc b/packages/qt4/qt_staging.inc index 21f17590b5..37002ca50e 100644 --- a/packages/qt4/qt_staging.inc +++ b/packages/qt4/qt_staging.inc @@ -18,6 +18,7 @@ do_stage() { for i in ${STAGE_TEMP}/${libdir}/*.la do + cp -fpPR $i ${STAGING_LIBDIR}/${QT_DIR_NAME}/ oe_libinstall -C ${STAGE_TEMP}/${libdir} -so $(basename $i .la) ${STAGING_LIBDIR}/${QT_DIR_NAME} done diff --git a/packages/qt4/qtopia-core.inc b/packages/qt4/qtopia-core.inc index 06837787cf..9e4eebc92e 100644 --- a/packages/qt4/qtopia-core.inc +++ b/packages/qt4/qtopia-core.inc @@ -15,12 +15,12 @@ S = "${WORKDIR}/qtopia-core-opensource-src-${PV}" QT_CONFIG_FLAGS += " \ - -nomake demos -nomake examples -nomake tools \ + -nomake demos -nomake examples -nomake tools -qtlibinfix E\ -qt-mouse-tslib -qt-gfx-transformed -embedded ${QT_ARCH}" QT_BASE_NAME = "qtopiacore" QT_BASE_LIB = "libqtopiacore" -QT_LIBRARY_NAME = "Qt" QT_DIR_NAME = "qtopia" +QT_LIBINFIX="E" require qt_depends.inc require qt_configuration.inc require qt_packaging.inc diff --git a/packages/qt4/qtopia-core_4.3.3.bb b/packages/qt4/qtopia-core_4.3.3.bb index b903e2b06a..9dad97f49a 100644 --- a/packages/qt4/qtopia-core_4.3.3.bb +++ b/packages/qt4/qtopia-core_4.3.3.bb @@ -1,4 +1,5 @@ require qtopia-core.inc SRC_URI += " \ file://0006-freetype-host-includes.patch;patch=1 \ - file://0007-openssl-host-includes.patch;patch=1 " + file://0007-openssl-host-includes.patch;patch=1 \ + file://0008-backport-qt-lib-infix.patch;patch=1" -- cgit v1.2.3 From a4db694c91c857abdba5a875314e3206c195e5a4 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Thu, 27 Dec 2007 12:59:27 +0000 Subject: packages/qt4/qt_staging.inc: Manually fix the .la files to say installed=no --- packages/qt4/qt_staging.inc | 1 + 1 file changed, 1 insertion(+) (limited to 'packages/qt4') diff --git a/packages/qt4/qt_staging.inc b/packages/qt4/qt_staging.inc index 37002ca50e..6048d7b03e 100644 --- a/packages/qt4/qt_staging.inc +++ b/packages/qt4/qt_staging.inc @@ -18,6 +18,7 @@ do_stage() { for i in ${STAGE_TEMP}/${libdir}/*.la do + sed -i s,installed=yes,installed=no, $i cp -fpPR $i ${STAGING_LIBDIR}/${QT_DIR_NAME}/ oe_libinstall -C ${STAGE_TEMP}/${libdir} -so $(basename $i .la) ${STAGING_LIBDIR}/${QT_DIR_NAME} done -- cgit v1.2.3 From f61e7fc91e6ee49c3a2124d38fc85dd12360ed40 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Thu, 27 Dec 2007 16:17:05 +0000 Subject: packages/qt4/qtopia-core: Force building of tools, demos and examples --- packages/qt4/qtopia-core.inc | 3 ++- packages/qt4/qtopia-core/build-tools.patch | 28 ++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 packages/qt4/qtopia-core/build-tools.patch (limited to 'packages/qt4') diff --git a/packages/qt4/qtopia-core.inc b/packages/qt4/qtopia-core.inc index 9e4eebc92e..05727b7c90 100644 --- a/packages/qt4/qtopia-core.inc +++ b/packages/qt4/qtopia-core.inc @@ -10,7 +10,8 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.ta file://0001-cross-compile.patch;patch=1 \ file://0003-no-tools.patch;patch=1 \ file://0004-no-qmake.patch;patch=1 \ - file://0005-fix-mkspecs.patch;patch=1" + file://0005-fix-mkspecs.patch;patch=1 \ + file://build-tools.patch;patch=1" S = "${WORKDIR}/qtopia-core-opensource-src-${PV}" diff --git a/packages/qt4/qtopia-core/build-tools.patch b/packages/qt4/qtopia-core/build-tools.patch new file mode 100644 index 0000000000..54ad666374 --- /dev/null +++ b/packages/qt4/qtopia-core/build-tools.patch @@ -0,0 +1,28 @@ +Do not disable tools, examples and demos for the QWS build. Use brute-force +to do this. + +Index: qtopia-core-opensource-src-4.3.3/configure +=================================================================== +--- qtopia-core-opensource-src-4.3.3.orig/configure 2007-12-27 16:30:36.000000000 +0100 ++++ qtopia-core-opensource-src-4.3.3/configure 2007-12-27 16:30:52.000000000 +0100 +@@ -2265,13 +2265,13 @@ + CFG_BUILD_PARTS="$QT_DEFAULT_BUILD_PARTS" + + # don't build tools by default when cross-compiling +- if [ "$PLATFORM" != "$XPLATFORM" ]; then +- CFG_BUILD_PARTS=`echo "$CFG_BUILD_PARTS" | sed "s, tools,,g"` +- fi +-fi +-for nobuild in $CFG_NOBUILD_PARTS; do +- CFG_BUILD_PARTS=`echo "$CFG_BUILD_PARTS" | sed "s, $nobuild,,g"` +-done ++ #if [ "$PLATFORM" != "$XPLATFORM" ]; then ++ # CFG_BUILD_PARTS=`echo "$CFG_BUILD_PARTS" | sed "s, tools,,g"` ++ #fi ++fi ++#for nobuild in $CFG_NOBUILD_PARTS; do ++# CFG_BUILD_PARTS=`echo "$CFG_BUILD_PARTS" | sed "s, $nobuild,,g"` ++#done + if echo $CFG_BUILD_PARTS | grep -v libs >/dev/null 2>&1; then + # echo + # echo "WARNING: libs is a required part of the build." -- cgit v1.2.3 From d76a122f461aa6b92be898198a7a1830a5a72f1a Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Thu, 27 Dec 2007 16:46:54 +0000 Subject: packages/qt4/qt_packaging.inc: Fix packaging of the QtUiTools${QT_LIBINFIX} --- .../qt4/files/0008-backport-qt-lib-infix.patch | 105 +++++++++++++-------- packages/qt4/qt_packaging.inc | 2 +- 2 files changed, 68 insertions(+), 39 deletions(-) (limited to 'packages/qt4') diff --git a/packages/qt4/files/0008-backport-qt-lib-infix.patch b/packages/qt4/files/0008-backport-qt-lib-infix.patch index 79786e517e..c93f58ca41 100644 --- a/packages/qt4/files/0008-backport-qt-lib-infix.patch +++ b/packages/qt4/files/0008-backport-qt-lib-infix.patch @@ -1,8 +1,8 @@ -diff --git a/configure b/configure -index c5bdc34..a52607f 100755 ---- a/configure -+++ b/configure -@@ -782,6 +782,11 @@ while [ "$#" -gt 0 ]; do +Index: qtopia-core-opensource-src-4.3.3/configure +=================================================================== +--- qtopia-core-opensource-src-4.3.3.orig/configure 2007-12-27 17:26:19.000000000 +0100 ++++ qtopia-core-opensource-src-4.3.3/configure 2007-12-27 17:26:19.000000000 +0100 +@@ -782,6 +782,11 @@ VAR=endian VAL=`echo $1 | sed "s,^-\(.*\)-.*,\1,"` ;; @@ -14,7 +14,7 @@ index c5bdc34..a52607f 100755 -D?*|-D) VAR="add_define" if [ "$1" = "-D" ]; then -@@ -903,6 +908,9 @@ while [ "$#" -gt 0 ]; do +@@ -903,6 +908,9 @@ libdir) QT_INSTALL_LIBS="$VAL" ;; @@ -24,7 +24,7 @@ index c5bdc34..a52607f 100755 translationdir) QT_INSTALL_TRANSLATIONS="$VAL" ;; -@@ -2606,6 +2614,8 @@ fi +@@ -2606,6 +2614,8 @@ -no-sse ............ Do not compile with use of SSE instructions. -no-sse2 ........... Do not compile with use of SSE2 instructions. @@ -33,7 +33,7 @@ index c5bdc34..a52607f 100755 -D ........ Add an explicit define to the preprocessor. -I ........ Add an explicit include path. -L ........ Add an explicit library path. -@@ -5273,6 +5283,8 @@ QT_MAJOR_VERSION = $QT_MAJOR_VERSION +@@ -5273,6 +5283,8 @@ QT_MINOR_VERSION = $QT_MINOR_VERSION QT_PATCH_VERSION = $QT_PATCH_VERSION @@ -42,11 +42,11 @@ index c5bdc34..a52607f 100755 EOF if [ "$CFG_RPATH" = "yes" ]; then echo "QMAKE_RPATHDIR += \"$QT_INSTALL_LIBS\"" >> "$QTCONFIG.tmp" -diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index 32a7fd5..48d584f 100644 ---- a/mkspecs/features/qt_functions.prf -+++ b/mkspecs/features/qt_functions.prf -@@ -28,7 +28,7 @@ defineTest(qtAddLibrary) { +Index: qtopia-core-opensource-src-4.3.3/mkspecs/features/qt_functions.prf +=================================================================== +--- qtopia-core-opensource-src-4.3.3.orig/mkspecs/features/qt_functions.prf 2007-12-04 18:07:53.000000000 +0100 ++++ qtopia-core-opensource-src-4.3.3/mkspecs/features/qt_functions.prf 2007-12-27 17:26:19.000000000 +0100 +@@ -28,7 +28,7 @@ INCLUDEPATH -= $$FRAMEWORK_INCLUDE INCLUDEPATH = $$FRAMEWORK_INCLUDE $$INCLUDEPATH } @@ -55,7 +55,7 @@ index 32a7fd5..48d584f 100644 } else:!qt_no_framework { #detection for(frmwrk_dir, $$list($$QMAKE_LIBDIR_QT $$QMAKE_LIBDIR $$(DYLD_FRAMEWORK_PATH) /Library/Frameworks)) { exists($${frmwrk_dir}/$${LIB_NAME}.framework) { -@@ -46,15 +46,15 @@ defineTest(qtAddLibrary) { +@@ -46,15 +46,15 @@ } isEmpty(LINKAGE) { CONFIG(debug, debug|release) { @@ -75,11 +75,11 @@ index 32a7fd5..48d584f 100644 } LIBS += $$LINKAGE export(LIBS) -diff --git a/src/qbase.pri b/src/qbase.pri -index 4db7e70..278e011 100644 ---- a/src/qbase.pri -+++ b/src/qbase.pri -@@ -138,7 +138,7 @@ DEFINES += QT_NO_CAST_TO_ASCII QT_ASCII_CAST_WARNINGS QT_44_API_QSQLQUERY_FINISH +Index: qtopia-core-opensource-src-4.3.3/src/qbase.pri +=================================================================== +--- qtopia-core-opensource-src-4.3.3.orig/src/qbase.pri 2007-12-04 18:08:13.000000000 +0100 ++++ qtopia-core-opensource-src-4.3.3/src/qbase.pri 2007-12-27 17:26:19.000000000 +0100 +@@ -138,7 +138,7 @@ contains(QT_CONFIG, qt3support):DEFINES *= QT3_SUPPORT DEFINES *= QT_MOC_COMPAT #we don't need warnings from calling moc code in our generated code @@ -88,11 +88,11 @@ index 4db7e70..278e011 100644 moc_dir.name = moc_location moc_dir.variable = QMAKE_MOC -diff --git a/tools/assistant/lib/lib.pro b/tools/assistant/lib/lib.pro -index c121f28..83c3ed7 100644 ---- a/tools/assistant/lib/lib.pro -+++ b/tools/assistant/lib/lib.pro -@@ -52,7 +52,7 @@ mac:!static:contains(QT_CONFIG, qt_framework) { +Index: qtopia-core-opensource-src-4.3.3/tools/assistant/lib/lib.pro +=================================================================== +--- qtopia-core-opensource-src-4.3.3.orig/tools/assistant/lib/lib.pro 2007-12-04 18:08:19.000000000 +0100 ++++ qtopia-core-opensource-src-4.3.3/tools/assistant/lib/lib.pro 2007-12-27 17:26:19.000000000 +0100 +@@ -52,7 +52,7 @@ } } @@ -101,19 +101,19 @@ index c121f28..83c3ed7 100644 target.path=$$[QT_INSTALL_LIBS] INSTALLS += target -diff --git a/tools/designer/src/components/component.pri b/tools/designer/src/components/component.pri -index 15c0cf2..78b075d 100644 ---- a/tools/designer/src/components/component.pri -+++ b/tools/designer/src/components/component.pri +Index: qtopia-core-opensource-src-4.3.3/tools/designer/src/components/component.pri +=================================================================== +--- qtopia-core-opensource-src-4.3.3.orig/tools/designer/src/components/component.pri 2007-12-04 18:08:43.000000000 +0100 ++++ qtopia-core-opensource-src-4.3.3/tools/designer/src/components/component.pri 2007-12-27 17:26:19.000000000 +0100 @@ -1,2 +1,2 @@ -TARGET = $$qtLibraryTarget($$TARGET) +TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) -diff --git a/tools/qdbus/src/src.pro b/tools/qdbus/src/src.pro -index 47ef100..0669a46 100644 ---- a/tools/qdbus/src/src.pro -+++ b/tools/qdbus/src/src.pro -@@ -70,7 +70,7 @@ mac:!static:contains(QT_CONFIG, qt_framework) { +Index: qtopia-core-opensource-src-4.3.3/tools/qdbus/src/src.pro +=================================================================== +--- qtopia-core-opensource-src-4.3.3.orig/tools/qdbus/src/src.pro 2007-12-04 18:08:18.000000000 +0100 ++++ qtopia-core-opensource-src-4.3.3/tools/qdbus/src/src.pro 2007-12-27 17:26:19.000000000 +0100 +@@ -70,7 +70,7 @@ } } @@ -122,11 +122,11 @@ index 47ef100..0669a46 100644 # Input -diff --git a/tools/qtestlib/src/src.pro b/tools/qtestlib/src/src.pro -index 5120a29..7d2082e 100644 ---- a/tools/qtestlib/src/src.pro -+++ b/tools/qtestlib/src/src.pro -@@ -61,7 +61,7 @@ mac:!static:contains(QT_CONFIG, qt_framework) { +Index: qtopia-core-opensource-src-4.3.3/tools/qtestlib/src/src.pro +=================================================================== +--- qtopia-core-opensource-src-4.3.3.orig/tools/qtestlib/src/src.pro 2007-12-04 18:08:18.000000000 +0100 ++++ qtopia-core-opensource-src-4.3.3/tools/qtestlib/src/src.pro 2007-12-27 17:26:19.000000000 +0100 +@@ -61,7 +61,7 @@ } } @@ -135,3 +135,32 @@ index 5120a29..7d2082e 100644 # Input HEADERS = qtest_global.h qtestcase.h qtestdata.h qtesteventloop.h +Index: qtopia-core-opensource-src-4.3.3/tools/designer/src/uitools/uitools.pro +=================================================================== +--- qtopia-core-opensource-src-4.3.3.orig/tools/designer/src/uitools/uitools.pro 2007-12-04 18:08:43.000000000 +0100 ++++ qtopia-core-opensource-src-4.3.3/tools/designer/src/uitools/uitools.pro 2007-12-27 17:26:19.000000000 +0100 +@@ -1,5 +1,5 @@ + TEMPLATE = lib +-TARGET = $$qtLibraryTarget(QtUiTools) ++TARGET = $$qtLibraryTarget(QtUiTools$$QT_LIBINFIX) + QT += xml + CONFIG += qt staticlib + DESTDIR = ../../../../lib +Index: qtopia-core-opensource-src-4.3.3/mkspecs/features/uitools.prf +=================================================================== +--- qtopia-core-opensource-src-4.3.3.orig/mkspecs/features/uitools.prf 2007-12-27 17:32:57.000000000 +0100 ++++ qtopia-core-opensource-src-4.3.3/mkspecs/features/uitools.prf 2007-12-27 17:33:56.000000000 +0100 +@@ -2,10 +2,10 @@ + qt:load(qt) + + # Include the correct version of the UiLoader library +-QTUITOOLS_LINKAGE = -lQtUiTools ++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 + diff --git a/packages/qt4/qt_packaging.inc b/packages/qt4/qt_packaging.inc index 5f94cb46f5..e610245c05 100644 --- a/packages/qt4/qt_packaging.inc +++ b/packages/qt4/qt_packaging.inc @@ -109,7 +109,7 @@ FILES_${QT_BASE_LIB}dbus4-dbg = "${libdir}/.debug/libQtDBus*" FILES_${QT_BASE_LIB}opengl4 = "${libdir}/libQtOpenGL${QT_LIBINFIX}.so.*" FILES_${QT_BASE_LIB}opengl4-dev = "${@qt_default_dev('OpenGL')}" FILES_${QT_BASE_LIB}opengl4-dbg = "${libdir}/.debug/libQtOpenGL*" -FILES_${QT_BASE_LIB}uitools4-dev = "${libdir}/libQtUiTools* ${includedir}/${QT_DIR_NAME}/QtUiTools* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}UiTools.pc" +FILES_${QT_BASE_LIB}uitools4-dev = "${libdir}/libQtUiTools* ${includedir}/${QT_DIR_NAME}/QtUiTools* ${libdir}/pkgconfig/QtUiTools${QT_LIBINFIX}.pc" FILES_${QT_BASE_NAME}-plugins-accessible = "${libdir}/${QT_DIR_NAME}/plugins/accessible/*.so" -- cgit v1.2.3 From c6aa92680ee15b79713585687579dd1687e2bd39 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Thu, 27 Dec 2007 16:58:58 +0000 Subject: packages/qt4/qt_staging.inc: Stage the .prl and semi private Qt libraries. --- packages/qt4/qt_staging.inc | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'packages/qt4') diff --git a/packages/qt4/qt_staging.inc b/packages/qt4/qt_staging.inc index 6048d7b03e..ddc28720a3 100644 --- a/packages/qt4/qt_staging.inc +++ b/packages/qt4/qt_staging.inc @@ -20,8 +20,17 @@ do_stage() { do sed -i s,installed=yes,installed=no, $i cp -fpPR $i ${STAGING_LIBDIR}/${QT_DIR_NAME}/ + cp -fpPR ${STAGE_TEMP}/${libdir}/$(basename $i .la).prl ${STAGING_LIBDIR}/${QT_DIR_NAME} oe_libinstall -C ${STAGE_TEMP}/${libdir} -so $(basename $i .la) ${STAGING_LIBDIR}/${QT_DIR_NAME} done + for i in libQtAssistantClient${QT_LIBINFIX} libQtDesignerComponents${QT_LIBINFIX} libQtUiTools${QT_LIBINFIX} libQtUiTools${QT_LIBINFIX} libQtDesigner${QT_LIBINFIX} + do + cp ${STAGE_TEMP}/${libdir}/$i.prl ${STAGING_LIBDIR}/${QT_DIR_NAME} || true + cp ${STAGE_TEMP}/${libdir}/$i.la ${STAGING_LIBDIR}/${QT_DIR_NAME} || true + oe_libinstall -C ${STAGE_TEMP}/${libdir} -so $i ${STAGING_LIBDIR}/${QT_DIR_NAME} || true + oe_libinstall -C ${STAGE_TEMP}/${libdir} -a $i ${STAGING_LIBDIR}/${QT_DIR_NAME} || true + done + rm -rf ${STAGE_TEMP} } -- cgit v1.2.3 From f8512cbc3629216472ff1340cc060104f769621e Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sat, 19 Jan 2008 23:58:37 +0000 Subject: packages/qt4/qt4-x11-free.inc: Set QT_LIBINFIX to an empty string to fix the packaging libQtCore, libQtGui... should now be properly created again. I was under the false expression that ${QT_LIBINFIX} would expand to an empty string. Set QT_LIBINFIX to an empty string for the Qt4/X11 variant. --- packages/qt4/qt4-x11-free.inc | 1 + 1 file changed, 1 insertion(+) (limited to 'packages/qt4') diff --git a/packages/qt4/qt4-x11-free.inc b/packages/qt4/qt4-x11-free.inc index 1647b07fd3..2650433ec8 100644 --- a/packages/qt4/qt4-x11-free.inc +++ b/packages/qt4/qt4-x11-free.inc @@ -19,6 +19,7 @@ QT_CONFIG_FLAGS += "-no-xinerama -no-tablet -no-xkb -no-opengl" QT_BASE_NAME = "qt4" QT_BASE_LIB = "libqt" QT_DIR_NAME = "qt4" +QT_LIBINFIX = "" require qt_depends.inc require qt_configuration.inc require qt_packaging.inc -- cgit v1.2.3 From 8d6b9e5c13410242ed3d110685761ac3c9f1887e Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sun, 20 Jan 2008 10:25:16 +0000 Subject: packages/qt4/qt_staging.inc: Fix the .pc files of Qt/X11 and Qt/Embedded The libdir was pointing to ${prefix}/lib it should have pointed to ${prefix}/lib/{qtopia..,qt4} for the staged libraries --- packages/qt4/qt_staging.inc | 1 + 1 file changed, 1 insertion(+) (limited to 'packages/qt4') diff --git a/packages/qt4/qt_staging.inc b/packages/qt4/qt_staging.inc index ddc28720a3..8f7b9aa29f 100644 --- a/packages/qt4/qt_staging.inc +++ b/packages/qt4/qt_staging.inc @@ -4,6 +4,7 @@ do_stage_append() { sed -i s#"-L${S}/lib"##g Qt*.pc sed -i s#"moc_location=${S}/bin/moc"#moc_location=${STAGING_BINDIR}/moc4# Qt*.pc sed -i s#"uic_location=${S}/bin/uic"#uic_location=${STAGING_BINDIR}/uic4# Qt*.pc + sed -i s#libdir=\$\{prefix\}/lib#libdir=\$\{prefix\}/lib/${QT_DIR_NAME}#g Qt*.pc } STAGE_TEMP = "${WORKDIR}/temp-staging" -- cgit v1.2.3 From ac72466510af33cf5fc9b47b414b349bf2bbd068 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sun, 20 Jan 2008 10:26:21 +0000 Subject: packages/qt4/qt_staging.inc: Treat the staged .la files as well to not point to the workdir --- packages/qt4/qt_staging.inc | 3 +++ 1 file changed, 3 insertions(+) (limited to 'packages/qt4') diff --git a/packages/qt4/qt_staging.inc b/packages/qt4/qt_staging.inc index 8f7b9aa29f..9aa309d3af 100644 --- a/packages/qt4/qt_staging.inc +++ b/packages/qt4/qt_staging.inc @@ -5,6 +5,9 @@ do_stage_append() { sed -i s#"moc_location=${S}/bin/moc"#moc_location=${STAGING_BINDIR}/moc4# Qt*.pc sed -i s#"uic_location=${S}/bin/uic"#uic_location=${STAGING_BINDIR}/uic4# Qt*.pc sed -i s#libdir=\$\{prefix\}/lib#libdir=\$\{prefix\}/lib/${QT_DIR_NAME}#g Qt*.pc + + cd ${STAGING_LIBDIR}/${QT_DIR_NAME} + sed -i s#"-L${S}/lib"##g libQt*.la } STAGE_TEMP = "${WORKDIR}/temp-staging" -- cgit v1.2.3 From b46f9164284b0cd6196d9bece226f5cf7705de1e Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sun, 20 Jan 2008 10:28:10 +0000 Subject: packages/qt4/qt_packaging.inc: Better safe than sorry and use += for the NONDEV_PACKAGES as well In the future some .bb file could add a package to the NONDEV_PACKAGES list and the update would have been lost with this update. --- packages/qt4/qt_packaging.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/qt4') diff --git a/packages/qt4/qt_packaging.inc b/packages/qt4/qt_packaging.inc index e610245c05..63d314c6c5 100644 --- a/packages/qt4/qt_packaging.inc +++ b/packages/qt4/qt_packaging.inc @@ -1,4 +1,4 @@ -NONDEV_PACKAGES = "${QT_BASE_LIB}core4 ${QT_BASE_LIB}gui4 ${QT_BASE_LIB}network4 \ +NONDEV_PACKAGES += "${QT_BASE_LIB}core4 ${QT_BASE_LIB}gui4 ${QT_BASE_LIB}network4 \ ${QT_BASE_LIB}sql4 ${QT_BASE_LIB}svg4 ${QT_BASE_LIB}test4 ${QT_BASE_LIB}xml4 \ ${QT_BASE_LIB}designer4 ${QT_BASE_LIB}designercomponents4 \ ${QT_BASE_LIB}3support4 ${QT_BASE_LIB}assistantclient4 ${QT_BASE_LIB}script4 \ -- cgit v1.2.3 From 37f1ff2ab29c485abab10005d25b363373a23dc9 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sun, 20 Jan 2008 11:50:04 +0000 Subject: packages/qt4/qtopia-core_4.2.0: Remove the older version, it is not used --- packages/qt4/qtopia-core_4.2.0.bb | 1 - 1 file changed, 1 deletion(-) delete mode 100644 packages/qt4/qtopia-core_4.2.0.bb (limited to 'packages/qt4') diff --git a/packages/qt4/qtopia-core_4.2.0.bb b/packages/qt4/qtopia-core_4.2.0.bb deleted file mode 100644 index bd54419686..0000000000 --- a/packages/qt4/qtopia-core_4.2.0.bb +++ /dev/null @@ -1 +0,0 @@ -require ${PN}.inc -- cgit v1.2.3 From 620b4535290d9d45724d00eaca5dde4ed4fdc2e1 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sun, 20 Jan 2008 22:49:28 +0000 Subject: packages/qt4/qtopia-core: Build the features that are available as plugin as plugin -Build whatever can be build as plugin as plugin (graphics driver, mouse...) -Change the configure script to find plugins -Packaging needs to be done --- .../allow-configure-plugins.patch | 62 ++++++++++++++++++++++ packages/qt4/qtopia-core.inc | 10 +++- packages/qt4/qtopia-core_4.3.3.bb | 3 +- 3 files changed, 73 insertions(+), 2 deletions(-) create mode 100644 packages/qt4/qtopia-core-4.3.3/allow-configure-plugins.patch (limited to 'packages/qt4') diff --git a/packages/qt4/qtopia-core-4.3.3/allow-configure-plugins.patch b/packages/qt4/qtopia-core-4.3.3/allow-configure-plugins.patch new file mode 100644 index 0000000000..601f2fc369 --- /dev/null +++ b/packages/qt4/qtopia-core-4.3.3/allow-configure-plugins.patch @@ -0,0 +1,62 @@ +Index: qtopia-core-opensource-src-4.3.3/configure +=================================================================== +--- qtopia-core-opensource-src-4.3.3.orig/configure 2008-01-20 11:42:07.000000000 +0100 ++++ qtopia-core-opensource-src-4.3.3/configure 2008-01-20 22:31:37.000000000 +0100 +@@ -639,10 +639,10 @@ + + CFG_SQL_AVAILABLE= + if [ -d "$relpath/src/plugins/sqldrivers" ]; then +- for a in "$relpath/src/plugins/sqldrivers/"*; do +- if [ -d "$a" ]; then +- base_a=`basename $a` +- CFG_SQL_AVAILABLE="${CFG_SQL_AVAILABLE} ${base_a}" ++ for a in `ls $relpath/src/plugins/sqldrivers/`; do ++ dir="$relpath/src/plugins/sqldrivers/$a" ++ if [ -d "$dir" ]; then ++ CFG_SQL_AVAILABLE="${CFG_SQL_AVAILABLE} ${a}" + eval "CFG_SQL_${base_a}=auto" + fi + done +@@ -650,30 +650,30 @@ + + CFG_DECORATION_PLUGIN_AVAILABLE= + if [ -d "$relpath/src/plugins/decorations" ]; then +- for a in "$relpath/src/plugins/decorations/"*; do +- if [ -d "$a" ]; then +- base_a=`basename $a` +- CFG_DECORATION_PLUGIN_AVAILABLE="${CFG_DECORATION_PLUGIN_AVAILABLE} ${base_a}" ++ for a in `ls $relpath/src/plugins/decorations/`; do ++ dir="$relpath/src/plugins/decorations/$a" ++ if [ -d "$dir" ]; then ++ CFG_DECORATION_PLUGIN_AVAILABLE="${CFG_DECORATION_PLUGIN_AVAILABLE} ${a}" + fi + done + fi + + CFG_MOUSE_PLUGIN_AVAILABLE= + if [ -d "$relpath/src/plugins/mousedrivers" ]; then +- for a in "$relpath/src/plugins/mousedrivers/"*; do +- if [ -d "$a" ]; then +- base_a=`basename $a` +- CFG_MOUSE_PLUGIN_AVAILABLE="${CFG_MOUSE_PLUGIN_AVAILABLE} ${base_a}" ++ for a in `ls $relpath/src/plugins/mousedrivers/`; do ++ dir="$relpath/src/plugins/mousedrivers/$a" ++ if [ -d "$dir" ]; then ++ CFG_MOUSE_PLUGIN_AVAILABLE="${CFG_MOUSE_PLUGIN_AVAILABLE} ${a}" + fi + done + fi + + CFG_GFX_PLUGIN_AVAILABLE= + if [ -d "$relpath/src/plugins/gfxdrivers" ]; then +- for a in "$relpath/src/plugins/gfxdrivers/"*; do +- if [ -d "$a" ]; then +- base_a=`basename $a` +- CFG_GFX_PLUGIN_AVAILABLE="${CFG_GFX_PLUGIN_AVAILABLE} ${base_a}" ++ for a in `ls $relpath/src/plugins/gfxdrivers/`; do ++ dir="$relpath/src/plugins/gfxdrivers/$a" ++ if [ -d "$dir" ]; then ++ CFG_GFX_PLUGIN_AVAILABLE="${CFG_GFX_PLUGIN_AVAILABLE} ${a}" + fi + done + CFG_GFX_OFF="$CFG_GFX_AVAILABLE" # assume all off diff --git a/packages/qt4/qtopia-core.inc b/packages/qt4/qtopia-core.inc index 05727b7c90..16f67ac629 100644 --- a/packages/qt4/qtopia-core.inc +++ b/packages/qt4/qtopia-core.inc @@ -17,7 +17,15 @@ S = "${WORKDIR}/qtopia-core-opensource-src-${PV}" QT_CONFIG_FLAGS += " \ -nomake demos -nomake examples -nomake tools -qtlibinfix E\ - -qt-mouse-tslib -qt-gfx-transformed -embedded ${QT_ARCH}" + -embedded ${QT_ARCH} \ + -qt-decoration-styled -plugin-decoration-default -plugin-decoration-windows \ + -plugin-gfx-transformed -plugin-gfx-qvfb -plugin-gfx-vnc\ + -plugin-mouse-tslib -qt-mouse-pc -qt-mouse-qvfb\ + -qt-kbd-tty -qt-kbd-usb -qt-kbd-qvfb\ + ${QT_QCONFIG} \ + " + +QT_QCONFIG = "" QT_BASE_NAME = "qtopiacore" QT_BASE_LIB = "libqtopiacore" QT_DIR_NAME = "qtopia" diff --git a/packages/qt4/qtopia-core_4.3.3.bb b/packages/qt4/qtopia-core_4.3.3.bb index 9dad97f49a..40ec78ef04 100644 --- a/packages/qt4/qtopia-core_4.3.3.bb +++ b/packages/qt4/qtopia-core_4.3.3.bb @@ -2,4 +2,5 @@ require qtopia-core.inc SRC_URI += " \ file://0006-freetype-host-includes.patch;patch=1 \ file://0007-openssl-host-includes.patch;patch=1 \ - file://0008-backport-qt-lib-infix.patch;patch=1" + file://0008-backport-qt-lib-infix.patch;patch=1 \ + file://allow-configure-plugins.patch;patch=1 " -- cgit v1.2.3 From 11434035bf87301cddff91550ecc865499a0adcc Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sun, 20 Jan 2008 23:17:35 +0000 Subject: packages/qt4/qtopia-core: Prepare for someone to use -qconfig -We don't disable any features, but passing -qconfig will automatically disable q3support so we can't enable the usage of -qconfig by default -Install an OE qconfig-oe.h and QT_QCONFIG can be overriden by the default OVERRIDE system (this makes up a bit for the lacking documentation) --- packages/qt4/qtopia-core-4.3.3/qconfig-oe.h | 45 +++++++++++++++++++++++++++++ packages/qt4/qtopia-core.inc | 5 ++++ 2 files changed, 50 insertions(+) create mode 100644 packages/qt4/qtopia-core-4.3.3/qconfig-oe.h (limited to 'packages/qt4') diff --git a/packages/qt4/qtopia-core-4.3.3/qconfig-oe.h b/packages/qt4/qtopia-core-4.3.3/qconfig-oe.h new file mode 100644 index 0000000000..f820c01da8 --- /dev/null +++ b/packages/qt4/qtopia-core-4.3.3/qconfig-oe.h @@ -0,0 +1,45 @@ +/**************************************************************************** +** +** Copyright (C) 1992-2007 Trolltech ASA. All rights reserved. +** +** This file is part of the QtCore module of the Qt Toolkit. +** +** This file may be used under the terms of the GNU General Public +** License version 2.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of +** this file. Please review the following information to ensure GNU +** General Public Licensing requirements will be met: +** http://trolltech.com/products/qt/licenses/licensing/opensource/ +** +** If you are unsure which license is appropriate for your use, please +** review the following information: +** http://trolltech.com/products/qt/licenses/licensing/licensingoverview +** or contact the sales department at sales@trolltech.com. +** +** In addition, as a special exception, Trolltech gives you certain +** additional rights. These rights are described in the Trolltech GPL +** Exception version 1.0, which can be found at +** http://www.trolltech.com/products/qt/gplexception/ and in the file +** GPL_EXCEPTION.txt in this package. +** +** In addition, as a special exception, Trolltech, as the sole copyright +** holder for Qt Designer, grants users of the Qt/Eclipse Integration +** plug-in the right for the Qt/Eclipse Integration to link to +** functionality provided by Qt Designer and its related libraries. +** +** Trolltech reserves all rights not expressly granted herein. +** +** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE +** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +** +****************************************************************************/ + + +/* + Empty leaves all features enabled. See doc/html/emb-features.html for choices. + + Note that disabling some features will produce a libqt that is not + compatible with other libqt builds. Such modifications are only + supported on Qtopia Core where reducing the library size is important + and where the application-suite is often a fixed set. +*/ diff --git a/packages/qt4/qtopia-core.inc b/packages/qt4/qtopia-core.inc index 16f67ac629..46bec73cd8 100644 --- a/packages/qt4/qtopia-core.inc +++ b/packages/qt4/qtopia-core.inc @@ -7,6 +7,7 @@ DEPENDS += "tslib" PR = "r1" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.tar.gz \ + file://qconfig-oe.h \ file://0001-cross-compile.patch;patch=1 \ file://0003-no-tools.patch;patch=1 \ file://0004-no-qmake.patch;patch=1 \ @@ -25,6 +26,10 @@ QT_CONFIG_FLAGS += " \ ${QT_QCONFIG} \ " +do_configure_prepend() { + cp ${WORKDIR}/qconfig-oe.h ${S}/src/corelib/global +} + QT_QCONFIG = "" QT_BASE_NAME = "qtopiacore" QT_BASE_LIB = "libqtopiacore" -- cgit v1.2.3 From 5bd832ff07a62f1c152b71a8e11b7553b336185a Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Mon, 21 Jan 2008 21:39:34 +0000 Subject: packages/qt4/qt_packaging.inc: Fix the splitting of the translation packages The variable inside the package name did not get expanded, let us expand it ourselves. --- packages/qt4/qt_packaging.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'packages/qt4') diff --git a/packages/qt4/qt_packaging.inc b/packages/qt4/qt_packaging.inc index 63d314c6c5..ca5e93be34 100644 --- a/packages/qt4/qt_packaging.inc +++ b/packages/qt4/qt_packaging.inc @@ -133,8 +133,9 @@ FILES_${QT_BASE_NAME}-demos = "${bindir}/qtdemo ${bindir}/${QT_DI FILES_${QT_BASE_NAME}-fonts = "${libdir}/fonts" python populate_packages_prepend() { - translationdir = bb.data.expand('${datadir}/${QT_DIR_NAME}/translations/', d) - do_split_packages(d, translationdir, '^qt_(.*)\.qm$', '${QT_DIR_NAME}-translation-%s', '{PN} translation for %s', extra_depends='' ) + translation_dir = bb.data.expand('${datadir}/${QT_DIR_NAME}/translations/', d) + translation_name = bb.data.expand('${QT_DIR_NAME}-translation-%s', d) + do_split_packages(d, translation_dir, '^qt_(.*)\.qm$', translation_name, '{PN} translation for %s', extra_depends='' ) } -- cgit v1.2.3 From 8fc769e4525e23f60abadddeff816708bf6d3be6 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Mon, 21 Jan 2008 21:45:41 +0000 Subject: packages/qt4/qt_packaging.inc: Package the phrasebooks --- packages/qt4/qt_packaging.inc | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'packages/qt4') diff --git a/packages/qt4/qt_packaging.inc b/packages/qt4/qt_packaging.inc index ca5e93be34..9b93c9a8ef 100644 --- a/packages/qt4/qt_packaging.inc +++ b/packages/qt4/qt_packaging.inc @@ -136,6 +136,11 @@ python populate_packages_prepend() { translation_dir = bb.data.expand('${datadir}/${QT_DIR_NAME}/translations/', d) translation_name = bb.data.expand('${QT_DIR_NAME}-translation-%s', d) do_split_packages(d, translation_dir, '^qt_(.*)\.qm$', translation_name, '{PN} translation for %s', extra_depends='' ) + + phrasebook_dir = bb.data.expand('${datadir}/${QT_DIR_NAME}/phrasebooks/', d) + phrasebook_name = bb.data.expand('${QT_DIR_NAME}-phrasebook-%s', d) + do_split_packages(d, phrasebook_dir, '^(.*)\.qph$', phrasebook_name, '{PN} phrasebook for %s', extra_depends='' ) + } -- cgit v1.2.3 From 95d65bf80c917be7ec810dc18c0e7ff72a38e16c Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Tue, 22 Jan 2008 08:08:37 +0000 Subject: packages/qt4/qt_packaging.inc: Attempt to package all possible plugins properly --- packages/qt4/qt_packaging.inc | 97 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 83 insertions(+), 14 deletions(-) (limited to 'packages/qt4') diff --git a/packages/qt4/qt_packaging.inc b/packages/qt4/qt_packaging.inc index 9b93c9a8ef..58b3e1314e 100644 --- a/packages/qt4/qt_packaging.inc +++ b/packages/qt4/qt_packaging.inc @@ -10,11 +10,15 @@ NONDEV_PACKAGES += "${QT_BASE_LIB}core4 ${QT_BASE_LIB}gui4 ${QT_BASE_LIB}network ${QT_BASE_NAME}-pixeltool ${QT_BASE_NAME}-dbus \ ${QT_BASE_NAME}-plugins-accessible \ ${QT_BASE_NAME}-plugins-codecs \ + ${QT_BASE_NAME}-plugins-decorations \ ${QT_BASE_NAME}-plugins-designer \ + ${QT_BASE_NAME}-plugins-gfxdrivers \ + ${QT_BASE_NAME}-plugins-mousedrivers \ + ${QT_BASE_NAME}-plugins-iconengines \ ${QT_BASE_NAME}-plugins-imageformats \ - ${QT_BASE_NAME}-plugins-sqldrivers \ ${QT_BASE_NAME}-plugins-inputmethods \ - ${QT_BASE_NAME}-plugins-iconengines \ + ${QT_BASE_NAME}-plugins-sqldrivers \ + ${QT_BASE_NAME}-plugins-styles \ ${QT_BASE_NAME}-fonts " DEV_PACKAGES += "${QT_BASE_LIB}core4-dev \ @@ -46,7 +50,18 @@ DBG_PACKAGES += "${QT_BASE_LIB}core4-dbg \ ${QT_BASE_LIB}assistantclient4-dbg \ ${QT_BASE_LIB}script4-dbg \ ${QT_BASE_LIB}dbus4-dbg \ - ${QT_BASE_LIB}opengl4-dbg " + ${QT_BASE_LIB}opengl4-dbg \ + ${QT_BASE_NAME}-plugins-accessible-dbg \ + ${QT_BASE_NAME}-plugins-codecs-dbg \ + ${QT_BASE_NAME}-plugins-decorations-dbg \ + ${QT_BASE_NAME}-plugins-designer-dbg \ + ${QT_BASE_NAME}-plugins-gfxdrivers-dbg \ + ${QT_BASE_NAME}-plugins-mousedrivers-dbg \ + ${QT_BASE_NAME}-plugins-iconengines-dbg \ + ${QT_BASE_NAME}-plugins-imageformats-dbg \ + ${QT_BASE_NAME}-plugins-inputmethods-dbg \ + ${QT_BASE_NAME}-plugins-sqldrivers-dbg \ + ${QT_BASE_NAME}-plugins-styles-dbg" PACKAGES += "${DEV_PACKAGES} ${NONDEV_PACKAGES} ${DBG_PACKAGES}" @@ -54,7 +69,7 @@ PACKAGES += "${DEV_PACKAGES} ${NONDEV_PACKAGES} ${DBG_PACKAGES}" ALLOW_EMPTY_${PN} = "1" FILES_${PN} = "" FILES_${PN}-dev = " ${includedir}/${QT_DIR_NAME}/Qt/*" -FILES_${PN}-dbg = "${bindir}/*/.debug ${libdir}/${QT_DIR_NAME}/plugins/*/.debug/*.so" +FILES_${PN}-dbg = "${bindir}/*/.debug " RDEPENDS_${PN} = "${NONDEV_PACKAGES}" RDEPENDS_${PN}-dev = "${DEV_PACKAGES}" RDEPENDS_${PN}-dbg = "${DBG_PACKAGES}" @@ -111,14 +126,29 @@ FILES_${QT_BASE_LIB}opengl4-dev = "${@qt_default_dev('OpenGL')}" FILES_${QT_BASE_LIB}opengl4-dbg = "${libdir}/.debug/libQtOpenGL*" FILES_${QT_BASE_LIB}uitools4-dev = "${libdir}/libQtUiTools* ${includedir}/${QT_DIR_NAME}/QtUiTools* ${libdir}/pkgconfig/QtUiTools${QT_LIBINFIX}.pc" - -FILES_${QT_BASE_NAME}-plugins-accessible = "${libdir}/${QT_DIR_NAME}/plugins/accessible/*.so" -FILES_${QT_BASE_NAME}-plugins-codecs = "${libdir}/${QT_DIR_NAME}/plugins/codecs/*.so" -FILES_${QT_BASE_NAME}-plugins-designer = "${libdir}/${QT_DIR_NAME}/plugins/designer/*.so" -FILES_${QT_BASE_NAME}-plugins-imageformats = "${libdir}/${QT_DIR_NAME}/plugins/imageformats/*.so" -FILES_${QT_BASE_NAME}-plugins-sqldrivers = "${libdir}/${QT_DIR_NAME}/plugins/sqldrivers/*.so" -FILES_${QT_BASE_NAME}-plugins-inputmethods = "${libdir}/${QT_DIR_NAME}/plugins/inputmethods/*.so" -FILES_${QT_BASE_NAME}-plugins-iconengines = "${libdir}/${QT_DIR_NAME}/plugins/iconengines/*.so" +# meta packages for the plugins +ALLOW_EMPTY_${QT_BASE_NAME}-plugins-accessible = "1" +ALLOW_EMPTY_${QT_BASE_NAME}-plugins-accessible-dbg = "1" +ALLOW_EMPTY_${QT_BASE_NAME}-plugins-codecs = "1" +ALLOW_EMPTY_${QT_BASE_NAME}-plugins-codecs-dbg = "1" +ALLOW_EMPTY_${QT_BASE_NAME}-plugins-decorations = "1" +ALLOW_EMPTY_${QT_BASE_NAME}-plugins-decorations-dbg = "1" +ALLOW_EMPTY_${QT_BASE_NAME}-plugins-designer = "1" +ALLOW_EMPTY_${QT_BASE_NAME}-plugins-designer-dbg = "1" +ALLOW_EMPTY_${QT_BASE_NAME}-plugins-gfxdrivers = "1" +ALLOW_EMPTY_${QT_BASE_NAME}-plugins-gfxdrivers-dbg = "1" +ALLOW_EMPTY_${QT_BASE_NAME}-plugins-mousedrivers = "1" +ALLOW_EMPTY_${QT_BASE_NAME}-plugins-mousedrivers-dbg = "1" +ALLOW_EMPTY_${QT_BASE_NAME}-plugins-iconengines = "1" +ALLOW_EMPTY_${QT_BASE_NAME}-plugins-iconengines-dbg = "1" +ALLOW_EMPTY_${QT_BASE_NAME}-plugins-imageformats = "1" +ALLOW_EMPTY_${QT_BASE_NAME}-plugins-imageformats-dbg = "1" +ALLOW_EMPTY_${QT_BASE_NAME}-plugins-inputmethods = "1" +ALLOW_EMPTY_${QT_BASE_NAME}-plugins-inputmethods-dbg = "1" +ALLOW_EMPTY_${QT_BASE_NAME}-plugins-sqldrivers = "1" +ALLOW_EMPTY_${QT_BASE_NAME}-plugins-sqldrivers-dbg = "1" +ALLOW_EMPTY_${QT_BASE_NAME}-plugins-styles = "1" +ALLOW_EMPTY_${QT_BASE_NAME}-plugins-styles-dbg = "1" FILES_${QT_BASE_NAME}-assistant = "${bindir}/*assistant*" FILES_${QT_BASE_NAME}-designer = "${bindir}/*designer*" @@ -134,13 +164,52 @@ FILES_${QT_BASE_NAME}-fonts = "${libdir}/fonts" python populate_packages_prepend() { translation_dir = bb.data.expand('${datadir}/${QT_DIR_NAME}/translations/', d) - translation_name = bb.data.expand('${QT_DIR_NAME}-translation-%s', d) + translation_name = bb.data.expand('${QT_BASE_NAME}-translation-%s', d) do_split_packages(d, translation_dir, '^qt_(.*)\.qm$', translation_name, '{PN} translation for %s', extra_depends='' ) phrasebook_dir = bb.data.expand('${datadir}/${QT_DIR_NAME}/phrasebooks/', d) - phrasebook_name = bb.data.expand('${QT_DIR_NAME}-phrasebook-%s', d) + phrasebook_name = bb.data.expand('${QT_BASE_NAME}-phrasebook-%s', d) do_split_packages(d, phrasebook_dir, '^(.*)\.qph$', phrasebook_name, '{PN} phrasebook for %s', extra_depends='' ) + # Package all the plugins and their -dbg version and create a meta package + import os + def qtopia_split(path, name, glob, meta_name): + """ + Split the package into a normal and -dbg package and then add the + new packages to the meta package. + """ + plugin_dir = bb.data.expand('${libdir}/${QT_DIR_NAME}/plugins/%s/' % path, d) + plugin_dir_dbg = bb.data.expand('${libdir}/${QT_DIR_NAME}/plugins/%s/.debug/' % path, d) + if not os.path.exists("%s%s" % (bb.data.expand('${D}',d), plugin_dir)): + bb.note("The path does not exist:", bb.data.expand('${D}', d), plugin_dir) + return + + plugin_name = bb.data.expand('${QT_BASE_NAME}-plugin-%s-%%s' % name, d) + plugin_name_dbg= bb.data.expand('${QT_BASE_NAME}-plugin-%s-%%s-dbg' % name, d) + print plugin_name, plugin_name_dbg, glob + + dev_packages = [] + dev_hook = lambda a,pkg,b,c,d:dev_packages.append(pkg) + dbg_packages = [] + dbg_hook = lambda a,pkg,b,c,d:dbg_packages.append(pkg) + do_split_packages(d, plugin_dir, glob, plugin_name, '{PN} %s for %%s' % name, extra_depends='', hook=dev_hook) + do_split_packages(d, plugin_dir_dbg, glob, plugin_name_dbg, '{PN} %s for %%s' % name, extra_depends='', hook=dbg_hook) + + print meta_name, dev_packages, dbg_packages + bb.data.setVar("RDEPENDS_%s" % meta_name, " ".join(dev_packages), d) + bb.data.setVar("RDEPENDS_%s-dbg" % meta_name, " ".join(dbg_packages), d) + + qtopia_split('accessible', 'accessible', '^libq(.*)\.so$', "${QT_BASE_NAME}-plugins-accessible") + qtopia_split('codecs', 'codec', '^libq(.*)\.so$', "${QT_BASE_NAME}-plugins-codecs") + qtopia_split('decorations', 'decoration', '^libqdecoration(.*)\.so$', "${QT_BASE_NAME}-plugins-decorations") + qtopia_split('designer', 'designer', '^lib(.*)\.so$', "${QT_BASE_NAME}-plugins-designer") + qtopia_split('gfxdrivers', 'gfxdriver', '^libqgfx(.*)\.so$', "${QT_BASE_NAME}-plugins-gfxdrivers") + qtopia_split('mousedrivers','mousedriver', '^libq(.*)mousedriver\.so$', "${QT_BASE_NAME}-plugins-mousedrivers") + qtopia_split('iconengines', 'iconengine', '^libq(.*)\.so$', "${QT_BASE_NAME}-plugins-iconengines") + qtopia_split('imageformats','imageformat', '^libq(.*)\.so$', "${QT_BASE_NAME}-plugins-imageformats") + qtopia_split('inputmethods','inputmethod', '^libq(.*)\.so$', "${QT_BASE_NAME}-plugins-inputmethods") + qtopia_split('sqldrivers', 'sqldriver', '^libq(.*)\.so$', "${QT_BASE_NAME}-plugins-sqldrivers") + qtopia_split('styles', 'style', '^libq(.*)\.so$', "${QT_BASE_NAME}-plugins-styles") } -- cgit v1.2.3 From d740dd9bb2c29a300333277986fc50d9eeb8c2d5 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Tue, 22 Jan 2008 08:33:44 +0000 Subject: packages/qt4/qt_packaging.inc: Remove the attempt to create the meta packages this way It didn't work because the RDEPENDS were not available in the package_write task anymore. We need to create a meta task where all plugins are referred to in some other way. --- packages/qt4/qt_packaging.inc | 76 ++++++++----------------------------------- 1 file changed, 14 insertions(+), 62 deletions(-) (limited to 'packages/qt4') diff --git a/packages/qt4/qt_packaging.inc b/packages/qt4/qt_packaging.inc index 58b3e1314e..931c5671d9 100644 --- a/packages/qt4/qt_packaging.inc +++ b/packages/qt4/qt_packaging.inc @@ -8,17 +8,6 @@ NONDEV_PACKAGES += "${QT_BASE_LIB}core4 ${QT_BASE_LIB}gui4 ${QT_BASE_LIB}network ${QT_BASE_NAME}-demos ${QT_BASE_NAME}-examples \ ${QT_BASE_NAME}-linguist \ ${QT_BASE_NAME}-pixeltool ${QT_BASE_NAME}-dbus \ - ${QT_BASE_NAME}-plugins-accessible \ - ${QT_BASE_NAME}-plugins-codecs \ - ${QT_BASE_NAME}-plugins-decorations \ - ${QT_BASE_NAME}-plugins-designer \ - ${QT_BASE_NAME}-plugins-gfxdrivers \ - ${QT_BASE_NAME}-plugins-mousedrivers \ - ${QT_BASE_NAME}-plugins-iconengines \ - ${QT_BASE_NAME}-plugins-imageformats \ - ${QT_BASE_NAME}-plugins-inputmethods \ - ${QT_BASE_NAME}-plugins-sqldrivers \ - ${QT_BASE_NAME}-plugins-styles \ ${QT_BASE_NAME}-fonts " DEV_PACKAGES += "${QT_BASE_LIB}core4-dev \ @@ -50,18 +39,7 @@ DBG_PACKAGES += "${QT_BASE_LIB}core4-dbg \ ${QT_BASE_LIB}assistantclient4-dbg \ ${QT_BASE_LIB}script4-dbg \ ${QT_BASE_LIB}dbus4-dbg \ - ${QT_BASE_LIB}opengl4-dbg \ - ${QT_BASE_NAME}-plugins-accessible-dbg \ - ${QT_BASE_NAME}-plugins-codecs-dbg \ - ${QT_BASE_NAME}-plugins-decorations-dbg \ - ${QT_BASE_NAME}-plugins-designer-dbg \ - ${QT_BASE_NAME}-plugins-gfxdrivers-dbg \ - ${QT_BASE_NAME}-plugins-mousedrivers-dbg \ - ${QT_BASE_NAME}-plugins-iconengines-dbg \ - ${QT_BASE_NAME}-plugins-imageformats-dbg \ - ${QT_BASE_NAME}-plugins-inputmethods-dbg \ - ${QT_BASE_NAME}-plugins-sqldrivers-dbg \ - ${QT_BASE_NAME}-plugins-styles-dbg" + ${QT_BASE_LIB}opengl4-dbg" PACKAGES += "${DEV_PACKAGES} ${NONDEV_PACKAGES} ${DBG_PACKAGES}" @@ -126,29 +104,6 @@ FILES_${QT_BASE_LIB}opengl4-dev = "${@qt_default_dev('OpenGL')}" FILES_${QT_BASE_LIB}opengl4-dbg = "${libdir}/.debug/libQtOpenGL*" FILES_${QT_BASE_LIB}uitools4-dev = "${libdir}/libQtUiTools* ${includedir}/${QT_DIR_NAME}/QtUiTools* ${libdir}/pkgconfig/QtUiTools${QT_LIBINFIX}.pc" -# meta packages for the plugins -ALLOW_EMPTY_${QT_BASE_NAME}-plugins-accessible = "1" -ALLOW_EMPTY_${QT_BASE_NAME}-plugins-accessible-dbg = "1" -ALLOW_EMPTY_${QT_BASE_NAME}-plugins-codecs = "1" -ALLOW_EMPTY_${QT_BASE_NAME}-plugins-codecs-dbg = "1" -ALLOW_EMPTY_${QT_BASE_NAME}-plugins-decorations = "1" -ALLOW_EMPTY_${QT_BASE_NAME}-plugins-decorations-dbg = "1" -ALLOW_EMPTY_${QT_BASE_NAME}-plugins-designer = "1" -ALLOW_EMPTY_${QT_BASE_NAME}-plugins-designer-dbg = "1" -ALLOW_EMPTY_${QT_BASE_NAME}-plugins-gfxdrivers = "1" -ALLOW_EMPTY_${QT_BASE_NAME}-plugins-gfxdrivers-dbg = "1" -ALLOW_EMPTY_${QT_BASE_NAME}-plugins-mousedrivers = "1" -ALLOW_EMPTY_${QT_BASE_NAME}-plugins-mousedrivers-dbg = "1" -ALLOW_EMPTY_${QT_BASE_NAME}-plugins-iconengines = "1" -ALLOW_EMPTY_${QT_BASE_NAME}-plugins-iconengines-dbg = "1" -ALLOW_EMPTY_${QT_BASE_NAME}-plugins-imageformats = "1" -ALLOW_EMPTY_${QT_BASE_NAME}-plugins-imageformats-dbg = "1" -ALLOW_EMPTY_${QT_BASE_NAME}-plugins-inputmethods = "1" -ALLOW_EMPTY_${QT_BASE_NAME}-plugins-inputmethods-dbg = "1" -ALLOW_EMPTY_${QT_BASE_NAME}-plugins-sqldrivers = "1" -ALLOW_EMPTY_${QT_BASE_NAME}-plugins-sqldrivers-dbg = "1" -ALLOW_EMPTY_${QT_BASE_NAME}-plugins-styles = "1" -ALLOW_EMPTY_${QT_BASE_NAME}-plugins-styles-dbg = "1" FILES_${QT_BASE_NAME}-assistant = "${bindir}/*assistant*" FILES_${QT_BASE_NAME}-designer = "${bindir}/*designer*" @@ -173,7 +128,7 @@ python populate_packages_prepend() { # Package all the plugins and their -dbg version and create a meta package import os - def qtopia_split(path, name, glob, meta_name): + def qtopia_split(path, name, glob): """ Split the package into a normal and -dbg package and then add the new packages to the meta package. @@ -195,21 +150,18 @@ python populate_packages_prepend() { do_split_packages(d, plugin_dir, glob, plugin_name, '{PN} %s for %%s' % name, extra_depends='', hook=dev_hook) do_split_packages(d, plugin_dir_dbg, glob, plugin_name_dbg, '{PN} %s for %%s' % name, extra_depends='', hook=dbg_hook) - print meta_name, dev_packages, dbg_packages - bb.data.setVar("RDEPENDS_%s" % meta_name, " ".join(dev_packages), d) - bb.data.setVar("RDEPENDS_%s-dbg" % meta_name, " ".join(dbg_packages), d) - - qtopia_split('accessible', 'accessible', '^libq(.*)\.so$', "${QT_BASE_NAME}-plugins-accessible") - qtopia_split('codecs', 'codec', '^libq(.*)\.so$', "${QT_BASE_NAME}-plugins-codecs") - qtopia_split('decorations', 'decoration', '^libqdecoration(.*)\.so$', "${QT_BASE_NAME}-plugins-decorations") - qtopia_split('designer', 'designer', '^lib(.*)\.so$', "${QT_BASE_NAME}-plugins-designer") - qtopia_split('gfxdrivers', 'gfxdriver', '^libqgfx(.*)\.so$', "${QT_BASE_NAME}-plugins-gfxdrivers") - qtopia_split('mousedrivers','mousedriver', '^libq(.*)mousedriver\.so$', "${QT_BASE_NAME}-plugins-mousedrivers") - qtopia_split('iconengines', 'iconengine', '^libq(.*)\.so$', "${QT_BASE_NAME}-plugins-iconengines") - qtopia_split('imageformats','imageformat', '^libq(.*)\.so$', "${QT_BASE_NAME}-plugins-imageformats") - qtopia_split('inputmethods','inputmethod', '^libq(.*)\.so$', "${QT_BASE_NAME}-plugins-inputmethods") - qtopia_split('sqldrivers', 'sqldriver', '^libq(.*)\.so$', "${QT_BASE_NAME}-plugins-sqldrivers") - qtopia_split('styles', 'style', '^libq(.*)\.so$', "${QT_BASE_NAME}-plugins-styles") + + qtopia_split('accessible', 'accessible', '^libq(.*)\.so$') + qtopia_split('codecs', 'codec', '^libq(.*)\.so$') + qtopia_split('decorations', 'decoration', '^libqdecoration(.*)\.so$') + qtopia_split('designer', 'designer', '^lib(.*)\.so$') + qtopia_split('gfxdrivers', 'gfxdriver', '^libqgfx(.*)\.so$') + qtopia_split('mousedrivers','mousedriver', '^libq(.*)mousedriver\.so$') + qtopia_split('iconengines', 'iconengine', '^libq(.*)\.so$') + qtopia_split('imageformats','imageformat', '^libq(.*)\.so$') + qtopia_split('inputmethods','inputmethod', '^libq(.*)\.so$') + qtopia_split('sqldrivers', 'sqldriver', '^libq(.*)\.so$') + qtopia_split('styles', 'style', '^libq(.*)\.so$') } -- cgit v1.2.3 From f445e6d0f90b8bcce3cb8a95c40f7e56c821661e Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Tue, 22 Jan 2008 08:39:29 +0000 Subject: packages/qt4/qt_packaging.inc: Fix packaging of the -dbg packages split in packages.bbclass gets called after the work in do_populate_packages_prepend() is done. This means that on the first packaging attempt no .debug files exist. So create one -dbg package for every plugin we find and assume that the file is getting split out. --- packages/qt4/qt_packaging.inc | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) (limited to 'packages/qt4') diff --git a/packages/qt4/qt_packaging.inc b/packages/qt4/qt_packaging.inc index 931c5671d9..ba2a037f59 100644 --- a/packages/qt4/qt_packaging.inc +++ b/packages/qt4/qt_packaging.inc @@ -134,22 +134,24 @@ python populate_packages_prepend() { new packages to the meta package. """ plugin_dir = bb.data.expand('${libdir}/${QT_DIR_NAME}/plugins/%s/' % path, d) - plugin_dir_dbg = bb.data.expand('${libdir}/${QT_DIR_NAME}/plugins/%s/.debug/' % path, d) if not os.path.exists("%s%s" % (bb.data.expand('${D}',d), plugin_dir)): bb.note("The path does not exist:", bb.data.expand('${D}', d), plugin_dir) return - plugin_name = bb.data.expand('${QT_BASE_NAME}-plugin-%s-%%s' % name, d) - plugin_name_dbg= bb.data.expand('${QT_BASE_NAME}-plugin-%s-%%s-dbg' % name, d) - print plugin_name, plugin_name_dbg, glob - - dev_packages = [] - dev_hook = lambda a,pkg,b,c,d:dev_packages.append(pkg) - dbg_packages = [] - dbg_hook = lambda a,pkg,b,c,d:dbg_packages.append(pkg) - do_split_packages(d, plugin_dir, glob, plugin_name, '{PN} %s for %%s' % name, extra_depends='', hook=dev_hook) - do_split_packages(d, plugin_dir_dbg, glob, plugin_name_dbg, '{PN} %s for %%s' % name, extra_depends='', hook=dbg_hook) - + plugin_name = bb.data.expand('${QT_BASE_NAME}-plugin-%s-%%s' % name, d) + dev_packages = [] + dev_hook = lambda file,pkg,b,c,d:dev_packages.append((file,pkg)) + do_split_packages(d, plugin_dir, glob, plugin_name, '{PN} %s for %%s' % name, extra_depends='', hook=dev_hook) + # Create a -dbg package as well + plugin_dir_dbg = bb.data.expand('${libdir}/${QT_DIR_NAME}/plugins/%s/.debug' % path, d) + packages = bb.data.getVar('PACKAGES',d) + for (file,package) in dev_packages: + packages = "%s %s-dbg" % (packages, package) + file_name = os.path.join(plugin_dir_dbg, os.path.basename(file)) + bb.data.setVar("FILES_%s-dbg" % package, file_name, d) + bb.data.setVar("DESCRIPTION_%s-dbg" % package, "{PN} %s for %s" % (name, package), d) + + bb.data.setVar('PACKAGES', packages, d) qtopia_split('accessible', 'accessible', '^libq(.*)\.so$') qtopia_split('codecs', 'codec', '^libq(.*)\.so$') -- cgit v1.2.3