diff options
author | Michael Lauer <mickey@vanille-media.de> | 2006-06-30 13:13:10 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-06-30 13:13:10 +0000 |
commit | 084d57b1b4b33cc76b96134edaf606d52b05d399 (patch) | |
tree | 56f31b50cb38a509c085394f92552ee16d52a65b /packages/qt/qt4-x11-free-4.1.1 | |
parent | 36798dae5a1580c7318545c48d8627bd7b3468d4 (diff) |
qt4 4.1.1 remove
Diffstat (limited to 'packages/qt/qt4-x11-free-4.1.1')
-rw-r--r-- | packages/qt/qt4-x11-free-4.1.1/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/qt/qt4-x11-free-4.1.1/configurable-cpu-extensions.patch | 34 | ||||
-rw-r--r-- | packages/qt/qt4-x11-free-4.1.1/cross-compile.patch | 159 | ||||
-rw-r--r-- | packages/qt/qt4-x11-free-4.1.1/fix-mkspecs.patch | 102 | ||||
-rw-r--r-- | packages/qt/qt4-x11-free-4.1.1/fix-resinit-declaration.patch | 16 | ||||
-rw-r--r-- | packages/qt/qt4-x11-free-4.1.1/gcc4_1.patch | 50 | ||||
-rw-r--r-- | packages/qt/qt4-x11-free-4.1.1/no-qmake.patch | 16 | ||||
-rw-r--r-- | packages/qt/qt4-x11-free-4.1.1/no-tools.patch | 16 |
8 files changed, 0 insertions, 393 deletions
diff --git a/packages/qt/qt4-x11-free-4.1.1/.mtn2git_empty b/packages/qt/qt4-x11-free-4.1.1/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/qt/qt4-x11-free-4.1.1/.mtn2git_empty +++ /dev/null diff --git a/packages/qt/qt4-x11-free-4.1.1/configurable-cpu-extensions.patch b/packages/qt/qt4-x11-free-4.1.1/configurable-cpu-extensions.patch deleted file mode 100644 index ab943db1ff..0000000000 --- a/packages/qt/qt4-x11-free-4.1.1/configurable-cpu-extensions.patch +++ /dev/null @@ -1,34 +0,0 @@ - -# -# 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/qt/qt4-x11-free-4.1.1/cross-compile.patch b/packages/qt/qt4-x11-free-4.1.1/cross-compile.patch deleted file mode 100644 index 7c8665c9c1..0000000000 --- a/packages/qt/qt4-x11-free-4.1.1/cross-compile.patch +++ /dev/null @@ -1,159 +0,0 @@ - -# -# 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/qt/qt4-x11-free-4.1.1/fix-mkspecs.patch b/packages/qt/qt4-x11-free-4.1.1/fix-mkspecs.patch deleted file mode 100644 index e927df9c7d..0000000000 --- a/packages/qt/qt4-x11-free-4.1.1/fix-mkspecs.patch +++ /dev/null @@ -1,102 +0,0 @@ - -# -# 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/qt/qt4-x11-free-4.1.1/fix-resinit-declaration.patch b/packages/qt/qt4-x11-free-4.1.1/fix-resinit-declaration.patch deleted file mode 100644 index fcd5de6f97..0000000000 --- a/packages/qt/qt4-x11-free-4.1.1/fix-resinit-declaration.patch +++ /dev/null @@ -1,16 +0,0 @@ - -# -# 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 <netinet/in.h> - # include <arpa/nameser.h> - # include <resolv.h> --extern "C" int res_init(); -+extern "C" int res_init() throw(); - #endif - - // POSIX Large File Support redefines open -> open64 diff --git a/packages/qt/qt4-x11-free-4.1.1/gcc4_1.patch b/packages/qt/qt4-x11-free-4.1.1/gcc4_1.patch deleted file mode 100644 index 392aaf4f5f..0000000000 --- a/packages/qt/qt4-x11-free-4.1.1/gcc4_1.patch +++ /dev/null @@ -1,50 +0,0 @@ - -# -# 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/qt/qt4-x11-free-4.1.1/no-qmake.patch b/packages/qt/qt4-x11-free-4.1.1/no-qmake.patch deleted file mode 100644 index 324f44303a..0000000000 --- a/packages/qt/qt4-x11-free-4.1.1/no-qmake.patch +++ /dev/null @@ -1,16 +0,0 @@ - -# -# 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/qt/qt4-x11-free-4.1.1/no-tools.patch b/packages/qt/qt4-x11-free-4.1.1/no-tools.patch deleted file mode 100644 index 2bda49c9c5..0000000000 --- a/packages/qt/qt4-x11-free-4.1.1/no-tools.patch +++ /dev/null @@ -1,16 +0,0 @@ - -# -# 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 { |