summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2023-11-07 16:43:58 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2023-11-08 20:46:56 +0100
commit58adc7f5df1fcf3349c51f3bf9ad5e63d0a679d0 (patch)
treeadd10a20dd66a72d38f20b6cda240c0c7f448548 /x11-misc/shared-mime-info
parentdev-cpp/kokkos: drop 3.7.1 (diff)
downloadgentoo-58adc7f5df1fcf3349c51f3bf9ad5e63d0a679d0.tar.gz
gentoo-58adc7f5df1fcf3349c51f3bf9ad5e63d0a679d0.tar.bz2
gentoo-58adc7f5df1fcf3349c51f3bf9ad5e63d0a679d0.zip
x11-misc/shared-mime-info: drop 2.1
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'x11-misc/shared-mime-info')
-rw-r--r--x11-misc/shared-mime-info/Manifest1
-rw-r--r--x11-misc/shared-mime-info/files/shared-mime-info-2.1-itstool.patch82
-rw-r--r--x11-misc/shared-mime-info/shared-mime-info-2.1.ebuild51
3 files changed, 0 insertions, 134 deletions
diff --git a/x11-misc/shared-mime-info/Manifest b/x11-misc/shared-mime-info/Manifest
index a5b540e169ce..29c3f2f475c9 100644
--- a/x11-misc/shared-mime-info/Manifest
+++ b/x11-misc/shared-mime-info/Manifest
@@ -1,4 +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 shared-mime-info-2.3.tar.bz2 6643480 BLAKE2B 2a3adc0568d1be5a17e5a1533f3c4620c6f9d97069ad9e0a0b26ac241c7b14f7d3b9200534df7e1c2295a561d5e049ce8edf8a1e96d2f4e2040508545172a351 SHA512 f1959933e93373ee6939b289d0c3c35d527ce6803865558e4a8bcb5a0183df2fc1148bbf58bfe9a97342e7125f2e0e39ac5dd3bae998510396d9b6c96a330762
DIST xdgmime-179296748e92bd91bf531656632a1056307fb7b7.tar.bz2 28123 BLAKE2B ea107dba0819027e4a0a486db00e76f50a4e32e8e84f366b81490e213456e2c7e1c4a92cc4f92173dd6f94f257455bdcb77e3eb7d0ce8fb699c948d2d5b01f0d SHA512 efccff2672efb3ff0e44e83cfbaf6e2b926146e4a9d6132b14e2d7a88d602af340b3948793306ce5f720ac8b09e5d37d3b356a0cc269e8240b382558c9a3cf10
diff --git a/x11-misc/shared-mime-info/files/shared-mime-info-2.1-itstool.patch b/x11-misc/shared-mime-info/files/shared-mime-info-2.1-itstool.patch
deleted file mode 100644
index dedeb61e29cf..000000000000
--- a/x11-misc/shared-mime-info/files/shared-mime-info-2.1-itstool.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 5a406b06792e26a83c7346b3c2443c0bd8d4cdb2 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz@archlinux.org>
-Date: Mon, 8 Nov 2021 18:22:47 -0500
-Subject: [PATCH] migrate from custom itstool to builtin msgfmt for creating
- translated XML
-
-gettext upstream has supported this for a very long time (since 0.19.7
-via commit b3c2a5a242c36fbbaa0c5b17f975d6c638598a23, released in 2015),
-and itstool is (mostly) a legacy of the time before gettext had proper
-support for these sorts of use cases.
-
-This is similar to the state of intltool, which is described at
-https://wiki.gnome.org/MigratingFromIntltoolToGettext
-
-During the port from autotools to meson, the legacy use of itstool was
-faithfully translated to meson in the only way possible: by jumping
-through hoops to run ninja inside ninja in order to generate the .mo
-files for itstool, because meson's i18n module used a flawed design and
-there was no "real" target to create those files, only a .PHONY
-run_target which other rules cannot depend on.
-
-Although meson 0.60.0 added support for real targets for the built .mo
-files, this changed the rules for output filenames, breaking the script.
-
-But msgfmt does not care, and anyways comes with builtin meson functions
-for convenient use with XML files. So let's take this opportunity to
-drop legacy dependencies and use the modern, builtin tooling, which
-fixes this bug as a side effect.
-
-Fixes #170
----
- .gitlab-ci.yml | 2 --
- README.md | 2 +-
- data/freedesktop_generate.sh | 12 ------------
- data/meson.build | 16 +++++-----------
- meson.build | 1 -
- 5 files changed, 6 insertions(+), 27 deletions(-)
- delete mode 100755 data/freedesktop_generate.sh
-
-diff --git a/data/meson.build b/data/meson.build
-index 24361c9..09ed7a9 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -1,18 +1,12 @@
-
- install_man('update-mime-database.1')
-
--freedesktop_org_xml = custom_target('freedesktop.org.xml',
-- input : files(
-- 'freedesktop.org.xml.in',
-- 'its/shared-mime-info.its',
-- 'its/shared-mime-info.loc',
-- ),
-+freedesktop_org_xml = i18n.merge_file(
-+ input: 'freedesktop.org.xml.in',
- output: 'freedesktop.org.xml',
-- command: [
-- find_program('freedesktop_generate.sh'),
-- meson.source_root(),
-- meson.build_root()
-- ],
-+ data_dirs: '.',
-+ po_dir: '../po',
-+ type: 'xml',
- install: true,
- install_dir: get_option('datadir') / 'mime' / 'packages',
- )
-diff --git a/meson.build b/meson.build
-index 0d08c8a..60f17ae 100644
---- a/meson.build
-+++ b/meson.build
-@@ -20,7 +20,6 @@
- ###############################################################################
- # Find tools
-
--itstool = find_program('itstool')
- xmllint = find_program('xmllint')
- xmlto = find_program('xmlto')
-
---
-GitLab
-
diff --git a/x11-misc/shared-mime-info/shared-mime-info-2.1.ebuild b/x11-misc/shared-mime-info/shared-mime-info-2.1.ebuild
deleted file mode 100644
index e77479e728a4..000000000000
--- a/x11-misc/shared-mime-info/shared-mime-info-2.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-HASH=0ee50652091363ab0d17e335e5e74fbe # don't forget to update on version bumps
-inherit meson xdg-utils
-
-DESCRIPTION="The Shared MIME-info Database specification"
-HOMEPAGE="https://gitlab.freedesktop.org/xdg/shared-mime-info"
-SRC_URI="https://gitlab.freedesktop.org/xdg/${PN}/uploads/${HASH}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-# requires installed xdgmime binary
-RESTRICT="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 )
-
-PATCHES=(
- "${FILESDIR}/shared-mime-info-2.1-itstool.patch"
-)
-
-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
-}