diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-26 13:37:37 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-26 13:37:37 +0200 |
commit | 978b7973febf9b1fee624681f33c805e4f04f5dd (patch) | |
tree | 73ae74deb425418dce2090020d169406e71d5b51 /extra/qt | |
parent | 6646a7a49f1ff4228204490260b3e0f0e12b5d3c (diff) | |
parent | a5721a07196cf00c26ea1bfb651aab756d202ccb (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/lxappearance/PKGBUILD
community/menu-cache/PKGBUILD
extra/kdemultimedia/PKGBUILD
extra/llvm/PKGBUILD
extra/qt/PKGBUILD
extra/qtwebkit/PKGBUILD
extra/sqlite/PKGBUILD
extra/wireshark/PKGBUILD
multilib/lib32-llvm/PKGBUILD
testing/mdadm/PKGBUILD
testing/udev/PKGBUILD
Diffstat (limited to 'extra/qt')
-rw-r--r-- | extra/qt/PKGBUILD | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD index be87f4b35..6c5d12d48 100644 --- a/extra/qt/PKGBUILD +++ b/extra/qt/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 156133 2012-04-14 10:06:17Z andrea $ +# $Id: PKGBUILD 159391 2012-05-23 12:59:51Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgbase=qt pkgname=('qt' 'qt-private-headers') -pkgver=4.8.1 -pkgrel=2 +pkgver=4.8.2 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://qt-project.org/' license=('GPL3' 'LGPL') @@ -15,23 +15,17 @@ makedepends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'glib2' 'dbu 'mysql' 'unixodbc' 'cups' 'gtk2') options=('!libtool') _pkgfqn="${pkgbase}-everywhere-opensource-src-${pkgver}" -source=("http://get.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz" +source=("http://releases.qt-project.org/qt4/source/${_pkgfqn}.tar.gz" 'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qtconfig.desktop' - 'gcc47.patch' 'improve-cups-support.patch' - 'fix-buffer-overflow.patch' - 'fix-cursortox-crash.patch' 'declarative-fix-sigbus.patch') -md5sums=('7960ba8e18ca31f0c6e4895a312f92ff' +md5sums=('3c1146ddf56247e16782f96910a8423b' 'fc211414130ab2764132e7370f8e5caa' '85179f5e0437514f8639957e1d8baf62' 'f11852b97583610f3dbb669ebc3e21bc' '6b771c8a81dd90b45e8a79afa0e5bbfd' - 'd8a0e81075b290ddc18ecd33b9b7ee22' 'c439c7731c25387352d8453ca7574971' - 'c493dca3c11fffb9af6719c6735cb0d2' - '13171b6aec2f240be05feb968178f70e' 'aac963d05a9d5733e2bfce9e26607f51') build() { @@ -40,14 +34,6 @@ build() { # MIPS N32-specific fix, shouldn't affect correctness on other platforms. patch -Np1 -i "${srcdir}/declarative-fix-sigbus.patch" - patch -p1 -i "${srcdir}"/gcc47.patch - - # (FS#29158) - patch -p1 -i "${srcdir}"/fix-buffer-overflow.patch - - # (FS#29402) (QTBUG#24718) - patch -p1 -i "${srcdir}"/fix-cursortox-crash.patch - # (FS#28381) (KDEBUG#180051) patch -p1 -i "${srcdir}"/improve-cups-support.patch |