- added includes patch (let public headers include required C++ headers)

- release .2

diff --git a/portsmf-includes.patch b/portsmf-includes.patch
new file mode 100644 (file)
index 0000000..d8747f5
--- /dev/null
+++ b/portsmf-includes.patch
@@ -0,0 +1,51 @@
+--- portsmf/allegro.h.orig     2013-06-22 20:54:59.000000000 +0200
++++ portsmf/allegro.h  2013-11-09 13:58:55.507385767 +0100
+@@ -49,6 +49,7 @@
+ #ifndef ALLEGRO_H
+ #define ALLEGRO_H
+ #include <assert.h>
++#include <cstring>
+ #include <istream>
+ #include <ostream>
+ 
+--- portsmf/mfmidi.h.orig      2013-06-22 20:54:58.000000000 +0200
++++ portsmf/mfmidi.h   2013-11-09 14:00:58.697380586 +0100
+@@ -1,3 +1,6 @@
++#ifndef MFMIDI_H\r
++#define MFMIDI_H\r
++\r
+ #define NOTEOFF 0x80\r
+ #define NOTEON 0x90\r
+ #define PRESSURE 0xa0\r
+@@ -95,4 +98,4 @@ private:
+     long Msgindex;\r
+ };\r
+ \r
+-\r
++#endif // MFMIDI_H\r
+--- portsmf/strparse.h.orig    2013-06-22 20:54:59.000000000 +0200
++++ portsmf/strparse.h 2013-11-09 14:01:24.820712834 +0100
+@@ -1,4 +1,8 @@
+ // strparse.h -- header for String_parse class\r
++#ifndef STRPARSE_H\r
++#define STRPARSE_H\r
++\r
++#include <string>\r
+ \r
+ class String_parse {\r
+ public:\r
+@@ -16,3 +20,5 @@ public:
+ };\r
+ \r
+ void string_escape(std::string &result, const char *s, const char *quote);\r
++\r
++#endif // STRPARSE_H\r
+--- portsmf/trace.h.orig       2013-06-22 20:54:58.000000000 +0200
++++ portsmf/trace.h    2013-11-09 14:01:43.927378705 +0100
+@@ -1,2 +1,6 @@
++#ifndef TRACE_H\r
++#define TRACE_H\r
++\r
+ void trace(char *format, ...);\r
+ \r
++#endif // TRACE_H\r

diff --git a/portsmf.spec b/portsmf.spec
index b4d555c5e51aeae9e19b43f3d2c43f504e09a127..d49319491e21ab95249923914d0eb2cdc3fed8c9 100644 (file)
--- a/portsmf.spec
+++ b/portsmf.spec
@@ -3,13 +3,14 @@ Summary(pl.UTF-8):    Port Standard MIDI File - przenośna biblioteka do odczytu/za
 Name:          portsmf
 Version:       0.1
 %define        snap    20101010
-Release:       0.%{snap}.1
+Release:       0.%{snap}.2
 License:       MIT-like
 Group:         Libraries
 # svn co https://portmedia.svn.sourceforge.net/svnroot/portmedia/portsmf/trunk portsmf
 Source0:       %{name}.tar.xz
 # Source0-md5: 654893b608c70230e0838725c563b86f
 Patch0:                %{name}-shared.patch
+Patch1:                %{name}-includes.patch
 URL:           http://sourceforge.net/p/portmedia/wiki/portsmf/
 BuildRequires: autoconf >= 2.61
 BuildRequires: automake
@@ -53,6 +54,7 @@ Statyczna biblioteka portSMF.
 %prep
 %setup -q -n %{name}
 %patch0 -p1
+%patch1 -p1
 
 %{__rm} configure