From 49592361f828a341ed27cb2c6f97da9f6c80211f Mon Sep 17 00:00:00 2001 From: Jeremy Lainé Date: Thu, 26 Mar 2009 18:40:41 +0100 Subject: qt4: add qt4-x11-free version 4.5.0 --- recipes/qt4/files/4.5.0/0003-no-tools.patch | 18 ++++++++++++ .../files/4.5.0/0006-freetype-host-includes.patch | 20 +++++++++++++ .../files/4.5.0/0007-openssl-host-includes.patch | 20 +++++++++++++ recipes/qt4/files/4.5.0/0008-qt-lib-infix.patch | 34 ++++++++++++++++++++++ 4 files changed, 92 insertions(+) create mode 100644 recipes/qt4/files/4.5.0/0003-no-tools.patch create mode 100644 recipes/qt4/files/4.5.0/0006-freetype-host-includes.patch create mode 100644 recipes/qt4/files/4.5.0/0007-openssl-host-includes.patch create mode 100644 recipes/qt4/files/4.5.0/0008-qt-lib-infix.patch (limited to 'recipes/qt4/files') diff --git a/recipes/qt4/files/4.5.0/0003-no-tools.patch b/recipes/qt4/files/4.5.0/0003-no-tools.patch new file mode 100644 index 0000000000..3829ffcdc5 --- /dev/null +++ b/recipes/qt4/files/4.5.0/0003-no-tools.patch @@ -0,0 +1,18 @@ +Index: qt-embedded-linux-opensource-src-4.5.0/src/src.pro +=================================================================== +--- qt-embedded-linux-opensource-src-4.5.0.orig/src/src.pro 2009-02-25 22:32:41.000000000 +0100 ++++ qt-embedded-linux-opensource-src-4.5.0/src/src.pro 2009-03-26 17:11:07.000000000 +0100 +@@ -6,12 +6,9 @@ + wince*:{ + SRC_SUBDIRS += src_corelib src_xml src_gui src_sql src_network src_script src_testlib + } else { +- SRC_SUBDIRS += src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_uic src_corelib src_xml src_network src_gui src_sql src_script src_testlib ++ SRC_SUBDIRS += src_corelib src_xml src_network src_gui src_sql src_script src_testlib + contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_qt3support + contains(QT_CONFIG, dbus):SRC_SUBDIRS += src_dbus +- !cross_compile { +- contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_tools_uic3 +- } + } + win32:!contains(QT_EDITION, OpenSource|Console): { + SRC_SUBDIRS += src_activeqt diff --git a/recipes/qt4/files/4.5.0/0006-freetype-host-includes.patch b/recipes/qt4/files/4.5.0/0006-freetype-host-includes.patch new file mode 100644 index 0000000000..987c425138 --- /dev/null +++ b/recipes/qt4/files/4.5.0/0006-freetype-host-includes.patch @@ -0,0 +1,20 @@ +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(-) + +Index: qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/freetype/freetype.pri +=================================================================== +--- qt-embedded-linux-opensource-src-4.5.0.orig/config.tests/unix/freetype/freetype.pri 2009-02-25 22:32:32.000000000 +0100 ++++ qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/freetype/freetype.pri 2009-03-26 17:14:16.000000000 +0100 +@@ -1,5 +1,5 @@ + !cross_compile { +- TRY_INCLUDEPATHS = /include /usr/include $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH ++ TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH + # LSB doesn't allow using headers from /include or /usr/include + linux-lsb-g++:TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH + for(p, TRY_INCLUDEPATHS) { diff --git a/recipes/qt4/files/4.5.0/0007-openssl-host-includes.patch b/recipes/qt4/files/4.5.0/0007-openssl-host-includes.patch new file mode 100644 index 0000000000..3409cc0bf2 --- /dev/null +++ b/recipes/qt4/files/4.5.0/0007-openssl-host-includes.patch @@ -0,0 +1,20 @@ +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(-) + +Index: qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/openssl/openssl.pri +=================================================================== +--- qt-embedded-linux-opensource-src-4.5.0.orig/config.tests/unix/openssl/openssl.pri 2009-02-25 22:32:32.000000000 +0100 ++++ qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/openssl/openssl.pri 2009-03-26 17:16:28.000000000 +0100 +@@ -1,5 +1,5 @@ + !cross_compile { +- TRY_INCLUDEPATHS = /include /usr/include /usr/local/include $$QMAKE_INCDIR $$INCLUDEPATH ++ TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$INCLUDEPATH + # LSB doesn't allow using headers from /include or /usr/include + linux-lsb-g++:TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$INCLUDEPATH + for(p, TRY_INCLUDEPATHS) { diff --git a/recipes/qt4/files/4.5.0/0008-qt-lib-infix.patch b/recipes/qt4/files/4.5.0/0008-qt-lib-infix.patch new file mode 100644 index 0000000000..3efaff37d3 --- /dev/null +++ b/recipes/qt4/files/4.5.0/0008-qt-lib-infix.patch @@ -0,0 +1,34 @@ +Index: qt-embedded-linux-opensource-src-4.5.0/mkspecs/features/uitools.prf +=================================================================== +--- qt-embedded-linux-opensource-src-4.5.0.orig/mkspecs/features/uitools.prf 2009-02-25 22:32:34.000000000 +0100 ++++ qt-embedded-linux-opensource-src-4.5.0/mkspecs/features/uitools.prf 2009-03-26 17:17:27.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 + +Index: qt-embedded-linux-opensource-src-4.5.0/tools/designer/src/uitools/uitools.pro +=================================================================== +--- qt-embedded-linux-opensource-src-4.5.0.orig/tools/designer/src/uitools/uitools.pro 2009-02-25 22:32:42.000000000 +0100 ++++ qt-embedded-linux-opensource-src-4.5.0/tools/designer/src/uitools/uitools.pro 2009-03-26 17:17:27.000000000 +0100 +@@ -1,5 +1,5 @@ + TEMPLATE = lib +-TARGET = $$qtLibraryTarget(QtUiTools) ++TARGET = QtUiTools + QT += xml + CONFIG += qt staticlib + DESTDIR = ../../../../lib +@@ -39,3 +39,4 @@ + QMAKE_PKGCONFIG_REQUIRES += QtXml + } + ++TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end -- cgit 1.2.3-korg