From 2a8d2f71d1d9963368e0ef3d641d75979a689d12 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 4 Jul 2024 08:06:08 +0100 Subject: gentoo auto-resync : 04:07:2024 - 08:06:07 --- x11-misc/Manifest.gz | Bin 46545 -> 46546 bytes x11-misc/xdg-utils/Manifest | 2 + .../xdg-utils/files/xdg-utils-1.2.1-qtpaths.patch | 21 ++++ x11-misc/xdg-utils/xdg-utils-1.2.1-r3.ebuild | 106 +++++++++++++++++++++ 4 files changed, 129 insertions(+) create mode 100644 x11-misc/xdg-utils/files/xdg-utils-1.2.1-qtpaths.patch create mode 100644 x11-misc/xdg-utils/xdg-utils-1.2.1-r3.ebuild (limited to 'x11-misc') diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz index 3896980ab368..55c895896468 100644 Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ diff --git a/x11-misc/xdg-utils/Manifest b/x11-misc/xdg-utils/Manifest index 83d5c9c6c916..f37d4a8723c2 100644 --- a/x11-misc/xdg-utils/Manifest +++ b/x11-misc/xdg-utils/Manifest @@ -1,3 +1,4 @@ +AUX xdg-utils-1.2.1-qtpaths.patch 991 BLAKE2B a92ec814aa414fe2ed9ee17ef3607053c7a292b285005e74eb96221924df9ba4d4d49c60d829523585194c64460fd962c2334dbb2efce4e4886a44852b9aed89 SHA512 22dffe018f8649d1d61f8f9c75e76b98efb75395f317d39234b114d9314e9b020734726f35404ad91dbc69c1a651af63fe0509147be73ee94a6ce635839a2ee6 AUX xdg-utils-1.2.1-xdg-mime-default.patch 5034 BLAKE2B 0eb35b1abd650e442c50cfd52d8801e4fbb36813aeac67b4dcd8d1d39eba08ca02f4bf2189242b848da481ba57ebe96ad849bde8ce52ff73b015fb3be5610d93 SHA512 0e57d5cf9fa9969738c1d836c4c3b644cc6e1e80cd7486ec5ca0fdb2c86f0f5e3988c4790faf1838ad09946803347a96c0fd47373c5971c691c20d4913845ad1 AUX xdg-utils-egrep.patch 760 BLAKE2B 641a75615aa54000acee26ad65e802245c12db388f372b1f7cfe4df29c025a8eb5e4523ef89a6e209e00c7ec0288c799f16a5d4ac04fa25da3375d2d128b1de2 SHA512 80976c70974c670432a48ab467ca68126f699816914b806a65f48b234c631cc470b7399b389a15a6181a0fbbf486692d0583f791c0592bdc70186df319075ac6 DIST xdg-utils-1.1.3_p20200220-no-which.patch.xz 5576 BLAKE2B cf8c3111689c355add2a0c16a887fd463dc2d00c267cac0561d4598430f043d19fea376859aa4ff521273ff788b4e8afdea5ef6e7b0ba51ffded23be2ad61335 SHA512 c30e512e8caae3f4d2282592722bc24e08cb33f5ec01d5504d2e49833c1598fe27807c095dc2226efca57dcbef4d2883fd9bfa46fb8eeee93c53f9880c050b51 @@ -6,4 +7,5 @@ DIST xdg-utils-v1.2.1.tar.bz2 293386 BLAKE2B 9d6ce4be8c27ad5b8d0ae55ad0d8b4457b5 EBUILD xdg-utils-1.1.3_p20210805-r2.ebuild 2424 BLAKE2B 44c105b594dcff348860cfdb915e1b18bfc028a9bc8a0a5c8ae33f7d9e67b6bca2b15360b908a921fc1e9629569152f6adbe81ff335f07d558b8d60b3029c7c6 SHA512 c944a53cc3a5f2c81f8e33bf39aea958ae95398f862f30a21636a1729b8bd196c0d7d4766ea25a501189edbb25fc194c75f4e62913faab8cb5d4862bb77bc865 EBUILD xdg-utils-1.2.1-r1.ebuild 2291 BLAKE2B b475167f8817c813c3bd844d3fd8d718fcfe96b8728a776e175494850ce42c522bade72c01b18407a594bf1b8698706b14445f8cf2419fb9a0ddea06aaeb67cc SHA512 c60238c0eff9b66984548046d26ef28bbccbdcd88adbce6138021f40b5880f5761fd99e464155e526e1a1e32d2e0057090d59a0db0aaf9597145ce829db5634c EBUILD xdg-utils-1.2.1-r2.ebuild 2354 BLAKE2B 17d67a1157da0cf87137feea2d4a91c8e290b0e1927bb218b4b3aa5ba87a4f7effce4dc824b279c597cf78e7814d572fae6fc246cd8e702ad6acc9f2bb7a6d1a SHA512 a9f23ef113977147d37756cefbbb3987a24d285a7407314f65b352bc49df3e9d29be66695fc6706ec0d96cb0582e5000b68756f5fc5562c38defcb17affbf476 +EBUILD xdg-utils-1.2.1-r3.ebuild 2568 BLAKE2B 8cd1c28c0b57f42db488656357899f71c4191e26d0f8ca61d5a8a44c129adf075ea6ace0ccb7d472c003c15c33e88ddf211caf5d884249e4188509e672f356e0 SHA512 e375b4ef80779bcad4d54d528d59b1b9404ce03e38b8d8bfb0bf09d60981ac11a5528f3615a44fff375a7f9218233e55591ce9789d25ee9dee927a6a2afe6ba8 MISC metadata.xml 319 BLAKE2B 4910953400fa3f3b0b72b8baba239a1e0c3466c38f84b6a60bc816620b789473179c151b1af68d0629ba7f79a1ea826b536f0f29678007bba025714ceb514061 SHA512 c07b03f20aeedd0ceaf7de137b76578142c703317d98ac7a57ae5143cab7523974a50aafa58e92c541d4a84ec0961b7de180d11d95c7da45f5698e3c19e7182d diff --git a/x11-misc/xdg-utils/files/xdg-utils-1.2.1-qtpaths.patch b/x11-misc/xdg-utils/files/xdg-utils-1.2.1-qtpaths.patch new file mode 100644 index 000000000000..a92d652bf2dc --- /dev/null +++ b/x11-misc/xdg-utils/files/xdg-utils-1.2.1-qtpaths.patch @@ -0,0 +1,21 @@ +Workaround for https://bugs.gentoo.org/934941. + +Pending questions: +* Should qt6paths instead be in /usr/bin in Gentoo? +* Why do we have a qtpaths6 as well as a qt6paths? +--- a/scripts/xdg-mime.in ++++ b/scripts/xdg-mime.in +@@ -166,8 +166,11 @@ make_default_kde() + # text/plain=gnome-gedit.desktop;gnu-emacs.desktop; + vendor="$1" + mimetype="$2" +- if [ "${KDE_SESSION_VERSION:-0}" -gt 4 ] ; then +- default_dir="$(qtpaths --writable-path ConfigLocation)" ++ if [ "${KDE_SESSION_VERSION:-0}" -gt 5 ] ; then ++ default_dir="$($(pkg-config --variable=bindir Qt6Core)/qt6paths) --writable-path ConfigLocation)" ++ default_file="$default_dir/mimeapps.list" ++ elif [ x"$KDE_SESSION_VERSION" = x"5" ; then ++ default_dir="$(qtpaths5 --writable-path ConfigLocation)" + default_file="$default_dir/mimeapps.list" + elif [ x"$KDE_SESSION_VERSION" = x"4" ]; then + default_dir="$(kde4-config --path xdgdata-apps 2> /dev/null | cut -d ':' -f 1)" diff --git a/x11-misc/xdg-utils/xdg-utils-1.2.1-r3.ebuild b/x11-misc/xdg-utils/xdg-utils-1.2.1-r3.ebuild new file mode 100644 index 000000000000..78afc65ad4b2 --- /dev/null +++ b/x11-misc/xdg-utils/xdg-utils-1.2.1-r3.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Portland utils for cross-platform/cross-toolkit/cross-desktop interoperability" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/xdg-utils/" +if [[ ${PV} == *_p* ]] ; then + MY_COMMIT="d4f00e1d803038af4f245949d8c747a384117852" + SRC_URI="https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/${MY_COMMIT}/${P}.tar.bz2" + S="${WORKDIR}"/xdg-utils-${MY_COMMIT} +else + SRC_URI="https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/v${PV}/${PN}-v${PV}.tar.bz2" + S="${WORKDIR}"/${PN}-v${PV} +fi + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="dbus doc gnome plasma X" +REQUIRED_USE="gnome? ( dbus )" + +RDEPEND=" + dev-perl/File-MimeInfo + dev-util/desktop-file-utils + x11-misc/shared-mime-info + dbus? ( + sys-apps/dbus + gnome? ( + dev-perl/Net-DBus + dev-perl/X11-Protocol + ) + ) + plasma? ( + virtual/pkgconfig + || ( + ( + kde-frameworks/kservice:6 + dev-qt/qtbase:6 + ) + ( + kde-frameworks/kservice:5 + dev-qt/qtpaths:5 + ) + ) + ) + X? ( + x11-apps/xprop + x11-apps/xset + ) +" +BDEPEND=" + app-alternatives/awk + >=app-text/xmlto-0.0.28-r3[text(+)] +" + +# Tests run random system programs, including interactive programs +# that block forever +RESTRICT="test" + +PATCHES=( + "${FILESDIR}"/${P}-xdg-mime-default.patch + "${FILESDIR}"/${PN}-1.2.1-qtpaths.patch +) + +src_prepare() { + default + + if [[ ${PV} == *_p* ]] ; then + # If you choose to do git snapshot instead of patchset, you need to remember + # to run `autoconf` in ./ and `make scripts-clean` in ./scripts/ to refresh + # all the files + eautoreconf + fi +} + +src_configure() { + export ac_cv_path_XMLTO="$(type -P xmlto) --skip-validation" #502166 + default + emake -C scripts scripts-clean +} + +src_install() { + default + + dodoc RELEASE_NOTES + + newdoc scripts/xsl/README README.xsl + use doc && dodoc -r scripts/html + + # Install default XDG_DATA_DIRS, bug #264647 + echo XDG_DATA_DIRS=\"${EPREFIX}/usr/local/share\" > 30xdg-data-local || die + echo 'COLON_SEPARATED="XDG_DATA_DIRS XDG_CONFIG_DIRS"' >> 30xdg-data-local || die + doenvd 30xdg-data-local + + echo XDG_DATA_DIRS=\"${EPREFIX}/usr/share\" > 90xdg-data-base || die + echo XDG_CONFIG_DIRS=\"${EPREFIX}/etc/xdg\" >> 90xdg-data-base || die + doenvd 90xdg-data-base +} + +pkg_postinst() { + [[ -x $(type -P gtk-update-icon-cache) ]] \ + || elog "Install dev-util/gtk-update-icon-cache for the gtk-update-icon-cache command." +} -- cgit v1.2.3