diff options
55 files changed, 663 insertions, 594 deletions
diff --git a/community/dfc/PKGBUILD b/community/dfc/PKGBUILD new file mode 100644 index 000000000..acf5d560c --- /dev/null +++ b/community/dfc/PKGBUILD @@ -0,0 +1,33 @@ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Rolinh <robinDOThahlingATgw-computingDOTnet> + +pkgname=dfc +pkgver=3.0.4 +pkgrel=1 +pkgdesc="Display file system space usage using graphs and colors" +arch=('x86_64' 'i686') +url="http://projects.gw-computing.net/projects/dfc" +license=('BSD') +depends=('glibc') +makedepends=('cmake' 'gettext') +conflicts=('dfc-git') +source=(http://projects.gw-computing.net/attachments/download/79/${pkgname}-${pkgver}.tar.gz) +install='dfc.install' +md5sums=('3b9edc197ad21e1dfe10128d130e626c') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + cmake . -DPREFIX=/usr -DSYSCONFDIR=/etc -DCMAKE_BUILD_TYPE=RELEASE + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/dfc/dfc.install b/community/dfc/dfc.install new file mode 100644 index 000000000..30fd1a096 --- /dev/null +++ b/community/dfc/dfc.install @@ -0,0 +1,4 @@ +post_install() { + echo 'Optional configuration file is located in /etc/xdg/dfc/' + echo 'Copy it to ~/.config/dfc/ (create this folder if necessary) if you want to use it.' +} diff --git a/community/nomacs/PKGBUILD b/community/nomacs/PKGBUILD index 1b737b3d0..dc9015337 100644 --- a/community/nomacs/PKGBUILD +++ b/community/nomacs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 94002 2013-07-13 00:27:24Z speps $ +# $Id: PKGBUILD 98626 2013-10-15 15:29:46Z speps $ # Maintainer: speps <speps at aur dot archlinux dot org> pkgname=nomacs -pkgver=1.4.0 +pkgver=1.6.0 pkgrel=1 pkgdesc="A Qt image viewer" arch=(i686 x86_64) @@ -12,7 +12,7 @@ depends=('qt4' 'exiv2' 'libraw' 'opencv') makedepends=('cmake') install="$pkgname.install" source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver-source.tar.bz2") -md5sums=('ede84986dce5f67c270bb5ff7354e867') +md5sums=('61cabef5638a4a2dabd0865df07e4b07') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/core/libarchive/PKGBUILD b/core/libarchive/PKGBUILD index 7d7260489..6820b23b0 100644 --- a/core/libarchive/PKGBUILD +++ b/core/libarchive/PKGBUILD @@ -1,20 +1,23 @@ -# $Id: PKGBUILD 193605 2013-08-25 14:43:38Z dreisner $ +# $Id: PKGBUILD 196629 2013-10-15 21:20:36Z dreisner $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=libarchive pkgver=3.1.2 -pkgrel=2 +pkgrel=3 pkgdesc="library that can create and read several streaming archive formats" arch=('i686' 'x86_64') url="http://libarchive.org/" license=('BSD') depends=('acl' 'attr' 'bzip2' 'expat' 'lzo2' 'openssl' 'xz' 'zlib') +options=('strip' 'debug') provides=('libarchive.so') source=("http://libarchive.org/downloads/$pkgname-$pkgver.tar.gz" '0001-mtree-fix-line-filename-length-calculation.patch' + https://github.com/libarchive/libarchive/commit/22531545514043e04633e1c015c7540b9de9dbe4.patch 'libarchive-3.1.2-acl.patch') md5sums=('efad5a503f66329bb9d2f4308b5de98a' 'fda89c145bbcd793a96b06b463ef6a72' + '6432f3360abd5645461a9c825c75b307' 'a5c995661c62429ceff2c23ea322393b') build() { @@ -27,6 +30,9 @@ build() { # https://code.google.com/p/libarchive/issues/detail?id=329 patch -Np1 -i "$srcdir/libarchive-3.1.2-acl.patch" + # CVE-2013-0211 + patch -Np1 -i "$srcdir/22531545514043e04633e1c015c7540b9de9dbe4.patch" + ./configure --prefix=/usr --without-xml2 make } diff --git a/extra/aisleriot/PKGBUILD b/extra/aisleriot/PKGBUILD index c2de2098b..d8a0f0d6e 100644 --- a/extra/aisleriot/PKGBUILD +++ b/extra/aisleriot/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 196010 2013-10-07 11:50:21Z jgc $ +# $Id: PKGBUILD 196568 2013-10-15 14:08:35Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=aisleriot -pkgver=3.10.0 +pkgver=3.10.1 pkgrel=1 pkgdesc="A collection of patience games written in guile scheme" arch=(i686 x86_64) @@ -17,7 +17,7 @@ optdepends=('libkdegames: KDE card sets' options=('!emptydirs' '!libtool') install=aisleriot.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) -sha256sums=('2b96e73fa2e3c75afc27b2a572c4175943fbaac015824a6f49c41bf479b26e02') +sha256sums=('06558f1adbd6d73ba7dd5dffc864d903532a26e0c29920127a233f344423bd9a') build() { cd $pkgname-$pkgver diff --git a/extra/baobab/PKGBUILD b/extra/baobab/PKGBUILD index c6faa8e06..1065bf503 100644 --- a/extra/baobab/PKGBUILD +++ b/extra/baobab/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 196017 2013-10-07 11:50:30Z jgc $ +# $Id: PKGBUILD 196589 2013-10-15 14:52:26Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=baobab -pkgver=3.10 +pkgver=3.10.1 pkgrel=1 pkgdesc="A graphical directory tree analyzer" arch=(i686 x86_64) @@ -12,8 +12,8 @@ depends=('dconf' 'gtk3' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'deskto makedepends=('intltool' 'itstool' 'vala' 'gobject-introspection') groups=('gnome') install=$pkgname.install -source=(http://download.gnome.org/sources/$pkgname/${pkgver}/$pkgname-$pkgver.tar.xz) -sha256sums=('6f4e309073c3834f957b957b03d388fd89900a1622a001d238ad6105c6e303ee') +source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) +sha256sums=('23ce8e4847ce5f1c8230e757532d94c84e6e273d6ec8fca20eecaed5f96563f9') build() { cd "$pkgname-$pkgver" diff --git a/extra/digikam/PKGBUILD b/extra/digikam/PKGBUILD index bbf7dd3b3..4ca152315 100644 --- a/extra/digikam/PKGBUILD +++ b/extra/digikam/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 195970 2013-10-06 19:03:45Z ronald $ +# $Id: PKGBUILD 196619 2013-10-15 19:42:35Z ronald $ # 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.4.0 +pkgver=3.5.0 pkgrel=1 pkgdesc="Digital photo management application for KDE" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr' '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") -sha1sums=('9ed0ef7a7eda8660edf44b1e89354f110e487373') +sha1sums=('9e44fcf219312cbcbbaee0cc9a7f460a01769224') prepare() { mkdir build diff --git a/extra/eog-plugins/PKGBUILD b/extra/eog-plugins/PKGBUILD index 0d6c8f1f4..29e60d254 100644 --- a/extra/eog-plugins/PKGBUILD +++ b/extra/eog-plugins/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 196030 2013-10-07 11:50:43Z jgc $ +# $Id: PKGBUILD 196614 2013-10-15 18:33:47Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=eog-plugins -pkgver=3.10.0 +pkgver=3.10.1 pkgrel=1 pkgdesc="Plugins for Eye of Gnome" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('intltool') install=eog-plugins.install options=('!libtool') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('0e6699c45181264e87f34a6eb03deeadfd5d73e35995772b7afc803e8218906d') +sha256sums=('d5b32c49dbf1e0b6cf56c9fdc6c19186c92e98d92b71aa98805491e2bb2f8e12') build() { cd $pkgname-$pkgver diff --git a/extra/eog/PKGBUILD b/extra/eog/PKGBUILD index d90093655..958a408ac 100644 --- a/extra/eog/PKGBUILD +++ b/extra/eog/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 196029 2013-10-07 11:50:42Z jgc $ +# $Id: PKGBUILD 196613 2013-10-15 18:33:14Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=eog -pkgver=3.10.0 +pkgver=3.10.1 pkgrel=1 pkgdesc="Eye of Gnome: An image viewing and cataloging program" arch=(i686 x86_64) @@ -15,7 +15,7 @@ groups=(gnome) options=('!emptydirs' '!libtool') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('d449abfba8ac460b9d9af17778a0f2ffed5c983e74232596b807c3a99f11a1da') +sha256sums=('16ab5da862d4474c12d0e8062e577ad70c7e1c790a44a3931cd78bf84ebd5ec6') build() { cd "$pkgname-$pkgver" diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index 28ebc9cd9..14bcec800 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193588 2013-08-24 16:58:24Z dan $ +# $Id: PKGBUILD 196624 2013-10-15 21:11:32Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=git -pkgver=1.8.4 +pkgver=1.8.4.1 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64) @@ -111,7 +111,7 @@ package() { install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket } -md5sums=('355768a1c70d0cb4fedf4b598ac1375b' - 'e3720f56e18a5ab8ee1871ac9c72ca7c' +md5sums=('5d8c89ad312ca0b0e603259c9357e6b8' + 'd3f87251966f2bfabdad428b781fef4f' '042524f942785772d7bd52a1f02fe5ae' 'f67869315c2cc112e076f0c73f248002') diff --git a/extra/glib-networking/PKGBUILD b/extra/glib-networking/PKGBUILD index d95cd3dd8..282c77da9 100644 --- a/extra/glib-networking/PKGBUILD +++ b/extra/glib-networking/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 196048 2013-10-07 11:51:08Z jgc $ +# $Id: PKGBUILD 196596 2013-10-15 14:58:00Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=glib-networking -pkgver=2.38.0 +pkgver=2.38.1 pkgrel=1 pkgdesc="Network-related giomodules for glib" arch=(i686 x86_64) @@ -13,18 +13,24 @@ makedepends=(intltool) options=('!libtool') install=glib-networking.install source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('a43eacbf721b475cf6ba0cd2eab02a332014f71a4c41d0b44bd7bbf8ed1f840d') +sha256sums=('32ea1e504f69ff6693ac4119ad598ded50bb0440cf4484d28ef0adf8fcc85653') build() { cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/$pkgname --disable-static + --libexecdir=/usr/lib/$pkgname --disable-static \ + --disable-installed-tests make } +check() { + cd $pkgname-$pkgver + make -k check +} + package() { cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install testfiles_DATA= } # vim:set ts=2 sw=2 et: diff --git a/extra/gnome-clocks/PKGBUILD b/extra/gnome-clocks/PKGBUILD index bea06b214..b96c42e8d 100644 --- a/extra/gnome-clocks/PKGBUILD +++ b/extra/gnome-clocks/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 196053 2013-10-07 11:51:15Z jgc $ +# $Id: PKGBUILD 196559 2013-10-15 13:46:33Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-clocks -pkgver=3.10.0 +pkgver=3.10.1 pkgrel=1 pkgdesc="Clocks applications for GNOME" arch=(i686 x86_64) @@ -15,7 +15,7 @@ options=(!libtool) groups=(gnome-extra) install=gnome-clocks.install source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('f6418272e8d3a9ad41fba49712917130b09db925b6caecd78653541aedee3e2d') +sha256sums=('5f6f3b7bb9929353d974aa444b10bb4d0f414176449cce2c626fabd2d4b55b43') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-contacts/PKGBUILD b/extra/gnome-contacts/PKGBUILD index d6e4b58d6..1ded72823 100644 --- a/extra/gnome-contacts/PKGBUILD +++ b/extra/gnome-contacts/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 196056 2013-10-07 11:51:18Z jgc $ +# $Id: PKGBUILD 196595 2013-10-15 14:57:07Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gnome-contacts -pkgver=3.10 +pkgver=3.10.1 pkgrel=1 pkgdesc="Contacts Manager for GNOME" arch=(i686 x86_64) @@ -12,8 +12,8 @@ groups=(gnome) depends=('gtk3' 'folks' 'libnotify' 'gnome-desktop' 'dconf' 'gnome-online-accounts' 'libgee' 'telepathy-glib' 'cheese') makedepends=('intltool' 'vala' 'gobject-introspection') install=$pkgname.install -source=(http://download.gnome.org/sources/$pkgname/${pkgver}/$pkgname-$pkgver.tar.xz) -sha256sums=('1cb57d81455ee44e50745452bfefdf74f9ad4e393661199005c665284cda20cf') +source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) +sha256sums=('e119c32bb10136e7190f11f79334fa82ed56468cff5bb7836da0ebf7b572779b') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-desktop/PKGBUILD b/extra/gnome-desktop/PKGBUILD index 411340229..007e01749 100644 --- a/extra/gnome-desktop/PKGBUILD +++ b/extra/gnome-desktop/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 196058 2013-10-07 11:51:23Z jgc $ +# $Id: PKGBUILD 196612 2013-10-15 18:31:39Z heftig $ # Maintainer: Jan de Groot <jan@archlinux.org> pkgname=gnome-desktop -pkgver=3.10.0 +pkgver=3.10.1 pkgrel=1 epoch=1 pkgdesc="Library with common API for various GNOME modules" @@ -14,7 +14,7 @@ url="http://www.gnome.org" groups=(gnome) options=(!libtool) source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('3e87352ba30e9965199fb360c852e22ccb7c7e5c02965b6d63fb175f3737b75c') +sha256sums=('10aca72355e8e2854450ce10edfb6da433af62ea0d87b0718ff62e9a40aabb41') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-mahjongg/PKGBUILD b/extra/gnome-mahjongg/PKGBUILD index 21fc000b4..c1fdba25c 100644 --- a/extra/gnome-mahjongg/PKGBUILD +++ b/extra/gnome-mahjongg/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 168943 2012-10-16 16:31:44Z heftig $ +# $Id: PKGBUILD 196566 2013-10-15 14:05:45Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-mahjongg -pkgver=3.10.0 +pkgver=3.10.1 pkgrel=1 pkgdesc="Disassemble a pile of tiles by removing matching pairs" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ install=gnome-mahjongg.install url="https://live.gnome.org/Mahjongg" groups=('gnome-extra') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('bcbb67d0784e3e8c1772d83f559506c40b5ff2d38c8212db004b0d913f04e963') +sha256sums=('fb987b1a024abd40cf013670854421d0fea1fffd107752493220b8cbb287ddd5') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-menus/PKGBUILD b/extra/gnome-menus/PKGBUILD index 81497af6f..7168b2c7a 100644 --- a/extra/gnome-menus/PKGBUILD +++ b/extra/gnome-menus/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 196156 2013-10-07 12:17:09Z jgc $ +# $Id: PKGBUILD 196604 2013-10-15 16:51:50Z heftig $ # Maintainer: Jan de Groot <jan@archlinux.org> pkgname=gnome-menus -pkgver=3.10.0 +pkgver=3.10.1 pkgrel=1 pkgdesc="GNOME menu specifications" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ options=('!libtool') license=('GPL' 'LGPL') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('713a58ff9e3264be70dd233c2935cfce4ee76223c17044ecbf6cb53eba875192') +sha256sums=('46950aba274c1ad58234374fa9b235258650737307f3bc396af48eb983668a71') build() { cd "$pkgname-$pkgver" diff --git a/extra/gnome-music/PKGBUILD b/extra/gnome-music/PKGBUILD index bc54efe94..45d97918b 100644 --- a/extra/gnome-music/PKGBUILD +++ b/extra/gnome-music/PKGBUILD @@ -2,7 +2,7 @@ pkgname=gnome-music pkgver=3.10.1 -pkgrel=1 +pkgrel=2 pkgdesc="Music player and management application" arch=(i686 x86_64) license=('GPL') @@ -12,8 +12,15 @@ makedepends=(intltool) options=('!libtool') groups=('gnome-extra') install=gnome-music.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('3b75643e8a6e4d9b44b2572f0ddecfa0ec32affd9172c43a4bec909d15ac9d7c') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz + notification.patch) +sha256sums=('3b75643e8a6e4d9b44b2572f0ddecfa0ec32affd9172c43a4bec909d15ac9d7c' + '629ff5a277aecd97d3e1040d3eee70b8f011f3cf65c7fa8ec03fc22b829059fd') + +prepare() { + cd $pkgname-$pkgver + patch -Np1 -i ../notification.patch +} build() { cd $pkgname-$pkgver diff --git a/extra/gnome-music/notification.patch b/extra/gnome-music/notification.patch new file mode 100644 index 000000000..7a98d98e9 --- /dev/null +++ b/extra/gnome-music/notification.patch @@ -0,0 +1,21 @@ +From efb6a7c0db5c40207bf78bde9d0f9b32ac667e9b Mon Sep 17 00:00:00 2001 +From: Jack Gurulian <jack.gurulian@gmail.com> +Date: Tue, 15 Oct 2013 10:54:47 +0000 +Subject: Correctly use AlbumArtCache.get_media_title in notifications + +--- +diff --git a/gnomemusic/notification.py b/gnomemusic/notification.py +index 2c8485e..5775db1 100644 +--- a/gnomemusic/notification.py ++++ b/gnomemusic/notification.py +@@ -78,7 +78,7 @@ class NotificationManager: + album = item.get_string(Grl.METADATA_KEY_ALBUM)\ + or _("Unknown Album") + +- self._notification.update(item.get_title(), ++ self._notification.update(AlbumArtCache.get_media_title(item), + # TRANSLATORS: by refers to the artist, from to the album + _("by %s, from %s") % ('<b>' + artist + '</b>', + '<i>' + album + '</i>'), +-- +cgit v0.9.2 diff --git a/extra/gnome-online-accounts/PKGBUILD b/extra/gnome-online-accounts/PKGBUILD index 06c9e5c77..f0ceb3ad6 100644 --- a/extra/gnome-online-accounts/PKGBUILD +++ b/extra/gnome-online-accounts/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 196071 2013-10-07 11:51:42Z jgc $ +# $Id: PKGBUILD 196591 2013-10-15 14:53:48Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gnome-online-accounts -pkgver=3.10.0 +pkgver=3.10.1 pkgrel=1 pkgdesc="GNOME service to access online accounts" arch=(i686 x86_64) @@ -13,7 +13,7 @@ makedepends=('intltool' 'libxslt' 'gobject-introspection' 'docbook-xsl') options=(!libtool) install=$pkgname.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) -sha256sums=('bba85366632cf5ce777b6889eab505d98d7593c37f7859a312dc57dde05a0feb') +sha256sums=('d925841a4c1c7a46a0837fc7e219891a46431e089847fa248e3f691c23ff7d9b') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD index 794d342dc..9fa2d31a2 100644 --- a/extra/gnome-shell/PKGBUILD +++ b/extra/gnome-shell/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 196079 2013-10-07 11:51:54Z jgc $ +# $Id: PKGBUILD 196636 2013-10-15 22:00:47Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Flamelab <panosfilip@gmail.com pkgname=gnome-shell -pkgver=3.10.0.1 +pkgver=3.10.1 pkgrel=1 pkgdesc="The next generation GNOME Shell" arch=(i686 x86_64) @@ -20,7 +20,7 @@ install=gnome-shell.install groups=(gnome) source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz nm-libexecdir.patch) -sha256sums=('eb98ca6274e82e446834221b2dfd9af0e12e5ebce651319435524fd6cd5f4ec9' +sha256sums=('52f43dcd6df9dd00e5fbcd16a0d7551801cbc77f8777f047e548e7803bb90e02' 'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607') prepare() { diff --git a/extra/gnome-system-monitor/PKGBUILD b/extra/gnome-system-monitor/PKGBUILD index 140b18c2d..629ea4b7d 100644 --- a/extra/gnome-system-monitor/PKGBUILD +++ b/extra/gnome-system-monitor/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 196083 2013-10-07 11:52:01Z jgc $ +# $Id: PKGBUILD 196588 2013-10-15 14:51:47Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-system-monitor -pkgver=3.10.0 +pkgver=3.10.1 pkgrel=1 pkgdesc="A system monitor for GNOME" arch=(i686 x86_64) @@ -15,7 +15,7 @@ url="http://www.gnome.org" groups=('gnome') install=gnome-system-monitor.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('a6bd4e925b21db08e687f7b71a0363777e1dbdda143142232c1c78ecf14821ac') +sha256sums=('d3d4ecff7426b0944c13f051b6e4e624a3cd5d39c155a9fba289144b8b87ab0f') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-terminal/PKGBUILD b/extra/gnome-terminal/PKGBUILD index 00cb6b89e..45ce6a7ce 100644 --- a/extra/gnome-terminal/PKGBUILD +++ b/extra/gnome-terminal/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 196084 2013-10-07 11:52:02Z jgc $ +# $Id: PKGBUILD 196570 2013-10-15 14:10:38Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-terminal -pkgver=3.10.0 -pkgrel=2 +pkgver=3.10.1 +pkgrel=1 pkgdesc="The GNOME Terminal Emulator" arch=(i686 x86_64) license=(GPL) @@ -15,7 +15,7 @@ url="http://www.gnome.org" groups=('gnome') install=gnome-terminal.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) -sha256sums=('2f7cc56d39e083eee0419c7d7e9ae43e00dca8bc55bdd31271fb193ec7f63796') +sha256sums=('d267e5245232e10ef12411ed7be1d879226b66f64f7cabe9731a7bd8b28e9f27') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-tetravex/PKGBUILD b/extra/gnome-tetravex/PKGBUILD index 96d6a0090..fb39549db 100644 --- a/extra/gnome-tetravex/PKGBUILD +++ b/extra/gnome-tetravex/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 196085 2013-10-07 11:52:04Z jgc $ +# $Id: PKGBUILD 196563 2013-10-15 13:58:33Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-tetravex -pkgver=3.10.0 +pkgver=3.10.1 pkgrel=1 pkgdesc="Complete the puzzle by matching numbered tiles" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ install=gnome-tetravex.install url="https://live.gnome.org/Tetravex" groups=('gnome-extra') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('12ae001325038cdf4bc5bd1bb8efe1807e560c55d63aa9dd21ac997d2f51dadf') +sha256sums=('8ea9503ae8252807eb2a9b33bb50bc7d3e7f65b11f8965dd5c2ab82f8a217162') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-weather/PKGBUILD b/extra/gnome-weather/PKGBUILD index 3774bc35c..329a56cee 100644 --- a/extra/gnome-weather/PKGBUILD +++ b/extra/gnome-weather/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 196090 2013-10-07 11:52:14Z jgc $ +# $Id: PKGBUILD 196616 2013-10-15 18:40:32Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-weather -pkgver=3.10.0 +pkgver=3.10.1 pkgrel=1 pkgdesc="Access current weather conditions and forecasts" arch=(i686 x86_64) @@ -14,7 +14,7 @@ options=(!libtool) groups=(gnome-extra) install=gnome-weather.install source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('66d764a19ceebc512711a3b71c849e04021311fa12d617148bbf22c083121b69') +sha256sums=('e0f2503c2cc9ced72da7728b262a767342b82852a74196db44377d18f1820fe4') build() { cd $pkgname-$pkgver diff --git a/extra/gptfdisk/PKGBUILD b/extra/gptfdisk/PKGBUILD index 9adee070c..6b353ece2 100644 --- a/extra/gptfdisk/PKGBUILD +++ b/extra/gptfdisk/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 189840 2013-07-09 09:22:21Z foutrelis $ +# $Id: PKGBUILD 196545 2013-10-15 06:55:43Z tpowa $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Hokum <hokum_at_mail_dot_ru> pkgname=gptfdisk -pkgver=0.8.7 +pkgver=0.8.8 pkgrel=1 pkgdesc="A text-mode partitioning tool that works on Globally Unique Identifier (GUID) Partition Table (GPT) disks" arch=('i686' 'x86_64') @@ -15,21 +15,18 @@ provides=("gdisk=$pkgver") conflicts=('gdisk') replaces=('gdisk') source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz) -sha256sums=('39e61d9f3701e95db1bcb83ce8fb211b22f33548e3c75b17f22067c6968e91e3') build() { - cd "$srcdir/$pkgname-$pkgver" - + cd $pkgname-$pkgver make } package () { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver install -d "$pkgdir"/usr/{bin,share/{doc/gdisk,man/man8}} install -t "$pkgdir/usr/bin" {,c,s}gdisk fixparts install -m644 -t "$pkgdir/usr/share/man/man8" {{,c,s}gdisk,fixparts}.8 install -m644 -t "$pkgdir/usr/share/doc/gdisk" README NEWS } - -# vim:set ts=2 sw=2 et: +md5sums=('bd47d03ec27bab5613254b5a20f72143') diff --git a/extra/gthumb/PKGBUILD b/extra/gthumb/PKGBUILD index 49267ecbf..58f88dba6 100644 --- a/extra/gthumb/PKGBUILD +++ b/extra/gthumb/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 196101 2013-10-07 11:52:31Z jgc $ +# $Id: PKGBUILD 196562 2013-10-15 13:57:17Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=gthumb -pkgver=3.2.3 -pkgrel=4 +pkgver=3.2.4 +pkgrel=1 pkgdesc="Image browser and viewer for the GNOME Desktop" arch=(i686 x86_64) license=(GPL) @@ -21,14 +21,11 @@ optdepends=('libopenraw: read RAW files' 'liboauth: web albums') options=('!libtool' '!emptydirs') install=gthumb.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - gtk310.patch) -sha256sums=('9f596b6e59b70bbdf177930f6b2cbc6aabdfc1a281db527e3515946c5ca4e70a' - 'dcbfad2eb7047c1ea4210dc0af1054dc2ec863331f12fcd59c05021570d38bfe') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('0b94e7317911334c80fce5116970186963419fd0c25eed4ecca2a4ddcc968177') prepare() { cd $pkgname-$pkgver - patch -Np1 -i ../gtk310.patch } build() { diff --git a/extra/gthumb/gtk310.patch b/extra/gthumb/gtk310.patch deleted file mode 100644 index 86f0e99e8..000000000 --- a/extra/gthumb/gtk310.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 36ba0c99c1780ca9f23f220ced70a76b97ce8260 Mon Sep 17 00:00:00 2001 -From: Paolo Bacchilega <paobac@src.gnome.org> -Date: Fri, 27 Sep 2013 15:40:33 +0000 -Subject: Fixed broken window layout with gtk+ 3.10 - -[bug #708800] ---- -diff --git a/gthumb/gth-window.c b/gthumb/gth-window.c -index a2960bc..a2cce99 100644 ---- a/gthumb/gth-window.c -+++ b/gthumb/gth-window.c -@@ -324,6 +324,7 @@ gth_window_attach (GthWindow *window, - return; - } - -+ gtk_widget_set_vexpand (child, FALSE); - gtk_grid_attach (GTK_GRID (window->priv->grid), - child, - 0, position, -@@ -362,6 +363,7 @@ gth_window_attach_content (GthWindow *window, - - _gtk_container_remove_children (GTK_CONTAINER (window->priv->contents[page]), NULL, NULL); - gtk_widget_set_hexpand (child, TRUE); -+ gtk_widget_set_vexpand (child, TRUE); - gtk_container_add (GTK_CONTAINER (window->priv->contents[page]), child); - } - --- -cgit v0.9.2 diff --git a/extra/gucharmap/PKGBUILD b/extra/gucharmap/PKGBUILD index 05fdac4a4..d7fcade36 100644 --- a/extra/gucharmap/PKGBUILD +++ b/extra/gucharmap/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 196106 2013-10-07 11:52:39Z jgc $ +# $Id: PKGBUILD 196572 2013-10-15 14:12:14Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan De Groot <jgc@archlinux.org> pkgname=gucharmap -pkgver=3.9.99 +pkgver=3.10.0 pkgrel=1 pkgdesc="Gnome Unicode Charmap" arch=('i686' 'x86_64') @@ -12,10 +12,10 @@ url="http://www.gnome.org" depends=('dconf' 'gtk3' 'hicolor-icon-theme') makedepends=('gtk-doc' 'intltool' 'gobject-introspection' 'itstool' 'docbook-xsl' 'desktop-file-utils') options=('!libtool' '!emptydirs') -groups=('gnome') +groups=(gnome) install=gucharmap.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('7a9425f07f8e4053e0382e627d65ca428674f8c63f2c721877ae8c62c25ccb00') +sha256sums=('a0447b5dd13e3364c5ca9bacb1f7387043d664effd64980e400c5b3d7301b617') build() { cd $pkgname-$pkgver diff --git a/extra/irqbalance/PKGBUILD b/extra/irqbalance/PKGBUILD index c2b5dadb1..e9e869dde 100644 --- a/extra/irqbalance/PKGBUILD +++ b/extra/irqbalance/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Martin Striz <ms@poruba.net> pkgname=irqbalance -pkgver=1.0.6 +pkgver=1.0.7 pkgrel=1 pkgdesc="IRQ balancing daemon for SMP systems" arch=('i686' 'x86_64') @@ -10,9 +10,9 @@ url="http://code.google.com/p/irqbalance" license=('GPL') depends=(glib2 numactl libcap-ng) makedepends=(pkgconfig) -source=(http://irqbalance.googlecode.com/files/irqbalance-$pkgver.tar.gz +source=(http://irqbalance.googlecode.com/files/irqbalance-$pkgver.tar.bz2 irqbalance.service) -md5sums=('b73b1a5a9e1c3c428ae39024c711e41e' +md5sums=('09cb0ab81ab4f3401a7ff5dabc158a1e' 'a97ad17dc7df98b81acb500b27f931e5') build() { diff --git a/extra/kdeplasma-applets-plasma-nm/PKGBUILD b/extra/kdeplasma-applets-plasma-nm/PKGBUILD index ea548ab39..bf9fb0dd3 100644 --- a/extra/kdeplasma-applets-plasma-nm/PKGBUILD +++ b/extra/kdeplasma-applets-plasma-nm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 196399 2013-10-12 17:21:21Z andrea $ +# $Id: PKGBUILD 196553 2013-10-15 10:05:35Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Antonio Rojas < nqn1976 @ gmail.com > pkgname=kdeplasma-applets-plasma-nm -pkgver=0.9.3.0 -pkgrel=2 +pkgver=0.9.3.1 +pkgrel=1 pkgdesc="Plasma applet written in QML for managing network connections" arch=('i686' 'x86_64') url="https://projects.kde.org/projects/playground/network/plasma-nm" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'openconnect') optdepends=('mobile-broadband-provider-info: Database of mobile broadband service providers' 'openconnect: Cisco AnyConnect VPN plugin') source=("http://download.kde.org/unstable/plasma-nm/plasma-nm-${pkgver}.tar.xz") -md5sums=('cdc781eb6f62ebddbe4fafb444f72d9b') +md5sums=('c6ce9cd8523ec0f99fe87dea8b76a02f') prepare() { mkdir build diff --git a/extra/konversation/PKGBUILD b/extra/konversation/PKGBUILD index 3f7da427f..298426026 100644 --- a/extra/konversation/PKGBUILD +++ b/extra/konversation/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186022 2013-05-20 14:06:29Z stephane $ +# $Id: PKGBUILD 196549 2013-10-15 07:10:19Z allan $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: James Rayner <iphitus@gmail.com> @@ -6,7 +6,7 @@ pkgname=konversation pkgver=1.4 -pkgrel=6 +pkgrel=7 pkgdesc="A user friendly IRC client for KDE" arch=('i686' 'x86_64') url="http://konversation.kde.org" @@ -21,11 +21,6 @@ options=('!makeflags') source=("http://download.kde.org/download.php?url=stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") sha1sums=('90741721f68a02d4345b9006a8ae53bc49ef3777') -prepare() { - cd "$srcdir/$pkgname-$pkgver" - # libpng16 fix - find -name '*.png' -exec optipng -quiet -force -fix {} + -} build() { cd "${srcdir}" diff --git a/extra/libgweather/PKGBUILD b/extra/libgweather/PKGBUILD index 078d75902..db36973cc 100644 --- a/extra/libgweather/PKGBUILD +++ b/extra/libgweather/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 196114 2013-10-07 11:52:53Z jgc $ +# $Id: PKGBUILD 196615 2013-10-15 18:35:27Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libgweather -pkgver=3.10.0 +pkgver=3.10.1 pkgrel=1 pkgdesc="Provides access to weather information from the net" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ options=('!libtool' '!emptydirs') url="http://www.gnome.org/" install=libgweather.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('4feab6e5c6eb4df85e7d134982a18a6196e63bc8179cfe5a25fc727482c52996') +sha256sums=('ae8e785f6798b4fe4cf1461c57faf1c0625716ccb92ea927e091840a1205cfc7') build() { cd "$pkgname-$pkgver" diff --git a/extra/libmikmod/PKGBUILD b/extra/libmikmod/PKGBUILD index 3cde12fec..66ba3b4c6 100644 --- a/extra/libmikmod/PKGBUILD +++ b/extra/libmikmod/PKGBUILD @@ -1,39 +1,37 @@ -# $Id: PKGBUILD 170549 2012-11-08 15:28:36Z heftig $ +# $Id: PKGBUILD 196633 2013-10-15 21:52:46Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=libmikmod -pkgver=3.2.0 +pkgver=3.3.3 pkgrel=1 pkgdesc="A portable sound library" -license=('GPL' 'LGPL') +license=(GPL LGPL) url="http://mikmod.shlomifish.org/" -arch=('i686' 'x86_64') -depends=('glibc' 'sh') -makedepends=('alsa-lib') +arch=(i686 x86_64) +depends=(openal sh) +makedepends=(alsa-lib) options=('!libtool') install=$pkgname.install -source=($url/files/$pkgname-$pkgver.tar.gz - libmikmod-3.2.0-64bit-fix.diff - libmikmod-3.1.12-loopingvolume-fix.diff) -md5sums=('96e9820d72a41fe27ff304071739696c' - '0bb09aac6e83e0a7fd6535961b3cff4c' - 'a837fd876cbd2ac27419b802504489db') +source=($url/files/$pkgname-$pkgver.tar.gz) +sha256sums=('79f02478c5abd8b2af73df4cc5f9d52625aa044327c01563168e270cf79b2437') -build() { - cd $pkgname-$pkgver +prepare() { + mkdir build +} - # patches from sdl_mixer-1.2.11 source - patch -Np1 -i $srcdir/libmikmod-3.2.0-64bit-fix.diff - patch -Np1 -i $srcdir/libmikmod-3.1.12-loopingvolume-fix.diff - - ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --disable-static +build() { + cd build + ../$pkgname-$pkgver/configure \ + --prefix=/usr \ + --enable-openal \ + --disable-static make } package() { - cd $pkgname-$pkgver + cd build make DESTDIR="$pkgdir" install } diff --git a/extra/libnm-qt/PKGBUILD b/extra/libnm-qt/PKGBUILD index fb085736d..65855e02c 100644 --- a/extra/libnm-qt/PKGBUILD +++ b/extra/libnm-qt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 196395 2013-10-12 17:08:13Z andrea $ +# $Id: PKGBUILD 196551 2013-10-15 09:59:45Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libnm-qt -pkgver=0.9.0 +pkgver=0.9.0.1 pkgrel=1 pkgdesc='Qt-only wrapper for NetworkManager DBus API' arch=('i686' 'x86_64') @@ -10,8 +10,8 @@ url='https://projects.kde.org/projects/extragear/libs/libnm-qt' license=('LGPL') depends=('libmm-qt' 'networkmanager') makedepends=('cmake') -source=("http://download.kde.org/unstable/networkmanagement/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha256sums=('1afc4b21efd656b34f45692e2c40c0337ca44d7238a56b4318f3bb6fc7df6e22') +source=("http://download.kde.org/unstable/networkmanager-qt/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") +sha256sums=('88239444df7fb7bbbadbe4bff50f68bcb7debe5efb101300aeb1b1e3cbb192cf') prepare() { mkdir -p build diff --git a/extra/librsvg/PKGBUILD b/extra/librsvg/PKGBUILD index 200df7513..bd3671427 100644 --- a/extra/librsvg/PKGBUILD +++ b/extra/librsvg/PKGBUILD @@ -1,22 +1,21 @@ -# $Id: PKGBUILD 196119 2013-10-07 11:53:02Z jgc $ +# $Id: PKGBUILD 196586 2013-10-15 14:49:58Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=librsvg -pkgver=2.39.0 -pkgrel=2 +pkgver=2.40.0 +pkgrel=1 epoch=1 pkgdesc="A SVG viewing library" arch=(i686 x86_64) license=('LGPL') depends=('gdk-pixbuf2' 'pango' 'libcroco') -makedepends=('intltool' 'gtk2' 'gtk3' 'gobject-introspection') -optdepends=('gtk3: for rsvg-view-3' - 'gtk2: gtk2 SVG engine module') +makedepends=('intltool' 'gtk3' 'gobject-introspection') +optdepends=('gtk3: for rsvg-view-3') options=('!libtool' '!emptydirs') url="https://live.gnome.org/LibRsvg" install=librsvg.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('aa47dcde0128eee6e3595d203bc673d9c27389588842f401bf585f31fc65095f') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) +sha256sums=('8f7db31df235813dbd035888035cf862d682e7cc5706c4e7ec05750d3f64a2f9') build() { cd $pkgname-$pkgver diff --git a/extra/libsoup/PKGBUILD b/extra/libsoup/PKGBUILD index 606854716..68abac436 100644 --- a/extra/libsoup/PKGBUILD +++ b/extra/libsoup/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 196121 2013-10-07 11:53:05Z jgc $ +# $Id: PKGBUILD 196594 2013-10-15 14:56:31Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libsoup -pkgver=2.44.0 +pkgver=2.44.1 pkgrel=1 pkgdesc="GNOME HTTP Library" arch=(i686 x86_64) @@ -16,7 +16,7 @@ conflicts=(libsoup-gnome) replaces=(libsoup-gnome) options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('2ed9b200bda39c686d19eb4a0a5464e9166d09cbb3ced5a689c78214e83b5c27') +sha256sums=('c532c331dd5f7eb78438867302ed6897a847c82b287ed9347bea8d1937974c1d') build() { cd $pkgname-$pkgver diff --git a/extra/lightsoff/PKGBUILD b/extra/lightsoff/PKGBUILD index 114ddfc89..9e6a34576 100644 --- a/extra/lightsoff/PKGBUILD +++ b/extra/lightsoff/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 168943 2012-10-16 16:31:44Z heftig $ +# $Id: PKGBUILD 196555 2013-10-15 13:41:16Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=lightsoff -pkgver=3.10.0 +pkgver=3.10.1 pkgrel=1 pkgdesc="Turn off all the lights" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ install=lightsoff.install url="https://live.gnome.org/Lightsoff" groups=('gnome-extra') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) -sha256sums=('920a38ebe320d3882c6a98d073388e64ba9c8bea4414c05fc16a81771b0a64a4') +sha256sums=('4db69a39a4cceb28e1c8331d65242643d1c7a9fe4c31c42f58f0421a9f205996') build() { cd $pkgname-$pkgver diff --git a/extra/mpd/PKGBUILD b/extra/mpd/PKGBUILD index 228b30adc..c887f420c 100644 --- a/extra/mpd/PKGBUILD +++ b/extra/mpd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 193202 2013-08-19 06:29:18Z bisson $ +# $Id: PKGBUILD 196535 2013-10-14 22:08:24Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -6,7 +6,7 @@ # Contributor: Ben <ben@benmazer.net> pkgname=mpd -pkgver=0.17.5 +pkgver=0.17.6 pkgrel=1 pkgdesc='Flexible, powerful, server-side application for playing music' url='http://www.musicpd.org/' @@ -17,7 +17,7 @@ depends=('libao' 'ffmpeg' 'libmodplug' 'audiofile' 'libshout' 'libmad' 'curl' 'f makedepends=('doxygen') source=("http://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz" 'tmpfiles.d') -sha1sums=('a12b78452de5ff876c36827572c6bb4af26e0f7d' +sha1sums=('c8cea5cbf87ece252d15457d2249090e73a8d11f' 'f4d5922abb69abb739542d8e93f4dfd748acdad7') backup=('etc/mpd.conf') diff --git a/extra/mutter-wayland/PKGBUILD b/extra/mutter-wayland/PKGBUILD index 004ece9dd..67c31c1bd 100644 --- a/extra/mutter-wayland/PKGBUILD +++ b/extra/mutter-wayland/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 196008 2013-10-07 11:49:47Z jgc $ +# $Id: PKGBUILD 196631 2013-10-15 21:31:37Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=mutter-wayland -pkgver=3.10.0.1 -pkgrel=2 +pkgver=3.10.1 +pkgrel=1 pkgdesc="A Wayland compositor for GNOME" arch=(i686 x86_64) license=(GPL) @@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs') install=mutter-wayland.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz mutter-wayland-3.10.0.1-logfile.patch) -sha256sums=('1d4e3086d9ff26f6ae01c844909db1f4050f2e9aaead1b91a8b6b37f2a241560' +sha256sums=('bdb6bcc25791309256b09ec9aa7e0be311ef311778450aafccb86caf2753b6b4' 'b79866b6b3fa6029b35ef2b5c5d0cb92886ec2ed0173f780c4d46a5b8d9a1644') diff --git a/extra/mutter/PKGBUILD b/extra/mutter/PKGBUILD index 57c710ec5..52b2fa92d 100644 --- a/extra/mutter/PKGBUILD +++ b/extra/mutter/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 196125 2013-10-07 11:53:12Z jgc $ +# $Id: PKGBUILD 196630 2013-10-15 21:30:35Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Michael Kanis <mkanis_at_gmx_dot_de> pkgname=mutter -pkgver=3.10.0.1 +pkgver=3.10.1 pkgrel=1 pkgdesc="A window manager for GNOME" arch=(i686 x86_64) @@ -16,7 +16,7 @@ groups=('gnome') options=('!libtool' '!emptydirs') install=mutter.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) -sha256sums=('2d1288727d60b45c4d902101b805c89fa93f7a6b147bb4a7d3d99f990680b203') +sha256sums=('39f90c976873596455ce95c39bf2d9256736979a04e6e8961237961085538c20') build() { cd "$pkgname-$pkgver" diff --git a/extra/numactl/PKGBUILD b/extra/numactl/PKGBUILD index 7a09b97f4..9b41941a9 100644 --- a/extra/numactl/PKGBUILD +++ b/extra/numactl/PKGBUILD @@ -2,15 +2,15 @@ # Contributor: Florian Zeitz <florob at babelmonkeys dot de> pkgname=numactl -pkgver=2.0.8 -pkgrel=2 +pkgver=2.0.9 +pkgrel=1 pkgdesc="Simple NUMA policy support" arch=('i686' 'x86_64') url="http://oss.sgi.com/projects/libnuma/" license=('LGPL2.1' 'GPL2') depends=('perl') source=(ftp://oss.sgi.com/www/projects/libnuma/download/$pkgname-${pkgver/_/-}.tar.gz) -sha1sums=('f7bf06caea29669992fd3540a4c864a32615b5a1') +sha1sums=('7231abc8f49e805225858ac08d801ade722f0b94') build() { cd "$srcdir/$pkgname-${pkgver/_/-}" diff --git a/extra/vte3/PKGBUILD b/extra/vte3/PKGBUILD index c82f7fcad..e8848b1e7 100644 --- a/extra/vte3/PKGBUILD +++ b/extra/vte3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 194827 2013-09-23 18:45:48Z heftig $ +# $Id: PKGBUILD 196587 2013-10-15 14:50:39Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=vte3 pkgname=(vte3 vte-common) -pkgver=0.34.8 +pkgver=0.34.9 pkgrel=1 pkgdesc="Virtual Terminal Emulator widget for use with GTK3" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ options=('!libtool' '!emptydirs') makedepends=('intltool' 'gobject-introspection' 'gtk3') url="http://www.gnome.org" source=(http://download.gnome.org/sources/vte/${pkgver::4}/vte-$pkgver.tar.xz) -sha256sums=('126ffb7d5a5da35639df003c84ff11ccc92f3fc8b1556d3e8b0f7314c8d909d0') +sha256sums=('6f38c5edf57d0a5b870c4e5e210731cccfb4899d0856ba7a3dc599f2ba6e23e1') build() { cd "vte-$pkgver" diff --git a/extra/yelp/PKGBUILD b/extra/yelp/PKGBUILD index c03aed726..76377805e 100644 --- a/extra/yelp/PKGBUILD +++ b/extra/yelp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 196147 2013-10-07 11:53:44Z jgc $ +# $Id: PKGBUILD 196592 2013-10-15 14:54:38Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=yelp -pkgver=3.10.0 +pkgver=3.10.1 pkgrel=1 pkgdesc="A help browser for GNOME" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ options=('!emptydirs' '!libtool') url="http://www.gnome.org" install=yelp.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('146f64a9b69409bedc5a0af9376ff2a38e5a4adcfa93c52c95d4ea4dc868cbd2') +sha256sums=('17736479b7d0b1128c7d6cb3073f2b09e4bbc82670731b2a0d3a3219a520f816') build() { cd $pkgname-$pkgver diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index 966946e51..6f223157c 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -304,6 +304,7 @@ _package-headers() { # remove unneeded architectures rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arc,arm,arm26,arm64,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,metag,mips,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa} +} _package-docs() { pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase^} kernel" diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index 2fce65168..175f5c3d0 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -304,6 +304,7 @@ _package-headers() { # remove unneeded architectures rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arc,arm,arm26,arm64,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,metag,mips,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa} +} _package-docs() { pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase^} kernel" diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD index 4cc986be1..463a94be4 100644 --- a/libre/clementine-libre/PKGBUILD +++ b/libre/clementine-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 94971 2013-08-01 22:31:55Z alucryd $ +# $Id: PKGBUILD 98608 2013-10-15 14:50:08Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: BlackEagle <ike.devolder@gmail.com> @@ -9,13 +9,13 @@ _pkgname=clementine pkgname=clementine-libre -pkgver=1.1.1 -pkgrel=9 +pkgver=1.2.0 +pkgrel=1 pkgdesc="A music player and library organizer, without nonfree artwork and spotify support" url="http://www.clementine-player.org/" license=('GPL') arch=('i686' 'x86_64') -depends=('chromaprint' 'gstreamer0.10-base' 'libcdio' 'libgpod' 'liblastfm' 'libmtp' 'projectm' 'protobuf' 'qca-ossl' 'qjson' 'taglib') +depends=('chromaprint' 'glew' 'gstreamer0.10-base' 'libcdio' 'libgpod' 'liblastfm' 'libmtp' 'libmygpo-qt' 'protobuf' 'qca-ossl' 'taglib') makedepends=('cmake' 'boost' 'mesa' 'sparsehash') optdepends=('gstreamer0.10-base-plugins: "Base" plugin libraries' 'gstreamer0.10-good-plugins: "Good" plugin libraries' @@ -27,19 +27,15 @@ conflicts=('clementine') provides=("clementine=$pkgver") install=clementine.install source=("http://clementine-player.googlecode.com/files/${_pkgname}-${pkgver}.tar.gz" - 'clementine-1.1.1-libimobiledevice-fix.patch' 'remove-nonfree-artwork-and-spotify.patch' 'moognu.png') -md5sums=('28e4afb822388bd337a761db8f86febf' - '736df6cd828a3172701f63c8dc978cb9' - '9ccfe62f8784a1ccbe8c96f8cacad9d0' - '59a8c0d7659898c457b95f877718cf1c') +sha256sums=('563d00da4e893f7b1966ed137bcab28042151e31ea561cb7076047d3cad96f72' + 'e3b0ba3649d6c66ef002ce281949ab6febf2481893245b4e30c6f11ae6f5b463' + 'c6918617769152f3617c61f721819e69d03f671b85760b11cfe45abd53955bc4') prepare() { cd ${_pkgname}-${pkgver} - patch -Np1 -i ../clementine-1.1.1-libimobiledevice-fix.patch - # remove nonfree nonfree artwork and spotify references on files patch -Np1 -i ../remove-nonfree-artwork-and-spotify.patch @@ -48,7 +44,7 @@ prepare() { # remove nonfree spotify files rm -v cmake/SpotifyVersion.cmake - rm -v data/spotify-core-logo-128x128.png + rm -v data/spotify-attribution.png rm -v data/icons/svg/spotify.svg rm -v data/schema/schema-30.sql rm -v src/{globalsearch/spotifysearchprovider.{cpp,h},internet/spotify{blobdownloader.{cpp,h},server.{cpp,h},service.{cpp,h},settingspage.{cpp,h,ui}}} @@ -71,7 +67,7 @@ build() { fi mkdir build && cd build - cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DUSE_SYSTEM_PROJECTM=1 -DBUILD_WERROR=0 + cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_BUILD_TYPE='Release' make } diff --git a/libre/clementine-libre/clementine-1.1.1-libimobiledevice-fix.patch b/libre/clementine-libre/clementine-1.1.1-libimobiledevice-fix.patch deleted file mode 100644 index da7722fcb..000000000 --- a/libre/clementine-libre/clementine-1.1.1-libimobiledevice-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up clementine-1.1.1/src/devices/imobiledeviceconnection.h.fix clementine-1.1.1/src/devices/imobiledeviceconnection.h ---- clementine-1.1.1/src/devices/imobiledeviceconnection.h.fix 2013-04-23 14:44:56.932661018 -0400 -+++ clementine-1.1.1/src/devices/imobiledeviceconnection.h 2013-04-23 14:46:44.033657190 -0400 -@@ -51,7 +51,7 @@ private: - idevice_t device_; - afc_client_t afc_; - -- uint16_t afc_port_; -+ lockdownd_service_descriptor_t afc_port_; - }; - - #endif // IMOBILEDEVICECONNECTION_H diff --git a/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch b/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch index 3a948bf96..957ddc7e7 100644 --- a/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch +++ b/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch @@ -1,7 +1,8 @@ -diff -rauN clementine-1.0.1/3rdparty/SPMediaKeyTap/SPMediaKeyTap.m clementine-libre-1.0.1/3rdparty/SPMediaKeyTap/SPMediaKeyTap.m ---- clementine-1.0.1/3rdparty/SPMediaKeyTap/SPMediaKeyTap.m 2011-12-02 19:24:43.000000000 -0200 -+++ clementine-libre-1.0.1/3rdparty/SPMediaKeyTap/SPMediaKeyTap.m 2012-05-28 17:19:14.612750904 -0300 -@@ -98,7 +98,6 @@ +diff --git a/3rdparty/SPMediaKeyTap/SPMediaKeyTap.m b/3rdparty/SPMediaKeyTap/SPMediaKeyTap.m +index a349f59..c418e0b 100644 +--- a/3rdparty/SPMediaKeyTap/SPMediaKeyTap.m ++++ b/3rdparty/SPMediaKeyTap/SPMediaKeyTap.m +@@ -98,7 +98,6 @@ static CGEventRef tapEventCallback(CGEventTapProxy proxy, CGEventType type, CGEv { return [NSArray arrayWithObjects: [[NSBundle mainBundle] bundleIdentifier], // your app @@ -9,10 +10,11 @@ diff -rauN clementine-1.0.1/3rdparty/SPMediaKeyTap/SPMediaKeyTap.m clementine-li @"com.apple.iTunes", @"com.apple.QuickTimePlayerX", @"com.apple.quicktimeplayer", -diff -rauN clementine-1.1.0/CMakeLists.txt clementine-libre-1.1.0/CMakeLists.txt ---- clementine-1.1.0/CMakeLists.txt 2012-10-22 04:24:28.000000000 -0200 -+++ clementine-libre-1.1.0/CMakeLists.txt 2012-10-26 01:58:08.725496264 -0200 -@@ -7,7 +7,6 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8ba5a8a..986351b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -7,7 +7,6 @@ include(cmake/Summary.cmake) include(cmake/Version.cmake) include(cmake/Deb.cmake) include(cmake/Rpm.cmake) @@ -20,15 +22,15 @@ diff -rauN clementine-1.1.0/CMakeLists.txt clementine-libre-1.1.0/CMakeLists.txt include(cmake/OptionalSource.cmake) set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) -@@ -55,7 +54,6 @@ - pkg_check_modules(USBMUXD libusbmuxd) - pkg_check_modules(LIBMTP libmtp>=1.0) - pkg_check_modules(INDICATEQT indicate-qt) --pkg_check_modules(SPOTIFY libspotify>=12.1.45) - pkg_check_modules(CDIO libcdio) +@@ -78,7 +77,6 @@ pkg_check_modules(LIBMYGPO_QT libmygpo-qt>=1.0.7) + pkg_check_modules(LIBXML libxml-2.0) pkg_check_modules(QCA qca2) - pkg_check_modules(CHROMAPRINT libchromaprint) -@@ -81,13 +79,6 @@ + pkg_check_modules(QJSON REQUIRED QJson) +-pkg_check_modules(SPOTIFY libspotify>=12.1.45) + pkg_check_modules(TAGLIB REQUIRED taglib>=1.6) + + if (WIN32) +@@ -124,13 +122,6 @@ if (APPLE) find_library(GROWL Growl) find_library(SPARKLE Sparkle) @@ -41,44 +43,42 @@ diff -rauN clementine-1.1.0/CMakeLists.txt clementine-libre-1.1.0/CMakeLists.txt - add_subdirectory(3rdparty/SPMediaKeyTap) set(SPMEDIAKEYTAP_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/SPMediaKeyTap) - set(SPMEDIAKEYTAP_LIBRARIES SPMediaKeyTap) -@@ -224,26 +215,16 @@ + set(SPMEDIAKEYTAP_LIBRARIES SPMediaKeyTap) +@@ -254,7 +245,7 @@ optional_component(DEVICEKIT ON "Devices: DeviceKit backend" DEPENDS "D-Bus support" HAVE_DBUS ) --optional_component(SPOTIFY ON "Spotify support: core code" -+optional_component(SPOTIFY OFF "Spotify support: core code" - DEPENDS "protobuf" PROTOBUF_FOUND PROTOBUF_PROTOC_EXECUTABLE - ) - -optional_component(SPOTIFY_BLOB ON "Spotify support: non-GPL binary helper" +optional_component(SPOTIFY_BLOB OFF "Spotify support: non-GPL binary helper" DEPENDS "protobuf" PROTOBUF_FOUND PROTOBUF_PROTOC_EXECUTABLE DEPENDS "libspotify" SPOTIFY_FOUND - DEPENDS "Spotify support: core code" HAVE_SPOTIFY ) +@@ -270,13 +261,6 @@ optional_component(SPARKLE ON "Sparkle integration" --set(NEED_SPOTIFY_DOWNLOADER OFF) --if(HAVE_SPOTIFY AND NOT HAVE_SPOTIFY_BLOB) -- set(NEED_SPOTIFY_DOWNLOADER ON) + optional_component(VISUALISATIONS ON "Visualisations") + +-if(NOT HAVE_SPOTIFY_BLOB AND NOT QCA_FOUND) +- message(FATAL_ERROR "Either QCA must be available or the non-GPL Spotify " +- "code must be compiled in") +-elif(QCA_FOUND) +- set(HAVE_SPOTIFY_DOWNLOADER ON) -endif() - --optional_component(SPOTIFY_DOWNLOADER -- ${NEED_SPOTIFY_DOWNLOADER} "Spotify support: blob downloader" -- DEPENDS "qca2" QCA_FOUND --) -- - optional_component(MOODBAR ON "Moodbar support" - DEPENDS "fftw3" FFTW3_FOUND - ) -@@ -411,14 +392,6 @@ + # Find DBus if it's enabled + if (HAVE_DBUS) + find_package(Qt4 REQUIRED QtDbus) +@@ -440,7 +424,6 @@ add_subdirectory(ext/libclementine-common) + add_subdirectory(ext/libclementine-tagreader) + add_subdirectory(ext/clementine-tagreader) + add_subdirectory(ext/libclementine-remote) +-add_subdirectory(ext/libclementine-spotifyblob) + + option(WITH_DEBIAN OFF) + if(WITH_DEBIAN) +@@ -451,10 +434,6 @@ if(HAVE_BREAKPAD) add_subdirectory(3rdparty/google-breakpad) endif(HAVE_BREAKPAD) --if(HAVE_SPOTIFY) -- add_subdirectory(ext/libclementine-spotifyblob) --endif(HAVE_SPOTIFY) -- -if(HAVE_SPOTIFY_BLOB) - add_subdirectory(ext/clementine-spotifyblob) -endif(HAVE_SPOTIFY_BLOB) @@ -86,18 +86,19 @@ diff -rauN clementine-1.1.0/CMakeLists.txt clementine-libre-1.1.0/CMakeLists.txt if(HAVE_MOODBAR) add_subdirectory(gst/moodbar) endif() -diff -rauN clementine-1.1.1/data/data.qrc clementine-libre-1.1.1/data/data.qrc ---- clementine-1.1.1/data/data.qrc 2012-11-18 06:51:26.000000000 -0200 -+++ clementine-libre-1.1.1/data/data.qrc 2013-05-13 02:55:19.579440533 -0300 -@@ -1,7 +1,6 @@ - <RCC> +diff --git a/data/data.qrc b/data/data.qrc +index 4c5473f..bd5fe2d 100644 +--- a/data/data.qrc ++++ b/data/data.qrc +@@ -2,7 +2,6 @@ <qresource prefix="/"> <file>blank.ttf</file> + <file>clementine_remote_qr.png</file> - <file>clementine-spotify-public.pem</file> <file>currenttrack_bar_left.png</file> <file>currenttrack_bar_mid.png</file> <file>currenttrack_bar_right.png</file> -@@ -76,7 +75,6 @@ +@@ -77,7 +76,6 @@ <file>icons/22x22/phone-nokia-n900.png</file> <file>icons/22x22/phone-palm-pre.png</file> <file>icons/22x22/phone.png</file> @@ -105,7 +106,7 @@ diff -rauN clementine-1.1.1/data/data.qrc clementine-libre-1.1.1/data/data.qrc <file>icons/22x22/user-away.png</file> <file>icons/22x22/view-choose.png</file> <file>icons/22x22/view-fullscreen.png</file> -@@ -153,7 +151,6 @@ +@@ -154,7 +152,6 @@ <file>icons/32x32/phone-palm-pre.png</file> <file>icons/32x32/phone.png</file> <file>icons/32x32/search.png</file> @@ -113,7 +114,7 @@ diff -rauN clementine-1.1.1/data/data.qrc clementine-libre-1.1.1/data/data.qrc <file>icons/32x32/tools-wizard.png</file> <file>icons/32x32/view-choose.png</file> <file>icons/32x32/view-fullscreen.png</file> -@@ -229,7 +226,6 @@ +@@ -230,7 +227,6 @@ <file>icons/48x48/phone-nokia-n900.png</file> <file>icons/48x48/phone-palm-pre.png</file> <file>icons/48x48/phone.png</file> @@ -121,7 +122,7 @@ diff -rauN clementine-1.1.1/data/data.qrc clementine-libre-1.1.1/data/data.qrc <file>icons/48x48/view-choose.png</file> <file>icons/48x48/view-fullscreen.png</file> <file>icons/48x48/view-media-equalizer.png</file> -@@ -261,10 +257,10 @@ +@@ -262,10 +258,10 @@ <file>lumberjacksong.txt</file> <file>lyrics/ultimate_providers.xml</file> <file>mainwindow.css</file> @@ -130,35 +131,37 @@ diff -rauN clementine-1.1.1/data/data.qrc clementine-libre-1.1.1/data/data.qrc <file>nomusic.png</file> <file>now_playing_tooltip.txt</file> - <file>nyancat.png</file> + <file>oauthsuccess.html</file> <file>osd_background.png</file> <file>osd_shadow_corner.png</file> - <file>osd_shadow_edge.png</file> -@@ -339,7 +335,6 @@ +@@ -391,7 +387,6 @@ <file>smartplaylistsearchterm.css</file> <file>songinfo.css</file> <file>spinner.gif</file> -- <file>spotify-core-logo-128x128.png</file> +- <file>spotify-attribution.png</file> <file>star-off.png</file> <file>star-on.png</file> <file>tiny-pause.png</file> -diff -rauN clementine-1.1.0/dist/macdeploy.py clementine-libre-1.1.0/dist/macdeploy.py ---- clementine-1.1.0/dist/macdeploy.py 2012-10-11 09:16:39.000000000 -0200 -+++ clementine-libre-1.1.0/dist/macdeploy.py 2012-10-26 02:06:12.781965350 -0200 -@@ -387,10 +387,7 @@ - FixPlugin(FindGioModule('libgiolibproxy.so'), 'gio-modules') - - try: -- FixPlugin('clementine-spotifyblob', '.') - FixPlugin('clementine-tagreader', '.') --except: -- print 'Failed to find blob: %s' % traceback.format_exc() - - for plugin in QT_PLUGINS: - FixPlugin(FindQtPlugin(plugin), os.path.dirname(plugin)) -diff -rauN clementine-1.1.0/dist/windows/clementine.nsi clementine-libre-1.1.0/dist/windows/clementine.nsi ---- clementine-1.1.0/dist/windows/clementine.nsi 2012-10-22 04:27:00.000000000 -0200 -+++ clementine-libre-1.1.0/dist/windows/clementine.nsi 2012-10-26 02:07:20.551540003 -0200 -@@ -94,9 +94,6 @@ +diff --git a/dist/macdeploy.py b/dist/macdeploy.py +index e054619..3568a6f 100755 +--- a/dist/macdeploy.py ++++ b/dist/macdeploy.py +@@ -398,10 +398,7 @@ def main(): + FixPlugin(FindGioModule('libgiolibproxy.so'), 'gio-modules') + + try: +- FixPlugin('clementine-spotifyblob', '.') + FixPlugin('clementine-tagreader', '.') +- except: +- print 'Failed to find blob: %s' % traceback.format_exc() + + for plugin in QT_PLUGINS: + FixPlugin(FindQtPlugin(plugin), os.path.dirname(plugin)) +diff --git a/dist/windows/clementine.nsi b/dist/windows/clementine.nsi +index 82c0fc1..086bdc7 100644 +--- a/dist/windows/clementine.nsi ++++ b/dist/windows/clementine.nsi +@@ -97,9 +97,6 @@ Section "Delete old files" oldfiles Delete "$INSTDIR\gstreamer-plugins\libgstqueue2.dll" Delete "$INSTDIR\gstreamer-plugins\libgstsoup.dll" @@ -168,42 +171,43 @@ diff -rauN clementine-1.1.0/dist/windows/clementine.nsi clementine-libre-1.1.0/d ; 1.0 Delete "$INSTDIR\libofa.dll" Delete "$INSTDIR\gstreamer-plugins\libgstofa.dll" -@@ -110,7 +107,6 @@ - File "avutil-50.dll" +@@ -128,7 +125,6 @@ Section "Clementine" Clementine + File "avutil-51.dll" File "clementine.exe" File "clementine-tagreader.exe" - File "clementine-spotifyblob.exe" File "clementine.ico" File "glew32.dll" File "intl.dll" -@@ -164,7 +160,6 @@ +@@ -181,7 +177,6 @@ Section "Clementine" Clementine File "libqjson.dll" File "libsoup-2.4-1.dll" File "libspeex-1.dll" - File "libspotify.dll" + File "libstdc++-6.dll" File "libtag.dll" File "libtasn1-3.dll" - File "libusbmuxd.dll" -@@ -957,7 +952,6 @@ +@@ -939,7 +934,6 @@ Section "Uninstall" Delete "$INSTDIR\clementine.ico" Delete "$INSTDIR\clementine.exe" Delete "$INSTDIR\clementine-tagreader.exe" - Delete "$INSTDIR\clementine-spotifyblob.exe" Delete "$INSTDIR\glew32.dll" Delete "$INSTDIR\intl.dll" - Delete "$INSTDIR\libcdio-12.dll" -@@ -1010,7 +1004,6 @@ + Delete "$INSTDIR\libcdio-14.dll" +@@ -992,7 +986,6 @@ Section "Uninstall" Delete "$INSTDIR\libqjson.dll" Delete "$INSTDIR\libsoup-2.4-1.dll" Delete "$INSTDIR\libspeex-1.dll" - Delete "$INSTDIR\libspotify.dll" + Delete "$INSTDIR\libstdc++-6.dll" Delete "$INSTDIR\libtag.dll" Delete "$INSTDIR\libtasn1-3.dll" - Delete "$INSTDIR\libusbmuxd.dll" -diff -rauN clementine-1.1.0/dist/windows/clementine.nsi.in clementine-libre-1.1.0/dist/windows/clementine.nsi.in ---- clementine-1.1.0/dist/windows/clementine.nsi.in 2012-10-11 09:16:39.000000000 -0200 -+++ clementine-libre-1.1.0/dist/windows/clementine.nsi.in 2012-10-26 02:08:02.052572234 -0200 -@@ -94,9 +94,6 @@ +diff --git a/dist/windows/clementine.nsi.in b/dist/windows/clementine.nsi.in +index 750b332..6bf47ff 100644 +--- a/dist/windows/clementine.nsi.in ++++ b/dist/windows/clementine.nsi.in +@@ -97,9 +97,6 @@ Section "Delete old files" oldfiles Delete "$INSTDIR\gstreamer-plugins\libgstqueue2.dll" Delete "$INSTDIR\gstreamer-plugins\libgstsoup.dll" @@ -213,70 +217,130 @@ diff -rauN clementine-1.1.0/dist/windows/clementine.nsi.in clementine-libre-1.1. ; 1.0 Delete "$INSTDIR\libofa.dll" Delete "$INSTDIR\gstreamer-plugins\libgstofa.dll" -@@ -110,7 +107,6 @@ - File "avutil-50.dll" +@@ -128,7 +125,6 @@ Section "Clementine" Clementine + File "avutil-51.dll" File "clementine.exe" File "clementine-tagreader.exe" - File "clementine-spotifyblob.exe" File "clementine.ico" File "glew32.dll" File "intl.dll" -@@ -164,7 +160,6 @@ +@@ -181,7 +177,6 @@ Section "Clementine" Clementine File "libqjson.dll" File "libsoup-2.4-1.dll" File "libspeex-1.dll" - File "libspotify.dll" + File "libstdc++-6.dll" File "libtag.dll" File "libtasn1-3.dll" - File "libusbmuxd.dll" -@@ -957,7 +952,6 @@ +@@ -939,7 +934,6 @@ Section "Uninstall" Delete "$INSTDIR\clementine.ico" Delete "$INSTDIR\clementine.exe" Delete "$INSTDIR\clementine-tagreader.exe" - Delete "$INSTDIR\clementine-spotifyblob.exe" Delete "$INSTDIR\glew32.dll" Delete "$INSTDIR\intl.dll" - Delete "$INSTDIR\libcdio-12.dll" -@@ -1010,7 +1004,6 @@ + Delete "$INSTDIR\libcdio-14.dll" +@@ -992,7 +986,6 @@ Section "Uninstall" Delete "$INSTDIR\libqjson.dll" Delete "$INSTDIR\libsoup-2.4-1.dll" Delete "$INSTDIR\libspeex-1.dll" - Delete "$INSTDIR\libspotify.dll" + Delete "$INSTDIR\libstdc++-6.dll" Delete "$INSTDIR\libtag.dll" Delete "$INSTDIR\libtasn1-3.dll" - Delete "$INSTDIR\libusbmuxd.dll" -diff -rauN clementine-1.1.0/src/CMakeLists.txt clementine-libre-1.1.0/src/CMakeLists.txt ---- clementine-1.1.0/src/CMakeLists.txt 2012-10-22 04:24:28.000000000 -0200 -+++ clementine-libre-1.1.0/src/CMakeLists.txt 2012-10-26 02:09:29.994361873 -0200 -@@ -630,7 +630,6 @@ +diff --git a/ext/libclementine-common/core/logging.cpp b/ext/libclementine-common/core/logging.cpp +index 3c53d7a..49dd8cf 100644 +--- a/ext/libclementine-common/core/logging.cpp ++++ b/ext/libclementine-common/core/logging.cpp +@@ -14,10 +14,6 @@ + limitations under the License. + */ + +-// Note: this file is licensed under the Apache License instead of GPL because +-// it is used by the Spotify blob which links against libspotify and is not GPL +-// compatible. +- + #include <QtGlobal> + + #include <cxxabi.h> +diff --git a/ext/libclementine-common/core/logging.h b/ext/libclementine-common/core/logging.h +index 3c582cf..4a3cea8 100644 +--- a/ext/libclementine-common/core/logging.h ++++ b/ext/libclementine-common/core/logging.h +@@ -14,11 +14,6 @@ + limitations under the License. + */ + +-// Note: this file is licensed under the Apache License instead of GPL because +-// it is used by the Spotify blob which links against libspotify and is not GPL +-// compatible. +- +- + #ifndef LOGGING_H + #define LOGGING_H + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 1104542..e7a8032 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -60,8 +60,6 @@ include_directories(${CMAKE_SOURCE_DIR}/ext/libclementine-tagreader) + include_directories(${CMAKE_BINARY_DIR}/ext/libclementine-tagreader) + include_directories(${CMAKE_SOURCE_DIR}/ext/libclementine-remote) + include_directories(${CMAKE_BINARY_DIR}/ext/libclementine-remote) +-include_directories(${CMAKE_SOURCE_DIR}/ext/libclementine-spotifyblob) +-include_directories(${CMAKE_BINARY_DIR}/ext/libclementine-spotifyblob) + + cmake_policy(SET CMP0011 NEW) + include(../cmake/ParseArguments.cmake) +@@ -157,7 +155,6 @@ set(SOURCES + globalsearch/simplesearchprovider.cpp + globalsearch/somafmsearchprovider.cpp + globalsearch/soundcloudsearchprovider.cpp +- globalsearch/spotifysearchprovider.cpp + globalsearch/suggestionwidget.cpp + globalsearch/urlsearchprovider.cpp + +@@ -195,9 +192,6 @@ set(SOURCES + internet/somafmservice.cpp + internet/somafmurlhandler.cpp + internet/soundcloudservice.cpp +- internet/spotifyserver.cpp +- internet/spotifyservice.cpp +- internet/spotifysettingspage.cpp + internet/subsonicservice.cpp + internet/subsonicsettingspage.cpp + internet/subsonicurlhandler.cpp +@@ -461,7 +455,6 @@ set(HEADERS + globalsearch/searchprovider.h + globalsearch/simplesearchprovider.h + globalsearch/soundcloudsearchprovider.h +- globalsearch/spotifysearchprovider.h + globalsearch/suggestionwidget.h + + internet/cloudfileservice.h +@@ -494,9 +487,6 @@ set(HEADERS + internet/somafmservice.h + internet/somafmurlhandler.h + internet/soundcloudservice.h +- internet/spotifyserver.h +- internet/spotifyservice.h +- internet/spotifysettingspage.h + internet/subsonicservice.h + internet/subsonicsettingspage.h + internet/subsonicurlhandler.h +@@ -685,7 +675,6 @@ set(UI internet/magnatunedownloaddialog.ui internet/magnatunesettingspage.ui internet/searchboxwidget.ui - internet/spotifysettingspage.ui + internet/subsonicsettingspage.ui library/groupbydialog.ui - library/libraryfilterwidget.ui -@@ -774,32 +773,6 @@ - internet/lastfmstationdialog.ui +@@ -836,15 +825,6 @@ optional_source(HAVE_LIBLASTFM ) --# Spotify --optional_source(HAVE_SPOTIFY -- SOURCES -- globalsearch/spotifysearchprovider.cpp -- internet/spotifyserver.cpp -- internet/spotifyservice.cpp -- internet/spotifysettingspage.cpp -- HEADERS -- globalsearch/spotifysearchprovider.h -- internet/spotifyserver.h -- internet/spotifyservice.h -- internet/spotifysettingspage.h -- INCLUDE_DIRECTORIES -- ${CMAKE_SOURCE_DIR}/ext/libclementine-spotifyblob -- ${CMAKE_BINARY_DIR}/ext/libclementine-spotifyblob --) -- + -optional_source(HAVE_SPOTIFY_DOWNLOADER - SOURCES - internet/spotifyblobdownloader.cpp @@ -289,16 +353,18 @@ diff -rauN clementine-1.1.0/src/CMakeLists.txt clementine-libre-1.1.0/src/CMakeL # Platform specific - OS X optional_source(APPLE INCLUDE_DIRECTORIES -@@ -1141,19 +1114,6 @@ +@@ -1171,7 +1151,6 @@ add_dependencies(clementine_lib pot) + + + target_link_libraries(clementine_lib +- clementine-spotifyblob-messages + libclementine-common + libclementine-tagreader + libclementine-remote +@@ -1240,13 +1219,6 @@ if(HAVE_BREAKPAD) endif (LINUX) endif(HAVE_BREAKPAD) --if(HAVE_SPOTIFY) -- target_link_libraries(clementine_lib -- clementine-spotifyblob-messages -- ) --endif(HAVE_SPOTIFY) -- -if(HAVE_SPOTIFY_DOWNLOADER) - target_link_libraries(clementine_lib - ${QCA_LIBRARIES} @@ -309,7 +375,7 @@ diff -rauN clementine-1.1.0/src/CMakeLists.txt clementine-libre-1.1.0/src/CMakeL if (APPLE) target_link_libraries(clementine_lib ${GROWL} -@@ -1231,16 +1191,6 @@ +@@ -1328,16 +1300,6 @@ target_link_libraries(clementine clementine_lib ) @@ -326,22 +392,78 @@ diff -rauN clementine-1.1.0/src/CMakeLists.txt clementine-libre-1.1.0/src/CMakeL if (APPLE) install(FILES ../dist/clementine.icns DESTINATION "${CMAKE_BINARY_DIR}/clementine.app/Contents/Resources") -diff -rauN clementine-1.1.0/src/config.h.in clementine-libre-1.1.0/src/config.h.in ---- clementine-1.1.0/src/config.h.in 2012-10-22 04:24:28.000000000 -0200 -+++ clementine-libre-1.1.0/src/config.h.in 2012-10-26 02:10:01.735935822 -0200 -@@ -38,8 +38,6 @@ +diff --git a/src/analyzers/nyancatanalyzer.cpp b/src/analyzers/nyancatanalyzer.cpp +index 39ea101..ab19341 100644 +--- a/src/analyzers/nyancatanalyzer.cpp ++++ b/src/analyzers/nyancatanalyzer.cpp +@@ -23,13 +23,13 @@ + #include <QTimerEvent> + #include <QBrush> + +-const char* NyanCatAnalyzer::kName = "Nyanalyzer cat"; ++const char* NyanCatAnalyzer::kName = "MooGNU"; + const float NyanCatAnalyzer::kPixelScale = 0.02f; + + + NyanCatAnalyzer::NyanCatAnalyzer(QWidget* parent) + : Analyzer::Base(parent, 9), +- cat_(":/nyancat.png"), ++ cat_(":/moognu.png"), + timer_id_(startTimer(kFrameIntervalMs)), + frame_(0), + current_buffer_(0), +diff --git a/src/config.h.in b/src/config.h.in +index 6cac97e..90e4ee2 100644 +--- a/src/config.h.in ++++ b/src/config.h.in +@@ -39,7 +39,6 @@ #cmakedefine HAVE_QCA - #cmakedefine HAVE_SAC + #cmakedefine HAVE_SKYDRIVE #cmakedefine HAVE_SPARKLE --#cmakedefine HAVE_SPOTIFY -#cmakedefine HAVE_SPOTIFY_DOWNLOADER #cmakedefine HAVE_STATIC_SQLITE + #cmakedefine HAVE_UBUNTU_ONE #cmakedefine HAVE_WIIMOTEDEV - #cmakedefine IMOBILEDEVICE_USES_UDIDS -diff -rauN clementine-1.1.0/src/core/utilities.cpp clementine-libre-1.1.0/src/core/utilities.cpp ---- clementine-1.1.0/src/core/utilities.cpp 2012-10-11 09:16:39.000000000 -0200 -+++ clementine-libre-1.1.0/src/core/utilities.cpp 2012-10-26 02:10:38.303908540 -0200 -@@ -310,9 +310,6 @@ +diff --git a/src/core/backgroundstreams.cpp b/src/core/backgroundstreams.cpp +index 347b959..b00cb87 100644 +--- a/src/core/backgroundstreams.cpp ++++ b/src/core/backgroundstreams.cpp +@@ -9,7 +9,6 @@ + + const char* BackgroundStreams::kSettingsGroup = "BackgroundStreams"; + const char* BackgroundStreams::kHypnotoadUrl = "hypnotoad:///"; +-const char* BackgroundStreams::kRainUrl = "http://data.clementine-player.org/rainymood"; + const char* BackgroundStreams::kEnterpriseUrl = "enterprise:///"; + + BackgroundStreams::BackgroundStreams(EngineBase* engine, QObject* parent) +@@ -28,7 +27,6 @@ void BackgroundStreams::LoadStreams() { + int version = s.value("version", 0).toInt(); + if (version < 1) { + AddStream(QT_TR_NOOP("Hypnotoad"), QUrl(kHypnotoadUrl)); +- AddStream(QT_TR_NOOP("Rain"), QUrl(kRainUrl)); + } + + if (version < kVersion) { +diff --git a/src/core/timeconstants.h b/src/core/timeconstants.h +index 96242d6..69196bd 100644 +--- a/src/core/timeconstants.h ++++ b/src/core/timeconstants.h +@@ -14,10 +14,6 @@ + limitations under the License. + */ + +-// Note: this file is licensed under the Apache License instead of GPL because +-// it is used by the Spotify blob which links against libspotify and is not GPL +-// compatible. +- + #ifndef TIMECONSTANTS_H + #define TIMECONSTANTS_H + +diff --git a/src/core/utilities.cpp b/src/core/utilities.cpp +index 3fdc6be..e6a109f 100644 +--- a/src/core/utilities.cpp ++++ b/src/core/utilities.cpp +@@ -340,9 +340,6 @@ QString GetConfigPath(ConfigPath config) { return QDir::homePath(); #endif @@ -351,30 +473,31 @@ diff -rauN clementine-1.1.0/src/core/utilities.cpp clementine-libre-1.1.0/src/co default: qFatal("%s", Q_FUNC_INFO); return QString::null; -diff -rauN clementine-1.1.0/src/core/utilities.h clementine-libre-1.1.0/src/core/utilities.h ---- clementine-1.1.0/src/core/utilities.h 2012-10-11 09:16:39.000000000 -0200 -+++ clementine-libre-1.1.0/src/core/utilities.h 2012-10-26 02:11:04.965764358 -0200 -@@ -108,7 +108,6 @@ +diff --git a/src/core/utilities.h b/src/core/utilities.h +index edaa545..ad2138c 100644 +--- a/src/core/utilities.h ++++ b/src/core/utilities.h +@@ -111,7 +111,6 @@ namespace Utilities { Path_NetworkCache, Path_GstreamerRegistry, Path_DefaultMusicLibrary, - Path_LocalSpotifyBlob, Path_MoodbarCache, + Path_CacheRoot, }; - QString GetConfigPath(ConfigPath config); -diff -rauN clementine-1.1.0/src/covers/albumcoverloader.cpp clementine-libre-1.1.0/src/covers/albumcoverloader.cpp ---- clementine-1.1.0/src/covers/albumcoverloader.cpp 2012-10-22 04:24:28.000000000 -0200 -+++ clementine-libre-1.1.0/src/covers/albumcoverloader.cpp 2012-10-26 03:59:14.488394050 -0200 -@@ -29,17 +29,12 @@ - #include <QUrl> - #include <QNetworkReply> - --#ifdef HAVE_SPOTIFY --# include "internet/spotifyservice.h" --#endif -- +diff --git a/src/covers/albumcoverloader.cpp b/src/covers/albumcoverloader.cpp +index a4c4241..39dd101 100644 +--- a/src/covers/albumcoverloader.cpp ++++ b/src/covers/albumcoverloader.cpp +@@ -30,7 +30,6 @@ + #include "core/tagreaderclient.h" + #include "core/utilities.h" + #include "internet/internetmodel.h" +-#include "internet/spotifyservice.h" + - AlbumCoverLoader::AlbumCoverLoader(QObject* parent) + +@@ -38,8 +37,7 @@ AlbumCoverLoader::AlbumCoverLoader(QObject* parent) : QObject(parent), stop_requested_(false), next_id_(1), @@ -384,38 +507,34 @@ diff -rauN clementine-1.1.0/src/covers/albumcoverloader.cpp clementine-libre-1.1 { } -@@ -167,30 +162,6 @@ +@@ -169,26 +167,6 @@ AlbumCoverLoader::TryLoadResult AlbumCoverLoader::TryLoadImage( remote_tasks_.insert(reply, task); return TryLoadResult(true, false, QImage()); - } else if (filename.toLower().startsWith("spotify://image/")) { - // HACK: we should add generic image URL handlers -- #ifdef HAVE_SPOTIFY -- SpotifyService* spotify = InternetModel::Service<SpotifyService>(); -- -- if (!connected_spotify_) { -- connect(spotify, SIGNAL(ImageLoaded(QString,QImage)), -- SLOT(SpotifyImageLoaded(QString,QImage))); -- connected_spotify_ = true; -- } -- -- QString id = QUrl(filename).path(); -- if (id.startsWith('/')) { -- id.remove(0, 1); -- } -- remote_spotify_tasks_.insert(id, task); -- -- // Need to schedule this in the spotify service's thread -- QMetaObject::invokeMethod(spotify, "LoadImage", Qt::QueuedConnection, -- Q_ARG(QString, id)); -- return TryLoadResult(true, false, QImage()); -- #else -- return TryLoadResult(false, false, QImage()); -- #endif +- SpotifyService* spotify = InternetModel::Service<SpotifyService>(); +- +- if (!connected_spotify_) { +- connect(spotify, SIGNAL(ImageLoaded(QString,QImage)), +- SLOT(SpotifyImageLoaded(QString,QImage))); +- connected_spotify_ = true; +- } +- +- QString id = QUrl(filename).path(); +- if (id.startsWith('/')) { +- id.remove(0, 1); +- } +- remote_spotify_tasks_.insert(id, task); +- +- // Need to schedule this in the spotify service's thread +- QMetaObject::invokeMethod(spotify, "LoadImage", Qt::QueuedConnection, +- Q_ARG(QString, id)); +- return TryLoadResult(true, false, QImage()); } QImage image(filename); -@@ -198,16 +169,6 @@ +@@ -196,16 +174,6 @@ AlbumCoverLoader::TryLoadResult AlbumCoverLoader::TryLoadImage( image.isNull() ? task.options.default_output_image_: image); } @@ -429,21 +548,22 @@ diff -rauN clementine-1.1.0/src/covers/albumcoverloader.cpp clementine-libre-1.1 - emit ImageLoaded(task.id, scaled, image); -} - - void AlbumCoverLoader::RemoteFetchFinished() { - QNetworkReply* reply = qobject_cast<QNetworkReply*>(sender()); - if (!reply) -diff -rauN clementine-1.1.0/src/covers/albumcoverloader.h clementine-libre-1.1.0/src/covers/albumcoverloader.h ---- clementine-1.1.0/src/covers/albumcoverloader.h 2012-10-22 04:24:28.000000000 -0200 -+++ clementine-libre-1.1.0/src/covers/albumcoverloader.h 2012-10-26 02:13:19.304984280 -0200 -@@ -62,7 +62,6 @@ + void AlbumCoverLoader::RemoteFetchFinished(QNetworkReply* reply) { + reply->deleteLater(); + +diff --git a/src/covers/albumcoverloader.h b/src/covers/albumcoverloader.h +index 987be66..5214e14 100644 +--- a/src/covers/albumcoverloader.h ++++ b/src/covers/albumcoverloader.h +@@ -62,7 +62,6 @@ class AlbumCoverLoader : public QObject { protected slots: void ProcessTasks(); - void RemoteFetchFinished(); + void RemoteFetchFinished(QNetworkReply* reply); - void SpotifyImageLoaded(const QString& url, const QImage& image); protected: enum State { -@@ -102,13 +101,10 @@ +@@ -102,13 +101,10 @@ class AlbumCoverLoader : public QObject { QMutex mutex_; QQueue<Task> tasks_; QMap<QNetworkReply*, Task> remote_tasks_; @@ -457,54 +577,47 @@ diff -rauN clementine-1.1.0/src/covers/albumcoverloader.h clementine-libre-1.1.0 static const int kMaxRedirects = 3; }; -diff -rauN clementine-1.1.0/src/engines/gstenginepipeline.cpp clementine-libre-1.1.0/src/engines/gstenginepipeline.cpp ---- clementine-1.1.0/src/engines/gstenginepipeline.cpp 2012-10-25 03:04:21.000000000 -0200 -+++ clementine-libre-1.1.0/src/engines/gstenginepipeline.cpp 2012-10-26 02:14:35.834075631 -0200 -@@ -30,11 +30,6 @@ +diff --git a/src/engines/gstenginepipeline.cpp b/src/engines/gstenginepipeline.cpp +index 94f77a3..37c1cdf 100644 +--- a/src/engines/gstenginepipeline.cpp ++++ b/src/engines/gstenginepipeline.cpp +@@ -29,8 +29,6 @@ + #include "core/signalchecker.h" #include "core/utilities.h" #include "internet/internetmodel.h" +-#include "internet/spotifyserver.h" +-#include "internet/spotifyservice.h" --#ifdef HAVE_SPOTIFY --# include "internet/spotifyserver.h" --# include "internet/spotifyservice.h" --#endif -- - const int GstEnginePipeline::kGstStateTimeoutNanosecs = 10000000; - const int GstEnginePipeline::kFaderFudgeMsec = 2000; -@@ -139,42 +134,11 @@ + const int GstEnginePipeline::kGstStateTimeoutNanosecs = 10000000; +@@ -141,37 +139,11 @@ bool GstEnginePipeline::ReplaceDecodeBin(GstElement* new_bin) { bool GstEnginePipeline::ReplaceDecodeBin(const QUrl& url) { GstElement* new_bin = NULL; - if (url.scheme() == "spotify") { -- #ifdef HAVE_SPOTIFY -- new_bin = gst_bin_new("spotify_bin"); +- new_bin = gst_bin_new("spotify_bin"); - -- // Create elements -- GstElement* src = engine_->CreateElement("tcpserversrc", new_bin); -- GstElement* gdp = engine_->CreateElement("gdpdepay", new_bin); -- if (!src || !gdp) -- return false; +- // Create elements +- GstElement* src = engine_->CreateElement("tcpserversrc", new_bin); +- GstElement* gdp = engine_->CreateElement("gdpdepay", new_bin); +- if (!src || !gdp) +- return false; - -- // Pick a port number -- const int port = Utilities::PickUnusedPort(); -- g_object_set(G_OBJECT(src), "host", "127.0.0.1", NULL); -- g_object_set(G_OBJECT(src), "port", port, NULL); +- // Pick a port number +- const int port = Utilities::PickUnusedPort(); +- g_object_set(G_OBJECT(src), "host", "127.0.0.1", NULL); +- g_object_set(G_OBJECT(src), "port", port, NULL); - -- // Link the elements -- gst_element_link(src, gdp); +- // Link the elements +- gst_element_link(src, gdp); - -- // Add a ghost pad -- GstPad* pad = gst_element_get_static_pad(gdp, "src"); -- gst_element_add_pad(GST_ELEMENT(new_bin), gst_ghost_pad_new("src", pad)); -- gst_object_unref(GST_OBJECT(pad)); +- // Add a ghost pad +- GstPad* pad = gst_element_get_static_pad(gdp, "src"); +- gst_element_add_pad(GST_ELEMENT(new_bin), gst_ghost_pad_new("src", pad)); +- gst_object_unref(GST_OBJECT(pad)); - -- // Tell spotify to start sending data to us. -- InternetModel::Service<SpotifyService>()->server()->StartPlaybackLater(url.toString(), port); -- #else // HAVE_SPOTIFY -- qLog(Error) << "Tried to play a spotify:// url, but spotify support is not compiled in"; -- return false; -- #endif +- // Tell spotify to start sending data to us. +- InternetModel::Service<SpotifyService>()->server()->StartPlaybackLater(url.toString(), port); - } else { new_bin = engine_->CreateElement("uridecodebin"); g_object_set(G_OBJECT(new_bin), "uri", url.toEncoded().constData(), NULL); @@ -515,33 +628,31 @@ diff -rauN clementine-1.1.0/src/engines/gstenginepipeline.cpp clementine-libre-1 return ReplaceDecodeBin(new_bin); } -diff -rauN clementine-1.1.0/src/internet/internetmodel.cpp clementine-libre-1.1.0/src/internet/internetmodel.cpp ---- clementine-1.1.0/src/internet/internetmodel.cpp 2012-10-22 04:24:28.000000000 -0200 -+++ clementine-libre-1.1.0/src/internet/internetmodel.cpp 2012-10-26 02:15:18.005072563 -0200 -@@ -34,9 +34,6 @@ - #ifdef HAVE_LIBLASTFM - #include "lastfmservice.h" - #endif --#ifdef HAVE_SPOTIFY -- #include "spotifyservice.h" --#endif - #ifdef HAVE_GOOGLE_DRIVE - #include "googledriveservice.h" - #endif -@@ -79,9 +76,6 @@ +diff --git a/src/internet/internetmodel.cpp b/src/internet/internetmodel.cpp +index 289f591..ac9e3e0 100644 +--- a/src/internet/internetmodel.cpp ++++ b/src/internet/internetmodel.cpp +@@ -30,7 +30,6 @@ + #include "savedradio.h" + #include "somafmservice.h" + #include "soundcloudservice.h" +-#include "spotifyservice.h" + #include "subsonicservice.h" + #include "core/closure.h" + #include "core/logging.h" +@@ -94,7 +93,6 @@ InternetModel::InternetModel(Application* app, QObject* parent) AddService(new SkyFmService(app, this)); AddService(new SomaFMService(app, this)); AddService(new SoundCloudService(app, this)); --#ifdef HAVE_SPOTIFY - AddService(new SpotifyService(app, this)); --#endif - } - - void InternetModel::AddService(InternetService *service) { -diff -rauN clementine-1.1.1/src/ui/about.cpp clementine-libre-1.1.1/src/ui/about.cpp ---- clementine-1.1.1/src/ui/about.cpp 2012-10-11 09:16:40.000000000 -0200 -+++ clementine-libre-1.1.1/src/ui/about.cpp 2013-05-13 02:19:40.262472593 -0300 -@@ -75,16 +75,9 @@ + AddService(new SubsonicService(app, this)); + #ifdef HAVE_UBUNTU_ONE + AddService(new UbuntuOneService(app, this)); +diff --git a/src/ui/about.cpp b/src/ui/about.cpp +index 53e42bd..49e7714 100644 +--- a/src/ui/about.cpp ++++ b/src/ui/about.cpp +@@ -76,14 +76,9 @@ QString About::MakeHtml() const { ret += QString("<br />%1</p>").arg(tr("...and all the Amarok contributors")); ret += QString("<p><b>%1</b>").arg(tr("And:")); @@ -549,44 +660,38 @@ diff -rauN clementine-1.1.1/src/ui/about.cpp clementine-libre-1.1.1/src/ui/about ret += QString("<br /><a href=\"http://www.smitelli.com/?page=blog&p=54\">Scott Smitelli</a>"); ret += QString("<br /><a href=\"http://hyperboleandahalf.blogspot.com\">Allie Brosh</a></p>"); --#ifdef HAVE_SPOTIFY -- ret += "<p>This product uses SPOTIFY(R) CORE but is not endorsed, certified " -- "or otherwise approved in any way by Spotify. Spotify is the " -- "registered trade mark of the Spotify Group.</p>"; --#endif // HAVE_SPOTIFY +- ret += "<p>This product uses Music by Spotify but is not endorsed, certified " +- "or otherwise approved in any way by Spotify. Spotify is the registered " +- "trade mark of the Spotify Group.</p>"; - return ret; } -diff -rauN clementine-1.1.0/src/ui/settingsdialog.cpp clementine-libre-1.1.0/src/ui/settingsdialog.cpp ---- clementine-1.1.0/src/ui/settingsdialog.cpp 2012-10-11 09:16:40.000000000 -0200 -+++ clementine-libre-1.1.0/src/ui/settingsdialog.cpp 2012-10-26 02:16:32.400950434 -0200 -@@ -55,10 +55,6 @@ - # include "wiimotedev/wiimotesettingspage.h" +diff --git a/src/ui/settingsdialog.cpp b/src/ui/settingsdialog.cpp +index dc0d84f..4a9335d 100644 +--- a/src/ui/settingsdialog.cpp ++++ b/src/ui/settingsdialog.cpp +@@ -38,7 +38,6 @@ + #include "internet/digitallyimportedsettingspage.h" + #include "internet/groovesharksettingspage.h" + #include "internet/magnatunesettingspage.h" +-#include "internet/spotifysettingspage.h" + #include "internet/subsonicsettingspage.h" + #include "internet/ubuntuonesettingspage.h" + #include "library/librarysettingspage.h" +@@ -174,7 +173,6 @@ SettingsDialog::SettingsDialog(Application* app, BackgroundStreams* streams, QWi + AddPage(Page_Box, new BoxSettingsPage(this), providers); #endif --#ifdef HAVE_SPOTIFY --# include "internet/spotifysettingspage.h" --#endif -- - #ifdef HAVE_GOOGLE_DRIVE - # include "internet/googledrivesettingspage.h" - #endif -@@ -147,10 +143,6 @@ - AddPage(Page_GoogleDrive, new GoogleDriveSettingsPage(this), providers); - #endif - --#ifdef HAVE_SPOTIFY - AddPage(Page_Spotify, new SpotifySettingsPage(this), providers); --#endif -- AddPage(Page_Magnatune, new MagnatuneSettingsPage(this), providers); AddPage(Page_DigitallyImported, new DigitallyImportedSettingsPage(this), providers); AddPage(Page_BackgroundStreams, new BackgroundStreamsSettingsPage(this), providers); -diff -rauN clementine-1.1.0/src/ui/settingsdialog.h clementine-libre-1.1.0/src/ui/settingsdialog.h ---- clementine-1.1.0/src/ui/settingsdialog.h 2012-10-11 09:16:40.000000000 -0200 -+++ clementine-libre-1.1.0/src/ui/settingsdialog.h 2012-10-26 02:16:56.596276994 -0200 -@@ -67,7 +67,6 @@ +diff --git a/src/ui/settingsdialog.h b/src/ui/settingsdialog.h +index e9e709a..5485a37 100644 +--- a/src/ui/settingsdialog.h ++++ b/src/ui/settingsdialog.h +@@ -69,7 +69,6 @@ public: Page_Library, Page_Lastfm, Page_Grooveshark, @@ -594,84 +699,3 @@ diff -rauN clementine-1.1.0/src/ui/settingsdialog.h clementine-libre-1.1.0/src/u Page_Magnatune, Page_DigitallyImported, Page_BackgroundStreams, -diff -rauN clementine-1.1.0/ext/libclementine-common/core/logging.cpp clementine-libre-1.1.0/ext/libclementine-common/core/logging.cpp ---- clementine-1.1.0/ext/libclementine-common/core/logging.cpp 2012-10-11 09:16:39.000000000 -0200 -+++ clementine-libre-1.1.0/ext/libclementine-common/core/logging.cpp 2012-10-26 02:20:08.682299778 -0200 -@@ -14,10 +14,6 @@ - limitations under the License. - */ - --// Note: this file is licensed under the Apache License instead of GPL because --// it is used by the Spotify blob which links against libspotify and is not GPL --// compatible. -- - #include <QtGlobal> - - #include <cxxabi.h> -diff -rauN clementine-1.1.0/ext/libclementine-common/core/logging.h clementine-libre-1.1.0/ext/libclementine-common/core/logging.h ---- clementine-1.1.0/ext/libclementine-common/core/logging.h 2012-10-11 09:16:39.000000000 -0200 -+++ clementine-libre-1.1.0/ext/libclementine-common/core/logging.h 2012-10-26 02:20:34.937511945 -0200 -@@ -14,11 +14,6 @@ - limitations under the License. - */ - --// Note: this file is licensed under the Apache License instead of GPL because --// it is used by the Spotify blob which links against libspotify and is not GPL --// compatible. -- -- - #ifndef LOGGING_H - #define LOGGING_H - -diff -rauN clementine-1.0.1/src/core/timeconstants.h clementine-libre-1.0.1/src/core/timeconstants.h ---- clementine-1.0.1/src/core/timeconstants.h 2011-12-02 19:24:44.000000000 -0200 -+++ clementine-libre-1.0.1/src/core/timeconstants.h 2012-05-30 03:10:10.338953893 -0300 -@@ -14,10 +14,6 @@ - limitations under the License. - */ - --// Note: this file is licensed under the Apache License instead of GPL because --// it is used by the Spotify blob which links against libspotify and is not GPL --// compatible. -- - #ifndef TIMECONSTANTS_H - #define TIMECONSTANTS_H - -diff -rauN clementine-1.1.1/src/core/backgroundstreams.cpp clementine-libre-1.1.1/src/core/backgroundstreams.cpp ---- clementine-1.1.1/src/core/backgroundstreams.cpp 2012-10-11 09:16:39.000000000 -0200 -+++ clementine-libre-1.1.1/src/core/backgroundstreams.cpp 2013-05-13 02:20:21.506864034 -0300 -@@ -9,7 +9,6 @@ - - const char* BackgroundStreams::kSettingsGroup = "BackgroundStreams"; - const char* BackgroundStreams::kHypnotoadUrl = "hypnotoad:///"; --const char* BackgroundStreams::kRainUrl = "http://data.clementine-player.org/rainymood"; - const char* BackgroundStreams::kEnterpriseUrl = "enterprise:///"; - - BackgroundStreams::BackgroundStreams(EngineBase* engine, QObject* parent) -@@ -28,7 +27,6 @@ - int version = s.value("version", 0).toInt(); - if (version < 1) { - AddStream(QT_TR_NOOP("Hypnotoad"), QUrl(kHypnotoadUrl)); -- AddStream(QT_TR_NOOP("Rain"), QUrl(kRainUrl)); - } - - if (version < kVersion) { -diff -rauN clementine-1.1.1/src/analyzers/nyancatanalyzer.cpp clementine-libre-1.1.1/src/analyzers/nyancatanalyzer.cpp ---- clementine-1.1.1/src/analyzers/nyancatanalyzer.cpp 2012-10-16 08:17:37.000000000 -0200 -+++ clementine-libre-1.1.1/src/analyzers/nyancatanalyzer.cpp 2013-08-02 00:16:25.974215711 -0300 -@@ -23,13 +23,13 @@ - #include <QTimerEvent> - #include <QBrush> - --const char* NyanCatAnalyzer::kName = "Nyanalyzer cat"; -+const char* NyanCatAnalyzer::kName = "MooGNU"; - const float NyanCatAnalyzer::kPixelScale = 0.02f; - - - NyanCatAnalyzer::NyanCatAnalyzer(QWidget* parent) - : Analyzer::Base(parent, 9), -- cat_(":/nyancat.png"), -+ cat_(":/moognu.png"), - timer_id_(startTimer(kFrameIntervalMs)), - frame_(0), - current_buffer_(0), diff --git a/libre/epiphany-libre/PKGBUILD b/libre/epiphany-libre/PKGBUILD index 0fcc1a491..d1289a2cf 100644 --- a/libre/epiphany-libre/PKGBUILD +++ b/libre/epiphany-libre/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 195129 2013-09-25 11:58:35Z jgc $ +# $Id: PKGBUILD 196579 2013-10-15 14:29:30Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> # Contributor (Parabola): Márcio Silva <coadde@lavabit.com> _pkgname=epiphany pkgname=epiphany-libre -pkgver=3.10.0 -pkgrel=2 +pkgver=3.10.1 +pkgrel=1 install=epiphany.install pkgdesc="A GNOME web browser based on the WebKit rendering engine, with DuckDuckGo HTML support" arch=('i686' 'x86_64' 'mips64el') @@ -20,11 +20,14 @@ options=('!libtool' '!emptydirs') groups=('gnome') url="http://www.gnome.org/projects/epiphany/" source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgname/${pkgver:0:4}/$_pkgname-$pkgver.tar.xz) -sha256sums=('7bd2c3b21464a83909d75befe2f9501c1ab2f00e2371f26023f79818faec351e') +sha256sums=('86c680b4b12432b18cbb8e7dec25b26586a536cb5842027db2e6986f416ddfad') prepare() { cd $_pkgname-$pkgver + # Replace DuckDuckGo to DuckDuckGo HTML + sed -i 's|duckduckgo[.]com|duckduckgo.com/html|g' $(grep -rlI 'duckduckgo[.]com') + # Replace Google support to DuckDuckGo HTML sed -i 's|http://www[.]google[.]com/search?q=%s[&]ie=UTF-8[&]oe=UTF-8|https://duckduckgo.com/html/?q=search|g' $(grep -rlI 'http://www[.]google[.]com/search?q=%s&ie=UTF-8&oe=UTF-8') sed -i '\|a quoted string should be searched|d' $(grep -rlI 'a quoted string should be searched') diff --git a/libre/file-roller-libre/PKGBUILD b/libre/file-roller-libre/PKGBUILD index 8289eb471..893b75e02 100644 --- a/libre/file-roller-libre/PKGBUILD +++ b/libre/file-roller-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 195293 2013-09-30 08:01:47Z jgc $ +# $Id: PKGBUILD 196556 2013-10-15 13:44:19Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> _pkgname=file-roller pkgname=file-roller-libre -pkgver=3.10.0 -pkgrel=2 +pkgver=3.10.1 +pkgrel=1 pkgdesc="Create and modify archives, with unar support included and nonfree unace recommendation removed" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -19,17 +19,11 @@ conflicts=("$_pkgname") options=('!libtool' '!emptydirs') install=file-roller.install url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz - bug708854.patch - bug709035.patch) -sha256sums=('d889bb9904146e5715c082aa9a6d96b0606a066ba2bf05fbfb7030f2bf274f13' - 'a8f4e856924b6b78e47cc134c723d1d93119f90ec9ab69dd0b59ec8a934688ba' - '59f07968b720ccd9c70e6232b2bfcaa3cf9298d6ce48be4882154d69cbe7a909') +source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz) +sha256sums=('7b180bcf98eaf19835926c694ec5262a421f3a0271f030ca338ccf7f6846a80f') prepare() { cd $_pkgname-$pkgver - patch -Np1 -i ../bug708854.patch - patch -Np1 -i ../bug709035.patch } build() { diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD index 1c9d0251c..994eb5382 100644 --- a/libre/libretools/PKGBUILD +++ b/libre/libretools/PKGBUILD @@ -9,9 +9,9 @@ pkgdesc="Programs for Parabola development" url="https://projects.parabolagnulinux.org/packages/libretools.git/" license=('GPL3' 'GPL2') -pkgver=20131007 -_libretools_commit=75bef554ce82c3c086cc04a4c12ccd2e9644290f -_devtools_commit=f566ebf8345cf39f1d50eaa6a679b3ca7088f4eb +pkgver=20131015 +_libretools_commit=0d673eadca425d63c7367372575058324e9ecc91 +_devtools_commit=345358c4deb71b7316b99fb025d39d5644249e17 _packages_url=https://projects.parabolagnulinux.org/packages source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.tar.bz2 @@ -83,5 +83,5 @@ package_libretools-mips64el() { make install-libretools-mips64el DESTDIR="$pkgdir" } -md5sums=('938d9909ed3ed3af9f31f82bbc54e788' - 'a3cc8d8fc2daa370799249a4ea5caafc') +md5sums=('6b662e93facb0535cdc7a84558ef17ac' + 'edda2408861dd0b4cffa0dd436a90ed5') diff --git a/nonprism/eog-plugins-nonprism/PKGBUILD b/nonprism/eog-plugins-nonprism/PKGBUILD index 7c889280b..58d53cb83 100644 --- a/nonprism/eog-plugins-nonprism/PKGBUILD +++ b/nonprism/eog-plugins-nonprism/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 194995 2013-09-24 13:10:42Z heftig $ +# $Id: PKGBUILD 196609 2013-10-15 18:22:34Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> _pkgname=eog-plugins pkgname=eog-plugins-nonprism -pkgver=3.10.0 +pkgver=3.10.1 pkgrel=1 pkgdesc="Plugins for Eye of Gnome, without libgdata support" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ replaces=$_pkgname install=eog-plugins.install options=('!libtool') source=(http://download.gnome.org/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz) -sha256sums=('0e6699c45181264e87f34a6eb03deeadfd5d73e35995772b7afc803e8218906d') +sha256sums=('d5b32c49dbf1e0b6cf56c9fdc6c19186c92e98d92b71aa98805491e2bb2f8e12') build() { cd $_pkgname-$pkgver diff --git a/nonprism/gnome-online-accounts-nonprism/PKGBUILD b/nonprism/gnome-online-accounts-nonprism/PKGBUILD index 39bb599d2..04ad42a0b 100644 --- a/nonprism/gnome-online-accounts-nonprism/PKGBUILD +++ b/nonprism/gnome-online-accounts-nonprism/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 195045 2013-09-24 18:59:12Z heftig $ +# $Id: PKGBUILD 196581 2013-10-15 14:29:38Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> _pkgname=gnome-online-accounts pkgname=gnome-online-accounts-nonprism -pkgver=3.10.0 +pkgver=3.10.1 pkgrel=1 pkgdesc="GNOME service to access online accounts, without support for unsafe and dangerous for privacy protocols" arch=(i686 x86_64 mips64el) @@ -18,7 +18,7 @@ replaces=($_pkgname $pkgname-coherence) options=(!libtool) install=$_pkgname.install source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:4}/$_pkgname-$pkgver.tar.xz) -sha256sums=('bba85366632cf5ce777b6889eab505d98d7593c37f7859a312dc57dde05a0feb') +sha256sums=('d925841a4c1c7a46a0837fc7e219891a46431e089847fa248e3f691c23ff7d9b') build() { cd $_pkgname-$pkgver diff --git a/pcr/libquvi-scripts-current/PKGBUILD b/pcr/libquvi-scripts-current/PKGBUILD new file mode 100644 index 000000000..2c480bd45 --- /dev/null +++ b/pcr/libquvi-scripts-current/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 196118 2013-10-07 11:53:00Z jgc $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> + +pkgname=libquvi-scripts-current +_pkgname=libquvi-scripts +provides=(libquvi-scripts) +pkgver=0.9.20131012 +pkgrel=1 +pkgdesc='Library for parsing video download links.' +arch=('any') +url='http://quvi.sourceforge.net/' +license=('AGPL3') +options=('!libtool') +depends=('lua51-socket' 'lua51-bitop' 'lua51-expat') +source=("http://downloads.sourceforge.net/sourceforge/quvi/${_pkgname}-${pkgver}.tar.xz"{,.sig}) + +build() { + cd "${_pkgname}-${pkgver}" + ./configure --prefix=/usr --with-nsfw --with-geoblocked + make +} + +package() { + cd "${_pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} +md5sums=('bd11a7946212b3e42f11c69afacc371a' + 'SKIP') diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD index 22cd86750..148fa6a82 100644 --- a/pcr/youtube-dl-current/PKGBUILD +++ b/pcr/youtube-dl-current/PKGBUILD @@ -5,7 +5,7 @@ pkgname=youtube-dl-current _pkgname=youtube-dl provides=(youtube-dl) -pkgver=2013.10.09 +pkgver=2013.10.15 pkgrel=1 pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites" arch=('any') @@ -27,5 +27,5 @@ package() { "${pkgdir}/usr/share/bash-completion/completions/youtube-dl" install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE" } -md5sums=('ddbefc30e4efefe29a2fe89ed6f4bccc' +md5sums=('dec34c0837db47b78d3febd67cf7725a' 'SKIP') |