From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1C26215ACFB for ; Tue, 18 Apr 2023 13:43:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4CC38E08F6; Tue, 18 Apr 2023 13:43:01 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 14CF3E08F6 for ; Tue, 18 Apr 2023 13:43:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5AA07340C72 for ; Tue, 18 Apr 2023 13:43:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D5CB2A3A for ; Tue, 18 Apr 2023 13:42:58 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1681825364.818b7f136978e737a0e5d53e46bd9aa77d5621a5.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/appstream/, dev-libs/appstream/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/appstream/Manifest dev-libs/appstream/appstream-0.16.1.ebuild dev-libs/appstream/files/appstream-0.16.1-disable-Werror-flags.patch X-VCS-Directories: dev-libs/appstream/files/ dev-libs/appstream/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: 818b7f136978e737a0e5d53e46bd9aa77d5621a5 X-VCS-Branch: master Date: Tue, 18 Apr 2023 13:42:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ba5c5ea5-e1fd-4d4a-8d44-40e6f0246050 X-Archives-Hash: 02ed82712371e7b75d9b8e7182788247 commit: 818b7f136978e737a0e5d53e46bd9aa77d5621a5 Author: Conrad Kostecki gentoo org> AuthorDate: Tue Apr 18 13:42:22 2023 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Tue Apr 18 13:42:44 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=818b7f13 Revert "dev-libs/appstream: add 0.16.1" This reverts commit 4d6980df2d445291d61ceceb5a3597570aec1112. Signed-off-by: Conrad Kostecki gentoo.org> dev-libs/appstream/Manifest | 1 - dev-libs/appstream/appstream-0.16.1.ebuild | 77 ---------------------- .../appstream-0.16.1-disable-Werror-flags.patch | 50 -------------- 3 files changed, 128 deletions(-) diff --git a/dev-libs/appstream/Manifest b/dev-libs/appstream/Manifest index ab274e663f0d..2e213f107408 100644 --- a/dev-libs/appstream/Manifest +++ b/dev-libs/appstream/Manifest @@ -1,2 +1 @@ DIST AppStream-0.15.6.tar.xz 2517688 BLAKE2B 09519205c7dfc5f0715b9d5ae7e99a67673ab499f1e2cb39815edde64defc1aa5059215575278bbcfc4482cd385a79e081c70f6acea3c446c5869dc6b2e18f6c SHA512 7426bc89e22b751de7b3e27d7c07eb1c373f4439f9966868ce5ea410d209b8c5292e03695a34b7a49bfa61e2e62265c7f7cdffc0be871c950193c933f65757ef -DIST AppStream-0.16.1.tar.xz 2558188 BLAKE2B 78d19fd3dc6f443fc6f130f9053cb4a32b1592766e3b076ad965845ee29038fec545cd13728724f49f372cf63fafce6b536e649dc1d266342f66095d37cb2514 SHA512 79e139bd0f54534aa37c21d24309c33ee936e737149d6fa5ba0ec50e8ade33c2951d0b1e2ff15729e2a4d274ff1f7ca734bb70efa94539d87a3f949a07fb7d9e diff --git a/dev-libs/appstream/appstream-0.16.1.ebuild b/dev-libs/appstream/appstream-0.16.1.ebuild deleted file mode 100644 index 22035505fdee..000000000000 --- a/dev-libs/appstream/appstream-0.16.1.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson xdg-utils - -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/ximion/${PN}" -else - MY_PN="AppStream" - SRC_URI="https://www.freedesktop.org/software/appstream/releases/${MY_PN}-${PV}.tar.xz" - KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86" - S="${WORKDIR}/${MY_PN}-${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 - -RDEPEND=" - >=dev-libs/glib-2.62:2 - dev-libs/libxml2:2 - >=dev-libs/libxmlb-0.3.6:= - dev-libs/libyaml - dev-libs/snowball-stemmer:= - >=net-misc/curl-7.62 - introspection? ( >=dev-libs/gobject-introspection-1.56:= ) - qt5? ( dev-qt/qtcore:5 ) -" -DEPEND="${RDEPEND} - test? ( qt5? ( dev-qt/qttest:5 ) ) -" -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 ) -" - -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 - -Dstatic-analysis=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.16.1-disable-Werror-flags.patch b/dev-libs/appstream/files/appstream-0.16.1-disable-Werror-flags.patch deleted file mode 100644 index e42c88e3bd31..000000000000 --- a/dev-libs/appstream/files/appstream-0.16.1-disable-Werror-flags.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- a/meson.build 2023-03-15 14:18:16.657101983 -0700 -+++ b/meson.build 2023-03-15 14:21:20.055049626 -0700 -@@ -97,47 +97,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=shadow', -- '-Werror=empty-body', -- '-Werror=pointer-arith', -- '-Werror=init-self', -- '-Werror=missing-declarations', -- '-Werror=return-type', -- '-Werror=misleading-indentation', -- '-Werror=format-security', -- -- # NOTE: Can be removed with AppStream 1.0 -- '-Wno-error=c++20-compat', -- language: 'cpp' --) -- - # Vendor extensions in system headers - add_project_arguments('-D_POSIX_C_SOURCE=200809L', language: 'c') -