gentoo resync : 25.08.2020

5 files changed, 134 insertions, 1 deletions

diff --git a/dev-libs/appstream/Manifest b/dev-libs/appstream/Manifest
index 51f332fa80d9..7234e52dd05c 100644
--- a/dev-libs/appstream/Manifest
+++ b/dev-libs/appstream/Manifest
@@ -1,5 +1,8 @@
+AUX appstream-0.12.11-disable-Werror-flags.patch 512 BLAKE2B dcf8eece66122356743a3d958d8f86f8165045a4edff60d1c8c3d41eb8b705572843b3931f075c567fd3a6734d60dcf58133a1997ea841aa57414f50f4c2b36a SHA512 457f4cfcb2ab775bb5d64b239384fe2ebfbf99591fe38941c8208accedad1728c3bbabd637161d36dedda39b992ac8277b1d1432f117cf1277de469227e2f391
+AUX appstream-0.12.11-no-highlight.js.patch 3876 BLAKE2B 30176763dd0ec5b9b4e65e748749fee6e68371ba37872c6a2d2556621efd166c1202b4d180d1dd9e980b5e7e12ffebd2579883b370126dda1550873d880dd769 SHA512 4be2760971b7dcc58fd21c8e3cd67242eadd3b1e19067a14e279594a40fc8bffc3fddce0c7a90db01e19129ba7e3d09997615f5ab9cf3dda9a8b76eb4dbd0e0b
+AUX appstream-0.12.11-qt-add-missing-provided-kindid-enum.patch 711 BLAKE2B cbca8047059f613dd6b4859b5f7982cfa09e22717982c7404e5375ec976dc03fa421e5b6103b0d399dbca9ce7a7ced02a822754ebe29f5d72a2d5da834219297 SHA512 1e9169aecce1073d851d2a22498586440d1eeb02e84ae362f381799ec244aa755cb58203f3873a566b07462be31fb1b3324c062b15cdadebc4253ab750363c66
 DIST AppStream-0.12.11.tar.xz 2120548 BLAKE2B 6053d1d1bbe182c8e57f657ea5dda9c4a777d5a7955f39a57677502fbbe010d5c49a7872329d1ef716c41c7423bfb4d284e71af97f99ca6e466fbf369bf80272 SHA512 6000f4e9f995b2d481374db2409f212da9d48893c4a757cb7287e2731117f50d0ed284dedc0e24e505b3b7c9c9f38dd9a5f855eeb6c7445eb7203e74d4a5f790
 DIST AppStream-0.12.7.tar.xz 1958948 BLAKE2B 51a70395e4801ceeb3e97ac081f4c45be242cca14728f8efc5eec0d4b3cfa4cc9fab9ef7429c18e9bbb0dedb693a847258be1b11491155658a6ffa2a28358e35 SHA512 53ca7ebde3fcd345a895527da2ac5d829a09f25d28836a867b500282fba3465bde657cd75a4030cb831022f7a0d9f50aadb36078d62924e4d0edad6bfe3c5561
-EBUILD appstream-0.12.11.ebuild 1695 BLAKE2B 4ebb95eca1abb10ee9ca9f9dbd6ab2c766b1718ffd7f5fa1e08354451493cab0ad9a2a19866582f9c4525dd077c4cd81987c0040990991b41f152ce038877a99 SHA512 e46cf958e89a2f7247f24d36d8baf056b2ce0dc0bba00f0c87d3df7997b3100807c6c82124cff92a8570b17b859486f3e948662941c5ca1cec0720a296954c5a
+EBUILD appstream-0.12.11-r1.ebuild 1987 BLAKE2B d9586bcd07fb457a98238d706fd29e21a7b1727535a17d96f679a98f433f2cb9bfaa36e11279c13f802fbc10b92b86415e2f6d4961fc7642ff4f2f8c1cd9fee2 SHA512 2001fc4e9979eeaeee4883620f1a5630d1d9d18b71e2470656d24aac2350d45e2b93968a2d0b2927f0d3378c89bdd434ec5d7e8230f8dafc3cf4047c21b010e5
 EBUILD appstream-0.12.7.ebuild 1619 BLAKE2B 0355409cb6ed3d49aba5deee05dddb87dd000b45427a472a1ca39a9c887567ef7f26cbf777eb9b9a6ec50e90b5544c1c607636ec22f8227ac5f087e7b2d0bcec SHA512 90a0ab33c5cf51b48c4297da10e26765b18a55bf5d2b18c051d6119ef10bc94d6470cb708d3105af39349ec63de90c1f03883544dcecad6853bce85f09b9b4fb
 MISC metadata.xml 399 BLAKE2B 433fcfbb840f3efc4130de1a4b9a18ce3b1762363bfa67d994a063098da0397b6776a6154250ad5a35a4960241234f2ba3dc2464b760cf19cbb680590d559049 SHA512 1f81f3603fc34a3dbeb570fe83ed2ff97e4ea2391cda7d7ceef017624a8498052cda4a21dee1f6b8eb41407998dfcecd765bde556837d00b13caaa41989f934f
diff --git a/dev-libs/appstream/appstream-0.12.11.ebuild b/dev-libs/appstream/appstream-0.12.11-r1.ebuild
index 4d3a31bbb3b3..c2dca084f140 100644
--- a/dev-libs/appstream/appstream-0.12.11.ebuild
+++ b/dev-libs/appstream/appstream-0.12.11-r1.ebuild
@@ -45,12 +45,20 @@ DEPEND="${RDEPEND}
 	test? ( qt5? ( dev-qt/qttest:5 ) )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-no-highlight.js.patch
+	"${FILESDIR}"/${P}-qt-add-missing-provided-kindid-enum.patch
+	"${FILESDIR}"/${P}-disable-Werror-flags.patch # bug 733774
+)
+
 src_prepare() {
 	default
 	sed -e "/^as_doc_target_dir/s/appstream/${PF}/" -i docs/meson.build || die
 	if ! use test; then
 		sed -e "/^subdir.*tests/s/^/#DONT /" -i {,qt/}meson.build || die # bug 675944
 	fi
+	rm docs/html/static/js/HighlightJS.LICENSE \
+		docs/html/static/js/highlight.min.js || die # incompatible license
 }
 
 src_configure() {
diff --git a/dev-libs/appstream/files/appstream-0.12.11-disable-Werror-flags.patch b/dev-libs/appstream/files/appstream-0.12.11-disable-Werror-flags.patch
new file mode 100644
index 000000000000..0f887432deb4
--- /dev/null
+++ b/dev-libs/appstream/files/appstream-0.12.11-disable-Werror-flags.patch
@@ -0,0 +1,12 @@
+--- a/meson.build	2020-07-26 21:29:04.621544863 +0200
++++ b/meson.build	2020-07-26 21:34:06.682233266 +0200
+@@ -52,9 +52,6 @@
+     add_global_arguments(maintainer_c_args, language: 'cpp')
+ endif
+ 
+-# a few compiler warning flags we always want enabled
+-add_global_arguments('-Werror=implicit-function-declaration', '-Wno-unused-parameter', language: 'c')
+-add_global_arguments('-Wno-unused-parameter', '-Wno-error=deprecated-copy', language: 'cpp')
+ add_global_arguments('-DAS_COMPILATION', language : 'c')
+ 
+ #
diff --git a/dev-libs/appstream/files/appstream-0.12.11-no-highlight.js.patch b/dev-libs/appstream/files/appstream-0.12.11-no-highlight.js.patch
new file mode 100644
index 000000000000..66b388061a45
--- /dev/null
+++ b/dev-libs/appstream/files/appstream-0.12.11-no-highlight.js.patch
@@ -0,0 +1,86 @@
+From 5ddf424d9b5713bd71c34b5ab6bbd10ad7b74bbc Mon Sep 17 00:00:00 2001
+From: Matthias Klumpp <matthias@tenstral.net>
+Date: Tue, 12 May 2020 20:00:19 +0200
+Subject: [PATCH] Never ship with an embedded convenience copy of Highlight.js
+
+This should make Debian happy.
+---
+ docs/doc-build-helper.py                 | 10 +-------
+ docs/meson.build                         | 12 ++++++++++
+ docs/style/static/js/HighlightJS.LICENSE | 29 ------------------------
+ docs/style/static/js/INFO.md             |  8 +++++++
+ 4 files changed, 21 insertions(+), 38 deletions(-)
+ delete mode 100644 docs/style/static/js/HighlightJS.LICENSE
+ create mode 100644 docs/style/static/js/INFO.md
+
+diff --git a/docs/doc-build-helper.py b/docs/doc-build-helper.py
+index ce46303d..c29cce2d 100755
+--- a/docs/doc-build-helper.py
++++ b/docs/doc-build-helper.py
+@@ -29,10 +29,6 @@
+ from pathlib import Path
+ 
+ 
+-# additional JavaScript from system locations, we use it if available
+-EXTRA_JS = [['/usr/share/javascript/highlight.js/highlight.min.js',
+-             'highlight.min.js']]
+-
+ # additional CSS from system locations, we use it if available
+ EXTRA_CSS = [['/usr/share/javascript/highlight.js/styles/routeros.css',
+               'highlight.css']]
+@@ -64,11 +60,7 @@ def daps_build(src_dir, project_name, daps_exe):
+     shutil.copy(os.path.join(src_dir, 'images', 'src', 'svg', 'appstream-logo.svg'),
+                 os.path.join(html_out_dir, 'images'))
+ 
+-    # copy extra JS and CSS if it is available
+-    for js_fname in EXTRA_JS:
+-        if os.path.exists(js_fname[0]):
+-            shutil.copy(js_fname[0], os.path.join(html_out_dir, 'static',
+-                                                  'js', js_fname[1]))
++    # copy extra CSS if it is available
+     for css_fname in EXTRA_CSS:
+         if os.path.exists(css_fname[0]):
+             shutil.copy(css_fname[0], os.path.join(html_out_dir, 'static',
+diff --git a/docs/meson.build b/docs/meson.build
+index 1ae5fc46..d4543fdd 100644
+--- a/docs/meson.build
++++ b/docs/meson.build
+@@ -101,6 +101,12 @@ if get_option('docs')
+ 
+     if get_option('install-docs')
+         install_subdir('html', install_dir: as_doc_target_dir)
++
++        meson.add_install_script('sh', '-c',
++                          'if [ -f "@0@" ]; then mkdir -p $DESTDIR/@1@ && ln -sf @0@ $DESTDIR/@1@; fi'
++                          .format('/usr/share/javascript/highlight.js/highlight.min.js',
++                                  join_paths(get_option('prefix'), as_doc_target_dir, 'html', 'static', 'js'))
++        )
+     endif
+ 
+     # add an extra testcase for documentation validation
+@@ -114,5 +120,11 @@ elif get_option('install-docs')
+     if run_command('[', '-d', join_paths(meson.current_source_dir(), 'html'), ']').returncode() == 0
+         # install documentation, if it exists
+         install_subdir('html', install_dir: as_doc_target_dir)
++
++        meson.add_install_script('sh', '-c',
++                          'if [ -f "@0@" ]; then mkdir -p $DESTDIR/@1@ && ln -sf @0@ $DESTDIR/@1@; fi'
++                          .format('/usr/share/javascript/highlight.js/highlight.min.js',
++                                  join_paths(get_option('prefix'), as_doc_target_dir, 'html', 'static', 'js'))
++        )
+     endif
+ endif
+diff --git a/docs/style/static/js/INFO.md b/docs/style/static/js/INFO.md
+new file mode 100644
+index 00000000..6e95673b
+--- /dev/null
++++ b/docs/style/static/js/INFO.md
+@@ -0,0 +1,8 @@
++### AppStream Documentation JS Directory
++
++You can place a minified copy of [Highlight.js](https://highlightjs.org/) in this
++directory to enable source-code highlighting in the documentation.
++
++In case a system-wide copy of `highlight.min.js` and its CSS files exists in
++`/usr/share/javascript/highlight.js/`, the buildsystem will automatically detect that
++and create symbolic links to these files when installing the documentation.
diff --git a/dev-libs/appstream/files/appstream-0.12.11-qt-add-missing-provided-kindid-enum.patch b/dev-libs/appstream/files/appstream-0.12.11-qt-add-missing-provided-kindid-enum.patch
new file mode 100644
index 000000000000..e96b2a3856dd
--- /dev/null
+++ b/dev-libs/appstream/files/appstream-0.12.11-qt-add-missing-provided-kindid-enum.patch
@@ -0,0 +1,24 @@
+From 36f71e78f033fdb5bb880825b878b7dab31c0a73 Mon Sep 17 00:00:00 2001
+From: Aleix Pol <aleixpol@kde.org>
+Date: Mon, 1 Jun 2020 13:25:25 +0200
+Subject: [PATCH] qt: add missing Provided::KindId enum
+
+It was never added to the Qt interface
+---
+ qt/provided.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/qt/provided.h b/qt/provided.h
+index 1e3ba317..8e350fb0 100644
+--- a/qt/provided.h
++++ b/qt/provided.h
+@@ -59,7 +59,8 @@ class APPSTREAMQT_EXPORT Provided {
+             KindDBusSystemService,
+             KindDBusUserService,
+             KindFirmwareRuntime,
+-            KindFirmwareFlashed
++            KindFirmwareFlashed,
++            KindId,
+         };
+         Q_ENUM(Kind)
+