public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/appstream/files/, dev-libs/appstream/
@ 2018-05-18 16:44 Andreas Sturmlechner
  0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2018-05-18 16:44 UTC (permalink / raw
  To: gentoo-commits

commit:     563dd71917c9077c1afad0dc04e3b2924ab53b59
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri May 18 16:43:46 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri May 18 16:44:11 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=563dd719

dev-libs/appstream: Fix install issue w/ meson

Thanks-to: David Haller <gentoo <AT> dhaller.de>
Closes: https://bugs.gentoo.org/640916
Package-Manager: Portage-2.3.38, Repoman-2.3.9

 dev-libs/appstream/appstream-0.11.5.ebuild                 |  2 ++
 .../appstream/files/appstream-0.11.5-fix-meson-po.patch    | 14 ++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/dev-libs/appstream/appstream-0.11.5.ebuild b/dev-libs/appstream/appstream-0.11.5.ebuild
index 227ab977dc5..bf4e52ace68 100644
--- a/dev-libs/appstream/appstream-0.11.5.ebuild
+++ b/dev-libs/appstream/appstream-0.11.5.ebuild
@@ -43,6 +43,8 @@ DEPEND="${RDEPEND}
 	)
 "
 
+PATCHES=( "${FILESDIR}/${P}-fix-meson-po.patch" )
+
 src_configure() {
 	xdg_environment_reset
 

diff --git a/dev-libs/appstream/files/appstream-0.11.5-fix-meson-po.patch b/dev-libs/appstream/files/appstream-0.11.5-fix-meson-po.patch
new file mode 100644
index 00000000000..2a37662e8f3
--- /dev/null
+++ b/dev-libs/appstream/files/appstream-0.11.5-fix-meson-po.patch
@@ -0,0 +1,14 @@
+Gentoo-bug: https://bugs.gentoo.org/640916
+Thanks-to: David Haller <gentoo@dhaller.de>
+
+--- a/po/meson.build	2017-09-04 18:09:52.000000000 +0200
++++ b/po/meson.build	2018-05-15 12:24:42.000000000 +0200
+@@ -21,7 +21,7 @@
+         'find ' + meson.current_source_dir() +
+         ' -type f' +
+         ' -iname "*.po"' +
+-        ' -printf \'%f\\n\'' +
++        ' -printf \'%f\n\'' +
+         ' | grep -oP \'.*(?=[.])\' | sort' +
+         ' > ' + join_paths(meson.current_source_dir(), 'LINGUAS')
+     ]


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/appstream/files/, dev-libs/appstream/
@ 2018-11-17 18:39 Andreas Sturmlechner
  0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2018-11-17 18:39 UTC (permalink / raw
  To: gentoo-commits

commit:     110872071b01b805f71afe6fdfb1bf0ac2c4f879
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 17 16:45:00 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 17 18:39:21 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11087207

dev-libs/appstream: Fix build with GCC-7.3.0

Reported-by: Oruriz <oruriz <AT> protonmail.com>
Thanks-to: Felix Tiede <info <AT> pc-tiede.de>
Closes: https://bugs.gentoo.org/670584
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-libs/appstream/appstream-0.12.2.ebuild         |  2 ++
 .../appstream/files/appstream-0.12.2-gcc-7.3.patch | 24 ++++++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/dev-libs/appstream/appstream-0.12.2.ebuild b/dev-libs/appstream/appstream-0.12.2.ebuild
index f2aa30c08f7..ff514c29496 100644
--- a/dev-libs/appstream/appstream-0.12.2.ebuild
+++ b/dev-libs/appstream/appstream-0.12.2.ebuild
@@ -43,6 +43,8 @@ DEPEND="${RDEPEND}
 	)
 "
 
+PATCHES=( "${FILESDIR}/${P}-gcc-7.3.patch" )
+
 src_prepare() {
 	default
 	sed -e "/^as_doc_target_dir/s/appstream/${PF}/" -i docs/meson.build || die

diff --git a/dev-libs/appstream/files/appstream-0.12.2-gcc-7.3.patch b/dev-libs/appstream/files/appstream-0.12.2-gcc-7.3.patch
new file mode 100644
index 00000000000..3eb8b0db877
--- /dev/null
+++ b/dev-libs/appstream/files/appstream-0.12.2-gcc-7.3.patch
@@ -0,0 +1,24 @@
+From 9252de815e4443d1b617211f38685afe7c0f6b0e Mon Sep 17 00:00:00 2001
+From: Matthias Klumpp <matthias@tenstral.net>
+Date: Sat, 20 Oct 2018 20:20:09 +0200
+Subject: [PATCH] Explicitly include string.h in as-tag.c
+
+This apparently is necessary to fix an FTBFS issue with older GCC
+releases. Resolves #207
+---
+ src/as-tag.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/as-tag.c b/src/as-tag.c
+index 6afba621..91076e69 100644
+--- a/src/as-tag.c
++++ b/src/as-tag.c
+@@ -32,6 +32,8 @@
+ 
+ #include "as-tag.h"
+ 
++#include <string.h>
++
+ #ifdef __clang__
+ #pragma clang diagnostic ignored "-Wmissing-field-initializers"
+ #endif


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/appstream/files/, dev-libs/appstream/
@ 2018-12-07 14:40 Andreas Sturmlechner
  0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2018-12-07 14:40 UTC (permalink / raw
  To: gentoo-commits

commit:     489516176274c2c99f8881ca92367b81774179e3
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  7 14:39:22 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Dec  7 14:39:22 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48951617

dev-libs/appstream: Drop old

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 dev-libs/appstream/Manifest                        |  2 -
 dev-libs/appstream/appstream-0.10.6-r1.ebuild      | 72 ----------------------
 dev-libs/appstream/appstream-0.12.2.ebuild         | 68 --------------------
 .../appstream/files/appstream-0.12.2-gcc-7.3.patch | 24 --------
 4 files changed, 166 deletions(-)

diff --git a/dev-libs/appstream/Manifest b/dev-libs/appstream/Manifest
index fc967ef5555..68f4f428e76 100644
--- a/dev-libs/appstream/Manifest
+++ b/dev-libs/appstream/Manifest
@@ -1,3 +1 @@
-DIST AppStream-0.12.2.tar.xz 1938868 BLAKE2B 968853e9d5f87ca2c1f894a6ffe5439f7fce611459243cd96d3859a15e225243585a1a43e90d8eca8271b91e1237d94eb4615b5c3c0543d9a37646b5fbd7d2fe SHA512 d5c95309d4fddb961f4a5b9ac460840e34d4bae0e256bd0be09ceeab0d45a3ac5254c9e9c183a1e6cb3983ce0a9d6d0e519908f612a5b135ed578ec26556e53d
 DIST AppStream-0.12.3.tar.xz 1940064 BLAKE2B a0160c4a922abfe315bdbfe6b7b32fea8d5eda5631347be4a39dcf102660ad26a3f40c5fed9dd0bdfb1b91956780ff7cf58e61d7f38b03d2f48a5bf67f2871f6 SHA512 3d54bb499e4056d341ffde2878549011708e6699b3ec58756ef2e4080864279ff5e5003224fcbad601007fd9296bb9ed062da7843e3e02272837ecc5d4c802f9
-DIST appstream-0.10.6.tar.gz 1821879 BLAKE2B 49e0476ef41c37d2e9bb12a7c046fcbb2cd8fcb1f521321dce4cda15e504a966cf59a1cbf56fc7359a82f677c54906ba041ad37eeb7f639ad69691e8d2ccd24c SHA512 9f8b4ddc39d580c62b166df0d9a2c5e4caac1b433d25a4e9118b7c73ceea5c7b1ff78f02d682a68cdfeb8da29e806a4838cfc11637fca2982f436af333605256

diff --git a/dev-libs/appstream/appstream-0.10.6-r1.ebuild b/dev-libs/appstream/appstream-0.10.6-r1.ebuild
deleted file mode 100644
index 02eef9f850b..00000000000
--- a/dev-libs/appstream/appstream-0.10.6-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils xdg-utils
-
-if [[ ${PV} = 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ximion/${PN}"
-else
-	inherit versionator
-	MY_PV="$(replace_all_version_separators '_')"
-	MY_P="APPSTREAM_${MY_PV}"
-	SRC_URI="https://github.com/ximion/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-	S="${WORKDIR}/${PN}-${MY_P}"
-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 APPSTREAM_LIB_API_LEVEL
-SLOT="0/4"
-IUSE="apt doc qt5 test"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/gobject-introspection
-	dev-libs/libxml2:2
-	dev-libs/libyaml
-	dev-libs/snowball-stemmer
-	qt5? ( dev-qt/qtcore:5 )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-	dev-util/itstool
-	sys-devel/gettext
-	test? (
-		qt5? ( dev-qt/qttest:5 )
-	)
-"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if ! use test; then
-		pushd qt > /dev/null || die
-		cmake_comment_add_subdirectory tests
-		popd > /dev/null || die
-	fi
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local mycmakeargs=(
-		-DSTEMMING=ON
-		-DL18N=ON
-		-DVAPI=OFF
-		-DMAINTAINER=OFF
-		-DSANITIZERS=OFF
-		-DDOCUMENTATION=OFF
-		-DAPT_SUPPORT=$(usex apt)
-		-DINSTALL_PREBUILT_DOCS=$(usex doc)
-		-DQT=$(usex qt5)
-	)
-
-	cmake-utils_src_configure
-}

diff --git a/dev-libs/appstream/appstream-0.12.2.ebuild b/dev-libs/appstream/appstream-0.12.2.ebuild
deleted file mode 100644
index ff514c29496..00000000000
--- a/dev-libs/appstream/appstream-0.12.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 ~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 +introspection qt5 test"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/libxml2:2
-	dev-libs/libyaml
-	dev-libs/snowball-stemmer
-	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
-	qt5? ( dev-qt/qtcore:5 )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.5
-	dev-libs/appstream-glib
-	dev-util/itstool
-	>=dev-util/meson-0.42.0
-	>=sys-devel/gettext-0.19.8
-	qt5? (
-		dev-qt/linguist-tools:5
-		test? ( dev-qt/qttest:5 )
-	)
-"
-
-PATCHES=( "${FILESDIR}/${P}-gcc-7.3.patch" )
-
-src_prepare() {
-	default
-	sed -e "/^as_doc_target_dir/s/appstream/${PF}/" -i docs/meson.build || die
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local emesonargs=(
-		-Dapidocs=false
-		-Ddocs=false
-		-Dmaintainer=false
-		-Dstemming=true
-		-Dvapi=false
-		-Dapt-support=$(usex apt 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.2-gcc-7.3.patch b/dev-libs/appstream/files/appstream-0.12.2-gcc-7.3.patch
deleted file mode 100644
index 3eb8b0db877..00000000000
--- a/dev-libs/appstream/files/appstream-0.12.2-gcc-7.3.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 9252de815e4443d1b617211f38685afe7c0f6b0e Mon Sep 17 00:00:00 2001
-From: Matthias Klumpp <matthias@tenstral.net>
-Date: Sat, 20 Oct 2018 20:20:09 +0200
-Subject: [PATCH] Explicitly include string.h in as-tag.c
-
-This apparently is necessary to fix an FTBFS issue with older GCC
-releases. Resolves #207
----
- src/as-tag.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/as-tag.c b/src/as-tag.c
-index 6afba621..91076e69 100644
---- a/src/as-tag.c
-+++ b/src/as-tag.c
-@@ -32,6 +32,8 @@
- 
- #include "as-tag.h"
- 
-+#include <string.h>
-+
- #ifdef __clang__
- #pragma clang diagnostic ignored "-Wmissing-field-initializers"
- #endif


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/appstream/files/, dev-libs/appstream/
@ 2021-03-26 21:14 Andreas Sturmlechner
  0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2021-03-26 21:14 UTC (permalink / raw
  To: gentoo-commits

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


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/appstream/files/, dev-libs/appstream/
@ 2023-01-25  8:25 Andreas Sturmlechner
  0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2023-01-25  8:25 UTC (permalink / raw
  To: gentoo-commits

commit:     85882759da4eb2b00c11bbfd2c44cfd5903f257e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 25 08:21:37 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 25 08:21:37 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85882759

dev-libs/appstream: drop 0.15.5

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-libs/appstream/Manifest                        |  1 -
 dev-libs/appstream/appstream-0.15.5.ebuild         | 79 ----------------------
 .../appstream-0.14.3-disable-Werror-flags.patch    | 12 ----
 3 files changed, 92 deletions(-)

diff --git a/dev-libs/appstream/Manifest b/dev-libs/appstream/Manifest
index c4334da85342..2e213f107408 100644
--- a/dev-libs/appstream/Manifest
+++ b/dev-libs/appstream/Manifest
@@ -1,2 +1 @@
-DIST AppStream-0.15.5.tar.xz 2499336 BLAKE2B a0710d1ef2756480fa814c8b740d066e1b06dffe6a3396a44697876372dc9d0f39088ff141817af549d0cf0ad99221e68305344dfdeb82e246f7cda18c3b63a7 SHA512 83202a8db9a31e4328b2a831b02e65389aad1ba95a4c2b2709084fb843cb3675af6fac73f932a31bb3a6d3ff5db85a863c01528be67d9bbd3b9614a978239771
 DIST AppStream-0.15.6.tar.xz 2517688 BLAKE2B 09519205c7dfc5f0715b9d5ae7e99a67673ab499f1e2cb39815edde64defc1aa5059215575278bbcfc4482cd385a79e081c70f6acea3c446c5869dc6b2e18f6c SHA512 7426bc89e22b751de7b3e27d7c07eb1c373f4439f9966868ce5ea410d209b8c5292e03695a34b7a49bfa61e2e62265c7f7cdffc0be871c950193c933f65757ef

diff --git a/dev-libs/appstream/appstream-0.15.5.ebuild b/dev-libs/appstream/appstream-0.15.5.ebuild
deleted file mode 100644
index 8978b5465107..000000000000
--- a/dev-libs/appstream/appstream-0.15.5.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2022 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}"/${PN}-0.14.3-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.14.3-disable-Werror-flags.patch b/dev-libs/appstream/files/appstream-0.14.3-disable-Werror-flags.patch
deleted file mode 100644
index 4e5a117061b4..000000000000
--- 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


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/appstream/files/, dev-libs/appstream/
@ 2024-05-14 17:41 Andreas Sturmlechner
  0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2024-05-14 17:41 UTC (permalink / raw
  To: gentoo-commits

commit:     2ced313913e1150158de9d6ac7dc1a6494b52cf3
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue May 14 17:35:37 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue May 14 17:40:33 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ced3139

dev-libs/appstream: drop 0.15.6

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-libs/appstream/Manifest                        |  1 -
 dev-libs/appstream/appstream-0.15.6.ebuild         | 77 ----------------------
 .../appstream-0.15.6-disable-Werror-flags.patch    | 46 -------------
 3 files changed, 124 deletions(-)

diff --git a/dev-libs/appstream/Manifest b/dev-libs/appstream/Manifest
index 14e5aa16b233..460e8ece43db 100644
--- a/dev-libs/appstream/Manifest
+++ b/dev-libs/appstream/Manifest
@@ -1,3 +1,2 @@
-DIST AppStream-0.15.6.tar.xz 2517688 BLAKE2B 09519205c7dfc5f0715b9d5ae7e99a67673ab499f1e2cb39815edde64defc1aa5059215575278bbcfc4482cd385a79e081c70f6acea3c446c5869dc6b2e18f6c SHA512 7426bc89e22b751de7b3e27d7c07eb1c373f4439f9966868ce5ea410d209b8c5292e03695a34b7a49bfa61e2e62265c7f7cdffc0be871c950193c933f65757ef
 DIST AppStream-0.16.4.tar.xz 2570176 BLAKE2B ac051b846fd1c7b0cbb3429e0b4c3f81027cddb35ee6bcd5e9d38a09d937abcc37ac4908f68ec55404ae852fd146b4e749832d3ac96443458e86cfe506a6fed4 SHA512 e3a9fc423fe5a2baaaa002871566f320ecd6dbd3a01ab24221afe9b93a69e9afb6bed6d7772c434376501803dc7b2c80b79eda849fcaf4748f9f24a5908a22a8
 DIST AppStream-1.0.2.tar.xz 2629708 BLAKE2B eb31e675cea1c8b9357227c851bdd24f9cb949e232089380a8727630ab8055f0de6bebd74f70f3c1cf84e5420b9d4fef681671a0e4e97265af26d594b2874c48 SHA512 e5c109c383e3bf3af3693bfb3146663767c2c61fac0bd421f2ce52242fe7b869effeacc4d207987321dfeb4ab0ba77ece6c1c6eea054a7365204cd955426517a

diff --git a/dev-libs/appstream/appstream-0.15.6.ebuild b/dev-libs/appstream/appstream-0.15.6.ebuild
deleted file mode 100644
index 22035505fdee..000000000000
--- a/dev-libs/appstream/appstream-0.15.6.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.15.6-disable-Werror-flags.patch b/dev-libs/appstream/files/appstream-0.15.6-disable-Werror-flags.patch
deleted file mode 100644
index ca50493e4fd6..000000000000
--- a/dev-libs/appstream/files/appstream-0.15.6-disable-Werror-flags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- a/meson.build	2022-12-22 23:48:12.000000000 +0100
-+++ b/meson.build	2022-12-24 22:15:49.620891586 +0100
-@@ -95,43 +95,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',
--  language: 'cpp'
--)
- add_project_arguments('-DAS_COMPILATION', language: 'c')
- 
- # Vendor extensions in system headers


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2024-05-14 17:41 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-18 16:44 [gentoo-commits] repo/gentoo:master commit in: dev-libs/appstream/files/, dev-libs/appstream/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2018-11-17 18:39 Andreas Sturmlechner
2018-12-07 14:40 Andreas Sturmlechner
2021-03-26 21:14 Andreas Sturmlechner
2023-01-25  8:25 Andreas Sturmlechner
2024-05-14 17:41 Andreas Sturmlechner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox