summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/slang/slang/change-char-type-to-signed-char-in-macros.patch218
-rw-r--r--meta/recipes-extended/slang/slang/fix-check-pcre.patch30
-rw-r--r--meta/recipes-extended/slang/slang/rpathfix.patch18
-rw-r--r--meta/recipes-extended/slang/slang/slang-fix-the-iconv-existence-checking.patch31
-rw-r--r--meta/recipes-extended/slang/slang/sprintf-bug-concerning-8-bit-characters.patch42
-rw-r--r--meta/recipes-extended/slang/slang_2.3.0.bb (renamed from meta/recipes-extended/slang/slang_2.2.4.bb)9
6 files changed, 57 insertions, 291 deletions
diff --git a/meta/recipes-extended/slang/slang/change-char-type-to-signed-char-in-macros.patch b/meta/recipes-extended/slang/slang/change-char-type-to-signed-char-in-macros.patch
deleted file mode 100644
index 2ea1ffda57..0000000000
--- a/meta/recipes-extended/slang/slang/change-char-type-to-signed-char-in-macros.patch
+++ /dev/null
@@ -1,218 +0,0 @@
1slang: change char type to signed char in macros
2
3C language has 3 distinct char types:
4 char
5 unsigned char
6 signed char
7A char has the same range of values as signed char on X86,
8but same as unsigned char on ARM which made Slang's typecast()
9and array_sort() unable to work for char value on ARM, since
10Slang is assuming "char" as "signed char".
11
12Now we change "char" as "signed char" explicitly in
13util/mkslarith2.sl, and use it to regenerate src/slarith2.inc
14
15Upstream-Status: Submitted
16Signed-off-by: Roy.Li <rongqing.li@windriver.com>
17---
18 src/slarith2.inc | 72 ++++++++++++++++++++++++-------------------------
19 src/util/mkslarith2.sl | 2 -
20 2 files changed, 37 insertions(+), 37 deletions(-)
21
22--- a/src/util/mkslarith2.sl
23+++ b/src/util/mkslarith2.sl
24@@ -1,7 +1,7 @@
25 #!/usr/bin/env slsh
26
27 private variable CTypes =
28- ["char", "unsigned char", "short", "unsigned short", "int", "unsigned int",
29+ ["signed char", "unsigned char", "short", "unsigned short", "int", "unsigned int",
30 "long", "unsigned long", "long long", "unsigned long long",
31 "float", "double", "long double"];
32 private variable Is_Int_Type =
33--- a/src/slarith2.inc
34+++ b/src/slarith2.inc
35@@ -1,43 +1,43 @@
36 /* DO NOT EDIT -- this file was generated by src/util/mkslarith2.sl */
37-/* ------------ char ---------- */
38-DEFUN_1(copy_char_to_char,char,char)
39+/* ------------ signed char ---------- */
40+DEFUN_1(copy_char_to_char,signed char,signed char)
41 #define char_to_char NULL
42 #define copy_char_to_uchar copy_char_to_char
43 #define char_to_uchar NULL
44-DEFUN_1(copy_char_to_short,char,short)
45+DEFUN_1(copy_char_to_short,signed char,short)
46 #define char_to_short NULL
47-DEFUN_1(copy_char_to_ushort,char,unsigned short)
48+DEFUN_1(copy_char_to_ushort,signed char,unsigned short)
49 #define char_to_ushort NULL
50-DEFUN_1(copy_char_to_int,char,int)
51-DEFUN_2(char_to_int,char,int,copy_char_to_int)
52-DEFUN_1(copy_char_to_uint,char,unsigned int)
53-DEFUN_2(char_to_uint,char,unsigned int,copy_char_to_uint)
54-DEFUN_1(copy_char_to_long,char,long)
55-DEFUN_2(char_to_long,char,long,copy_char_to_long)
56-DEFUN_1(copy_char_to_ulong,char,unsigned long)
57-DEFUN_2(char_to_ulong,char,unsigned long,copy_char_to_ulong)
58+DEFUN_1(copy_char_to_int,signed char,int)
59+DEFUN_2(char_to_int,signed char,int,copy_char_to_int)
60+DEFUN_1(copy_char_to_uint,signed char,unsigned int)
61+DEFUN_2(char_to_uint,signed char,unsigned int,copy_char_to_uint)
62+DEFUN_1(copy_char_to_long,signed char,long)
63+DEFUN_2(char_to_long,signed char,long,copy_char_to_long)
64+DEFUN_1(copy_char_to_ulong,signed char,unsigned long)
65+DEFUN_2(char_to_ulong,signed char,unsigned long,copy_char_to_ulong)
66 #if defined(HAVE_LONG_LONG)
67-DEFUN_1(copy_char_to_llong,char,long long)
68-DEFUN_2(char_to_llong,char,long long,copy_char_to_llong)
69+DEFUN_1(copy_char_to_llong,signed char,long long)
70+DEFUN_2(char_to_llong,signed char,long long,copy_char_to_llong)
71 #endif /* defined(HAVE_LONG_LONG) */
72 #if defined(HAVE_LONG_LONG)
73-DEFUN_1(copy_char_to_ullong,char,unsigned long long)
74-DEFUN_2(char_to_ullong,char,unsigned long long,copy_char_to_ullong)
75+DEFUN_1(copy_char_to_ullong,signed char,unsigned long long)
76+DEFUN_2(char_to_ullong,signed char,unsigned long long,copy_char_to_ullong)
77 #endif /* defined(HAVE_LONG_LONG) */
78 #if SLANG_HAS_FLOAT
79-DEFUN_1(copy_char_to_float,char,float)
80-DEFUN_2(char_to_float,char,float,copy_char_to_float)
81+DEFUN_1(copy_char_to_float,signed char,float)
82+DEFUN_2(char_to_float,signed char,float,copy_char_to_float)
83 #endif /* SLANG_HAS_FLOAT */
84 #if SLANG_HAS_FLOAT
85-DEFUN_1(copy_char_to_double,char,double)
86-DEFUN_2(char_to_double,char,double,copy_char_to_double)
87+DEFUN_1(copy_char_to_double,signed char,double)
88+DEFUN_2(char_to_double,signed char,double,copy_char_to_double)
89 #endif /* SLANG_HAS_FLOAT */
90 #if defined(HAVE_LONG_DOUBLE)
91-DEFUN_1(copy_char_to_ldouble,char,long double)
92-DEFUN_2(char_to_ldouble,char,long double,copy_char_to_ldouble)
93+DEFUN_1(copy_char_to_ldouble,signed char,long double)
94+DEFUN_2(char_to_ldouble,signed char,long double,copy_char_to_ldouble)
95 #endif /* defined(HAVE_LONG_DOUBLE) */
96 #if SLANG_HAS_FLOAT
97-TO_DOUBLE_FUN(char_to_one_double,char)
98+TO_DOUBLE_FUN(char_to_one_double,signed char)
99 #endif
100
101 /* ------------ unsigned char ---------- */
102@@ -82,7 +82,7 @@ TO_DOUBLE_FUN(uchar_to_one_double,unsign
103 #endif
104
105 /* ------------ short ---------- */
106-DEFUN_1(copy_short_to_char,short,char)
107+DEFUN_1(copy_short_to_char,short,signed char)
108 #define short_to_char NULL
109 DEFUN_1(copy_short_to_uchar,short,unsigned char)
110 #define short_to_uchar NULL
111@@ -123,7 +123,7 @@ TO_DOUBLE_FUN(short_to_one_double,short)
112 #endif
113
114 /* ------------ unsigned short ---------- */
115-DEFUN_1(copy_ushort_to_char,unsigned short,char)
116+DEFUN_1(copy_ushort_to_char,unsigned short,signed char)
117 #define ushort_to_char NULL
118 DEFUN_1(copy_ushort_to_uchar,unsigned short,unsigned char)
119 #define ushort_to_uchar NULL
120@@ -164,7 +164,7 @@ TO_DOUBLE_FUN(ushort_to_one_double,unsig
121 #endif
122
123 /* ------------ int ---------- */
124-DEFUN_1(copy_int_to_char,int,char)
125+DEFUN_1(copy_int_to_char,int,signed char)
126 #define int_to_char NULL
127 DEFUN_1(copy_int_to_uchar,int,unsigned char)
128 #define int_to_uchar NULL
129@@ -205,7 +205,7 @@ TO_DOUBLE_FUN(int_to_one_double,int)
130 #endif
131
132 /* ------------ unsigned int ---------- */
133-DEFUN_1(copy_uint_to_char,unsigned int,char)
134+DEFUN_1(copy_uint_to_char,unsigned int,signed char)
135 #define uint_to_char NULL
136 DEFUN_1(copy_uint_to_uchar,unsigned int,unsigned char)
137 #define uint_to_uchar NULL
138@@ -246,7 +246,7 @@ TO_DOUBLE_FUN(uint_to_one_double,unsigne
139 #endif
140
141 /* ------------ long ---------- */
142-DEFUN_1(copy_long_to_char,long,char)
143+DEFUN_1(copy_long_to_char,long,signed char)
144 #define long_to_char NULL
145 DEFUN_1(copy_long_to_uchar,long,unsigned char)
146 #define long_to_uchar NULL
147@@ -287,7 +287,7 @@ TO_DOUBLE_FUN(long_to_one_double,long)
148 #endif
149
150 /* ------------ unsigned long ---------- */
151-DEFUN_1(copy_ulong_to_char,unsigned long,char)
152+DEFUN_1(copy_ulong_to_char,unsigned long,signed char)
153 #define ulong_to_char NULL
154 DEFUN_1(copy_ulong_to_uchar,unsigned long,unsigned char)
155 #define ulong_to_uchar NULL
156@@ -329,7 +329,7 @@ TO_DOUBLE_FUN(ulong_to_one_double,unsign
157
158 /* ------------ long long ---------- */
159 #if defined(HAVE_LONG_LONG)
160-DEFUN_1(copy_llong_to_char,long long,char)
161+DEFUN_1(copy_llong_to_char,long long,signed char)
162 #define llong_to_char NULL
163 DEFUN_1(copy_llong_to_uchar,long long,unsigned char)
164 #define llong_to_uchar NULL
165@@ -372,7 +372,7 @@ TO_DOUBLE_FUN(llong_to_one_double,long l
166
167 /* ------------ unsigned long long ---------- */
168 #if defined(HAVE_LONG_LONG)
169-DEFUN_1(copy_ullong_to_char,unsigned long long,char)
170+DEFUN_1(copy_ullong_to_char,unsigned long long,signed char)
171 #define ullong_to_char NULL
172 DEFUN_1(copy_ullong_to_uchar,unsigned long long,unsigned char)
173 #define ullong_to_uchar NULL
174@@ -415,7 +415,7 @@ TO_DOUBLE_FUN(ullong_to_one_double,unsig
175
176 /* ------------ float ---------- */
177 #if SLANG_HAS_FLOAT
178-DEFUN_1(copy_float_to_char,float,char)
179+DEFUN_1(copy_float_to_char,float,signed char)
180 #define float_to_char NULL
181 DEFUN_1(copy_float_to_uchar,float,unsigned char)
182 #define float_to_uchar NULL
183@@ -458,7 +458,7 @@ TO_DOUBLE_FUN(float_to_one_double,float)
184
185 /* ------------ double ---------- */
186 #if SLANG_HAS_FLOAT
187-DEFUN_1(copy_double_to_char,double,char)
188+DEFUN_1(copy_double_to_char,double,signed char)
189 #define double_to_char NULL
190 DEFUN_1(copy_double_to_uchar,double,unsigned char)
191 #define double_to_uchar NULL
192@@ -501,7 +501,7 @@ TO_DOUBLE_FUN(double_to_one_double,doubl
193
194 /* ------------ long double ---------- */
195 #if defined(HAVE_LONG_DOUBLE)
196-DEFUN_1(copy_ldouble_to_char,long double,char)
197+DEFUN_1(copy_ldouble_to_char,long double,signed char)
198 #define ldouble_to_char NULL
199 DEFUN_1(copy_ldouble_to_uchar,long double,unsigned char)
200 #define ldouble_to_uchar NULL
201@@ -545,7 +545,7 @@ TO_DOUBLE_FUN(ldouble_to_one_double,long
202 #if SLANG_HAS_FLOAT
203 static To_Double_Fun_Table_Type To_Double_Fun_Table [MAX_ARITHMETIC_TYPES] =
204 {
205- {sizeof(char), char_to_one_double},
206+ {sizeof(signed char), char_to_one_double},
207 {sizeof(unsigned char), uchar_to_one_double},
208 {sizeof(short), short_to_one_double},
209 {sizeof(unsigned short), ushort_to_one_double},
210@@ -583,7 +583,7 @@ static To_Double_Fun_Table_Type To_Doubl
211
212 static Binary_Matrix_Type Binary_Matrix [MAX_ARITHMETIC_TYPES][MAX_ARITHMETIC_TYPES] =
213 {
214- /* char */
215+ /* signed char */
216 {
217 {(FVOID_STAR)copy_char_to_char, char_to_char},
218 {(FVOID_STAR)copy_char_to_uchar, char_to_uchar},
diff --git a/meta/recipes-extended/slang/slang/fix-check-pcre.patch b/meta/recipes-extended/slang/slang/fix-check-pcre.patch
index 0c1553a661..a0ec0ff658 100644
--- a/meta/recipes-extended/slang/slang/fix-check-pcre.patch
+++ b/meta/recipes-extended/slang/slang/fix-check-pcre.patch
@@ -11,14 +11,13 @@ this off.
11Upstream-Status: Inappropriate 11Upstream-Status: Inappropriate
12Signed-off-by: Roy.Li <rongqing.li@windriver.com> 12Signed-off-by: Roy.Li <rongqing.li@windriver.com>
13--- 13---
14 configure | 60 ++++++------------------------------------------------------ 14 configure | 72 +++++---------------------------------------------------------
15 1 files changed, 6 insertions(+), 54 deletions(-) 15 1 file changed, 6 insertions(+), 66 deletions(-)
16 16
17diff --git a/configure b/configure 17diff --git a/configure b/configure
18index f1586c3..d22814f 100755
19--- a/configure 18--- a/configure
20+++ b/configure 19+++ b/configure
21@@ -6991,6 +6991,7 @@ $as_echo_n "checking for the pcre library and header files ... " >&6; } 20@@ -7191,6 +7191,7 @@ $as_echo_n "checking for the pcre library and header files ... " >&6; }
22 /usr/include/pcre,/usr/lib \ 21 /usr/include/pcre,/usr/lib \
23 /usr/pcre/include,/usr/pcre/lib \ 22 /usr/pcre/include,/usr/pcre/lib \
24 /usr/include,/usr/lib \ 23 /usr/include,/usr/lib \
@@ -26,7 +25,7 @@ index f1586c3..d22814f 100755
26 /opt/include/pcre,/opt/lib \ 25 /opt/include/pcre,/opt/lib \
27 /opt/pcre/include,/opt/pcre/lib \ 26 /opt/pcre/include,/opt/pcre/lib \
28 /opt/include,/opt/lib" 27 /opt/include,/opt/lib"
29@@ -7021,14 +7022,14 @@ $as_echo_n "checking for the pcre library and header files ... " >&6; } 28@@ -7221,14 +7222,14 @@ $as_echo_n "checking for the pcre library and header files ... " >&6; }
30 xincdir=`echo $include_and_lib | tr ',' ' ' | awk '{print $1}'` 29 xincdir=`echo $include_and_lib | tr ',' ' ' | awk '{print $1}'`
31 xlibdir=`echo $include_and_lib | tr ',' ' ' | awk '{print $2}'` 30 xlibdir=`echo $include_and_lib | tr ',' ' ' | awk '{print $2}'`
32 found=0 31 found=0
@@ -45,7 +44,7 @@ index f1586c3..d22814f 100755
45 jd_with_pcre_library="yes" 44 jd_with_pcre_library="yes"
46 found=1 45 found=1
47 break 46 break
48@@ -7054,56 +7055,7 @@ $as_echo "yes: $jd_pcre_library_dir and $jd_pcre_include_dir" >&6; } 47@@ -7255,68 +7255,7 @@ $as_echo "yes: $jd_pcre_library_dir and $jd_pcre_include_dir" >&6; }
49 then 48 then
50 PCRE_LIB="" 49 PCRE_LIB=""
51 else 50 else
@@ -74,7 +73,7 @@ index f1586c3..d22814f 100755
74- fi 73- fi
75- fi 74- fi
76- ;; 75- ;;
77- *osf*|*openbsd*) 76- *osf*|*openbsd*|*freebsd*)
78- if test "X$GCC" = Xyes 77- if test "X$GCC" = Xyes
79- then 78- then
80- RPATH="-Wl,-rpath," 79- RPATH="-Wl,-rpath,"
@@ -95,7 +94,19 @@ index f1586c3..d22814f 100755
95- RPATH="$RPATH$jd_pcre_library_dir" 94- RPATH="$RPATH$jd_pcre_library_dir"
96- fi 95- fi
97- else 96- else
98- RPATH="$RPATH:$jd_pcre_library_dir" 97- _already_there=0
98- for X in `echo $RPATH | sed 's/:/ /g'`
99- do
100- if test "$X" = "$jd_pcre_library_dir"
101- then
102- _already_there=1
103- break
104- fi
105- done
106- if test $_already_there = 0
107- then
108- RPATH="$RPATH:$jd_pcre_library_dir"
109- fi
99- fi 110- fi
100-fi 111-fi
101- 112-
@@ -103,6 +114,3 @@ index f1586c3..d22814f 100755
103 fi 114 fi
104 115
105 PCRE_INC=-I$jd_pcre_include_dir 116 PCRE_INC=-I$jd_pcre_include_dir
106--
1071.7.4.1
108
diff --git a/meta/recipes-extended/slang/slang/rpathfix.patch b/meta/recipes-extended/slang/slang/rpathfix.patch
index 50cac9264f..f82a5313d5 100644
--- a/meta/recipes-extended/slang/slang/rpathfix.patch
+++ b/meta/recipes-extended/slang/slang/rpathfix.patch
@@ -10,7 +10,7 @@ Index: slang-2.2.4/configure
10=================================================================== 10===================================================================
11--- slang-2.2.4.orig/configure 2012-03-14 23:40:01.283560679 +0000 11--- slang-2.2.4.orig/configure 2012-03-14 23:40:01.283560679 +0000
12+++ slang-2.2.4/configure 2012-03-14 23:41:18.023558900 +0000 12+++ slang-2.2.4/configure 2012-03-14 23:41:18.023558900 +0000
13@@ -6081,56 +6081,7 @@ 13@@ -6246,68 +6246,7 @@ esac
14 ELF_CFLAGS="$ELF_CFLAGS $IEEE_CFLAGS" 14 ELF_CFLAGS="$ELF_CFLAGS $IEEE_CFLAGS"
15 CFLAGS="$CFLAGS $IEEE_CFLAGS" 15 CFLAGS="$CFLAGS $IEEE_CFLAGS"
16 16
@@ -39,7 +39,7 @@ Index: slang-2.2.4/configure
39- fi 39- fi
40- fi 40- fi
41- ;; 41- ;;
42- *osf*|*openbsd*) 42- *osf*|*openbsd*|*freebsd*)
43- if test "X$GCC" = Xyes 43- if test "X$GCC" = Xyes
44- then 44- then
45- RPATH="-Wl,-rpath," 45- RPATH="-Wl,-rpath,"
@@ -60,7 +60,19 @@ Index: slang-2.2.4/configure
60- RPATH="$RPATH$libdir" 60- RPATH="$RPATH$libdir"
61- fi 61- fi
62- else 62- else
63- RPATH="$RPATH:$libdir" 63- _already_there=0
64- for X in `echo $RPATH | sed 's/:/ /g'`
65- do
66- if test "$X" = "$libdir"
67- then
68- _already_there=1
69- break
70- fi
71- done
72- if test $_already_there = 0
73- then
74- RPATH="$RPATH:$libdir"
75- fi
64- fi 76- fi
65-fi 77-fi
66- 78-
diff --git a/meta/recipes-extended/slang/slang/slang-fix-the-iconv-existence-checking.patch b/meta/recipes-extended/slang/slang/slang-fix-the-iconv-existence-checking.patch
index 958fe983c5..850551ef0a 100644
--- a/meta/recipes-extended/slang/slang/slang-fix-the-iconv-existence-checking.patch
+++ b/meta/recipes-extended/slang/slang/slang-fix-the-iconv-existence-checking.patch
@@ -19,14 +19,14 @@ Upstream-Status: Inappropriate
19 19
20Signed-off-by: Zheng Junling <zhengjunling@huawei.com> 20Signed-off-by: Zheng Junling <zhengjunling@huawei.com>
21--- 21---
22 configure | 60 ++++++------------------------------------------------------ 22 configure | 72 +++++---------------------------------------------------------
23 1 file changed, 6 insertions(+), 54 deletions(-) 23 1 file changed, 6 insertions(+), 66 deletions(-)
24 24
25diff --git a/configure b/configure 25diff --git a/configure b/configure
26index 7a96256..91632f3 100755 26index fa395ff..7fa769c 100755
27--- a/configure 27--- a/configure
28+++ b/configure 28+++ b/configure
29@@ -7909,6 +7909,7 @@ $as_echo_n "checking for the iconv library and header files ... " >&6; } 29@@ -8259,6 +8259,7 @@ $as_echo_n "checking for the iconv library and header files ... " >&6; }
30 /usr/include/iconv,/usr/lib \ 30 /usr/include/iconv,/usr/lib \
31 /usr/iconv/include,/usr/iconv/lib \ 31 /usr/iconv/include,/usr/iconv/lib \
32 /usr/include,/usr/lib \ 32 /usr/include,/usr/lib \
@@ -34,7 +34,7 @@ index 7a96256..91632f3 100755
34 /opt/include/iconv,/opt/lib \ 34 /opt/include/iconv,/opt/lib \
35 /opt/iconv/include,/opt/iconv/lib \ 35 /opt/iconv/include,/opt/iconv/lib \
36 /opt/include,/opt/lib" 36 /opt/include,/opt/lib"
37@@ -7939,14 +7940,14 @@ $as_echo_n "checking for the iconv library and header files ... " >&6; } 37@@ -8289,14 +8290,14 @@ $as_echo_n "checking for the iconv library and header files ... " >&6; }
38 xincdir=`echo $include_and_lib | tr ',' ' ' | awk '{print $1}'` 38 xincdir=`echo $include_and_lib | tr ',' ' ' | awk '{print $1}'`
39 xlibdir=`echo $include_and_lib | tr ',' ' ' | awk '{print $2}'` 39 xlibdir=`echo $include_and_lib | tr ',' ' ' | awk '{print $2}'`
40 found=0 40 found=0
@@ -53,7 +53,7 @@ index 7a96256..91632f3 100755
53 jd_with_iconv_library="yes" 53 jd_with_iconv_library="yes"
54 found=1 54 found=1
55 break 55 break
56@@ -7972,56 +7973,7 @@ $as_echo "yes: $jd_iconv_library_dir and $jd_iconv_include_dir" >&6; } 56@@ -8201,68 +8201,7 @@ $as_echo "yes: $jd_iconv_library_dir and $jd_iconv_include_dir" >&6; }
57 then 57 then
58 ICONV_LIB="" 58 ICONV_LIB=""
59 else 59 else
@@ -82,7 +82,7 @@ index 7a96256..91632f3 100755
82- fi 82- fi
83- fi 83- fi
84- ;; 84- ;;
85- *osf*|*openbsd*) 85- *osf*|*openbsd*|*freebsd*)
86- if test "X$GCC" = Xyes 86- if test "X$GCC" = Xyes
87- then 87- then
88- RPATH="-Wl,-rpath," 88- RPATH="-Wl,-rpath,"
@@ -103,7 +103,19 @@ index 7a96256..91632f3 100755
103- RPATH="$RPATH$jd_iconv_library_dir" 103- RPATH="$RPATH$jd_iconv_library_dir"
104- fi 104- fi
105- else 105- else
106- RPATH="$RPATH:$jd_iconv_library_dir" 106- _already_there=0
107- for X in `echo $RPATH | sed 's/:/ /g'`
108- do
109- if test "$X" = "$jd_iconv_library_dir"
110- then
111- _already_there=1
112- break
113- fi
114- done
115- if test $_already_there = 0
116- then
117- RPATH="$RPATH:$jd_iconv_library_dir"
118- fi
107- fi 119- fi
108-fi 120-fi
109- 121-
@@ -111,6 +123,3 @@ index 7a96256..91632f3 100755
111 fi 123 fi
112 124
113 ICONV_INC=-I$jd_iconv_include_dir 125 ICONV_INC=-I$jd_iconv_include_dir
114--
1151.8.3.4
116
diff --git a/meta/recipes-extended/slang/slang/sprintf-bug-concerning-8-bit-characters.patch b/meta/recipes-extended/slang/slang/sprintf-bug-concerning-8-bit-characters.patch
deleted file mode 100644
index 420001b08b..0000000000
--- a/meta/recipes-extended/slang/slang/sprintf-bug-concerning-8-bit-characters.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1Upstream-Status: Backport
2
3From 3a05d1a920140e9f2c72791c12f664213feb46df Mon Sep 17 00:00:00 2001
4From: Manfred Hanke <Manfred.Hanke@tngtech.com>
5Date: Thu, 20 Jun 2013 10:24:12 +0200
6Subject: [PATCH] sprintf bug (concerning %c for 8-bit character in non-UTF8
7 mode) fixed
8
9char *str points to SLuchar_Type utf8_buf[], which had too small scope
10
11src/test/strops.sl failed in the following environment:
12 - compiler: gcc (Debian 4.7.2-5) 4.7.2
13 - CFLAGS: -g -O2
14 - libc: GNU C Library (Debian EGLIBC 2.13-38) stable release version 2.13
15 - kernel: 3.2.0-4-686-pae #1 SMP Debian 3.2.39-2 i686 GNU/Linux
16---
17 src/slstrops.c | 2 +-
18 1 file changed, 1 insertion(+), 1 deletion(-)
19
20diff --git a/src/slstrops.c b/src/slstrops.c
21index ce6acb0..cbbbb01 100644
22--- a/src/slstrops.c
23+++ b/src/slstrops.c
24@@ -1884,6 +1884,7 @@ static char *SLdo_sprintf (char *fmt) /*{{{*/
25 #endif
26 unsigned char uch;
27 int use_long = 0, use_alt_format = 0;
28+ SLuchar_Type utf8_buf[SLUTF8_MAX_MBLEN+1];
29
30 while (1)
31 {
32@@ -2071,7 +2072,6 @@ static char *SLdo_sprintf (char *fmt) /*{{{*/
33 #endif
34 {
35 SLwchar_Type wc;
36- SLuchar_Type utf8_buf[SLUTF8_MAX_MBLEN+1];
37
38 if (-1 == SLang_pop_wchar (&wc))
39 return out;
40--
411.7.9.5
42
diff --git a/meta/recipes-extended/slang/slang_2.2.4.bb b/meta/recipes-extended/slang/slang_2.3.0.bb
index 237e9f2526..17efbbe223 100644
--- a/meta/recipes-extended/slang/slang_2.2.4.bb
+++ b/meta/recipes-extended/slang/slang_2.3.0.bb
@@ -10,17 +10,14 @@ to recode S-Lang procedures in C if you need to."
10HOMEPAGE = "http://www.jedsoft.org/slang/" 10HOMEPAGE = "http://www.jedsoft.org/slang/"
11SECTION = "libs" 11SECTION = "libs"
12DEPENDS = "pcre ncurses" 12DEPENDS = "pcre ncurses"
13PR = "r12"
14 13
15LICENSE = "GPLv2" 14LICENSE = "GPLv2"
16LIC_FILES_CHKSUM = "file://COPYING;md5=a52a18a472d4f7e45479b06563717c02" 15LIC_FILES_CHKSUM = "file://COPYING;md5=a52a18a472d4f7e45479b06563717c02"
17 16
18 17
19SRC_URI = "http://www.jedsoft.org/releases/slang/old/slang-${PV}.tar.bz2 \ 18SRC_URI = "http://www.jedsoft.org/releases/${BPN}/${BP}.tar.bz2 \
20 file://rpathfix.patch \ 19 file://rpathfix.patch \
21 file://fix-check-pcre.patch \ 20 file://fix-check-pcre.patch \
22 file://change-char-type-to-signed-char-in-macros.patch \
23 file://sprintf-bug-concerning-8-bit-characters.patch \
24 file://slang-fix-the-iconv-existence-checking.patch \ 21 file://slang-fix-the-iconv-existence-checking.patch \
25 file://0001-Fix-error-conflicting-types-for-posix_close.patch \ 22 file://0001-Fix-error-conflicting-types-for-posix_close.patch \
26 " 23 "
@@ -30,8 +27,8 @@ inherit autotools-brokensep
30 27
31CLEANBROKEN = "1" 28CLEANBROKEN = "1"
32 29
33SRC_URI[md5sum] = "7fcfd447e378f07dd0c0bae671fe6487" 30SRC_URI[md5sum] = "3bcc790460d52db1316c20395b7ac2f1"
34SRC_URI[sha256sum] = "9a8257a9a2a55099af858b13338dc8f3a06dd2069f46f0df2c9c3bb84a01d5db" 31SRC_URI[sha256sum] = "f95224060f45e0d8212a5039b339afa5f1a94a1bb0298e796104e5b12e926129"
35 32
36EXTRA_OECONF += " --without-z --without-png --without-onig --x-includes=${STAGING_DIR_HOST}/usr/include/X11 --x-libraries=${STAGING_DIR_HOST}/usr/lib" 33EXTRA_OECONF += " --without-z --without-png --without-onig --x-includes=${STAGING_DIR_HOST}/usr/include/X11 --x-libraries=${STAGING_DIR_HOST}/usr/lib"
37 34
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-12 15:35:35 +0000