diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-06-26 03:25:35 +0000 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-06-26 03:25:35 +0000 |
commit | 76b667b6360f6f7e97f13392cf156f197dc4017b (patch) | |
tree | 3299ec5921d2da42ec5563b4ced54e65aa2c058b /extra | |
parent | 7d53ccd018d0e86e7aa3a0c0b1a092ce8b206041 (diff) |
Thu Jun 26 03:22:36 UTC 2014
Diffstat (limited to 'extra')
-rw-r--r-- | extra/banshee/PKGBUILD | 7 | ||||
-rw-r--r-- | extra/ddrescue/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/mono/Microsoft.Portable.Common.targets | 4 | ||||
-rw-r--r-- | extra/mono/PKGBUILD | 21 | ||||
-rw-r--r-- | extra/mono/build_fix.patch | 25 | ||||
-rw-r--r-- | extra/monodevelop-debugger-gdb/PKGBUILD | 10 | ||||
-rw-r--r-- | extra/monodevelop/PKGBUILD | 10 | ||||
-rw-r--r-- | extra/qt5/PKGBUILD | 17 | ||||
-rw-r--r-- | extra/qt5/QTBUG-39047.patch | 57 | ||||
-rw-r--r-- | extra/whois/PKGBUILD | 6 |
10 files changed, 69 insertions, 94 deletions
diff --git a/extra/banshee/PKGBUILD b/extra/banshee/PKGBUILD index 03a547c62..add9ed3ee 100644 --- a/extra/banshee/PKGBUILD +++ b/extra/banshee/PKGBUILD @@ -4,15 +4,14 @@ pkgname=banshee pkgver=2.6.2 -pkgrel=3 +pkgrel=4 pkgdesc="Music management and playback for GNOME" arch=('i686' 'x86_64') url="http://banshee.fm/" license=('MIT') -depends=(libxxf86vm gst-plugins-base-libs mono-addins dbus-sharp-glib webkitgtk2 libsoup-gnome gdata-sharp taglib-sharp gudev-sharp gkeyfile-sharp gconf-sharp libmtp libgpod mono-zeroconf desktop-file-utils hicolor-icon-theme media-player-info gst-plugins-bad mono-upnp) +depends=(libxxf86vm gst-plugins-base-libs mono-addins dbus-sharp-glib webkitgtk2 libsoup-gnome gdata-sharp taglib-sharp gudev-sharp gkeyfile-sharp gconf-sharp libmtp libgpod mono-zeroconf desktop-file-utils hicolor-icon-theme media-player-info gst-plugins-bad mono-upnp gst-plugins-good) makedepends=('intltool' 'gnome-doc-utils' 'gtk-sharp-beans' 'gnome-common') -optdepends=('gst-plugins-good: Extra media codecs' - 'gst-plugins-ugly: Extra media codecs' +optdepends=('gst-plugins-ugly: Extra media codecs' 'gst-libav: Extra media codecs' 'brasero: CD burning') install=$pkgname.install diff --git a/extra/ddrescue/PKGBUILD b/extra/ddrescue/PKGBUILD index 3deeb3bd5..c7f04a95e 100644 --- a/extra/ddrescue/PKGBUILD +++ b/extra/ddrescue/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 191219 2013-07-21 14:09:43Z schiv $ +# $Id: PKGBUILD 215440 2014-06-25 16:26:12Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=ddrescue -pkgver=1.17 +pkgver=1.18.1 pkgrel=1 pkgdesc="GNU data recovery tool" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ depends=('gcc-libs') install=$pkgname.install source=("http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.lz" "http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.lz.sig") -md5sums=('564469370fe70cd9ac280b15e1addc50' +md5sums=('c3c745003a0da42ee8b96627af7a9de6' 'SKIP') build() { diff --git a/extra/mono/Microsoft.Portable.Common.targets b/extra/mono/Microsoft.Portable.Common.targets new file mode 100644 index 000000000..82bea1e6d --- /dev/null +++ b/extra/mono/Microsoft.Portable.Common.targets @@ -0,0 +1,4 @@ +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\Microsoft.Portable.Core.props" /> + <Import Project="..\Microsoft.Portable.Core.targets" /> +</Project> diff --git a/extra/mono/PKGBUILD b/extra/mono/PKGBUILD index 93c7f5000..b032eb485 100644 --- a/extra/mono/PKGBUILD +++ b/extra/mono/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 207447 2014-03-09 13:14:56Z bpiotrowski $ +# $Id: PKGBUILD 215454 2014-06-25 21:05:54Z daniel $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: Brice Carpentier <brice@dlfp.org> pkgname=mono -pkgver=3.2.8 +pkgver=3.4.0 pkgrel=1 pkgdesc="Free implementation of the .NET platform including runtime and compiler" arch=(i686 x86_64) @@ -15,13 +15,21 @@ provides=('monodoc') conflicts=('monodoc') source=(http://download.mono-project.com/sources/mono/${pkgname}-${pkgver}.tar.bz2 mono.binfmt.d - sgen_fix.patch) -md5sums=('1075f99bd8a69890af9e30309728e684' + sgen_fix.patch + build_fix.patch + Microsoft.Portable.Common.targets) +md5sums=('698024a40ee0721c2a24c45be2e39f28' 'b9ef8a65fea497acf176cca16c1e2402' - '8a700b94bff7a913f920e95890d2fb4c') + '8a700b94bff7a913f920e95890d2fb4c' + '30a5af1a4ff50b98f9e73cc2ae554115' + 'acbffadb0ac233c494b40dd5e79209a5') build() { cd "${srcdir}"/${pkgname}-${pkgver} + + patch -p1 < ../build_fix.patch + cp ../Microsoft.Portable.Common.targets mcs/tools/xbuild/targets/ + # build mono ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -29,7 +37,8 @@ build() { --sbindir=/usr/bin \ --disable-quiet-build \ --disable-system-aot \ - --disable-static + --disable-static \ + --with-mcs-docs=no make # build jay diff --git a/extra/mono/build_fix.patch b/extra/mono/build_fix.patch new file mode 100644 index 000000000..13e864b64 --- /dev/null +++ b/extra/mono/build_fix.patch @@ -0,0 +1,25 @@ +From c68c72144d7b2a0516276137855d4508a3f59a17 Mon Sep 17 00:00:00 2001 +From: Michael Hutchinson <m.j.hutchinson@gmail.com> +Date: Tue, 1 Apr 2014 17:21:51 -0400 +Subject: [PATCH] [xbuild] Include PCL common targets in tarball + +BXC18690 - Microsoft.Portable.Common.targets is missing in mono 3.4.0 tarball +--- + mcs/tools/xbuild/Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/mcs/tools/xbuild/Makefile b/mcs/tools/xbuild/Makefile +index c3a5d6a..31d5329 100644 +--- a/mcs/tools/xbuild/Makefile ++++ b/mcs/tools/xbuild/Makefile +@@ -93,6 +93,7 @@ EXTRA_DISTFILES = \ + frameworks/net_4.5.xml \ + targets/Microsoft.Portable.CSharp_4.0.targets \ + targets/Microsoft.Portable.CSharp_4.5.targets \ ++ targets/Microsoft.Portable.Common.targets \ + targets/Microsoft.Portable.Core.targets \ + targets/Microsoft.Portable.Core.props \ + targets/Microsoft.WebApplication.targets \ +-- +1.9.3 + diff --git a/extra/monodevelop-debugger-gdb/PKGBUILD b/extra/monodevelop-debugger-gdb/PKGBUILD index 54592ad81..0da28832f 100644 --- a/extra/monodevelop-debugger-gdb/PKGBUILD +++ b/extra/monodevelop-debugger-gdb/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 206315 2014-02-23 20:59:50Z daniel $ +# $Id: PKGBUILD 215461 2014-06-25 21:33:52Z daniel $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> pkgname=monodevelop-debugger-gdb -pkgver=4.2.2 +pkgver=5.0.1 pkgrel=1 pkgdesc="Mono Debugger support" arch=('i686' 'x86_64') # also "any" pkg? url="http://monodevelop.com" license=('GPL') -depends=('monodevelop>=4.2.2' 'gdb') +depends=('monodevelop>=5.0.1' 'gdb') makedepends=('mono') options=('!makeflags') -source=(http://origin-download.mono-project.com/sources/$pkgname/$pkgname-$pkgver-2.tar.bz2) -md5sums=('c18d13045a9dadf3239bc00a76d5ad8c') +source=(http://origin-download.mono-project.com/sources/$pkgname/$pkgname-$pkgver-0.tar.bz2) +md5sums=('4292cb70a2a4cab1181d8fba922b8c77') build() { export MONO_SHARED_DIR="${srcdir}/.wabi" diff --git a/extra/monodevelop/PKGBUILD b/extra/monodevelop/PKGBUILD index 05a947424..8d4ac1f74 100644 --- a/extra/monodevelop/PKGBUILD +++ b/extra/monodevelop/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 206317 2014-02-23 21:00:08Z daniel $ +# $Id: PKGBUILD 215459 2014-06-25 21:33:31Z daniel $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: Timm Preetz <timm@preetz.us> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=monodevelop -pkgver=4.2.2 +pkgver=5.0.1 pkgrel=1 pkgdesc="An IDE primarily designed for C# and other .NET languages" @@ -13,13 +13,13 @@ arch=('i686' 'x86_64') url="http://www.monodevelop.com" license=('GPL') -depends=('mono>=2.10.8' 'mono-addins>=0.6.2' 'gnome-sharp' 'desktop-file-utils' 'hicolor-icon-theme') +depends=('mono>=3.2.8' 'mono-addins>=0.6.2' 'gnome-sharp' 'desktop-file-utils' 'hicolor-icon-theme') makedepends=('rsync' 'git') options=(!makeflags) install=monodevelop.install -source=(http://origin-download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}-2.tar.bz2 +source=(http://origin-download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}-0.tar.bz2 monodevelop-core-addins.pc.in.patch) -md5sums=('34bf8adb9b5b6a798e65f3c0ce4edced' +md5sums=('5f68aa384c7aa473fdd36da2f70117b4' '8466d032735130e37d4091a793a7966c') build() { diff --git a/extra/qt5/PKGBUILD b/extra/qt5/PKGBUILD index ebc217b1c..28ba0da38 100644 --- a/extra/qt5/PKGBUILD +++ b/extra/qt5/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 213668 2014-05-27 22:18:41Z andrea $ +# $Id: PKGBUILD 215457 2014-06-25 21:23:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=qt5 @@ -23,8 +23,8 @@ pkgname=('qt5-base' 'qt5-websockets' 'qt5-x11extras' 'qt5-xmlpatterns') -pkgver=5.3.0 -pkgrel=3 +pkgver=5.3.1 +pkgrel=1 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL' 'FDL' 'custom') @@ -38,15 +38,13 @@ groups=('qt' 'qt5') _pkgfqn="qt-everywhere-opensource-src-${pkgver}" source=("http://download.qt-project.org/official_releases/qt/5.3/${pkgver}/single/${_pkgfqn}.tar.xz" 'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qdbusviewer.desktop' - 'use-python2.patch' - 'QTBUG-39047.patch') -md5sums=('f00ac7930e3b1b2b364dedcd15acc142' + 'use-python2.patch') +md5sums=('f9a24a0d5645efa0715b6ff0fa13d60f' 'b2897dd6a2967bccf8f10e397aafee55' '9638a78e502719ef8fe5f8d10d0361a9' '188da8f4c87316e730ebf1c6217bf5a0' '322b419b16c75d4de0ee7ad0a246caa1' - 'a378deccf363bd6079da459c89aff7b9' - '819813c53ab11b2341baf54afbc37e37') + 'a378deccf363bd6079da459c89aff7b9') prepare() { cd ${_pkgfqn} @@ -60,9 +58,6 @@ prepare() { sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ $(find . -name '*.py') - - cd qtdeclarative - patch -p1 -i "${srcdir}"/QTBUG-39047.patch } build() { diff --git a/extra/qt5/QTBUG-39047.patch b/extra/qt5/QTBUG-39047.patch deleted file mode 100644 index ee6e4ad40..000000000 --- a/extra/qt5/QTBUG-39047.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 009ad875f89d7d7bc4447e18c2fbbd485a75e0b5 Mon Sep 17 00:00:00 2001 -From: Oleg Shparber <trollixx@gmail.com> -Date: Mon, 19 May 2014 00:53:39 -0700 -Subject: [PATCH] Fix improper antialiasing property behavior - -For components antialiased by default the property was returned -as false if default true value was set to true again. - -Task-number: QTBUG-39047 -Change-Id: I16960a12b6d38a0d9e487fc6612610c39c4949d4 -Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com> ---- - src/quick/items/qquickitem.cpp | 8 +++++--- - tests/auto/quick/qquicktext/tst_qquicktext.cpp | 7 +++++++ - 2 files changed, 12 insertions(+), 3 deletions(-) - -diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp -index 3f0dae8..ef2eac4 100644 ---- a/src/quick/items/qquickitem.cpp -+++ b/src/quick/items/qquickitem.cpp -@@ -5691,10 +5691,12 @@ void QQuickItem::setAntialiasing(bool aa) - { - Q_D(QQuickItem); - -- bool changed = (aa != antialiasing()); -- d->antialiasingValid = true; -+ if (!d->antialiasingValid) { -+ d->antialiasingValid = true; -+ d->antialiasing = d->implicitAntialiasing; -+ } - -- if (!changed) -+ if (aa == d->antialiasing) - return; - - d->antialiasing = aa; -diff --git a/tests/auto/quick/qquicktext/tst_qquicktext.cpp b/tests/auto/quick/qquicktext/tst_qquicktext.cpp -index 0b69981..d36c55d 100644 ---- a/tests/auto/quick/qquicktext/tst_qquicktext.cpp -+++ b/tests/auto/quick/qquicktext/tst_qquicktext.cpp -@@ -1334,6 +1334,13 @@ void tst_qquicktext::antialiasing() - text->resetAntialiasing(); - QCOMPARE(text->antialiasing(), true); - QCOMPARE(spy.count(), 2); -+ -+ // QTBUG-39047 -+ component.setData("import QtQuick 2.0\n Text { antialiasing: true }", QUrl()); -+ object.reset(component.create()); -+ text = qobject_cast<QQuickText *>(object.data()); -+ QVERIFY(text); -+ QCOMPARE(text->antialiasing(), true); - } - - void tst_qquicktext::weight() --- -1.7.1 - diff --git a/extra/whois/PKGBUILD b/extra/whois/PKGBUILD index 09901f926..bfcd7465b 100644 --- a/extra/whois/PKGBUILD +++ b/extra/whois/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 212129 2014-05-08 15:21:13Z giovanni $ +# $Id: PKGBUILD 215436 2014-06-25 12:58:23Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=whois -pkgver=5.1.2 +pkgver=5.1.3 pkgrel=1 pkgdesc="The whois client by Marco d'Itri" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('libidn') makedepends=('perl') backup=('etc/whois.conf') source=("http://ftp.debian.org/debian/pool/main/w/whois/${pkgname}_${pkgver}.tar.xz") -md5sums=('a103596a4da3f1795fccbd9432c59ec9') +md5sums=('2817d6065bbd8f274a3e5240e0bf7dd5') build() { cd "${srcdir}/${pkgname}-${pkgver}" |