summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2014-07-25 19:25:36 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2014-07-25 19:25:36 +0000
commit55d136db6e81b502028242915cc70a73628518b1 (patch)
treef5ccc7f73465e5792130b354c42f5a835d302be6 /media-video/xine-ui/files
parentfix version numbers, fix tecla use flag, stub out doc use flag waiting for up... (diff)
downloadgentoo-2-55d136db6e81b502028242915cc70a73628518b1.tar.gz
gentoo-2-55d136db6e81b502028242915cc70a73628518b1.tar.bz2
gentoo-2-55d136db6e81b502028242915cc70a73628518b1.zip
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.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'media-video/xine-ui/files')
-rw-r--r--media-video/xine-ui/files/xine-ui-0.99.8-readline-6.3.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/media-video/xine-ui/files/xine-ui-0.99.8-readline-6.3.patch b/media-video/xine-ui/files/xine-ui-0.99.8-readline-6.3.patch
new file mode 100644
index 000000000000..3799975d0afb
--- /dev/null
+++ b/media-video/xine-ui/files/xine-ui-0.99.8-readline-6.3.patch
@@ -0,0 +1,33 @@
+http://bugs.gentoo.org/show_bug.cgi?id=504208
+
+Fix building with readline >= 6.3 API (see network.c change)
+Fix another crash on exit (see main.c change)
+
+patches/debian-changes from xine-ui_0.99.8-2.debian.tar.xz at http://packages.debian.org/xine-ui
+
+--- src/xitk/main.c
++++ src/xitk/main.c
+@@ -1255,8 +1255,10 @@ static void event_listener(void *user_da
+ gGui->mixer.volume_level = (aevent->left + aevent->right) / 2;
+ if(gGui->mixer.method == SOUND_CARD_MIXER) {
+ gGui->mixer.mute = aevent->mute;
+- xitk_slider_set_pos(panel->mixer.slider, gGui->mixer.volume_level);
+- xitk_checkbox_set_state(panel->mixer.mute, gGui->mixer.mute);
++ if (panel) {
++ xitk_slider_set_pos(panel->mixer.slider, gGui->mixer.volume_level);
++ xitk_checkbox_set_state(panel->mixer.mute, gGui->mixer.mute);
++ }
+ }
+ }
+ break;
+--- src/xitk/network.c
++++ src/xitk/network.c
+@@ -1255,7 +1255,7 @@ int main(int argc, char **argv) {
+ rl_readline_name = PROGNAME;
+ rl_set_prompt(session.prompt);
+ rl_initialize();
+- rl_attempted_completion_function = (CPPFunction *)completion_function;
++ rl_attempted_completion_function = completion_function;
+
+ signal(SIGPIPE, SIG_IGN);
+