commit: 33086404d42b4a6fea1cca7766e9fc911140f542 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Nov 28 21:40:53 2023 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Nov 28 22:10:12 2023 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=33086404
dev-libs/appstream: Switch to Qt6, bump subslot, add new dependency Rebase disable-Werror-flags.patch Bug: https://bugs.gentoo.org/914646 Closes: https://bugs.gentoo.org/914610 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-libs/appstream/appstream-9999.ebuild | 23 ++++++----- .../appstream-0.14.3-disable-Werror-flags.patch | 12 ------ .../appstream-1.0.0-disable-Werror-flags.patch | 47 ++++++++++++++++++++++ 3 files changed, 59 insertions(+), 23 deletions(-) diff --git a/dev-libs/appstream/appstream-9999.ebuild b/dev-libs/appstream/appstream-9999.ebuild index cf8b0253b6..bde07617b8 100644 --- a/dev-libs/appstream/appstream-9999.ebuild +++ b/dev-libs/appstream/appstream-9999.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then else MY_PN="AppStream" SRC_URI="https://www.freedesktop.org/software/appstream/releases/${MY_PN}-${PV}.tar.xz"; - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" S="${WORKDIR}/${MY_PN}-${PV}" fi @@ -20,22 +20,24 @@ 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" +SLOT="0/5" +IUSE="apt doc +introspection qt6 systemd test" RESTRICT="test" # bug 691962 RDEPEND=" + app-arch/zstd:= >=dev-libs/glib-2.62:2 dev-libs/libxml2:2 - >=dev-libs/libxmlb-0.3.6:= + >=dev-libs/libxmlb-0.3.14:= dev-libs/libyaml dev-libs/snowball-stemmer:= >=net-misc/curl-7.62 introspection? ( >=dev-libs/gobject-introspection-1.56:= ) - qt5? ( dev-qt/qtcore:5 ) + qt6? ( dev-qt/qtbase:6 ) + systemd? ( sys-apps/systemd:= ) " DEPEND="${RDEPEND} - test? ( qt5? ( dev-qt/qttest:5 ) ) + test? ( qt6? ( dev-qt/qtbase:6[test] ) ) " BDEPEND=" dev-libs/appstream-glib @@ -43,12 +45,10 @@ BDEPEND=" dev-util/itstool >=sys-devel/gettext-0.19.8 doc? ( app-text/docbook-xml-dtd:4.5 ) - test? ( dev-qt/linguist-tools:5 ) + test? ( dev-qt/qttools:6[linguist] ) " -PATCHES=( - "${FILESDIR}"/${PN}-0.14.3-disable-Werror-flags.patch # bug 733774 -) +PATCHES=( "${FILESDIR}"/${PN}-1.0.0-disable-Werror-flags.patch ) # bug 733774 src_prepare() { default @@ -72,7 +72,8 @@ src_configure() { -Dapt-support=$(usex apt true false) -Dinstall-docs=$(usex doc true false) -Dgir=$(usex introspection true false) - -Dqt=$(usex qt5 true false) + -Dqt=$(usex qt6 true false) + -Dsystemd=$(usex systemd 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 deleted file mode 100644 index 4e5a117061..0000000000 --- a/dev-libs/appstream/files/appstream-0.14.3-disable-Werror-flags.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- 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 diff --git a/dev-libs/appstream/files/appstream-1.0.0-disable-Werror-flags.patch b/dev-libs/appstream/files/appstream-1.0.0-disable-Werror-flags.patch new file mode 100644 index 0000000000..309d365c28 --- /dev/null +++ b/dev-libs/appstream/files/appstream-1.0.0-disable-Werror-flags.patch @@ -0,0 +1,47 @@ +--- a/meson.build ++++ b/meson.build +@@ -90,44 +90,6 @@ + endif + endif + +-# a few compiler warning flags we always want enabled +-add_project_arguments( +- cc.get_supported_arguments([ +- '-Werror=shadow', +- '-Werror=empty-body', +- '-Werror=strict-prototypes', +- '-Werror=missing-prototypes', +- '-Werror=implicit-function-declaration', +- '-Werror=pointer-arith', +- '-Werror=missing-declarations', +- '-Werror=return-type', +- '-Werror=int-conversion', +- '-Werror=incompatible-pointer-types', +- '-Werror=misleading-indentation', +- '-Werror=missing-include-dirs', +- '-Werror=declaration-after-statement', +- '-Werror=format-security', +- +- '-Wno-missing-field-initializers', +- '-Wno-error=missing-field-initializers', +- '-Wno-unused-parameter', +- '-Wno-error=unused-parameter', +- ]), +- language: 'c' +-) +-add_project_arguments( +- '-Wno-unused-parameter', +- '-Werror=empty-body', +- '-Werror=pointer-arith', +- '-Werror=init-self', +- '-Werror=missing-declarations', +- '-Werror=return-type', +- '-Werror=misleading-indentation', +- '-Werror=format-security', +- +- language: 'cpp' +-) +- + # Vendor extensions in system headers + if host_machine.system() != 'netbsd' + # on NetBSD, defining POSIX_C_SOURCE *removes* non-POSIX symbols from namespace,
