diff options
| -rw-r--r-- | x11-misc/dunst/Manifest | 4 | ||||
| -rw-r--r-- | x11-misc/dunst/dunst-1.0.0.ebuild | 22 | ||||
| -rw-r--r-- | x11-misc/dunst/files/dunst-1.0.0-fix-pause-resume.patch | 60 | ||||
| -rw-r--r-- | x11-misc/dunst/files/dunst-1.0.0-numlock.patch | 130 |
4 files changed, 16 insertions, 200 deletions
diff --git a/x11-misc/dunst/Manifest b/x11-misc/dunst/Manifest index d098251..0f16a34 100644 --- a/x11-misc/dunst/Manifest +++ b/x11-misc/dunst/Manifest @@ -1,4 +1,2 @@ -AUX dunst-1.0.0-fix-pause-resume.patch 1750 SHA256 8f3d4fd5fcef89b0564a6bbf796c474884c43d830eaaf7d085afb3f831cbb92f SHA512 4cab00a4a7342fb43ebf9f3167d1a9bfdbcf9b67160a7024391b7ce4e8269c8e81ea89c81505b01dd7b55b4bb39dfe8ad95c08556b5f45ad9c2c3bed39911350 WHIRLPOOL 8cb0537d6c0451cad697d6fa450f0dcc3e0d9fedc73d2f80c43f75bc0391397669e10504c20ac76e6f18475407b9153fcd93b4c321af41883405e8b17d2bd04b -AUX dunst-1.0.0-numlock.patch 5898 SHA256 f48b56b74a7bae8191d0aebc2235677d23a4b26c3cb35266a0e73af4ca1e8b3e SHA512 1ddb9779f09acce1267158fef6e451cc2532c9f4bda7b4fd16ebe08603ea6c3ee05f5aabdace85667dd50ff997c0906ce7c9a17728a0b1f967a5d9ccc0faffd5 WHIRLPOOL 4bffa04c74d0cc392bbb36d6b80f74076a1bd8681d0f801a0f7380eea4937c796f6fcaa77f0488483252c8676f38af44cba77696dfce708d4d4e912d619a1652 DIST dunst-1.0.0.tar.bz2 75306 SHA256 5c79ef11165421a4828453a42dfe9c60a4cb9d8743f970186a90c67e277f5280 SHA512 81490597ef8354d2c32838c72e03b121cf09d61e0fbef697a8adfb0c4783e45b3bb05790bf94cc1d0ed41e7f4b5f13a8edfdc65fec5569dc29966edd0807bfe1 WHIRLPOOL 724295fec6d284cc512944435a93df8c55b214d59d2b2b33c3fbf83e6a51db40b6ca15ce68446988dbeab695b0a907a4301124f35fb6748bed8c8143042b0bd9 -EBUILD dunst-1.0.0.ebuild 1154 SHA256 098dd1dfae1855857623c1583ec9e3812ba009c2db871b66f88072ac2c1bc0a2 SHA512 1759c67c6850db4c052eca0ed9b197be1782aedb704931f0c5c6d15a3b21f083774c897c6663455ab2c8d1be941b4233cf08dc439ac6643c536c7bdc7ae94d5a WHIRLPOOL ff9f38881b784cf5230aaab241977aee1122a3e831399cf1526582d053244d1d0e4141140e3b230440eacd11e2db672e553eca5e1a6fcfbb67c2ee2dc4781c8e +EBUILD dunst-1.0.0.ebuild 1208 SHA256 d33d293f9fed485fe0499201db6ded291c622e338792af260141d377cdc76254 SHA512 1b9bba9c406d577d03169942e8873bdf8cc4e82c66eed25b7d18527e6b2eba231ab6acc6847c35c78ff24d80e32e9ea8f369f3993fca4bd715c22a3febe66819 WHIRLPOOL 03e5d6bf91e8f74c48184df5d196358c02a87ee39356de86fc4d6a578b8ebae6cdbb3a41d02344244dcf6d2fa949f004071b55c994cc3a142017b5edcd7d2021 diff --git a/x11-misc/dunst/dunst-1.0.0.ebuild b/x11-misc/dunst/dunst-1.0.0.ebuild index 721b31b..a4dfca3 100644 --- a/x11-misc/dunst/dunst-1.0.0.ebuild +++ b/x11-misc/dunst/dunst-1.0.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/dunst/dunst-0.5.0.ebuild,v 1.1 2013/02/22 14:12:34 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/dunst/dunst-1.0.0.ebuild,v 1.3 2013/06/16 16:11:18 wired Exp $ EAPI=5 @@ -13,7 +13,7 @@ SRC_URI="http://www.knopwob.org/public/dunst-release/${P}.tar.bz2" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" +IUSE="dunstify" CDEPEND=" dev-libs/glib:2 @@ -22,12 +22,15 @@ CDEPEND=" x11-libs/libXScrnSaver x11-libs/libXft x11-libs/libXinerama - x11-libs/pango + x11-libs/cairo[X,glib] + x11-libs/pango[X] + dunstify? ( x11-libs/libnotify ) " DEPEND="${CDEPEND} dev-lang/perl virtual/pkgconfig" + RDEPEND="${CDEPEND}" src_prepare() { @@ -37,15 +40,20 @@ src_prepare() { s:-O.:: }" config.mk || die "sed failed" - # don't build dunstify: it pulls in deps but is not being installed - sed -ie "/^all:/ s:dunstify::" Makefile || 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 "${FILESDIR}"/dunst-1.0.0-numlock.patch - epatch "${FILESDIR}"/dunst-1.0.0-fix-pause-resume.patch + 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-fix-pause-resume.patch b/x11-misc/dunst/files/dunst-1.0.0-fix-pause-resume.patch deleted file mode 100644 index 9955177..0000000 --- a/x11-misc/dunst/files/dunst-1.0.0-fix-pause-resume.patch +++ /dev/null @@ -1,60 +0,0 @@ -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(-) - -diff --git a/dunst.c b/dunst.c -index fe67f4b..534a6d2 100644 ---- 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.8.1.5 - diff --git a/x11-misc/dunst/files/dunst-1.0.0-numlock.patch b/x11-misc/dunst/files/dunst-1.0.0-numlock.patch deleted file mode 100644 index e6b4d9a..0000000 --- a/x11-misc/dunst/files/dunst-1.0.0-numlock.patch +++ /dev/null @@ -1,130 +0,0 @@ -diff --git a/x.c b/x.c -index 2ad74d3..4248082 100644 ---- a/x.c -+++ b/x.c -@@ -458,6 +458,53 @@ static void setopacity(Window win, unsigned long opacity) - - - -+ /* -+ * Returns the modifier which is NumLock. -+ */ -+static KeySym x_numlock_mod() -+{ -+ const KeyCode nl = XKeysymToKeycode(xctx.dpy, XStringToKeysym("Num_Lock")); -+ -+ int mod; -+ KeySym sym = 0; -+ XModifierKeymap * map = XGetModifierMapping(xctx.dpy); -+ -+ for (mod = 0; mod < 8; mod++) { -+ for (int j = 0; j < map->max_keypermod; j++) { -+ if (map->modifiermap[mod*map->max_keypermod+j] == nl) { -+ switch (mod) { -+ case ShiftMapIndex: -+ sym = ShiftMask; -+ break; -+ case LockMapIndex: -+ sym = LockMask; -+ break; -+ case ControlMapIndex: -+ sym = ControlMask; -+ break; -+ case Mod1MapIndex: -+ sym = Mod1Mask; -+ break; -+ case Mod2MapIndex: -+ sym = Mod2Mask; -+ break; -+ case Mod3MapIndex: -+ sym = Mod3Mask; -+ break; -+ case Mod4MapIndex: -+ sym = Mod4Mask; -+ break; -+ case Mod5MapIndex: -+ sym = Mod5Mask; -+ break; -+ } -+ } -+ } -+ } -+ -+ XFreeModifiermap(map); -+ return sym; -+} - - /* - * Helper function to use glib's mainloop mechanic -@@ -488,6 +535,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) { -@@ -508,10 +556,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) -@@ -521,19 +572,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; -@@ -926,9 +977,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); -@@ -945,8 +999,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); -+ } - } - - /* |