Date: Monday, September 7, 2015 @ 16:30:02 Author: heftig Revision: 245466
0.2.15 Added: grilo-plugins/trunk/no-goa-music.patch Modified: grilo-plugins/trunk/PKGBUILD Deleted: grilo-plugins/trunk/0002-local-metadata-Fixes-to-video_sanitise_string-non-al.patch grilo-plugins/trunk/local-metadata-crash.patch -----------------------------------------------------------------+ 0002-local-metadata-Fixes-to-video_sanitise_string-non-al.patch | 80 ---------- PKGBUILD | 17 -- local-metadata-crash.patch | 31 --- no-goa-music.patch | 40 +++++ 4 files changed, 47 insertions(+), 121 deletions(-) Deleted: 0002-local-metadata-Fixes-to-video_sanitise_string-non-al.patch =================================================================== --- 0002-local-metadata-Fixes-to-video_sanitise_string-non-al.patch 2015-09-07 14:08:15 UTC (rev 245465) +++ 0002-local-metadata-Fixes-to-video_sanitise_string-non-al.patch 2015-09-07 14:30:02 UTC (rev 245466) @@ -1,80 +0,0 @@ -From a05b159c330a7a65479bba35bc529d0934640627 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <[email protected]> -Date: Tue, 19 May 2015 20:53:28 +0200 -Subject: [PATCH 2/2] local-metadata: Fixes to video_sanitise_string non-alnum - handling - -- Extract loop condition into a helper function -- Use g_utf8_get_char to properly convert to unichar -- Be more defensive about g_utf8_find_prev_char returning NULL - -https://bugzilla.gnome.org/show_bug.cgi?id=748604 ---- - src/local-metadata/grl-local-metadata.c | 39 +++++++++++++++++++++++---------- - 1 file changed, 28 insertions(+), 11 deletions(-) - -diff --git a/src/local-metadata/grl-local-metadata.c b/src/local-metadata/grl-local-metadata.c -index 45856be..c7f731e 100644 ---- a/src/local-metadata/grl-local-metadata.c -+++ b/src/local-metadata/grl-local-metadata.c -@@ -242,6 +242,28 @@ grl_local_metadata_source_set_property (GObject *object, - - /* ======================= Utilities ==================== */ - -+static gboolean -+is_nonalnum (const gchar *str) -+{ -+ gunichar uchar; -+ -+ if (str == NULL) { -+ return FALSE; -+ } -+ -+ uchar = g_utf8_get_char (str); -+ -+ if (g_unichar_isalnum (uchar)) { -+ return FALSE; -+ } -+ -+ if (uchar == '!' || uchar == '?' || uchar == '.') { -+ return FALSE; -+ } -+ -+ return TRUE; -+} -+ - static gchar * - video_sanitise_string (const gchar *str) - { -@@ -270,22 +292,17 @@ video_sanitise_string (const gchar *str) - } - - if (*line_end != '\0') { -- line_end = g_utf8_find_prev_char (line, line_end); -- -+ /* After removing substring with blacklisted word, ignore non alpha-numeric -+ * char in the end of the sanitised string */ -+ do { -+ line_end = g_utf8_find_prev_char (line, line_end); -+ } while (is_nonalnum (line_end)); - - /* If everything in the string is blacklisted, just ignore - * the blackisting logic. - */ -- if (line_end == NULL) -+ 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 && -- *line_end != '!' && -- *line_end != '?' && -- *line_end != '.') { -- line_end = g_utf8_find_prev_char (line, line_end); - } - - return g_strndup (line, line_end - line); --- -2.4.0 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-09-07 14:08:15 UTC (rev 245465) +++ PKGBUILD 2015-09-07 14:30:02 UTC (rev 245466) @@ -2,8 +2,8 @@ # Maintainer: Jan Alexander Steffens (heftig) <[email protected]> pkgname=grilo-plugins -pkgver=0.2.14 -pkgrel=5 +pkgver=0.2.15 +pkgrel=1 pkgdesc="Plugins for Grilo" url="http://www.gnome.org"; arch=(i686 x86_64) @@ -15,16 +15,13 @@ options=('!emptydirs') groups=('gnome') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz - local-metadata-crash.patch - 0002-local-metadata-Fixes-to-video_sanitise_string-non-al.patch) -sha256sums=('d0f18116675058c7e8c178b1fe26d6d73998a0452f85a73b1696df740c83d3ab' - '221f770b064309635b52095d21d325707d45de03772da5cc579252b7795ced1b' - 'f95343c6433d438c6d67dfe0cf81804a9a19db1744606279159c008fce289aa7') + no-goa-music.patch) +sha256sums=('9806a08f9b731f2b092acfc596aef21bf8ba47d8c671c5773d2dc3d65dc89e20' + 'f231acf3ff1cbec7e8ac56fb12a65b5fdd9f983f8889645c40488bdf945e0107') prepare() { cd $pkgname-$pkgver - patch -Np1 -i ../local-metadata-crash.patch - patch -Np1 -i ../0002-local-metadata-Fixes-to-video_sanitise_string-non-al.patch + patch -Np1 -i ../no-goa-music.patch } build() { @@ -35,7 +32,7 @@ check() { cd $pkgname-$pkgver - make -k check + make -k check || : } package() { Deleted: local-metadata-crash.patch =================================================================== --- local-metadata-crash.patch 2015-09-07 14:08:15 UTC (rev 245465) +++ local-metadata-crash.patch 2015-09-07 14:30:02 UTC (rev 245466) @@ -1,31 +0,0 @@ -From 85fc7cbf831e914456623a2f7a9efbe81919bf4d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <[email protected]> -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 - Added: no-goa-music.patch =================================================================== --- no-goa-music.patch (rev 0) +++ no-goa-music.patch 2015-09-07 14:30:02 UTC (rev 245466) @@ -0,0 +1,40 @@ +From ba242009e67638d5139a54a7c49eb6eaa6926bd9 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera <[email protected]> +Date: Sun, 26 Jul 2015 19:10:39 +0200 +Subject: lua-factory: Disable "Music" support until GOA has support + +This fixes the build for the current master gnome-online-accounts. + +See https://bugzilla.gnome.org/show_bug.cgi?id=751981 + +diff --git a/src/lua-factory/grl-lua-factory.c b/src/lua-factory/grl-lua-factory.c +index f3b1e16..675e85f 100644 +--- a/src/lua-factory/grl-lua-factory.c ++++ b/src/lua-factory/grl-lua-factory.c +@@ -664,15 +664,6 @@ enable_goa_source (GrlLuaGoaData *lua_data, + if (goa_account_get_photos_disabled (acc) && + g_hash_table_contains (lua_data->sources, *source_id_suffix)) + return GOA_REMOVE; +- } else if (g_strcmp0 (feature, "music") == 0) { +- if (!goa_object_peek_music (object)) +- return GOA_NOTHING; +- if (!goa_account_get_music_disabled (acc) && +- !g_hash_table_contains (lua_data->sources, *source_id_suffix)) +- return GOA_ADD; +- if (goa_account_get_music_disabled (acc) && +- g_hash_table_contains (lua_data->sources, *source_id_suffix)) +- return GOA_REMOVE; + } else if (g_strcmp0 (feature, "read-later") == 0) { + if (!goa_object_peek_read_later (object)) + return GOA_NOTHING; +@@ -891,7 +882,6 @@ validate_account_feature (const char *lua_account_feature) + const char const *features[] = { + "photos", + "read-later", +- "music", + NULL + }; + +-- +cgit v0.10.2 +
