[packages/portsmf] - added includes patch (let public headers include required C++ headers) - release .2

qboosh qboosh at pld-linux.org
Sat Nov 9 14:04:16 CET 2013


commit ec3739a426ba81784a1b7ee840cbf40680bc6d72
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Nov 9 14:04:37 2013 +0100

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

 portsmf-includes.patch | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++
 portsmf.spec           |  4 +++-
 2 files changed, 54 insertions(+), 1 deletion(-)
---
diff --git a/portsmf.spec b/portsmf.spec
index b4d555c..d493194 100644
--- 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
 
diff --git a/portsmf-includes.patch b/portsmf-includes.patch
new file mode 100644
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
++#define MFMIDI_H
++
+ #define NOTEOFF 0x80
+ #define NOTEON 0x90
+ #define PRESSURE 0xa0
+@@ -95,4 +98,4 @@ private:
+     long Msgindex;
+ };
+ 
+-
++#endif // MFMIDI_H
+--- 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
++#ifndef STRPARSE_H
++#define STRPARSE_H
++
++#include <string>
+ 
+ class String_parse {
+ public:
+@@ -16,3 +20,5 @@ public:
+ };
+ 
+ void string_escape(std::string &result, const char *s, const char *quote);
++
++#endif // STRPARSE_H
+--- 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
++#define TRACE_H
++
+ void trace(char *format, ...);
+ 
++#endif // TRACE_H
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/portsmf.git/commitdiff/ec3739a426ba81784a1b7ee840cbf40680bc6d72



More information about the pld-cvs-commit mailing list