Accepting request 328557 from home:dimstar:Factory

- Add libcaca-ncurses6.patch: defined against a function name never
  worked, so set_escdelay was actually never used. With curses 6.0,
  though, ESCDELAY is no longer 'a variable', but a reference to a
  function, so we can't assign anything to it. We just assume that
  we always use a recent enough version of ncurses to have
  set_escdelay avaialble.

OBS-URL: https://build.opensuse.org/request/show/328557
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libcaca?expand=0&rev=38
This commit is contained in:
Dave Plater 2015-09-02 09:47:11 +00:00 committed by Git OBS Bridge
parent f310858f70
commit e6273284ff
3 changed files with 28 additions and 0 deletions

16
libcaca-ncurses6.patch Normal file
View File

@ -0,0 +1,16 @@
Index: libcaca-0.99.beta19/caca/driver/ncurses.c
===================================================================
--- libcaca-0.99.beta19.orig/caca/driver/ncurses.c
+++ libcaca-0.99.beta19/caca/driver/ncurses.c
@@ -262,11 +262,7 @@ static int ncurses_init_graphics(caca_di
mouseinterval(-1); /* No click emulation */
/* Set the escape delay to a ridiculously low value */
-#if defined set_escdelay
set_escdelay(10);
-#else
- ESCDELAY = 10;
-#endif
/* Activate colour */
start_color();

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Wed Sep 2 07:14:17 UTC 2015 - dimstar@opensuse.org
- Add libcaca-ncurses6.patch: defined against a function name never
worked, so set_escdelay was actually never used. With curses 6.0,
though, ESCDELAY is no longer 'a variable', but a reference to a
function, so we can't assign anything to it. We just assume that
we always use a recent enough version of ncurses to have
set_escdelay avaialble.
-------------------------------------------------------------------
Fri Mar 20 15:50:59 UTC 2015 - dvlaeev@suse.com

View File

@ -57,6 +57,7 @@ Patch4: libcaca-ruby_am_cflags.patch
Patch5: libcaca-ruby_vendor_install.patch
Patch7: libcaca-0.99.beta16-missing-GLU.patch
Patch9: caca-no-build-date.patch
Patch10: libcaca-ncurses6.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define rb_vendorarch %{_libdir}/ruby/vendor_ruby/%{rb_ver}/%{rb_arch}
%define rb_vendorlib %{_libdir}/ruby/vendor_ruby/%{rb_ver}
@ -188,6 +189,7 @@ chmod 0644 %{S:0}
%patch7
%patch9
%patch1
%patch10 -p1
RUBY="ruby-`echo %{rb_ver} | sed 's|\.[^\.]*$||'`"
find . -type f -exec sed -i "s|ruby-1.9|$RUBY|" \{\} \;