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 100644
+--- a/src/optical-media/meson.build
b/s