Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Jeroen Roovers <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/dunst/files/, x11-misc/dunst/
Date: Sat, 24 Sep 2016 10:30:20
Message-Id: 1474713006.5e5dd6d1633f13449b0a4d1bc94558fdd8187614.jer@gentoo
1 commit: 5e5dd6d1633f13449b0a4d1bc94558fdd8187614
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 24 10:26:15 2016 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 24 10:30:06 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e5dd6d1
7
8 x11-misc/dunst: Old
9
10 Package-Manager: portage-2.3.1
11
12 x11-misc/dunst/Manifest | 2 -
13 x11-misc/dunst/dunst-0.5.0.ebuild | 29 ----
14 x11-misc/dunst/dunst-1.0.0-r1.ebuild | 63 ---------
15 x11-misc/dunst/dunst-1.0.0.ebuild | 59 --------
16 .../dunst-1.0.0-correctly_handle_num_lock.patch | 149 ---------------------
17 .../dunst/files/dunst-1.0.0-fix_pause_resume.patch | 60 ---------
18 6 files changed, 362 deletions(-)
19
20 diff --git a/x11-misc/dunst/Manifest b/x11-misc/dunst/Manifest
21 index aec8705..182bd8b 100644
22 --- a/x11-misc/dunst/Manifest
23 +++ b/x11-misc/dunst/Manifest
24 @@ -1,3 +1 @@
25 -DIST dunst-0.5.0.tar.bz2 28521 SHA256 4be8cf366930b297f03078f233f2fec479638d0c69b0e5e75bb49da487684b05 SHA512 3ce762295ea28b10539da6c5b9b4bffa41535d90544d933b2b81838f44a6d5d95c292a08048576b87db4f74592e5e068687743d7fda0dc3aa4aac06aa81ba7fd WHIRLPOOL ab1200ddadff1bcf6bbb5a56b464c4da2c045e9e074e1ada3e1841574dde21e4e672452130b7fffa9605fb20ab22870f9e49af2b32e15513f7dfa071be9958b1
26 -DIST dunst-1.0.0.tar.bz2 75306 SHA256 5c79ef11165421a4828453a42dfe9c60a4cb9d8743f970186a90c67e277f5280 SHA512 81490597ef8354d2c32838c72e03b121cf09d61e0fbef697a8adfb0c4783e45b3bb05790bf94cc1d0ed41e7f4b5f13a8edfdc65fec5569dc29966edd0807bfe1 WHIRLPOOL 724295fec6d284cc512944435a93df8c55b214d59d2b2b33c3fbf83e6a51db40b6ca15ce68446988dbeab695b0a907a4301124f35fb6748bed8c8143042b0bd9
27 DIST dunst-1.1.0.tar.bz2 79032 SHA256 c72bf167eaab4e44a98ec87101b023efee0aa8916df56630b99a5bc53f8d7070 SHA512 ba01a6b18da5199b3356342f5c22592f93f447389267810bbfc35decf1a67f89650d445d3c1dd6f3cc76a4f86f7165adc777b669444627e42d3e671d4f04a04b WHIRLPOOL 6985c17549de4c7f6e2ba17ae1117db21693f4ed05df65e6238cfe6001aeb9c7a98834f3e794a0c80dbe913099082624256708c29ffa02cf35b0ab0032e94926
28
29 diff --git a/x11-misc/dunst/dunst-0.5.0.ebuild b/x11-misc/dunst/dunst-0.5.0.ebuild
30 deleted file mode 100644
31 index 46e56c6..00000000
32 --- a/x11-misc/dunst/dunst-0.5.0.ebuild
33 +++ /dev/null
34 @@ -1,29 +0,0 @@
35 -# Copyright 1999-2013 Gentoo Foundation
36 -# Distributed under the terms of the GNU General Public License v2
37 -# $Id$
38 -
39 -EAPI=5
40 -
41 -DESCRIPTION="customizable and lightweight notification-daemon"
42 -HOMEPAGE="http://www.knopwob.org/dunst/"
43 -SRC_URI="http://www.knopwob.org/public/dunst-release/${P}.tar.bz2"
44 -
45 -LICENSE="BSD"
46 -SLOT="0"
47 -KEYWORDS="~amd64 ~x86"
48 -IUSE=""
49 -
50 -DEPEND="
51 - dev-libs/libxdg-basedir
52 - sys-apps/dbus
53 - x11-libs/libXScrnSaver
54 - x11-libs/libXft
55 - x11-libs/libXinerama
56 -"
57 -RDEPEND="${DEPEND}"
58 -
59 -src_install() {
60 - emake DESTDIR="${D}" PREFIX="/usr" install
61 -
62 - dodoc CHANGELOG
63 -}
64
65 diff --git a/x11-misc/dunst/dunst-1.0.0-r1.ebuild b/x11-misc/dunst/dunst-1.0.0-r1.ebuild
66 deleted file mode 100644
67 index cdfd2d6..00000000
68 --- a/x11-misc/dunst/dunst-1.0.0-r1.ebuild
69 +++ /dev/null
70 @@ -1,63 +0,0 @@
71 -# Copyright 1999-2014 Gentoo Foundation
72 -# Distributed under the terms of the GNU General Public License v2
73 -# $Id$
74 -
75 -EAPI=5
76 -
77 -inherit eutils
78 -
79 -DESCRIPTION="customizable and lightweight notification-daemon"
80 -HOMEPAGE="http://www.knopwob.org/dunst/"
81 -SRC_URI="http://www.knopwob.org/public/dunst-release/${P}.tar.bz2"
82 -
83 -LICENSE="BSD"
84 -SLOT="0"
85 -KEYWORDS="~amd64 ~x86"
86 -IUSE="dunstify"
87 -
88 -CDEPEND="
89 - dev-libs/glib:2
90 - dev-libs/libxdg-basedir
91 - sys-apps/dbus
92 - x11-libs/libXScrnSaver
93 - x11-libs/libXft
94 - x11-libs/libXinerama
95 - x11-libs/cairo[X,glib]
96 - x11-libs/pango[X]
97 - dunstify? ( x11-libs/libnotify )
98 -"
99 -
100 -DEPEND="${CDEPEND}
101 - dev-lang/perl
102 - virtual/pkgconfig"
103 -
104 -RDEPEND="${CDEPEND}"
105 -
106 -src_prepare() {
107 - # fixes backported from git
108 - epatch "${FILESDIR}"/${P}-correctly_handle_num_lock.patch
109 - epatch "${FILESDIR}"/${P}-fix_pause_resume.patch
110 -
111 - # Remove nasty CFLAGS which override user choice
112 - sed -ie "/^CFLAGS/ {
113 - s:-g::
114 - s:-O.::
115 - }" config.mk || die "sed failed"
116 -
117 - if ! use dunstify; then
118 - # don't build dunstify: it pulls in deps but is not being installed
119 - sed -ie "/^all:/ s:dunstify::" Makefile || die "sed failed"
120 - fi
121 -
122 - epatch_user
123 -}
124 -
125 -src_install() {
126 - emake DESTDIR="${D}" PREFIX="/usr" install
127 -
128 - if use dunstify; then
129 - dobin dunstify
130 - fi
131 -
132 - dodoc CHANGELOG
133 -}
134
135 diff --git a/x11-misc/dunst/dunst-1.0.0.ebuild b/x11-misc/dunst/dunst-1.0.0.ebuild
136 deleted file mode 100644
137 index 32aa742..00000000
138 --- a/x11-misc/dunst/dunst-1.0.0.ebuild
139 +++ /dev/null
140 @@ -1,59 +0,0 @@
141 -# Copyright 1999-2013 Gentoo Foundation
142 -# Distributed under the terms of the GNU General Public License v2
143 -# $Id$
144 -
145 -EAPI=5
146 -
147 -inherit eutils
148 -
149 -DESCRIPTION="customizable and lightweight notification-daemon"
150 -HOMEPAGE="http://www.knopwob.org/dunst/"
151 -SRC_URI="http://www.knopwob.org/public/dunst-release/${P}.tar.bz2"
152 -
153 -LICENSE="BSD"
154 -SLOT="0"
155 -KEYWORDS="~amd64 ~x86"
156 -IUSE="dunstify"
157 -
158 -CDEPEND="
159 - dev-libs/glib:2
160 - dev-libs/libxdg-basedir
161 - sys-apps/dbus
162 - x11-libs/libXScrnSaver
163 - x11-libs/libXft
164 - x11-libs/libXinerama
165 - x11-libs/cairo[X,glib]
166 - x11-libs/pango[X]
167 - dunstify? ( x11-libs/libnotify )
168 -"
169 -
170 -DEPEND="${CDEPEND}
171 - dev-lang/perl
172 - virtual/pkgconfig"
173 -
174 -RDEPEND="${CDEPEND}"
175 -
176 -src_prepare() {
177 - # Remove nasty CFLAGS which override user choice
178 - sed -ie "/^CFLAGS/ {
179 - s:-g::
180 - s:-O.::
181 - }" config.mk || die "sed failed"
182 -
183 - if ! use dunstify; then
184 - # don't build dunstify: it pulls in deps but is not being installed
185 - sed -ie "/^all:/ s:dunstify::" Makefile || die "sed failed"
186 - fi
187 -
188 - epatch_user
189 -}
190 -
191 -src_install() {
192 - emake DESTDIR="${D}" PREFIX="/usr" install
193 -
194 - if use dunstify; then
195 - dobin dunstify
196 - fi
197 -
198 - dodoc CHANGELOG
199 -}
200
201 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
202 deleted file mode 100644
203 index fc784fb..00000000
204 --- a/x11-misc/dunst/files/dunst-1.0.0-correctly_handle_num_lock.patch
205 +++ /dev/null
206 @@ -1,149 +0,0 @@
207 -https://github.com/knopwob/dunst/commit/be7d2b351
208 -
209 -From be7d2b3511dc528b135e5dc6d5358c700fefaa30 Mon Sep 17 00:00:00 2001
210 -From: =?UTF-8?q?Ren=C3=A9=20=27Necoro=27=20Neumann?= <necoro@××××××.net>
211 -Date: Mon, 3 Jun 2013 14:39:24 +0200
212 -Subject: [PATCH] Correctly handle Num_Lock.
213 -
214 -Find out which modifier key is used by Num_Lock (`x_numlock_mod()`) and
215 -register grabs for both variants: modifier present/not present.
216 ----
217 - x.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------
218 - 1 file changed, 67 insertions(+), 6 deletions(-)
219 -
220 ---- a/x.c
221 -+++ b/x.c
222 -@@ -485,6 +485,58 @@ static void setopacity(Window win, unsigned long opacity)
223 -
224 -
225 -
226 -+ /*
227 -+ * Returns the modifier which is NumLock.
228 -+ */
229 -+static KeySym x_numlock_mod()
230 -+{
231 -+ static KeyCode nl = 0;
232 -+ KeySym sym = 0;
233 -+ XModifierKeymap * map = XGetModifierMapping(xctx.dpy);
234 -+
235 -+ if (!nl)
236 -+ nl = XKeysymToKeycode(xctx.dpy, XStringToKeysym("Num_Lock"));
237 -+
238 -+ for (int mod = 0; mod < 8; mod++) {
239 -+ for (int j = 0; j < map->max_keypermod; j++) {
240 -+ if (map->modifiermap[mod*map->max_keypermod+j] == nl) {
241 -+ /* In theory, one could use `1 << mod`, but this
242 -+ * could count as 'using implementation details',
243 -+ * so use this large switch. */
244 -+ switch (mod) {
245 -+ case ShiftMapIndex:
246 -+ sym = ShiftMask;
247 -+ goto end;
248 -+ case LockMapIndex:
249 -+ sym = LockMask;
250 -+ goto end;
251 -+ case ControlMapIndex:
252 -+ sym = ControlMask;
253 -+ goto end;
254 -+ case Mod1MapIndex:
255 -+ sym = Mod1Mask;
256 -+ goto end;
257 -+ case Mod2MapIndex:
258 -+ sym = Mod2Mask;
259 -+ goto end;
260 -+ case Mod3MapIndex:
261 -+ sym = Mod3Mask;
262 -+ goto end;
263 -+ case Mod4MapIndex:
264 -+ sym = Mod4Mask;
265 -+ goto end;
266 -+ case Mod5MapIndex:
267 -+ sym = Mod5Mask;
268 -+ goto end;
269 -+ }
270 -+ }
271 -+ }
272 -+ }
273 -+
274 -+end:
275 -+ XFreeModifiermap(map);
276 -+ return sym;
277 -+}
278 -
279 - /*
280 - * Helper function to use glib's mainloop mechanic
281 -@@ -515,6 +567,7 @@ gboolean x_mainloop_fd_dispatch(GSource * source, GSourceFunc callback,
282 - gpointer user_data)
283 - {
284 - XEvent ev;
285 -+ unsigned int state;
286 - while (XPending(xctx.dpy) > 0) {
287 - XNextEvent(xctx.dpy, &ev);
288 - switch (ev.type) {
289 -@@ -535,10 +588,13 @@ gboolean x_mainloop_fd_dispatch(GSource * source, GSourceFunc callback,
290 - }
291 - break;
292 - case KeyPress:
293 -+ state = ev.xkey.state;
294 -+ /* NumLock is also encoded in the state. Remove it. */
295 -+ state &= ~x_numlock_mod();
296 - if (settings.close_ks.str
297 - && XLookupKeysym(&ev.xkey,
298 - 0) == settings.close_ks.sym
299 -- && settings.close_ks.mask == ev.xkey.state) {
300 -+ && settings.close_ks.mask == state) {
301 - if (displayed) {
302 - notification *n = g_queue_peek_head(displayed);
303 - if (n)
304 -@@ -548,19 +604,19 @@ gboolean x_mainloop_fd_dispatch(GSource * source, GSourceFunc callback,
305 - if (settings.history_ks.str
306 - && XLookupKeysym(&ev.xkey,
307 - 0) == settings.history_ks.sym
308 -- && settings.history_ks.mask == ev.xkey.state) {
309 -+ && settings.history_ks.mask == state) {
310 - history_pop();
311 - }
312 - if (settings.close_all_ks.str
313 - && XLookupKeysym(&ev.xkey,
314 - 0) == settings.close_all_ks.sym
315 -- && settings.close_all_ks.mask == ev.xkey.state) {
316 -+ && settings.close_all_ks.mask == state) {
317 - move_all_to_history();
318 - }
319 - if (settings.context_ks.str
320 - && XLookupKeysym(&ev.xkey,
321 - 0) == settings.context_ks.sym
322 -- && settings.context_ks.mask == ev.xkey.state) {
323 -+ && settings.context_ks.mask == state) {
324 - context_menu();
325 - }
326 - break;
327 -@@ -953,9 +1009,12 @@ int x_shortcut_grab(keyboard_shortcut * ks)
328 -
329 - x_shortcut_setup_error_handler();
330 -
331 -- if (ks->is_valid)
332 -+ if (ks->is_valid) {
333 - XGrabKey(xctx.dpy, ks->code, ks->mask, root,
334 - true, GrabModeAsync, GrabModeAsync);
335 -+ XGrabKey(xctx.dpy, ks->code, ks->mask | x_numlock_mod() , root,
336 -+ true, GrabModeAsync, GrabModeAsync);
337 -+ }
338 -
339 - if (x_shortcut_tear_down_error_handler()) {
340 - fprintf(stderr, "Unable to grab key \"%s\"\n", ks->str);
341 -@@ -972,8 +1031,10 @@ void x_shortcut_ungrab(keyboard_shortcut * ks)
342 - {
343 - Window root;
344 - root = RootWindow(xctx.dpy, DefaultScreen(xctx.dpy));
345 -- if (ks->is_valid)
346 -+ if (ks->is_valid) {
347 - XUngrabKey(xctx.dpy, ks->code, ks->mask, root);
348 -+ XUngrabKey(xctx.dpy, ks->code, ks->mask | x_numlock_mod(), root);
349 -+ }
350 - }
351 -
352 - /*
353 ---
354 -1.9.1
355 -
356
357 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
358 deleted file mode 100644
359 index f95cc31..00000000
360 --- a/x11-misc/dunst/files/dunst-1.0.0-fix_pause_resume.patch
361 +++ /dev/null
362 @@ -1,60 +0,0 @@
363 -https://github.com/knopwob/dunst/commit/04248fd4
364 -
365 -From 04248fd49ef6769c7dc7e246fc505ad9c70afe27 Mon Sep 17 00:00:00 2001
366 -From: Sascha Kruse <knopwob@××××××××××.com>
367 -Date: Mon, 22 Apr 2013 20:07:35 +0000
368 -Subject: [PATCH] fix pause/resume
369 -
370 -this fixes github issue #98
371 ----
372 - dunst.c | 14 ++++++++------
373 - 1 file changed, 8 insertions(+), 6 deletions(-)
374 -
375 ---- a/dunst.c
376 -+++ b/dunst.c
377 -@@ -105,7 +105,7 @@ void update_lists()
378 -
379 - if (pause_display) {
380 - while (displayed->length > 0) {
381 -- g_queue_insert_sorted(queue, g_queue_pop_head(queue),
382 -+ g_queue_insert_sorted(queue, g_queue_pop_head(displayed),
383 - notification_cmp_data, NULL);
384 - }
385 - return;
386 -@@ -240,16 +240,16 @@ gboolean run(void *data)
387 - timeout_cnt--;
388 - }
389 -
390 -- if (displayed->length > 0 && !xctx.visible) {
391 -- x_win_show();
392 -+ if (displayed->length > 0 && !xctx.visible && !pause_display) {
393 -+ x_win_show();
394 - }
395 -
396 -- if (displayed->length == 0 && xctx.visible) {
397 -- x_win_hide();
398 -+ if (xctx.visible && (pause_display || displayed->length == 0)) {
399 -+ x_win_hide();
400 - }
401 -
402 - if (xctx.visible) {
403 -- x_win_draw();
404 -+ x_win_draw();
405 - }
406 -
407 - if (xctx.visible) {
408 -@@ -355,9 +355,11 @@ void pause_signal_handler(int sig)
409 - {
410 - if (sig == SIGUSR1) {
411 - pause_display = true;
412 -+ wake_up();
413 - }
414 - if (sig == SIGUSR2) {
415 - pause_display = false;
416 -+ wake_up();
417 - }
418 -
419 - signal(sig, pause_signal_handler);
420 ---
421 -1.9.1
422 -
Report Message
Find on MARC Find on Google Groups