commit: c02c8cd6770e3cc594e8d63f76d0a6c4c3435f4e Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org> AuthorDate: Sun Feb 27 23:54:00 2022 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Mon Feb 28 00:03:01 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c02c8cd6
x11-misc/dunst: update config path Closes: https://bugs.gentoo.org/834050 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> .../{dunst-9999.ebuild => dunst-1.7.3-r1.ebuild} | 15 +++++++------- .../{dunst-9999.ebuild => dunst-1.8.0-r1.ebuild} | 17 +++++++++------- x11-misc/dunst/dunst-9999.ebuild | 2 ++ x11-misc/dunst/files/dunst-1.8.0-xdg.patch | 23 ++++++++++++++++++++++ 4 files changed, 43 insertions(+), 14 deletions(-) diff --git a/x11-misc/dunst/dunst-9999.ebuild b/x11-misc/dunst/dunst-1.7.3-r1.ebuild similarity index 75% copy from x11-misc/dunst/dunst-9999.ebuild copy to x11-misc/dunst/dunst-1.7.3-r1.ebuild index c26bd529c4b9..37336b25c793 100644 --- a/x11-misc/dunst/dunst-9999.ebuild +++ b/x11-misc/dunst/dunst-1.7.3-r1.ebuild @@ -1,18 +1,17 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit git-r3 systemd toolchain-funcs - -EGIT_REPO_URI="https://github.com/dunst-project/dunst"; +inherit systemd toolchain-funcs DESCRIPTION="Lightweight replacement for common notification daemons" HOMEPAGE="https://dunst-project.org/ https://github.com/dunst-project/dunst"; +SRC_URI="https://github.com/dunst-project/dunst/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86" IUSE="wayland" DEPEND=" @@ -45,8 +44,9 @@ src_prepare() { # Respect users CFLAGS sed -e 's/-Os//' -i config.mk || die - # Use correct path for system unit + # Use correct path for dbus and system unit sed -e "s|##PREFIX##|${EPREFIX}/usr|" -i dunst.systemd.service.in || die + sed -e "s|##PREFIX##|${EPREFIX}/usr|" -i org.knopwob.dunst.service.in || die } src_configure() { @@ -57,6 +57,7 @@ src_configure() { src_compile() { local myemakeargs=( + SYSCONFDIR="${EPREFIX}/etc/xdg" SYSTEMD="0" WAYLAND="$(usex wayland 1 0)" ) @@ -67,7 +68,7 @@ src_compile() { src_install() { local myemakeargs=( PREFIX="${ED}/usr" - SYSCONFDIR="${ED}/etc" + SYSCONFDIR="${ED}/etc/xdg" SYSTEMD="0" WAYLAND="$(usex wayland 1 0)" ) diff --git a/x11-misc/dunst/dunst-9999.ebuild b/x11-misc/dunst/dunst-1.8.0-r1.ebuild similarity index 73% copy from x11-misc/dunst/dunst-9999.ebuild copy to x11-misc/dunst/dunst-1.8.0-r1.ebuild index c26bd529c4b9..3607f4c5c20e 100644 --- a/x11-misc/dunst/dunst-9999.ebuild +++ b/x11-misc/dunst/dunst-1.8.0-r1.ebuild @@ -1,18 +1,17 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit git-r3 systemd toolchain-funcs - -EGIT_REPO_URI="https://github.com/dunst-project/dunst"; +inherit systemd toolchain-funcs DESCRIPTION="Lightweight replacement for common notification daemons" HOMEPAGE="https://dunst-project.org/ https://github.com/dunst-project/dunst"; +SRC_URI="https://github.com/dunst-project/dunst/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" IUSE="wayland" DEPEND=" @@ -39,14 +38,17 @@ BDEPEND=" wayland? ( dev-libs/wayland-protocols ) " +PATCHES=( "${FILESDIR}/${PN}-1.8.0-xdg.patch" ) + src_prepare() { default # Respect users CFLAGS sed -e 's/-Os//' -i config.mk || die - # Use correct path for system unit + # Use correct path for dbus and system unit sed -e "s|##PREFIX##|${EPREFIX}/usr|" -i dunst.systemd.service.in || die + sed -e "s|##PREFIX##|${EPREFIX}/usr|" -i org.knopwob.dunst.service.in || die } src_configure() { @@ -57,6 +59,7 @@ src_configure() { src_compile() { local myemakeargs=( + SYSCONFDIR="${EPREFIX}/etc/xdg" SYSTEMD="0" WAYLAND="$(usex wayland 1 0)" ) @@ -67,7 +70,7 @@ src_compile() { src_install() { local myemakeargs=( PREFIX="${ED}/usr" - SYSCONFDIR="${ED}/etc" + SYSCONFDIR="${ED}/etc/xdg" SYSTEMD="0" WAYLAND="$(usex wayland 1 0)" ) diff --git a/x11-misc/dunst/dunst-9999.ebuild b/x11-misc/dunst/dunst-9999.ebuild index c26bd529c4b9..6bf23561e0a8 100644 --- a/x11-misc/dunst/dunst-9999.ebuild +++ b/x11-misc/dunst/dunst-9999.ebuild @@ -39,6 +39,8 @@ BDEPEND=" wayland? ( dev-libs/wayland-protocols ) " +PATCHES=( "${FILESDIR}/${PN}-1.8.0-xdg.patch" ) + src_prepare() { default diff --git a/x11-misc/dunst/files/dunst-1.8.0-xdg.patch b/x11-misc/dunst/files/dunst-1.8.0-xdg.patch new file mode 100644 index 000000000000..e2a3a127094c --- /dev/null +++ b/x11-misc/dunst/files/dunst-1.8.0-xdg.patch @@ -0,0 +1,23 @@ +From 50743754de28da6d474c001e6b7e04ada789c04a Mon Sep 17 00:00:00 2001 +From: Aleksei Bavshin <alebast...@gmail.com> +Date: Sun, 27 Feb 2022 08:49:41 -0800 +Subject: [PATCH] Use correct variable for the configuration file paths + +Fixes #1041 +--- + src/utils.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/utils.c b/src/utils.c +index 380dac26..90c47a9a 100644 +--- a/src/utils.c ++++ b/src/utils.c +@@ -448,7 +448,7 @@ FILE *fopen_verbose(const char * const path) + + /* see utils.h */ + void add_paths_from_env(GPtrArray *arr, char *env_name, char *subdir, char *alternative) { +- const char *xdg_data_dirs = g_getenv("XDG_DATA_DIRS"); ++ const char *xdg_data_dirs = g_getenv(env_name); + if (!xdg_data_dirs) + xdg_data_dirs = alternative; +
