commit: 04fee22016701cef5763319978ee5a4605fe9987 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Mar 26 20:00:50 2021 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Mar 26 21:14:24 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04fee220
dev-libs/appstream: 0.14.3 version bump - Rebase disable-Werror-flags.patch - Fix build with >=glib-2.67 See also: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1935 Upstream commit 8a179f14619103247e4a14d96ea03c358d9c1492 Closes: https://bugs.gentoo.org/777765 Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-libs/appstream/Manifest | 1 + dev-libs/appstream/appstream-0.14.3.ebuild | 77 ++++++++++++++++++++++ .../appstream-0.14.3-disable-Werror-flags.patch | 12 ++++ 3 files changed, 90 insertions(+) diff --git a/dev-libs/appstream/Manifest b/dev-libs/appstream/Manifest index 406bf02a125..7d79c92e900 100644 --- a/dev-libs/appstream/Manifest +++ b/dev-libs/appstream/Manifest @@ -1 +1,2 @@ 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.14.3.ebuild b/dev-libs/appstream/appstream-0.14.3.ebuild new file mode 100644 index 00000000000..7a8b4e4420b --- /dev/null +++ b/dev-libs/appstream/appstream-0.14.3.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2021 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-misc/curl + introspection? ( >=dev-libs/gobject-introspection-1.56:= ) + qt5? ( dev-qt/qtcore:5 ) +" +DEPEND="${RDEPEND} + test? ( qt5? ( dev-qt/qttest:5 ) ) +" + +PATCHES=( + "${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 +} + +src_configure() { + xdg_environment_reset + + local emesonargs=( + -Dapidocs=false + -Ddocs=false + -Dcompose=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.14.3-disable-Werror-flags.patch b/dev-libs/appstream/files/appstream-0.14.3-disable-Werror-flags.patch new file mode 100644 index 00000000000..4e5a117061b --- /dev/null +++ b/dev-libs/appstream/files/appstream-0.14.3-disable-Werror-flags.patch @@ -0,0 +1,12 @@ +--- a/meson.build ++++ b/meson.build +@@ -52,9 +52,6 @@ + add_project_arguments(maintainer_c_args, language: 'cpp') + endif + +-# a few compiler warning flags we always want enabled +-add_project_arguments('-Werror=implicit-function-declaration', '-Wno-unused-parameter', language: 'c') +-add_project_arguments('-Wno-unused-parameter', language: 'cpp') + add_project_arguments('-DAS_COMPILATION', language: 'c') + + # Vendor extensions in system headers
