[plee-the-bear] fix incorrect return types
Tom Callaway
spot at fedoraproject.org
Sat Sep 18 10:46:29 UTC 2010
commit ce71ceabcffe8aafd63588121d0f2719d86c45a4
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date: Sat Sep 18 12:46:18 2010 +0200
fix incorrect return types
plee-the-bear-0.4.1-svn3463.patch | 69 +++++++++++++++++++++++++++++++++++++
plee-the-bear-0.4.1-svn3465.patch | 63 +++++++++++++++++++++++++++++++++
plee-the-bear.spec | 14 ++++++--
3 files changed, 143 insertions(+), 3 deletions(-)
---
diff --git a/plee-the-bear-0.4.1-svn3463.patch b/plee-the-bear-0.4.1-svn3463.patch
new file mode 100644
index 0000000..06e7b3f
--- /dev/null
+++ b/plee-the-bear-0.4.1-svn3463.patch
@@ -0,0 +1,69 @@
+diff -up plee-the-bear-0.4.1/bear-engine/core/src/engine/code/compiled_file.cpp.svn3463 plee-the-bear-0.4.1/bear-engine/core/src/engine/code/compiled_file.cpp
+--- plee-the-bear-0.4.1/bear-engine/core/src/engine/code/compiled_file.cpp.svn3463 2010-09-18 12:23:34.789920074 +0200
++++ plee-the-bear-0.4.1/bear-engine/core/src/engine/code/compiled_file.cpp 2010-09-18 12:25:03.615919994 +0200
+@@ -50,7 +50,7 @@ bear::engine::compiled_file::compiled_fi
+ * \brief Read a string from the file.
+ * \param s The string to read.
+ */
+-bear::engine::compiled_file::compiled_file&
++bear::engine::compiled_file&
+ bear::engine::compiled_file::operator>>( std::string& s )
+ {
+ if (m_text)
+@@ -66,8 +66,7 @@ bear::engine::compiled_file::operator>>(
+ * \brief Read an long from the file.
+ * \param i The long to read.
+ */
+-bear::engine::compiled_file::compiled_file&
+-bear::engine::compiled_file::operator>>( long& i )
++bear::engine::compiled_file& bear::engine::compiled_file::operator>>( long& i )
+ {
+ if (m_text)
+ input_long_as_text(i);
+@@ -82,7 +81,7 @@ bear::engine::compiled_file::operator>>(
+ * \brief Read an unsigned long from the file.
+ * \param i The long to read.
+ */
+-bear::engine::compiled_file::compiled_file&
++bear::engine::compiled_file&
+ bear::engine::compiled_file::operator>>( unsigned long& i )
+ {
+ if (m_text)
+@@ -98,8 +97,7 @@ bear::engine::compiled_file::operator>>(
+ * \brief Read an integer from the file.
+ * \param i The integer to read.
+ */
+-bear::engine::compiled_file::compiled_file&
+-bear::engine::compiled_file::operator>>( int& i )
++bear::engine::compiled_file& bear::engine::compiled_file::operator>>( int& i )
+ {
+ if (m_text)
+ input_integer_as_text(i);
+@@ -114,7 +112,7 @@ bear::engine::compiled_file::operator>>(
+ * \brief Read an unsigned integer from the file.
+ * \param i The integer to read.
+ */
+-bear::engine::compiled_file::compiled_file&
++bear::engine::compiled_file&
+ bear::engine::compiled_file::operator>>( unsigned int& i )
+ {
+ if (m_text)
+@@ -130,7 +128,7 @@ bear::engine::compiled_file::operator>>(
+ * \brief Read a real from the file.
+ * \param r The value to read.
+ */
+-bear::engine::compiled_file::compiled_file&
++bear::engine::compiled_file&
+ bear::engine::compiled_file::operator>>( double& r )
+ {
+ if (m_text)
+@@ -146,8 +144,7 @@ bear::engine::compiled_file::operator>>(
+ * \brief Read a boolean from the file.
+ * \param b The value to read.
+ */
+-bear::engine::compiled_file::compiled_file&
+-bear::engine::compiled_file::operator>>( bool& b )
++bear::engine::compiled_file& bear::engine::compiled_file::operator>>( bool& b )
+ {
+ if (m_text)
+ input_bool_as_text(b);
diff --git a/plee-the-bear-0.4.1-svn3465.patch b/plee-the-bear-0.4.1-svn3465.patch
new file mode 100644
index 0000000..c30a686
--- /dev/null
+++ b/plee-the-bear-0.4.1-svn3465.patch
@@ -0,0 +1,63 @@
+diff -up plee-the-bear-0.4.1/bear-factory/bear-editor/src/bf/code/compiled_file.cpp.svn3465 plee-the-bear-0.4.1/bear-factory/bear-editor/src/bf/code/compiled_file.cpp
+--- plee-the-bear-0.4.1/bear-factory/bear-editor/src/bf/code/compiled_file.cpp.svn3465 2010-09-18 12:16:18.570920000 +0200
++++ plee-the-bear-0.4.1/bear-factory/bear-editor/src/bf/code/compiled_file.cpp 2010-09-18 12:18:26.438920007 +0200
+@@ -44,8 +44,7 @@ bf::compiled_file::compiled_file( std::o
+ * \brief Write a string in the file.
+ * \param s The string to write.
+ */
+-bf::compiled_file::compiled_file&
+-bf::compiled_file::operator<<( const std::string& s )
++bf::compiled_file& bf::compiled_file::operator<<( const std::string& s )
+ {
+ output_string_as_text(s);
+
+@@ -57,8 +56,7 @@ bf::compiled_file::operator<<( const std
+ * \brief Write an long in the file.
+ * \param i The long to write.
+ */
+-bf::compiled_file::compiled_file&
+-bf::compiled_file::operator<<( long i )
++bf::compiled_file& bf::compiled_file::operator<<( long i )
+ {
+ output_long_as_text(i);
+
+@@ -70,8 +68,7 @@ bf::compiled_file::operator<<( long i )
+ * \brief Write an unsigned long in the file.
+ * \param i The long to write.
+ */
+-bf::compiled_file::compiled_file&
+-bf::compiled_file::operator<<( unsigned long i )
++bf::compiled_file& bf::compiled_file::operator<<( unsigned long i )
+ {
+ output_unsigned_long_as_text(i);
+
+@@ -83,8 +80,7 @@ bf::compiled_file::operator<<( unsigned
+ * \brief Write an integer in the file.
+ * \param i The integer to write.
+ */
+-bf::compiled_file::compiled_file&
+-bf::compiled_file::operator<<( int i )
++bf::compiled_file& bf::compiled_file::operator<<( int i )
+ {
+ output_integer_as_text(i);
+
+@@ -96,8 +92,7 @@ bf::compiled_file::operator<<( int i )
+ * \brief Write an unsigned integer in the file.
+ * \param i The integer to write.
+ */
+-bf::compiled_file::compiled_file&
+-bf::compiled_file::operator<<( unsigned int i )
++bf::compiled_file& bf::compiled_file::operator<<( unsigned int i )
+ {
+ output_unsigned_integer_as_text(i);
+
+@@ -109,8 +104,7 @@ bf::compiled_file::operator<<( unsigned
+ * \brief Write a real in the file.
+ * \param r The value to write.
+ */
+-bf::compiled_file::compiled_file&
+-bf::compiled_file::operator<<( double r )
++bf::compiled_file& bf::compiled_file::operator<<( double r )
+ {
+ output_real_as_text(r);
+
diff --git a/plee-the-bear.spec b/plee-the-bear.spec
index 161007c..538b245 100644
--- a/plee-the-bear.spec
+++ b/plee-the-bear.spec
@@ -8,6 +8,13 @@ License: GPLv2+ and CC-BY-SA
URL: http://plee-the-bear.sourceforge.net/
Source0: http://downloads.sourceforge.net/project/plee-the-bear/Plee%20the%20Bear/0.4/%{name}-%{version}.tar.gz
Patch0: plee-the-bear-0.4.1-boost.patch
+# Fix incorrect return type.
+# SVN 3463, 3465
+# http://plee-the-bear.svn.sourceforge.net/viewvc/plee-the-bear?view=revision&revision=3463
+# http://plee-the-bear.svn.sourceforge.net/viewvc/plee-the-bear?view=revision&revision=3465
+Patch1: plee-the-bear-0.4.1-svn3463.patch
+Patch2: plee-the-bear-0.4.1-svn3465.patch
+
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: desktop-file-utils
@@ -40,7 +47,8 @@ game counts several contributions from external people.
%prep
%setup -q
%patch0 -p1
-
+%patch1 -p1 -b .svn3463
+%patch2 -p1 -b .svn3465
%build
%cmake . \
@@ -99,8 +107,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
-* Fri Jul 30 2010 Lubomir Rintel <lkundrak at v3.sk> - 0.4.1-7
-- Rebuild for newer boost
+* Sat Sep 18 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 0.4.1-7
+- fix incorrect return type
* Wed Jul 14 2010 Dan Horák <dan at danny.cz> - 0.4.1-6
- rebuilt against wxGTK-2.8.11-2
More information about the scm-commits
mailing list