* [gentoo-commits] repo/gentoo:master commit in: x11-misc/dunst/, x11-misc/dunst/files/
@ 2021-03-04 12:59 Joonas Niilola
0 siblings, 0 replies; 3+ messages in thread
From: Joonas Niilola @ 2021-03-04 12:59 UTC (permalink / raw
To: gentoo-commits
commit: 98c8397688f16da06947dd96c33cb5e97addac50
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Mon Mar 1 12:37:37 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Mar 4 12:59:11 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98c83976
x11-misc/dunst: version bump to 1.6.1
new maintainer
Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
Closes: https://github.com/gentoo/gentoo/pull/19719
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
x11-misc/dunst/Manifest | 1 +
x11-misc/dunst/dunst-1.6.1.ebuild | 59 ++++++++++++++++++++++++++++
x11-misc/dunst/dunst-9999.ebuild | 41 +++++++++++--------
x11-misc/dunst/files/dunst-1.6.1-no-Os.patch | 13 ++++++
x11-misc/dunst/metadata.xml | 10 +++--
5 files changed, 105 insertions(+), 19 deletions(-)
diff --git a/x11-misc/dunst/Manifest b/x11-misc/dunst/Manifest
index cdb47650637..46f77b7e029 100644
--- a/x11-misc/dunst/Manifest
+++ b/x11-misc/dunst/Manifest
@@ -1,2 +1,3 @@
DIST dunst-1.4.1.tar.gz 160124 BLAKE2B d618b3bffc8f4518f58d28e108a8aadf1ff71164f581632bc198b3d0a81f6efa0fff73513fa5d46ec4a7058bb1beb8d8a51cb01e4621c76f8d3f8653cc6e2270 SHA512 43667898e123ef0dea59e2ca55a76686785906e44b453b2a86bdf361045b3f6b751a2e81fa9f562127f80bf47f8c9248960c37f8365dbbe409d72ddc3deb34fb
DIST dunst-1.5.0.tar.gz 169272 BLAKE2B 63c33e62f61aefec67e5420d5afe41808cf8b377c0decde92781ef541315c955b715aa78c6e1a2288b916cabf7830d5621366d53731d477e3c4a6a60349f4c8b SHA512 2057dc530adce1dac89f12f4ca55e9186d378ccc2b406e0fa20d43bc69f671dc303b608a4fea781ab1193bd2e159dcbdecf3baf50e27ac9b0f164965b5824c85
+DIST dunst-1.6.1.tar.gz 217267 BLAKE2B 267e5be6a079097fb5a677bd2451b0e5bcbcddadf4c4de9af87d4eab7dd90b61908f140db3f1238b6a79d370fc3bb89c062c6b4deeefae6c9c0069b55017e907 SHA512 079ffd0ff75f1865b68cb8db261849cbe4f68b5c632c39ef8f7a3d193ff3eba3734bca31cb7268f27c9a411aec56e4c484c383b419bc0b4755b7d80ede84cd96
diff --git a/x11-misc/dunst/dunst-1.6.1.ebuild b/x11-misc/dunst/dunst-1.6.1.ebuild
new file mode 100644
index 00000000000..b4ea0aaabb0
--- /dev/null
+++ b/x11-misc/dunst/dunst-1.6.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit systemd toolchain-funcs
+
+DESCRIPTION="Customizable and lightweight notification-daemon"
+HOMEPAGE="https://dunst-project.org/"
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/dunst-project/dunst"
+else
+ SRC_URI="https://github.com/dunst-project/dunst/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test wayland"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ dev-libs/glib:2
+ sys-apps/dbus
+ x11-libs/cairo[X,glib]
+ x11-libs/gdk-pixbuf
+ x11-libs/libX11
+ x11-libs/libXScrnSaver
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libnotify
+ x11-libs/pango[X]
+ wayland? ( dev-libs/wayland )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+ dev-lang/perl
+ virtual/pkgconfig
+ wayland? ( dev-libs/wayland-protocols )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.6.1-no-Os.patch )
+
+src_configure() {
+ tc-export CC PKG_CONFIG
+ default
+}
+
+src_compile() {
+ emake WAYLAND=$(usex wayland 1 0) SYSTEMD=0
+ sed -e "s|##PREFIX##|${EPREFIX}/usr|" \
+ -i dunst.systemd.service.in > dunst.service
+}
+
+src_install() {
+ emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+ systemd_dounit dunst.service
+}
diff --git a/x11-misc/dunst/dunst-9999.ebuild b/x11-misc/dunst/dunst-9999.ebuild
index f341b6af662..b4ea0aaabb0 100644
--- a/x11-misc/dunst/dunst-9999.ebuild
+++ b/x11-misc/dunst/dunst-9999.ebuild
@@ -1,16 +1,24 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit git-r3 toolchain-funcs
+inherit systemd toolchain-funcs
DESCRIPTION="Customizable and lightweight notification-daemon"
-HOMEPAGE="https://dunst-project.org/ https://github.com/dunst-project/dunst"
-EGIT_REPO_URI="https://github.com/${PN}-project/${PN}"
+HOMEPAGE="https://dunst-project.org/"
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/dunst-project/dunst"
+else
+ SRC_URI="https://github.com/dunst-project/dunst/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~x86"
+fi
LICENSE="BSD"
SLOT="0"
-KEYWORDS=""
+IUSE="test wayland"
+RESTRICT="!test? ( test )"
DEPEND="
dev-libs/glib:2
@@ -23,28 +31,29 @@ DEPEND="
x11-libs/libXrandr
x11-libs/libnotify
x11-libs/pango[X]
+ wayland? ( dev-libs/wayland )
"
+RDEPEND="${DEPEND}"
BDEPEND="
dev-lang/perl
virtual/pkgconfig
-"
-RDEPEND="
- ${DEPEND}
+ wayland? ( dev-libs/wayland-protocols )
"
-src_prepare() {
- sed -i -e "/^CFLAGS/ { s:-g::;s:-O.:: }" config.mk || die
-
- default
-}
+PATCHES=( "${FILESDIR}"/${PN}-1.6.1-no-Os.patch )
src_configure() {
tc-export CC PKG_CONFIG
default
}
-src_install() {
- emake DESTDIR="${D}" PREFIX="/usr" install
+src_compile() {
+ emake WAYLAND=$(usex wayland 1 0) SYSTEMD=0
+ sed -e "s|##PREFIX##|${EPREFIX}/usr|" \
+ -i dunst.systemd.service.in > dunst.service
+}
- dodoc AUTHORS CHANGELOG.md README.md RELEASE_NOTES
+src_install() {
+ emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+ systemd_dounit dunst.service
}
diff --git a/x11-misc/dunst/files/dunst-1.6.1-no-Os.patch b/x11-misc/dunst/files/dunst-1.6.1-no-Os.patch
new file mode 100644
index 00000000000..90a1de94de9
--- /dev/null
+++ b/x11-misc/dunst/files/dunst-1.6.1-no-Os.patch
@@ -0,0 +1,13 @@
+diff --git a/config.mk b/config.mk
+index 54426a7..2e18031 100644
+--- a/config.mk
++++ b/config.mk
+@@ -36,7 +36,7 @@ endif
+
+ # flags
+ DEFAULT_CPPFLAGS = -D_DEFAULT_SOURCE -DVERSION=\"${VERSION}\"
+-DEFAULT_CFLAGS = -g --std=gnu99 -pedantic -Wall -Wno-overlength-strings -Os ${STATIC} ${ENABLE_WAYLAND}
++DEFAULT_CFLAGS = --std=gnu99 -pedantic -Wall -Wno-overlength-strings ${STATIC} ${ENABLE_WAYLAND}
+ DEFAULT_LDFLAGS = -lm -lrt
+
+ CPPFLAGS_DEBUG := -DDEBUG_BUILD
diff --git a/x11-misc/dunst/metadata.xml b/x11-misc/dunst/metadata.xml
index de3681ee131..1472d6311ca 100644
--- a/x11-misc/dunst/metadata.xml
+++ b/x11-misc/dunst/metadata.xml
@@ -1,9 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type='project'>
- <email>desktop-misc@gentoo.org</email>
- <name>Gentoo Desktop Miscellaneous Project</name>
+ <maintainer type="person">
+ <email>gentoo@aisha.cc</email>
+ <name>Aisha Tammy</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
</maintainer>
<use>
<flag name="dunstify">Experimental replacement for notify-send.</flag>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/dunst/, x11-misc/dunst/files/
@ 2022-01-20 22:58 Conrad Kostecki
0 siblings, 0 replies; 3+ messages in thread
From: Conrad Kostecki @ 2022-01-20 22:58 UTC (permalink / raw
To: gentoo-commits
commit: cdb63fa7950ea04f0d1fe6e7439f6b43b5281441
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 20 22:56:57 2022 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Jan 20 22:57:57 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdb63fa7
x11-misc/dunst: drop 1.6.1
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
x11-misc/dunst/Manifest | 1 -
x11-misc/dunst/dunst-1.6.1.ebuild | 60 ----------------------------
x11-misc/dunst/files/dunst-1.6.1-no-Os.patch | 13 ------
3 files changed, 74 deletions(-)
diff --git a/x11-misc/dunst/Manifest b/x11-misc/dunst/Manifest
index c50981ddcceb..52a62bb405e6 100644
--- a/x11-misc/dunst/Manifest
+++ b/x11-misc/dunst/Manifest
@@ -1,2 +1 @@
-DIST dunst-1.6.1.tar.gz 217267 BLAKE2B 267e5be6a079097fb5a677bd2451b0e5bcbcddadf4c4de9af87d4eab7dd90b61908f140db3f1238b6a79d370fc3bb89c062c6b4deeefae6c9c0069b55017e907 SHA512 079ffd0ff75f1865b68cb8db261849cbe4f68b5c632c39ef8f7a3d193ff3eba3734bca31cb7268f27c9a411aec56e4c484c383b419bc0b4755b7d80ede84cd96
DIST dunst-1.7.3.tar.gz 4596283 BLAKE2B dff61659b777a92cd2add9b15551a7fa471eb9adda47b31bd48d6b20a34192f3f9e7147a4249047f6993a595d0d0cf9895d9a7cc84f5bbc64972f4e111e924ad SHA512 e8bd8555bd9ea3dc5ae85c2459ad1fa29bbc5d575346381e828fc6efd618db1e87c40b4fceeb89aef83bb7f5df6b246d8a354ce8b13ec549f3452cb32c918d62
diff --git a/x11-misc/dunst/dunst-1.6.1.ebuild b/x11-misc/dunst/dunst-1.6.1.ebuild
deleted file mode 100644
index fb0a1988036b..000000000000
--- a/x11-misc/dunst/dunst-1.6.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit systemd toolchain-funcs
-
-DESCRIPTION="Customizable and lightweight notification-daemon"
-HOMEPAGE="https://dunst-project.org/ https://github.com/dunst-project/dunst"
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/dunst-project/dunst"
-else
- SRC_URI="https://github.com/dunst-project/dunst/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 ~arm x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test wayland"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- dev-libs/glib:2
- sys-apps/dbus
- x11-libs/cairo[X,glib]
- x11-libs/gdk-pixbuf
- x11-libs/libX11
- x11-libs/libXScrnSaver
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libnotify
- x11-libs/pango[X]
- wayland? ( dev-libs/wayland )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
- dev-lang/perl
- virtual/pkgconfig
- wayland? ( dev-libs/wayland-protocols )
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.6.1-no-Os.patch )
-
-src_configure() {
- tc-export CC PKG_CONFIG
- default
-}
-
-src_compile() {
- emake WAYLAND=$(usex wayland 1 0) SYSTEMD=0
- sed -e "s|##PREFIX##|${EPREFIX}/usr|" \
- dunst.systemd.service.in > dunst.service || die
-}
-
-src_install() {
- emake WAYLAND=$(usex wayland 1 0) SYSTEMD=0 \
- DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
- systemd_douserunit dunst.service
-}
diff --git a/x11-misc/dunst/files/dunst-1.6.1-no-Os.patch b/x11-misc/dunst/files/dunst-1.6.1-no-Os.patch
deleted file mode 100644
index 90a1de94de95..000000000000
--- a/x11-misc/dunst/files/dunst-1.6.1-no-Os.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/config.mk b/config.mk
-index 54426a7..2e18031 100644
---- a/config.mk
-+++ b/config.mk
-@@ -36,7 +36,7 @@ endif
-
- # flags
- DEFAULT_CPPFLAGS = -D_DEFAULT_SOURCE -DVERSION=\"${VERSION}\"
--DEFAULT_CFLAGS = -g --std=gnu99 -pedantic -Wall -Wno-overlength-strings -Os ${STATIC} ${ENABLE_WAYLAND}
-+DEFAULT_CFLAGS = --std=gnu99 -pedantic -Wall -Wno-overlength-strings ${STATIC} ${ENABLE_WAYLAND}
- DEFAULT_LDFLAGS = -lm -lrt
-
- CPPFLAGS_DEBUG := -DDEBUG_BUILD
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/dunst/, x11-misc/dunst/files/
@ 2022-03-02 20:29 Conrad Kostecki
0 siblings, 0 replies; 3+ messages in thread
From: Conrad Kostecki @ 2022-03-02 20:29 UTC (permalink / raw
To: gentoo-commits
commit: dbeca47cb185e4153eb9f15c98002c6abcb58b68
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 2 20:28:12 2022 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Wed Mar 2 20:28:12 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbeca47c
x11-misc/dunst: drop 1.8.0-r1
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
x11-misc/dunst/Manifest | 1 -
x11-misc/dunst/dunst-1.8.0-r1.ebuild | 81 ------------------------------
x11-misc/dunst/files/dunst-1.8.0-xdg.patch | 23 ---------
3 files changed, 105 deletions(-)
diff --git a/x11-misc/dunst/Manifest b/x11-misc/dunst/Manifest
index ac0deb9ee533..76dbb6535e7c 100644
--- a/x11-misc/dunst/Manifest
+++ b/x11-misc/dunst/Manifest
@@ -1,3 +1,2 @@
DIST dunst-1.7.3.tar.gz 4596283 BLAKE2B dff61659b777a92cd2add9b15551a7fa471eb9adda47b31bd48d6b20a34192f3f9e7147a4249047f6993a595d0d0cf9895d9a7cc84f5bbc64972f4e111e924ad SHA512 e8bd8555bd9ea3dc5ae85c2459ad1fa29bbc5d575346381e828fc6efd618db1e87c40b4fceeb89aef83bb7f5df6b246d8a354ce8b13ec549f3452cb32c918d62
-DIST dunst-1.8.0.tar.gz 4603966 BLAKE2B 796cd76f782772cc91af27d797db92f6d3a35511d8a907e060a6363604a4b58a52f1cfc755d60a158e57ccb8b612ad119c36e8bbe960d354eed59acab93c0fde SHA512 b8e7f0884bb66aee8627858f667ef4db31664b07f7d7ede27c37d88fff6d7f47c62739d07fe7ab26628f95a13b13efa7704ea318dea4d0bcf0193a3fba6124bd
DIST dunst-1.8.1.tar.gz 4603941 BLAKE2B c694503087425a69eecd40e4e50c5cfe5e5d3e9525d259b04dacd7e2bc05ff188aad14a331c41e6ecdd91b7c43d87d5902662b8a510675f3450da7097b7da1e9 SHA512 bd8605844eacb24ec1beafbd62be1defa8ff9f6fc2e93a4746acaba483e86d0fa3937045c20dbba71c46310102d8878c8ec987a3081328b02a09d7f9fde974d9
diff --git a/x11-misc/dunst/dunst-1.8.0-r1.ebuild b/x11-misc/dunst/dunst-1.8.0-r1.ebuild
deleted file mode 100644
index 3607f4c5c20e..000000000000
--- a/x11-misc/dunst/dunst-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="wayland"
-
-DEPEND="
- dev-libs/glib:2
- sys-apps/dbus
- x11-libs/cairo[X,glib]
- x11-libs/gdk-pixbuf:2
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXScrnSaver
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libnotify
- x11-libs/pango[X]
- x11-misc/xdg-utils
- wayland? ( dev-libs/wayland )
-"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="
- dev-lang/perl
- virtual/pkgconfig
- 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 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() {
- tc-export CC PKG_CONFIG
-
- default
-}
-
-src_compile() {
- local myemakeargs=(
- SYSCONFDIR="${EPREFIX}/etc/xdg"
- SYSTEMD="0"
- WAYLAND="$(usex wayland 1 0)"
- )
-
- emake "${myemakeargs[@]}"
-}
-
-src_install() {
- local myemakeargs=(
- PREFIX="${ED}/usr"
- SYSCONFDIR="${ED}/etc/xdg"
- SYSTEMD="0"
- WAYLAND="$(usex wayland 1 0)"
- )
-
- emake "${myemakeargs[@]}" install
-
- systemd_newuserunit dunst.systemd.service.in dunst.service
-}
diff --git a/x11-misc/dunst/files/dunst-1.8.0-xdg.patch b/x11-misc/dunst/files/dunst-1.8.0-xdg.patch
deleted file mode 100644
index e2a3a127094c..000000000000
--- a/x11-misc/dunst/files/dunst-1.8.0-xdg.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 50743754de28da6d474c001e6b7e04ada789c04a Mon Sep 17 00:00:00 2001
-From: Aleksei Bavshin <alebastr89@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;
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-03-02 20:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-03-02 20:29 [gentoo-commits] repo/gentoo:master commit in: x11-misc/dunst/, x11-misc/dunst/files/ Conrad Kostecki
-- strict thread matches above, loose matches on Subject: below --
2022-01-20 22:58 Conrad Kostecki
2021-03-04 12:59 Joonas Niilola
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox