Skip to content

Commit fc9d4e4

Browse files
committed
update libcaca patch for git master
1 parent 4421d2c commit fc9d4e4

File tree

1 file changed

+19
-21
lines changed

1 file changed

+19
-21
lines changed

patches/libcaca_git_stdio-cruft.diff

+19-21
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1-
diff -ur caca/figfont.c.bak caca/figfont.c
2-
--- caca/figfont.c.bak 2017-05-13 22:44:04.812500000 +0200
3-
+++ caca/figfont.c 2017-05-13 22:52:57.375000000 +0200
4-
@@ -637,31 +637,6 @@
5-
}
1+
diff --git a/caca/figfont.c b/caca/figfont.c
2+
index 4c50b4e..a41966a 100644
3+
--- a/caca/figfont.c
4+
+++ b/caca/figfont.c
5+
@@ -635,29 +635,3 @@ static uint32_t hsmush(uint32_t ch1, uint32_t ch2, int rule)
66

7-
/*
7+
return 0;
8+
}
9+
-
10+
-/*
811
- * Functions for the mingw32 runtime
912
- */
1013
-
@@ -29,13 +32,10 @@ diff -ur caca/figfont.c.bak caca/figfont.c
2932
-# endif
3033
-#endif
3134
-
32-
-/*
33-
* XXX: The following functions are aliases.
34-
*/
35-
36-
diff -ur caca/string.c.bak caca/string.c
37-
--- caca/string.c.bak 2017-05-13 22:44:04.859375000 +0200
38-
+++ caca/string.c 2017-05-13 22:53:04.890625000 +0200
35+
diff --git a/caca/string.c b/caca/string.c
36+
index b2a67ce..c6dc886 100644
37+
--- a/caca/string.c
38+
+++ b/caca/string.c
3939
@@ -36,16 +36,6 @@
4040
#include "caca.h"
4141
#include "caca_internals.h"
@@ -53,7 +53,7 @@ diff -ur caca/string.c.bak caca/string.c
5353
/** \brief Set cursor position.
5454
*
5555
* Put the cursor at the given coordinates. Functions making use of the
56-
@@ -349,13 +339,7 @@
56+
@@ -349,13 +339,7 @@ int caca_vprintf(caca_canvas_t *cv, int x, int y, char const *format,
5757
buf = malloc(bufsize);
5858
}
5959

@@ -67,10 +67,12 @@ diff -ur caca/string.c.bak caca/string.c
6767
buf[bufsize - 1] = '\0';
6868

6969
ret = caca_put_str(cv, x, y, buf);
70-
@@ -611,26 +595,6 @@
71-
}
70+
@@ -609,24 +593,3 @@ int caca_set_canvas_boundaries(caca_canvas_t *cv, int x, int y, int w, int h)
7271

73-
/*
72+
return 0;
73+
}
74+
-
75+
-/*
7476
- * Functions for the mingw32 runtime
7577
- */
7678
-
@@ -90,7 +92,3 @@ diff -ur caca/string.c.bak caca/string.c
9092
-# endif
9193
-#endif
9294
-
93-
-/*
94-
* XXX: The following functions are aliases.
95-
*/
96-

0 commit comments

Comments
 (0)