[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#975082: [PATCH] patch for snd-20.9 for notcurses 2.0.7



As requested, here's a patch that gets snd-20.9 as packaged in
Debian's snd_20.9-1 to compile with Notcurses 2.0.7. Since
there's no version less than 2.0.7 in Debian, there's no need to
do the fine-grained comparisons the upstream author is doing.
The next release from upstream will have a native solution to
this, at which point this patch can be dropped. I'm sorry for
the inconvenience!

[schwarzgerat](0) $ cat notcurses2.diff 
diff -ur snd-20.9-a/notcurses_s7.c snd-20.9-b/notcurses_s7.c
--- snd-20.9-a/notcurses_s7.c	2020-11-22 05:02:25.000000000 -0500
+++ snd-20.9-b/notcurses_s7.c	2020-11-24 04:58:19.984208602 -0500
@@ -1014,7 +1014,7 @@
   return(s7_car(args));
 }
 
-#if NOTCURSES_2_0_5
+#if NOTCURSES_2
 static s7_pointer g_ncplane_options_x(s7_scheme *sc, s7_pointer args) 
 {
   return(s7_make_integer(sc, ((ncplane_options *)s7_c_pointer_with_type(sc, s7_car(args), ncplane_options_symbol, __func__, 1))->x));
@@ -1635,7 +1635,7 @@
   {
    ncplane_options nopts = {
      .y = yoff,
-#if NOTCURSES_2_0_5
+#if NOTCURSES_2
      .x = xoff,
 #else
      .horiz = {
[schwarzgerat](0) $ 

-- 
nick black -=- https://www.nick-black.com
to make an apple pie from scratch,
you need first invent a universe.
diff -ur snd-20.9-a/notcurses_s7.c snd-20.9-b/notcurses_s7.c
--- snd-20.9-a/notcurses_s7.c	2020-11-22 05:02:25.000000000 -0500
+++ snd-20.9-b/notcurses_s7.c	2020-11-24 04:58:19.984208602 -0500
@@ -1014,7 +1014,7 @@
   return(s7_car(args));
 }
 
-#if NOTCURSES_2_0_5
+#if NOTCURSES_2
 static s7_pointer g_ncplane_options_x(s7_scheme *sc, s7_pointer args) 
 {
   return(s7_make_integer(sc, ((ncplane_options *)s7_c_pointer_with_type(sc, s7_car(args), ncplane_options_symbol, __func__, 1))->x));
@@ -1635,7 +1635,7 @@
   {
    ncplane_options nopts = {
      .y = yoff,
-#if NOTCURSES_2_0_5
+#if NOTCURSES_2
      .x = xoff,
 #else
      .horiz = {

Reply to: