Date: Thursday, September 13, 2012 @ 11:16:18 Author: andrea Revision: 166630
upgpkg: qt 4.8.3-1 Upstream release Modified: qt/trunk/PKGBUILD Deleted: qt/trunk/fix-assistant-crash.patch ---------------------------+ PKGBUILD | 14 +++++--------- fix-assistant-crash.patch | 12 ------------ 2 files changed, 5 insertions(+), 21 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-09-13 14:11:07 UTC (rev 166629) +++ PKGBUILD 2012-09-13 15:16:18 UTC (rev 166630) @@ -4,8 +4,8 @@ pkgbase=qt pkgname=('qt' 'qt-private-headers') -pkgver=4.8.2 -pkgrel=3 +pkgver=4.8.3 +pkgrel=1 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL') @@ -18,15 +18,13 @@ source=("http://releases.qt-project.org/qt4/source/${_pkgfqn}.tar.gz" 'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qtconfig.desktop' - 'improve-cups-support.patch' - 'fix-assistant-crash.patch') -md5sums=('3c1146ddf56247e16782f96910a8423b' + 'improve-cups-support.patch') +md5sums=('a663b6c875f8d7caa8ac9c30e4a4ec3b' 'fc211414130ab2764132e7370f8e5caa' '85179f5e0437514f8639957e1d8baf62' 'f11852b97583610f3dbb669ebc3e21bc' '6b771c8a81dd90b45e8a79afa0e5bbfd' - 'c439c7731c25387352d8453ca7574971' - 'e9c11e4606b7f55ae405e3e76f863dc1') + 'c439c7731c25387352d8453ca7574971') build() { cd "${srcdir}"/${_pkgfqn} @@ -34,8 +32,6 @@ # (FS#28381) (KDEBUG#180051) patch -p1 -i "${srcdir}"/improve-cups-support.patch - patch -p1 -i "${srcdir}"/fix-assistant-crash.patch - export QT4DIR="${srcdir}"/${_pkgfqn} export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} Deleted: fix-assistant-crash.patch =================================================================== --- fix-assistant-crash.patch 2012-09-13 14:11:07 UTC (rev 166629) +++ fix-assistant-crash.patch 2012-09-13 15:16:18 UTC (rev 166630) @@ -1,12 +0,0 @@ ---- qt-everywhere-opensource-src-4.8.2/tools/assistant/tools/assistant/mainwindow.cpp 2012-06-26 17:37:47.334536023 +0000 -+++ qt-everywhere-opensource-src-4.8.2/tools/assistant/tools/assistant/mainwindow.cpp~ 2012-06-26 17:37:08.531487286 +0000 -@@ -944,8 +944,7 @@ - if (helpEngine.usesAppFont()) - font = helpEngine.appFont(); - -- const QWidgetList &widgets = qApp->allWidgets(); -- foreach (QWidget* widget, widgets) -+ foreach (QWidget* widget, QApplication::allWidgets()) - widget->setFont(font); - } -