[pingus] gcc patch.

Jon Ciesla limb at fedoraproject.org
Tue Jan 3 19:18:00 UTC 2012


commit ebeb16b71748cbbb7abe5eda3ecbf501afd76fcc
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Tue Jan 3 13:17:46 2012 -0600

    gcc patch.

 pingus-0.7.6-gcc470-udl.patch |   11 +++++++++++
 pingus.spec                   |    3 +++
 2 files changed, 14 insertions(+), 0 deletions(-)
---
diff --git a/pingus-0.7.6-gcc470-udl.patch b/pingus-0.7.6-gcc470-udl.patch
new file mode 100644
index 0000000..381fb5b
--- /dev/null
+++ b/pingus-0.7.6-gcc470-udl.patch
@@ -0,0 +1,11 @@
+--- src/pingus/pingus_main.cpp~	2011-12-24 15:46:47.000000000 -0600
++++ src/pingus/pingus_main.cpp	2012-01-03 13:13:03.034195720 -0600
+@@ -465,7 +465,7 @@
+ void
+ PingusMain::print_greeting_message()
+ {
+-  std::string greeting = "Welcome to Pingus "VERSION;
++  std::string greeting = "Welcome to Pingus " VERSION;
+   greeting += "!";
+   std::cout <<  greeting << std::endl;
+   for (unsigned int i = 0; i < greeting.length(); ++i)
diff --git a/pingus.spec b/pingus.spec
index a64a153..e205ba7 100644
--- a/pingus.spec
+++ b/pingus.spec
@@ -11,6 +11,7 @@ Source2:        pingus.png
 #Patch0:         pingus-0.7.2-gcc43.patch
 #Patch1:         pingus-0.7.2-gcc44.patch
 #Patch2:         pingus-0.7.4-binsh.patch
+Patch3:         pingus-0.7.6-gcc470-udl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL_mixer-devel SDL_image-devel boost-devel libpng-devel
 BuildRequires:  physfs-devel scons desktop-file-utils
@@ -30,6 +31,7 @@ combination of commands are necessary. The game is presented in a 2D site view.
 #%%patch0 -p1
 #%%patch1 -p0
 #%%patch2 -p0
+%patch3 -p0
 iconv -f ISO8859-2 -t UTF8 AUTHORS > AUTHORS.tmp
 mv AUTHORS.tmp AUTHORS
 
@@ -87,6 +89,7 @@ fi
 * Tue Jan 03 2012 Jon Ciesla <limburgher at gmail.com> - 0.7.6-1
 - New upstream.
 - binsh patch upstreamed.
+- Patch for gcc 4.7.0 user defined literal.
 
 * Mon Nov 21 2011 Jon Ciesla <limb at jcomserv.net> - 0.7.4-4
 - Rebuild for new Boost.


More information about the scm-commits mailing list