From 2bef1fef811e3f553f18a6dac1c32e4dfff7ae13 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Sun, 17 May 2015 15:22:12 -0300
Subject: grilo-plugins-0.2.14-3.nonprism1: local metadata plugin crashes
 (FS#44724 -> https://bugs.archlinux.org/task/44724)

---
 nonprism/grilo-plugins/PKGBUILD                   | 17 +++++++++----
 nonprism/grilo-plugins/local-metadata-crash.patch | 31 +++++++++++++++++++++++
 2 files changed, 43 insertions(+), 5 deletions(-)
 create mode 100644 nonprism/grilo-plugins/local-metadata-crash.patch

diff --git a/nonprism/grilo-plugins/PKGBUILD b/nonprism/grilo-plugins/PKGBUILD
index de4e5b3c4..2da00f4ae 100644
--- a/nonprism/grilo-plugins/PKGBUILD
+++ b/nonprism/grilo-plugins/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 233400 2015-03-12 13:39:12Z jgc $
+# $Id: PKGBUILD 239495 2015-05-17 13:39:45Z heftig $
 # Maintainer (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 pkgname=grilo-plugins
 pkgver=0.2.14
-pkgrel=1.nonprism1
+pkgrel=3.nonprism1
 pkgdesc="Plugins for Grilo, without libgdata support"
 url="http://www.gnome.org"
 arch=(i686 x86_64)
@@ -12,13 +12,20 @@ license=(LGPL)
 replaces=(${pkgname}-nonprism)
 conflicts=(${pkgname}-nonprism)
 depends=(grilo lua libmediaart libtracker-sparql gom libdmapsharing)
-makedepends=(intltool itstool gnome-common git yelp-tools)
+makedepends=(intltool itstool yelp-tools)
 optdepends=('dleyna-server: DLNA plugin'
             'tracker: Tracker plugin')
 options=('!emptydirs')
 groups=('gnome')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('d0f18116675058c7e8c178b1fe26d6d73998a0452f85a73b1696df740c83d3ab')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz
+        local-metadata-crash.patch)
+sha256sums=('d0f18116675058c7e8c178b1fe26d6d73998a0452f85a73b1696df740c83d3ab'
+            '221f770b064309635b52095d21d325707d45de03772da5cc579252b7795ced1b')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../local-metadata-crash.patch
+}
 
 build() {
   cd $pkgname-$pkgver
diff --git a/nonprism/grilo-plugins/local-metadata-crash.patch b/nonprism/grilo-plugins/local-metadata-crash.patch
new file mode 100644
index 000000000..edc2b6dff
--- /dev/null
+++ b/nonprism/grilo-plugins/local-metadata-crash.patch
@@ -0,0 +1,31 @@
+From 85fc7cbf831e914456623a2f7a9efbe81919bf4d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.com>
+Date: Tue, 28 Apr 2015 19:46:54 -0400
+Subject: local-metadata: Ignore sanitization if the whole filename is
+ blacklisted
+
+If the whole filename ends up blacklisted, then just take it as-is.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=748604
+
+diff --git a/src/local-metadata/grl-local-metadata.c b/src/local-metadata/grl-local-metadata.c
+index adc81f0..45856be 100644
+--- a/src/local-metadata/grl-local-metadata.c
++++ b/src/local-metadata/grl-local-metadata.c
+@@ -272,6 +272,13 @@ video_sanitise_string (const gchar *str)
+   if (*line_end != '\0') {
+     line_end = g_utf8_find_prev_char (line, line_end);
+ 
++
++    /* If everything in the string is blacklisted, just ignore
++     * the blackisting logic.
++     */
++    if (line_end == NULL)
++      return g_strdup (str);
++
+     /* After removing substring with blacklisted word, ignore non alpha-numeric
+      * char in the end of the sanitised string */
+     while (g_unichar_isalnum (*line_end) == FALSE &&
+-- 
+cgit v0.10.2
+
-- 
cgit v1.2.3