summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2012-09-22 00:17:51 -0700
committerroot <root@rshg054.dnsready.net>2012-09-22 00:17:51 -0700
commit0297e16d6d46f426939811847e72539d15bbf12d (patch)
tree9f8fb2c593c67b3ae01861328bcff9369f11c17c /extra
parent7bcc3e9d12b9294024067ecaf8ab28a9fe83ab6c (diff)
Sat Sep 22 00:17:51 PDT 2012
Diffstat (limited to 'extra')
-rw-r--r--extra/dovecot/PKGBUILD8
-rw-r--r--extra/qt/PKGBUILD17
-rw-r--r--extra/qt/fix-crash-in-assistant.patch11
3 files changed, 24 insertions, 12 deletions
diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD
index f4f418727..a8aa3b571 100644
--- a/extra/dovecot/PKGBUILD
+++ b/extra/dovecot/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 164655 2012-08-01 19:38:29Z andyrtr $
+# $Id: PKGBUILD 166907 2012-09-21 14:30:04Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Contributor: Paul Mattal <paul@mattal.com>
# Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com>
# Contributor: GARETTE Emmanuel <gnunux at laposte dot net>
pkgname=dovecot
-pkgver=2.1.9
+pkgver=2.1.10
pkgrel=1
pkgdesc="An IMAP and POP3 server written with security primarily in mind"
arch=('i686' 'x86_64')
@@ -22,8 +22,8 @@ install=$pkgname.install
source=(http://dovecot.org/releases/2.1/${pkgname}-${pkgver}.tar.gz{,.sig}
dovecot.sh
dovecot.tmpfilesd)
-md5sums=('3cb45a55c011a2f8599ad70ccfaaf8f5'
- '4ad189a6203aa1b2a595e7587908364a'
+md5sums=('a5a4b3c444cf37e2c6bb6df3af87e18e'
+ '9327f77a0090e7d389cf9f3b35ae7c04'
'587159e84e2da6f83d70b3c706ba87cc'
'342a28251d40f983c98c0d1f1bf3d07d')
diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD
index 789880899..4dae23cae 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')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
@@ -19,23 +19,24 @@ 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'
+ 'fix-crash-in-assistant.patch')
+md5sums=('a663b6c875f8d7caa8ac9c30e4a4ec3b'
'fc211414130ab2764132e7370f8e5caa'
'85179f5e0437514f8639957e1d8baf62'
'f11852b97583610f3dbb669ebc3e21bc'
'6b771c8a81dd90b45e8a79afa0e5bbfd'
'c439c7731c25387352d8453ca7574971'
- 'e9c11e4606b7f55ae405e3e76f863dc1')
+ '57590084078b6379f0501f7728b02ae2')
build() {
cd "${srcdir}"/${_pkgfqn}
# (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);
+ }