Date: Tuesday, November 9, 2010 @ 17:17:20 Author: andrea Revision: 98480
upstream release; remove old patches; add comments to .desktop Modified: qt/trunk/PKGBUILD qt/trunk/assistant.desktop qt/trunk/designer.desktop qt/trunk/linguist.desktop qt/trunk/qtconfig.desktop Deleted: qt/trunk/fix-multisampling-with-ati-card.patch qt/trunk/fix-scroll-when-last-item-is-removed.patch --------------------------------------------+ PKGBUILD | 29 +++++++------------- assistant.desktop | 7 ++-- designer.desktop | 8 +++-- fix-multisampling-with-ati-card.patch | 25 ----------------- fix-scroll-when-last-item-is-removed.patch | 38 --------------------------- linguist.desktop | 11 ++++--- qtconfig.desktop | 2 + 7 files changed, 28 insertions(+), 92 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-11-09 21:06:41 UTC (rev 98479) +++ PKGBUILD 2010-11-09 22:17:20 UTC (rev 98480) @@ -3,15 +3,15 @@ # Contributor: Pierre Schmitz <[email protected]> pkgname=qt -pkgver=4.7.0 -pkgrel=4 +pkgver=4.7.1 +pkgrel=1 pkgdesc='A cross-platform application and UI framework' arch=('i686' 'x86_64') url='http://qt.nokia.com/' license=('GPL3' 'LGPL') depends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'dbus' - 'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib' - 'xdg-utils' 'hicolor-icon-theme') + 'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib' + 'xdg-utils' 'hicolor-icon-theme') optdepends=('postgresql-libs: PostgreSQL driver' 'libmysqlclient: MySQL driver' 'unixodbc: ODBC driver' @@ -23,16 +23,13 @@ options=('!libtool') _pkgfqn="qt-everywhere-opensource-src-${pkgver}" source=("ftp://ftp.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz"; - 'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qtconfig.desktop' - 'fix-scroll-when-last-item-is-removed.patch' - 'fix-multisampling-with-ati-card.patch') -md5sums=('3a2f25b9b115037277f4fb759194a7a5' - 'a445c6917086d80f1cfc1e40cb6b0132' - 'd457f0a0ad68a3861c3cadefe3b42ded' - '668331d9798a0e2b94381efb7be4c513' - 'c29f2993d6a0f73d756d2fa36e130e1c' - 'ef20c34afc5be5ed62f2935be66d9402' - 'b2e0f134bbb848ebef41134a45a36ee9') + 'assistant.desktop' 'designer.desktop' 'linguist.desktop' + 'qtconfig.desktop') +md5sums=('6f88d96507c84e9fea5bf3a71ebeb6d7' + 'fc211414130ab2764132e7370f8e5caa' + '85179f5e0437514f8639957e1d8baf62' + 'f11852b97583610f3dbb669ebc3e21bc' + '6b771c8a81dd90b45e8a79afa0e5bbfd') build() { unset QMAKESPEC @@ -42,10 +39,6 @@ cd $srcdir/$_pkgfqn - # Already fixed in 4.7.1 - patch -Np1 -i ${srcdir}/fix-scroll-when-last-item-is-removed.patch - patch -Np1 -i ${srcdir}/fix-multisampling-with-ati-card.patch - sed -i "s|-O2|$CXXFLAGS|" mkspecs/common/g++.conf sed -i "/^QMAKE_RPATH/s| -Wl,-rpath,||g" mkspecs/common/g++.conf sed -i "/^QMAKE_LFLAGS\s/s|+=|+= $LDFLAGS|g" mkspecs/common/g++.conf Modified: assistant.desktop =================================================================== --- assistant.desktop 2010-11-09 21:06:41 UTC (rev 98479) +++ assistant.desktop 2010-11-09 22:17:20 UTC (rev 98480) @@ -1,8 +1,9 @@ [Desktop Entry] +Name=Qt Assistant +Comment=Shows Qt documentation and examples Exec=/usr/bin/assistant -Name=Qt Assistant -GenericName=Qt Document Browser Icon=assistant Terminal=false +Encoding=UTF-8 Type=Application -Categories=Qt;Development;Documentation +Categories=Qt;Development;Documentation; Modified: designer.desktop =================================================================== --- designer.desktop 2010-11-09 21:06:41 UTC (rev 98479) +++ designer.desktop 2010-11-09 22:17:20 UTC (rev 98480) @@ -1,9 +1,11 @@ [Desktop Entry] -Exec=/usr/bin/designer Name=Qt Designer GenericName=Interface Designer -MimeType=application/x-designer +Comment=Design GUIs for Qt applications +Exec=/usr/bin/designer Icon=designer +MimeType=application/x-designer; Terminal=false +Encoding=UTF-8 Type=Application -Categories=Qt;Development;GUIDesigner +Categories=Qt;Development; Deleted: fix-multisampling-with-ati-card.patch =================================================================== --- fix-multisampling-with-ati-card.patch 2010-11-09 21:06:41 UTC (rev 98479) +++ fix-multisampling-with-ati-card.patch 2010-11-09 22:17:20 UTC (rev 98480) @@ -1,25 +0,0 @@ -From e48e50c460434c451c67403390d98f7418c77cce Mon Sep 17 00:00:00 2001 -From: Jonathan Liu <[email protected]> -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 - Deleted: fix-scroll-when-last-item-is-removed.patch =================================================================== --- fix-scroll-when-last-item-is-removed.patch 2010-11-09 21:06:41 UTC (rev 98479) +++ fix-scroll-when-last-item-is-removed.patch 2010-11-09 22:17:20 UTC (rev 98480) @@ -1,38 +0,0 @@ -From 6da6b7099d4e0b49329793e4b90703ec3d868048 Mon Sep 17 00:00:00 2001 -From: Frank Reininghaus <[email protected]> -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 <[email protected]> ---- - 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 - Modified: linguist.desktop =================================================================== --- linguist.desktop 2010-11-09 21:06:41 UTC (rev 98479) +++ linguist.desktop 2010-11-09 22:17:20 UTC (rev 98480) @@ -1,9 +1,10 @@ [Desktop Entry] +Name=Qt Linguist +Comment=Add translations to Qt applications Exec=/usr/bin/linguist -Name=Qt Linguist -GenericName=Translation Tool -MimeType=application/x-linguist +Icon=linguist +MimeType=text/vnd.trolltech.linguist;application/x-linguist; Terminal=false +Encoding=UTF-8 Type=Application -Icon=linguist -Categories=Qt;Development;Translation +Categories=Qt;Development; Modified: qtconfig.desktop =================================================================== --- qtconfig.desktop 2010-11-09 21:06:41 UTC (rev 98479) +++ qtconfig.desktop 2010-11-09 22:17:20 UTC (rev 98480) @@ -4,5 +4,7 @@ Exec=/usr/bin/qtconfig Icon=qtlogo Terminal=false +Encoding=UTF-8 Type=Application Categories=Qt;Settings; +NoDisplay=true
