diff options
| author | root <root@rshg054.dnsready.net> | 2012-12-01 01:52:00 -0800 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-12-01 01:52:00 -0800 |
| commit | c31ace4c6175db330d7e4aac1e7388fe5ca5d4f3 (patch) | |
| tree | 305ea12a2bf8d2d9c7a36e52f68dba9fdb801548 /extra/qt | |
| parent | 51867161079ab52d5152105142a3bc965c63ca03 (diff) | |
Sat Dec 1 01:48:48 PST 2012
Diffstat (limited to 'extra/qt')
| -rw-r--r-- | extra/qt/PKGBUILD | 35 | ||||
| -rw-r--r-- | extra/qt/assistant.desktop | 1 | ||||
| -rw-r--r-- | extra/qt/designer.desktop | 1 | ||||
| -rw-r--r-- | extra/qt/linguist.desktop | 1 | ||||
| -rw-r--r-- | extra/qt/qtconfig.desktop | 1 |
5 files changed, 10 insertions, 29 deletions
diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD index 77bd108c3..81bc33e83 100644 --- a/extra/qt/PKGBUILD +++ b/extra/qt/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 171529 2012-11-18 11:57:31Z andrea $ +# $Id: PKGBUILD 172171 2012-11-30 15:30:26Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgbase=qt pkgname=('qt' 'qt-private-headers') -pkgver=4.8.3 -pkgrel=6 +pkgver=4.8.4 +pkgrel=1 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL') @@ -19,20 +19,14 @@ source=("http://releases.qt-project.org/qt4/source/${_pkgfqn}.tar.gz" 'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qtconfig.desktop' 'improve-cups-support.patch' - 'fix-crash-in-assistant.patch' - 'disable-ssl-compression.patch' - 'fix-qtscript-crash.patch' - 'qsortfilterproxymodel.patch') -md5sums=('a663b6c875f8d7caa8ac9c30e4a4ec3b' - 'fc211414130ab2764132e7370f8e5caa' - '85179f5e0437514f8639957e1d8baf62' - 'f11852b97583610f3dbb669ebc3e21bc' - '6b771c8a81dd90b45e8a79afa0e5bbfd' + 'fix-crash-in-assistant.patch') +md5sums=('89c5ecba180cae74c66260ac732dc5cb' + 'f1837a03fd0ebbd2da58975845f278e3' + '480fea1ed076992b688373c8db274be0' + '5595c24d5bb942c21e3a4d299e6d0bf1' + '824a3b77a25e98567f640e0441ccdebc' 'c439c7731c25387352d8453ca7574971' - '57590084078b6379f0501f7728b02ae2' - '94e9e433342018bf35e8d6d968b7432c' - '71579422635e9343665de1c1ba5a3f91' - 'cd550cd628d10459128ca5f231ca6d3f') + '57590084078b6379f0501f7728b02ae2') build() { cd ${_pkgfqn} @@ -43,15 +37,6 @@ build() { # (FS#29469) patch -p1 -i "${srcdir}"/fix-crash-in-assistant.patch - # Security fix - patch -p1 -i "${srcdir}"/disable-ssl-compression.patch - - # QTBUG#27322 - patch -p1 -i "${srcdir}"/fix-qtscript-crash.patch - - # QTBUG#27122 - patch -p1 -i "${srcdir}"/qsortfilterproxymodel.patch - export QT4DIR="${srcdir}"/${_pkgfqn} export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} diff --git a/extra/qt/assistant.desktop b/extra/qt/assistant.desktop index a9e98c44b..37ff84b44 100644 --- a/extra/qt/assistant.desktop +++ b/extra/qt/assistant.desktop @@ -4,6 +4,5 @@ Comment=Shows Qt documentation and examples Exec=/usr/bin/assistant Icon=assistant Terminal=false -Encoding=UTF-8 Type=Application Categories=Qt;Development;Documentation; diff --git a/extra/qt/designer.desktop b/extra/qt/designer.desktop index 9b7b6e9aa..f0b381d02 100644 --- a/extra/qt/designer.desktop +++ b/extra/qt/designer.desktop @@ -6,6 +6,5 @@ Exec=/usr/bin/designer Icon=designer MimeType=application/x-designer; Terminal=false -Encoding=UTF-8 Type=Application Categories=Qt;Development; diff --git a/extra/qt/linguist.desktop b/extra/qt/linguist.desktop index 8cbe86599..3b203e0bd 100644 --- a/extra/qt/linguist.desktop +++ b/extra/qt/linguist.desktop @@ -5,6 +5,5 @@ Exec=/usr/bin/linguist Icon=linguist MimeType=text/vnd.trolltech.linguist;application/x-linguist; Terminal=false -Encoding=UTF-8 Type=Application Categories=Qt;Development; diff --git a/extra/qt/qtconfig.desktop b/extra/qt/qtconfig.desktop index 46dcf9e3d..95770ff6a 100644 --- a/extra/qt/qtconfig.desktop +++ b/extra/qt/qtconfig.desktop @@ -4,7 +4,6 @@ Comment=Configure Qt behavior, styles, fonts Exec=/usr/bin/qtconfig Icon=qtlogo Terminal=false -Encoding=UTF-8 Type=Application Categories=Qt;Settings; NoDisplay=true |