Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-video/xine-ui/files: xine-ui-0.99.8-readline-6.3.patch
Date: Fri, 25 Jul 2014 19:25:41
Message-Id: 20140725192536.DAF3E2004E@flycatcher.gentoo.org
1 ssuominen 14/07/25 19:25:36
2
3 Added: xine-ui-0.99.8-readline-6.3.patch
4 Log:
5 Version bump with sys-libs/readline >= 6.3 compability patch wrt #504208 by Dmitry Derevyanko. Import yet another "prevent crash on exit" fix from Debian patchset.
6
7 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
8
9 Revision Changes Path
10 1.1 media-video/xine-ui/files/xine-ui-0.99.8-readline-6.3.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/xine-ui/files/xine-ui-0.99.8-readline-6.3.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/xine-ui/files/xine-ui-0.99.8-readline-6.3.patch?rev=1.1&content-type=text/plain
14
15 Index: xine-ui-0.99.8-readline-6.3.patch
16 ===================================================================
17 http://bugs.gentoo.org/show_bug.cgi?id=504208
18
19 Fix building with readline >= 6.3 API (see network.c change)
20 Fix another crash on exit (see main.c change)
21
22 patches/debian-changes from xine-ui_0.99.8-2.debian.tar.xz at http://packages.debian.org/xine-ui
23
24 --- src/xitk/main.c
25 +++ src/xitk/main.c
26 @@ -1255,8 +1255,10 @@ static void event_listener(void *user_da
27 gGui->mixer.volume_level = (aevent->left + aevent->right) / 2;
28 if(gGui->mixer.method == SOUND_CARD_MIXER) {
29 gGui->mixer.mute = aevent->mute;
30 - xitk_slider_set_pos(panel->mixer.slider, gGui->mixer.volume_level);
31 - xitk_checkbox_set_state(panel->mixer.mute, gGui->mixer.mute);
32 + if (panel) {
33 + xitk_slider_set_pos(panel->mixer.slider, gGui->mixer.volume_level);
34 + xitk_checkbox_set_state(panel->mixer.mute, gGui->mixer.mute);
35 + }
36 }
37 }
38 break;
39 --- src/xitk/network.c
40 +++ src/xitk/network.c
41 @@ -1255,7 +1255,7 @@ int main(int argc, char **argv) {
42 rl_readline_name = PROGNAME;
43 rl_set_prompt(session.prompt);
44 rl_initialize();
45 - rl_attempted_completion_function = (CPPFunction *)completion_function;
46 + rl_attempted_completion_function = completion_function;
47
48 signal(SIGPIPE, SIG_IGN);