# HG changeset patch # User Christopher Rogers # Date 1288242076 0 # Node ID 99e3675b8ff1ef5c425adc13322d9be020d9ef55 # Parent a1cd19a9e26946b87c4aa3e4c9fa1da3dd1bfc95 Up: qt4 to 4.7.0. Fixed qt4 to compile in clean chroot too. diff -r a1cd19a9e269 -r 99e3675b8ff1 Qt4-dev/receipt --- a/Qt4-dev/receipt Thu Oct 28 04:58:29 2010 +0000 +++ b/Qt4-dev/receipt Thu Oct 28 05:01:16 2010 +0000 @@ -1,11 +1,11 @@ # SliTaz package receipt. PACKAGE="Qt4-dev" -VERSION="4.6.2" +VERSION="4.7.0" CATEGORY="development" SHORT_DESC="qt x11 toolkit" MAINTAINER="allan316@gmail.com" -DEPENDS="QtDesigner jpeg tiff libpng libgl libglu \ +DEPENDS="QtDesigner jpeg tiff libpng mesa libglu-mesa \ freetds libmysqlclient libpostgresqlclient libunixODBC xcb-util \ libQt3Support libQtClucene libQtDBus libQtHelp libQtOpenGL \ libQtScript libQtSql libQtWebkit gcc-lib-base" diff -r a1cd19a9e269 -r 99e3675b8ff1 QtDesigner/receipt --- a/QtDesigner/receipt Thu Oct 28 04:58:29 2010 +0000 +++ b/QtDesigner/receipt Thu Oct 28 05:01:16 2010 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="QtDesigner" -VERSION="4.6.2" +VERSION="4.7.0" CATEGORY="development" SHORT_DESC="Qt Designer" MAINTAINER="allan316@gmail.com" diff -r a1cd19a9e269 -r 99e3675b8ff1 libQt3Support/receipt --- a/libQt3Support/receipt Thu Oct 28 04:58:29 2010 +0000 +++ b/libQt3Support/receipt Thu Oct 28 05:01:16 2010 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="libQt3Support" -VERSION="4.6.2" +VERSION="4.7.0" CATEGORY="development" SHORT_DESC="Qt3 support Library" MAINTAINER="allan316@gmail.com" diff -r a1cd19a9e269 -r 99e3675b8ff1 libQtClucene/receipt --- a/libQtClucene/receipt Thu Oct 28 04:58:29 2010 +0000 +++ b/libQtClucene/receipt Thu Oct 28 05:01:16 2010 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="libQtClucene" -VERSION="4.6.2" +VERSION="4.7.0" CATEGORY="development" SHORT_DESC="Qt clucene Library" MAINTAINER="allan316@gmail.com" diff -r a1cd19a9e269 -r 99e3675b8ff1 libQtCore/receipt --- a/libQtCore/receipt Thu Oct 28 04:58:29 2010 +0000 +++ b/libQtCore/receipt Thu Oct 28 05:01:16 2010 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="libQtCore" -VERSION="4.6.2" +VERSION="4.7.0" CATEGORY="development" SHORT_DESC="Qt Core files" MAINTAINER="allan316@gmail.com" diff -r a1cd19a9e269 -r 99e3675b8ff1 libQtDBus/receipt --- a/libQtDBus/receipt Thu Oct 28 04:58:29 2010 +0000 +++ b/libQtDBus/receipt Thu Oct 28 05:01:16 2010 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="libQtDBus" -VERSION="4.6.2" +VERSION="4.7.0" CATEGORY="development" SHORT_DESC="Qt Dbus Library" MAINTAINER="allan316@gmail.com" diff -r a1cd19a9e269 -r 99e3675b8ff1 libQtDesigner/receipt --- a/libQtDesigner/receipt Thu Oct 28 04:58:29 2010 +0000 +++ b/libQtDesigner/receipt Thu Oct 28 05:01:16 2010 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="libQtDesigner" -VERSION="4.6.2" +VERSION="4.7.0" CATEGORY="development" SHORT_DESC="Qt Designer" MAINTAINER="allan316@gmail.com" diff -r a1cd19a9e269 -r 99e3675b8ff1 libQtGui/receipt --- a/libQtGui/receipt Thu Oct 28 04:58:29 2010 +0000 +++ b/libQtGui/receipt Thu Oct 28 05:01:16 2010 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="libQtGui" -VERSION="4.6.2" +VERSION="4.7.0" CATEGORY="development" SHORT_DESC="Qt Gui Library" MAINTAINER="allan316@gmail.com" @@ -13,7 +13,6 @@ WANTED="qt4" SOURCE="qt-everywhere-opensource-src" - # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { diff -r a1cd19a9e269 -r 99e3675b8ff1 libQtHelp/receipt --- a/libQtHelp/receipt Thu Oct 28 04:58:29 2010 +0000 +++ b/libQtHelp/receipt Thu Oct 28 05:01:16 2010 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="libQtHelp" -VERSION="4.6.2" +VERSION="4.7.0" CATEGORY="development" SHORT_DESC="Qt help Library" MAINTAINER="allan316@gmail.com" diff -r a1cd19a9e269 -r 99e3675b8ff1 libQtNetwork/receipt --- a/libQtNetwork/receipt Thu Oct 28 04:58:29 2010 +0000 +++ b/libQtNetwork/receipt Thu Oct 28 05:01:16 2010 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="libQtNetwork" -VERSION="4.6.2" +VERSION="4.7.0" CATEGORY="development" SHORT_DESC="Qt Network Library" MAINTAINER="allan316@gmail.com" diff -r a1cd19a9e269 -r 99e3675b8ff1 libQtOpenGL/receipt --- a/libQtOpenGL/receipt Thu Oct 28 04:58:29 2010 +0000 +++ b/libQtOpenGL/receipt Thu Oct 28 05:01:16 2010 +0000 @@ -1,11 +1,11 @@ # SliTaz package receipt. PACKAGE="libQtOpenGL" -VERSION="4.6.2" +VERSION="4.7.0" CATEGORY="development" SHORT_DESC="Qt Network Library" MAINTAINER="allan316@gmail.com" -DEPENDS="libQtGui libgl libglu xorg-libXxf86vm xorg-libXdamage libdrm" +DEPENDS="libQtGui mesa libglu-mesa xorg-libXxf86vm xorg-libXdamage libdrm" TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://qt.nokia.com/" WANTED="qt4" diff -r a1cd19a9e269 -r 99e3675b8ff1 libQtScript/receipt --- a/libQtScript/receipt Thu Oct 28 04:58:29 2010 +0000 +++ b/libQtScript/receipt Thu Oct 28 05:01:16 2010 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="libQtScript" -VERSION="4.6.2" +VERSION="4.7.0" CATEGORY="development" SHORT_DESC="Qt Script Lib" MAINTAINER="allan316@gmail.com" diff -r a1cd19a9e269 -r 99e3675b8ff1 libQtSql/receipt --- a/libQtSql/receipt Thu Oct 28 04:58:29 2010 +0000 +++ b/libQtSql/receipt Thu Oct 28 05:01:16 2010 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="libQtSql" -VERSION="4.6.2" +VERSION="4.7.0" CATEGORY="development" SHORT_DESC="Qt sql Library" MAINTAINER="allan316@gmail.com" diff -r a1cd19a9e269 -r 99e3675b8ff1 libQtSvg/receipt --- a/libQtSvg/receipt Thu Oct 28 04:58:29 2010 +0000 +++ b/libQtSvg/receipt Thu Oct 28 05:01:16 2010 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="libQtSvg" -VERSION="4.6.2" +VERSION="4.7.0" CATEGORY="development" SHORT_DESC="Qt Svg Library" MAINTAINER="allan316@gmail.com" diff -r a1cd19a9e269 -r 99e3675b8ff1 libQtWebkit/receipt --- a/libQtWebkit/receipt Thu Oct 28 04:58:29 2010 +0000 +++ b/libQtWebkit/receipt Thu Oct 28 05:01:16 2010 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="libQtWebkit" -VERSION="4.6.2" +VERSION="4.7.0" CATEGORY="development" SHORT_DESC="Web browser engine for Qt" MAINTAINER="allan316@gmail.com" diff -r a1cd19a9e269 -r 99e3675b8ff1 libQtXml/receipt --- a/libQtXml/receipt Thu Oct 28 04:58:29 2010 +0000 +++ b/libQtXml/receipt Thu Oct 28 05:01:16 2010 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="libQtXml" -VERSION="4.6.2" +VERSION="4.7.0" CATEGORY="development" SHORT_DESC="Qt Xml library" MAINTAINER="allan316@gmail.com" diff -r a1cd19a9e269 -r 99e3675b8ff1 qmake/receipt --- a/qmake/receipt Thu Oct 28 04:58:29 2010 +0000 +++ b/qmake/receipt Thu Oct 28 05:01:16 2010 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="qmake" -VERSION="4.6.2" +VERSION="4.7.0" CATEGORY="development" SHORT_DESC="Qt make" MAINTAINER="allan316@gmail.com" @@ -12,7 +12,6 @@ SOURCE="qt-everywhere-opensource-src" TAGS="qt" - # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { diff -r a1cd19a9e269 -r 99e3675b8ff1 qt4-phonon/receipt --- a/qt4-phonon/receipt Thu Oct 28 04:58:29 2010 +0000 +++ b/qt4-phonon/receipt Thu Oct 28 05:01:16 2010 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="qt4-phonon" -VERSION="4.6.2" +VERSION="4.7.0" CATEGORY="multimedia" SHORT_DESC="Qt phonon library" MAINTAINER="pankso@slitaz.org" diff -r a1cd19a9e269 -r 99e3675b8ff1 qt4/receipt --- a/qt4/receipt Thu Oct 28 04:58:29 2010 +0000 +++ b/qt4/receipt Thu Oct 28 05:01:16 2010 +0000 @@ -2,7 +2,7 @@ PACKAGE="qt4" SOURCE="qt-everywhere-opensource-src" -VERSION="4.6.2" +VERSION="4.7.0" CATEGORY="meta" SHORT_DESC="qt x11 toolkit" MAINTAINER="allan316@gmail.com" @@ -10,7 +10,9 @@ libQtDesigner libQtScript libQt3Support libQtClucene libQtDBus libQtHelp \ libQtOpenGL libQtSql libQtWebkit gstreamer" BUILD_DEPENDS="xorg-libX11-dev dbus-dev slitaz-dev-pkgs gstreamer \ -gstreamer-dev gst-python-dev" +gstreamer-dev gst-python-dev libmng-dev cups-dev mysql-dev unixODBC-dev \ +mesa-dev fontconfig-dev libegl-mesa libglu-mesa libglw-mesa postgresql-dev glibc-locale \ +gtk+-dev gst-plugins-base-dev" TARBALL="$SOURCE-$VERSION.tar.gz" WEB_SITE="http://qt.nokia.com/" WGET_URL="ftp://ftp.qt.nokia.com/qt/source/$TARBALL" @@ -21,6 +23,10 @@ compile_rules() { cd $src + # Already fixed in 4.7.1 + patch -Np1 -i ../stuff/fix-scroll-when-last-item-is-removed.patch + patch -Np1 -i ../stuff/fix-multisampling-with-ati-card.patch + ./configure -v \ -prefix /usr \ -confirm-license -opensource \ @@ -36,6 +42,13 @@ -nomake demos \ -nomake examples \ -nomake docs \ + -system-zlib \ + -system-libtiff \ + -system-libpng \ + -system-libmng \ + -system-libjpeg \ + -system-sqlite \ + -glib \ -phonon \ -optimized-qmake \ -opengl \ diff -r a1cd19a9e269 -r 99e3675b8ff1 qt4/stuff/fix-multisampling-with-ati-card.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/qt4/stuff/fix-multisampling-with-ati-card.patch Thu Oct 28 05:01:16 2010 +0000 @@ -0,0 +1,25 @@ +From e48e50c460434c451c67403390d98f7418c77cce Mon Sep 17 00:00:00 2001 +From: Jonathan Liu +Date: Wed, 25 Aug 2010 14:07:40 +1000 +Subject: [PATCH] Fix OpenGL multisampling for some graphics drivers + +--- + src/opengl/qgl_win.cpp | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/opengl/qgl_win.cpp b/src/opengl/qgl_win.cpp +index 5ab944a..8eb6177 100644 +--- a/src/opengl/qgl_win.cpp ++++ b/src/opengl/qgl_win.cpp +@@ -1042,7 +1042,7 @@ int QGLContext::choosePixelFormat(void* dummyPfd, HDC pdc) + iAttributes[i++] = WGL_DRAW_TO_WINDOW_ARB; + iAttributes[i++] = TRUE; + iAttributes[i++] = WGL_COLOR_BITS_ARB; +- iAttributes[i++] = 32; ++ iAttributes[i++] = 24; + iAttributes[i++] = WGL_DOUBLE_BUFFER_ARB; + iAttributes[i++] = d->glFormat.doubleBuffer(); + if (d->glFormat.stereo()) { +-- +1.7.2.1 + diff -r a1cd19a9e269 -r 99e3675b8ff1 qt4/stuff/fix-scroll-when-last-item-is-removed.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/qt4/stuff/fix-scroll-when-last-item-is-removed.patch Thu Oct 28 05:01:16 2010 +0000 @@ -0,0 +1,38 @@ +From 6da6b7099d4e0b49329793e4b90703ec3d868048 Mon Sep 17 00:00:00 2001 +From: Frank Reininghaus +Date: Wed, 22 Sep 2010 10:19:59 +0200 +Subject: [PATCH] QTreeView: do not scroll to top if last item is removed + +When the last item is the current item and is removed, +QTreeViewPrivate::updateScrollBars() is called after QTreeViewPrivate's +viewItems member is cleared. This commit makes sure that viewItems is +restored by calling QTreeView::doItemsLayout() in this case, preventing +that the scroll bar range is set to zero temporarily and the view is +scrolled to the top unexpectedly (this was a regression in 4.7.0: +QTBUG-13567). + +Merge-request: 2481 +Reviewed-by: Olivier Goffart +--- + src/gui/itemviews/qtreeview.cpp | 4 ++++ + tests/auto/qtreeview/tst_qtreeview.cpp | 22 ++++++++++++++++++++++ + 2 files changed, 26 insertions(+), 0 deletions(-) + +diff --git a/src/gui/itemviews/qtreeview.cpp b/src/gui/itemviews/qtreeview.cpp +index b797776..40b51fe 100644 +--- a/src/gui/itemviews/qtreeview.cpp ++++ b/src/gui/itemviews/qtreeview.cpp +@@ -3435,6 +3435,10 @@ void QTreeViewPrivate::updateScrollBars() + if (!viewportSize.isValid()) + viewportSize = QSize(0, 0); + ++ if (viewItems.isEmpty()) { ++ q->doItemsLayout(); ++ } ++ + int itemsInViewport = 0; + if (uniformRowHeights) { + if (defaultItemHeight <= 0) +-- +1.6.1 +