public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/shared-mime-info/
Date: Wed, 30 Mar 2022 04:11:44 +0000 (UTC)	[thread overview]
Message-ID: <1648610245.5b5534feec1ab9b284d9aa52af2b3d79b3acb5e9.sam@gentoo> (raw)

commit:     5b5534feec1ab9b284d9aa52af2b3d79b3acb5e9
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 29 23:55:07 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Mar 30 03:17:25 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b5534fe

x11-misc/shared-mime-info: add 2.2

Now with tests! Hopefully won't need at least some of these hacks
for much longer for xdgmime as Eli Schwartz is working on a Meson
port for it.

This isn't ideal but it's better than before when we didn't even
try running the xdgmime bits.

Bug: https://gitlab.freedesktop.org/xdg/xdgmime/-/merge_requests/25
Signed-off-by: Sam James <sam <AT> gentoo.org>

 x11-misc/shared-mime-info/Manifest                 |  2 +
 .../shared-mime-info/shared-mime-info-2.2.ebuild   | 93 ++++++++++++++++++++++
 2 files changed, 95 insertions(+)

diff --git a/x11-misc/shared-mime-info/Manifest b/x11-misc/shared-mime-info/Manifest
index c111c1487da2..3585101d2d2f 100644
--- a/x11-misc/shared-mime-info/Manifest
+++ b/x11-misc/shared-mime-info/Manifest
@@ -1 +1,3 @@
 DIST shared-mime-info-2.1.tar.xz 5202496 BLAKE2B e8dfc7efe78feb5a38c8115a2b332f46c3dac2f89dffad0834fa7b77560b3ef528e779ab9e42822288f85d8c434fd590859db682f3f99494aa6a4387c985e912 SHA512 87e308281e83c4cf889594f7c2e8dcb4d0d0d3910124c3816fdb886ba7d6113b2581711adcb17032b47f9b8d8b7001fab58daa52b7da7c0ef87915e341d6f1b0
+DIST shared-mime-info-2.2.tar.gz 7064139 BLAKE2B 5e791893a60d64a8a1d421c1fabb5e214c6e34ae975d232a9d695b998e8e9aafb6449e858fd845feb120e170bf7c77f70c1fc23e3d4cf8e7c49c6e92418cab96 SHA512 490d96daf4214ab6ac537761b67f3ff4716b95d7ea3fedd2e2ab7b0b02d946acad49790a25efcb5e949551dc4c39ba08911e59f06b198b61dcb1bc44799a2b2e
+DIST xdgmime-92f6a09fda2b23c2ab95cede8eb0612ca96bd0f7.tar.gz 32703 BLAKE2B 865ff57c566b60fb2bd6cb37e259800ee72fb4b9f2d135db46e9a40206946677a7b50bfb8f13d9ce1493bac972e8a5230d7caa833733f3a8d8631e844a648436 SHA512 90abe20483d5ae2131d18740fffbc57c94470be99e9ea1b04e13bffaf3dda4aa9145cb92bb4defe0a655c0bdbd630aaa325e7a9095b9599faebb751699b9cdd8

diff --git a/x11-misc/shared-mime-info/shared-mime-info-2.2.ebuild b/x11-misc/shared-mime-info/shared-mime-info-2.2.ebuild
new file mode 100644
index 000000000000..3d31957ca47c
--- /dev/null
+++ b/x11-misc/shared-mime-info/shared-mime-info-2.2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson toolchain-funcs xdg-utils
+
+# Keep an eye on https://gitlab.freedesktop.org/xdg/xdgmime/-/merge_requests/25!
+# xdgmime is used for tests but doesn't make releases nowadays; do what
+# Fedora does and use a snapshot so we can run the test suite.
+MY_XDGMIME_COMMIT="92f6a09fda2b23c2ab95cede8eb0612ca96bd0f7"
+DESCRIPTION="The Shared MIME-info Database specification"
+HOMEPAGE="https://gitlab.freedesktop.org/xdg/shared-mime-info"
+SRC_URI="https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/${PV}/${P}.tar.gz"
+SRC_URI+=" test? ( https://gitlab.freedesktop.org/xdg/xdgmime/-/archive/${MY_XDGMIME_COMMIT}/xdgmime-${MY_XDGMIME_COMMIT}.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/xmlto
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/libxml2
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( HACKING.md NEWS README.md )
+
+src_prepare() {
+	default
+
+	if use test ; then
+		# Drop empty dir (it's a submodule in upstream git repo)
+		rm -r "${S}"/xdgmime || die
+		# Lead Meson to our snapshot
+		ln -s "${WORKDIR}"/xdgmime-${MY_XDGMIME_COMMIT} xdgmime || die
+		# Don't break parallel make
+		sed -i -e 's:make:$(MAKE):' xdgmime/Makefile || die
+	fi
+}
+
+src_configure() {
+	# We have to trick Meson into thinking it's there now so that
+	# we can run meson then emake to build xdgmime later, rather than
+	# building before running meson which would mean doing something
+	# unexpected in src_configure.
+	if use test ; then
+		# Paths from https://gitlab.freedesktop.org/xdg/shared-mime-info/-/blob/master/meson.build#L29
+		touch xdgmime/src/{print,test}-mime{,-data} || die
+		chmod +x xdgmime/src/{print,test}-mime{,-data} || die
+	fi
+
+	local emesonargs=(
+		-Dbuild-tools=true
+		-Dupdate-mimedb=false
+	)
+
+	meson_src_configure
+}
+
+src_compile() {
+	if use test ; then
+		tc-export CC
+
+		# xdgmime only has a homebrew Makefile
+		emake -C xdgmime
+	fi
+
+	meson_src_compile
+}
+
+src_install() {
+	meson_src_install
+
+	# in prefix, install an env.d entry such that prefix patch is used/added
+	if use prefix; then
+		echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share\"" > "${T}"/50mimeinfo || die
+		doenvd "${T}"/50mimeinfo
+	fi
+}
+
+pkg_postinst() {
+	use prefix && export XDG_DATA_DIRS="${EPREFIX}"/usr/share
+	xdg_mimeinfo_database_update
+}


             reply	other threads:[~2022-03-30  4:11 UTC|newest]

Thread overview: 108+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-30  4:11 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-02-22  4:45 [gentoo-commits] repo/gentoo:master commit in: x11-misc/shared-mime-info/ Ionen Wolkens
2024-02-06 20:13 Sam James
2024-02-06 19:29 Sam James
2024-02-06  5:04 Sam James
2024-02-06  5:04 Sam James
2024-02-06  5:04 Sam James
2024-02-06  4:56 Sam James
2024-02-06  4:56 Sam James
2023-11-12 22:39 Sam James
2023-11-08 19:48 Andreas Sturmlechner
2023-10-15 12:38 Sam James
2023-10-15 12:38 Sam James
2022-05-05 16:48 Jakov Smolić
2022-05-04  8:16 WANG Xuerui
2022-04-29  4:06 Sam James
2022-04-29  4:06 Sam James
2022-04-29  4:06 Sam James
2022-04-29  3:30 Sam James
2022-04-22 15:20 Agostino Sarubbo
2022-04-20 23:53 Sam James
2022-04-20 23:53 Sam James
2021-10-07  6:37 Sam James
2021-09-09  7:39 Agostino Sarubbo
2021-09-09  7:17 Agostino Sarubbo
2021-09-08  0:46 Sam James
2021-09-08  0:46 Sam James
2021-09-08  0:46 Sam James
2021-09-08  0:42 Sam James
2021-09-07 17:00 Sam James
2021-09-07 14:08 Pacho Ramos
2021-04-05 22:19 Sam James
2021-01-07 16:52 Sam James
2021-01-07 10:09 Sam James
2021-01-06 12:05 Fabian Groffen
2021-01-06  8:09 Sam James
2021-01-06  8:09 Sam James
2021-01-04 19:40 Sergei Trofimovich
2021-01-04 19:37 Sergei Trofimovich
2021-01-04 17:39 Sam James
2021-01-01  3:32 Sam James
2020-12-27 18:29 Fabian Groffen
2020-08-31 14:26 Yixun Lan
2020-06-19  8:35 Lars Wendler
2020-06-15 19:49 Lars Wendler
2020-06-15 15:06 Lars Wendler
2020-06-15 14:35 Lars Wendler
2020-06-15 13:47 Lars Wendler
2020-06-15 12:23 Lars Wendler
2020-05-29 20:42 Sergei Trofimovich
2020-05-28 15:45 Agostino Sarubbo
2020-05-28 15:43 Agostino Sarubbo
2020-05-28 15:42 Agostino Sarubbo
2020-05-28 15:40 Agostino Sarubbo
2020-05-28 15:39 Agostino Sarubbo
2020-05-28 15:37 Agostino Sarubbo
2020-05-28 12:32 Agostino Sarubbo
2020-05-23 13:34 Andreas Sturmlechner
2020-04-19 15:59 Andreas Sturmlechner
2019-12-08  5:32 Matt Turner
2019-11-27 20:15 Sergei Trofimovich
2019-11-22 13:44 Matt Turner
2019-11-20 23:14 Aaron Bauman
2019-11-20 15:40 Agostino Sarubbo
2019-11-20 11:50 Agostino Sarubbo
2019-11-20 11:48 Agostino Sarubbo
2019-11-20 11:35 Agostino Sarubbo
2019-11-20 11:27 Agostino Sarubbo
2019-11-20 11:21 Agostino Sarubbo
2019-11-20 11:16 Agostino Sarubbo
2019-05-04 18:29 Andreas K. Hüttel
2019-05-02 15:37 Mike Gilbert
2019-05-01 15:51 Mike Gilbert
2019-05-01 15:51 Mike Gilbert
2018-10-20 11:26 Markus Meier
2018-10-14 11:07 Mikle Kolyada
2018-10-12  7:32 Tobias Klausmann
2018-10-06 19:46 Matt Turner
2018-10-06 19:46 Matt Turner
2018-09-30 23:03 Mart Raudsepp
2018-09-30 21:38 Sergei Trofimovich
2018-09-28  7:42 Mikle Kolyada
2018-09-25  6:35 Sergei Trofimovich
2018-09-24 21:26 Sergei Trofimovich
2018-09-24  1:50 Thomas Deutschmann
2018-07-04  9:28 Lars Wendler
2018-05-24 17:18 Mike Frysinger
2018-04-05 21:07 Sergei Trofimovich
2018-04-05 12:39 Mart Raudsepp
2018-03-17  0:22 Michael Palimaka
2018-03-15 13:41 Mikle Kolyada
2018-02-06 18:36 Thomas Deutschmann
2018-01-29 15:51 Tobias Klausmann
2017-12-25 11:01 Sergei Trofimovich
2017-12-24 11:11 Sergei Trofimovich
2017-12-21 11:05 Sergei Trofimovich
2017-12-18 16:18 Jason Zaman
2017-09-19 17:15 Manuel Rüger
2017-07-26 19:51 Markus Meier
2017-06-30  8:23 Sergei Trofimovich
2017-06-28 13:19 Agostino Sarubbo
2017-03-07  9:14 David Seifert
2017-02-20 14:11 Michael Haubenwallner
2016-12-08 20:55 Justin Lecher
2016-09-07 14:50 Manuel Rüger
2016-09-07 14:50 Manuel Rüger
2016-02-27 10:03 Manuel Rüger
2015-10-05 22:58 Manuel Rüger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1648610245.5b5534feec1ab9b284d9aa52af2b3d79b3acb5e9.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox