diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-09-22 19:48:00 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-09-22 19:48:00 -0300 |
| commit | 37c6b66933676a18529b4e647d1a79a626900512 (patch) | |
| tree | 71c20974a4371e5bb41d2fa4faa807a73f12f8b8 /extra/qt | |
| parent | a3574b9529a82018664ff6e810d7d81b2bb4eb75 (diff) | |
| parent | 0297e16d6d46f426939811847e72539d15bbf12d (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/qt/PKGBUILD
testing/systemd/PKGBUILD
testing/systemd/use-split-usr-path.patch
Diffstat (limited to 'extra/qt')
| -rw-r--r-- | extra/qt/PKGBUILD | 19 | ||||
| -rw-r--r-- | extra/qt/fix-crash-in-assistant.patch | 11 |
2 files changed, 20 insertions, 10 deletions
diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD index 47cd3a2c5..f3646cf9a 100644 --- a/extra/qt/PKGBUILD +++ b/extra/qt/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 163963 2012-07-23 03:00:13Z allan $ +# $Id: PKGBUILD 166901 2012-09-21 13:44:23Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgbase=qt pkgname=('qt' 'qt-private-headers') -pkgver=4.8.2 -pkgrel=3 +pkgver=4.8.3 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url='http://qt-project.org/' license=('GPL3' 'LGPL') @@ -20,16 +20,14 @@ source=("http://releases.qt-project.org/qt4/source/${_pkgfqn}.tar.gz" 'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qtconfig.desktop' 'improve-cups-support.patch' - 'declarative-fix-sigbus.patch' - 'fix-assistant-crash.patch') -md5sums=('3c1146ddf56247e16782f96910a8423b' + 'fix-crash-in-assistant.patch') +md5sums=('a663b6c875f8d7caa8ac9c30e4a4ec3b' 'fc211414130ab2764132e7370f8e5caa' '85179f5e0437514f8639957e1d8baf62' 'f11852b97583610f3dbb669ebc3e21bc' '6b771c8a81dd90b45e8a79afa0e5bbfd' 'c439c7731c25387352d8453ca7574971' - 'aac963d05a9d5733e2bfce9e26607f51' - 'e9c11e4606b7f55ae405e3e76f863dc1') + '57590084078b6379f0501f7728b02ae2') build() { cd "${srcdir}"/${_pkgfqn} @@ -39,9 +37,10 @@ build() { # (FS#28381) (KDEBUG#180051) patch -p1 -i "${srcdir}"/improve-cups-support.patch - - patch -p1 -i "${srcdir}"/fix-assistant-crash.patch + # (FS#) + patch -p1 -i "${srcdir}"/fix-crash-in-assistant.patch + export QT4DIR="${srcdir}"/${_pkgfqn} export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} diff --git a/extra/qt/fix-crash-in-assistant.patch b/extra/qt/fix-crash-in-assistant.patch new file mode 100644 index 000000000..4246e0532 --- /dev/null +++ b/extra/qt/fix-crash-in-assistant.patch @@ -0,0 +1,11 @@ +--- 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); + } |