diff options
author | Jeroen Roovers <jer@gentoo.org> | 2016-09-24 12:26:15 +0200 |
---|---|---|
committer | Jeroen Roovers <jer@gentoo.org> | 2016-09-24 12:30:06 +0200 |
commit | 5e5dd6d1633f13449b0a4d1bc94558fdd8187614 (patch) | |
tree | 4ba868f945ca8034d8dd542f543aa69340bd66de /x11-misc | |
parent | dev-vcs/git-annex: restore manpage installation (diff) | |
download | gentoo-5e5dd6d1633f13449b0a4d1bc94558fdd8187614.tar.gz gentoo-5e5dd6d1633f13449b0a4d1bc94558fdd8187614.tar.bz2 gentoo-5e5dd6d1633f13449b0a4d1bc94558fdd8187614.zip |
x11-misc/dunst: Old
Package-Manager: portage-2.3.1
Diffstat (limited to 'x11-misc')
-rw-r--r-- | x11-misc/dunst/Manifest | 2 | ||||
-rw-r--r-- | x11-misc/dunst/dunst-0.5.0.ebuild | 29 | ||||
-rw-r--r-- | x11-misc/dunst/dunst-1.0.0-r1.ebuild | 63 | ||||
-rw-r--r-- | x11-misc/dunst/dunst-1.0.0.ebuild | 59 | ||||
-rw-r--r-- | x11-misc/dunst/files/dunst-1.0.0-correctly_handle_num_lock.patch | 149 | ||||
-rw-r--r-- | x11-misc/dunst/files/dunst-1.0.0-fix_pause_resume.patch | 60 |
6 files changed, 0 insertions, 362 deletions
diff --git a/x11-misc/dunst/Manifest b/x11-misc/dunst/Manifest index aec870557380..182bd8b49371 100644 --- a/x11-misc/dunst/Manifest +++ b/x11-misc/dunst/Manifest @@ -1,3 +1 @@ -DIST dunst-0.5.0.tar.bz2 28521 SHA256 4be8cf366930b297f03078f233f2fec479638d0c69b0e5e75bb49da487684b05 SHA512 3ce762295ea28b10539da6c5b9b4bffa41535d90544d933b2b81838f44a6d5d95c292a08048576b87db4f74592e5e068687743d7fda0dc3aa4aac06aa81ba7fd WHIRLPOOL ab1200ddadff1bcf6bbb5a56b464c4da2c045e9e074e1ada3e1841574dde21e4e672452130b7fffa9605fb20ab22870f9e49af2b32e15513f7dfa071be9958b1 -DIST dunst-1.0.0.tar.bz2 75306 SHA256 5c79ef11165421a4828453a42dfe9c60a4cb9d8743f970186a90c67e277f5280 SHA512 81490597ef8354d2c32838c72e03b121cf09d61e0fbef697a8adfb0c4783e45b3bb05790bf94cc1d0ed41e7f4b5f13a8edfdc65fec5569dc29966edd0807bfe1 WHIRLPOOL 724295fec6d284cc512944435a93df8c55b214d59d2b2b33c3fbf83e6a51db40b6ca15ce68446988dbeab695b0a907a4301124f35fb6748bed8c8143042b0bd9 DIST dunst-1.1.0.tar.bz2 79032 SHA256 c72bf167eaab4e44a98ec87101b023efee0aa8916df56630b99a5bc53f8d7070 SHA512 ba01a6b18da5199b3356342f5c22592f93f447389267810bbfc35decf1a67f89650d445d3c1dd6f3cc76a4f86f7165adc777b669444627e42d3e671d4f04a04b WHIRLPOOL 6985c17549de4c7f6e2ba17ae1117db21693f4ed05df65e6238cfe6001aeb9c7a98834f3e794a0c80dbe913099082624256708c29ffa02cf35b0ab0032e94926 diff --git a/x11-misc/dunst/dunst-0.5.0.ebuild b/x11-misc/dunst/dunst-0.5.0.ebuild deleted file mode 100644 index 46e56c652caf..000000000000 --- a/x11-misc/dunst/dunst-0.5.0.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -DESCRIPTION="customizable and lightweight notification-daemon" -HOMEPAGE="http://www.knopwob.org/dunst/" -SRC_URI="http://www.knopwob.org/public/dunst-release/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND=" - dev-libs/libxdg-basedir - sys-apps/dbus - x11-libs/libXScrnSaver - x11-libs/libXft - x11-libs/libXinerama -" -RDEPEND="${DEPEND}" - -src_install() { - emake DESTDIR="${D}" PREFIX="/usr" install - - dodoc CHANGELOG -} diff --git a/x11-misc/dunst/dunst-1.0.0-r1.ebuild b/x11-misc/dunst/dunst-1.0.0-r1.ebuild deleted file mode 100644 index cdfd2d6dbf1c..000000000000 --- a/x11-misc/dunst/dunst-1.0.0-r1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils - -DESCRIPTION="customizable and lightweight notification-daemon" -HOMEPAGE="http://www.knopwob.org/dunst/" -SRC_URI="http://www.knopwob.org/public/dunst-release/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="dunstify" - -CDEPEND=" - dev-libs/glib:2 - dev-libs/libxdg-basedir - sys-apps/dbus - x11-libs/libXScrnSaver - x11-libs/libXft - x11-libs/libXinerama - x11-libs/cairo[X,glib] - x11-libs/pango[X] - dunstify? ( x11-libs/libnotify ) -" - -DEPEND="${CDEPEND} - dev-lang/perl - virtual/pkgconfig" - -RDEPEND="${CDEPEND}" - -src_prepare() { - # fixes backported from git - epatch "${FILESDIR}"/${P}-correctly_handle_num_lock.patch - epatch "${FILESDIR}"/${P}-fix_pause_resume.patch - - # Remove nasty CFLAGS which override user choice - sed -ie "/^CFLAGS/ { - s:-g:: - s:-O.:: - }" config.mk || die "sed failed" - - if ! use dunstify; then - # don't build dunstify: it pulls in deps but is not being installed - sed -ie "/^all:/ s:dunstify::" Makefile || die "sed failed" - fi - - epatch_user -} - -src_install() { - emake DESTDIR="${D}" PREFIX="/usr" install - - if use dunstify; then - dobin dunstify - fi - - dodoc CHANGELOG -} diff --git a/x11-misc/dunst/dunst-1.0.0.ebuild b/x11-misc/dunst/dunst-1.0.0.ebuild deleted file mode 100644 index 32aa742ab9b9..000000000000 --- a/x11-misc/dunst/dunst-1.0.0.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils - -DESCRIPTION="customizable and lightweight notification-daemon" -HOMEPAGE="http://www.knopwob.org/dunst/" -SRC_URI="http://www.knopwob.org/public/dunst-release/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="dunstify" - -CDEPEND=" - dev-libs/glib:2 - dev-libs/libxdg-basedir - sys-apps/dbus - x11-libs/libXScrnSaver - x11-libs/libXft - x11-libs/libXinerama - x11-libs/cairo[X,glib] - x11-libs/pango[X] - dunstify? ( x11-libs/libnotify ) -" - -DEPEND="${CDEPEND} - dev-lang/perl - virtual/pkgconfig" - -RDEPEND="${CDEPEND}" - -src_prepare() { - # Remove nasty CFLAGS which override user choice - sed -ie "/^CFLAGS/ { - s:-g:: - s:-O.:: - }" config.mk || die "sed failed" - - if ! use dunstify; then - # don't build dunstify: it pulls in deps but is not being installed - sed -ie "/^all:/ s:dunstify::" Makefile || die "sed failed" - fi - - epatch_user -} - -src_install() { - emake DESTDIR="${D}" PREFIX="/usr" install - - if use dunstify; then - dobin dunstify - fi - - dodoc CHANGELOG -} diff --git a/x11-misc/dunst/files/dunst-1.0.0-correctly_handle_num_lock.patch b/x11-misc/dunst/files/dunst-1.0.0-correctly_handle_num_lock.patch deleted file mode 100644 index fc784fb8fc66..000000000000 --- a/x11-misc/dunst/files/dunst-1.0.0-correctly_handle_num_lock.patch +++ /dev/null @@ -1,149 +0,0 @@ -https://github.com/knopwob/dunst/commit/be7d2b351 - -From be7d2b3511dc528b135e5dc6d5358c700fefaa30 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ren=C3=A9=20=27Necoro=27=20Neumann?= <necoro@necoro.net> -Date: Mon, 3 Jun 2013 14:39:24 +0200 -Subject: [PATCH] Correctly handle Num_Lock. - -Find out which modifier key is used by Num_Lock (`x_numlock_mod()`) and -register grabs for both variants: modifier present/not present. ---- - x.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------ - 1 file changed, 67 insertions(+), 6 deletions(-) - ---- a/x.c -+++ b/x.c -@@ -485,6 +485,58 @@ static void setopacity(Window win, unsigned long opacity) - - - -+ /* -+ * Returns the modifier which is NumLock. -+ */ -+static KeySym x_numlock_mod() -+{ -+ static KeyCode nl = 0; -+ KeySym sym = 0; -+ XModifierKeymap * map = XGetModifierMapping(xctx.dpy); -+ -+ if (!nl) -+ nl = XKeysymToKeycode(xctx.dpy, XStringToKeysym("Num_Lock")); -+ -+ for (int mod = 0; mod < 8; mod++) { -+ for (int j = 0; j < map->max_keypermod; j++) { -+ if (map->modifiermap[mod*map->max_keypermod+j] == nl) { -+ /* In theory, one could use `1 << mod`, but this -+ * could count as 'using implementation details', -+ * so use this large switch. */ -+ switch (mod) { -+ case ShiftMapIndex: -+ sym = ShiftMask; -+ goto end; -+ case LockMapIndex: -+ sym = LockMask; -+ goto end; -+ case ControlMapIndex: -+ sym = ControlMask; -+ goto end; -+ case Mod1MapIndex: -+ sym = Mod1Mask; -+ goto end; -+ case Mod2MapIndex: -+ sym = Mod2Mask; -+ goto end; -+ case Mod3MapIndex: -+ sym = Mod3Mask; -+ goto end; -+ case Mod4MapIndex: -+ sym = Mod4Mask; -+ goto end; -+ case Mod5MapIndex: -+ sym = Mod5Mask; -+ goto end; -+ } -+ } -+ } -+ } -+ -+end: -+ XFreeModifiermap(map); -+ return sym; -+} - - /* - * Helper function to use glib's mainloop mechanic -@@ -515,6 +567,7 @@ gboolean x_mainloop_fd_dispatch(GSource * source, GSourceFunc callback, - gpointer user_data) - { - XEvent ev; -+ unsigned int state; - while (XPending(xctx.dpy) > 0) { - XNextEvent(xctx.dpy, &ev); - switch (ev.type) { -@@ -535,10 +588,13 @@ gboolean x_mainloop_fd_dispatch(GSource * source, GSourceFunc callback, - } - break; - case KeyPress: -+ state = ev.xkey.state; -+ /* NumLock is also encoded in the state. Remove it. */ -+ state &= ~x_numlock_mod(); - if (settings.close_ks.str - && XLookupKeysym(&ev.xkey, - 0) == settings.close_ks.sym -- && settings.close_ks.mask == ev.xkey.state) { -+ && settings.close_ks.mask == state) { - if (displayed) { - notification *n = g_queue_peek_head(displayed); - if (n) -@@ -548,19 +604,19 @@ gboolean x_mainloop_fd_dispatch(GSource * source, GSourceFunc callback, - if (settings.history_ks.str - && XLookupKeysym(&ev.xkey, - 0) == settings.history_ks.sym -- && settings.history_ks.mask == ev.xkey.state) { -+ && settings.history_ks.mask == state) { - history_pop(); - } - if (settings.close_all_ks.str - && XLookupKeysym(&ev.xkey, - 0) == settings.close_all_ks.sym -- && settings.close_all_ks.mask == ev.xkey.state) { -+ && settings.close_all_ks.mask == state) { - move_all_to_history(); - } - if (settings.context_ks.str - && XLookupKeysym(&ev.xkey, - 0) == settings.context_ks.sym -- && settings.context_ks.mask == ev.xkey.state) { -+ && settings.context_ks.mask == state) { - context_menu(); - } - break; -@@ -953,9 +1009,12 @@ int x_shortcut_grab(keyboard_shortcut * ks) - - x_shortcut_setup_error_handler(); - -- if (ks->is_valid) -+ if (ks->is_valid) { - XGrabKey(xctx.dpy, ks->code, ks->mask, root, - true, GrabModeAsync, GrabModeAsync); -+ XGrabKey(xctx.dpy, ks->code, ks->mask | x_numlock_mod() , root, -+ true, GrabModeAsync, GrabModeAsync); -+ } - - if (x_shortcut_tear_down_error_handler()) { - fprintf(stderr, "Unable to grab key \"%s\"\n", ks->str); -@@ -972,8 +1031,10 @@ void x_shortcut_ungrab(keyboard_shortcut * ks) - { - Window root; - root = RootWindow(xctx.dpy, DefaultScreen(xctx.dpy)); -- if (ks->is_valid) -+ if (ks->is_valid) { - XUngrabKey(xctx.dpy, ks->code, ks->mask, root); -+ XUngrabKey(xctx.dpy, ks->code, ks->mask | x_numlock_mod(), root); -+ } - } - - /* --- -1.9.1 - diff --git a/x11-misc/dunst/files/dunst-1.0.0-fix_pause_resume.patch b/x11-misc/dunst/files/dunst-1.0.0-fix_pause_resume.patch deleted file mode 100644 index f95cc310b373..000000000000 --- a/x11-misc/dunst/files/dunst-1.0.0-fix_pause_resume.patch +++ /dev/null @@ -1,60 +0,0 @@ -https://github.com/knopwob/dunst/commit/04248fd4 - -From 04248fd49ef6769c7dc7e246fc505ad9c70afe27 Mon Sep 17 00:00:00 2001 -From: Sascha Kruse <knopwob@googlemail.com> -Date: Mon, 22 Apr 2013 20:07:35 +0000 -Subject: [PATCH] fix pause/resume - -this fixes github issue #98 ---- - dunst.c | 14 ++++++++------ - 1 file changed, 8 insertions(+), 6 deletions(-) - ---- a/dunst.c -+++ b/dunst.c -@@ -105,7 +105,7 @@ void update_lists() - - if (pause_display) { - while (displayed->length > 0) { -- g_queue_insert_sorted(queue, g_queue_pop_head(queue), -+ g_queue_insert_sorted(queue, g_queue_pop_head(displayed), - notification_cmp_data, NULL); - } - return; -@@ -240,16 +240,16 @@ gboolean run(void *data) - timeout_cnt--; - } - -- if (displayed->length > 0 && !xctx.visible) { -- x_win_show(); -+ if (displayed->length > 0 && !xctx.visible && !pause_display) { -+ x_win_show(); - } - -- if (displayed->length == 0 && xctx.visible) { -- x_win_hide(); -+ if (xctx.visible && (pause_display || displayed->length == 0)) { -+ x_win_hide(); - } - - if (xctx.visible) { -- x_win_draw(); -+ x_win_draw(); - } - - if (xctx.visible) { -@@ -355,9 +355,11 @@ void pause_signal_handler(int sig) - { - if (sig == SIGUSR1) { - pause_display = true; -+ wake_up(); - } - if (sig == SIGUSR2) { - pause_display = false; -+ wake_up(); - } - - signal(sig, pause_signal_handler); --- -1.9.1 - |