diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-11-08 22:21:23 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-11-08 22:21:23 +0000 |
commit | 4f8c8df3b07b6ea3556ab2bc7b252213bbdab3f3 (patch) | |
tree | da90388e25f27949d16131813690edb36c53aa81 /x11-misc | |
parent | 413ca4e6c2089d8b5e0844c26cf5671209226b93 (diff) |
gentoo auto-resync : 08:11:2023 - 22:21:23
Diffstat (limited to 'x11-misc')
-rw-r--r-- | x11-misc/Manifest.gz | bin | 46717 -> 46717 bytes | |||
-rw-r--r-- | x11-misc/shared-mime-info/Manifest | 4 | ||||
-rw-r--r-- | x11-misc/shared-mime-info/files/shared-mime-info-2.1-itstool.patch | 82 | ||||
-rw-r--r-- | x11-misc/shared-mime-info/shared-mime-info-2.1.ebuild | 51 | ||||
-rw-r--r-- | x11-misc/shared-mime-info/shared-mime-info-2.3.ebuild | 94 |
5 files changed, 0 insertions, 231 deletions
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz Binary files differindex bf80dd6e6cc0..6d2ab3d2df59 100644 --- a/x11-misc/Manifest.gz +++ b/x11-misc/Manifest.gz diff --git a/x11-misc/shared-mime-info/Manifest b/x11-misc/shared-mime-info/Manifest index fa46e2ae1f9a..0a74e4375064 100644 --- a/x11-misc/shared-mime-info/Manifest +++ b/x11-misc/shared-mime-info/Manifest @@ -1,14 +1,10 @@ -AUX shared-mime-info-2.1-itstool.patch 2841 BLAKE2B 4198fa232a034cf2c71f18973c0223af4944bc443c2b642e095cd842c8f206c20812d98d1466d50f345e35c8f61b213a58d711a3b7e515820c462e143dce9904 SHA512 af6772dc8bcceebcdc965e30f626b5ea415bbb0facff9ecaab6fadc23dbdc9ee0d72f588ac0d9637bcdf5930f30bd21102145e56def080cb946cd0f9b027a4b0 AUX shared-mime-info-2.3-clang-string-literal.patch 1319 BLAKE2B b929683d915ff7635458aa1bbb8e0e6c2a738e2dab4d670096597f1b847317a277375cb1cfd9b6efa9af4e62c8432568d9469feecc51c26872be2a29356603e8 SHA512 70369c51b83c3dece1969918aa894cfe6708b7bef21cacf7468ed2bd353dc9b61163548ec9ede161d118095180ce0d831124347a373bfa4853ceb8566dc5a18c AUX shared-mime-info-2.3-fsync-detection.patch 2022 BLAKE2B 52eda0b6ef9dbba0bafd98860a017952c88243dad8379b6fb619d64ff65108cf906d0d11e548c70ff0c1bb51972a50d833896721d092884a710b8b03a31b0428 SHA512 dc5efa6af36059d8353c6c24ab60da7d6a91e6ea5463fb61bdb91a5853841775c37854447fa433289a2b9dac7384cfcd10894fa9329b131df847fe896616bab8 AUX shared-mime-info-2.3-wformat.patch 9794 BLAKE2B 525e64c3f4327c50a7d4b7439f058898bc80a58e2561d82029c6c060c88c7701fa4e60aa0d6b9beaf51c87d1dab50f3a911c5e35537119d3b3e90742242ed0d7 SHA512 deac4f195f78f99dfa257d8e647197e7e4b2d599f14f2b4a68e34286bdf133e870fe0426a3180f6f30d05b68c978e2150497d97c179ce263a1ce4c2a092935d2 -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 DIST xdgmime-92f6a09fda2b23c2ab95cede8eb0612ca96bd0f7.tar.gz 32703 BLAKE2B 865ff57c566b60fb2bd6cb37e259800ee72fb4b9f2d135db46e9a40206946677a7b50bfb8f13d9ce1493bac972e8a5230d7caa833733f3a8d8631e844a648436 SHA512 90abe20483d5ae2131d18740fffbc57c94470be99e9ea1b04e13bffaf3dda4aa9145cb92bb4defe0a655c0bdbd630aaa325e7a9095b9599faebb751699b9cdd8 -EBUILD shared-mime-info-2.1.ebuild 1260 BLAKE2B 5041b205fd7c83f024fe47af09c9d3312aca1d13f9729be402d6778448dbccdd7723574f2d80c91f7cef61407b5a8bd15b13771943785c45b7c68be0af02c9df SHA512 49a6ee43193657b7a98dfd2b9e27ce80557e14f49c1dfdcc28b1c4ed8c8b35865f2e3d1029f76032923d06b81d98d301a90ae2cad0092bdd50b70f75ce77002a EBUILD shared-mime-info-2.2.ebuild 2590 BLAKE2B 53f29bbfbe47f5304f75cfd3b48b111eb95c58c02a10ee6683c678be82f89ca713242d5863f46988020e93587b060a6acdec11ff44699eb4a1df95b86b42adb2 SHA512 f47451d4bf4adb1cb5c07f4c46cdb89cc9d429f112207a8b7dc322f7631eb46957eecd79c7fe1ab49f877afffd9d558a412d6dbf220f06da8a99c9d95cd80e0c EBUILD shared-mime-info-2.3-r1.ebuild 2816 BLAKE2B 4af2e85d620e9b9c8ad47d29067b3ba13b14b144892567fcfa6f64d132006a4fe0f3b2a7d8864fc2d6fd3e92d5f9a5e6f69c036ae573ece37b924172804cd552 SHA512 ef79fe6edecb78b7a92449ad1e5a33cc42e7318235d66826bb1d9c7ac04e9830e290ab02914de5ad4dc1a90664581e649c82c8d193299dadfcb51050fd24d3af -EBUILD shared-mime-info-2.3.ebuild 2680 BLAKE2B 5a94b911ae679aca8c7d9ead5c8a43347406fb94d0902c62912189d3241b7e726779fb15ce5634f7b5885040f9c582fe746f99b909426e1645663b52b3533694 SHA512 ea339bc3fac97c73fc5099ac99df6a0148366d2fe9b50c309d735c2a92ad976a6401f4a0daf249fc27727e8e66f4245b6615e1ef4c48b1b946b05a7bbc3409eb MISC metadata.xml 326 BLAKE2B f1dab1cfd169c5cb1be051aafeff74601494801bf89257f2727ebfc7999392bfc4dbb94af165a52f045ea4b7d9b178ae8f658123f4d9ec22aae50f9e4470845e SHA512 0c0d4f09ec5bcbbc9bb592c4676761524ce38094d62a2da3dfb1618e9ef933a599770e78fe5a94e0f9c5b7b295742fb39c2484cd07f641fd041aa68fe41b38c8 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 -} diff --git a/x11-misc/shared-mime-info/shared-mime-info-2.3.ebuild b/x11-misc/shared-mime-info/shared-mime-info-2.3.ebuild deleted file mode 100644 index 82a520646c8e..000000000000 --- a/x11-misc/shared-mime-info/shared-mime-info-2.3.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson xdg-utils - -# 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="179296748e92bd91bf531656632a1056307fb7b7" -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.bz2" -SRC_URI+=" test? ( https://gitlab.freedesktop.org/xdg/xdgmime/-/archive/${MY_XDGMIME_COMMIT}/xdgmime-${MY_XDGMIME_COMMIT}.tar.bz2 )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-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 - mkdir "${WORKDIR}"/xdgmime_build || die - ln -s "${WORKDIR}"/xdgmime_build 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 - mkdir xdgmime/src || die - touch xdgmime/src/{print,test}-mime{,-data} || die - chmod +x xdgmime/src/{print,test}-mime{,-data} || die - - BUILD_DIR="${WORKDIR}"/xdgmime_build EMESON_SOURCE="${WORKDIR}"/xdgmime-${MY_XDGMIME_COMMIT} meson_src_configure - fi - - local emesonargs=( - -Dbuild-tools=true - -Dupdate-mimedb=false - $(meson_use test build-tests) - ) - - meson_src_configure -} - -src_compile() { - if use test ; then - meson_src_compile -C "${WORKDIR}"/xdgmime_build - 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 -} |