summaryrefslogtreecommitdiff
path: root/community
diff options
context:
space:
mode:
Diffstat (limited to 'community')
-rw-r--r--community/c++-gtk-utils/PKGBUILD8
-rw-r--r--community/deja-dup/PKGBUILD18
-rw-r--r--community/deja-dup/not-check-ubuntuone-couch.patch45
-rw-r--r--community/deja-dup/update-u1-pythonchecker.patch13
-rw-r--r--community/lgi/PKGBUILD10
-rw-r--r--community/libcec/PKGBUILD8
-rw-r--r--community/mp3splt-gtk/PKGBUILD6
-rw-r--r--community/mp3splt-gtk/mp3splt-gtk.changelog3
-rw-r--r--community/opencc/PKGBUILD6
-rw-r--r--community/perl-datetime/PKGBUILD6
-rw-r--r--community/qmmp/PKGBUILD15
-rw-r--r--community/qmmp/cdio-includes.patch12
-rw-r--r--community/qmmp/qmmp.changelog3
-rw-r--r--community/shotwell/0001-Port-to-GStreamer-1.0.patch150
-rw-r--r--community/shotwell/PKGBUILD17
-rw-r--r--community/shotwell/regenerate-video-thumbnails.patch154
-rw-r--r--community/skrooge/PKGBUILD6
-rw-r--r--community/skrooge/skrooge.changelog3
-rw-r--r--community/texvc/PKGBUILD17
-rw-r--r--community/the_silver_searcher/PKGBUILD12
20 files changed, 350 insertions, 162 deletions
diff --git a/community/c++-gtk-utils/PKGBUILD b/community/c++-gtk-utils/PKGBUILD
index fb5404502..de311fb37 100644
--- a/community/c++-gtk-utils/PKGBUILD
+++ b/community/c++-gtk-utils/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 81974 2013-01-05 08:10:13Z giovanni $
+# $Id: PKGBUILD 85715 2013-03-05 15:34:23Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
pkgname=c++-gtk-utils
-pkgver=2.0.14
+pkgver=2.0.15
pkgrel=1
pkgdesc="Classes and functions for programming in GTK+"
arch=('i686' 'x86_64')
url="http://cxx-gtk-utils.sourceforge.net/"
license=('LGPL2.1')
depends=('gtk3')
-options=('!libtool')
+options=('!libtool' '!docs' '!emptydirs')
source=("http://downloads.sourceforge.net/project/cxx-gtk-utils/cxx-gtk-utils/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('84c7da0542bc60c093573c134e053c15')
+md5sums=('b9de1eb63916d167effa76b6e7b180f3')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/deja-dup/PKGBUILD b/community/deja-dup/PKGBUILD
index d33e77dd1..ddaecba9b 100644
--- a/community/deja-dup/PKGBUILD
+++ b/community/deja-dup/PKGBUILD
@@ -1,25 +1,27 @@
-# $Id: PKGBUILD 79462 2012-11-05 20:10:47Z bgyorgy $
+# $Id: PKGBUILD 85692 2013-03-05 09:07:44Z bgyorgy $
# Maintainer: Balló György <ballogyor+arch at gmail dot com>
pkgname=deja-dup
pkgver=24.0
-pkgrel=2
+pkgrel=3
pkgdesc="Simple backup tool, that hides the complexity of backing up the Right Way and uses duplicity as the backend"
arch=('i686' 'x86_64')
url="https://launchpad.net/deja-dup"
license=('GPL')
-depends=('duplicity' 'libgnome-keyring' 'libpeas' 'libnotify' 'python2-gobject2' 'dconf' 'xdg-utils')
+depends=('duplicity' 'libgnome-keyring' 'libpeas' 'libnotify' 'python2-gobject' 'gvfs' 'dconf' 'xdg-utils')
makedepends=('vala' 'intltool' 'itstool' 'nautilus')
optdepends=('nautilus: backup extension'
- 'ubuntuone-client: backup into Ubuntu One storage')
+ 'python2-boto: Amazon S3 backend'
+ 'python2-oauthlib: Ubuntu One backend'
+ 'ubuntuone-client: Ubuntu One backend')
options=('!libtool')
install=$pkgname.install
source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz
new-u1backend-support.patch
- not-check-ubuntuone-couch.patch)
+ update-u1-pythonchecker.patch)
md5sums=('335131d1f3c85615339fa8b212db50ae'
'944a4c62f042b240feba98f8d9a893b2'
- '8d59798638982c2bdb55b2e415087245')
+ 'd0893c17e3e61c3ada065a002a9ab419')
build() {
cd "$srcdir/$pkgname-$pkgver"
@@ -28,8 +30,8 @@ build() {
# Add support for the new Ubuntu One backend
patch -Np0 -i "$srcdir/new-u1backend-support.patch"
- # Now we don't need ubuntuone-couch for Ubuntu One support
- patch -Np1 -i "$srcdir/not-check-ubuntuone-couch.patch"
+ # And update the PythonChecker check for the new U1 backend too
+ patch -Np0 -i "$srcdir/update-u1-pythonchecker.patch"
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
--disable-static --disable-schemas-compile --without-unity
diff --git a/community/deja-dup/not-check-ubuntuone-couch.patch b/community/deja-dup/not-check-ubuntuone-couch.patch
deleted file mode 100644
index d7fb903a1..000000000
--- a/community/deja-dup/not-check-ubuntuone-couch.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -Naur deja-dup-24.0.orig/common/BackendU1.vala deja-dup-24.0/common/BackendU1.vala
---- deja-dup-24.0.orig/common/BackendU1.vala 2012-08-07 00:20:51.000000000 +0200
-+++ deja-dup-24.0/common/BackendU1.vala 2012-11-05 16:39:34.140104977 +0100
-@@ -75,11 +75,14 @@
-
- class U1Checker : Checker
- {
-- PythonChecker pyu1;
- construct {
- try {
- var proxy = BackendU1.get_creds_proxy();
-- if (proxy.get_name_owner() == null) {
-+ if (proxy.get_name_owner() != null) {
-+ available = true;
-+ complete = true;
-+ }
-+ else {
- available = false;
- complete = true;
- }
-@@ -89,24 +92,6 @@
- available = false;
- complete = true;
- }
--
-- if (!complete) {
-- // A bit of abstraction leakage here; we have to keep these imports in
-- // line with what duplicity uses. Maybe we should add to duplicity a way
-- // to ask 'can I use this backend?'
-- pyu1 = PythonChecker.get_checker("ubuntuone.platform.credentials, ubuntuone.couch.auth");
-- if (pyu1.complete) {
-- available = pyu1.available;
-- complete = pyu1.complete;
-- }
-- else {
-- pyu1.notify["complete"].connect(() => {
-- available = pyu1.available;
-- complete = pyu1.complete;
-- pyu1 = null;
-- });
-- }
-- }
- }
- }
-
diff --git a/community/deja-dup/update-u1-pythonchecker.patch b/community/deja-dup/update-u1-pythonchecker.patch
new file mode 100644
index 000000000..32d55966c
--- /dev/null
+++ b/community/deja-dup/update-u1-pythonchecker.patch
@@ -0,0 +1,13 @@
+=== modified file 'common/BackendU1.vala'
+--- common/BackendU1.vala 2012-11-05 15:10:54 +0000
++++ common/BackendU1.vala 2012-11-05 15:17:28 +0000
+@@ -94,7 +94,7 @@
+ // A bit of abstraction leakage here; we have to keep these imports in
+ // line with what duplicity uses. Maybe we should add to duplicity a way
+ // to ask 'can I use this backend?'
+- pyu1 = PythonChecker.get_checker("ubuntuone.platform.credentials, ubuntuone.couch.auth");
++ pyu1 = PythonChecker.get_checker("oauthlib, httplib2");
+ if (pyu1.complete) {
+ available = pyu1.available;
+ complete = pyu1.complete;
+
diff --git a/community/lgi/PKGBUILD b/community/lgi/PKGBUILD
index a59c2817c..0c03956a1 100644
--- a/community/lgi/PKGBUILD
+++ b/community/lgi/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 81847 2013-01-02 00:52:50Z seblu $
+# $Id: PKGBUILD 85686 2013-03-04 23:40:53Z seblu $
# Maintainer: speps <speps at aur dot archlinux dot org>
-# Maintainer: Sébastien Luttringer <seblu@archlinux.org>
+# Maintainer: Sébastien Luttringer
pkgbase=lgi
pkgname=(lua-lgi)
-pkgver=0.6.2
+pkgver=0.7.1
pkgrel=1
pkgdesc='Lua bindings for gnome/gobject using gobject-introspection library'
arch=(i686 x86_64)
@@ -13,8 +13,8 @@ license=('custom:MIT')
depends=('glibc' 'glib2' 'libffi' 'lua' 'gobject-introspection')
replaces=('lgi')
conflicts=('lgi')
-source=("https://github.com/downloads/pavouk/lgi/$pkgbase-$pkgver.tar.gz")
-md5sums=('9ae2c0740e9ea536b6b6afacea5bd21b')
+source=("$pkgbase-$pkgver.tar.gz::https://github.com/pavouk/$pkgbase/archive/$pkgver.tar.gz")
+md5sums=('de7367aee8e39f7df7c2229675c5ff2d')
build() {
cd $pkgbase-$pkgver
diff --git a/community/libcec/PKGBUILD b/community/libcec/PKGBUILD
index e959ef944..8eac02749 100644
--- a/community/libcec/PKGBUILD
+++ b/community/libcec/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 83326 2013-01-29 17:19:32Z spupykin $
+# $Id: PKGBUILD 85731 2013-03-05 21:06:38Z idevolder $
# Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
# Contributor: Philippe Cherel <philippe.cherel@mayenne.org>
pkgname=libcec
-pkgver=2.0.5
+pkgver=2.1.0
pkgrel=1
pkgdesc="Pulse-Eight's libcec for the Pulse-Eight USB-CEC adapter"
arch=('i686' 'x86_64')
@@ -11,9 +11,9 @@ url="https://github.com/Pulse-Eight/libcec"
license=('GPL')
depends=('udev' 'lockdev')
source=("$pkgname-$pkgver.tar.gz::https://github.com/Pulse-Eight/libcec/tarball/$pkgname-$pkgver")
-_srcfolder=Pulse-Eight-libcec-e1599e0
+_srcfolder=Pulse-Eight-libcec-5984da4
options=(!libtool)
-sha256sums=('83d99cf759531d8c8a217f360f4748159cb9cedac98d77a4615450bad6d570c4')
+sha256sums=('b0589450a25566d34b84aff6bc899fd823dba8ffebcfe11a3f58924c252367fe')
build() {
mv "$_srcfolder" "$pkgname-$pkgver"
diff --git a/community/mp3splt-gtk/PKGBUILD b/community/mp3splt-gtk/PKGBUILD
index fccf564df..d4c742a66 100644
--- a/community/mp3splt-gtk/PKGBUILD
+++ b/community/mp3splt-gtk/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 76430 2012-09-18 04:50:32Z jlichtblau $
+# $Id: PKGBUILD 85719 2013-03-05 18:41:12Z jlichtblau $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
pkgname=mp3splt-gtk
-pkgver=0.7.3
+pkgver=0.8.1
pkgrel=1
pkgdesc="Split mp3 and ogg files without decoding"
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ makedepends=('pkgconfig')
install=$pkgname.install
changelog=$pkgname.changelog
source=(http://downloads.sourceforge.net/sourceforge/mp3splt/$pkgname-$pkgver.tar.gz)
-sha256sums=('7300383453ca8d3268776163e2afb9b03a0d907d2f29ec6fc1826b41679d4e1c')
+sha256sums=('d0bfd6524bd29e061c9d00574c164ed70a112eec11f36ae8a240606c712f1241')
build() {
cd ${srcdir}/$pkgname-$pkgver
diff --git a/community/mp3splt-gtk/mp3splt-gtk.changelog b/community/mp3splt-gtk/mp3splt-gtk.changelog
index 939aa6841..0a86bdfc2 100644
--- a/community/mp3splt-gtk/mp3splt-gtk.changelog
+++ b/community/mp3splt-gtk/mp3splt-gtk.changelog
@@ -1,3 +1,6 @@
+2013-03-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * mp3splt-gtk 0.8.1-1
+
2012-09-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
* mp3splt-gtk 0.7.3-1
diff --git a/community/opencc/PKGBUILD b/community/opencc/PKGBUILD
index ae94dce10..2628cfe76 100644
--- a/community/opencc/PKGBUILD
+++ b/community/opencc/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 79884 2012-11-14 13:43:08Z fyan $
+# $Id: PKGBUILD 85687 2013-03-05 05:00:24Z fyan $
# Maintainer: Felix Yan <felixonmars@gmail.com>
pkgname=opencc
-pkgver=0.3.0
+pkgver=0.4.0
pkgrel=1
pkgdesc="Library for Open Chinese Convert"
arch=('i686' 'x86_64')
@@ -22,4 +22,4 @@ package() {
cd "$srcdir/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
}
-md5sums=('84462870e5d491da24bb33a5fb494911')
+md5sums=('00a2de2314cd28fc8631c229fb3aa894')
diff --git a/community/perl-datetime/PKGBUILD b/community/perl-datetime/PKGBUILD
index e96c8ac14..62eed7371 100644
--- a/community/perl-datetime/PKGBUILD
+++ b/community/perl-datetime/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 76996 2012-10-03 07:10:45Z spupykin $
+# $Id: PKGBUILD 85696 2013-03-05 09:22:28Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: François Charette <firmicus ατ gmx δοτ net>
pkgname=perl-datetime
-pkgver=0.77
+pkgver=0.78
pkgrel=1
pkgdesc="A complete, easy to use date and time object"
arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ LC_NUMERIC=C
provides=("perl-datetime=`printf %.4f $pkgver`")
options=('!emptydirs')
source=(http://www.cpan.org/authors/id/D/DR/DROLSKY/DateTime-$pkgver.tar.gz)
-md5sums=('1c35bb64f0a261cd3ab4cc161726290a')
+md5sums=('9d71a13933e3afc55c2c54202d40ae13')
build() {
cd $srcdir/DateTime-$pkgver
diff --git a/community/qmmp/PKGBUILD b/community/qmmp/PKGBUILD
index 808ad62dd..90d5ea67a 100644
--- a/community/qmmp/PKGBUILD
+++ b/community/qmmp/PKGBUILD
@@ -1,9 +1,9 @@
-#$Id: PKGBUILD 85390 2013-03-01 10:38:00Z andrea $
+#$Id: PKGBUILD 85725 2013-03-05 19:16:19Z jlichtblau $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
pkgname=qmmp
-pkgver=0.6.6
-pkgrel=6
+pkgver=0.6.7
+pkgrel=1
pkgdesc="Qt4 based audio-player"
arch=('i686' 'x86_64')
url="http://qmmp.ylsoftware.com/"
@@ -22,16 +22,13 @@ optdepends=('flac: native FLAC support'
'projectm: visual efects'
'ffmpeg' 'libsamplerate' 'wavpack')
install=$pkgname.install
-source=(http://qmmp.ylsoftware.com/files/$pkgname-$pkgver.tar.bz2
- cdio-includes.patch)
-sha256sums=('dfa973cca80c020a85a11bb66701a3804f9fde326440abb179559c98bf3b5b99'
- '7b3ff46dd30070cd79c5ca2dd6dfa1b9872bc09041f4bd985edf20a4333db07c')
+changelog=$pkgname.changelog
+source=(http://qmmp.ylsoftware.com/files/$pkgname-$pkgver.tar.bz2)
+sha256sums=('82d8ed7f3678695e213f0989f869095b37bd212d23ad2827981bc65225d59f8c')
build() {
cd ${srcdir}/$pkgname-$pkgver
- patch -Np1 -i ${srcdir}/cdio-includes.patch
-
cmake . -DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=/usr/lib
make
diff --git a/community/qmmp/cdio-includes.patch b/community/qmmp/cdio-includes.patch
deleted file mode 100644
index 4c471291f..000000000
--- a/community/qmmp/cdio-includes.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -upr qmmp-0.6.5.orig/src/plugins/Input/cdaudio/decoder_cdaudio.cpp qmmp-0.6.5/src/plugins/Input/cdaudio/decoder_cdaudio.cpp
---- qmmp-0.6.5.orig/src/plugins/Input/cdaudio/decoder_cdaudio.cpp 2013-01-10 21:55:55.000000000 +0200
-+++ qmmp-0.6.5/src/plugins/Input/cdaudio/decoder_cdaudio.cpp 2013-01-10 21:56:26.000000000 +0200
-@@ -25,7 +25,7 @@
- #include <QFileInfo>
- #include <QDir>
- #include <cdio/cdio.h>
--#include <cdio/cdda.h>
-+#include <cdio/paranoia/cdda.h>
- #include <cdio/audio.h>
- #include <cdio/cd_types.h>
- #include <cdio/logging.h>
diff --git a/community/qmmp/qmmp.changelog b/community/qmmp/qmmp.changelog
index 83a1d07a0..af394d59f 100644
--- a/community/qmmp/qmmp.changelog
+++ b/community/qmmp/qmmp.changelog
@@ -1,3 +1,6 @@
+2013-03-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * qmmp 0.6.7-1
+
2013-01-13 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
* qmmp 0.6.6-2 libcdio/libcdio-paranoia rebuild
diff --git a/community/shotwell/0001-Port-to-GStreamer-1.0.patch b/community/shotwell/0001-Port-to-GStreamer-1.0.patch
index 7d7ac742d..a7a2cbf4c 100644
--- a/community/shotwell/0001-Port-to-GStreamer-1.0.patch
+++ b/community/shotwell/0001-Port-to-GStreamer-1.0.patch
@@ -1,17 +1,11 @@
-From 9cb0726dd0873e3664f3589aabadea8bb7c8ff37 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.com>
-Date: Tue, 25 Sep 2012 18:15:02 -0400
-Subject: [PATCH] Port to GStreamer 1.0
+From 4db67e385c9c2d89947077f1520aa31af2538d65 Mon Sep 17 00:00:00 2001
+From: Alban Browaeys <prahal@yahoo.com>
+Date: Wed, 09 Jan 2013 01:11:27 +0000
+Subject: Ports Shotwell to GStreamer 1.0. Closes #6055.
---
- Makefile | 21 +++++++++++----------
- src/VideoSupport.vala | 8 ++++----
- src/libshotwell.deps | 5 +++--
- thumbnailer/shotwell-video-thumbnailer.vala | 18 ++++++++----------
- 4 files changed, 26 insertions(+), 26 deletions(-)
-
diff --git a/Makefile b/Makefile
-index 1bd09e0..06059e3 100644
+index 2488f82..5a7e262 100644
--- a/Makefile
+++ b/Makefile
@@ -37,7 +37,7 @@ EXTRAS_SUPPORTED_LANGUAGES=fr de it es pl et sv sk lv pt bg bn nl da zh_CN el ru
@@ -19,7 +13,7 @@ index 1bd09e0..06059e3 100644
SYSTEM_LANG_DIR := $(DESTDIR)$(PREFIX)/share/locale
-VALAFLAGS := -g --enable-checking --thread --fatal-warnings --enable-deprecated $(USER_VALAFLAGS)
-+VALAFLAGS := -g --enable-checking --thread --enable-deprecated $(USER_VALAFLAGS)
++VALAFLAGS := -g --enable-checking --thread --fatal-warnings --enable-deprecated --enable-experimental $(USER_VALAFLAGS)
ifdef UNITY_SUPPORT
VALAFLAGS := $(VALAFLAGS) --define UNITY_SUPPORT
endif
@@ -36,19 +30,18 @@ index 1bd09e0..06059e3 100644
gtk+-3.0 \
gudev-1.0 \
libexif \
-@@ -314,8 +314,9 @@ endif
+@@ -314,8 +314,8 @@ endif
THUMBNAILER_PKGS = \
gtk+-3.0 \
gee-1.0 \
- gstreamer-0.10 \
- gstreamer-base-0.10
+ gstreamer-1.0 \
-+ gstreamer-base-1.0 \
-+ gstreamer-app-1.0 \
++ gstreamer-base-1.0
DIRECT_LIBS =
-@@ -325,10 +326,10 @@ EXT_PKG_VERSIONS = \
+@@ -325,10 +325,10 @@ EXT_PKG_VERSIONS = \
gio-unix-2.0 >= 2.20 \
glib-2.0 >= $(MIN_GLIB_VERSION) \
gmodule-2.0 >= 2.24.0 \
@@ -63,6 +56,15 @@ index 1bd09e0..06059e3 100644
gtk+-3.0 >= 3.0.11 \
gudev-1.0 >= 145 \
libexif >= 0.6.16 \
+@@ -683,7 +683,7 @@ $(VALA_STAMP): $(EXPANDED_SRC_FILES) $(EXPANDED_VAPI_FILES) $(GPHOTO_VAPI_FILE)
+ $(call check_valac_version)
+ @echo Compiling Vala code...
+ @mkdir -p $(BUILD_DIR)
+- @$(VALAC) --ccode --directory=$(BUILD_DIR) --basedir=src \
++ $(VALAC) --ccode --directory=$(BUILD_DIR) --basedir=src \
+ $(foreach pkg,$(VALA_PKGS),--pkg=$(pkg)) \
+ $(foreach vapidir,$(VAPI_DIRS),--vapidir=$(vapidir)) \
+ $(foreach def,$(DEFINES),-X -D$(def)) \
diff --git a/src/VideoSupport.vala b/src/VideoSupport.vala
index deb45e2..f679bd0 100644
--- a/src/VideoSupport.vala
@@ -97,10 +99,10 @@ index deb45e2..f679bd0 100644
message("interpreter state cookie not found; assuming all video thumbnails are out of date");
interpreter_state_changed = true;
diff --git a/thumbnailer/shotwell-video-thumbnailer.vala b/thumbnailer/shotwell-video-thumbnailer.vala
-index a4d7dc2..c12784e 100644
+index 79a2d7e..ae1e537 100644
--- a/thumbnailer/shotwell-video-thumbnailer.vala
+++ b/thumbnailer/shotwell-video-thumbnailer.vala
-@@ -10,11 +10,7 @@
+@@ -10,22 +10,15 @@
// Shotwell Thumbnailer takes in a video file and returns a thumbnail to stdout. This is
// a replacement for totem-video-thumbnailer
class ShotwellThumbnailer {
@@ -109,51 +111,109 @@ index a4d7dc2..c12784e 100644
- red_mask = (int) 0xFF000000,
- green_mask = (int) 0x00FF0000,
- blue_mask = (int) 0x0000FF00,
-+ const string caps_string = """video/x-raw, format=RGBA,
- width = (int) [ 1, max ],
- height = (int) [ 1, max ],
- framerate = (fraction) [ 0, max ]""";
-@@ -36,7 +32,7 @@ class ShotwellThumbnailer {
+- width = (int) [ 1, max ],
+- height = (int) [ 1, max ],
+- framerate = (fraction) [ 0, max ]""";
++ const string caps_string = """video/x-raw,format=RGB,bpp=32,depth=32,pixel-aspect-ratio=1/1""";
+
+ public static int main(string[] args) {
+ Gst.Element pipeline, sink;
+ int width, height;
+- Gst.Buffer buffer;
++ Gst.Sample sample;
+ string descr;
+ Gdk.Pixbuf pixbuf;
+- int64 position;
++ int64 duration, position;
+ Gst.StateChangeReturn ret;
+ bool res;
+
+@@ -36,7 +29,7 @@ class ShotwellThumbnailer {
return 1;
}
- descr = "filesrc location=\"%s\" ! decodebin2 ! ffmpegcolorspace ! ".printf(args[1]) +
-+ descr = "filesrc location=\"%s\" ! decodebin ! videoconvert ! ".printf(args[1]) +
++ descr = "filesrc location=\"%s\" ! decodebin ! videoconvert ! videoscale ! ".printf(args[1]) +
"appsink name=sink caps=\"%s\"".printf(caps_string);
try {
-@@ -69,7 +65,7 @@ class ShotwellThumbnailer {
- // by seeking to somewhere else we have a bigger chance of getting something
- // more interesting. An optimization would be to detect black images and then
- // seek a little more.
+@@ -64,29 +57,41 @@ class ShotwellThumbnailer {
+ stderr.printf("Failed to play the file: couldn't get state.\n");
+ return 3;
+ }
+-
+- // Seek to the a position in the file. Most files have a black first frame so
+- // by seeking to somewhere else we have a bigger chance of getting something
+- // more interesting. An optimization would be to detect black images and then
+- // seek a little more.
- position = (int64) (Gst.Format.PERCENT_MAX * 0.05);
-+ position = (int64) (Gst.FORMAT_PERCENT_MAX * 0.05);
- pipeline.seek_simple(Gst.Format.PERCENT, Gst.SeekFlags.KEY_UNIT | Gst.SeekFlags.FLUSH , position);
-
- // Get the preroll buffer from appsink, this block untils appsink really
-@@ -86,7 +82,7 @@ class ShotwellThumbnailer {
+- pipeline.seek_simple(Gst.Format.PERCENT, Gst.SeekFlags.KEY_UNIT | Gst.SeekFlags.FLUSH , position);
+-
+- // Get the preroll buffer from appsink, this block untils appsink really
+- // prerolls.
+- GLib.Signal.emit_by_name(sink, "pull-preroll", out buffer, null);
+-
++
++ /* get the duration */
++ pipeline.query_duration (Gst.Format.TIME, out duration);
++
++ if (duration != -1) {
++ /* we have a duration, seek to 5% */
++ position = duration * 5 / 100;
++ } else {
++ /* no duration, seek to 1 second, this could EOS */
++ position = 1 * Gst.SECOND;
++ }
++
++ /* seek to the a position in the file. Most files have a black first frame so
++ * by seeking to somewhere else we have a bigger chance of getting something
++ * more interesting. An optimisation would be to detect black images and then
++ * seek a little more */
++ pipeline.seek_simple (Gst.Format.TIME, Gst.SeekFlags.KEY_UNIT | Gst.SeekFlags.FLUSH, position);
++
++ /* get the preroll buffer from appsink, this block untils appsink really
++ * prerolls */
++ GLib.Signal.emit_by_name (sink, "pull-preroll", out sample, null);
++
+ // if we have a buffer now, convert it to a pixbuf. It's possible that we
+ // don't have a buffer because we went EOS right away or had an error.
+- if (buffer != null) {
++ if (sample != null) {
++ Gst.Buffer buffer;
+ Gst.Caps caps;
+ Gst.Structure s;
++ Gst.MapInfo mapinfo;
+
+ // Get the snapshot buffer format now. We set the caps on the appsink so
// that it can only be an rgb buffer. The only thing we have not specified
// on the caps is the height, which is dependant on the pixel-aspect-ratio
// of the source material.
- caps = buffer.get_caps();
-+ caps = (sink as Gst.App.Sink).caps;
++ caps = sample.get_caps();
if (caps == null) {
stderr.printf("could not get snapshot format\n");
return 5;
-@@ -104,9 +100,11 @@ class ShotwellThumbnailer {
-
+@@ -101,14 +106,18 @@ class ShotwellThumbnailer {
+ stderr.printf("Could not get snapshot dimension\n");
+ return 6;
+ }
+-
++
++ buffer = sample.get_buffer();
++ buffer.map(out mapinfo, Gst.MapFlags.READ);
++
// Create pixmap from buffer and save, gstreamer video buffers have a stride
// that is rounded up to the nearest multiple of 4.
- pixbuf = new Gdk.Pixbuf.from_data(buffer.data, Gdk.Colorspace.RGB, true, 8,
-+ Gst.MapInfo info;
-+ buffer.map(out info, Gst.MapFlags.READ);
-+ pixbuf = new Gdk.Pixbuf.from_data(info.data, Gdk.Colorspace.RGB, true, 8,
- width, height, width * 4, null);
--
-+ buffer.unmap(info);
+- width, height, width * 4, null);
++ pixbuf = new Gdk.Pixbuf.from_data(mapinfo.data, Gdk.Colorspace.RGB, false, 8,
++ width, height, (((width * 3)+3)&~3), null);
+
// Save the pixbuf.
pixbuf.save("/dev/stdout", "png");
++ buffer.unmap(mapinfo);
} else {
---
-1.7.11.4
-
+ stderr.printf("Could not make snapshot\n");
+ return 10;
+--
+cgit v0.9
diff --git a/community/shotwell/PKGBUILD b/community/shotwell/PKGBUILD
index 578cc10f5..8ff178ab2 100644
--- a/community/shotwell/PKGBUILD
+++ b/community/shotwell/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 81068 2012-12-11 14:37:24Z allan $
+# $Id: PKGBUILD 85690 2013-03-05 07:36:48Z bgyorgy $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com>
pkgname=shotwell
pkgver=0.13.1
-pkgrel=5
+pkgrel=6
pkgdesc="A digital photo organizer designed for the GNOME desktop environment"
arch=('i686' 'x86_64')
url="http://yorba.org/shotwell/"
@@ -17,19 +17,26 @@ makedepends=('intltool' 'vala>=0.17.2' 'libunique3')
install=shotwell.install
source=("http://yorba.org/download/shotwell/0.13/shotwell-${pkgver}.tar.xz"
"no-libexec.patch"
- "0001-Port-to-GStreamer-1.0.patch")
+ "0001-Port-to-GStreamer-1.0.patch"
+ "regenerate-video-thumbnails.patch")
md5sums=('71eb1346093705ca2b37c12a21994d14'
'b4124e022c98b4382530e6fbcef965e2'
- '86e47eade2b5a49bd6503294751d95f0')
+ '666d28c2a1b78632df8ab5f24c3aa3cd'
+ '4b70442c6d9c04f3be23426ef92adb43')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
patch -p1 <$srcdir/no-libexec.patch
- # http://redmine.yorba.org/issues/5548
+ # Port to GSreamer 1.0 (video thumbnailer)
+ # http://redmine.yorba.org/issues/6055
patch -p1 <$srcdir/0001-Port-to-GStreamer-1.0.patch
+ # Regenerate video thumbnails on lost
+ # http://redmine.yorba.org/issues/6152
+ patch -p1 <$srcdir/regenerate-video-thumbnails.patch
+
./configure --prefix=/usr \
--disable-schemas-compile \
--disable-desktop-update \
diff --git a/community/shotwell/regenerate-video-thumbnails.patch b/community/shotwell/regenerate-video-thumbnails.patch
new file mode 100644
index 000000000..8a399355e
--- /dev/null
+++ b/community/shotwell/regenerate-video-thumbnails.patch
@@ -0,0 +1,154 @@
+From 05c10b9c6107dc785808732216498ef5f3f6b87d Mon Sep 17 00:00:00 2001
+From: Clint Rogers <clinton@yorba.org>
+Date: Wed, 16 Jan 2013 00:09:42 +0000
+Subject: Causes video thumbnails to get regenerated if lost; closes #6152.
+
+Also moves some code around so regeneration for both stills and videos happens in the same spot, improving code navigability.
+---
+diff --git a/src/PhotoMonitor.vala b/src/PhotoMonitor.vala
+index 40416d1..3dcc481 100644
+--- a/src/PhotoMonitor.vala
++++ b/src/PhotoMonitor.vala
+@@ -287,16 +287,7 @@ private class PhotoMonitor : MediaMonitor {
+
+ return MediaMonitor.DiscoveredFile.UNKNOWN;
+ }
+-
+- if (!ThumbnailCache.exists(photo)) {
+- try {
+- ThumbnailCache.import_from_source(photo, true);
+- photo.notify_altered(new Alteration("image","thumbnail"));
+- } catch (Error e) {
+- // thumbnail for this object was already broken, so nothing got worse.
+- }
+- }
+-
++
+ switch (state) {
+ case LibraryPhotoSourceCollection.State.ONLINE:
+ case LibraryPhotoSourceCollection.State.OFFLINE:
+diff --git a/src/ThumbnailCache.vala b/src/ThumbnailCache.vala
+index be97183..2a2c716 100644
+--- a/src/ThumbnailCache.vala
++++ b/src/ThumbnailCache.vala
+@@ -1,7 +1,7 @@
+-/* Copyright 2009-2012 Yorba Foundation
++/* Copyright 2009-2013 Yorba Foundation
+ *
+ * This software is licensed under the GNU LGPL (version 2.1 or later).
+- * See the COPYING file in this distribution.
++ * See the COPYING file in this distribution.
+ */
+
+ public class Thumbnails {
+@@ -74,6 +74,7 @@ public class ThumbnailCache : Object {
+ private class AsyncFetchJob : BackgroundJob {
+ public ThumbnailCache cache;
+ public string thumbnail_name;
++ public ThumbnailSource source;
+ public PhotoFileFormat source_format;
+ public Dimensions dim;
+ public Gdk.InterpType interp;
+@@ -84,13 +85,14 @@ public class ThumbnailCache : Object {
+ public bool fetched = false;
+
+ public AsyncFetchJob(ThumbnailCache cache, string thumbnail_name,
+- PhotoFileFormat source_format, Gdk.Pixbuf? prefetched, Dimensions dim,
++ ThumbnailSource source, Gdk.Pixbuf? prefetched, Dimensions dim,
+ Gdk.InterpType interp, AsyncFetchCallback callback, Cancellable? cancellable) {
+ base(cache, async_fetch_completion_callback, cancellable);
+
+ this.cache = cache;
+ this.thumbnail_name = thumbnail_name;
+- this.source_format = source_format;
++ this.source = source;
++ this.source_format = source.get_preferred_thumbnail_format();
+ this.unscaled = prefetched;
+ this.dim = dim;
+ this.interp = interp;
+@@ -126,11 +128,42 @@ public class ThumbnailCache : Object {
+ // scale if specified
+ scaled = dim.has_area() ? resize_pixbuf(unscaled, dim, interp) : unscaled;
+ } catch (Error err) {
++ // Is the problem that the thumbnail couldn't be read? If so, it's recoverable;
++ // we'll just create it and leave this.err as null if creation works.
++ if (err is FileError) {
++ try {
++ Photo photo = source as Photo;
++ Video video = source as Video;
++
++ if (photo != null) {
++ unscaled = photo.get_pixbuf(Scaling.for_best_fit(dim.width, true));
++ photo.notify_altered(new Alteration("image","thumbnail"));
++ return;
++ }
++
++ if (video != null) {
++ unscaled = video.create_thumbnail(dim.width);
++ scaled = resize_pixbuf(unscaled, dim, interp);
++ cache.save_thumbnail(cache.get_source_cached_file(source),
++ unscaled, source);
++ replace(source, cache.size, unscaled);
++ return;
++ }
++
++ } catch (Error e) {
++ // Creating the thumbnail failed; tell the rest of the app.
++ this.err = e;
++ return;
++ }
++ }
++
++ // ...the original error wasn't from reading the file, but something else;
++ // tell the rest of the app.
+ this.err = err;
+ }
+ }
+ }
+-
++
+ private static Workers fetch_workers = null;
+
+ public const ulong MAX_BIG_CACHED_BYTES = 40 * 1024 * 1024;
+@@ -230,13 +263,13 @@ public class ThumbnailCache : Object {
+
+ public static void fetch_async(ThumbnailSource source, int scale, AsyncFetchCallback callback,
+ Cancellable? cancellable = null) {
+- get_best_cache(scale)._fetch_async(source.get_source_id(), source.get_preferred_thumbnail_format(),
++ get_best_cache(scale)._fetch_async(source, source.get_preferred_thumbnail_format(),
+ Dimensions(), DEFAULT_INTERP, callback, cancellable);
+ }
+
+- public static void fetch_async_scaled(ThumbnailSource source, int scale, Dimensions dim,
++ public static void fetch_async_scaled(ThumbnailSource source, int scale, Dimensions dim,
+ Gdk.InterpType interp, AsyncFetchCallback callback, Cancellable? cancellable = null) {
+- get_best_cache(scale)._fetch_async(source.get_source_id(),
++ get_best_cache(scale)._fetch_async(source,
+ source.get_preferred_thumbnail_format(), dim, interp, callback, cancellable);
+ }
+
+@@ -343,9 +376,10 @@ public class ThumbnailCache : Object {
+ return pixbuf;
+ }
+
+- private void _fetch_async(string thumbnail_name, PhotoFileFormat format, Dimensions dim,
++ private void _fetch_async(ThumbnailSource source, PhotoFileFormat format, Dimensions dim,
+ Gdk.InterpType interp, AsyncFetchCallback callback, Cancellable? cancellable) {
+ // check if the pixbuf is already in memory
++ string thumbnail_name = source.get_source_id();
+ Gdk.Pixbuf pixbuf = fetch_from_memory(thumbnail_name);
+ if (pixbuf != null && (!dim.has_area() || Dimensions.for_pixbuf(pixbuf).equals(dim))) {
+ // if no scaling operation required, callback in this context and done (otherwise,
+@@ -365,8 +399,8 @@ public class ThumbnailCache : Object {
+ // situation. This may change in the future, and the caching situation will need to be
+ // handled.
+
+- fetch_workers.enqueue(new AsyncFetchJob(this, thumbnail_name, format, pixbuf, dim, interp,
+- callback, cancellable));
++ fetch_workers.enqueue(new AsyncFetchJob(this, thumbnail_name, source, pixbuf, dim,
++ interp, callback, cancellable));
+ }
+
+ // Called within Gtk.main's thread context
+--
+cgit v0.9
diff --git a/community/skrooge/PKGBUILD b/community/skrooge/PKGBUILD
index c75667c91..a80ceb641 100644
--- a/community/skrooge/PKGBUILD
+++ b/community/skrooge/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 83379 2013-01-30 20:36:03Z jlichtblau $
+# $Id: PKGBUILD 85723 2013-03-05 18:54:32Z jlichtblau $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Ray Rashif <schiv@archlinux.org>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: neuromante <lorenzo.nizzi.grifi@gmail.com>
pkgname=skrooge
-pkgver=1.5.1
+pkgver=1.6.0
pkgrel=1
pkgdesc="A personal finances manager for KDE"
arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ optdepends=('kdepim-libkdepim: for KDE PIM integration')
install=$pkgname.install
changelog=$pkgname.changelog
source=(http://skrooge.org/files/$pkgname-$pkgver.tar.bz2)
-sha256sums=('9d8332d80faf4c89b02582894588829b3004d6abf79528c4b6e35a791a8adebc')
+sha256sums=('7237400f0ae9af317ec9ac45d8d35144f827146b8cb4e37fa092412fec5f0b0e')
build() {
cd ${srcdir}/$pkgname-$pkgver
diff --git a/community/skrooge/skrooge.changelog b/community/skrooge/skrooge.changelog
index 229dda2a4..81cf3a3d2 100644
--- a/community/skrooge/skrooge.changelog
+++ b/community/skrooge/skrooge.changelog
@@ -1,3 +1,6 @@
+2013-03-50 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * skrooge 1.6.0-1
+
2013-01-30 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
* skrooge 1.5.1-1
diff --git a/community/texvc/PKGBUILD b/community/texvc/PKGBUILD
index 75f7fe4f2..c428dd131 100644
--- a/community/texvc/PKGBUILD
+++ b/community/texvc/PKGBUILD
@@ -1,10 +1,9 @@
-# $Id: PKGBUILD 73896 2012-07-16 14:22:08Z spupykin $
+# $Id: PKGBUILD 85705 2013-03-05 09:48:36Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=texvc
-pkgver=1.19.1
-_svnrev=110614
+pkgver=1.20
pkgrel=1
pkgdesc="tex to HTML/MathML/png converter used by mediawiki"
arch=(i686 x86_64)
@@ -12,12 +11,16 @@ url="http://www.mediawiki.org/wiki/Extension:Math"
license=("GPL")
depends=('imagemagick' 'ghostscript' 'texlive-core' 'texlive-latexextra')
makedepends=('ocaml')
-source=(http://upload.wikimedia.org/ext-dist/Math-MW1.19-${_svnrev}.tar.gz)
-md5sums=('d5217e19c26bc08201f9fe6bec8722ff')
+source=(mediawiki-math-1.20.tar.gz::https://nodeload.github.com/wikimedia/mediawiki-extensions-Math/legacy.tar.gz/REL${pkgver/./_})
+md5sums=('ee8fceb0a86f2972409104767406591c')
build() {
- cd $srcdir/Math/math
- make
+ cd $srcdir/wikimedia-mediawiki-extensions-Math-*/math
+ make -j1
+}
+
+package() {
+ cd $srcdir/wikimedia-mediawiki-extensions-Math-*/math
install -d -m 0755 $pkgdir/usr/bin
install -m 0755 texvc $pkgdir/usr/bin
}
diff --git a/community/the_silver_searcher/PKGBUILD b/community/the_silver_searcher/PKGBUILD
index df57c5d07..3d6293130 100644
--- a/community/the_silver_searcher/PKGBUILD
+++ b/community/the_silver_searcher/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 82290 2013-01-14 11:59:53Z arodseth $
+# $Id: PKGBUILD 85733 2013-03-05 21:38:07Z arodseth $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Jeff Horelick <jdhore1@gmail.com>
# Contributor: skydrome <skydrome@i2pmail.org>
pkgname=the_silver_searcher
-pkgver=0.13.1
+pkgver=0.14
pkgrel=1
pkgdesc='Code searching tool similar to Ack, but faster'
-url='http://github.com/ggreer/the_silver_searcher'
+url='https://github.com/ggreer/the_silver_searcher'
license=('Apache')
-depends=('pcre')
+depends=('pcre' 'zlib')
arch=('x86_64' 'i686')
-source=("https://github.com/downloads/ggreer/$pkgname/$pkgname-$pkgver.tar.gz")
-sha256sums=('140ded2207259f670e4b866a68cc2577495b63844c7dae101f89078c6b37b6fc')
+source=("https://github.com/ggreer/$pkgname/archive/$pkgver.tar.gz")
+sha256sums=('9334d6f41685963c41790502fcfd83ed0ac664d94626d9fee44ae5c33c616bb3')
build() {
cd "$srcdir/$pkgname-$pkgver"