diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2021-06-06 18:40:20 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2021-06-10 17:29:43 +0200 |
commit | b9902fd95fcfb604fa031b96b6a1aec703254b2a (patch) | |
tree | c7a9e68803b46520f440c8dc31987ecf993ce906 /dev-libs/appstream | |
parent | dev-libs/plasma-wayland-protocols: Drop 1.1.1 (diff) | |
download | gentoo-b9902fd95fcfb604fa031b96b6a1aec703254b2a.tar.gz gentoo-b9902fd95fcfb604fa031b96b6a1aec703254b2a.tar.bz2 gentoo-b9902fd95fcfb604fa031b96b6a1aec703254b2a.zip |
dev-libs/appstream: Drop 0.12.11-r1
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'dev-libs/appstream')
5 files changed, 0 insertions, 203 deletions
diff --git a/dev-libs/appstream/Manifest b/dev-libs/appstream/Manifest index 7d79c92e900f..8bb471ce7ea7 100644 --- a/dev-libs/appstream/Manifest +++ b/dev-libs/appstream/Manifest @@ -1,2 +1 @@ -DIST AppStream-0.12.11.tar.xz 2120548 BLAKE2B 6053d1d1bbe182c8e57f657ea5dda9c4a777d5a7955f39a57677502fbbe010d5c49a7872329d1ef716c41c7423bfb4d284e71af97f99ca6e466fbf369bf80272 SHA512 6000f4e9f995b2d481374db2409f212da9d48893c4a757cb7287e2731117f50d0ed284dedc0e24e505b3b7c9c9f38dd9a5f855eeb6c7445eb7203e74d4a5f790 DIST AppStream-0.14.3.tar.xz 2277536 BLAKE2B 99ceae6873c189b289143c8ab59eaacfbadbbe7cf05db96079c00ba09c82aeac63f4436e1b9e54b8d172aa7e9f609583cf2a78d3f44ce880cb1a326034432563 SHA512 b4c41b44375091636cc46e2f7f5e0b86612474faa6d55010caee78cb9c9ac468d093cf261184d900be7aae8513dc72d2821ff9ee17786e123c86a928ce5e9135 diff --git a/dev-libs/appstream/appstream-0.12.11-r1.ebuild b/dev-libs/appstream/appstream-0.12.11-r1.ebuild deleted file mode 100644 index c6f2bbb71f20..000000000000 --- a/dev-libs/appstream/appstream-0.12.11-r1.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit meson xdg-utils - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/ximion/${PN}" -else - SRC_URI="https://www.freedesktop.org/software/appstream/releases/AppStream-${PV}.tar.xz" - KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" - S="${WORKDIR}/AppStream-${PV}" -fi - -DESCRIPTION="Cross-distro effort for providing metadata for software in the Linux ecosystem" -HOMEPAGE="https://www.freedesktop.org/wiki/Distributions/AppStream/" - -LICENSE="LGPL-2.1+ GPL-2+" -# check as_api_level -SLOT="0/4" -IUSE="apt doc +introspection qt5 test" -RESTRICT="test" # bug 691962 - -BDEPEND=" - dev-libs/appstream-glib - dev-libs/libxslt - dev-util/itstool - >=sys-devel/gettext-0.19.8 - doc? ( app-text/docbook-xml-dtd:4.5 ) - test? ( dev-qt/linguist-tools:5 ) -" -RDEPEND=" - dev-db/lmdb:= - >=dev-libs/glib-2.58:2 - dev-libs/libxml2:2 - dev-libs/libyaml - dev-libs/snowball-stemmer - >=net-libs/libsoup-2.56:2.4 - introspection? ( >=dev-libs/gobject-introspection-1.56:= ) - qt5? ( dev-qt/qtcore:5 ) -" -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() { - xdg_environment_reset - - local emesonargs=( - -Dapidocs=false - -Ddocs=false - -Dmaintainer=false - -Dstemming=true - -Dvapi=false - -Dapt-support=$(usex apt true false) - -Dinstall-docs=$(usex doc true false) - -Dgir=$(usex introspection true false) - -Dqt=$(usex qt5 true false) - ) - - meson_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 deleted file mode 100644 index 0f887432deb4..000000000000 --- a/dev-libs/appstream/files/appstream-0.12.11-disable-Werror-flags.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- 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 deleted file mode 100644 index 66b388061a45..000000000000 --- a/dev-libs/appstream/files/appstream-0.12.11-no-highlight.js.patch +++ /dev/null @@ -1,86 +0,0 @@ -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 deleted file mode 100644 index e96b2a3856dd..000000000000 --- a/dev-libs/appstream/files/appstream-0.12.11-qt-add-missing-provided-kindid-enum.patch +++ /dev/null @@ -1,24 +0,0 @@ -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) - |