From 51ca07dfca5e5f0b34a4296ad054179d89a520c3 Mon Sep 17 00:00:00 2001 From: Sam James Date: Sun, 28 Jul 2024 03:38:19 +0100 Subject: x11-misc/xdg-utils: fix path to qtpaths6 & typo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Thanks-to: Emanuel Komínek Bug: https://bugs.gentoo.org/934941 Signed-off-by: Sam James --- .../xdg-utils/files/xdg-utils-1.2.1-qtpaths.patch | 2 +- x11-misc/xdg-utils/xdg-utils-1.2.1-r4.ebuild | 110 --------------------- x11-misc/xdg-utils/xdg-utils-1.2.1-r5.ebuild | 110 +++++++++++++++++++++ 3 files changed, 111 insertions(+), 111 deletions(-) delete mode 100644 x11-misc/xdg-utils/xdg-utils-1.2.1-r4.ebuild create mode 100644 x11-misc/xdg-utils/xdg-utils-1.2.1-r5.ebuild (limited to 'x11-misc') 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 index a92d652bf2dc..de4bde42a1af 100644 --- 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 @@ -12,7 +12,7 @@ Pending questions: - 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_dir="$($(pkg-config --variable=bindir Qt6Core)/qtpaths6 --writable-path ConfigLocation)" + default_file="$default_dir/mimeapps.list" + elif [ x"$KDE_SESSION_VERSION" = x"5" ; then + default_dir="$(qtpaths5 --writable-path ConfigLocation)" diff --git a/x11-misc/xdg-utils/xdg-utils-1.2.1-r4.ebuild b/x11-misc/xdg-utils/xdg-utils-1.2.1-r4.ebuild deleted file mode 100644 index cda3c70809fd..000000000000 --- a/x11-misc/xdg-utils/xdg-utils-1.2.1-r4.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# 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 - ) - X? ( - x11-apps/xprop - x11-apps/xset - ) -" -PDEPEND=" - plasma? ( - || ( - ( - kde-frameworks/kservice:6 - dev-qt/qtbase:6 - ) - ( - kde-frameworks/kservice:5 - dev-qt/qtpaths:5 - ) - ) - ) -" -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." -} diff --git a/x11-misc/xdg-utils/xdg-utils-1.2.1-r5.ebuild b/x11-misc/xdg-utils/xdg-utils-1.2.1-r5.ebuild new file mode 100644 index 000000000000..cda3c70809fd --- /dev/null +++ b/x11-misc/xdg-utils/xdg-utils-1.2.1-r5.ebuild @@ -0,0 +1,110 @@ +# 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 + ) + X? ( + x11-apps/xprop + x11-apps/xset + ) +" +PDEPEND=" + plasma? ( + || ( + ( + kde-frameworks/kservice:6 + dev-qt/qtbase:6 + ) + ( + kde-frameworks/kservice:5 + dev-qt/qtpaths:5 + ) + ) + ) +" +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-65-gdbad