Fri, 10 Aug 2012 14:32:29 +0200
Accommodate undefined C++ wrapper '__*_DECLS' preprocessor definitions.
figlet/figlet.patch | file | annotate | diff | comparison | revisions | |
figlet/figlet.spec | file | annotate | diff | comparison | revisions |
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/figlet/figlet.patch Fri Aug 10 14:32:29 2012 +0200 1.3 @@ -0,0 +1,22 @@ 1.4 +Index: utf8.h 1.5 +--- utf8.h.orig 2012-08-10 11:27:29.714031512 +0200 1.6 ++++ utf8.h 2012-08-10 11:29:26.743204276 +0200 1.7 +@@ -27,6 +27,18 @@ 1.8 + #define UTF8_IGNORE_ERROR 0x01 1.9 + #define UTF8_SKIP_BOM 0x02 1.10 + 1.11 ++#ifndef __BEGIN_DECLS 1.12 ++#undef __BEGIN_DECLS 1.13 ++#undef __END_DECLS 1.14 ++#ifdef __cplusplus 1.15 ++# define __BEGIN_DECLS extern "C" { 1.16 ++# define __END_DECLS } 1.17 ++#else 1.18 ++# define __BEGIN_DECLS /* empty */ 1.19 ++# define __END_DECLS /* empty */ 1.20 ++#endif 1.21 ++#endif /* __BEGIN_DECLS */ 1.22 ++ 1.23 + __BEGIN_DECLS 1.24 + 1.25 + size_t utf8_to_wchar(const char *in, size_t insize, wchar_t *out,
2.1 --- a/figlet/figlet.spec Fri Aug 10 14:31:08 2012 +0200 2.2 +++ b/figlet/figlet.spec Fri Aug 10 14:32:29 2012 +0200 2.3 @@ -32,10 +32,11 @@ 2.4 Group: Typesetting 2.5 License: BSD 2.6 Version: 2.2.5 2.7 -Release: 20120609 2.8 +Release: 20120800 2.9 2.10 # list of sources 2.11 Source0: ftp://ftp.figlet.org/pub/figlet/program/unix/figlet-%{version}.tar.gz 2.12 +Patch0: figlet.patch 2.13 2.14 # build information 2.15 BuildPreReq: OpenPKG, openpkg >= 20100101 2.16 @@ -54,6 +55,7 @@ 2.17 2.18 %prep 2.19 %setup -q 2.20 + %patch -p0 2.21 2.22 %build 2.23 %{l_make} %{l_mflags} \