From 47bab4834ce8727d19c1c48c7396833633d2204a Mon Sep 17 00:00:00 2001 From: Volker Grabsch Date: Tue, 27 Oct 2009 17:54:54 +0100 Subject: update version of package qt (by Mark Brand) --- src/qt-win32.patch | 50 ++++++++++++++++++++++++++++++++++++++++++++------ src/qt.mk | 31 +++++++++++-------------------- 2 files changed, 55 insertions(+), 26 deletions(-) diff --git a/src/qt-win32.patch b/src/qt-win32.patch index ec16fdc..e14778b 100644 --- a/src/qt-win32.patch +++ b/src/qt-win32.patch @@ -21,8 +21,8 @@ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ---- qt-everywhere-opensource-src-4.6.0-tp1.native/configure 2009-09-07 13:00:28.000000000 +0200 -+++ qt-everywhere-opensource-src-4.6.0-tp1/configure 2009-10-02 18:22:05.000000000 +0200 +--- qt-everywhere-opensource-src-4.6.0-beta1.native/configure 2009-10-13 17:34:09.000000000 +0200 ++++ qt-everywhere-opensource-src-4.6.0-beta1/configure 2009-10-25 13:14:22.000000000 +0100 @@ -600,7 +600,7 @@ rm -f "$outpath/config.tests/.qmake.cache" cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache" @@ -32,7 +32,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. QMakeVar add decorations "default windows styled" QMakeVar add mouse-drivers "pc" if [ "$UNAME_SYSTEM" = "Linux" ] ; then -@@ -4961,7 +4961,9 @@ +@@ -4956,7 +4956,9 @@ echo "Basic XLib functionality test failed!" echo " You might need to modify the include and library search paths by editing" echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}." @@ -43,7 +43,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. fi # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x) -@@ -5035,7 +5037,9 @@ +@@ -5030,7 +5032,9 @@ echo " You might need to modify the include and library search paths by editing" echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in" echo " ${XQMAKESPEC}." @@ -54,7 +54,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. fi case "$PLATFORM" in hpux*) -@@ -6087,11 +6091,12 @@ +@@ -6096,11 +6100,12 @@ QT_CONFIG="$QT_CONFIG freetype" fi @@ -72,7 +72,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. if [ "$CFG_ZLIB" = "yes" ]; then QT_CONFIG="$QT_CONFIG zlib" elif [ "$CFG_ZLIB" = "system" ]; then -@@ -7594,7 +7599,11 @@ +@@ -7610,7 +7615,11 @@ [ "$IN_ROOT" = "no" ] && continue case $a in @@ -193,3 +193,41 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +QMAKE_STRIP = HOSTPLATFORMPREFIX-strip QMAKE_STRIPFLAGS_LIB += --strip-unneeded -load(qt_config) +--- qt-everywhere-opensource-src-4.6.0-beta1.native/src/3rdparty/webkit/JavaScriptCore/jsc.pro 2009-10-13 17:34:08.000000000 +0200 ++++ qt-everywhere-opensource-src-4.6.0-beta1/src/3rdparty/webkit/JavaScriptCore/jsc.pro 2009-10-25 20:23:25.000000000 +0100 +@@ -20,6 +20,13 @@ + } else { # Release + OBJECTS_DIR = obj/release + } ++ ++# MAB: Added by analogy to JavaScriptCore.pro and WebCore.pro ++# JavaScriptCore.pri needs to know path for generated sources ++isEmpty(GENERATED_SOURCES_DIR):GENERATED_SOURCES_DIR = generated ++GENERATED_SOURCES_DIR_SLASH = $${GENERATED_SOURCES_DIR}$${QMAKE_DIR_SEP} ++ ++INCLUDEPATH += $$GENERATED_SOURCES_DIR + OBJECTS_DIR_WTR = $$OBJECTS_DIR$${QMAKE_DIR_SEP} + include($$PWD/JavaScriptCore.pri) + +--- qt-everywhere-opensource-src-4.6.0-beta1.native/src/3rdparty/webkit/WebKit/qt/Plugins/Plugins.pro 2009-10-13 17:34:08.000000000 +0200 ++++ qt-everywhere-opensource-src-4.6.0-beta1/src/3rdparty/webkit/WebKit/qt/Plugins/Plugins.pro 2009-10-25 21:08:46.000000000 +0100 +@@ -4,7 +4,7 @@ + HEADERS += ICOHandler.h + SOURCES += ICOHandler.cpp + +-include(../../WebKit.pri) ++include(../../../WebKit.pri) + + contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols + unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions +--- qt-everywhere-opensource-src-4.6.0-beta1.native/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pro 2009-10-13 17:34:08.000000000 +0200 ++++ qt-everywhere-opensource-src-4.6.0-beta1/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pro 2009-10-25 13:17:35.000000000 +0100 +@@ -16,7 +16,7 @@ + include($$QT_SOURCE_TREE/src/qbase.pri) + INSTALLS = + DESTDIR = $$OLDDESTDIR +- PRECOMPILED_HEADER = $$PWD/../WebKit/qt/WebKit_pch.h ++ PRECOMPILED_HEADER = $$PWD/../../webkit/WebKit/qt/WebKit_pch.h + DEFINES *= NDEBUG + } + diff --git a/src/qt.mk b/src/qt.mk index b08e6e2..9916b3f 100644 --- a/src/qt.mk +++ b/src/qt.mk @@ -24,8 +24,8 @@ # Qt PKG := qt $(PKG)_IGNORE := -$(PKG)_VERSION := 4.6.0-tp1 -$(PKG)_CHECKSUM := 4394bea076279ea090549d3caa00cc1f5e33a22b +$(PKG)_VERSION := 4.6.0-beta1 +$(PKG)_CHECKSUM := ab3898f0d7307decbce03a6fc6829218bba17311 $(PKG)_SUBDIR := $(PKG)-everywhere-opensource-src-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-everywhere-opensource-src-$($(PKG)_VERSION).tar.gz $(PKG)_WEBSITE := http://qt.nokia.com/ @@ -44,6 +44,11 @@ define $(PKG)_BUILD # Native, unpatched build of Qt for moc, rcc, uic and qmake cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,qt) mv '$(1)/$(qt_SUBDIR)' '$(1).native' + + # But, 4.6.0-beta1 native build needs this bugfix too + cp '$(1)'/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pro \ + '$(1).native'/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pro + $(SED) 's,PLATFORM_X11=yes,PLATFORM_X11=no,' -i '$(1)'.native/configure $(SED) 's,PLATFORM=solaris-cc$$,PLATFORM=solaris-g++,' -i '$(1)'.native/configure cd '$(1)'.native && ./configure \ @@ -90,7 +95,8 @@ define $(PKG)_BUILD mv '$(1)'/mkspecs/features/unix '$(1)'/mkspecs/features/unix.orig ln -s win32 '$(1)'/mkspecs/features/unix - # Adjust the mkspec values that contain the TARGET platform prefix + # Adjust the mkspec values that contain the TARGET platform prefix. + # The patch ensures planted strings HOSTPLATFORMPREFIX and HOSTPLATFORMINCLUDE. $(SED) 's,HOSTPLATFORMPREFIX-,$(TARGET)-,g' -i '$(1)'/mkspecs/win32-g++/qmake.conf $(SED) 's,HOSTPLATFORMINCLUDE,$(PREFIX)/$(TARGET)/include,g' -i '$(1)'/mkspecs/win32-g++/qmake.conf @@ -102,22 +108,6 @@ define $(PKG)_BUILD find '$(1)'/src -name '*.pr[oi]' -exec \ $(SED) 's,\(^\|[^_/]\)win32\([^-]\|$$\),\1unix\2,g' -i {} \; - # Fix-ups for files not found during configure - # Probably errors in QT 4.6 Technology Preview 1 - ln -s ../WebKit.pri '$(1)'/src/3rdparty/webkit/WebKit - - # Fix-ups for files not found during make - # Probably errors in QT 4.6 Technology Preview 1 - mkdir '$(1)'/src/3rdparty/webkit/JavaScriptCore/generated/release - ln -s ../chartables.c '$(1)'/src/3rdparty/webkit/JavaScriptCore/generated/release/ - ln -s ../Grammar.cpp '$(1)'/src/3rdparty/webkit/JavaScriptCore/generated/release/ - mkdir '$(1)'/src/3rdparty/webkit/JavaScriptCore/generated/debug - ln -s ../chartables.c '$(1)'/src/3rdparty/webkit/JavaScriptCore/generated/debug/ - ln -s ../Grammar.cpp '$(1)'/src/3rdparty/webkit/JavaScriptCore/generated/debug/ - - # Fix case of filename - $(SED) 's,QWidget\.h,qwidget.h,g' -i '$(1)'/src/3rdparty/webkit/WebCore/plugins/win/PluginViewWin.cpp - # Configure Qt for MinGW target cd '$(1)' && ./configure \ -opensource \ @@ -134,7 +124,8 @@ define $(PKG)_BUILD -bindir '$(1)'/bindirsink \ -script \ -opengl desktop \ - -phonon \ + -no-webkit \ + -no-phonon \ -no-phonon-backend \ -accessibility \ -no-reduce-exports \ -- cgit v0.12