diff options
Diffstat (limited to 'extra')
137 files changed, 2524 insertions, 759 deletions
diff --git a/extra/alsa-tools/PKGBUILD b/extra/alsa-tools/PKGBUILD index dbdca4980..9c19f436c 100644 --- a/extra/alsa-tools/PKGBUILD +++ b/extra/alsa-tools/PKGBUILD @@ -5,7 +5,8 @@ pkgname=alsa-tools pkgver=1.0.27 -pkgrel=4 +pkgrel=5 +pkgdesc="Advanced tools for certain sound cards" arch=('i686' 'x86_64' 'mips64el') url="http://alsa-project.org/" license=('GPL') diff --git a/extra/amarok/PKGBUILD b/extra/amarok/PKGBUILD index 781d88be9..86fc0ad57 100644 --- a/extra/amarok/PKGBUILD +++ b/extra/amarok/PKGBUILD @@ -1,12 +1,11 @@ -# $Id: PKGBUILD 191886 2013-08-01 06:53:20Z bpiotrowski $ +# $Id: PKGBUILD 193110 2013-08-16 13:35:31Z andrea $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=amarok -replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree') -pkgver=2.7.1 -pkgrel=3 +pkgver=2.8.0 +pkgrel=1 pkgdesc="The powerful music player for KDE" arch=("i686" "x86_64" 'mips64el') url="http://amarok.kde.org/" @@ -22,16 +21,11 @@ optdepends=("libgpod: support for Apple iPod audio devices" "libmygpo-qt: gpodder.net Internet Service" "clamz: allow to download songs from Amazon.com") install="${pkgname}.install" -source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" - 'kde411.patch') -sha1sums=('445eba6aaadface756410cf0f568a3770d437d2d' - 'c2fd0153ec622fccac47ebd31a1b0548c6222541') +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('e76ccd53c05d57f9457d74cd08c2c41383c00937') prepare() { mkdir build - - cd ${pkgname}-${pkgver} - patch -p1 -i "${srcdir}"/kde411.patch } build() { diff --git a/extra/amarok/kde411.patch b/extra/amarok/kde411.patch deleted file mode 100644 index 8099a4432..000000000 --- a/extra/amarok/kde411.patch +++ /dev/null @@ -1,35 +0,0 @@ -commit e899704b3db4af2ff228eb0d4dbbec05fb9a2448 -Author: Hrvoje Senjan <hrvoje.senjan@gmail.com> -Date: Mon Jun 10 09:26:37 2013 +0200 - - Remove usage of (fake) Amarok-Mockup theme - - This is due to https://bugs.kde.org/show_bug.cgi?id=320855 - Amarok-Mockup is unused, as far i can see, and also makes Amarok crash with kdelibs master/4.11 - If it is still needed, or there is a better solution, i'll discard the review... - - From 6b85a2899a30db5acebee92182a67778499a8d9e Mon Sep 17 00:00:00 2001 - From: Hrvoje Senjan <hrvoje.senjan@gmail.com> - Date: Sun, 9 Jun 2013 19:55:58 +0200 - Subject: [PATCH 1/1] Kill Amarok-Mockup - - BUG: 320855 - FIXED-IN: 2.8 - REVIEW: 110917 - -diff --git a/src/context/ContextView.cpp b/src/context/ContextView.cpp -index f61518f..152f8da 100644 ---- a/src/context/ContextView.cpp -+++ b/src/context/ContextView.cpp -@@ -78,11 +78,6 @@ ContextView::ContextView( Plasma::Containment *cont, Plasma::Corona *corona, QWi - p.setColor( QPalette::Base, c ); - setPalette( p ); - -- PERF_LOG( "Accessing Plasma::Theme" ); -- // here we initialize all the Plasma paths to Amarok paths -- Plasma::Theme::defaultTheme()->setUseGlobalSettings( false ); -- Theme::defaultTheme()->setThemeName( "Amarok-Mockup" ); -- PERF_LOG( "Access to Plasma::Theme complete" ) - contextScene()->setAppletMimeType( "text/x-amarokappletservicename" ); - - cont->setPos( 0, 0 ); diff --git a/extra/bigloo/PKGBUILD b/extra/bigloo/PKGBUILD index 8bcb8f06d..f8cdd72ca 100644 --- a/extra/bigloo/PKGBUILD +++ b/extra/bigloo/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 175916 2013-01-24 12:57:16Z juergen $ +# $Id: PKGBUILD 192494 2013-08-13 09:04:03Z juergen $ # Maintainer: Jürgen Hötzel <juergen@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> # Contributor: Kevin Piche <kevin@archlinux.org> pkgname=bigloo -_pkgver=4.0a +_pkgver=4.0b pkgver=${_pkgver/-/_} pkgrel=1 pkgdesc="Fast scheme compiler" @@ -17,7 +17,7 @@ optdepends=('emacs' 'java-environment' 'zip' 'sqlite' 'alsa-lib' 'flac' 'avahi') options=('!makeflags') install=bigloo.install source=(ftp://ftp-sop.inria.fr/indes/fp/Bigloo/${pkgname}${_pkgver}.tar.gz) -md5sums=('e98c882a79d5fa1373aa4da6b61c55c8') +md5sums=('5e66d9516a877f2b892d191bbe809379') build() { cd "${srcdir}/${pkgname}${_pkgver}" diff --git a/extra/bzr/PKGBUILD b/extra/bzr/PKGBUILD index d0f0ec89e..2b8e2d478 100644 --- a/extra/bzr/PKGBUILD +++ b/extra/bzr/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 168990 2012-10-17 10:19:13Z allan $ +# $Id: PKGBUILD 192090 2013-08-05 19:19:16Z eric $ # Maintainer : # Contributor: Hugo Doria <hugo@archlinux.org> pkgname=bzr -pkgver=2.5.1 -pkgrel=2 +pkgver=2.6.0 +pkgrel=1 pkgdesc="A decentralized revision control system (bazaar)" arch=('i686' 'x86_64' 'mips64el') url="http://bazaar.canonical.com/en/" @@ -12,19 +12,23 @@ license=('GPL') depends=('python2') optdepends=('python2-paramiko: for sftp support') source=("http://launchpad.net/${pkgname}/${pkgver%.*}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz"{,.sig}) -md5sums=('ac5079858364a046071000d5cdccb67b' - 'c83dd08dd2c3e27edbab873500d7d6eb') +sha1sums=('5eb4d0367c6d83396250165da5bb2c8a9f378293' + 'SKIP') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + cd ${pkgname}-${pkgver} sed -i 's|man/man1|share/man/man1|' setup.py sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \ bzrlib/{plugins/bash_completion/bashcomp.py,tests/ssl_certs/create_ssls.py,patiencediff.py,_patiencediff_py.py} +} + +build() { + cd ${pkgname}-${pkgver} python2 setup.py build } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 # bash-completion diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD index 57b68aa52..1f09c96b3 100644 --- a/extra/calligra/PKGBUILD +++ b/extra/calligra/PKGBUILD @@ -1,24 +1,24 @@ -# $Id: PKGBUILD 192008 2013-08-04 04:49:59Z lcarlier $ +# $Id: PKGBUILD 192059 2013-08-05 14:17:28Z andyrtr $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=calligra -pkgname=('calligra-filters' - 'calligra-libs' - 'calligra-plugins' - 'calligra-tools' +pkgname=('calligra-braindump' + 'calligra-extras' + 'calligra-filters' + 'calligra-flow' + 'calligra-handbook' 'calligra-karbon' 'calligra-kexi' - 'calligra-plan' - 'calligra-stage' 'calligra-krita' + 'calligra-libs' + 'calligra-plan' + 'calligra-plugins' 'calligra-sheets' - 'calligra-words' - 'calligra-handbook' - 'calligra-braindump' - 'calligra-flow') -pkgver=2.6.4 -pkgrel=2 + 'calligra-stage' + 'calligra-words') +pkgver=2.7.1 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') @@ -28,8 +28,8 @@ makedepends=('cmake' 'automoc4' 'boost' 'kdepimlibs' 'eigen2' 'kdeedu-marble' 'openjpeg' 'kdegraphics-okular' 'pstoedit') [ "$CARCH" != "mips64el" ] && makedepends+=('vc') groups=('calligra') -source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2") -md5sums=('a38fdc882888469ea8b0dea949c05dda') +source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.xz") +md5sums=('9cf909ddf57ecb16d4370cc1062d0f7f') prepare() { mkdir build @@ -82,16 +82,8 @@ package_calligra-plugins() { cd "${srcdir}"/build/plugins make DESTDIR="${pkgdir}" install -} - -package_calligra-tools() { - pkgdesc="Tools for the Calligra office suite" - depends=('calligra-libs') - conflicts=('koffice-tools') - replaces=('koffice-tools') - install=calligra-tools.install - - cd "${srcdir}"/build/tools + + cd "${srcdir}"/build/3rdparty/kdchart make DESTDIR="${pkgdir}" install } @@ -224,3 +216,15 @@ package_calligra-flow() { cd "${srcdir}"/build/flow make DESTDIR="${pkgdir}" install } + +package_calligra-extras() { + pkgdesc="Calligra suite extras" + depends=('calligra-libs') + optdepends=('kdegraphics-okular') + conflicts=('calligra-tools') + replaces=('calligra-tools') + install=calligra-extras.install + + cd "${srcdir}"/build/extras + make DESTDIR="${pkgdir}" install +} diff --git a/extra/calligra/calligra-tools.install b/extra/calligra/calligra-extras.install index 6c87527e2..b8c7ebf27 100644 --- a/extra/calligra/calligra-tools.install +++ b/extra/calligra/calligra-extras.install @@ -1,5 +1,4 @@ post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null update-desktop-database -q } diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD index 73f595116..3e8043dc4 100644 --- a/extra/cmake/PKGBUILD +++ b/extra/cmake/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 189655 2013-07-04 07:18:16Z andrea $ +# $Id: PKGBUILD 192290 2013-08-09 19:48:53Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=cmake pkgver=2.8.11.2 -pkgrel=1 +pkgrel=2 pkgdesc="A cross-platform open-source make system" arch=('i686' 'x86_64' 'mips64el') url="http://www.cmake.org/" @@ -21,6 +21,9 @@ md5sums=('6f5d7b8e7534a5d9e1a7664ba63cf882' prepare() { cd ${pkgname}-${pkgver} patch -p1 -i "${srcdir}"/imagemagick.patch + sed -i 's/Magick++-6.Q16/Magick++-6.Q16 Magick++-6.Q16HDRI/' Modules/FindImageMagick.cmake + sed -i 's/MagickWand-6.Q16/MagickWand-6.Q16 MagickWand-6.Q16HDRI/' Modules/FindImageMagick.cmake + sed -i 's/MagickCore-6.Q16/MagickCore-6.Q16 MagickCore-6.Q16HDRI/' Modules/FindImageMagick.cmake } build() { diff --git a/extra/digikam/PKGBUILD b/extra/digikam/PKGBUILD index 634e8d8ec..3fbc98569 100644 --- a/extra/digikam/PKGBUILD +++ b/extra/digikam/PKGBUILD @@ -1,33 +1,24 @@ -# $Id: PKGBUILD 187093 2013-06-03 17:45:39Z andrea $ +# $Id: PKGBUILD 192477 2013-08-12 20:25:44Z eric $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgbase=digikam pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki') -pkgver=3.2.0 -pkgrel=2 +pkgver=3.3.0 +pkgrel=1 pkgdesc="Digital photo management application for KDE" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.digikam.org/" makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr' - 'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin' + 'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin' 'libgphoto2' 'cmake' 'automoc4' 'doxygen' 'lensfun' 'qt-gstreamer' 'imagemagick') -source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2" - "digikam-3.1.0-fixed-pngs.tar.gz") -noextract=("digikam-3.1.0-fixed-pngs.tar.gz") -sha1sums=('666f1d937dc033ddb880aed8a32e7943113d973f' - 'b0a1991e0df9b72c79562c719bc9d944a3b8bc78') +source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('ecf8d9eca918059cdd90ef3538295ee9873fb55f') prepare() { mkdir build - - cd ${pkgname}-${pkgver} - - # Fix invalid PNG images to work with libpng 1.6 - # https://bugs.kde.org/show_bug.cgi?id=319350 - tar xf "${srcdir}/digikam-3.1.0-fixed-pngs.tar.gz" --strip-components=1 } build() { diff --git a/extra/digikam/digikam-3.1.0-fixed-pngs.tar.gz b/extra/digikam/digikam-3.1.0-fixed-pngs.tar.gz Binary files differdeleted file mode 100644 index cbd21446f..000000000 --- a/extra/digikam/digikam-3.1.0-fixed-pngs.tar.gz +++ /dev/null diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD index 841c951ac..c9f3fb2d2 100644 --- a/extra/dovecot/PKGBUILD +++ b/extra/dovecot/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188926 2013-06-25 16:51:14Z andyrtr $ +# $Id: PKGBUILD 192152 2013-08-06 14:10:47Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Paul Mattal <paul@mattal.com> # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com> @@ -8,7 +8,7 @@ # --->>> remember to rebuild/bump pigeonhole in one step <<<--- pkgname=dovecot -pkgver=2.2.4 +pkgver=2.2.5 pkgrel=1 pkgdesc="An IMAP and POP3 server written with security primarily in mind" arch=('i686' 'x86_64' 'mips64el') @@ -24,7 +24,7 @@ options=('!libtool') install=$pkgname.install source=(http://dovecot.org/releases/2.2/${pkgname}-${pkgver}.tar.gz{,.sig} dovecot.tmpfilesd) -md5sums=('984cfc921a83c580c52c86e128e9dac2' +md5sums=('0096442e2a1739b1b7997a833248a263' 'SKIP' '342a28251d40f983c98c0d1f1bf3d07d') diff --git a/extra/dvdauthor/PKGBUILD b/extra/dvdauthor/PKGBUILD index faa374c8c..13143c008 100644 --- a/extra/dvdauthor/PKGBUILD +++ b/extra/dvdauthor/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184370 2013-05-06 19:36:57Z foutrelis $ +# $Id: PKGBUILD 192473 2013-08-12 20:25:40Z eric $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Travis Willard <travisw@wmpub.ca> # Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com> @@ -6,7 +6,7 @@ pkgname=dvdauthor pkgver=0.7.1 -pkgrel=5 +pkgrel=6 pkgdesc="DVD authoring tools" arch=('i686' 'x86_64' 'mips64el') url="http://dvdauthor.sourceforge.net/" diff --git a/extra/ecl/PKGBUILD b/extra/ecl/PKGBUILD index 4b47eeb56..263e734cf 100644 --- a/extra/ecl/PKGBUILD +++ b/extra/ecl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 180165 2013-03-18 13:33:10Z juergen $ +# $Id: PKGBUILD 192491 2013-08-13 08:44:20Z juergen $ # Contributor: John Proctor <jproctor@prium.net> # Maintainer: juergen <juergen@archlinux.org> pkgname=ecl -pkgver=12.12.1 +pkgver=13.5.1 pkgrel=1 pkgdesc="Embeddable Common Lisp" arch=('i686' 'x86_64' 'mips64el') @@ -13,8 +13,8 @@ depends=('bash' 'gmp') makedepends=('texinfo') provides=('common-lisp' 'cl-asdf') options=('!makeflags') -source=(http://downloads.sourceforge.net/project/ecls/ecls/12.12/ecl-${pkgver}.tgz) -md5sums=('014856bdfe265672f9d4b86a060a7aba') +source=(http://downloads.sourceforge.net/project/ecls/ecls/13.5/ecl-${pkgver}.tgz) +md5sums=('f6bb59d9383c51fc94e1c7ca5cf1c586') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/emacs/PKGBUILD b/extra/emacs/PKGBUILD index a7d6139c7..9092bf044 100644 --- a/extra/emacs/PKGBUILD +++ b/extra/emacs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 191914 2013-08-01 06:59:43Z bpiotrowski $ +# $Id: PKGBUILD 192474 2013-08-12 20:25:41Z eric $ # Maintainer: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Renchi Raju <renchi@green.tam.uiuc.edu> pkgname=emacs pkgver=24.3 -pkgrel=3 +pkgrel=4 pkgdesc="The extensible, customizable, self-documenting real-time display editor" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/emacs/emacs.html" diff --git a/extra/evas_generic_loaders/PKGBUILD b/extra/evas_generic_loaders/PKGBUILD index ea77f1bff..ca5461359 100644 --- a/extra/evas_generic_loaders/PKGBUILD +++ b/extra/evas_generic_loaders/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 188785 2013-06-20 07:31:01Z bpiotrowski $ +# $Id: PKGBUILD 192061 2013-08-05 14:17:30Z andyrtr $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=evas_generic_loaders pkgver=1.7.7 -pkgrel=3 +pkgrel=4 pkgdesc="Additional generic loaders for Evas" arch=('i686' 'x86_64' 'mips64el') url="http://www.enlightenment.org" diff --git a/extra/evolution-data-server/PKGBUILD b/extra/evolution-data-server/PKGBUILD index fbd713048..e6d5812df 100644 --- a/extra/evolution-data-server/PKGBUILD +++ b/extra/evolution-data-server/PKGBUILD @@ -1,22 +1,40 @@ -# $Id: PKGBUILD 191340 2013-07-23 17:20:12Z jgc $ +# $Id: PKGBUILD 192423 2013-08-11 13:38:21Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evolution-data-server -pkgver=3.8.4 +pkgver=3.8.5 pkgrel=1 pkgdesc="Centralized access to appointments and contacts" arch=('i686' 'x86_64' 'mips64el') depends=(gnome-online-accounts nss krb5 libgweather libical db libgdata) -makedepends=(intltool gperf gobject-introspection vala python2) +makedepends=(intltool gperf gobject-introspection vala python2 gnome-common) options=('!libtool') install=$pkgname.install url="http://www.gnome.org" license=(GPL) -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('0b9e725d36a4c63ccb15b4e0f92932764c9a335e84af2ebeeb4c182760ef3f6e') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz +fix-google-2fa-1.patch +fix-google-2fa-2.patch +fix-google-2fa-3.patch +fix-google-2fa-4.patch) +sha256sums=('73c4ecfed65651cc72966b90081d7b72f9b42573585bc89797efea65ccfdbd2a' + 'c1de9fe146f0512cf6c0219341c8409a9e4d955c3eb6a85f7d07183972b9328e' + '3e1c83dd00f01dfa0f9d67d2327de110b3e232a5f9a882ccce09a02392df7de6' + '9da8cccf504f40b8ee9e068b465cdf0a1a858999dd88d8e8e96f1e4cdffbf1e2' + '27022d00575ba1b9283d9420aa231c2770ff403b0b6c0442b6d679faefdbe00e') + + +prepare() { + cd "$pkgname-$pkgver" + patch -Np1 -i ../fix-google-2fa-1.patch + patch -Np1 -i ../fix-google-2fa-2.patch + patch -Np1 -i ../fix-google-2fa-3.patch + patch -Np1 -i ../fix-google-2fa-4.patch +} build() { cd "$pkgname-$pkgver" + autoreconf -fi ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --with-openldap=yes \ --libexecdir=/usr/lib/evolution-data-server \ diff --git a/extra/evolution-data-server/fix-google-2fa-1.patch b/extra/evolution-data-server/fix-google-2fa-1.patch new file mode 100644 index 000000000..530996898 --- /dev/null +++ b/extra/evolution-data-server/fix-google-2fa-1.patch @@ -0,0 +1,402 @@ +From fa0d18fcf2d8084d2a41f24f50f689eed8e3e241 Mon Sep 17 00:00:00 2001 +From: Matthew Barnes <mbarnes@redhat.com> +Date: Tue, 09 Jul 2013 18:23:04 +0000 +Subject: Add ESoupAuthBearer. + +SoupAuth subclass for use with OAuth 2.0 HTTP authentication. + +See http://tools.ietf.org/html/rfc6750 + +EBackends should use e_source_get_oauth2_access_token() to obtain +the access token and token expiry for an ESource, then pass them to +e_soup_auth_bearer_set_access_token(). +--- +diff --git a/docs/reference/libebackend/libebackend-docs.xml b/docs/reference/libebackend/libebackend-docs.xml +index fa9ab92..f54d3d6 100644 +--- a/docs/reference/libebackend/libebackend-docs.xml ++++ b/docs/reference/libebackend/libebackend-docs.xml +@@ -34,6 +34,7 @@ + <title>Miscellaneous Utilities</title> + <xi:include href="xml/e-file-cache.xml"/> + <xi:include href="xml/e-db3-utils.xml"/> ++ <xi:include href="xml/e-soup-auth-bearer.xml"/> + <xi:include href="xml/e-sqlite3-vfs.xml"/> + <xi:include href="xml/e-user-prompter.xml"/> + <xi:include href="xml/e-user-prompter-server.xml"/> +diff --git a/docs/reference/libebackend/libebackend-sections.txt b/docs/reference/libebackend/libebackend-sections.txt +index 6c604bf..189f002 100644 +--- a/docs/reference/libebackend/libebackend-sections.txt ++++ b/docs/reference/libebackend/libebackend-sections.txt +@@ -397,6 +397,24 @@ EServerSideSourcePrivate + </SECTION> + + <SECTION> ++<FILE>e-soup-auth-bearer</FILE> ++<TITLE>ESoupAuthBearer</TITLE> ++ESoupAuthBearer ++e_soup_auth_bearer_set_access_token ++<SUBSECTION Standard> ++E_SOUP_AUTH_BEARER ++E_IS_SOUP_AUTH_BEARER ++E_TYPE_SOUP_AUTH_BEARER ++E_SOUP_AUTH_BEARER_CLASS ++E_IS_SOUP_AUTH_BEARER_CLASS ++E_SOUP_AUTH_BEARER_GET_CLASS ++ESoupAuthBearerClass ++e_soup_auth_bearer_get_type ++<SUBSECTION Private> ++ESoupAuthBearerPrivate ++</SECTION> ++ ++<SECTION> + <FILE>e-source-registry-server</FILE> + <TITLE>ESourceRegistryServer</TITLE> + E_SOURCE_REGISTRY_SERVER_OBJECT_PATH +diff --git a/docs/reference/libebackend/libebackend.types b/docs/reference/libebackend/libebackend.types +index aeb38dc..1d7fe96 100644 +--- a/docs/reference/libebackend/libebackend.types ++++ b/docs/reference/libebackend/libebackend.types +@@ -15,6 +15,7 @@ e_module_get_type + e_oauth2_support_get_type + e_offline_listener_get_type + e_server_side_source_get_type ++e_soup_auth_bearer_get_type + e_source_registry_server_get_type + e_user_prompter_get_type + e_user_prompter_server_get_type +diff --git a/libebackend/Makefile.am b/libebackend/Makefile.am +index c77b470..783732e 100644 +--- a/libebackend/Makefile.am ++++ b/libebackend/Makefile.am +@@ -35,6 +35,7 @@ libebackend_1_2_la_CPPFLAGS = \ + $(E_BACKEND_CFLAGS) \ + $(GCR_BASE_CFLAGS) \ + $(GIO_UNIX_CFLAGS) \ ++ $(SOUP_CFLAGS) \ + $(CODE_COVERAGE_CFLAGS) \ + $(NULL) + +@@ -56,6 +57,7 @@ libebackend_1_2_la_SOURCES = \ + e-db3-utils.c \ + e-module.c \ + e-server-side-source.c \ ++ e-soup-auth-bearer.c \ + e-source-registry-server.c \ + e-sqlite3-vfs.c \ + e-user-prompter.c \ +@@ -71,6 +73,7 @@ libebackend_1_2_la_LIBADD = \ + $(SQLITE3_LIBS) \ + $(GCR_BASE_LIBS) \ + $(GIO_UNIX_LIBS) \ ++ $(SOUP_LIBS) \ + $(DB_LIBS) + + libebackend_1_2_la_LDFLAGS = \ +@@ -100,6 +103,7 @@ libebackendinclude_HEADERS = \ + e-dbhash.h \ + e-module.h \ + e-server-side-source.h \ ++ e-soup-auth-bearer.h \ + e-source-registry-server.h \ + e-sqlite3-vfs.h \ + e-user-prompter.h \ +diff --git a/libebackend/e-soup-auth-bearer.c b/libebackend/e-soup-auth-bearer.c +new file mode 100644 +index 0000000..1d5f804 +--- /dev/null ++++ b/libebackend/e-soup-auth-bearer.c +@@ -0,0 +1,196 @@ ++/* ++ * e-soup-auth-bearer.c ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) version 3. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with the program; if not, see <http://www.gnu.org/licenses/> ++ * ++ */ ++ ++/** ++ * SECTION: e-soup-auth-bearer ++ * @include: libebackend/libebackend.h ++ * @short_description: OAuth 2.0 support for libsoup ++ * ++ * #ESoupAuthBearer adds libsoup support for the use of bearer tokens in ++ * HTTP requests to access OAuth 2.0 protected resources, as defined in ++ * <ulink url="http://tools.ietf.org/html/rfc6750">RFC 6750</ulink>. ++ * ++ * An #EBackend should integrate #ESoupAuthBearer first by adding it as a ++ * feature to a #SoupSession's #SoupAuthManager, then from a #SoupSession ++ * #SoupSession::authenticate handler call e_source_get_oauth2_access_token() ++ * and pass the results to e_soup_auth_bearer_set_access_token(). ++ **/ ++ ++#include "e-soup-auth-bearer.h" ++ ++#include <time.h> ++ ++#define E_SOUP_AUTH_BEARER_GET_PRIVATE(obj) \ ++ (G_TYPE_INSTANCE_GET_PRIVATE \ ++ ((obj), E_TYPE_SOUP_AUTH_BEARER, ESoupAuthBearerPrivate)) ++ ++#define AUTH_STRENGTH 1 ++ ++#define EXPIRY_INVALID ((time_t) -1) ++ ++struct _ESoupAuthBearerPrivate { ++ gchar *access_token; ++ time_t expiry; ++}; ++ ++G_DEFINE_TYPE ( ++ ESoupAuthBearer, ++ e_soup_auth_bearer, ++ SOUP_TYPE_AUTH) ++ ++static gboolean ++e_soup_auth_bearer_is_expired (ESoupAuthBearer *bearer) ++{ ++ gboolean expired = FALSE; ++ ++ if (bearer->priv->expiry != EXPIRY_INVALID) ++ expired = (bearer->priv->expiry < time (NULL)); ++ ++ return expired; ++} ++ ++static void ++e_soup_auth_bearer_finalize (GObject *object) ++{ ++ ESoupAuthBearerPrivate *priv; ++ ++ priv = E_SOUP_AUTH_BEARER_GET_PRIVATE (object); ++ ++ g_free (priv->access_token); ++ ++ /* Chain up to parent's finalize() method. */ ++ G_OBJECT_CLASS (e_soup_auth_bearer_parent_class)->finalize (object); ++} ++ ++static gboolean ++e_soup_auth_bearer_update (SoupAuth *auth, ++ SoupMessage *message, ++ GHashTable *auth_header) ++{ ++ /* XXX Not sure what to do here. Discard the access token? */ ++ ++ return TRUE; ++} ++ ++static GSList * ++e_soup_auth_bearer_get_protection_space (SoupAuth *auth, ++ SoupURI *source_uri) ++{ ++ /* XXX Not sure what to do here. Need to return something. */ ++ ++ return g_slist_prepend (NULL, g_strdup ("")); ++} ++ ++static gboolean ++e_soup_auth_bearer_is_authenticated (SoupAuth *auth) ++{ ++ ESoupAuthBearer *bearer; ++ gboolean authenticated = FALSE; ++ ++ bearer = E_SOUP_AUTH_BEARER (auth); ++ ++ if (!e_soup_auth_bearer_is_expired (bearer)) ++ authenticated = (bearer->priv->access_token != NULL); ++ ++ return authenticated; ++} ++ ++static gchar * ++e_soup_auth_bearer_get_authorization (SoupAuth *auth, ++ SoupMessage *message) ++{ ++ ESoupAuthBearer *bearer; ++ ++ bearer = E_SOUP_AUTH_BEARER (auth); ++ ++ return g_strdup_printf ("Bearer %s", bearer->priv->access_token); ++} ++ ++static void ++e_soup_auth_bearer_class_init (ESoupAuthBearerClass *class) ++{ ++ GObjectClass *object_class; ++ SoupAuthClass *auth_class; ++ ++ g_type_class_add_private (class, sizeof (ESoupAuthBearerPrivate)); ++ ++ /* Keep the "e" prefix on private methods ++ * so we don't step on libsoup's namespace. */ ++ ++ object_class = G_OBJECT_CLASS (class); ++ object_class->finalize = e_soup_auth_bearer_finalize; ++ ++ auth_class = SOUP_AUTH_CLASS (class); ++ auth_class->scheme_name = "Bearer"; ++ auth_class->strength = AUTH_STRENGTH; ++ auth_class->update = e_soup_auth_bearer_update; ++ auth_class->get_protection_space = e_soup_auth_bearer_get_protection_space; ++ auth_class->is_authenticated = e_soup_auth_bearer_is_authenticated; ++ auth_class->get_authorization = e_soup_auth_bearer_get_authorization; ++} ++ ++static void ++e_soup_auth_bearer_init (ESoupAuthBearer *bearer) ++{ ++ bearer->priv = E_SOUP_AUTH_BEARER_GET_PRIVATE (bearer); ++ bearer->priv->expiry = EXPIRY_INVALID; ++} ++ ++/** ++ * e_soup_auth_bearer_set_access_token: ++ * @bearer: an #ESoupAuthBearer ++ * @access_token: an OAuth 2.0 access token ++ * @expires_in_seconds: expiry for @access_token, or 0 if unknown ++ * ++ * This function is analogous to soup_auth_authenticate() for "Basic" HTTP ++ * authentication, except it takes an OAuth 2.0 access token instead of a ++ * username and password. ++ * ++ * If @expires_in_seconds is greater than zero, soup_auth_is_authenticated() ++ * will return %FALSE after the given number of seconds have elapsed. ++ * ++ * Since: 3.10 ++ **/ ++void ++e_soup_auth_bearer_set_access_token (ESoupAuthBearer *bearer, ++ const gchar *access_token, ++ gint expires_in_seconds) ++{ ++ gboolean was_authenticated; ++ gboolean now_authenticated; ++ ++ g_return_if_fail (E_IS_SOUP_AUTH_BEARER (bearer)); ++ ++ was_authenticated = soup_auth_is_authenticated (SOUP_AUTH (bearer)); ++ ++ g_free (bearer->priv->access_token); ++ bearer->priv->access_token = g_strdup (access_token); ++ ++ if (expires_in_seconds > 0) ++ bearer->priv->expiry = time (NULL) + expires_in_seconds; ++ else ++ bearer->priv->expiry = EXPIRY_INVALID; ++ ++ now_authenticated = soup_auth_is_authenticated (SOUP_AUTH (bearer)); ++ ++ if (was_authenticated != now_authenticated) ++ g_object_notify ( ++ G_OBJECT (bearer), ++ SOUP_AUTH_IS_AUTHENTICATED); ++} ++ +diff --git a/libebackend/e-soup-auth-bearer.h b/libebackend/e-soup-auth-bearer.h +new file mode 100644 +index 0000000..83746a4 +--- /dev/null ++++ b/libebackend/e-soup-auth-bearer.h +@@ -0,0 +1,79 @@ ++/* ++ * e-soup-auth-bearer.h ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) version 3. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with the program; if not, see <http://www.gnu.org/licenses/> ++ * ++ */ ++ ++#if !defined (__LIBEBACKEND_H_INSIDE__) && !defined (LIBEBACKEND_COMPILATION) ++#error "Only <libebackend/libebackend.h> should be included directly." ++#endif ++ ++#ifndef E_SOUP_AUTH_BEARER_H ++#define E_SOUP_AUTH_BEARER_H ++ ++#include <libsoup/soup.h> ++ ++/* Standard GObject macros */ ++#define E_TYPE_SOUP_AUTH_BEARER \ ++ (e_soup_auth_bearer_get_type ()) ++#define E_SOUP_AUTH_BEARER(obj) \ ++ (G_TYPE_CHECK_INSTANCE_CAST \ ++ ((obj), E_TYPE_SOUP_AUTH_BEARER, ESoupAuthBearer)) ++#define E_SOUP_AUTH_BEARER_CLASS(cls) \ ++ (G_TYPE_CHECK_CLASS_CAST \ ++ ((cls), E_TYPE_SOUP_AUTH_BEARER, ESoupAuthBearerClass)) ++#define E_IS_SOUP_AUTH_BEARER(obj) \ ++ (G_TYPE_CHECK_INSTANCE_TYPE \ ++ ((obj), E_TYPE_SOUP_AUTH_BEARER)) ++#define E_IS_SOUP_AUTH_BEARER_CLASS(cls) \ ++ (G_TYPE_CHECK_CLASS_TYPE \ ++ ((cls), E_TYPE_SOUP_AUTH_BEARER)) ++#define E_SOUP_AUTH_BEARER_GET_CLASS(obj) \ ++ (G_TYPE_INSTANCE_GET_CLASS \ ++ ((obj), E_TYPE_SOUP_AUTH_BEARER, ESoupAuthBearerClass)) ++ ++G_BEGIN_DECLS ++ ++typedef struct _ESoupAuthBearer ESoupAuthBearer; ++typedef struct _ESoupAuthBearerClass ESoupAuthBearerClass; ++typedef struct _ESoupAuthBearerPrivate ESoupAuthBearerPrivate; ++ ++/** ++ * ESoupAuthBearer: ++ * ++ * Contains only private data that should be read and manipulated using the ++ * functions below. ++ * ++ * Since: 3.10 ++ **/ ++struct _ESoupAuthBearer { ++ SoupAuth parent; ++ ESoupAuthBearerPrivate *priv; ++}; ++ ++struct _ESoupAuthBearerClass { ++ SoupAuthClass parent_class; ++}; ++ ++GType e_soup_auth_bearer_get_type (void) G_GNUC_CONST; ++void e_soup_auth_bearer_set_access_token ++ (ESoupAuthBearer *bearer, ++ const gchar *access_token, ++ gint expires_in_seconds); ++ ++G_END_DECLS ++ ++#endif /* E_SOUP_AUTH_BEARER_H */ ++ +diff --git a/libebackend/libebackend.h b/libebackend/libebackend.h +index f7f0157..0aac5d4 100644 +--- a/libebackend/libebackend.h ++++ b/libebackend/libebackend.h +@@ -42,6 +42,7 @@ + #include <libebackend/e-oauth2-support.h> + #include <libebackend/e-offline-listener.h> + #include <libebackend/e-server-side-source.h> ++#include <libebackend/e-soup-auth-bearer.h> + #include <libebackend/e-source-registry-server.h> + #include <libebackend/e-sqlite3-vfs.h> + #include <libebackend/e-user-prompter.h> + diff --git a/extra/evolution-data-server/fix-google-2fa-2.patch b/extra/evolution-data-server/fix-google-2fa-2.patch new file mode 100644 index 000000000..d178cd0af --- /dev/null +++ b/extra/evolution-data-server/fix-google-2fa-2.patch @@ -0,0 +1,86 @@ +From 54e876d3fc25ec59c58beda915a8c9d1f8d5f101 Mon Sep 17 00:00:00 2001 +From: Matthew Barnes <mbarnes@redhat.com> +Date: Tue, 09 Jul 2013 21:06:16 +0000 +Subject: CalDAV: Add support for OAuth 2.0 authentication. + +--- +diff --git a/calendar/backends/caldav/e-cal-backend-caldav.c b/calendar/backends/caldav/e-cal-backend-caldav.c +index 58c70b6..58f0654 100644 +--- a/calendar/backends/caldav/e-cal-backend-caldav.c ++++ b/calendar/backends/caldav/e-cal-backend-caldav.c +@@ -968,6 +968,32 @@ parse_propfind_response (SoupMessage *message, + /* Authentication helpers for libsoup */ + + static void ++soup_authenticate_bearer (SoupSession *session, ++ SoupMessage *message, ++ SoupAuth *auth, ++ ESource *source) ++{ ++ gchar *access_token = NULL; ++ gint expires_in_seconds = -1; ++ GError *local_error = NULL; ++ ++ e_source_get_oauth2_access_token_sync ( ++ source, NULL, &access_token, ++ &expires_in_seconds, &local_error); ++ ++ e_soup_auth_bearer_set_access_token ( ++ E_SOUP_AUTH_BEARER (auth), ++ access_token, expires_in_seconds); ++ ++ if (local_error != NULL) { ++ g_warning ("%s: %s", G_STRFUNC, local_error->message); ++ g_error_free (local_error); ++ } ++ ++ g_free (access_token); ++} ++ ++static void + soup_authenticate (SoupSession *session, + SoupMessage *msg, + SoupAuth *auth, +@@ -985,8 +1011,14 @@ soup_authenticate (SoupSession *session, + extension_name = E_SOURCE_EXTENSION_AUTHENTICATION; + auth_extension = e_source_get_extension (source, extension_name); + ++ if (retrying) ++ return; ++ ++ if (E_IS_SOUP_AUTH_BEARER (auth)) { ++ soup_authenticate_bearer (session, msg, auth, source); ++ + /* do not send same password twice, but keep it for later use */ +- if (!retrying && cbdav->priv->password != NULL) { ++ } else if (cbdav->priv->password != NULL) { + gchar *user; + + user = e_source_authentication_dup_user (auth_extension); +@@ -5194,6 +5226,8 @@ cal_backend_caldav_constructed (GObject *object) + static void + e_cal_backend_caldav_init (ECalBackendCalDAV *cbdav) + { ++ SoupSessionFeature *feature; ++ + cbdav->priv = E_CAL_BACKEND_CALDAV_GET_PRIVATE (cbdav); + cbdav->priv->session = soup_session_sync_new (); + g_object_set ( +@@ -5203,6 +5237,16 @@ e_cal_backend_caldav_init (ECalBackendCalDAV *cbdav) + SOUP_SESSION_SSL_USE_SYSTEM_CA_FILE, TRUE, + NULL); + ++ /* XXX SoupAuthManager is public API as of libsoup 2.42, but ++ * this isn't worth bumping our libsoup requirement over. ++ * So get the SoupAuthManager GType by its type name. */ ++ feature = soup_session_get_feature ( ++ cbdav->priv->session, ++ g_type_from_name ("SoupAuthManager")); ++ ++ /* Add the "Bearer" auth type to support OAuth 2.0. */ ++ soup_session_feature_add_feature (feature, E_TYPE_SOUP_AUTH_BEARER); ++ + cbdav->priv->proxy = e_proxy_new (); + e_proxy_setup_proxy (cbdav->priv->proxy); + g_signal_connect (cbdav->priv->proxy, "changed", G_CALLBACK (proxy_settings_changed), cbdav->priv); + diff --git a/extra/evolution-data-server/fix-google-2fa-3.patch b/extra/evolution-data-server/fix-google-2fa-3.patch new file mode 100644 index 000000000..a5c6ca324 --- /dev/null +++ b/extra/evolution-data-server/fix-google-2fa-3.patch @@ -0,0 +1,48 @@ +From cc9fb7d15ce3983fc36487d2856e5fd14b341725 Mon Sep 17 00:00:00 2001 +From: Matthew Barnes <mbarnes@redhat.com> +Date: Tue, 09 Jul 2013 15:49:09 +0000 +Subject: google: Minor module cleanups. + +--- +diff --git a/modules/google-backend/module-google-backend.c b/modules/google-backend/module-google-backend.c +index d5684bb..cbd7bd2 100644 +--- a/modules/google-backend/module-google-backend.c ++++ b/modules/google-backend/module-google-backend.c +@@ -100,19 +100,17 @@ google_backend_contacts_update_auth_method (ESource *source) + EOAuth2Support *oauth2_support; + ESourceAuthentication *extension; + const gchar *extension_name; +- +- extension_name = E_SOURCE_EXTENSION_AUTHENTICATION; +- extension = e_source_get_extension (source, extension_name); ++ const gchar *method; + + oauth2_support = e_server_side_source_ref_oauth2_support ( + E_SERVER_SIDE_SOURCE (source)); +- if (oauth2_support != NULL) { +- e_source_authentication_set_method (extension, "OAuth2"); +- g_object_unref (oauth2_support); +- return; +- } + +- e_source_authentication_set_method (extension, "ClientLogin"); ++ extension_name = E_SOURCE_EXTENSION_AUTHENTICATION; ++ extension = e_source_get_extension (source, extension_name); ++ method = (oauth2_support != NULL) ? "OAuth2" : "ClientLogin"; ++ e_source_authentication_set_method (extension, method); ++ ++ g_clear_object (&oauth2_support); + } + + static void +@@ -178,7 +176,8 @@ google_backend_add_calendar (ECollectionBackend *backend) + + g_get_current_time (&today_tv); + today = g_time_val_to_iso8601 (&today_tv); +- e_source_alarms_set_last_notified (E_SOURCE_ALARMS (extension), today); ++ e_source_alarms_set_last_notified ( ++ E_SOURCE_ALARMS (extension), today); + g_free (today); + } + + diff --git a/extra/evolution-data-server/fix-google-2fa-4.patch b/extra/evolution-data-server/fix-google-2fa-4.patch new file mode 100644 index 000000000..26b64763e --- /dev/null +++ b/extra/evolution-data-server/fix-google-2fa-4.patch @@ -0,0 +1,159 @@ +From 13afda757c4ba8d558eaa64853849f2ad00a9806 Mon Sep 17 00:00:00 2001 +From: Matthew Barnes <mbarnes@redhat.com> +Date: Tue, 09 Jul 2013 15:42:17 +0000 +Subject: google: Use CalDAV v2 if OAuth 2.0 support is available. + +--- +diff --git a/modules/google-backend/module-google-backend.c b/modules/google-backend/module-google-backend.c +index cbd7bd2..4ded74d 100644 +--- a/modules/google-backend/module-google-backend.c ++++ b/modules/google-backend/module-google-backend.c +@@ -45,10 +45,16 @@ + + /* Calendar Configuration Details */ + #define GOOGLE_CALENDAR_BACKEND_NAME "caldav" +-#define GOOGLE_CALENDAR_HOST "www.google.com" +-#define GOOGLE_CALENDAR_CALDAV_PATH "/calendar/dav/%s/events" + #define GOOGLE_CALENDAR_RESOURCE_ID "Calendar" + ++/* CalDAV v1 Configuration Details */ ++#define GOOGLE_CALDAV_V1_HOST "www.google.com" ++#define GOOGLE_CALDAV_V1_PATH "/calendar/dav/%s/events" ++ ++/* CalDAV v2 Configuration Details */ ++#define GOOGLE_CALDAV_V2_HOST "apidata.googleusercontent.com" ++#define GOOGLE_CALDAV_V2_PATH "/caldav/v2/%s/events" ++ + /* Contacts Configuration Details */ + #define GOOGLE_CONTACTS_BACKEND_NAME "google" + #define GOOGLE_CONTACTS_HOST "www.google.com" +@@ -95,6 +101,52 @@ G_DEFINE_DYNAMIC_TYPE ( + E_TYPE_COLLECTION_BACKEND_FACTORY) + + static void ++google_backend_calendar_update_auth_method (ESource *source) ++{ ++ EOAuth2Support *oauth2_support; ++ ESourceAuthentication *auth_extension; ++ ESourceWebdav *webdav_extension; ++ const gchar *extension_name; ++ const gchar *host; ++ const gchar *method; ++ const gchar *path_format; ++ gchar *path; ++ gchar *user; ++ ++ oauth2_support = e_server_side_source_ref_oauth2_support ( ++ E_SERVER_SIDE_SOURCE (source)); ++ ++ /* The host name and WebDAV resource path depend on the ++ * authentication method used, so update those here too. */ ++ ++ if (oauth2_support != NULL) { ++ method = "OAuth2"; ++ host = GOOGLE_CALDAV_V2_HOST; ++ path_format = GOOGLE_CALDAV_V2_PATH; ++ } else { ++ method = "plain/password"; ++ host = GOOGLE_CALDAV_V1_HOST; ++ path_format = GOOGLE_CALDAV_V1_PATH; ++ } ++ ++ extension_name = E_SOURCE_EXTENSION_AUTHENTICATION; ++ auth_extension = e_source_get_extension (source, extension_name); ++ e_source_authentication_set_host (auth_extension, host); ++ e_source_authentication_set_method (auth_extension, method); ++ ++ extension_name = E_SOURCE_EXTENSION_WEBDAV_BACKEND; ++ webdav_extension = e_source_get_extension (source, extension_name); ++ ++ user = e_source_authentication_dup_user (auth_extension); ++ path = g_strdup_printf (path_format, (user != NULL) ? user : ""); ++ e_source_webdav_set_resource_path (webdav_extension, path); ++ g_free (path); ++ g_free (user); ++ ++ g_clear_object (&oauth2_support); ++} ++ ++static void + google_backend_contacts_update_auth_method (ESource *source) + { + EOAuth2Support *oauth2_support; +@@ -123,14 +175,16 @@ google_backend_add_calendar (ECollectionBackend *backend) + ESourceCollection *collection_extension; + const gchar *backend_name; + const gchar *extension_name; +- const gchar *identity; + const gchar *resource_id; +- gchar *path; + + /* FIXME As a future enhancement, we should query Google + * for a list of user calendars and add them to the + * collection with matching display names and colors. */ + ++ /* NOTE: Host name and WebDAV resource path are set in ++ * google_backend_calendar_update_auth_method(), ++ * since they depend on the auth method used. */ ++ + collection_source = e_backend_get_source (E_BACKEND (backend)); + + resource_id = GOOGLE_CALENDAR_RESOURCE_ID; +@@ -153,15 +207,15 @@ google_backend_add_calendar (ECollectionBackend *backend) + extension_name = E_SOURCE_EXTENSION_AUTHENTICATION; + extension = e_source_get_extension (source, extension_name); + +- e_source_authentication_set_host ( +- E_SOURCE_AUTHENTICATION (extension), +- GOOGLE_CALENDAR_HOST); +- + g_object_bind_property ( + collection_extension, "identity", + extension, "user", + G_BINDING_SYNC_CREATE); + ++ /* Make sure the WebDAV resource path is up-to-date, since ++ * it's built from the "user" property that we just set. */ ++ google_backend_calendar_update_auth_method (source); ++ + extension_name = E_SOURCE_EXTENSION_SECURITY; + extension = e_source_get_extension (source, extension_name); + +@@ -181,15 +235,6 @@ google_backend_add_calendar (ECollectionBackend *backend) + g_free (today); + } + +- extension_name = E_SOURCE_EXTENSION_WEBDAV_BACKEND; +- extension = e_source_get_extension (source, extension_name); +- +- identity = e_source_collection_get_identity (collection_extension); +- path = g_strdup_printf (GOOGLE_CALENDAR_CALDAV_PATH, identity); +- e_source_webdav_set_resource_path ( +- E_SOURCE_WEBDAV (extension), path); +- g_free (path); +- + server = e_collection_backend_ref_server (backend); + e_source_registry_server_add_source (server, source); + g_object_unref (server); +@@ -336,6 +381,20 @@ google_backend_child_added (ECollectionBackend *backend, + collection_identity); + } + ++ /* Keep the calendar authentication method up-to-date. ++ * ++ * XXX Not using a property binding here in case I end up adding ++ * other "support" interfaces which influence authentication. ++ * Many-to-one property bindinds tend not to work so well. */ ++ extension_name = E_SOURCE_EXTENSION_CALENDAR; ++ if (e_source_has_extension (child_source, extension_name)) { ++ google_backend_calendar_update_auth_method (child_source); ++ g_signal_connect ( ++ child_source, "notify::oauth2-support", ++ G_CALLBACK (google_backend_calendar_update_auth_method), ++ NULL); ++ } ++ + /* Keep the contacts authentication method up-to-date. + * + * XXX Not using a property binding here in case I end up adding + diff --git a/extra/evolution-ews/PKGBUILD b/extra/evolution-ews/PKGBUILD index 45f4e38b3..4e0063e36 100644 --- a/extra/evolution-ews/PKGBUILD +++ b/extra/evolution-ews/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 191347 2013-07-23 17:52:56Z jgc $ +# $Id: PKGBUILD 192425 2013-08-11 13:43:43Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=evolution-ews -pkgver=3.8.4 +pkgver=3.8.5 pkgrel=1 pkgdesc="MS Exchange integration through Exchange Web Services" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=('evolution-data-server' 'gtkhtml4' 'libmspack') makedepends=('intltool' 'evolution') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('1883d0d375286583520800317fbf41be585d34b40166fd03dc14c3f237a6f660') +sha256sums=('74a0fdcc698797902ca107f3523e3d3b3e51b8ba01709d308b47ed31e99de877') build() { cd $pkgname-$pkgver diff --git a/extra/evolution/PKGBUILD b/extra/evolution/PKGBUILD index d02ef0b2a..b1976409b 100644 --- a/extra/evolution/PKGBUILD +++ b/extra/evolution/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 191343 2013-07-23 17:41:59Z jgc $ +# $Id: PKGBUILD 192424 2013-08-11 13:43:05Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=evolution -pkgver=3.8.4 +pkgver=3.8.5 pkgrel=1 pkgdesc="Manage your email, contacts and schedule" arch=('i686' 'x86_64' 'mips64el') @@ -19,7 +19,7 @@ options=('!libtool' '!emptydirs') install=evolution.install url=http://www.gnome.org/projects/evolution/ source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('d5cfd0cb68ed8bf6e9515a5a44f566e3d26d3813a22ee6e5b0f86029039b1766') +sha256sums=('26ef047425826a7672f0db7f3d4eef908e68bae47a9e0756883079c445e4326d') build() { cd $pkgname-$pkgver diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index 94d69acbf..17525f0b1 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 191951 2013-08-01 20:53:41Z bpiotrowski $ +# $Id: PKGBUILD 192419 2013-08-11 13:05:15Z bpiotrowski $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=ffmpeg -pkgver=2.0 -pkgrel=2 +pkgver=2.0.1 +pkgrel=1 epoch=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" arch=('i686' 'x86_64' 'mips64el') @@ -22,7 +22,7 @@ if [ "${CARCH}" != "mips64el" ]; then makedepends=('yasm' 'libvdpau') fi source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2) -sha256sums=('940e1bc4f3e185364099b4ba60d4b952615a4232c5641baa3e9f45d4d748130c') +sha256sums=('611eae7e3485d5fd9ff03e0ac7575ea89bc8105e40e99a40de02324957482f95') build() { cd $pkgname-$pkgver diff --git a/extra/gifsicle/PKGBUILD b/extra/gifsicle/PKGBUILD index f550546a7..ced5c1b09 100644 --- a/extra/gifsicle/PKGBUILD +++ b/extra/gifsicle/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 185185 2013-05-11 22:17:24Z eric $ +# $Id: PKGBUILD 192181 2013-08-06 18:35:21Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gifsicle -pkgver=1.70 +pkgver=1.71 pkgrel=1 pkgdesc="A powerful command-line program for creating, editing, manipulating and getting information about GIF images and animations" arch=('i686' 'x86_64' 'mips64el') @@ -10,7 +10,7 @@ url="http://www.lcdf.org/gifsicle/" license=('GPL') depends=('libx11') source=(http://www.lcdf.org/${pkgname}/${pkgname}-${pkgver}.tar.gz) -sha1sums=('f5017c7e3298108f2063a926f83392c66f0652ae') +sha1sums=('a7665faa99b157ea545b65761d19e15b9b4a8b74') build() { cd ${pkgname}-${pkgver} diff --git a/extra/glew/PKGBUILD b/extra/glew/PKGBUILD index d29c44bf3..a46ee9b84 100644 --- a/extra/glew/PKGBUILD +++ b/extra/glew/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 191913 2013-08-01 06:53:46Z bpiotrowski $ +# $Id: PKGBUILD 192292 2013-08-09 20:35:39Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: SleepyDog pkgname=glew pkgver=1.10.0 -pkgrel=1 +pkgrel=2 pkgdesc="The OpenGL Extension Wrangler Library" arch=('i686' 'x86_64' 'mips64el') url="http://glew.sourceforge.net" @@ -15,14 +15,15 @@ source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tgz) sha1sums=('f41b45ca4a630ad1d00b8b87c5f493781a380300') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} sed -i 's|lib64|lib|' config/Makefile.linux + sed -i '/^.PHONY: .*\.pc$/d' Makefile make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make GLEW_DEST="${pkgdir}/usr" install.all install -D -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" diff --git a/extra/gmime/PKGBUILD b/extra/gmime/PKGBUILD index 08415356b..a3277a101 100644 --- a/extra/gmime/PKGBUILD +++ b/extra/gmime/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 189227 2013-06-30 19:58:41Z heftig $ +# $Id: PKGBUILD 192269 2013-08-09 12:51:47Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Ben <ben@benmazer.net> pkgname=gmime -pkgver=2.6.16 +pkgver=2.6.17 pkgrel=1 pkgdesc="Core mime parsing library" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('glib2' 'gpgme' 'zlib') [ "$CARCH" != "mips64el" ] && makedepends=('gtk-sharp-2') options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('1093c2c9b4644d53b9c2df30042b3c4c2e9141d3e65e299030d227485d95c8af') +sha256sums=('22d49e57c404a0a68d1ac3426c8f23a39185a4b2d569de03bece07db03d1202f') build() { # get rid of that .wapi errors in fakeroot diff --git a/extra/gnome-control-center/PKGBUILD b/extra/gnome-control-center/PKGBUILD index 573dfed07..44787ffbb 100644 --- a/extra/gnome-control-center/PKGBUILD +++ b/extra/gnome-control-center/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 191381 2013-07-25 09:28:55Z heftig $ +# $Id: PKGBUILD 192485 2013-08-12 21:17:35Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-control-center pkgver=3.8.4.1 -pkgrel=1 +pkgrel=2 pkgdesc="The Control Center for GNOME" license=(GPL) arch=('i686' 'x86_64' 'mips64el') @@ -22,8 +22,15 @@ groups=(gnome) url="http://www.gnome.org" install=gnome-control-center.install options=('!libtool' '!emptydirs') -source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz) -sha256sums=('3cfc5b93ca12f498c075f5b5356e0af4a0aaee003c0a90a4309bc12876f40c55') +source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz + no-deprecated-upower.diff) +sha256sums=('3cfc5b93ca12f498c075f5b5356e0af4a0aaee003c0a90a4309bc12876f40c55' + '4182fa082b071c840bc0a6e981dad3c070602cae473229227e81bdaa2b5f8c23') + +prepare() { + cd $pkgname-$pkgver + patch -Np1 -i ../no-deprecated-upower.diff +} build() { cd $pkgname-$pkgver @@ -33,6 +40,7 @@ build() { #https://bugzilla.gnome.org/show_bug.cgi?id=656229 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool + make } diff --git a/extra/gnome-control-center/no-deprecated-upower.diff b/extra/gnome-control-center/no-deprecated-upower.diff new file mode 100644 index 000000000..4fa629855 --- /dev/null +++ b/extra/gnome-control-center/no-deprecated-upower.diff @@ -0,0 +1,69 @@ +diff --git c/panels/power/cc-power-panel.c i/panels/power/cc-power-panel.c +index d70496a..af71db9 100644 +--- c/panels/power/cc-power-panel.c ++++ i/panels/power/cc-power-panel.c +@@ -70,6 +70,7 @@ struct _CcPowerPanelPrivate + GCancellable *cancellable; + GtkBuilder *builder; + UpClient *up_client; ++ GDBusProxy *logind_proxy; + GDBusProxy *screen_proxy; + gboolean has_batteries; + +@@ -137,6 +138,7 @@ cc_power_panel_dispose (GObject *object) + } + g_clear_object (&priv->builder); + g_clear_object (&priv->screen_proxy); ++ g_clear_object (&priv->logind_proxy); + g_clear_object (&priv->up_client); + #ifdef HAVE_BLUETOOTH + g_clear_object (&priv->bt_client); +@@ -1737,6 +1739,7 @@ add_automatic_suspend_section (CcPowerPanel *self) + GtkWidget *dialog; + GtkWidget *combo; + GtkCellRenderer *cell; ++ GVariant *result; + + /* The default values for these settings are unfortunate for us; + * timeout == 0, action == suspend means 'do nothing' - just +@@ -1820,7 +1823,23 @@ add_automatic_suspend_section (CcPowerPanel *self) + gtk_widget_set_margin_bottom (label, 6); + gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0); + +- if (up_client_get_can_hibernate (self->priv->up_client)) ++ value = 0; ++ result = g_dbus_proxy_call_sync (self->priv->logind_proxy, ++ "CanHibernate", ++ NULL, ++ G_DBUS_CALL_FLAGS_NONE, ++ -1, ++ NULL, ++ NULL); ++ if (result) ++ { ++ g_variant_get (result, "(s)", &s); ++ if (g_strcmp0 (s, "yes") == 0) ++ value = 1; ++ g_variant_unref(result); ++ } ++ ++ if (value) + { + model = (GtkTreeModel*)gtk_builder_get_object (priv->builder, "liststore_critical"); + priv->critical_battery_combo = sw = gtk_combo_box_new_with_model (model); +@@ -2070,6 +2089,15 @@ cc_power_panel_init (CcPowerPanel *self) + got_screen_proxy_cb, + self); + ++ priv->logind_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM, ++ G_DBUS_PROXY_FLAGS_NONE, ++ NULL, ++ "org.freedesktop.login1", ++ "/org/freedesktop/login1", ++ "org.freedesktop.login1.Manager", ++ NULL, ++ &error); ++ + priv->up_client = up_client_new (); + + priv->gsd_settings = g_settings_new ("org.gnome.settings-daemon.plugins.power"); diff --git a/extra/gnome-online-accounts/PKGBUILD b/extra/gnome-online-accounts/PKGBUILD index 253cec562..59ead62c0 100644 --- a/extra/gnome-online-accounts/PKGBUILD +++ b/extra/gnome-online-accounts/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185462 2013-05-14 10:31:45Z heftig $ +# $Id: PKGBUILD 192045 2013-08-05 10:07:57Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gnome-online-accounts pkgver=3.8.2 -pkgrel=1 +pkgrel=2 pkgdesc="GNOME service to access online accounts" arch=(i686 x86_64 mips64el) url="http://www.gnome.org" @@ -12,9 +12,31 @@ depends=('webkitgtk3' 'json-glib' 'libnotify' 'rest' 'hicolor-icon-theme' 'libse makedepends=('intltool' 'libxslt' 'gobject-introspection' 'docbook-xsl') options=(!libtool) install=$pkgname.install -source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('12611a002043c8acc29e9800ec009e3e19736bdb6237d246e848d7c7909fe826') +source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz + imap-smtp.patch + smtp-auth-plain.patch + drop-google-password-interface-1.patch + drop-google-password-interface-2.patch + drop-google-password-interface-3.patch) +sha256sums=('12611a002043c8acc29e9800ec009e3e19736bdb6237d246e848d7c7909fe826' + '2b413d1f401647bd143b7dc6dd4b6d6660ff47ef9a11ccbc691b7c13de5cba69' + 'e7250be7c078053345699250433b7164751d3e457155bd35508c7d1660f459be' + '33435c10aa1ba3fbb6fd633dc098cd1da50629f1d602521ca83be5379f2ebe48' + 'c837f9be4e5e072a06ea44076e6b9a1519c66c95b16d7a55b1dba105fded317f' + '18dfad8ed978af1068fd057bbe323006c349ac4ea77c742aa06f1011dc92326e') +prepare() { + cd $pkgname-$pkgver + # Upstream 3.8 branch + patch -Np1 -i ../imap-smtp.patch + patch -Np1 -i ../smtp-auth-plain.patch + + # Backport from Ubuntu + patch -Np1 -i ../drop-google-password-interface-1.patch + patch -Np1 -i ../drop-google-password-interface-2.patch + patch -Np1 -i ../drop-google-password-interface-3.patch +} + build() { cd $pkgname-$pkgver ./configure --prefix=/usr --libexec=/usr/lib/gnome-online-accounts diff --git a/extra/gnome-online-accounts/drop-google-password-interface-1.patch b/extra/gnome-online-accounts/drop-google-password-interface-1.patch new file mode 100644 index 000000000..1bd5c8c0f --- /dev/null +++ b/extra/gnome-online-accounts/drop-google-password-interface-1.patch @@ -0,0 +1,39 @@ +From 9182fb378614abb2ff0245fe71a753f22eaaa906 Mon Sep 17 00:00:00 2001 +From: Debarshi Ray <debarshir@gnome.org> +Date: Tue, 11 Jun 2013 14:58:21 +0000 +Subject: google: Bump credentials generation + +Access to the following were turned on in the Google APIs Console: + - Calendar API + - Google Calendar CalDAV API + - Google Contacts CardDAV API + +Of these, only the last two are new. We were already requesting the +scope for Calendar API, but looks like the APIs Console is the way +to go now. Interestingly the APIs Console does not list all the other +services that we are interested in, or it is does but is not obvious +to me. + +In any case we need access to their new CalDAV API which works with +OAuth2 because that would let us work with 2-factor authenticated +accounts again. + +See: https://bugzilla.gnome.org/show_bug.cgi?id=686804 + https://bugzilla.gnome.org/show_bug.cgi?id=688364 +--- +(limited to 'src/goabackend/goagoogleprovider.c') + +diff --git a/src/goabackend/goagoogleprovider.c b/src/goabackend/goagoogleprovider.c +index 8271711..79f5f73 100644 +--- a/src/goabackend/goagoogleprovider.c ++++ b/src/goabackend/goagoogleprovider.c +@@ -148,7 +148,7 @@ get_scope (GoaOAuth2Provider *provider) + static guint + get_credentials_generation (GoaProvider *provider) + { +- return 3; ++ return 4; + } + + static const gchar * + diff --git a/extra/gnome-online-accounts/drop-google-password-interface-2.patch b/extra/gnome-online-accounts/drop-google-password-interface-2.patch new file mode 100644 index 000000000..9aa1ce28e --- /dev/null +++ b/extra/gnome-online-accounts/drop-google-password-interface-2.patch @@ -0,0 +1,74 @@ +From a0fd4cd595bd0fe6eb4015ea9050170319b16546 Mon Sep 17 00:00:00 2001 +From: Debarshi Ray <debarshir@gnome.org> +Date: Wed, 19 Jun 2013 15:04:38 +0000 +Subject: google: Export CalDAV and CardDAV endpoints + +According to: +https://developers.google.com/google-apps/calendar/caldav/v2/guide/ +https://developers.google.com/google-apps/carddav/ + +See: https://bugzilla.gnome.org/show_bug.cgi?id=686804 + https://bugzilla.gnome.org/show_bug.cgi?id=688364 +--- +(limited to 'src/goabackend/goagoogleprovider.c') + +diff --git a/src/goabackend/goagoogleprovider.c b/src/goabackend/goagoogleprovider.c +index 79f5f73..740c08e 100644 +--- a/src/goabackend/goagoogleprovider.c ++++ b/src/goabackend/goagoogleprovider.c +@@ -385,6 +385,7 @@ build_object (GoaProvider *provider, + gboolean contacts_enabled; + gboolean chat_enabled; + gboolean documents_enabled; ++ const gchar *email_address; + + account = NULL; + mail = NULL; +@@ -419,6 +420,7 @@ build_object (GoaProvider *provider, + } + + account = goa_object_get_account (GOA_OBJECT (object)); ++ email_address = goa_account_get_identity (account); + + /* Email */ + mail = goa_object_get_mail (GOA_OBJECT (object)); +@@ -427,8 +429,6 @@ build_object (GoaProvider *provider, + { + if (mail == NULL) + { +- const gchar *email_address; +- email_address = goa_account_get_identity (account); + mail = goa_mail_skeleton_new (); + g_object_set (G_OBJECT (mail), + "email-address", email_address, +@@ -457,8 +457,19 @@ build_object (GoaProvider *provider, + { + if (calendar == NULL) + { ++ gchar *uri_caldav; ++ ++ uri_caldav = g_strconcat ("https://apidata.googleusercontent.com/caldav/v2/", ++ email_address, ++ "/user", ++ NULL); ++ + calendar = goa_calendar_skeleton_new (); ++ g_object_set (G_OBJECT (calendar), ++ "uri", uri_caldav, ++ NULL); + goa_object_skeleton_set_calendar (object, calendar); ++ g_free (uri_caldav); + } + } + else +@@ -475,6 +486,9 @@ build_object (GoaProvider *provider, + if (contacts == NULL) + { + contacts = goa_contacts_skeleton_new (); ++ g_object_set (G_OBJECT (contacts), ++ "uri", "https://www.googleapis.com/.well-known/carddav", ++ NULL); + goa_object_skeleton_set_contacts (object, contacts); + } + } + diff --git a/extra/gnome-online-accounts/drop-google-password-interface-3.patch b/extra/gnome-online-accounts/drop-google-password-interface-3.patch new file mode 100644 index 000000000..487132b32 --- /dev/null +++ b/extra/gnome-online-accounts/drop-google-password-interface-3.patch @@ -0,0 +1,296 @@ +From 365a5a92909fce8dcdd851b5a2b9caf34e0da926 Mon Sep 17 00:00:00 2001 +From: Debarshi Ray <debarshir@gnome.org> +Date: Fri, 28 Jun 2013 12:22:07 +0000 +Subject: google: Don't offer a PasswordBased interface + +This was a temporary measure back when Google did not support OAuth2 +for CalDAV. Now that they do, we can drop this. + +In any case, the workaround didn't work with accounts using 2-factor +authentication. This will make those people happy. + +This reverts 89c335479c1bb8409af8296c99ffea602a28b71f + +See: https://bugzilla.gnome.org/show_bug.cgi?id=686804 + https://bugzilla.gnome.org/show_bug.cgi?id=688364 +--- +(limited to 'src/goabackend/goagoogleprovider.c') + +Index: gnome-online-accounts-3.8.2/src/goabackend/goagoogleprovider.c +=================================================================== +--- gnome-online-accounts-3.8.2.orig/src/goabackend/goagoogleprovider.c 2013-07-10 13:29:35.381448621 -0400 ++++ gnome-online-accounts-3.8.2/src/goabackend/goagoogleprovider.c 2013-07-10 13:29:35.377448621 -0400 +@@ -32,8 +32,6 @@ + #include "goaprovider-priv.h" + #include "goaoauth2provider.h" + #include "goagoogleprovider.h" +-#include "goahttpclient.h" +-#include "goautils.h" + + /** + * GoaGoogleProvider: +@@ -71,8 +69,6 @@ + + /* ---------------------------------------------------------------------------------------------------- */ + +-static const gchar *CALDAV_ENDPOINT = "https://www.google.com/calendar/dav/%s/events/"; +- + static const gchar * + get_provider_type (GoaProvider *_provider) + { +@@ -310,48 +306,8 @@ + return ret; + } + +-static gboolean +-is_password_node (GoaOAuth2Provider *provider, WebKitDOMHTMLInputElement *element) +-{ +- gboolean ret; +- gchar *element_type; +- gchar *id; +- gchar *name; +- +- element_type = NULL; +- id = NULL; +- name = NULL; +- +- ret = FALSE; +- +- g_object_get (element, "type", &element_type, NULL); +- if (g_strcmp0 (element_type, "password") != 0) +- goto out; +- +- id = webkit_dom_html_element_get_id (WEBKIT_DOM_HTML_ELEMENT (element)); +- if (g_strcmp0 (id, "Passwd") != 0) +- goto out; +- +- name = webkit_dom_html_input_element_get_name (element); +- if (g_strcmp0 (name, "Passwd") != 0) +- goto out; +- +- ret = TRUE; +- +- out: +- g_free (element_type); +- g_free (id); +- g_free (name); +- return ret; +-} +- + /* ---------------------------------------------------------------------------------------------------- */ + +-static gboolean on_handle_get_password (GoaPasswordBased *interface, +- GDBusMethodInvocation *invocation, +- const gchar *id, +- gpointer user_data); +- + static gboolean + build_object (GoaProvider *provider, + GoaObjectSkeleton *object, +@@ -367,7 +323,6 @@ + GoaContacts *contacts; + GoaChat *chat; + GoaDocuments *documents; +- GoaPasswordBased *password_based; + gboolean ret; + gboolean mail_enabled; + gboolean calendar_enabled; +@@ -394,20 +349,6 @@ + error)) + goto out; + +- password_based = goa_object_get_password_based (GOA_OBJECT (object)); +- if (password_based == NULL) +- { +- password_based = goa_password_based_skeleton_new (); +- /* Ensure D-Bus method invocations run in their own thread */ +- g_dbus_interface_skeleton_set_flags (G_DBUS_INTERFACE_SKELETON (password_based), +- G_DBUS_INTERFACE_SKELETON_FLAGS_HANDLE_METHOD_INVOCATIONS_IN_THREAD); +- goa_object_skeleton_set_password_based (object, password_based); +- g_signal_connect (password_based, +- "handle-get-password", +- G_CALLBACK (on_handle_get_password), +- NULL); +- } +- + account = goa_object_get_account (GOA_OBJECT (object)); + email_address = goa_account_get_identity (account); + +@@ -567,103 +508,6 @@ + /* ---------------------------------------------------------------------------------------------------- */ + + static gboolean +-ensure_credentials_sync (GoaProvider *provider, +- GoaObject *object, +- gint *out_expires_in, +- GCancellable *cancellable, +- GError **error) +-{ +- GVariant *credentials; +- GoaAccount *account; +- GoaHttpClient *http_client; +- gboolean ret; +- const gchar *username; +- gchar *password; +- gchar *uri_caldav; +- +- credentials = NULL; +- http_client = NULL; +- password = NULL; +- uri_caldav = NULL; +- +- ret = FALSE; +- +- /* Chain up */ +- if (!GOA_PROVIDER_CLASS (goa_google_provider_parent_class)->ensure_credentials_sync (provider, +- object, +- out_expires_in, +- cancellable, +- error)) +- goto out; +- +- credentials = goa_utils_lookup_credentials_sync (provider, +- object, +- cancellable, +- error); +- if (credentials == NULL) +- { +- if (error != NULL) +- { +- (*error)->domain = GOA_ERROR; +- (*error)->code = GOA_ERROR_NOT_AUTHORIZED; +- } +- goto out; +- } +- +- account = goa_object_peek_account (object); +- username = goa_account_get_presentation_identity (account); +- uri_caldav = g_strdup_printf (CALDAV_ENDPOINT, username); +- +- if (!g_variant_lookup (credentials, "password", "s", &password)) +- { +- if (error != NULL) +- { +- *error = g_error_new (GOA_ERROR, +- GOA_ERROR_NOT_AUTHORIZED, +- _("Did not find password with identity `%s' in credentials"), +- username); +- } +- goto out; +- } +- +- http_client = goa_http_client_new (); +- ret = goa_http_client_check_sync (http_client, +- uri_caldav, +- username, +- password, +- FALSE, +- cancellable, +- error); +- if (!ret) +- { +- if (error != NULL) +- { +- g_prefix_error (error, +- /* Translators: the first %s is the username +- * (eg., debarshi.ray@gmail.com or rishi), and the +- * (%s, %d) is the error domain and code. +- */ +- _("Invalid password with username `%s' (%s, %d): "), +- username, +- g_quark_to_string ((*error)->domain), +- (*error)->code); +- (*error)->domain = GOA_ERROR; +- (*error)->code = GOA_ERROR_NOT_AUTHORIZED; +- } +- goto out; +- } +- +- out: +- g_clear_object (&http_client); +- g_free (password); +- g_free (uri_caldav); +- g_clear_pointer (&credentials, (GDestroyNotify) g_variant_unref); +- return ret; +-} +- +-/* ---------------------------------------------------------------------------------------------------- */ +- +-static gboolean + get_use_mobile_browser (GoaOAuth2Provider *provider) + { + return TRUE; +@@ -744,7 +588,6 @@ + provider_class->get_provider_name = get_provider_name; + provider_class->get_provider_group = get_provider_group; + provider_class->build_object = build_object; +- provider_class->ensure_credentials_sync = ensure_credentials_sync; + provider_class->show_account = show_account; + provider_class->get_credentials_generation = get_credentials_generation; + +@@ -758,65 +601,7 @@ + oauth2_class->get_scope = get_scope; + oauth2_class->is_deny_node = is_deny_node; + oauth2_class->is_identity_node = is_identity_node; +- oauth2_class->is_password_node = is_password_node; + oauth2_class->get_token_uri = get_token_uri; + oauth2_class->get_use_mobile_browser = get_use_mobile_browser; + oauth2_class->add_account_key_values = add_account_key_values; + } +- +-/* ---------------------------------------------------------------------------------------------------- */ +- +-/* runs in a thread dedicated to handling @invocation */ +-static gboolean +-on_handle_get_password (GoaPasswordBased *interface, +- GDBusMethodInvocation *invocation, +- const gchar *id, /* unused */ +- gpointer user_data) +-{ +- GoaObject *object; +- GoaAccount *account; +- GoaProvider *provider; +- GError *error; +- GVariant *credentials; +- const gchar *identity; +- gchar *password; +- +- /* TODO: maybe log what app is requesting access */ +- +- password = NULL; +- credentials = NULL; +- +- object = GOA_OBJECT (g_dbus_interface_get_object (G_DBUS_INTERFACE (interface))); +- account = goa_object_peek_account (object); +- identity = goa_account_get_identity (account); +- provider = goa_provider_get_for_provider_type (goa_account_get_provider_type (account)); +- +- error = NULL; +- credentials = goa_utils_lookup_credentials_sync (provider, +- object, +- NULL, /* GCancellable* */ +- &error); +- if (credentials == NULL) +- { +- g_dbus_method_invocation_take_error (invocation, error); +- goto out; +- } +- +- if (!g_variant_lookup (credentials, "password", "s", &password)) +- { +- g_dbus_method_invocation_return_error (invocation, +- GOA_ERROR, +- GOA_ERROR_FAILED, /* TODO: more specific */ +- _("Did not find password with identity `%s' in credentials"), +- identity); +- goto out; +- } +- +- goa_password_based_complete_get_password (interface, invocation, password); +- +- out: +- g_free (password); +- g_clear_pointer (&credentials, (GDestroyNotify) g_variant_unref); +- g_object_unref (provider); +- return TRUE; /* invocation was handled */ +-} diff --git a/extra/gnome-online-accounts/imap-smtp.patch b/extra/gnome-online-accounts/imap-smtp.patch new file mode 100644 index 000000000..7213c8d1e --- /dev/null +++ b/extra/gnome-online-accounts/imap-smtp.patch @@ -0,0 +1,20 @@ +From 034da0871ad78629f9d0df618be494dbb19157e4 Mon Sep 17 00:00:00 2001 +From: Debarshi Ray <debarshir@gnome.org> +Date: Tue, 18 Jun 2013 10:35:42 +0000 +Subject: imap-smtp: Prevent error messages from expanding the dialog + +--- +diff --git a/src/goabackend/goaimapsmtpprovider.c b/src/goabackend/goaimapsmtpprovider.c +index d10a9d8..841327d 100644 +--- a/src/goabackend/goaimapsmtpprovider.c ++++ b/src/goabackend/goaimapsmtpprovider.c +@@ -669,6 +669,7 @@ create_account_details_ui (GoaProvider *provider, + + data->cluebar_label = gtk_label_new (""); + gtk_label_set_line_wrap (GTK_LABEL (data->cluebar_label), TRUE); ++ gtk_label_set_max_width_chars (GTK_LABEL (data->cluebar_label), 36); + gtk_container_add (GTK_CONTAINER (gtk_info_bar_get_content_area (GTK_INFO_BAR (data->cluebar))), + data->cluebar_label); + +-- +cgit v0.9.2 diff --git a/extra/gnome-online-accounts/smtp-auth-plain.patch b/extra/gnome-online-accounts/smtp-auth-plain.patch new file mode 100644 index 000000000..c6782d0f6 --- /dev/null +++ b/extra/gnome-online-accounts/smtp-auth-plain.patch @@ -0,0 +1,88 @@ +From 2210bf547dc35adacbc95c0dcf4abe75a73a8368 Mon Sep 17 00:00:00 2001 +From: Debarshi Ray <debarshir@gnome.org> +Date: Tue, 18 Jun 2013 15:27:55 +0000 +Subject: smtp-auth-plain: Handle multiline SMTP greetings + +Fixes: https://bugzilla.gnome.org/702263 +--- +diff --git a/src/goabackend/goasmtpauthplain.c b/src/goabackend/goasmtpauthplain.c +index bb783bd..77324cf 100644 +--- a/src/goabackend/goasmtpauthplain.c ++++ b/src/goabackend/goasmtpauthplain.c +@@ -167,6 +167,40 @@ smtp_auth_plain_check_454 (const gchar *response, GError **error) + + /* ---------------------------------------------------------------------------------------------------- */ + ++static gboolean ++smtp_auth_plain_check_greeting (GDataInputStream *input, GCancellable *cancellable, GError **error) ++{ ++ gboolean ret; ++ gchar *response; ++ ++ response = NULL; ++ ret = FALSE; ++ ++ greeting_again: ++ response = g_data_input_stream_read_line (input, NULL, cancellable, error); ++ if (response == NULL) ++ goto out; ++ g_debug ("< %s", response); ++ if (smtp_auth_plain_check_421 (response, error)) ++ goto out; ++ if (smtp_auth_plain_check_not_220 (response, error)) ++ goto out; ++ ++ if (response[3] == '-') ++ { ++ g_clear_pointer (&response, g_free); ++ goto greeting_again; ++ } ++ ++ ret = TRUE; ++ ++ out: ++ g_free (response); ++ return ret; ++} ++ ++/* ---------------------------------------------------------------------------------------------------- */ ++ + static gchar * + smtp_auth_plain_get_domain (GoaSmtpAuthPlain *auth, + GError **error) +@@ -563,15 +597,8 @@ goa_smtp_auth_plain_run_sync (GoaMailAuth *_auth, + + if (!auth->greeting_absent) + { +- response = g_data_input_stream_read_line (input, NULL, cancellable, error); +- if (response == NULL) +- goto out; +- g_debug ("< %s", response); +- if (smtp_auth_plain_check_421 (response, error)) ++ if (!smtp_auth_plain_check_greeting (input, cancellable, error)) + goto out; +- if (smtp_auth_plain_check_not_220 (response, error)) +- goto out; +- g_clear_pointer (&response, g_free); + } + + /* Send EHLO */ +@@ -685,15 +712,8 @@ goa_smtp_auth_plain_starttls_sync (GoaMailAuth *_auth, + + /* Check the greeting */ + +- response = g_data_input_stream_read_line (input, NULL, cancellable, error); +- if (response == NULL) +- goto out; +- g_debug ("< %s", response); +- if (smtp_auth_plain_check_421 (response, error)) ++ if (!smtp_auth_plain_check_greeting (input, cancellable, error)) + goto out; +- if (smtp_auth_plain_check_not_220 (response, error)) +- goto out; +- g_clear_pointer (&response, g_free); + + /* Send EHLO */ + +-- +cgit v0.9.2 diff --git a/extra/gnome-settings-daemon/0001-power-Use-logind-to-discover-critical-action-availab.patch b/extra/gnome-settings-daemon/0001-power-Use-logind-to-discover-critical-action-availab.patch new file mode 100644 index 000000000..7e678f936 --- /dev/null +++ b/extra/gnome-settings-daemon/0001-power-Use-logind-to-discover-critical-action-availab.patch @@ -0,0 +1,77 @@ +From 1271864ddfc053a1567d046b5fcdf8351da3f438 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> +Date: Mon, 5 Aug 2013 18:15:00 +0200 +Subject: [PATCH] power: Use logind to discover critical action availability + +The upower functionality is deprecated and will return an +error unless upower is built with --enable-deprecated. + +Follows a similar patch to gnome-control-center. +--- + plugins/power/gsd-power-manager.c | 42 ++++++++++++++++++++++++++++----------- + 1 file changed, 30 insertions(+), 12 deletions(-) + +diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c +index fde90ef..8bd124f 100644 +--- a/plugins/power/gsd-power-manager.c ++++ b/plugins/power/gsd-power-manager.c +@@ -27,7 +27,6 @@ + #include <string.h> + #include <glib/gi18n.h> + #include <gtk/gtk.h> +-#define UPOWER_ENABLE_DEPRECATED 1 + #include <libupower-glib/upower.h> + #include <libnotify/notify.h> + #include <canberra-gtk.h> +@@ -1164,18 +1163,37 @@ static GsdPowerActionType + manager_critical_action_get (GsdPowerManager *manager, + gboolean is_ups) + { +- GsdPowerActionType policy; ++ GsdPowerActionType policy = GSD_POWER_ACTION_SHUTDOWN; ++ GsdPowerActionType setpolicy; ++ GVariant *result = NULL; ++ gchar *s; + +- policy = g_settings_get_enum (manager->priv->settings, "critical-battery-action"); +- if (policy == GSD_POWER_ACTION_SUSPEND) { +- if (is_ups == FALSE && +- up_client_get_can_suspend (manager->priv->up_client)) +- return policy; +- return GSD_POWER_ACTION_SHUTDOWN; +- } else if (policy == GSD_POWER_ACTION_HIBERNATE) { +- if (up_client_get_can_hibernate (manager->priv->up_client)) +- return policy; +- return GSD_POWER_ACTION_SHUTDOWN; ++ setpolicy = g_settings_get_enum (manager->priv->settings, "critical-battery-action"); ++ ++ if (setpolicy == GSD_POWER_ACTION_SUSPEND) { ++ if (is_ups == FALSE) { ++ result = g_dbus_proxy_call_sync (manager->priv->logind_proxy, ++ "CanSuspend", ++ NULL, ++ G_DBUS_CALL_FLAGS_NONE, ++ -1, NULL, NULL); ++ } ++ } else if (setpolicy == GSD_POWER_ACTION_HIBERNATE) { ++ result = g_dbus_proxy_call_sync (manager->priv->logind_proxy, ++ "CanHibernate", ++ NULL, ++ G_DBUS_CALL_FLAGS_NONE, ++ -1, NULL, NULL); ++ } else { ++ /* Other actions need no check */ ++ return setpolicy; ++ } ++ ++ if (result) { ++ g_variant_get (result, "(s)", &s); ++ if (g_strcmp0 (s, "yes") == 0) ++ policy = setpolicy; ++ g_variant_unref (result); + } + + return policy; +-- +1.8.3.4 + diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD index 836cc9334..644ef9539 100644 --- a/extra/gnome-settings-daemon/PKGBUILD +++ b/extra/gnome-settings-daemon/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 191201 2013-07-19 20:57:52Z heftig $ +# $Id: PKGBUILD 192484 2013-08-12 21:17:34Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-settings-daemon pkgver=3.8.4 -pkgrel=1 +pkgrel=2 pkgdesc="The GNOME Settings daemon" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -14,8 +14,15 @@ options=('!emptydirs' '!libtool') install=gnome-settings-daemon.install url="http://www.gnome.org" groups=('gnome') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('03ad56a8d517faf0754efcf2e7e26257e9ddbe32ef2931f3579138659cc178bc') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + 0001-power-Use-logind-to-discover-critical-action-availab.patch) +sha256sums=('03ad56a8d517faf0754efcf2e7e26257e9ddbe32ef2931f3579138659cc178bc' + '9825d3486665d87d4fc54355a6d318d68f5d3caeb286bdd659147920a85c56d9') + +prepare() { + cd $pkgname-$pkgver + patch -Np1 -i ../0001-power-Use-logind-to-discover-critical-action-availab.patch +} build() { cd $pkgname-$pkgver diff --git a/extra/grip/PKGBUILD b/extra/grip/PKGBUILD index d12cfc08c..6e3703187 100644 --- a/extra/grip/PKGBUILD +++ b/extra/grip/PKGBUILD @@ -1,30 +1,33 @@ -# $Id: PKGBUILD 137616 2011-09-10 05:34:08Z eric $ -# Maintainer: tobias <tobias@archlinux.org> -# Contributor: Todd Musall <tmusall@comcast.net> +# $Id: PKGBUILD 192310 2013-08-10 01:59:42Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=grip pkgver=3.3.1 -pkgrel=9 +pkgrel=10 pkgdesc="A cd-player and ripper for the Gnome desktop" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -url="http://nostatic.org/grip/" +url="http://sourceforge.net/projects/grip/" depends=('vte' 'curl' 'libgnomeui' 'id3lib' 'cdparanoia') optdepends=('yelp: to display the help and notices') -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz \ +source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz grip-3.3.1-invalid-genre-size.patch) -md5sums=('4b4233999b9f2bc85c711092553ea9aa' - '046448be7d1580e86a2211cd8661d855') +sha1sums=('58ef51fbddf981a189f8b5b39774e3bd6862127d' + '27057cb49f2abe97045912899965a9bb347612a2') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + cd ${pkgname}-${pkgver} patch -p1 -i "${srcdir}/grip-3.3.1-invalid-genre-size.patch" - sed -i '/[.] conftest[.]id3/s: c: ./c:' configure + sed -i '/[.] conftest[.]id3/s: c: ./c:' configure +} + +build() { + cd ${pkgname}-${pkgver} ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index 82414c855..781f40724 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 189934 2013-07-11 19:07:10Z eric $ +# $Id: PKGBUILD 192475 2013-08-12 20:25:42Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.8.6.4 +pkgver=6.8.6.8 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.imagemagick.org/" license=('custom') makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \ - 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'liblqr') + 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'liblqr' 'libwebp') [ "$CARCH" != "mips64el" ] && makedepends+=('opencl-headers' 'libcl') #source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ perlmagick.rpath.patch) -sha1sums=('ab62d1777ef3ae18820bdb9f757ac65f9d2f944d' +sha1sums=('fe298492c6be08eb887d02b75efeb609fa6c4d61' 'e143cf9d530fabf3b58023899b5cc544ba93daec') prepare() { @@ -28,11 +28,11 @@ build() { cd ImageMagick-${pkgver%.*}-${pkgver##*.} [ "$CARCH" != "mips64el" ] && extraconf="--enable-opencl" ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \ - --disable-openmp --with-wmf --with-openexr --with-xml --with-lcms2 --with-jp2 \ - --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \ + --enable-hdri --with-wmf --with-openexr --with-xml --with-lcms2 --with-jp2 \ + --with-webp --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \ --with-perl --with-perl-options="INSTALLDIRS=vendor" --with-lqr --with-rsvg \ --without-gvc --without-djvu --without-autotrace \ - --without-webp --without-jbig --without-fpx --without-dps --without-fftw $extraconf + --without-jbig --without-fpx --without-dps --without-fftw $extraconf make } @@ -50,7 +50,8 @@ package_imagemagick() { 'librsvg: for SVG support' 'libxml2: for XML support' 'jasper: for JPEG-2000 support' - 'libpng: for PNG support') + 'libpng: for PNG support' + 'libwebp: for WEBP support') backup=("etc/ImageMagick-${pkgver%%.*}/coder.xml" "etc/ImageMagick-${pkgver%%.*}/colors.xml" "etc/ImageMagick-${pkgver%%.*}/delegates.xml" diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD index 98b4c7b5a..b15ccc6ee 100644 --- a/extra/inkscape/PKGBUILD +++ b/extra/inkscape/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 186340 2013-05-25 02:56:30Z foutrelis $ +# $Id: PKGBUILD 192476 2013-08-12 20:25:43Z eric $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> # Contributor: tobias <tobias@archlinux.org> pkgname=inkscape pkgver=0.48.4 -pkgrel=8 +pkgrel=10 pkgdesc='Vector graphics editor using the SVG file format' url='http://inkscape.sourceforge.net/' license=('GPL' 'LGPL') @@ -19,12 +19,12 @@ optdepends=('pstoedit: latex formulas' 'python2-lxml: some extensions and filters' 'pyxml: some extensions' 'uniconvertor: reading/writing to some proprietary formats') -options=('!libtool') source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2" 'spuriouscomma.patch') sha1sums=('5f26f6ad191d1e7c2a9fb69a438722beb172224c' '7d1d5a6d1d2b0926721a994d5889c52890fc57c1') +options=('!libtool') install=install prepare() { diff --git a/extra/kobodeluxe/PKGBUILD b/extra/kobodeluxe/PKGBUILD index c7cf2efbf..b8be491ce 100644 --- a/extra/kobodeluxe/PKGBUILD +++ b/extra/kobodeluxe/PKGBUILD @@ -1,43 +1,42 @@ -# $Id: PKGBUILD 122903 2011-05-07 08:05:30Z eric $ +# $Id: PKGBUILD 192417 2013-08-11 02:14:23Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=kobodeluxe pkgver=0.5.1 -pkgrel=3.2 +pkgrel=4 pkgdesc="An enhanced version of Akira Higuchi's game XKobo, an addictive space shoot'em up" arch=('i686' 'x86_64' 'mips64el') url="http://www.olofson.net/kobodl/" license=('GPL' 'LGPL') -depends=('libjpeg' 'libpng' 'sdl_image' 'hicolor-icon-theme' 'gtk-update-icon-cache') +depends=('sdl_image' 'hicolor-icon-theme' 'gtk-update-icon-cache') install=kobodeluxe.install -source=(http://www.olofson.net/kobodl/download/KoboDeluxe-${pkgver}.tar.gz \ +source=(http://www.olofson.net/kobodl/download/KoboDeluxe-${pkgver}.tar.gz kobodeluxe-gcc-4.3.patch kobodeluxe-0.5.1-glibc2.10.patch) -md5sums=('cf765559461213d651c7be042507b767' - '2b76306ec997fdc64986b4425e5b7814' - '56115c9a1e3db1b95b731fdcb11f3f4f') sha1sums=('12abe182ccde52050cd23077092d0424d25c3e75' '274dc8e7909bc6f9fab31306c85d992af8b62674' '9d1b3b8cef4a16b6a082fed9f93f1dc12b2a3be0') +prepare() { + cd KoboDeluxe-${pkgver} + tar -xf icons.tar.gz + patch -p0 -i "${srcdir}/kobodeluxe-gcc-4.3.patch" + patch -p0 -i "${srcdir}/kobodeluxe-0.5.1-glibc2.10.patch" +} + build() { - cd "${srcdir}/KoboDeluxe-${pkgver}" - patch -p0 < ../kobodeluxe-gcc-4.3.patch - patch -p0 < ../kobodeluxe-0.5.1-glibc2.10.patch + cd KoboDeluxe-${pkgver} ./configure --prefix=/usr --localstatedir=/var --sharedstatedir=/var/games make } package() { - cd "${srcdir}/KoboDeluxe-${pkgver}" + cd KoboDeluxe-${pkgver} make DESTDIR="${pkgdir}" install - tar -xzf icons.tar.gz install -D -m644 icons/KDE/kobo-deluxe.desktop "${pkgdir}/usr/share/applications/kobo-deluxe.desktop" for i in 16 22 32 48 64 128 ; do - install -D -m644 icons/KDE/icons/${i}x${i}/kobodl.png "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/kobodl.png" + install -D -m644 icons/KDE/icons/${i}x${i}/kobodl.png "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps/kobodl.png" done - install -D -m644 icons/Ubuntu/kobo-icon.xpm "${pkgdir}/usr/share/pixmaps/kobo-icon.xpm" - ln -s /usr/share/icons/hicolor/48x48/kobodl.png "${pkgdir}/usr/share/icons/kobodl.png" chown root:games "${pkgdir}/usr/bin/kobodl" chmod 2755 "${pkgdir}/usr/bin/kobodl" diff --git a/extra/libburn/PKGBUILD b/extra/libburn/PKGBUILD index d59f1283d..ef67f8080 100644 --- a/extra/libburn/PKGBUILD +++ b/extra/libburn/PKGBUILD @@ -1,28 +1,28 @@ -# $Id: PKGBUILD 186945 2013-06-01 10:04:29Z andyrtr $ +# $Id: PKGBUILD 192276 2013-08-09 14:16:57Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=libburn -pkgver=1.3.0.pl01 +pkgver=1.3.2 # .pl01 pkgrel=1 pkgdesc="Library for reading, mastering and writing optical discs" arch=('i686' 'x86_64' 'mips64el') -url="http://libburnia.pykix.org/" +url="http://libburnia-project.org" license=('GPL') depends=('glibc') source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz{,.sig}) options=('!libtool' '!emptydirs') -md5sums=('1ccbb8624b8c2b9937727000e46b52cf' +md5sums=('3c6ee25f172ff28e7b5e5de4f9f26ba9' 'SKIP') build() { - cd ${srcdir}/${pkgname}-${pkgver/.pl01/} + cd ${pkgname}-${pkgver} # /.pl01/} ./configure --prefix=/usr --disable-static make } package() { - cd ${srcdir}/${pkgname}-${pkgver/.pl01/} + cd ${pkgname}-${pkgver} # /.pl01/} make DESTDIR=${pkgdir} install } diff --git a/extra/libdiscid/PKGBUILD b/extra/libdiscid/PKGBUILD index c3dbd69e7..ba372dd96 100644 --- a/extra/libdiscid/PKGBUILD +++ b/extra/libdiscid/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 188777 2013-06-20 04:15:31Z eric $ +# $Id: PKGBUILD 192092 2013-08-05 19:32:28Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Eric Gillingham <sysrq@sysrq.tk> pkgname=libdiscid -pkgver=0.5.1 +pkgver=0.5.2 pkgrel=1 pkgdesc="A Library for creating MusicBrainz DiscIDs" arch=('i686' 'x86_64' 'mips64el') @@ -12,20 +12,20 @@ license=('LGPL') depends=('glibc') options=('!libtool') source=("http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/${pkgname}-${pkgver}.tar.gz") -md5sums=('7770e649929b378d4758f97f9937a3d5') +md5sums=('ce5141be6082cf2f8a31f624ce8510c9') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } check() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make check } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/libgdata/PKGBUILD b/extra/libgdata/PKGBUILD index 5dc7da933..a08e9273d 100644 --- a/extra/libgdata/PKGBUILD +++ b/extra/libgdata/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183428 2013-04-21 22:11:14Z heftig $ +# $Id: PKGBUILD 192056 2013-08-05 13:43:53Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libgdata -pkgver=0.13.3 +pkgver=0.13.4 pkgrel=1 pkgdesc="GLib-based library for accessing online service APIs using the GData protocol" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ makedepends=('intltool' 'gobject-introspection') url="http://www.gnome.org" options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('4bf52706b2ab404f8b128e000509acd9937facf26916d3e907a3db8653f73637') +sha256sums=('ae405145bb6a2109488b7123206b469b141f17317066471dd485b4ea50499c83') build() { cd "$pkgname-$pkgver" diff --git a/extra/libisoburn/PKGBUILD b/extra/libisoburn/PKGBUILD index e733b5295..8c8c9f278 100644 --- a/extra/libisoburn/PKGBUILD +++ b/extra/libisoburn/PKGBUILD @@ -1,28 +1,28 @@ -# $Id: PKGBUILD 185770 2013-05-18 14:58:09Z andyrtr $ +# $Id: PKGBUILD 192280 2013-08-09 14:22:03Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Gour <Gour <gour@mail.inet.hr> pkgname=libisoburn -pkgver=1.3.0 +pkgver=1.3.2 pkgrel=1 pkgdesc="frontend for libraries libburn and libisofs" -url="http://libburnia.pykix.org/wiki/Libisoburn" +url="http://libburnia-project.org" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') -depends=('libburn>=1.3.0' 'libisofs>=1.3.0' 'readline') +depends=('libburn>=1.3.2' 'libisofs>=1.3.2' 'readline') options=('!libtool') install=${pkgname}.install source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz{,.sig}) -md5sums=('1341e87e385cb559ee1cd2605e372dec' +md5sums=('7ebee7c1d4e09565daddca15467035af' 'SKIP') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} make DESTDIR=${pkgdir} install } diff --git a/extra/libisofs/PKGBUILD b/extra/libisofs/PKGBUILD index 2700c317f..8e9d86495 100644 --- a/extra/libisofs/PKGBUILD +++ b/extra/libisofs/PKGBUILD @@ -1,30 +1,30 @@ -# $Id: PKGBUILD 185768 2013-05-18 14:55:44Z andyrtr $ +# $Id: PKGBUILD 192278 2013-08-09 14:19:12Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Hugo Doria <hugodoria@gmail.com> # Contributor: Bjorn Martensen pkgname=libisofs -pkgver=1.3.0 +pkgver=1.3.2 pkgrel=1 pkgdesc="Library to pack up hard disk files and directories into a ISO 9660 disk image" arch=('i686' 'x86_64' 'mips64el') -url="http://libburnia.pykix.org/" +url="http://libburnia-project.org" license=('GPL') depends=('acl' 'zlib') source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz{,.sig}) options=('!libtool') -md5sums=('5ab9f4a57d3c815d1183cbf49ce86a9e' +md5sums=('3dfdaaf964ed7a779bc23de50c5f2175' 'SKIP') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} ./configure --prefix=/usr \ --enable-libacl --enable-xattr --disable-static make } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} make DESTDIR=${pkgdir} install } diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index eb350d700..6ba2ea184 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188760 2013-06-19 19:35:08Z andyrtr $ +# $Id: PKGBUILD 192063 2013-08-05 14:17:33Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgbase="libreoffice" @@ -21,7 +21,7 @@ pkgname=('libreoffice-common' 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built) _LOver=4.0.4.2 pkgver=4.0.4 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" @@ -33,7 +33,7 @@ makedepends=( # makedepends # the runtime dependencies "curl>=7.20.0" "hunspell>=1.2.8" "python>=3.3" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=51.1" - 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' 'lcms2' 'poppler>=0.22.4' + 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' 'lcms2' 'poppler>=0.24.0' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils' 'ttf-dejavu') # to satisfy regression tests @@ -78,6 +78,7 @@ source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz ${_additional_source_url}/libmspub-0.0.6.tar.bz2 ${_additional_source_url}/libvisio-0.0.28.tar.bz2 make-pyuno-work-with-system-wide-module-install.diff + poppler_buildfix.diff libreoffice-common.sh libreoffice-common.csh) noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 185d60944ea767075d27247c3162b3bc-unowinreg.dll @@ -147,12 +148,13 @@ md5sums=('19462798bbf6e1dc75a8b12bd1775ea2' '1120705cd0f0d9bd5506360bf57b6c2e' '05574c2ec54dd0c29d75cacdf9419f44' '07d2bf5ad839a394cca008b3ec6e7bb1' + '092939d16adbb006780c68040192f8ce' '4195735a80876ae812fca5736b50192a' 'e7e4b3e70e99e5cba8f8dfcacf3b0d87') -build() { +prepare() { - cd ${srcdir}/libreoffice-$_LOver + cd libreoffice-$_LOver # fix exttextcat build error # /usr/include/features.h:330:4: error: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp] @@ -164,6 +166,9 @@ build() { ln -s ${srcdir}/$source . done popd + + # fix build with poppler 0.24.0 + patch -Np1 -i ${srcdir}/poppler_buildfix.diff # fix not upstreamable pyuno paths - patch taken from Debian patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff @@ -179,6 +184,11 @@ build() { # qt4 fix sed -i "s:qmake:qmake-qt4:g" configure.ac +} + +build() { + + cd libreoffice-$_LOver #autoconf -f @@ -275,7 +285,7 @@ package_libreoffice-common() { pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites" install=libreoffice-common.install depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3" "neon>=0.28.6" 'dbus-glib' 'librsvg' - 'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=51.1" 'clucene' 'lcms2' "poppler>=0.22.4" + 'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=51.1" 'clucene' 'lcms2' "poppler>=0.24.0" 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils') optdepends=('libreoffice-langpack: additional language support' 'java-runtime: adds java support' diff --git a/extra/libreoffice/PKGBUILD.41 b/extra/libreoffice/PKGBUILD.41 index 30930fce4..c73d74627 100644 --- a/extra/libreoffice/PKGBUILD.41 +++ b/extra/libreoffice/PKGBUILD.41 @@ -18,9 +18,9 @@ pkgname=('libreoffice-common' 'libreoffice-extension-presentation-minimizer' 'libreoffice-extension-wiki-publisher' 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built) -_LOver=4.1.0.0.beta2 +_LOver=4.1.0.4 pkgver=4.1.0 -pkgrel=0.2 #beta2 +pkgrel=1 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" @@ -29,7 +29,7 @@ makedepends=( # makedepends 'apache-ant' 'gperf' 'kdelibs' 'gconf' 'cppunit' 'beanshell' 'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick' 'glu' 'mesa' 'gst-plugins-base-libs' 'java-environment' 'postgresql-libs' 'doxygen' - 'clucene' 'bluez-libs' # 'harfbuzz' + 'clucene' 'bluez-libs' 'harfbuzz-icu' # the runtime dependencies "curl>=7.20.0" "hunspell>=1.2.8" "python>=3.3" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=51.1" @@ -75,14 +75,12 @@ source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz ${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll ${_additional_source_url}/8473296c671b6e3dd8197f4145e0854b-libodfgen-0.0.2.tar.bz2 - ${_additional_source_url}/c48827713e93539dc7285f9e86ffbdc5-harfbuzz-0.9.17.tar.bz2 ${_additional_source_url}/libcdr-0.0.14.tar.bz2 ${_additional_source_url}/libmspub-0.0.6.tar.bz2 - ${_additional_source_url}/libmwaw-0.1.9.tar.bz2 - ${_additional_source_url}/libvisio-0.0.28.tar.bz2 + ${_additional_source_url}/libmwaw-0.1.10.tar.bz2 + ${_additional_source_url}/libvisio-0.0.30.tar.bz2 make-pyuno-work-with-system-wide-module-install.diff - libreoffice-common.sh libreoffice-common.csh - fix_install.diff) + libreoffice-common.sh libreoffice-common.csh) noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 185d60944ea767075d27247c3162b3bc-unowinreg.dll 08c85a6d6d793daee14e10e22eefdc4b-mdds_0.8.1.tar.bz2 @@ -113,14 +111,13 @@ noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 8473296c671b6e3dd8197f4145e0854b-libodfgen-0.0.2.tar.bz2 - c48827713e93539dc7285f9e86ffbdc5-harfbuzz-0.9.17.tar.bz2 libcdr-0.0.14.tar.bz2 libmspub-0.0.6.tar.bz2 - libmwaw-0.1.9.tar.bz2 - libvisio-0.0.28.tar.bz2 ) -md5sums=('a785e1ed4809246edc39d0b55a807cdd' - '96ea39853d9058cb9e98749539827187' - '6ecbe09a87d5c2c1a186671d24643111' + libmwaw-0.1.10.tar.bz2 + libvisio-0.0.30.tar.bz2 ) +md5sums=('5311656e1b54eadd4b93f948dfd5e68e' + 'e2cd3b63e3050771a1330fc98e41a701' + '1f4438828cbcf83c257742482dade3ef' 'f02578f5218f217a9f20e9c30e119c6a' '1f24ab1d39f4a51faf22244c94a6203f' '35c94d2df8893241173de1d16b6034c0' @@ -151,15 +148,13 @@ md5sums=('a785e1ed4809246edc39d0b55a807cdd' '17410483b5b5f267aa18b7e00b65e6e0' '185d60944ea767075d27247c3162b3bc' '8473296c671b6e3dd8197f4145e0854b' - 'c48827713e93539dc7285f9e86ffbdc5' 'd88f9b94df880d2c05be943b000ca112' '1120705cd0f0d9bd5506360bf57b6c2e' - '2090daf6e8a27b52e8c5f26c915bd7c5' - '05574c2ec54dd0c29d75cacdf9419f44' + '2289bb137bbba9b473ce60168895c036' + '9d9eb3ae6bee763c161228b2b12e25f8' '07d2bf5ad839a394cca008b3ec6e7bb1' '4195735a80876ae812fca5736b50192a' - 'e7e4b3e70e99e5cba8f8dfcacf3b0d87' - 'd1fa6b1b1820cc5a7154720a1dcb0a4a') + 'e7e4b3e70e99e5cba8f8dfcacf3b0d87') prepare() { @@ -179,10 +174,6 @@ prepare() { # fix not upstreamable pyuno paths - patch taken from Debian patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff - # fix file-lists - # http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-4-1&id=8ce82f83fb8146b684bec5d903d76f034ba37d4a - patch -Np1 -i ${srcdir}/fix_install.diff - #use the CFLAGS but remove the LibO overridden ones for i in $CFLAGS; do case "$i" in @@ -246,7 +237,6 @@ build() { --without-system-apache-commons \ --without-system-libodfgen \ --without-system-libmwaw \ - --without-system-harfbuzz \ --with-system-dicts \ --with-external-dict-dir=/usr/share/hunspell \ --with-external-hyph-dir=/usr/share/hyphen \ @@ -294,7 +284,7 @@ package_libreoffice-common() { install=libreoffice-common.install depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3" "neon>=0.28.6" 'dbus-glib' 'librsvg' 'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=51.1" 'clucene' 'lcms2' "poppler>=0.22.4" - 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils') + 'harfbuzz-icu' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils') optdepends=('libreoffice-langpack: additional language support' 'java-runtime: adds java support' 'libcups: adds printing support' @@ -556,7 +546,8 @@ package_libreoffice-sdk() { done # fix environment path to keep compatibility with other java-environments - sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh} +# sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh} + sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.sh } package_libreoffice-sdk-doc() { diff --git a/extra/libreoffice/poppler_buildfix.diff b/extra/libreoffice/poppler_buildfix.diff new file mode 100644 index 000000000..ae11d8b1f --- /dev/null +++ b/extra/libreoffice/poppler_buildfix.diff @@ -0,0 +1,50 @@ +From a7688eff345133147984507c35bf444131cc3d63 Mon Sep 17 00:00:00 2001 +From: Petr Mladek <pmladek@suse.cz> +Date: Tue, 16 Jul 2013 14:45:31 +0000 +Subject: fix build with system poppler-0.23.0 + +XRef *xref parameter has been added to the OutputDev::startPage method, see +http://cgit.freedesktop.org/poppler/poppler/commit/?id=8eb489c355d734a72e140ce7e32470d048362499 + +Change-Id: I7ad875bf58f6998e639c740f0dac3795738cd1db +Reviewed-on: https://gerrit.libreoffice.org/4940 +Reviewed-by: Andras Timar <atimar@suse.com> +Tested-by: Andras Timar <atimar@suse.com> +--- +diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +index 03adf89..53a77d3 100644 +--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx ++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +@@ -481,7 +481,11 @@ PDFOutDev::PDFOutDev( PDFDoc* pDoc ) : + { + } + +-void PDFOutDev::startPage(int /*pageNum*/, GfxState* state) ++void PDFOutDev::startPage(int /*pageNum*/, GfxState* state ++#if POPPLER_CHECK_VERSION(0, 23, 0) ++ , XRef* /*xref*/ ++#endif ++) + { + assert(state); + printf("startPage %f %f\n", +diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +index c0977cb7..4f3d3a9 100644 +--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx ++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +@@ -181,7 +181,11 @@ namespace pdfi + virtual void setDefaultCTM(double *ctm) SAL_OVERRIDE; + + // Start a page. +- virtual void startPage(int pageNum, GfxState *state) SAL_OVERRIDE; ++ virtual void startPage(int pageNum, GfxState *state ++#if POPPLER_CHECK_VERSION(0, 23, 0) ++ , XRef *xref ++#endif ++ ) SAL_OVERRIDE; + + // End a page. + virtual void endPage() SAL_OVERRIDE; +-- +cgit v0.9.0.2-2-gbebe + diff --git a/extra/libsamplerate/PKGBUILD b/extra/libsamplerate/PKGBUILD index bd788e0d2..848c8a990 100644 --- a/extra/libsamplerate/PKGBUILD +++ b/extra/libsamplerate/PKGBUILD @@ -1,31 +1,31 @@ -# $Id: PKGBUILD 136113 2011-08-23 03:20:21Z eric $ +# $Id: PKGBUILD 192312 2013-08-10 02:16:26Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=libsamplerate pkgver=0.1.8 -pkgrel=1.3 +pkgrel=2 pkgdesc="Secret Rabbit Code - aka Sample Rate Converter for audio" arch=('i686' 'x86_64' 'mips64el') url="http://www.mega-nerd.com/SRC/index.html" license=('GPL') depends=('libsndfile') options=('!libtool') -source=(http://www.mega-nerd.com/SRC/libsamplerate-${pkgver}.tar.gz) -md5sums=('1c7fb25191b4e6e3628d198a66a84f47') -sha1sums=('e5fe82c4786be2fa33ca6bd4897db4868347fe70') +source=(http://www.mega-nerd.com/SRC/libsamplerate-${pkgver}.tar.gz{,.asc}) +sha1sums=('e5fe82c4786be2fa33ca6bd4897db4868347fe70' + 'SKIP') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } check() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make check } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/libvdpau/PKGBUILD b/extra/libvdpau/PKGBUILD index ec4e40325..131314257 100644 --- a/extra/libvdpau/PKGBUILD +++ b/extra/libvdpau/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 189278 2013-07-02 07:41:51Z jgc $ +# $Id: PKGBUILD 192069 2013-08-05 15:40:48Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libvdpau -pkgver=0.6 -pkgrel=2 +pkgver=0.7 +pkgrel=1 pkgdesc="Nvidia VDPAU library" arch=(i686 x86_64 mips64el) url='http://cgit.freedesktop.org/~aplattner/libvdpau' @@ -13,7 +13,7 @@ options=('!libtool') license=('custom') source=(http://people.freedesktop.org/~aplattner/vdpau/${pkgname}-${pkgver}.tar.gz) makedepends=('dri2proto') -sha256sums=('9b55beec9d8b01bbf89229b7d075ceee870f4e1830523c11f29a46c07fe72d75') +sha256sums=('24dc08467ce8c59d6cfbf0d34d2dd1f86b4ff62e90777e0a8f513c5c9de9bce0') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libwnck3/PKGBUILD b/extra/libwnck3/PKGBUILD index 72701a12b..8094c64ae 100644 --- a/extra/libwnck3/PKGBUILD +++ b/extra/libwnck3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 182596 2013-04-10 21:34:12Z heftig $ +# $Id: PKGBUILD 192146 2013-08-06 11:30:34Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=libwnck3 _pkgbasename=libwnck -pkgver=3.4.5 +pkgver=3.4.6 pkgrel=1 pkgdesc="Window Navigator Construction Kit (GTK+3)" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ makedepends=('intltool' 'gobject-introspection') options=('!libtool') url="http://www.gnome.org/" source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz) -sha256sums=('560f9709405fb33500c2f79efabdb1c4056866dec281f354ad3da97181fbf381') +sha256sums=('e3ae2d25b684910f49fc548dc96b8a54b77c431d94ad1fd5a37cbecab7bb1851') build() { cd "$_pkgbasename-$pkgver" diff --git a/extra/lv2/PKGBUILD b/extra/lv2/PKGBUILD index 8cf34018a..a970b50b5 100644 --- a/extra/lv2/PKGBUILD +++ b/extra/lv2/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 180306 2013-03-19 21:48:21Z schiv $ +# $Id: PKGBUILD 192433 2013-08-11 16:50:46Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> pkgname=lv2 -pkgver=1.4.0 +pkgver=1.6.0 pkgrel=1 pkgdesc="Successor to the LADSPA audio plug-in standard" url="http://lv2plug.in/" @@ -15,7 +15,7 @@ provides=('lv2core') conflicts=('lv2core') replaces=('lv2core') source=("http://lv2plug.in/spec/$pkgname-$pkgver.tar.bz2") -md5sums=('b7fb567fbfadae14ecd4f422fa24d41e') +md5sums=('943c3a62ec9b4e62139d83f8dd095fab') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/mariadb/PKGBUILD b/extra/mariadb/PKGBUILD index 4935e2033..a9a45312b 100644 --- a/extra/mariadb/PKGBUILD +++ b/extra/mariadb/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 190839 2013-07-18 17:45:57Z bpiotrowski $ +# $Id: PKGBUILD 193074 2013-08-15 15:18:16Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> pkgbase=mariadb pkgname=('libmariadbclient' 'mariadb-clients' 'mariadb') pkgver=5.5.32 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') license=('GPL') url='http://mariadb.org/' @@ -35,7 +35,7 @@ build() { -DENABLED_LOCAL_INFILE=ON \ -DINSTALL_INFODIR=share/mysql/docs \ -DINSTALL_MANDIR=share/man \ - -DINSTALL_PLUGINDIR=/usr/lib/mysql/plugin \ + -DINSTALL_PLUGINDIR=lib/mysql/plugin \ -DINSTALL_SCRIPTDIR=bin \ -DINSTALL_INCLUDEDIR=include/mysql \ -DINSTALL_DOCREADMEDIR=share/mysql \ diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD index 784354ec1..de2c8f8fa 100644 --- a/extra/maxima/PKGBUILD +++ b/extra/maxima/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 187812 2013-06-06 11:09:25Z juergen $ +# $Id: PKGBUILD 192520 2013-08-13 12:39:35Z juergen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Damir Perisa <damir@archlinux.org> pkgname=maxima pkgver=5.30.0 -pkgrel=2 +pkgrel=3 pkgdesc="Maxima - a sophisticated computer algebra system" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -12,7 +12,7 @@ url="http://maxima.sourceforge.net" if [ "${CARCH}" == "mips64el" ] ; then depends=('clisp' 'texinfo' 'sh') else - depends=('sbcl=1.1.8' 'texinfo' 'sh') + depends=('sbcl=1.1.10' 'texinfo' 'sh') fi makedepends=('python2') optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/bin/rmaxima' 'tk: graphical xmaxima interface') diff --git a/extra/miro/PKGBUILD b/extra/miro/PKGBUILD index 921762748..6fe805c8a 100644 --- a/extra/miro/PKGBUILD +++ b/extra/miro/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 191901 2013-08-01 06:53:34Z bpiotrowski $ +# $Id: PKGBUILD 192487 2013-08-13 05:59:27Z bpiotrowski $ # Maintainer: Ronald van Haren <ronald.archlinux.org> pkgname=miro -pkgver=5.0.4 -pkgrel=4 +pkgver=6.0 +pkgrel=1 pkgdesc="The free and open source internet TV platform" arch=('i686' 'x86_64' 'mips64el') url="http://www.getmiro.com" @@ -16,17 +16,13 @@ depends=('python2-dbus' 'pyrex' 'pygtk' 'gstreamer0.10' 'python2-gconf' 'gstreamer0.10-ffmpeg' 'ffmpeg' 'mutagen' 'xdg-utils') makedepends=('boost') install=miro.install -source=("http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz" - 'ffmpeg.patch') -sha1sums=('1144f98149ff07208b994a7cedb45a4beaaa451f' - '37dc0b4de66ccefd5fa3e9a68b187305180b4fc4') +source=("http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz") +sha1sums=('96cd4ed4a26e157422e47dfebf491c8a42e54c51') package() { cd "${srcdir}/${pkgname}-${pkgver}" cd linux - patch -p2 -i "${srcdir}"/ffmpeg.patch - python2 setup.py install --root="${pkgdir}" # fix miro startup script so --debug works with python2 diff --git a/extra/miro/ffmpeg.patch b/extra/miro/ffmpeg.patch deleted file mode 100644 index efbf6f5da..000000000 --- a/extra/miro/ffmpeg.patch +++ /dev/null @@ -1,74 +0,0 @@ ---- miro-5.0.1/linux/miro-segmenter.c~ 2012-07-06 14:33:24.618082171 +0000 -+++ miro-5.0.1/linux/miro-segmenter.c 2012-07-06 15:10:19.564146117 +0000 -@@ -156,7 +156,7 @@ - exit(1); - } - -- ret = av_open_input_file(&ic, input, ifmt, 0, NULL); -+ ret = avformat_open_input(&ic, input, ifmt, 0); - if (ret != 0) { - fprintf(stderr, "Could not open input file, make sure it is an mpegts file: %d\n", ret); - exit(1); -@@ -215,12 +215,7 @@ - } - } - -- if (av_set_parameters(oc, NULL) < 0) { -- fprintf(stderr, "Invalid output format parameters\n"); -- exit(1); -- } -- -- dump_format(oc, 0, input, 1); -+ av_dump_format(oc, 0, input, 1); - - if (video_st) { - codec = avcodec_find_decoder(video_st->codec->codec_id); -@@ -233,12 +228,12 @@ - } - } - -- if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) { -+ if (avio_open(&oc->pb, output_filename, AVIO_FLAG_WRITE) < 0) { - fprintf(stderr, "Could not open '%s'\n", output_filename); - exit(1); - } - -- if (av_write_header(oc)) { -+ if (avformat_write_header(oc, NULL)) { - fprintf(stderr, "Could not write mpegts header to first output file\n"); - - exit(1); -@@ -274,10 +269,10 @@ - } - - if (segment_time - prev_segment_time >= segment_duration) { -- put_flush_packet(oc->pb); -- url_fclose(oc->pb); -+ avio_flush(oc->pb); -+ avio_close(oc->pb); - -- if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) { -+ if (avio_open(&oc->pb, output_filename, AVIO_FLAG_WRITE) < 0) { - fprintf(stderr, "Could not open '%s'\n", output_filename); - break; - } -@@ -307,7 +302,7 @@ - av_freep(&oc->streams[i]); - } - -- url_fclose(oc->pb); -+ avio_close(oc->pb); - av_free(oc); - - /* End-of-transcode marker. */ ---- miro-5.0.4/linux/miro-segmenter.c.orig 2012-10-04 20:48:31.000000000 +0200 -+++ miro-5.0.4/linux/miro-segmenter.c 2013-07-14 13:59:53.171303178 +0200 -@@ -228,7 +228,7 @@ - fprintf(stderr, "Could not find video decoder, key frames will not be honored\n"); - } - -- if (avcodec_open(video_st->codec, codec) < 0) { -+ if (avcodec_open2(video_st->codec, codec, NULL) < 0) { - fprintf(stderr, "Could not open video decoder, key frames will not be honored\n"); - } - } diff --git a/extra/moc/PKGBUILD b/extra/moc/PKGBUILD index 58b68e0d8..e8530f7bd 100644 --- a/extra/moc/PKGBUILD +++ b/extra/moc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 191902 2013-08-01 06:53:35Z bpiotrowski $ +# $Id: PKGBUILD 192415 2013-08-11 01:32:19Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=moc pkgver=2.5beta1 -pkgrel=4 +pkgrel=5 epoch=1 pkgdesc="An ncurses console audio player designed to be powerful and easy to use" arch=('i686' 'x86_64' 'mips64el') @@ -52,7 +52,7 @@ build() { --with-oss --with-alsa --with-jack --with-aac --with-mp3 \ --with-musepack --with-vorbis --with-flac --with-wavpack \ --with-sndfile --with-modplug --with-ffmpeg --with-speex \ - --with-samplerate --with-curl --disable-debug + --with-samplerate --with-curl --disable-cache --disable-debug make } diff --git a/extra/msmtp/PKGBUILD b/extra/msmtp/PKGBUILD index 2e0cf0f28..7fc242493 100644 --- a/extra/msmtp/PKGBUILD +++ b/extra/msmtp/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 187066 2013-06-03 11:16:46Z allan $ +# $Id: PKGBUILD 192440 2013-08-11 23:21:00Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=msmtp @@ -8,7 +8,7 @@ pkgrel=4 arch=('i686' 'x86_64' 'mips64el') license=('GPL3') url="http://msmtp.sourceforge.net" -makedepends=('texlive-core' 'gsasl' 'libgnome-keyring') +makedepends=('texlive-plainextra' 'gsasl' 'libgnome-keyring') source=(http://download.sourceforge.net/sourceforge/msmtp/${pkgbase}-${pkgver}.tar.bz2) sha1sums=('c0edce1e1951968853f15209c8509699ff9e9ab5') diff --git a/extra/nasm/PKGBUILD b/extra/nasm/PKGBUILD index 083193448..8ef22a31f 100644 --- a/extra/nasm/PKGBUILD +++ b/extra/nasm/PKGBUILD @@ -1,28 +1,28 @@ -# $Id: PKGBUILD 174748 2013-01-06 01:52:18Z stephane $ +# $Id: PKGBUILD 192097 2013-08-05 20:37:17Z eric $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=nasm -pkgver=2.10.07 +pkgver=2.10.09 pkgrel=1 pkgdesc="An 80x86 assembler designed for portability and modularity" +arch=('i686' 'x86_64') url="http://www.nasm.us" license=('BSD') -arch=('i686' 'x86_64' 'mips64el') depends=('glibc') -source=(http://www.nasm.us/pub/nasm/releasebuilds/${pkgver}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('2eb839c25ad0aa43a0d2d48146fd8ac708d9aabf') install=nasm.install +source=(http://www.nasm.us/pub/nasm/releasebuilds/${pkgver}/${pkgname}-${pkgver}.tar.xz) +sha1sums=('062dd7315b307870917e708a96b6862481cefc54') build() { - cd "${srcdir}/${pkgbase}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make make -C doc info } package() { - cd "${srcdir}/${pkgbase}-${pkgver}" + cd ${pkgname}-${pkgver} make INSTALLROOT="${pkgdir}" install install_rdf install -dm755 "${pkgdir}"/usr/share/info install -m644 doc/info/* "${pkgdir}"/usr/share/info/ diff --git a/extra/obex-data-server/PKGBUILD b/extra/obex-data-server/PKGBUILD index af2212d26..56f7224e8 100644 --- a/extra/obex-data-server/PKGBUILD +++ b/extra/obex-data-server/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 187105 2013-06-03 20:13:14Z andrea $ +# $Id: PKGBUILD 192478 2013-08-12 20:25:45Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> @@ -6,7 +6,7 @@ pkgname=obex-data-server pkgver=0.4.6 -pkgrel=7 +pkgrel=8 pkgdesc="A D-Bus service providing high-level OBEX client and server side functionality" arch=('i686' 'x86_64' 'mips64el') url="http://wiki.muiline.com/obex-data-server" diff --git a/extra/perl-crypt-openssl-random/PKGBUILD b/extra/perl-crypt-openssl-random/PKGBUILD index 37b05c472..cc0e07a6f 100644 --- a/extra/perl-crypt-openssl-random/PKGBUILD +++ b/extra/perl-crypt-openssl-random/PKGBUILD @@ -3,16 +3,16 @@ # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=perl-crypt-openssl-random -pkgver=0.04 -pkgrel=9 +pkgver=0.06 +pkgrel=1 pkgdesc="Interface to OpenSSL PRNG methods" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/Crypt-OpenSSL-Random" depends=('perl' 'openssl') license=('GPL') options=('!emptydirs') -source=(http://www.cpan.org/authors/id/I/IR/IROBERTS/Crypt-OpenSSL-Random-$pkgver.tar.gz) -md5sums=('c56ac5dbdd46122eb9b8da59613b7b0a') +source=(http://search.cpan.org/CPAN/authors/id/R/RU/RURBAN/Crypt-OpenSSL-Random-$pkgver.tar.gz) +md5sums=('3771d3417f658d28f8682adc1e087136') build() { cd "$srcdir/Crypt-OpenSSL-Random-$pkgver" diff --git a/extra/perl-dbd-sqlite/PKGBUILD b/extra/perl-dbd-sqlite/PKGBUILD index 53cb50634..7c2ffa75b 100644 --- a/extra/perl-dbd-sqlite/PKGBUILD +++ b/extra/perl-dbd-sqlite/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188483 2013-06-14 22:43:41Z eric $ +# $Id: PKGBUILD 192099 2013-08-05 20:52:00Z eric $ # Maintainer: pkgname=perl-dbd-sqlite -pkgver=1.39 +pkgver=1.40 pkgrel=1 pkgdesc="Self-contained RDBMS in a DBI driver" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('GPL' 'PerlArtistic') depends=('perl-dbi' 'sqlite') options=('!emptydirs') source=(http://www.cpan.org/authors/id/I/IS/ISHIGAKI/DBD-SQLite-${pkgver}.tar.gz) -md5sums=('8ca0719852fcbcbbee470c705eeff24a') +md5sums=('b9876882186499583428b14cf5c0e29c') build() { cd DBD-SQLite-${pkgver} diff --git a/extra/perl-net-upnp/PKGBUILD b/extra/perl-net-upnp/PKGBUILD index 40b1c769b..f4a74c9a3 100644 --- a/extra/perl-net-upnp/PKGBUILD +++ b/extra/perl-net-upnp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 143946 2011-11-30 21:55:00Z giovanni $ +# $Id: PKGBUILD 193058 2013-08-15 05:11:38Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Drew Gilbert <gilbert dot drew at gmail dot com> pkgname=perl-net-upnp pkgver=1.4.2 -pkgrel=4 +pkgrel=5 pkgdesc="Perl Module UPnP" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/~skonno/Net-UPnP-1.4.2/" @@ -22,11 +22,17 @@ build() { make } -package() { +check() { cd "${srcdir}/Net-UPnP-${pkgver}" - make install DESTDIR="${pkgdir}" + make test +} + +package() { + cd "${srcdir}/Net-UPnP-${pkgver}" - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete + make install DESTDIR="${pkgdir}" + + # install license file + install -Dm644 "README" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/perl-netaddr-ip/PKGBUILD b/extra/perl-netaddr-ip/PKGBUILD index c69974650..57f61fb40 100644 --- a/extra/perl-netaddr-ip/PKGBUILD +++ b/extra/perl-netaddr-ip/PKGBUILD @@ -1,34 +1,32 @@ -# $Id: PKGBUILD 186411 2013-05-26 09:25:25Z bluewind $ +# $Id: PKGBUILD 192117 2013-08-06 02:08:02Z eric $ # Maintainer: # Contributor: Dale Blount <dale@archlinux.org> # Contributor: Francois Charette <francois.archlinux.org> pkgname=perl-netaddr-ip -_realname=NetAddr-IP -pkgver=4.066 -pkgrel=2 +pkgver=4.069 +pkgrel=1 pkgdesc="Perl module to manage IP addresses and subnets" arch=(i686 x86_64 'mips64el') +url="http://search.cpan.org/dist/NetAddr-IP/" license=('PerlArtistic' 'GPL') depends=('perl') options=('!emptydirs') -url="http://search.cpan.org/dist/${_realname}/" -source=(http://search.cpan.org/CPAN/authors/id/M/MI/MIKER/${_realname}-${pkgver}.tar.gz) -md5sums=('7c6cf77d3c02fa0baf77b6a97f2a670a') +source=(http://search.cpan.org/CPAN/authors/id/M/MI/MIKER/NetAddr-IP-${pkgver}.tar.gz) +md5sums=('7721135fcea390327f75421a6b701144') build() { - cd "${srcdir}/${_realname}-${pkgver}" - # install module in vendor directories. + cd NetAddr-IP-${pkgver} perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "${srcdir}/${_realname}-${pkgver}" + cd NetAddr-IP-${pkgver} make test } package() { - cd "${srcdir}/${_realname}-${pkgver}" + cd NetAddr-IP-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/perl-template-toolkit/PKGBUILD b/extra/perl-template-toolkit/PKGBUILD index 3dedbd70f..dcec9fa06 100644 --- a/extra/perl-template-toolkit/PKGBUILD +++ b/extra/perl-template-toolkit/PKGBUILD @@ -1,38 +1,33 @@ -# $Id: PKGBUILD 186416 2013-05-26 09:25:42Z bluewind $ +# $Id: PKGBUILD 192119 2013-08-06 02:24:44Z eric $ # Maintainer: # Contributor: Firmicus <francois.archlinux.org> # Contributor: Tom Killian <tomk@runbox.com> # Contributor: FJ <joostef@gmail.com> pkgname=perl-template-toolkit -_realname=Template-Toolkit -pkgver=2.24 -pkgrel=2 +pkgver=2.25 +pkgrel=1 pkgdesc="Perl template processing system" arch=(i686 x86_64 'mips64el') +url="http://search.cpan.org/dist/Template-Toolkit/" license=('PerlArtistic') -url="http://search.cpan.org/dist/${_realname}/" -depends=('perl-appconfig' 'perl>=5.10.0') +depends=('perl-appconfig' 'perl') options=('!emptydirs') -source=(http://search.cpan.org/CPAN/authors/id/A/AB/ABW/${_realname}-$pkgver.tar.gz) -md5sums=('c25fdab1beebf8818c2e624bc9f9d212') +source=(http://search.cpan.org/CPAN/authors/id/A/AB/ABW/Template-Toolkit-$pkgver.tar.gz) +md5sums=('6be78743caf5fafe8de4a17c2d0c72ff') build() { - cd "${srcdir}/${_realname}-$pkgver" - # install module in vendor directories. - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + cd Template-Toolkit-$pkgver + perl Makefile.PL INSTALLDIRS=vendor TT_ACCEPT=y make } check() { - cd "${srcdir}/${_realname}-${pkgver}" - - # Failing test can be ignored as it doesn't indicate a problem in main code - # https://rt.cpan.org/Public/Bug/Display.html?id=84778 - make test || true + cd Template-Toolkit-$pkgver + make test } package() { - cd "${srcdir}/${_realname}-$pkgver" + cd Template-Toolkit-$pkgver make install DESTDIR="${pkgdir}" } diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index 06a523ebd..2d9ec3f3f 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 189704 2013-07-05 05:55:47Z pierre $ +# $Id: PKGBUILD 193093 2013-08-16 07:06:58Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=php @@ -21,7 +21,7 @@ pkgname=('php' 'php-sqlite' 'php-tidy' 'php-xsl') -pkgver=5.4.17 +pkgver=5.4.18 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('PHP') @@ -33,7 +33,7 @@ makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx' source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" 'php.ini.patch' 'apache.conf' 'php-fpm.conf.in.patch' 'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles') -md5sums=('1e027e99e2a874310fd518e87e3947af' +md5sums=('b2e185b46b22a48a385cf21a0dc76e65' '44c1bb1df346b3b9d3e092c7df9a37d0' 'dec2cbaad64e3abf4f0ec70e1de4e8e9' '5c1f4c967b66ce3eaf819b46951dcbf5' diff --git a/extra/pigeonhole/PKGBUILD b/extra/pigeonhole/PKGBUILD index 0e3c4add9..1c1d605cc 100644 --- a/extra/pigeonhole/PKGBUILD +++ b/extra/pigeonhole/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 189647 2013-07-04 03:26:07Z andyrtr $ +# $Id: PKGBUILD 192153 2013-08-06 14:10:47Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributorr: Peter Lewis <plewis@aur.archlinux.org> @@ -7,12 +7,12 @@ # This must be built against the version of dovecot being used, # else mail delivery will fail. # Specify the version of dovecot to be used here: -_dcpkgver=2.2.4 +_dcpkgver=2.2.5 # Make sure to bump pkgrel if changing this. pkgname=pigeonhole pkgver=0.4.1 -pkgrel=1 +pkgrel=2 pkgdesc="Sieve implementation for Dovecot" arch=('i686' 'x86_64' 'mips64el') url="http://pigeonhole.dovecot.org/" diff --git a/extra/pixman/PKGBUILD b/extra/pixman/PKGBUILD index 5655fca9b..e81398e3d 100644 --- a/extra/pixman/PKGBUILD +++ b/extra/pixman/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185126 2013-05-11 09:39:45Z andyrtr $ +# $Id: PKGBUILD 192216 2013-08-07 19:14:18Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=pixman -pkgver=0.30.0 +pkgver=0.30.2 pkgrel=1 pkgdesc="The pixel-manipulation library for X and cairo" arch=(i686 x86_64 'mips64el') @@ -13,7 +13,7 @@ license=('custom') depends=('glibc') options=('!libtool') source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('7ef2e8a355c2ac38bd4b3390ad220801433422dc') +sha1sums=('4ea0832932fd5447a1d5768e0d5403b6c7c4dbaf') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD index 777ad72d2..ebe625d87 100644 --- a/extra/poppler/PKGBUILD +++ b/extra/poppler/PKGBUILD @@ -1,37 +1,38 @@ -# $Id: PKGBUILD 188733 2013-06-18 15:55:17Z andyrtr $ +# $Id: PKGBUILD 192058 2013-08-05 14:17:25Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=poppler -pkgname=('poppler' 'poppler-glib' 'poppler-qt') -pkgver=0.22.5 +pkgname=('poppler' 'poppler-glib' 'poppler-qt4' 'poppler-qt5') +pkgver=0.24.0 pkgrel=1 arch=(i686 x86_64 mips64el) license=('GPL') -makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt4' 'pkgconfig' 'lcms2' 'gobject-introspection' 'icu') +makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt4' 'pkgconfig' 'lcms2' 'gobject-introspection' 'icu' 'qt5-base') options=('!libtool' '!emptydirs') url="http://poppler.freedesktop.org/" _testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a -source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz +source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.xz http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2) -md5sums=('1cd27460f7e3379d1eb109cfd7bcdb39' +md5sums=('891000481f639e996d000d767d953a7f' '9dc64c254a31e570507bdd4ad4ba629a') -build() { - - cd "${srcdir}" +prepare() { ln -sf test-${_testtag} test cd ${pkgbase}-${pkgver} sed -i -e '/AC_PATH_XTRA/d' configure.ac sed -i "s:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:" configure.ac +} +build() { + cd ${pkgbase}-${pkgver} autoreconf -fi - ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --enable-cairo-output \ --enable-xpdf-headers \ --enable-libjpeg --enable-zlib \ --enable-poppler-qt4 \ + --enable-poppler-qt5 \ --enable-poppler-glib make } @@ -49,10 +50,11 @@ package_poppler() { cd "${srcdir}/${pkgbase}-${pkgver}" sed -e 's/^glib_subdir =.*/glib_subdir =/' \ - -e 's/^qt4_subdir =.*/qt4_subdir =/' -i Makefile + -e 's/^qt4_subdir =.*/qt4_subdir =/' \ + -e 's/^qt5_subdir =.*/qt5_subdir =/' -i Makefile make DESTDIR="${pkgdir}" install - rm -f "${pkgdir}"/usr/lib/pkgconfig/poppler-{glib,qt4}.pc + rm -f "${pkgdir}"/usr/lib/pkgconfig/poppler-{glib,qt4,qt5}.pc } package_poppler-glib() { @@ -69,8 +71,11 @@ package_poppler-glib() { rm -f "${pkgdir}/usr/bin/poppler-glib-demo" } -package_poppler-qt() { - pkgdesc="Poppler Qt bindings" +package_poppler-qt4() { + pkgdesc="Poppler Qt4 bindings" + provides=("poppler-qt=${pkgver}") + replaces=('poppler-qt') + conflicts=('poppler-qt') depends=("poppler=${pkgver}" 'qt4') cd "${srcdir}/${pkgbase}-${pkgver}/poppler" @@ -81,3 +86,16 @@ package_poppler-qt() { install -m644 ../poppler-qt4.pc "${pkgdir}/usr/lib/pkgconfig/" rm -f "${pkgdir}"/usr/lib/libpoppler.* } + +package_poppler-qt5() { + pkgdesc="Poppler Qt5 bindings" + depends=("poppler=${pkgver}" 'qt5-base') + + cd "${srcdir}/${pkgbase}-${pkgver}/poppler" + make DESTDIR="${pkgdir}" install-libLTLIBRARIES + cd "${srcdir}/${pkgbase}-${pkgver}/qt5" + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/lib/pkgconfig" + install -m644 ../poppler-qt5.pc "${pkgdir}/usr/lib/pkgconfig/" + rm -f "${pkgdir}"/usr/lib/libpoppler.* +} diff --git a/extra/psiconv/PKGBUILD b/extra/psiconv/PKGBUILD index fc389f1c1..a13eba73f 100644 --- a/extra/psiconv/PKGBUILD +++ b/extra/psiconv/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180313 2013-03-20 02:35:34Z eric $ +# $Id: PKGBUILD 192479 2013-08-12 20:25:46Z eric $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=psiconv pkgver=0.9.8 -pkgrel=12 +pkgrel=13 pkgdesc="Converts Psion 5(MX) files to more commonly used file formats" arch=('i686' 'x86_64' 'mips64el') url="http://software.frodo.looijaard.name/psiconv/" diff --git a/extra/pstoedit/PKGBUILD b/extra/pstoedit/PKGBUILD index a20de52d2..26df56f54 100644 --- a/extra/pstoedit/PKGBUILD +++ b/extra/pstoedit/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 191859 2013-07-31 16:31:30Z bpiotrowski $ +# $Id: PKGBUILD 192480 2013-08-12 20:25:47Z eric $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Tobias Powalowski <t.powa@gmx.de> pkgname=pstoedit pkgver=3.62 -pkgrel=1 +pkgrel=2 pkgdesc="Translates PostScript and PDF graphics into other vector formats" arch=("i686" "x86_64" 'mips64el') url="http://www.pstoedit.net/" diff --git a/extra/putty/PKGBUILD b/extra/putty/PKGBUILD index d177db829..b3b357b24 100644 --- a/extra/putty/PKGBUILD +++ b/extra/putty/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 144938 2011-12-11 04:46:16Z eric $ +# $Id: PKGBUILD 192256 2013-08-09 00:29:07Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=putty -pkgver=0.62 -pkgrel=1.1 +pkgver=0.63 +pkgrel=1 pkgdesc="A terminal integrated SSH/Telnet client" arch=('i686' 'x86_64' 'mips64el') url="http://www.chiark.greenend.org.uk/~sgtatham/putty/" @@ -11,18 +11,18 @@ license=('MIT') depends=('gtk2') source=(http://the.earth.li/~sgtatham/putty/${pkgver}/${pkgname}-${pkgver}.tar.gz putty-${pkgver}.tar.gz.sig::http://the.earth.li/~sgtatham/putty/latest/putty-${pkgver}.tar.gz.DSA) -sha1sums=('5898438614117ee7e3704fc3f30a3c4bf2041380' - '128cded001647e3b47494dbfb1eeb70cbed49a7c') +sha1sums=('195c0603ef61082b91276faa8d4246ea472bba3b' + '77a3c246485071f7c2ac7101778bdc6bd4918a6b') build() { - cd "${srcdir}/${pkgname}-${pkgver}/unix" + cd ${pkgname}-${pkgver}/unix sed -i 's/-Werror//' configure ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}/unix" + cd ${pkgname}-${pkgver}/unix make DESTDIR="${pkgdir}" install install -D -m644 ../LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/python-egenix-mx-base/PKGBUILD b/extra/python-egenix-mx-base/PKGBUILD index f478e09b7..b0f59d673 100644 --- a/extra/python-egenix-mx-base/PKGBUILD +++ b/extra/python-egenix-mx-base/PKGBUILD @@ -1,11 +1,10 @@ -# $Id: PKGBUILD 174964 2013-01-09 16:03:42Z stephane $ +# $Id: PKGBUILD 192252 2013-08-08 18:04:12Z eric $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgbase=python-egenix-mx-base pkgname=('python2-egenix-mx-base') -_origname=egenix-mx-base -pkgver=3.2.5 +pkgver=3.2.6 pkgrel=1 pkgdesc="A collection of Python tools" arch=('i686' 'x86_64' 'mips64el') @@ -14,20 +13,25 @@ url="http://www.egenix.com/products/python/mxBase/" makedepends=('python2') conflicts=('python-egenix-mx-base<=3.2.4-1') replaces=('python-egenix-mx-base<=3.2.4-1') -source=("http://downloads.egenix.com/python/${_origname}-${pkgver}.tar.gz") -sha1sums=('d64607ff3bdd0c908f1f4ce39d458514135c9a86') - -build() { - cd "${srcdir}/${_origname}-${pkgver}" +source=(http://downloads.egenix.com/python/egenix-mx-base-${pkgver}.tar.gz{,.asc}) +sha1sums=('3e21c6eba53a841070a4e9430a85ecf8a28df20f' + 'SKIP') +prepare() { + cd egenix-mx-base-${pkgver} find . -name \*.py -exec sed -i -e "s|^#!.*python|#!/usr/bin/python2|" {} \; +} +build() { + cd egenix-mx-base-${pkgver} python2 setup.py build } package_python2-egenix-mx-base() { - depends=('python2>=2.7') - cd "${srcdir}/${_origname}-${pkgver}" + depends=('python2') + + cd egenix-mx-base-${pkgver} python2 setup.py install --root="${pkgdir}" --skip-build --optimize=1 - install -D -m644 COPYRIGHT "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE + chmod 644 "${pkgdir}"/usr/lib/python2.7/site-packages/mx/{URL/Doc/mxURL.pdf,DateTime/Doc/mxDateTime.pdf} + install -D -m644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE } diff --git a/extra/python-lxml/PKGBUILD b/extra/python-lxml/PKGBUILD index c8272f0d2..70b51dbc5 100644 --- a/extra/python-lxml/PKGBUILD +++ b/extra/python-lxml/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 188212 2013-06-13 03:55:11Z angvp $ +# $Id: PKGBUILD 192296 2013-08-09 23:05:32Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> pkgbase=python-lxml pkgname=('python-lxml' 'python2-lxml' 'python-lxml-docs') -pkgver=3.2.1 +pkgver=3.2.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('BSD' 'custom') url="http://lxml.de/" makedepends=('python2' 'python' 'libxslt' 'python-cssselect' 'python2-cssselect') source=(http://pypi.python.org/packages/source/l/lxml/lxml-${pkgver}.tar.gz{,.asc}) -md5sums=('d183ccd6bbd5ca139e9db9e9a675787e' +md5sums=('fef47bb4ac72ac38ce778518dac42236' 'SKIP') # Temporary commented due a conflict with devtools and lxml diff --git a/extra/qrencode/PKGBUILD b/extra/qrencode/PKGBUILD index 6e22ba1d6..644858ae9 100644 --- a/extra/qrencode/PKGBUILD +++ b/extra/qrencode/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184425 2013-05-06 19:39:20Z foutrelis $ +# $Id: PKGBUILD 192463 2013-08-12 10:26:17Z bluewind $ # Maintainer: Florian Pritz< flo@xinu.at> # Contributor: Dany Martineau <dany.luc.martineau@gmail.com> pkgname=qrencode -pkgver=3.4.2 -pkgrel=2 +pkgver=3.4.3 +pkgrel=1 pkgdesc="C library for encoding data in a QR Code symbol." arch=(i686 x86_64 mips64el) depends=('libpng') @@ -13,7 +13,7 @@ url="http://megaui.net/fukuchi/works/qrencode/index.en.html" license=('GPL') options=(!libtool) source=(http://megaui.net/fukuchi/works/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('2c1693a29fe2f26089ccdff9051c0a3f') +md5sums=('89a90a3b8cbca60ac412b2e0e0c776e7') build() { cd "${srcdir}/$pkgname-$pkgver" diff --git a/extra/racket/PKGBUILD b/extra/racket/PKGBUILD index f1a873c99..ccf956ea3 100644 --- a/extra/racket/PKGBUILD +++ b/extra/racket/PKGBUILD @@ -1,27 +1,21 @@ -# $Id: PKGBUILD 188741 2013-06-19 03:52:40Z eric $ +# $Id: PKGBUILD 192411 2013-08-10 21:15:00Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=racket -pkgver=5.3.5 +pkgver=5.3.6 pkgrel=1 pkgdesc="A programming language environment (formerly known as PLT Scheme) suitable for tasks ranging from scripting to application development" arch=('i686' 'x86_64' 'mips64el') url="http://racket-lang.org/" license=('LGPL') -depends=('gtk2' 'desktop-file-utils') +depends=('gtk2' 'desktop-file-utils' 'hicolor-icon-theme') makedepends=('gsfonts' 'sqlite') options=('!libtool' '!strip') install=racket.install -source=(http://download.racket-lang.org/installers/${pkgver}/racket/${pkgname}-${pkgver}-src-unix.tgz \ - drracket.desktop racket-libpng16.patch) -sha1sums=('8a895454a9e0fdf689368fa54ce63ba88d432c5e' - 'a20808f6b250225704856f82a544681a962a299d' - '5b0260f92fc1ec4dc09d90a5264683bd3b5eed5e') - -prepare() { - cd ${pkgname}-${pkgver} - patch -p1 -i "${srcdir}/racket-libpng16.patch" -} +source=(http://download.racket-lang.org/installers/${pkgver}/racket/${pkgname}-${pkgver}-src-unix.tgz + drracket.desktop) +sha1sums=('783485416359f4fc22da41c5a1a89103e7cb9d95' + 'a20808f6b250225704856f82a544681a962a299d') build() { cd ${pkgname}-${pkgver}/src @@ -34,6 +28,9 @@ package() { cd ${pkgname}-${pkgver}/src make DESTDIR="${pkgdir}" install - install -D -m644 ../collects/icons/plt.xpm "${pkgdir}/usr/share/pixmaps/drracket.xpm" + install -d "${pkgdir}"/usr/share/icons/hicolor/{16x16,32x32,48x48}/apps + ln -s /usr/lib/racket/collects/icons/plt-16x16.png "${pkgdir}/usr/share/icons/hicolor/16x16/apps/drracket.png" + ln -s /usr/lib/racket/collects/icons/plt-32x32.png "${pkgdir}/usr/share/icons/hicolor/32x32/apps/drracket.png" + ln -s /usr/lib/racket/collects/icons/plt-48x48.png "${pkgdir}/usr/share/icons/hicolor/48x48/apps/drracket.png" install -D -m644 "${srcdir}/drracket.desktop" "${pkgdir}/usr/share/applications/drracket.desktop" } diff --git a/extra/racket/racket-libpng16.patch b/extra/racket/racket-libpng16.patch deleted file mode 100644 index 8e4b605f2..000000000 --- a/extra/racket/racket-libpng16.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 5629a6156a5720e51a277849f75b3135cb93664f Mon Sep 17 00:00:00 2001 -From: Matthew Flatt <mflatt@racket-lang.org> -Date: Wed, 15 May 2013 20:28:05 -0600 -Subject: [PATCH] support libpng16 - ---- - collects/racket/draw/unsafe/png.rkt | 21 ++++++++++++++------- - 1 file changed, 14 insertions(+), 7 deletions(-) - -diff --git a/collects/racket/draw/unsafe/png.rkt b/collects/racket/draw/unsafe/png.rkt -index 596fcb4..a6b028d 100644 ---- a/collects/racket/draw/unsafe/png.rkt -+++ b/collects/racket/draw/unsafe/png.rkt -@@ -10,11 +10,15 @@ - [(unix) - ;; Most Linux distros supply "libpng12", while other Unix - ;; variants often have just "libpng", etc. -- (ffi-lib "libpng15" '("15" "") -- #:fail (lambda () -- (ffi-lib "libpng12" '("0" "") -- #:fail (lambda () -- (ffi-lib "libpng")))))] -+ (let loop ([alts '(("libpng16" ("16" "")) -+ ("libpng15" ("15" "")) -+ ("libpng12" ("0" "")) -+ ("libpng"))]) -+ (cond -+ [(null? alts) #f] -+ [else (apply ffi-lib (car alts) -+ #:fail (lambda () -+ (loop (cdr alts))))]))] - [(macosx) (ffi-lib "libpng15.15.dylib")] - [(windows) - (ffi-lib "zlib1.dll") -@@ -29,9 +33,12 @@ - ;; assume that other versions are also ok - (define PNG_LIBPNG_VER_STRING (string->bytes/latin-1 - (let ([v (png_access_version_number)]) -- (format "~s.~s" -+ (format "~s.~s~a" - (quotient v 10000) -- (quotient (remainder v 10000) 100))))) -+ (quotient (remainder v 10000) 100) -+ (if (zero? (remainder v 100)) -+ "" -+ (format ".~a" (remainder v 100))))))) - - (define _png_structp (_cpointer 'png_structp)) - (define _png_infop (_cpointer 'png_infop)) --- -1.8.1.6 - diff --git a/extra/racket/racket.install b/extra/racket/racket.install index 660593cf5..c317fbaca 100644 --- a/extra/racket/racket.install +++ b/extra/racket/racket.install @@ -1,11 +1,12 @@ post_install() { - update-desktop-database -q + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } post_upgrade() { - post_install + post_install } post_remove() { - post_install + post_install } diff --git a/extra/rdesktop/PKGBUILD b/extra/rdesktop/PKGBUILD index f3e237c08..9b3b81803 100644 --- a/extra/rdesktop/PKGBUILD +++ b/extra/rdesktop/PKGBUILD @@ -1,23 +1,28 @@ -# $Id: PKGBUILD 176924 2013-02-02 17:56:28Z andrea $ +# $Id: PKGBUILD 193090 2013-08-15 23:15:47Z eric $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Dan McGee <dan@archlinux.org> pkgname=rdesktop -pkgver=1.7.1 +pkgver=1.8.0 pkgrel=3 pkgdesc="An open source client for Windows Remote Desktop Services" arch=('i686' 'x86_64' 'mips64el') url="http://www.rdesktop.org/" license=('GPL3') -depends=('openssl' 'libao' 'libsamplerate' 'xorg-xrandr') +depends=('libao' 'libsamplerate' 'xorg-xrandr' 'pcsclite') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'rdesktop-send_physical_buttons.diff' 'rdesktop-libao.patch') -md5sums=('c4b39115951c4a6d74f511c99b18fcf9' - '880d3aeac67b901e6bf44d1323374768' - 'bd2c9bc68bddcc2652c668753d787df7') + 'rdesktop-send_physical_buttons.diff' 'rdesktop-libao.patch' 'rdesktop-tcp.patch' + rdesktop-r1729.patch rdesktop-r1731.patch rdesktop-r1732.patch) +sha1sums=('2d39a41d29ad1ad2509d1e343a2817a3c7d666de' + '809a9dc11ad4f704f79fc4bc2a70b76a4f42596d' + '68a48061e5ed76150c1444891a192f7884fd056e' + 'a14793c72194bed74725bcf75fdb8b93c7577399' + '972d6ec59cf140383880464e3ef43e03969f3bfe' + '9a417aba27ded0ab595cbb07fccd452bdc0af20c' + '1bc92e04058a2f5c02f42a5c97da7ee672a71698') -build() { +prepare() { cd ${pkgname}-${pkgver} # FS#15113 @@ -26,6 +31,17 @@ build() { # Fix libao segfault, from Fedora patch -i "${srcdir}/rdesktop-libao.patch" + # FS#36488 + patch -i "${srcdir}/rdesktop-tcp.patch" + patch -i "${srcdir}/rdesktop-r1731.patch" + patch -i "${srcdir}/rdesktop-r1732.patch" + + # FS#36505 + patch -i "${srcdir}/rdesktop-r1729.patch" +} + +build() { + cd ${pkgname}-${pkgver} ./configure --prefix=/usr \ --enable-smartcard \ --with-ipv6 diff --git a/extra/rdesktop/rdesktop-libao.patch b/extra/rdesktop/rdesktop-libao.patch index 1f3dea9ed..9def24443 100644 --- a/extra/rdesktop/rdesktop-libao.patch +++ b/extra/rdesktop/rdesktop-libao.patch @@ -1,20 +1,12 @@ -diff -up rdesktop-1.6.0/rdpsnd_libao.c.ao rdesktop-1.6.0/rdpsnd_libao.c ---- rdesktop-1.6.0/rdpsnd_libao.c.ao 2007-10-30 14:57:30.000000000 +0100 -+++ rdesktop-1.6.0/rdpsnd_libao.c 2010-12-02 21:22:39.000000000 +0100 -@@ -76,7 +76,7 @@ libao_open(void) - format.channels = 2; - format.rate = 44100; - format.byte_format = AO_FMT_NATIVE; -- -+ format.matrix = NULL; +Index: rdpsnd_libao.c +=================================================================== +--- rdpsnd_libao.c (revision 1729) ++++ rdpsnd_libao.c (revision 1730) +@@ -111,6 +111,7 @@ + { + ao_sample_format format; - o_device = ao_open_live(default_driver, &format, NULL); - if (o_device == NULL) -@@ -115,6 +115,7 @@ libao_set_format(RD_WAVEFORMATEX * pwfx) ++ memset(&format, 0, sizeof(format)); + format.bits = pwfx->wBitsPerSample; format.channels = pwfx->nChannels; format.rate = 44100; - format.byte_format = AO_FMT_NATIVE; -+ format.matrix = NULL; - - if (o_device != NULL) - ao_close(o_device); diff --git a/extra/rdesktop/rdesktop-r1729.patch b/extra/rdesktop/rdesktop-r1729.patch new file mode 100644 index 000000000..3f38a692c --- /dev/null +++ b/extra/rdesktop/rdesktop-r1729.patch @@ -0,0 +1,33 @@ +Index: scard.c +=================================================================== +--- scard.c (revision 1728) ++++ scard.c (revision 1729) +@@ -2,8 +2,8 @@ + rdesktop: A Remote Desktop Protocol client. + Smart Card support + Copyright (C) Alexi Volkov <alexi@myrealbox.com> 2006 +- Copyright 2010 Pierre Ossman <ossman@cendio.se> for Cendio AB +- Copyright 2011 Henrik Andersson <hean01@cendio.se> for Cendio AB ++ Copyright 2010-2013 Pierre Ossman <ossman@cendio.se> for Cendio AB ++ Copyright 2011-2013 Henrik Andersson <hean01@cendio.se> for Cendio AB + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by +@@ -1109,6 +1109,7 @@ + MYPCSC_SCARDCONTEXT myHContext; + SERVER_DWORD dwTimeout; + SERVER_DWORD dwCount; ++ SERVER_DWORD dwPointerId; + SERVER_LPSCARD_READERSTATE_A rsArray, cur; + MYPCSC_LPSCARD_READERSTATE_A myRsArray; + long i; +@@ -1133,7 +1134,8 @@ + memset(rsArray, 0, dwCount * sizeof(SERVER_SCARD_READERSTATE_A)); + for (i = 0, cur = rsArray; i < dwCount; i++, cur++) + { +- in_uint32_le(in, cur->szReader); ++ in_uint32_le(in, dwPointerId); ++ cur->szReader = (char *)(intptr_t)dwPointerId; + in_uint32_le(in, cur->dwCurrentState); + in_uint32_le(in, cur->dwEventState); + in_uint32_le(in, cur->cbAtr); diff --git a/extra/rdesktop/rdesktop-r1731.patch b/extra/rdesktop/rdesktop-r1731.patch new file mode 100644 index 000000000..f72728191 --- /dev/null +++ b/extra/rdesktop/rdesktop-r1731.patch @@ -0,0 +1,13 @@ +Index: rdesktop.c +=================================================================== +--- rdesktop.c (revision 1730) ++++ rdesktop.c (revision 1731) +@@ -87,7 +87,7 @@ + RD_BOOL g_sendmotion = True; + RD_BOOL g_bitmap_cache = True; + RD_BOOL g_bitmap_cache_persist_enable = False; +-RD_BOOL g_bitmap_cache_precache = True; ++RD_BOOL g_bitmap_cache_precache = False; + RD_BOOL g_use_ctrl = True; + RD_BOOL g_encryption = True; + RD_BOOL g_encryption_initial = True; diff --git a/extra/rdesktop/rdesktop-r1732.patch b/extra/rdesktop/rdesktop-r1732.patch new file mode 100644 index 000000000..a4260d0d0 --- /dev/null +++ b/extra/rdesktop/rdesktop-r1732.patch @@ -0,0 +1,73 @@ +Index: proto.h +=================================================================== +--- proto.h (revision 1731) ++++ proto.h (revision 1732) +@@ -144,6 +144,7 @@ + char *l_to_a(long N, int base); + int load_licence(unsigned char **data); + void save_licence(unsigned char *data, int length); ++void rd_create_ui(void); + RD_BOOL rd_pstcache_mkdir(void); + int rd_open_file(char *filename); + void rd_close_file(int fd); +Index: rdp.c +=================================================================== +--- rdp.c (revision 1731) ++++ rdp.c (revision 1732) +@@ -1044,6 +1044,9 @@ + uint8 type; + uint16 len_src_descriptor, len_combined_caps; + ++ /* at this point we need to ensure that we have ui created */ ++ rd_create_ui(); ++ + in_uint32_le(s, g_rdp_shareid); + in_uint16_le(s, len_src_descriptor); + in_uint16_le(s, len_combined_caps); +Index: rdesktop.c +=================================================================== +--- rdesktop.c (revision 1731) ++++ rdesktop.c (revision 1732) +@@ -87,7 +87,7 @@ + RD_BOOL g_sendmotion = True; + RD_BOOL g_bitmap_cache = True; + RD_BOOL g_bitmap_cache_persist_enable = False; +-RD_BOOL g_bitmap_cache_precache = False; ++RD_BOOL g_bitmap_cache_precache = True; + RD_BOOL g_use_ctrl = True; + RD_BOOL g_encryption = True; + RD_BOOL g_encryption_initial = True; +@@ -1132,13 +1132,7 @@ + DEBUG(("Connection successful.\n")); + memset(password, 0, sizeof(password)); + +- /* only create a window if we dont have one intialized */ +- if (!ui_have_window()) +- { +- if (!ui_create_window()) +- return EX_OSERR; +- } +- ++ rd_create_ui(); + tcp_run_ui(True); + + g_redirect = False; +@@ -1732,6 +1726,18 @@ + close(fd); + } + ++/* create rdesktop ui */ ++void ++rd_create_ui() ++{ ++ /* only create a window if we dont have one intialized */ ++ if (!ui_have_window()) ++ { ++ if (!ui_create_window()) ++ return EX_OSERR; ++ } ++} ++ + /* Create the bitmap cache directory */ + RD_BOOL + rd_pstcache_mkdir(void) diff --git a/extra/rdesktop/rdesktop-send_physical_buttons.diff b/extra/rdesktop/rdesktop-send_physical_buttons.diff index 8e0f6cee7..69620988f 100644 --- a/extra/rdesktop/rdesktop-send_physical_buttons.diff +++ b/extra/rdesktop/rdesktop-send_physical_buttons.diff @@ -26,8 +26,8 @@ diff -u -r1.163 rdesktop.c #endif while ((c = getopt(argc, argv, -- VNCOPT "Au:L:d:s:c:p:n:k:g:fbBeEmzCDKS:T:NX:a:x:Pr:045h?")) != -1) -+ VNCOPT "Au:L:d:s:c:p:n:k:g:fbBeEMmzCDKS:T:NX:a:x:Pr:045h?")) != -1) +- VNCOPT "A:u:L:d:s:c:p:n:k:g:o:fbBeEitmzCDKS:T:NX:a:x:Pr:045h?")) != -1) ++ VNCOPT "A:u:L:d:s:c:p:n:k:g:o:fbBeEitMmzCDKS:T:NX:a:x:Pr:045h?")) != -1) { switch (c) { diff --git a/extra/rdesktop/rdesktop-tcp.patch b/extra/rdesktop/rdesktop-tcp.patch new file mode 100644 index 000000000..f20182978 --- /dev/null +++ b/extra/rdesktop/rdesktop-tcp.patch @@ -0,0 +1,11 @@ +--- a/rdesktop/trunk/tcp.c ++++ b/rdesktop/trunk/tcp.c +@@ -193,7 +193,7 @@ + int rcvd = 0, ssl_err; + + if (g_network_error == True) +- return; ++ return NULL; + + if (s == NULL) + { diff --git a/extra/refind-efi/PKGBUILD b/extra/refind-efi/PKGBUILD index 5b7826717..1954b0992 100644 --- a/extra/refind-efi/PKGBUILD +++ b/extra/refind-efi/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 191365 2013-07-24 10:47:59Z tpowa $ +# $Id: PKGBUILD 192314 2013-08-10 05:37:22Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Keshav Padram <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> @@ -16,8 +16,8 @@ _COMPILER="GCC46" ####### pkgname="refind-efi" -pkgver="0.7.1" -pkgrel="4" +pkgver="0.7.3" +pkgrel="1" pkgdesc="Rod Smith's fork of rEFIt UEFI Boot Manager - built with Tianocore UDK libs" url="http://www.rodsbooks.com/refind/index.html" arch=('x86_64' 'i686') @@ -242,3 +242,10 @@ package() { sed 's|^ThisScript=.*|ThisScript="/usr/bin/refind-install"|g' -i "${pkgdir}/usr/bin/refind-install" } +sha1sums=('baac40c10b26b337c85248aa8e2b61ab4f06f73d' + '3d53eb615c3363d45feb95b9bfbf1d5491bf1c24' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP') diff --git a/extra/refind-efi/refind-efi.install b/extra/refind-efi/refind-efi.install index 947d157e3..a1f237896 100644 --- a/extra/refind-efi/refind-efi.install +++ b/extra/refind-efi/refind-efi.install @@ -6,7 +6,7 @@ rEFInd UEFI application has been installed at /usr/share/refind/refind_*.efi Other UEFI applications have been installed at /usr/share/refind/tools_*/ -UEFI drivers have deen installed at /usr/share/refind/drivers_*/ +UEFI drivers have been installed at /usr/share/refind/drivers_*/ Copy the efi application (according to your UEFI ARCH) and /usr/share/refind/refind.conf-sample to a sub-directory of <EFISYS>/EFI/ diff --git a/extra/rygel/PKGBUILD b/extra/rygel/PKGBUILD index 2a449a41a..244d9dca6 100644 --- a/extra/rygel/PKGBUILD +++ b/extra/rygel/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 191370 2013-07-24 12:22:37Z heftig $ +# $Id: PKGBUILD 192270 2013-08-09 12:52:33Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Balló György <ballogyor+arch at gmail dot com> pkgname=rygel -pkgver=0.18.3 +pkgver=0.18.4 pkgrel=1 pkgdesc="UPnP AV MediaServer and MediaRenderer that allows you to easily share audio, video and pictures, and control of media player on your home network" arch=('i686' 'x86_64' 'mips64el') @@ -22,7 +22,7 @@ options=('!libtool') install=rygel.install groups=('gnome-extra') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('b3bb97476b44f7adae162c8cdb062160120336ed33a88c2a692ab8fac187d105') +sha256sums=('f63f3f1cd1456b7e3b9232ec81ad481d220530a734ed8a09eb046d30c34d3ebe') build() { cd $pkgname-$pkgver diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD index d809ad4c7..570fd2d63 100644 --- a/extra/samba/PKGBUILD +++ b/extra/samba/PKGBUILD @@ -10,12 +10,12 @@ pkgbase=samba pkgname=('libwbclient' 'smbclient' 'samba') -pkgver=4.0.7 +pkgver=4.0.8 # We use the 'A' to fake out pacman's version comparators. Samba chooses # to append 'a','b',etc to their subsequent releases, which pamcan # misconstrues as alpha, beta, etc. Bad samba! -_realver=4.0.7 -pkgrel=3 +_realver=4.0.8 +pkgrel=1 arch=(i686 x86_64 mips64el) url="http://www.samba.org" license=('GPL3') @@ -246,17 +246,17 @@ sys.path.insert(0, '/usr/lib/python${_pyver}/site-packages')" \ install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema } -md5sums=('d887c1383654fc60b7bb1b74d273a826' +md5sums=('03819bc1132e417feac1b39299365b73' '5697da77590ec092cc8a883bae06093c' 'ee8507839745cf17d2fb5401be7da6a8' '96f82c38f3f540b53f3e5144900acf17' 'ee4763a656cf00d92bfda31b6bb2c5cb' '6c447748a064d631435dbef0a3dcf32f' - 'c0c561c47de24d33dd48aae79823810b' + 'e4ae6a3cac080602120aa151918c4a36' 'a78b9aa93eb14b0ac445897395693225' - 'e8ebc966b5684a557284dd435daaab7f' + 'df6380c73cb73163968eabc8650f7358' '70afd2db60a2e8eff7615dbdecd887ac' '6db11f3dd2112a4b7a73007b189bef3f' 'fd6be0cf1e5b3f0c3599fdb95455d19f' - '081c20b9d994d69ce5c37dcf96f10572' + 'd5f56f43e1280bba20f6bbd88d16fa41' '49abd7b719e3713a3f75a8a50958e381') diff --git a/extra/samba/nmbd.service b/extra/samba/nmbd.service index 34c66d5d6..e138225ac 100644 --- a/extra/samba/nmbd.service +++ b/extra/samba/nmbd.service @@ -5,7 +5,7 @@ After=network.target [Service] Type=forking PIDFile=/var/run/nmbd.pid -ExecStart=/usr/bin/nmbd -D +ExecStart=/usr/bin/nmbd -D ExecReload=/bin/kill -HUP $MAINPID [Install] diff --git a/extra/samba/smbd.service b/extra/samba/smbd.service index de34c2a5f..0a8125db0 100644 --- a/extra/samba/smbd.service +++ b/extra/samba/smbd.service @@ -5,7 +5,7 @@ After=network.target nmbd.service winbindd.service [Service] Type=forking PIDFile=/var/run/smbd.pid -ExecStart=/usr/bin/smbd -D +ExecStart=/usr/bin/smbd -D ExecReload=/bin/kill -HUP $MAINPID [Install] diff --git a/extra/samba/winbindd.service b/extra/samba/winbindd.service index 20bac9a83..41ecbfdd5 100644 --- a/extra/samba/winbindd.service +++ b/extra/samba/winbindd.service @@ -5,7 +5,7 @@ After=network.target nmbd.service [Service] Type=forking PIDFile=/var/run/winbindd.pid -ExecStart=/usr/bin/winbindd -D +ExecStart=/usr/bin/winbindd -D ExecReload=/bin/kill -HUP $MAINPID [Install] diff --git a/extra/sbcl/PKGBUILD b/extra/sbcl/PKGBUILD index dbeffd68b..014f6d1f9 100644 --- a/extra/sbcl/PKGBUILD +++ b/extra/sbcl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 187814 2013-06-06 11:10:02Z juergen $ +# $Id: PKGBUILD 192518 2013-08-13 12:04:18Z juergen $ # Contributor: John Proctor <jproctor@prium.net> # Contributor: Daniel White <daniel@whitehouse.id.au> # Maintainer: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Leslie Polzer (skypher) pkgname=sbcl -pkgver=1.1.8 +pkgver=1.1.10 pkgrel=1 pkgdesc="Steel Bank Common Lisp" url="http://www.sbcl.org/" @@ -21,7 +21,7 @@ source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pk "arch-fixes.lisp" "ftp://ftp.gnu.org/pub/gnu/texinfo/texinfo-4.13a.tar.gz" "texinfo-4.13a-data_types.patch") -md5sums=('118dea06e26151d8315a118169ec16ec' +md5sums=('ccec396f1bef6468be1f18bcc60231fe' '7ac0c1936547f4278198b8bf7725204d' '71ba711519209b5fb583fed2b3d86fcb' 'd8574782ff7def1e2dc5c291dbeaec18') diff --git a/extra/sdl2/PKGBUILD b/extra/sdl2/PKGBUILD new file mode 100644 index 000000000..8cd8fc037 --- /dev/null +++ b/extra/sdl2/PKGBUILD @@ -0,0 +1,35 @@ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> + +pkgname=sdl2 +pkgver=2.0.0 +pkgrel=3 +pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard (Version 2)" +arch=('i686' 'x86_64') +url="http://www.libsdl.org" +license=('MIT') +depends=('glibc' 'libxext' 'libxrender' 'libx11' 'libgl') +makedepends=('alsa-lib' 'mesa' 'libpulse' 'cmake') +optdepends=('alsa-lib: ALSA audio driver' + 'libpulse: PulseAudio audio driver') +source=("http://www.libsdl.org/release/SDL2-${pkgver}.tar.gz") +md5sums=('beec89afb6edcc6f0abc4114f2e6bcf7') + +build() { + cd "${srcdir}/SDL2-${pkgver}" + + mkdir build && cd build + + cmake .. \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DSDL_STATIC=OFF \ + -DRPATH=OFF + make +} + +package() { + cd "${srcdir}/SDL2-${pkgver}/build" + + make DESTDIR="${pkgdir}/" install + + install -Dm644 ../COPYING.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/extra/sdl2_gfx/PKGBUILD b/extra/sdl2_gfx/PKGBUILD new file mode 100644 index 000000000..b302c886a --- /dev/null +++ b/extra/sdl2_gfx/PKGBUILD @@ -0,0 +1,30 @@ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Jameson Pugh <imntreal@gmail.com> + +pkgname=sdl2_gfx +pkgver=5 +pkgrel=1 +pkgdesc="SDL Graphic Primitives (Version 2)" +arch=('i686' 'x86_64') +url="http://www.ferzkopp.net/joomla/software-mainmenu-14/4-ferzkopps-linux-software/19-sdlgfx" +license=('zlib') +depends=('sdl2') +makedepends=('svn') +options=(!libtool) +source=("sdl2-gfx::svn://svn.code.sf.net/p/sdl2gfx/code/trunk#revision=$pkgver") +md5sums=('SKIP') + +build() { + cd "${srcdir}/sdl2-gfx" + + ./autogen.sh + ./configure --disable-static --prefix=/usr + make +} + +package() { + cd "${srcdir}/sdl2-gfx" + make DESTDIR="${pkgdir}/" install + + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/extra/sdl2_image/PKGBUILD b/extra/sdl2_image/PKGBUILD new file mode 100644 index 000000000..fc17b5d2d --- /dev/null +++ b/extra/sdl2_image/PKGBUILD @@ -0,0 +1,27 @@ +#Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> + +pkgname=sdl2_image +pkgver=2.0.0 +pkgrel=1 +pkgdesc="A simple library to load images of various formats as SDL surfaces (Version 2)" +arch=('i686' 'x86_64') +url="http://www.libsdl.org" +license=('MIT') +depends=('sdl2' 'libpng' 'libtiff' 'libjpeg' 'libwebp') +makedepends=('cmake') +options=(!libtool) +source=("http://www.libsdl.org/tmp/SDL_image/release/SDL2_image-${pkgver}.tar.gz") +sha1sums=('1a37f0f63421bd1b86dd6ddabcb04fa8f28874ce') + +build() { + cd "${srcdir}/SDL2_image-${pkgver}/" + ./configure --disable-static --prefix=/usr + make +} + +package() { + cd "${srcdir}/SDL2_image-${pkgver}/" + + make DESTDIR="${pkgdir}/" install + install -Dm644 COPYING.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/extra/sdl2_mixer/PKGBUILD b/extra/sdl2_mixer/PKGBUILD new file mode 100644 index 000000000..760fee8a7 --- /dev/null +++ b/extra/sdl2_mixer/PKGBUILD @@ -0,0 +1,29 @@ +#Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> + +pkgname=sdl2_mixer +pkgver=2.0.0 +pkgrel=1 +pkgdesc="A simple multi-channel audio mixer (Version 2)" +arch=('i686' 'x86_64') +url="http://www.libsdl.org" +license=('MIT') +depends=('sdl2' 'libvorbis' 'libmodplug' 'smpeg2' 'flac') +makedepends=('fluidsynth') +optdepends=('fluidsynth: MIDI software synth, replaces built-in timidity') +options=(!libtool) +source=("http://www.libsdl.org/tmp/SDL_mixer/release/SDL2_mixer-${pkgver}.tar.gz") +md5sums=('4c85cdc7b6d162afb918aed626436109') + +build() { + cd "${srcdir}/SDL2_mixer-${pkgver}/" + + ./configure --disable-static --prefix=/usr + make +} + +package() { + cd "${srcdir}/SDL2_mixer-${pkgver}/" + + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/extra/sdl2_net/PKGBUILD b/extra/sdl2_net/PKGBUILD new file mode 100644 index 000000000..6deb7d889 --- /dev/null +++ b/extra/sdl2_net/PKGBUILD @@ -0,0 +1,30 @@ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> + +pkgname=sdl2_net +pkgver=249 +pkgrel=1 +pkgdesc="A small sample cross-platform networking library (Version 2)" +arch=('i686' 'x86_64') +url="http://www.libsdl.org" +license=('MIT') +depends=(sdl2) +makedepends=(mercurial) +options=(!libtool) +source=("sdl2_net::hg+http://hg.libsdl.org/SDL_net#revision=$pkgver") +md5sums=('SKIP') + +build() { + cd "${srcdir}/sdl2_net/" + + ./autogen.sh + ./configure --disable-static --prefix=/usr + make +} + +package() { + cd "${srcdir}/sdl2_net/" + + make DESTDIR="${pkgdir}/" install + + install -Dm644 COPYING.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/extra/sdl2_ttf/PKGBUILD b/extra/sdl2_ttf/PKGBUILD new file mode 100644 index 000000000..fe743318c --- /dev/null +++ b/extra/sdl2_ttf/PKGBUILD @@ -0,0 +1,31 @@ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> + +pkgname=sdl2_ttf +pkgver=2.0.12 +pkgrel=1 +pkgdesc="A library that allows you to use TrueType fonts in your SDL applications (Version 2)" +arch=('i686' 'x86_64') +url="http://www.libsdl.org" +license=('MIT') +depends=('sdl2' 'freetype2') +makedepends=('cmake') +provides=(sdl2_ttf) +options=(!libtool) +source=("http://www.libsdl.org/tmp/SDL_ttf/release/SDL2_ttf-${pkgver}.tar.gz") +md5sums=('a0925e117cc5f0fb7cf2a66c7968c117') + +build() { + cd "${srcdir}/SDL2_ttf-${pkgver}/" + + ./autogen.sh + ./configure --disable-static --prefix=/usr + make +} + +package() { + cd "${srcdir}/SDL2_ttf-${pkgver}/" + + make DESTDIR="${pkgdir}/" install + + install -Dm644 COPYING.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/extra/smartmontools/PKGBUILD b/extra/smartmontools/PKGBUILD index 676484541..3f29ad702 100644 --- a/extra/smartmontools/PKGBUILD +++ b/extra/smartmontools/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 185826 2013-05-19 13:29:06Z giovanni $ +# $Id: PKGBUILD 192431 2013-08-11 16:45:27Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Jeff Mickey <jeff@archlinux.org> # Contributor: Jani Talikka <jani.talikka@gmail.com> # Contributor: Ralf Barth <archlinux.org@haggy.org> pkgname=smartmontools -pkgver=6.1 -pkgrel=3 +pkgver=6.2 +pkgrel=1 pkgdesc="Control and monitor S.M.A.R.T. enabled ATA and SCSI Hard Drives" url="http://smartmontools.sourceforge.net" license=('GPL') @@ -17,7 +17,7 @@ backup=('etc/smartd.conf' 'etc/conf.d/smartd') source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'smartd.conf') -md5sums=('83a3a681f8183ed858392d550ae1cca6' +md5sums=('d44f84081a12cef79cd17f78044351fc' '28c1b80c41dac52d433961dcfb4f70e0') build() { diff --git a/extra/smpeg2/PKGBUILD b/extra/smpeg2/PKGBUILD new file mode 100644 index 000000000..1f7dd4856 --- /dev/null +++ b/extra/smpeg2/PKGBUILD @@ -0,0 +1,32 @@ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> + +pkgname=smpeg2 +pkgver=412 +pkgrel=2 +pkgdesc="SDL2 MPEG Player Library" +arch=('i686' 'x86_64') +url="http://icculus.org/smpeg/" +license=('LGPL') +depends=('sdl2') +makedepends=('gtk' 'mesa' 'glu' 'svn') +optdepends=('gtk: to use gtv ' 'glu: to use glmovie') +options=('!libtool') +source=(svn://svn.icculus.org/smpeg/trunk#revision=$pkgver) +md5sums=('SKIP') + +build() { + cd ${srcdir}/trunk + sed -i s/SDL_CONFIG/SDL2_CONFIG/g smpeg2-config.in + ./autogen.sh + ./configure --prefix=/usr --mandir=/usr/share/man --disable-static + make +} + +package() { + cd ${srcdir}/trunk + make DESTDIR=${pkgdir} install + + # hacky way of resolving conflicts + rm ${pkgdir}/usr/bin/plaympeg + rm -r ${pkgdir}/usr/share/man +} diff --git a/extra/snd/PKGBUILD b/extra/snd/PKGBUILD index ce5dea5d9..f8185ed5b 100644 --- a/extra/snd/PKGBUILD +++ b/extra/snd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 189298 2013-07-02 15:47:31Z schiv $ +# $Id: PKGBUILD 193060 2013-08-15 10:40:13Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: see .contrib pkgname=snd -pkgver=13.8 +pkgver=13.9 pkgrel=1 pkgdesc="An advanced sound editor" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ optdepends=('wavpack' 'flac' 'speex' 'mpg123' 'timidity++' 'vorbis-tools') install=$pkgname.install source=("ftp://ccrma-ftp.stanford.edu/pub/Lisp/$pkgname-$pkgver.tar.gz") -md5sums=('d70148dc06073b49a854ada504e8a2d4') +md5sums=('acceab2d1e30720640aca54d4b68d45b') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/stellarium/PKGBUILD b/extra/stellarium/PKGBUILD index 3cd2faeb2..5d83aa15b 100644 --- a/extra/stellarium/PKGBUILD +++ b/extra/stellarium/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 178997 2013-03-01 10:25:43Z andrea $ +# $Id: PKGBUILD 192489 2013-08-13 06:26:20Z bpiotrowski $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=stellarium -pkgver=0.12.0 -pkgrel=2 +pkgver=0.12.2 +pkgrel=1 pkgdesc="A stellarium with great graphics and a nice database of sky-objects" arch=("i686" "x86_64" 'mips64el') url="http://stellarium.free.fr/" license=('GPL2') depends=('libpng' 'glu' 'libgl' 'freetype2' 'qt4' 'openssl' 'desktop-file-utils' -'xdg-utils') + 'xdg-utils' 'phonon') install=stellarium.install makedepends=('cmake' 'boost' 'mesa' 'mesa-libgl') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz stellarium.desktop stellarium.png) -sha1sums=('c6cc8f0954d976584e8ab9bc061f3b35e3b84251' +sha1sums=('35752a24bdeb461b9c16e8533b13689b05a87105' 'c9cc79212542238227b5bd6af99f60fe056f4ab2' 'b890d3b6c4dcfcfcc696514202af11b2a50c0fea') diff --git a/extra/suil/PKGBUILD b/extra/suil/PKGBUILD index 6e56f882b..91c6d1670 100644 --- a/extra/suil/PKGBUILD +++ b/extra/suil/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: speps <speps at aur dot archlinux dot org> pkgname=suil -pkgver=0.6.12 +pkgver=0.6.14 pkgrel=1 pkgdesc="A lightweight C library for loading and wrapping LV2 plugin UIs" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ makedepends=('python2' 'qt4' 'gtk2') optdepends=('qt4: Qt 4.x UI wrapping support' 'gtk2: GTK+ 2.x UI wrapping support') source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2") -md5sums=('528d4a0a37e6c9d5a4547ac36f7bd9e6') +md5sums=('c9738de0d6974aca1fe75dd280114158') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/swt/PKGBUILD b/extra/swt/PKGBUILD index 117266eec..13cc00f19 100644 --- a/extra/swt/PKGBUILD +++ b/extra/swt/PKGBUILD @@ -1,24 +1,24 @@ -# $Id: PKGBUILD 178694 2013-02-26 10:20:09Z guillaume $ +# $Id: PKGBUILD 192094 2013-08-05 19:35:39Z guillaume $ # Maintainer: Guillaume ALAUX <guillaume@archlinux.org> pkgname=swt -pkgver=4.2.1 -pkgrel=2 -_date=201209141800 +pkgver=4.3 +pkgrel=1 +_date=201306052000 pkgdesc='An open source widget toolkit for Java' arch=('i686' 'x86_64') url='http://www.eclipse.org/swt/' license=('EPL') depends=('java-runtime>=6' 'gtk2>=2.20.1' 'libxtst') -optdepends=('libgnomeui' 'mesa' 'glu' 'libwebkit') -makedepends=('java-environment' 'libxtst' 'mesa' 'glu' 'libgnomeui' 'unzip' 'pkgconfig' 'libwebkit' 'apache-ant') +optdepends=('libgnomeui' 'mesa' 'glu' 'webkitgtk2') +makedepends=('java-environment' 'libxtst' 'mesa' 'glu' 'libgnomeui' 'unzip' 'pkgconfig' 'webkitgtk2' 'apache-ant') if [ "${CARCH}" = "i686" ]; then _carch=x86 - sha256sums=('6198cd749ec25303a8c3a044e7680d643209862d2947f9efdda20bf7467575ba' + sha256sums=('d15fd80dd1d73f915879e08d53b535c781d589195eba0d011c307912514aa965' '6bb48007a95e3d8c6b577cc9cc4b61a51ce928b04f4fcd393cf72f8f727fe923') fi if [ "${CARCH}" = "x86_64" ]; then _carch=x86_64 - sha256sums=('e89e330df24ca72c57a381e81590293ce3f475d855258183179436bd5dcd85c8' + sha256sums=('0da9ce9fc30de90a45054df6d28c7092705707abcde9cc923a2601d1dd237707' '6bb48007a95e3d8c6b577cc9cc4b61a51ce928b04f4fcd393cf72f8f727fe923') fi source=(http://download.eclipse.org/eclipse/downloads/drops4/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-${_carch}.zip diff --git a/extra/tcl/PKGBUILD b/extra/tcl/PKGBUILD index f74ed7032..e5eaa0140 100644 --- a/extra/tcl/PKGBUILD +++ b/extra/tcl/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 183693 2013-04-27 04:42:47Z eric $ +# $Id: PKGBUILD 192225 2013-08-08 07:36:39Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=tcl pkgver=8.6.0 -pkgrel=4 +pkgrel=5 pkgdesc="The Tcl scripting language" arch=('i686' 'x86_64' 'mips64el') url="http://tcl.sourceforge.net/" license=('custom') depends=('zlib') source=(http://downloads.sourceforge.net/sourceforge/tcl/tcl${pkgver}-src.tar.gz) -md5sums=('573aa5fe678e9185ef2b3c56b24658d3') +sha1sums=('fc57fc08ab113740a702bb67d4f350f8ec85ef58') prepare() { cd tcl${pkgver} @@ -36,10 +36,8 @@ check() { package() { cd tcl${pkgver}/unix make INSTALL_ROOT="${pkgdir}" install install-private-headers - find "${pkgdir}" -name '*.a' -type f -exec chmod 644 {} \; ln -sf tclsh8.6 "${pkgdir}/usr/bin/tclsh" - - # install license + ln -sf libtcl${pkgver%.*}.so "${pkgdir}/usr/lib/libtcl.so" install -Dm644 ../license.terms "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" # remove buildroot traces diff --git a/extra/telepathy-kde-accounts-kcm/PKGBUILD b/extra/telepathy-kde-accounts-kcm/PKGBUILD index 614224917..f04c3c4cd 100644 --- a/extra/telepathy-kde-accounts-kcm/PKGBUILD +++ b/extra/telepathy-kde-accounts-kcm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186175 2013-05-21 22:00:58Z andrea $ +# $Id: PKGBUILD 192364 2013-08-10 10:59:23Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Laurent Carlier <lordheavym@gmail.com> pkgname=telepathy-kde-accounts-kcm _pkgname=ktp-accounts-kcm -pkgver=0.6.2 +pkgver=0.6.3 pkgrel=1 pkgdesc="KCM Module for configuring Telepathy Instant Messaging Accounts" arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ groups=('kde-telepathy') conflicts=('telepathy-kde-accounts-kcm-plugins') replaces=('telepathy-kde-accounts-kcm-plugins') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('fc71170f6f7f417b9cd0f4da3cb54ff70e66406e') +sha1sums=('9646cfe13c4cf155acd97d6ea66ea9bf3c8a73d7') build() { mkdir build diff --git a/extra/telepathy-kde-approver/PKGBUILD b/extra/telepathy-kde-approver/PKGBUILD index 63c7defc4..2172fa537 100644 --- a/extra/telepathy-kde-approver/PKGBUILD +++ b/extra/telepathy-kde-approver/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186177 2013-05-21 22:01:10Z andrea $ +# $Id: PKGBUILD 192366 2013-08-10 10:59:48Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Laurent Carlier <lordheavym@gmail.com> pkgname=telepathy-kde-approver _pkgname=ktp-approver -pkgver=0.6.2 +pkgver=0.6.3 pkgrel=1 pkgdesc="KDE Channel Approver for Telepathy" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ depends=('telepathy-kde-common-internals' 'telepathy-kde-contact-list') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('996fabdc858bb48be7b5c277f0a88c0fb357ee8c') +sha1sums=('a29415946b45160aa0469e8aa7e4b6c20209569c') build() { mkdir build diff --git a/extra/telepathy-kde-auth-handler/PKGBUILD b/extra/telepathy-kde-auth-handler/PKGBUILD index b23052552..1909ea3d0 100644 --- a/extra/telepathy-kde-auth-handler/PKGBUILD +++ b/extra/telepathy-kde-auth-handler/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186179 2013-05-21 22:01:20Z andrea $ +# $Id: PKGBUILD 192368 2013-08-10 11:00:07Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-auth-handler _pkgname=ktp-auth-handler -pkgver=0.6.2 +pkgver=0.6.3 pkgrel=1 pkgdesc="Provide UI/KWallet Integration For Passwords and SSL Errors on Account Connect" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals' 'qjson') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('a27fb07682fb2ce7dde15a40688c12b3d8f2299d') +sha1sums=('027697f01a41e70d10cebb78b15e7bc783617be3') build() { mkdir build diff --git a/extra/telepathy-kde-common-internals/PKGBUILD b/extra/telepathy-kde-common-internals/PKGBUILD index d07c8f6ba..32a2b36bc 100644 --- a/extra/telepathy-kde-common-internals/PKGBUILD +++ b/extra/telepathy-kde-common-internals/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186195 2013-05-21 22:02:56Z andrea $ +# $Id: PKGBUILD 192370 2013-08-10 11:00:20Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-common-internals _pkgname=ktp-common-internals -pkgver=0.6.2 +pkgver=0.6.3 pkgrel=1 pkgdesc="Common components for KDE-Telepathy" arch=('i686' 'x86_64' 'mips64el') @@ -13,10 +13,13 @@ depends=('kdelibs' 'telepathy-logger-qt' 'telepathy-mission-control') makedepends=('cmake' 'automoc4' 'boost' 'doxygen') install=${pkgname}.install source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('06fb5a5353f973e254c894be33de79b28089cbc5') +sha1sums=('d4934f760b62da5859d81fc1d264315f4d5473e8') -build() { +prepare() { mkdir build +} + +build() { cd build cmake ../${_pkgname}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ diff --git a/extra/telepathy-kde-contact-list/PKGBUILD b/extra/telepathy-kde-contact-list/PKGBUILD index adcb867d8..20c8d634d 100644 --- a/extra/telepathy-kde-contact-list/PKGBUILD +++ b/extra/telepathy-kde-contact-list/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186182 2013-05-21 22:01:31Z andrea $ +# $Id: PKGBUILD 192372 2013-08-10 11:00:34Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Laurent Carlier <lordheavym@gmail.com> pkgname=telepathy-kde-contact-list _pkgname=ktp-contact-list -pkgver=0.6.2 +pkgver=0.6.3 pkgrel=1 pkgdesc="Telepathy contact list application" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ makedepends=('cmake' 'automoc4' 'boost') groups=('kde-telepathy') install=${pkgname}.install source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('fe971a74ab966faea0680b6231c545754b9e00cf') +sha1sums=('f26eb5d1cf546b87921447d455b4b47ac8772673') build() { mkdir build diff --git a/extra/telepathy-kde-contact-runner/PKGBUILD b/extra/telepathy-kde-contact-runner/PKGBUILD index 2c4a547d6..bb11e5843 100644 --- a/extra/telepathy-kde-contact-runner/PKGBUILD +++ b/extra/telepathy-kde-contact-runner/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186184 2013-05-21 22:01:43Z andrea $ +# $Id: PKGBUILD 192374 2013-08-10 11:00:51Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-contact-runner _pkgname=ktp-contact-runner -pkgver=0.6.2 +pkgver=0.6.3 pkgrel=1 pkgdesc="KRunner plugin for KDE Telepathy" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('98c21256a81b18955628b3c645e36391c1ffca4a') +sha1sums=('1fa8321597c54ad75db23e57ded46818c1f923cd') build() { mkdir build diff --git a/extra/telepathy-kde-desktop-applets/PKGBUILD b/extra/telepathy-kde-desktop-applets/PKGBUILD index 88b275e56..8d510f6b6 100644 --- a/extra/telepathy-kde-desktop-applets/PKGBUILD +++ b/extra/telepathy-kde-desktop-applets/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186186 2013-05-21 22:01:57Z andrea $ +# $Id: PKGBUILD 192376 2013-08-10 11:01:07Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-desktop-applets _pkgname=ktp-desktop-applets -pkgver=0.6.2 +pkgver=0.6.3 pkgrel=1 pkgdesc="The KDE-Telepathy Plasma desktop applets" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ groups=('kde-telepathy') conflicts=('telepathy-kde-contact-applet' 'telepathy-kde-presence-applet') replaces=('telepathy-kde-contact-applet' 'telepathy-kde-presence-applet') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('b0273d52657a31ba56168a4e4db2f56f6c81e2fd') +sha1sums=('c6482ecd6fc009b6c0da3d428506e21a65561eb8') build() { mkdir build diff --git a/extra/telepathy-kde-filetransfer-handler/PKGBUILD b/extra/telepathy-kde-filetransfer-handler/PKGBUILD index 67901433b..636aa5ac1 100644 --- a/extra/telepathy-kde-filetransfer-handler/PKGBUILD +++ b/extra/telepathy-kde-filetransfer-handler/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186188 2013-05-21 22:02:08Z andrea $ +# $Id: PKGBUILD 192378 2013-08-10 11:01:25Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-filetransfer-handler _pkgname=ktp-filetransfer-handler -pkgver=0.6.2 +pkgver=0.6.3 pkgrel=1 pkgdesc="Telepathy file transfer handler" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('79bb46d90a3a981cadb2cc2f84832ef91e11deeb') +sha1sums=('f9acb53cadc4d63acedcb5017f6c4a5f95a1c2b5') build() { mkdir build diff --git a/extra/telepathy-kde-integration-module/PKGBUILD b/extra/telepathy-kde-integration-module/PKGBUILD index b1664d516..c1ae0356a 100644 --- a/extra/telepathy-kde-integration-module/PKGBUILD +++ b/extra/telepathy-kde-integration-module/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186190 2013-05-21 22:02:18Z andrea $ +# $Id: PKGBUILD 192380 2013-08-10 11:01:40Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-integration-module _pkgname=ktp-kded-integration-module -pkgver=0.6.2 +pkgver=0.6.3 pkgrel=1 pkgdesc="Sits in KDED and takes care of various bits of system integration like setting user to auto-away or handling connection errors" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('1aa1b8597acff39f0549ed9f716d733de4d77b63') +sha1sums=('e8faf0e651053718077865f388fe209f2c06f537') build() { mkdir build diff --git a/extra/telepathy-kde-send-file/PKGBUILD b/extra/telepathy-kde-send-file/PKGBUILD index d7cd51288..e4d3c8a8b 100644 --- a/extra/telepathy-kde-send-file/PKGBUILD +++ b/extra/telepathy-kde-send-file/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186192 2013-05-21 22:02:28Z andrea $ +# $Id: PKGBUILD 192382 2013-08-10 11:01:57Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-send-file _pkgname=ktp-send-file -pkgver=0.6.2 +pkgver=0.6.3 pkgrel=1 pkgdesc="A File manager plugin to launch a file transfer job with a specified contact" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') groups=('kde-telepathy') install=${pkgname}.install source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('51734ea448b6a3338a28fc9e9fc7d371453ed9a6') +sha1sums=('a1fb83c768967483896541f81a78820fb67dff78') build() { mkdir build diff --git a/extra/telepathy-kde-text-ui/PKGBUILD b/extra/telepathy-kde-text-ui/PKGBUILD index 0c73a3158..1b19ea826 100644 --- a/extra/telepathy-kde-text-ui/PKGBUILD +++ b/extra/telepathy-kde-text-ui/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186213 2013-05-22 06:19:49Z andrea $ +# $Id: PKGBUILD 192384 2013-08-10 11:02:14Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Laurent Carlier <lordheavym@gmail.com> pkgname=telepathy-kde-text-ui _pkgname=ktp-text-ui -pkgver=0.6.2.1 +pkgver=0.6.3 pkgrel=1 pkgdesc="Telepathy handler for Text Chats" arch=('i686' 'x86_64' 'mips64el') @@ -13,8 +13,8 @@ license=('GPL') depends=('telepathy-kde-contact-list' 'telepathy-logger-qt') makedepends=('cmake' 'automoc4' 'boost') groups=('kde-telepathy') -source=("http://download.kde.org/stable/kde-telepathy/0.6.2/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('71951b929ad3caa6a0f46e338bd669c7e542ac15') +source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") +sha1sums=('480a634f95e75306efa7694526b8a137b18f9e49') build() { mkdir build diff --git a/extra/testdisk/PKGBUILD b/extra/testdisk/PKGBUILD index 93d4df898..b3ee6b030 100644 --- a/extra/testdisk/PKGBUILD +++ b/extra/testdisk/PKGBUILD @@ -1,18 +1,17 @@ -# $Id: PKGBUILD 176860 2013-02-01 21:35:19Z eric $ +# $Id: PKGBUILD 192126 2013-08-06 06:45:24Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Michal Krenek <mikos@sg1.cz> pkgname=testdisk -pkgver=6.13 -pkgrel=4 +pkgver=6.14 +pkgrel=1 pkgdesc="Checks and undeletes partitions + PhotoRec, signature based recovery tool" arch=('i686' 'x86_64' 'mips64el') url="http://www.cgsecurity.org/index.html?testdisk.html" license=('GPL') depends=('libjpeg' 'openssl' 'progsreiserfs' 'ntfsprogs') source=(http://www.cgsecurity.org/$pkgname-$pkgver.tar.bz2) -md5sums=('3bcbf0722d3823ca155e633969ce9f0b') build() { cd "$srcdir/$pkgname-$pkgver" @@ -27,3 +26,4 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } +md5sums=('b1f0edabc9035e9ec9c8e0a95059ff3f') diff --git a/extra/tk/PKGBUILD b/extra/tk/PKGBUILD index 9dde63604..cf3fd5faf 100644 --- a/extra/tk/PKGBUILD +++ b/extra/tk/PKGBUILD @@ -1,42 +1,37 @@ -# $Id: PKGBUILD 173851 2012-12-25 00:34:54Z foutrelis $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: Judd Vinet <jvinet@zeroflux.org> +# $Id: PKGBUILD 192227 2013-08-08 07:38:43Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=tk pkgver=8.6.0 -pkgrel=1.1 +pkgrel=2 pkgdesc="A windowing toolkit for use with tcl" arch=('i686' 'x86_64' 'mips64el') url="http://tcl.sourceforge.net/" license=('custom') depends=("tcl=${pkgver}" 'libxss' 'libxft') source=(http://downloads.sourceforge.net/sourceforge/tcl/tk${pkgver}-src.tar.gz) -md5sums=('b883a1a3c489c17413fb602a94bf54e8') +sha1sums=('c42e160285e2d26eae8c2a1e6c6f86db4fa7663b') build() { - cd ${srcdir}/tk${pkgver}/unix - + cd tk${pkgver}/unix [[ $CARCH == "x86_64" ]] && BIT="--enable-64bit" - ./configure --prefix=/usr --mandir=/usr/share/man --enable-threads $BIT - + ./configure --prefix=/usr --mandir=/usr/share/man --enable-threads --disable-rpath $BIT make } #check() { -# cd ${srcdir}/tk${pkgver}/unix +# cd tk${pkgver}/unix # make test #} package() { - cd ${srcdir}/tk${pkgver}/unix - - make INSTALL_ROOT=${pkgdir} install install-private-headers - ln -sf wish8.6 ${pkgdir}/usr/bin/wish - - # install license - install -Dm644 license.terms ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + cd tk${pkgver}/unix + make INSTALL_ROOT="${pkgdir}" install install-private-headers + ln -sf wish8.6 "${pkgdir}/usr/bin/wish" + ln -sf libtk${pkgver%.*}.so "${pkgdir}/usr/lib/libtk.so" + install -Dm644 license.terms "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" # remove buildroot traces - sed -i "s#${srcdir}#/usr/src#" ${pkgdir}/usr/lib/tkConfig.sh + sed -i "s#${srcdir}#/usr/src#" "${pkgdir}/usr/lib/tkConfig.sh" } diff --git a/extra/transcode/PKGBUILD b/extra/transcode/PKGBUILD index 9cd251ca0..5029e2ceb 100644 --- a/extra/transcode/PKGBUILD +++ b/extra/transcode/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 191909 2013-08-01 06:53:42Z bpiotrowski $ +# $Id: PKGBUILD 192481 2013-08-12 20:25:48Z eric $ # Maintainer: # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: roberto <roberto@archlinux.org> @@ -6,7 +6,7 @@ pkgname=transcode _sripver=0.3-4 pkgver=1.1.7 -pkgrel=10 +pkgrel=11 pkgdesc="A video/DVD ripper and encoder for the terminal/console" arch=('i686' 'x86_64' 'mips64el') url="http://tcforge.berlios.de/" diff --git a/extra/valgrind/PKGBUILD b/extra/valgrind/PKGBUILD index fd6cd7b6d..44b5394c8 100644 --- a/extra/valgrind/PKGBUILD +++ b/extra/valgrind/PKGBUILD @@ -1,28 +1,39 @@ -# $Id: PKGBUILD 173941 2012-12-28 13:12:00Z allan $ +# $Id: PKGBUILD 193067 2013-08-15 12:08:37Z allan $ # Maintainer: Dan McGee <dan@archlinux.org> # Maintainer: Allan McRae <allan@archlinux.org> pkgname=valgrind pkgver=3.8.1 -pkgrel=2 +pkgrel=3 pkgdesc="A tool to help find memory-management problems in programs" arch=('i686' 'x86_64') license=('GPL') url="http://valgrind.org/" -depends=('glibc>=2.17' 'glibc<2.18' 'perl') +depends=('glibc>=2.18' 'glibc<2.19' 'perl') makedepends=('gdb') options=('!emptydirs') source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2 - valgrind-3.8.1-glibc-2.17.patch) + valgrind-3.8.1-glibc-2.18.patch + valgrind-3.8.1-ptrace-build-fix.patch) md5sums=('288758010b271119a0ffc0183f1d6e38' - 'e87c34f9f9ce0040d141b3bd57842b5c') + 'f3f911e6f5b0ab9d176d40b47d6cae24' + '9d429e62255621a0c190a8180d8ab1a4') -build() { +prepare() { cd ${srcdir}/${pkgname}-${pkgver} - patch -p1 -i $srcdir/valgrind-3.8.1-glibc-2.17.patch + patch -p1 -i $srcdir/valgrind-3.8.1-glibc-2.18.patch + + # based on svn commits 13471 & 13482 + patch -p0 -i $srcdir/valgrind-3.8.1-ptrace-build-fix.patch + + ./autogen.sh +} + +build() { + cd ${srcdir}/${pkgname}-${pkgver} - if [ "${CARCH}" = "x86_64" ]; then + if [[ ${CARCH} = "x86_64" ]]; then ./configure --prefix=/usr --mandir=/usr/share/man --enable-only64bit else ./configure --prefix=/usr --mandir=/usr/share/man diff --git a/extra/valgrind/valgrind-3.8.1-glibc-2.17.patch b/extra/valgrind/valgrind-3.8.1-glibc-2.17.patch deleted file mode 100644 index bfeb9486d..000000000 --- a/extra/valgrind/valgrind-3.8.1-glibc-2.17.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -Naur valgrind-3.8.1-orig/configure valgrind-3.8.1/configure ---- valgrind-3.8.1-orig/configure 2012-09-19 05:19:23.000000000 +1000 -+++ valgrind-3.8.1/configure 2012-12-27 08:11:36.645429011 +1000 -@@ -6612,6 +6612,24 @@ - - # DEFAULT_SUPP set by kernel version check above. - ;; -+ 2.17) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.17 family" >&5 -+$as_echo "2.17 family" >&6; } -+ -+$as_echo "#define GLIBC_2_17 1" >>confdefs.h -+ -+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" -+ ;; -+ darwin) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5 -+$as_echo "Darwin" >&6; } -+ -+$as_echo "#define DARWIN_LIBC 1" >>confdefs.h -+ -+ # DEFAULT_SUPP set by kernel version check above. -+ ;; - bionic) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Bionic" >&5 - $as_echo "Bionic" >&6; } -@@ -6624,7 +6642,7 @@ - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported version ${GLIBC_VERSION}" >&5 - $as_echo "unsupported version ${GLIBC_VERSION}" >&6; } -- as_fn_error "Valgrind requires glibc version 2.2 - 2.16" "$LINENO" 5 -+ as_fn_error "Valgrind requires glibc version 2.2 - 2.17" "$LINENO" 5 - as_fn_error "or Darwin libc" "$LINENO" 5 - ;; - esac diff --git a/extra/valgrind/valgrind-3.8.1-glibc-2.18.patch b/extra/valgrind/valgrind-3.8.1-glibc-2.18.patch new file mode 100644 index 000000000..9f471ad1c --- /dev/null +++ b/extra/valgrind/valgrind-3.8.1-glibc-2.18.patch @@ -0,0 +1,33 @@ +diff -Naur valgrind-3.8.1-orig/configure.in valgrind-3.8.1/configure.in +--- valgrind-3.8.1-orig/configure.in 2013-08-13 22:36:20.201676976 +1000 ++++ valgrind-3.8.1/configure.in 2013-08-13 22:38:18.402750093 +1000 +@@ -906,6 +906,20 @@ + DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" + DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" + ;; ++ 2.17) ++ AC_MSG_RESULT(2.17 family) ++ AC_DEFINE([GLIBC_2_17], 1, [Define to 1 if you're using glibc 2.17.x]) ++ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" ++ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" ++ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" ++ ;; ++ 2.18) ++ AC_MSG_RESULT(2.18 family) ++ AC_DEFINE([GLIBC_2_18], 1, [Define to 1 if you're using glibc 2.18.x]) ++ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" ++ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" ++ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" ++ ;; + darwin) + AC_MSG_RESULT(Darwin) + AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin]) +@@ -919,7 +933,7 @@ + + *) + AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}]) +- AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.16]) ++ AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.18]) + AC_MSG_ERROR([or Darwin libc]) + ;; + esac diff --git a/extra/valgrind/valgrind-3.8.1-ptrace-build-fix.patch b/extra/valgrind/valgrind-3.8.1-ptrace-build-fix.patch new file mode 100644 index 000000000..89af000b1 --- /dev/null +++ b/extra/valgrind/valgrind-3.8.1-ptrace-build-fix.patch @@ -0,0 +1,78 @@ +Index: coregrind/vgdb.c +=================================================================== +--- coregrind/vgdb.c (revision 13470) ++++ coregrind/vgdb.c (revision 13471) +@@ -100,11 +100,10 @@ + + #if defined(PTRACEINVOKER) + #include <sys/user.h> + #if defined(VGO_linux) + # include <sys/prctl.h> +-# include <linux/ptrace.h> + #endif + #endif + + + // Outputs information for the user about ptrace not working. + +Index: coregrind/vgdb.c +=================================================================== +--- coregrind/vgdb.c (revision 13481) ++++ coregrind/vgdb.c (revision 13482) +@@ -691,7 +691,7 @@ + // runtime check not yet done. + // 0 : PTRACE_GETREGS runtime check has failed. + // 1 : PTRACE_GETREGS defined and runtime check ok. +-#ifdef PTRACE_GETREGS ++#ifdef HAVE_PTRACE_GETREGS + static int has_working_ptrace_getregs = -1; + #endif + +@@ -702,7 +702,7 @@ + Bool getregs (int pid, void *regs, long regs_bsz) + { + DEBUG(1, "getregs regs_bsz %ld\n", regs_bsz); +-# ifdef PTRACE_GETREGS ++# ifdef HAVE_PTRACE_GETREGS + if (has_working_ptrace_getregs) { + // Platforms having GETREGS + long res; +@@ -773,7 +773,7 @@ + DEBUG(1, "setregs regs_bsz %ld\n", regs_bsz); + // Note : the below is checking for GETREGS, not SETREGS + // as if one is defined and working, the other one should also work. +-# ifdef PTRACE_GETREGS ++# ifdef HAVE_PTRACE_GETREGS + if (has_working_ptrace_getregs) { + // Platforms having SETREGS + long res; +Index: configure.in +=================================================================== +--- configure.in (revision 13481) ++++ configure.in (revision 13482) +@@ -1040,6 +1040,25 @@ + + AM_CONDITIONAL([HAVE_GNU_STPNCPY], [test x$ac_have_gnu_stpncpy = xyes]) + ++# Check for PTRACE_GETREGS ++ ++AC_MSG_CHECKING([for PTRACE_GETREGS]) ++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ++#include <stddef.h> ++#include <sys/ptrace.h> ++#include <sys/user.h> ++]], [[ ++ void *p; ++ long res = ptrace (PTRACE_GETREGS, 0, p, p); ++]])], [ ++AC_MSG_RESULT([yes]) ++AC_DEFINE([HAVE_PTRACE_GETREGS], 1, ++ [Define to 1 if you have the `PTRACE_GETREGS' ptrace request.]) ++], [ ++AC_MSG_RESULT([no]) ++]) ++ ++ + # Check for CLOCK_MONOTONIC + + AC_MSG_CHECKING([for CLOCK_MONOTONIC]) diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD index 34cde25f7..4b30165c2 100644 --- a/extra/vim/PKGBUILD +++ b/extra/vim/PKGBUILD @@ -5,12 +5,12 @@ pkgbase=vim pkgname=('vim' 'gvim' 'vim-runtime') -_topver=7.3 -_patchlevel=1287 -__hgrev=941318315ace +_topver=7.4 +_patchlevel=0 +__hgrev=a643d80b6507 _versiondir="vim${_topver//./}" pkgver=${_topver}.${_patchlevel} -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') license=('custom:vim') url="http://www.vim.org" @@ -20,9 +20,9 @@ source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz" 'vimrc' 'archlinux.vim' 'gvim.desktop') -md5sums=('e43d2b39c51246ad8dba45d0d75748ec' +md5sums=('1dfdea2e3fbf778647286d7e23ef9f54' 'SKIP' - '20fceda56badf201695c57999b0bc609' + 'b9d4dcb9d3ee2e151dc4be1e94934f6a' '10353a61aadc3f276692d0e17db1478e' 'd90413bd21f400313a785bb4010120cd') diff --git a/extra/vim/vimrc b/extra/vim/vimrc index fc18d2d5b..3642e25c9 100644 --- a/extra/vim/vimrc +++ b/extra/vim/vimrc @@ -11,6 +11,6 @@ runtime! archlinux.vim " If you prefer the old-style vim functionalty, add 'runtime! vimrc_example.vim' -" Or better yet, read /usr/share/vim/vim73/vimrc_example.vim or the vim manual +" Or better yet, read /usr/share/vim/vim74/vimrc_example.vim or the vim manual " and configure vim to your own liking! diff --git a/extra/xf86-input-wacom/PKGBUILD b/extra/xf86-input-wacom/PKGBUILD index cd3687168..b333857db 100644 --- a/extra/xf86-input-wacom/PKGBUILD +++ b/extra/xf86-input-wacom/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 189910 2013-07-11 09:04:39Z heftig $ +# $Id: PKGBUILD 192066 2013-08-05 14:20:19Z andyrtr $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: M Rawash <mrawash@gmail.com> pkgname=xf86-input-wacom -pkgver=0.22.0 +pkgver=0.22.1 pkgrel=1 pkgdesc="X.Org Wacom tablet driver" arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ optdepends=('inputattach: support for serial tablets') options=(!libtool) source=(http://downloads.sourceforge.net/project/linuxwacom/$pkgname/$pkgname-$pkgver.tar.bz2 70-wacom.rules) -md5sums=('cb709fb69a62d0eee9e80a3e0c090234' +md5sums=('dba80caac08145a907fc7f7796f3aea7' 'cc46dcb399d5ee62c9feb610c60d1270') build() { diff --git a/extra/xf86-video-ati/PKGBUILD b/extra/xf86-video-ati/PKGBUILD index e2ec0bdcf..3eaefab5d 100644 --- a/extra/xf86-video-ati/PKGBUILD +++ b/extra/xf86-video-ati/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 180193 2013-03-18 16:09:02Z andyrtr $ +# $Id: PKGBUILD 192205 2013-08-07 15:15:12Z lcarlier $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xf86-video-ati -pkgver=7.1.0 +pkgver=7.2.0 epoch=1 -pkgrel=3 +pkgrel=1 pkgdesc="X.org ati video driver" arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" @@ -16,7 +16,7 @@ conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERS groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('c8ae44051fcb331625217f98c09a3aa69f493052b69d62c03f41fed0bfe610cd') +sha256sums=('f30f5efdc8d7d18d06eda7ef2f91a8b7290f1cfbf6ff26362cd47ab8969daec4') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD index eeb25cf03..962feec51 100644 --- a/extra/xf86-video-intel/PKGBUILD +++ b/extra/xf86-video-intel/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 191785 2013-07-30 19:12:09Z andyrtr $ +# $Id: PKGBUILD 192403 2013-08-10 17:30:29Z lcarlier $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-intel -pkgver=2.21.13 -pkgrel=1 +pkgver=2.21.14 +pkgrel=2 arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') @@ -19,13 +19,14 @@ conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERS options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('76e17cebf79d3c3c98af246fcfb55018aa12e2d56fe5f3b6d54b93e90837efa8') +sha256sums=('cc74d482dfd1f6b87773233a6d5c36118039b42fe7f8d99ee28bda7b78aa3b49') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr \ - --enable-dri + --enable-dri \ + --with-default-accel=sna make } diff --git a/extra/xf86-video-intel/xf86-video-intel.install b/extra/xf86-video-intel/xf86-video-intel.install index d523eb61a..b03eea8aa 100644 --- a/extra/xf86-video-intel/xf86-video-intel.install +++ b/extra/xf86-video-intel/xf86-video-intel.install @@ -1,8 +1,12 @@ +post_upgrade() { + post_install +} + post_install() { - echo ">>> This driver now allows to switch" - echo ">>> between sna/uxa acceleration methods." + echo ">>> This driver now uses sna as the default" + echo ">>> acceleration methods." + echo ">>> You can use uxa method if you run into trouble." echo ">>> Add to the device section in /etc/X11/xorg.conf" - echo ">>> Option \"AccelMethod\" \"sna\"" - echo ">>> use uxa method if you run into trouble with sna." + echo ">>> Option \"AccelMethod\" \"uxa\"" } diff --git a/extra/xf86-video-openchrome/PKGBUILD b/extra/xf86-video-openchrome/PKGBUILD index 5d38408b6..a287258bd 100644 --- a/extra/xf86-video-openchrome/PKGBUILD +++ b/extra/xf86-video-openchrome/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 186307 2013-05-24 13:57:21Z andyrtr $ +# $Id: PKGBUILD 192461 2013-08-12 09:17:15Z lcarlier $ # Contributor: Paul Mattal <paul@mattal.com> # Maintainer: Juergen Hoetzel <juergen@hoetzel.info> pkgname=xf86-video-openchrome pkgver=0.3.3 -pkgrel=1 +pkgrel=2 pkgdesc="X.Org Openchrome drivers" arch=(i686 x86_64) license=('custom') url="http://www.openchrome.org" depends=('libdrm' 'libxvmc' 'systemd') +optdepends=('unichrome-dri') makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15' 'xf86-video-via' 'xf86-video-unichrome' 'openchrome' 'unichrome-dri') +conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15' 'xf86-video-via' 'xf86-video-unichrome' 'openchrome') replaces=('openchrome' 'xf86-video-via') groups=('xorg-drivers' 'xorg') options=('!libtool' '!emptydirs' '!makeflags') diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD index 7f0efbbb5..2129f8250 100644 --- a/extra/xine-lib/PKGBUILD +++ b/extra/xine-lib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 191912 2013-08-01 06:53:45Z bpiotrowski $ +# $Id: PKGBUILD 192482 2013-08-12 20:25:49Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=xine-lib pkgver=1.2.3 -pkgrel=2 +pkgrel=3 pkgdesc="A multimedia playback engine" arch=('i686' 'x86_64' 'mips64el') url="http://www.xine-project.org" diff --git a/extra/xorg-xprop/PKGBUILD b/extra/xorg-xprop/PKGBUILD index 9a68e6606..66c31787a 100644 --- a/extra/xorg-xprop/PKGBUILD +++ b/extra/xorg-xprop/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 130748 2011-07-07 22:27:50Z andyrtr $ +# $Id: PKGBUILD 192262 2013-08-09 05:22:32Z lcarlier $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xprop -pkgver=1.2.1 -pkgrel=1.2 +pkgver=1.2.2 +pkgrel=1 pkgdesc="Property displayer for X" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" @@ -12,7 +12,7 @@ depends=('libx11') makedepends=('xorg-util-macros') groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/xprop-${pkgver}.tar.bz2) -sha1sums=('d531be0f5f2b7758216ea4d7890f88c42c5fa3fd') +sha256sums=('9bee88b1025865ad121f72d32576dd3027af1446774aa8300cce3c261d869bc6') build() { cd "${srcdir}/xprop-${pkgver}" diff --git a/extra/xorg-xset/PKGBUILD b/extra/xorg-xset/PKGBUILD index c49686f8c..fe4fa833e 100644 --- a/extra/xorg-xset/PKGBUILD +++ b/extra/xorg-xset/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 176905 2013-02-02 07:13:56Z andyrtr $ +# $Id: PKGBUILD 192274 2013-08-09 14:12:18Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xset -pkgver=1.2.2 -pkgrel=2 +pkgver=1.2.3 +pkgrel=1 pkgdesc="User preference utility for X" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" @@ -12,16 +12,16 @@ depends=('libxmu') makedepends=('xorg-util-macros') groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/xset-${pkgver}.tar.bz2) -sha256sums=('61371c140030b8b05075a1378b34a4d7c438ed9159496a95f10782c6f4aec1e8') +sha256sums=('4382f4fb29b88647e13f3b4bc29263134270747fc159cfc5f7e3af23588c8063') build() { - cd "${srcdir}/xset-${pkgver}" + cd xset-${pkgver} ./configure --prefix=/usr --without-fontcache --without-xf86misc make } package() { - cd "${srcdir}/xset-${pkgver}" + cd xset-${pkgver} make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" diff --git a/extra/xorg-xwd/PKGBUILD b/extra/xorg-xwd/PKGBUILD index 32ec675ac..a1efcae8c 100644 --- a/extra/xorg-xwd/PKGBUILD +++ b/extra/xorg-xwd/PKGBUILD @@ -1,27 +1,27 @@ -# $Id: PKGBUILD 150997 2012-02-24 12:58:04Z allan $ +# $Id: PKGBUILD 192272 2013-08-09 14:11:01Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xwd -pkgver=1.0.5 -pkgrel=2.1 +pkgver=1.0.6 +pkgrel=1 pkgdesc="X Window System image dumping utility" arch=('i686' 'x86_64' 'mips64el') url="http://xorg.freedesktop.org/" license=('custom') -depends=('libx11') +depends=('libxkbfile') makedepends=('xorg-util-macros' 'libxt') groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/xwd-${pkgver}.tar.bz2) -sha1sums=('3b0e4f3f9d28a07444e72952342e21544d4785b6') +sha256sums=('3bb396a2268d78de4b1c3e5237a85f7849d3434e87b3cd1f4d57eef614227d79') build() { - cd "${srcdir}/xwd-${pkgver}" + cd xwd-${pkgver} ./configure --prefix=/usr make } package() { - cd "${srcdir}/xwd-${pkgver}" + cd xwd-${pkgver} make DESTDIR="${pkgdir}" install install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/extra/zsh/PKGBUILD b/extra/zsh/PKGBUILD index 3abcbe7a7..bd94f4965 100644 --- a/extra/zsh/PKGBUILD +++ b/extra/zsh/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 187080 2013-06-03 11:17:13Z allan $ +# $Id: PKGBUILD 192725 2013-08-14 17:32:47Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=zsh pkgver=5.0.2 -pkgrel=2 +pkgrel=3 pkgdesc='A very advanced and programmable command interpreter (shell) for UNIX' arch=('i686' 'x86_64' 'mips64el') url='http://www.zsh.org/' diff --git a/extra/zsh/zsh.install b/extra/zsh/zsh.install index a2aafa252..c9bd5b663 100644 --- a/extra/zsh/zsh.install +++ b/extra/zsh/zsh.install @@ -1,5 +1,6 @@ post_install() { - grep -q '/usr/bin/zsh' etc/shells || echo '/usr/bin/zsh' >> etc/shells + grep -qe '^/bin/zsh$' etc/shells || echo '/bin/zsh' >> etc/shells + grep -qe '^/usr/bin/zsh$' etc/shells || echo '/usr/bin/zsh' >> etc/shells } post_upgrade() { |