wok-stable rev 6976
Up: qt4 to 4.7.0. Fixed qt4 to compile in clean chroot too.
| author | Christopher Rogers <slaxemulator@gmail.com> |
|---|---|
| date | Thu Oct 28 05:01:16 2010 +0000 (2010-10-28) |
| parents | a1cd19a9e269 |
| children | 897eb75a6923 |
| files | Qt4-dev/receipt QtDesigner/receipt libQt3Support/receipt libQtClucene/receipt libQtCore/receipt libQtDBus/receipt libQtDesigner/receipt libQtGui/receipt libQtHelp/receipt libQtNetwork/receipt libQtOpenGL/receipt libQtScript/receipt libQtSql/receipt libQtSvg/receipt libQtWebkit/receipt libQtXml/receipt qmake/receipt qt4-phonon/receipt qt4/receipt qt4/stuff/fix-multisampling-with-ati-card.patch qt4/stuff/fix-scroll-when-last-item-is-removed.patch |
line diff
1.1 --- a/Qt4-dev/receipt Thu Oct 28 04:58:29 2010 +0000 1.2 +++ b/Qt4-dev/receipt Thu Oct 28 05:01:16 2010 +0000 1.3 @@ -1,11 +1,11 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="Qt4-dev" 1.7 -VERSION="4.6.2" 1.8 +VERSION="4.7.0" 1.9 CATEGORY="development" 1.10 SHORT_DESC="qt x11 toolkit" 1.11 MAINTAINER="allan316@gmail.com" 1.12 -DEPENDS="QtDesigner jpeg tiff libpng libgl libglu \ 1.13 +DEPENDS="QtDesigner jpeg tiff libpng mesa libglu-mesa \ 1.14 freetds libmysqlclient libpostgresqlclient libunixODBC xcb-util \ 1.15 libQt3Support libQtClucene libQtDBus libQtHelp libQtOpenGL \ 1.16 libQtScript libQtSql libQtWebkit gcc-lib-base"
2.1 --- a/QtDesigner/receipt Thu Oct 28 04:58:29 2010 +0000 2.2 +++ b/QtDesigner/receipt Thu Oct 28 05:01:16 2010 +0000 2.3 @@ -1,7 +1,7 @@ 2.4 # SliTaz package receipt. 2.5 2.6 PACKAGE="QtDesigner" 2.7 -VERSION="4.6.2" 2.8 +VERSION="4.7.0" 2.9 CATEGORY="development" 2.10 SHORT_DESC="Qt Designer" 2.11 MAINTAINER="allan316@gmail.com"
3.1 --- a/libQt3Support/receipt Thu Oct 28 04:58:29 2010 +0000 3.2 +++ b/libQt3Support/receipt Thu Oct 28 05:01:16 2010 +0000 3.3 @@ -1,7 +1,7 @@ 3.4 # SliTaz package receipt. 3.5 3.6 PACKAGE="libQt3Support" 3.7 -VERSION="4.6.2" 3.8 +VERSION="4.7.0" 3.9 CATEGORY="development" 3.10 SHORT_DESC="Qt3 support Library" 3.11 MAINTAINER="allan316@gmail.com"
4.1 --- a/libQtClucene/receipt Thu Oct 28 04:58:29 2010 +0000 4.2 +++ b/libQtClucene/receipt Thu Oct 28 05:01:16 2010 +0000 4.3 @@ -1,7 +1,7 @@ 4.4 # SliTaz package receipt. 4.5 4.6 PACKAGE="libQtClucene" 4.7 -VERSION="4.6.2" 4.8 +VERSION="4.7.0" 4.9 CATEGORY="development" 4.10 SHORT_DESC="Qt clucene Library" 4.11 MAINTAINER="allan316@gmail.com"
5.1 --- a/libQtCore/receipt Thu Oct 28 04:58:29 2010 +0000 5.2 +++ b/libQtCore/receipt Thu Oct 28 05:01:16 2010 +0000 5.3 @@ -1,7 +1,7 @@ 5.4 # SliTaz package receipt. 5.5 5.6 PACKAGE="libQtCore" 5.7 -VERSION="4.6.2" 5.8 +VERSION="4.7.0" 5.9 CATEGORY="development" 5.10 SHORT_DESC="Qt Core files" 5.11 MAINTAINER="allan316@gmail.com"
6.1 --- a/libQtDBus/receipt Thu Oct 28 04:58:29 2010 +0000 6.2 +++ b/libQtDBus/receipt Thu Oct 28 05:01:16 2010 +0000 6.3 @@ -1,7 +1,7 @@ 6.4 # SliTaz package receipt. 6.5 6.6 PACKAGE="libQtDBus" 6.7 -VERSION="4.6.2" 6.8 +VERSION="4.7.0" 6.9 CATEGORY="development" 6.10 SHORT_DESC="Qt Dbus Library" 6.11 MAINTAINER="allan316@gmail.com"
7.1 --- a/libQtDesigner/receipt Thu Oct 28 04:58:29 2010 +0000 7.2 +++ b/libQtDesigner/receipt Thu Oct 28 05:01:16 2010 +0000 7.3 @@ -1,7 +1,7 @@ 7.4 # SliTaz package receipt. 7.5 7.6 PACKAGE="libQtDesigner" 7.7 -VERSION="4.6.2" 7.8 +VERSION="4.7.0" 7.9 CATEGORY="development" 7.10 SHORT_DESC="Qt Designer" 7.11 MAINTAINER="allan316@gmail.com"
8.1 --- a/libQtGui/receipt Thu Oct 28 04:58:29 2010 +0000 8.2 +++ b/libQtGui/receipt Thu Oct 28 05:01:16 2010 +0000 8.3 @@ -1,7 +1,7 @@ 8.4 # SliTaz package receipt. 8.5 8.6 PACKAGE="libQtGui" 8.7 -VERSION="4.6.2" 8.8 +VERSION="4.7.0" 8.9 CATEGORY="development" 8.10 SHORT_DESC="Qt Gui Library" 8.11 MAINTAINER="allan316@gmail.com" 8.12 @@ -13,7 +13,6 @@ 8.13 WANTED="qt4" 8.14 SOURCE="qt-everywhere-opensource-src" 8.15 8.16 - 8.17 # Rules to gen a SliTaz package suitable for Tazpkg. 8.18 genpkg_rules() 8.19 {
9.1 --- a/libQtHelp/receipt Thu Oct 28 04:58:29 2010 +0000 9.2 +++ b/libQtHelp/receipt Thu Oct 28 05:01:16 2010 +0000 9.3 @@ -1,7 +1,7 @@ 9.4 # SliTaz package receipt. 9.5 9.6 PACKAGE="libQtHelp" 9.7 -VERSION="4.6.2" 9.8 +VERSION="4.7.0" 9.9 CATEGORY="development" 9.10 SHORT_DESC="Qt help Library" 9.11 MAINTAINER="allan316@gmail.com"
10.1 --- a/libQtNetwork/receipt Thu Oct 28 04:58:29 2010 +0000 10.2 +++ b/libQtNetwork/receipt Thu Oct 28 05:01:16 2010 +0000 10.3 @@ -1,7 +1,7 @@ 10.4 # SliTaz package receipt. 10.5 10.6 PACKAGE="libQtNetwork" 10.7 -VERSION="4.6.2" 10.8 +VERSION="4.7.0" 10.9 CATEGORY="development" 10.10 SHORT_DESC="Qt Network Library" 10.11 MAINTAINER="allan316@gmail.com"
11.1 --- a/libQtOpenGL/receipt Thu Oct 28 04:58:29 2010 +0000 11.2 +++ b/libQtOpenGL/receipt Thu Oct 28 05:01:16 2010 +0000 11.3 @@ -1,11 +1,11 @@ 11.4 # SliTaz package receipt. 11.5 11.6 PACKAGE="libQtOpenGL" 11.7 -VERSION="4.6.2" 11.8 +VERSION="4.7.0" 11.9 CATEGORY="development" 11.10 SHORT_DESC="Qt Network Library" 11.11 MAINTAINER="allan316@gmail.com" 11.12 -DEPENDS="libQtGui libgl libglu xorg-libXxf86vm xorg-libXdamage libdrm" 11.13 +DEPENDS="libQtGui mesa libglu-mesa xorg-libXxf86vm xorg-libXdamage libdrm" 11.14 TARBALL="$PACKAGE-$VERSION.tar.gz" 11.15 WEB_SITE="http://qt.nokia.com/" 11.16 WANTED="qt4"
12.1 --- a/libQtScript/receipt Thu Oct 28 04:58:29 2010 +0000 12.2 +++ b/libQtScript/receipt Thu Oct 28 05:01:16 2010 +0000 12.3 @@ -1,7 +1,7 @@ 12.4 # SliTaz package receipt. 12.5 12.6 PACKAGE="libQtScript" 12.7 -VERSION="4.6.2" 12.8 +VERSION="4.7.0" 12.9 CATEGORY="development" 12.10 SHORT_DESC="Qt Script Lib" 12.11 MAINTAINER="allan316@gmail.com"
13.1 --- a/libQtSql/receipt Thu Oct 28 04:58:29 2010 +0000 13.2 +++ b/libQtSql/receipt Thu Oct 28 05:01:16 2010 +0000 13.3 @@ -1,7 +1,7 @@ 13.4 # SliTaz package receipt. 13.5 13.6 PACKAGE="libQtSql" 13.7 -VERSION="4.6.2" 13.8 +VERSION="4.7.0" 13.9 CATEGORY="development" 13.10 SHORT_DESC="Qt sql Library" 13.11 MAINTAINER="allan316@gmail.com"
14.1 --- a/libQtSvg/receipt Thu Oct 28 04:58:29 2010 +0000 14.2 +++ b/libQtSvg/receipt Thu Oct 28 05:01:16 2010 +0000 14.3 @@ -1,7 +1,7 @@ 14.4 # SliTaz package receipt. 14.5 14.6 PACKAGE="libQtSvg" 14.7 -VERSION="4.6.2" 14.8 +VERSION="4.7.0" 14.9 CATEGORY="development" 14.10 SHORT_DESC="Qt Svg Library" 14.11 MAINTAINER="allan316@gmail.com"
15.1 --- a/libQtWebkit/receipt Thu Oct 28 04:58:29 2010 +0000 15.2 +++ b/libQtWebkit/receipt Thu Oct 28 05:01:16 2010 +0000 15.3 @@ -1,7 +1,7 @@ 15.4 # SliTaz package receipt. 15.5 15.6 PACKAGE="libQtWebkit" 15.7 -VERSION="4.6.2" 15.8 +VERSION="4.7.0" 15.9 CATEGORY="development" 15.10 SHORT_DESC="Web browser engine for Qt" 15.11 MAINTAINER="allan316@gmail.com"
16.1 --- a/libQtXml/receipt Thu Oct 28 04:58:29 2010 +0000 16.2 +++ b/libQtXml/receipt Thu Oct 28 05:01:16 2010 +0000 16.3 @@ -1,7 +1,7 @@ 16.4 # SliTaz package receipt. 16.5 16.6 PACKAGE="libQtXml" 16.7 -VERSION="4.6.2" 16.8 +VERSION="4.7.0" 16.9 CATEGORY="development" 16.10 SHORT_DESC="Qt Xml library" 16.11 MAINTAINER="allan316@gmail.com"
17.1 --- a/qmake/receipt Thu Oct 28 04:58:29 2010 +0000 17.2 +++ b/qmake/receipt Thu Oct 28 05:01:16 2010 +0000 17.3 @@ -1,7 +1,7 @@ 17.4 # SliTaz package receipt. 17.5 17.6 PACKAGE="qmake" 17.7 -VERSION="4.6.2" 17.8 +VERSION="4.7.0" 17.9 CATEGORY="development" 17.10 SHORT_DESC="Qt make" 17.11 MAINTAINER="allan316@gmail.com" 17.12 @@ -12,7 +12,6 @@ 17.13 SOURCE="qt-everywhere-opensource-src" 17.14 TAGS="qt" 17.15 17.16 - 17.17 # Rules to gen a SliTaz package suitable for Tazpkg. 17.18 genpkg_rules() 17.19 {
18.1 --- a/qt4-phonon/receipt Thu Oct 28 04:58:29 2010 +0000 18.2 +++ b/qt4-phonon/receipt Thu Oct 28 05:01:16 2010 +0000 18.3 @@ -1,7 +1,7 @@ 18.4 # SliTaz package receipt. 18.5 18.6 PACKAGE="qt4-phonon" 18.7 -VERSION="4.6.2" 18.8 +VERSION="4.7.0" 18.9 CATEGORY="multimedia" 18.10 SHORT_DESC="Qt phonon library" 18.11 MAINTAINER="pankso@slitaz.org"
19.1 --- a/qt4/receipt Thu Oct 28 04:58:29 2010 +0000 19.2 +++ b/qt4/receipt Thu Oct 28 05:01:16 2010 +0000 19.3 @@ -2,7 +2,7 @@ 19.4 19.5 PACKAGE="qt4" 19.6 SOURCE="qt-everywhere-opensource-src" 19.7 -VERSION="4.6.2" 19.8 +VERSION="4.7.0" 19.9 CATEGORY="meta" 19.10 SHORT_DESC="qt x11 toolkit" 19.11 MAINTAINER="allan316@gmail.com" 19.12 @@ -10,7 +10,9 @@ 19.13 libQtDesigner libQtScript libQt3Support libQtClucene libQtDBus libQtHelp \ 19.14 libQtOpenGL libQtSql libQtWebkit gstreamer" 19.15 BUILD_DEPENDS="xorg-libX11-dev dbus-dev slitaz-dev-pkgs gstreamer \ 19.16 -gstreamer-dev gst-python-dev" 19.17 +gstreamer-dev gst-python-dev libmng-dev cups-dev mysql-dev unixODBC-dev \ 19.18 +mesa-dev fontconfig-dev libegl-mesa libglu-mesa libglw-mesa postgresql-dev glibc-locale \ 19.19 +gtk+-dev gst-plugins-base-dev" 19.20 TARBALL="$SOURCE-$VERSION.tar.gz" 19.21 WEB_SITE="http://qt.nokia.com/" 19.22 WGET_URL="ftp://ftp.qt.nokia.com/qt/source/$TARBALL" 19.23 @@ -21,6 +23,10 @@ 19.24 compile_rules() 19.25 { 19.26 cd $src 19.27 + # Already fixed in 4.7.1 19.28 + patch -Np1 -i ../stuff/fix-scroll-when-last-item-is-removed.patch 19.29 + patch -Np1 -i ../stuff/fix-multisampling-with-ati-card.patch 19.30 + 19.31 ./configure -v \ 19.32 -prefix /usr \ 19.33 -confirm-license -opensource \ 19.34 @@ -36,6 +42,13 @@ 19.35 -nomake demos \ 19.36 -nomake examples \ 19.37 -nomake docs \ 19.38 + -system-zlib \ 19.39 + -system-libtiff \ 19.40 + -system-libpng \ 19.41 + -system-libmng \ 19.42 + -system-libjpeg \ 19.43 + -system-sqlite \ 19.44 + -glib \ 19.45 -phonon \ 19.46 -optimized-qmake \ 19.47 -opengl \
20.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 20.2 +++ b/qt4/stuff/fix-multisampling-with-ati-card.patch Thu Oct 28 05:01:16 2010 +0000 20.3 @@ -0,0 +1,25 @@ 20.4 +From e48e50c460434c451c67403390d98f7418c77cce Mon Sep 17 00:00:00 2001 20.5 +From: Jonathan Liu <net147@gmail.com> 20.6 +Date: Wed, 25 Aug 2010 14:07:40 +1000 20.7 +Subject: [PATCH] Fix OpenGL multisampling for some graphics drivers 20.8 + 20.9 +--- 20.10 + src/opengl/qgl_win.cpp | 2 +- 20.11 + 1 files changed, 1 insertions(+), 1 deletions(-) 20.12 + 20.13 +diff --git a/src/opengl/qgl_win.cpp b/src/opengl/qgl_win.cpp 20.14 +index 5ab944a..8eb6177 100644 20.15 +--- a/src/opengl/qgl_win.cpp 20.16 ++++ b/src/opengl/qgl_win.cpp 20.17 +@@ -1042,7 +1042,7 @@ int QGLContext::choosePixelFormat(void* dummyPfd, HDC pdc) 20.18 + iAttributes[i++] = WGL_DRAW_TO_WINDOW_ARB; 20.19 + iAttributes[i++] = TRUE; 20.20 + iAttributes[i++] = WGL_COLOR_BITS_ARB; 20.21 +- iAttributes[i++] = 32; 20.22 ++ iAttributes[i++] = 24; 20.23 + iAttributes[i++] = WGL_DOUBLE_BUFFER_ARB; 20.24 + iAttributes[i++] = d->glFormat.doubleBuffer(); 20.25 + if (d->glFormat.stereo()) { 20.26 +-- 20.27 +1.7.2.1 20.28 +
21.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 21.2 +++ b/qt4/stuff/fix-scroll-when-last-item-is-removed.patch Thu Oct 28 05:01:16 2010 +0000 21.3 @@ -0,0 +1,38 @@ 21.4 +From 6da6b7099d4e0b49329793e4b90703ec3d868048 Mon Sep 17 00:00:00 2001 21.5 +From: Frank Reininghaus <frank78ac@googlemail.com> 21.6 +Date: Wed, 22 Sep 2010 10:19:59 +0200 21.7 +Subject: [PATCH] QTreeView: do not scroll to top if last item is removed 21.8 + 21.9 +When the last item is the current item and is removed, 21.10 +QTreeViewPrivate::updateScrollBars() is called after QTreeViewPrivate's 21.11 +viewItems member is cleared. This commit makes sure that viewItems is 21.12 +restored by calling QTreeView::doItemsLayout() in this case, preventing 21.13 +that the scroll bar range is set to zero temporarily and the view is 21.14 +scrolled to the top unexpectedly (this was a regression in 4.7.0: 21.15 +QTBUG-13567). 21.16 + 21.17 +Merge-request: 2481 21.18 +Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com> 21.19 +--- 21.20 + src/gui/itemviews/qtreeview.cpp | 4 ++++ 21.21 + tests/auto/qtreeview/tst_qtreeview.cpp | 22 ++++++++++++++++++++++ 21.22 + 2 files changed, 26 insertions(+), 0 deletions(-) 21.23 + 21.24 +diff --git a/src/gui/itemviews/qtreeview.cpp b/src/gui/itemviews/qtreeview.cpp 21.25 +index b797776..40b51fe 100644 21.26 +--- a/src/gui/itemviews/qtreeview.cpp 21.27 ++++ b/src/gui/itemviews/qtreeview.cpp 21.28 +@@ -3435,6 +3435,10 @@ void QTreeViewPrivate::updateScrollBars() 21.29 + if (!viewportSize.isValid()) 21.30 + viewportSize = QSize(0, 0); 21.31 + 21.32 ++ if (viewItems.isEmpty()) { 21.33 ++ q->doItemsLayout(); 21.34 ++ } 21.35 ++ 21.36 + int itemsInViewport = 0; 21.37 + if (uniformRowHeights) { 21.38 + if (defaultItemHeight <= 0) 21.39 +-- 21.40 +1.6.1 21.41 +