[arch-commits] Commit in grilo-plugins/repos (10 files)

2017-02-17 Thread Jan Steffens 
Date: Friday, February 17, 2017 @ 22:42:18
  Author: heftig
Revision: 289120

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  
grilo-plugins/repos/extra-i686/0001-lua-factory-Remove-bad-prototype-for-html_entity_has.patch
(from rev 289119, 
grilo-plugins/trunk/0001-lua-factory-Remove-bad-prototype-for-html_entity_has.patch)
  
grilo-plugins/repos/extra-i686/0001-meson-Fix-library-name-of-optical-media-plugin.patch
(from rev 289119, 
grilo-plugins/trunk/0001-meson-Fix-library-name-of-optical-media-plugin.patch)
  
grilo-plugins/repos/extra-i686/0002-lua-factory-Remove-generated-htmlentity.c.patch
(from rev 289119, 
grilo-plugins/trunk/0002-lua-factory-Remove-generated-htmlentity.c.patch)
  grilo-plugins/repos/extra-i686/PKGBUILD
(from rev 289119, grilo-plugins/trunk/PKGBUILD)
  
grilo-plugins/repos/extra-x86_64/0001-lua-factory-Remove-bad-prototype-for-html_entity_has.patch
(from rev 289119, 
grilo-plugins/trunk/0001-lua-factory-Remove-bad-prototype-for-html_entity_has.patch)
  
grilo-plugins/repos/extra-x86_64/0001-meson-Fix-library-name-of-optical-media-plugin.patch
(from rev 289119, 
grilo-plugins/trunk/0001-meson-Fix-library-name-of-optical-media-plugin.patch)
  
grilo-plugins/repos/extra-x86_64/0002-lua-factory-Remove-generated-htmlentity.c.patch
(from rev 289119, 
grilo-plugins/trunk/0002-lua-factory-Remove-generated-htmlentity.c.patch)
  grilo-plugins/repos/extra-x86_64/PKGBUILD
(from rev 289119, grilo-plugins/trunk/PKGBUILD)
Deleted:
  grilo-plugins/repos/extra-i686/PKGBUILD
  grilo-plugins/repos/extra-x86_64/PKGBUILD

--+
 /PKGBUILD| 
 112 +
 extra-i686/0001-lua-factory-Remove-bad-prototype-for-html_entity_has.patch   | 
  27 
 extra-i686/0001-meson-Fix-library-name-of-optical-media-plugin.patch | 
  25 
 extra-i686/0002-lua-factory-Remove-generated-htmlentity.c.patch  | 
 923 ++
 extra-i686/PKGBUILD  | 
  48 
 extra-x86_64/0001-lua-factory-Remove-bad-prototype-for-html_entity_has.patch | 
  27 
 extra-x86_64/0001-meson-Fix-library-name-of-optical-media-plugin.patch   | 
  25 
 extra-x86_64/0002-lua-factory-Remove-generated-htmlentity.c.patch| 
 923 ++
 extra-x86_64/PKGBUILD| 
  48 
 9 files changed, 2062 insertions(+), 96 deletions(-)

Copied: 
grilo-plugins/repos/extra-i686/0001-lua-factory-Remove-bad-prototype-for-html_entity_has.patch
 (from rev 289119, 
grilo-plugins/trunk/0001-lua-factory-Remove-bad-prototype-for-html_entity_has.patch)
===
--- extra-i686/0001-lua-factory-Remove-bad-prototype-for-html_entity_has.patch  
(rev 0)
+++ extra-i686/0001-lua-factory-Remove-bad-prototype-for-html_entity_has.patch  
2017-02-17 22:42:18 UTC (rev 289120)
@@ -0,0 +1,27 @@
+From 2fc539daa0e51a280f36c3d3558f15856bc217fd Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" 
+Date: Fri, 17 Feb 2017 23:22:59 +0100
+Subject: [PATCH 1/2] lua-factory: Remove bad prototype for html_entity_hash
+
+gperf 3.1 changes the type of the len argument for the generated
+function to size_t, causing a conflict.
+---
+ src/lua-factory/lua-library/htmlentity.gperf | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/lua-factory/lua-library/htmlentity.gperf 
b/src/lua-factory/lua-library/htmlentity.gperf
+index cbd326c4f56f3e2d..096bf3e39b106eda 100644
+--- a/src/lua-factory/lua-library/htmlentity.gperf
 b/src/lua-factory/lua-library/htmlentity.gperf
+@@ -35,8 +35,6 @@ struct _EntityEntry {
+   const gchar *name;
+   gulong value;
+ };
+-struct _EntityEntry *
+-html_entity_hash (register const char *str, register unsigned int len);
+ %%
+ Aacute, 193
+ aacute, 225
+-- 
+2.11.1
+

Copied: 
grilo-plugins/repos/extra-i686/0001-meson-Fix-library-name-of-optical-media-plugin.patch
 (from rev 289119, 
grilo-plugins/trunk/0001-meson-Fix-library-name-of-optical-media-plugin.patch)
===
--- extra-i686/0001-meson-Fix-library-name-of-optical-media-plugin.patch
(rev 0)
+++ extra-i686/0001-meson-Fix-library-name-of-optical-media-plugin.patch
2017-02-17 22:42:18 UTC (rev 289120)
@@ -0,0 +1,25 @@
+From 1282d9e3756d38362a5dc34c41ba0dd6c5c3ff71 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" 
+Date: Fri, 17 Feb 2017 23:38:48 +0100
+Subject: [PATCH] meson: Fix library name of optical-media plugin
+
+---
+ src/optical-media/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/optical-media/meson.build b/src/optical-media/meson.build
+index aaf6a68786853aec..5a8845e4aecf37bb

[arch-commits] Commit in grilo-plugins/repos (10 files)

2015-05-19 Thread Jan Steffens 
Date: Tuesday, May 19, 2015 @ 21:27:50
  Author: heftig
Revision: 239562

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  
grilo-plugins/repos/extra-i686/0002-local-metadata-Fixes-to-video_sanitise_string-non-al.patch
(from rev 239561, 
grilo-plugins/trunk/0002-local-metadata-Fixes-to-video_sanitise_string-non-al.patch)
  grilo-plugins/repos/extra-i686/PKGBUILD
(from rev 239561, grilo-plugins/trunk/PKGBUILD)
  grilo-plugins/repos/extra-i686/local-metadata-crash.patch
(from rev 239561, grilo-plugins/trunk/local-metadata-crash.patch)
  
grilo-plugins/repos/extra-x86_64/0002-local-metadata-Fixes-to-video_sanitise_string-non-al.patch
(from rev 239561, 
grilo-plugins/trunk/0002-local-metadata-Fixes-to-video_sanitise_string-non-al.patch)
  grilo-plugins/repos/extra-x86_64/PKGBUILD
(from rev 239561, grilo-plugins/trunk/PKGBUILD)
  grilo-plugins/repos/extra-x86_64/local-metadata-crash.patch
(from rev 239561, grilo-plugins/trunk/local-metadata-crash.patch)
Deleted:
  grilo-plugins/repos/extra-i686/PKGBUILD
  grilo-plugins/repos/extra-i686/local-metadata-crash.patch
  grilo-plugins/repos/extra-x86_64/PKGBUILD
  grilo-plugins/repos/extra-x86_64/local-metadata-crash.patch

--+
 /PKGBUILD| 
  88 ++
 /local-metadata-crash.patch  | 
  62 +++
 extra-i686/0002-local-metadata-Fixes-to-video_sanitise_string-non-al.patch   | 
  80 +
 extra-i686/PKGBUILD  | 
  36 
 extra-i686/local-metadata-crash.patch| 
  31 ---
 extra-x86_64/0002-local-metadata-Fixes-to-video_sanitise_string-non-al.patch | 
  80 +
 extra-x86_64/PKGBUILD| 
  36 
 extra-x86_64/local-metadata-crash.patch  | 
  31 ---
 8 files changed, 310 insertions(+), 134 deletions(-)

Copied: 
grilo-plugins/repos/extra-i686/0002-local-metadata-Fixes-to-video_sanitise_string-non-al.patch
 (from rev 239561, 
grilo-plugins/trunk/0002-local-metadata-Fixes-to-video_sanitise_string-non-al.patch)
===
--- extra-i686/0002-local-metadata-Fixes-to-video_sanitise_string-non-al.patch  
(rev 0)
+++ extra-i686/0002-local-metadata-Fixes-to-video_sanitise_string-non-al.patch  
2015-05-19 19:27:50 UTC (rev 239562)
@@ -0,0 +1,80 @@
+From a05b159c330a7a65479bba35bc529d0934640627 Mon Sep 17 00:00:00 2001
+From: Jan Alexander Steffens (heftig) jan.steff...@gmail.com
+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);
+ }
+ 
+