[packages/pingus] gcc4 patch is not needed, added gcc4.7 patch and compiler options to allow building with that compil
baggins
baggins at pld-linux.org
Thu Jul 12 20:17:55 CEST 2012
commit c3fb70b6e6a77a503f7aefdaf562fe41f2033622
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Thu Jul 12 20:16:23 2012 +0200
gcc4 patch is not needed, added gcc4.7 patch and compiler
options to allow building with that compiler
pingus-gcc4.7.patch | 22 ++++++++++++++++++++++
pingus-gcc4.patch | 24 ------------------------
pingus.spec | 8 ++++----
3 files changed, 26 insertions(+), 28 deletions(-)
---
diff --git a/pingus-gcc4.7.patch b/pingus-gcc4.7.patch
new file mode 100644
index 0000000..0d57c35
--- /dev/null
+++ b/pingus-gcc4.7.patch
@@ -0,0 +1,22 @@
+--- pingus-0.7.6/src/pingus/pingus_main.cpp~ 2012-07-12 20:07:33.010071041 +0200
++++ pingus-0.7.6/src/pingus/pingus_main.cpp 2012-07-12 20:09:18.276733996 +0200
+@@ -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)
+--- pingus-0.7.6/src/pingus/screens/pingus_menu.cpp~ 2011-12-24 22:46:47.000000000 +0100
++++ pingus-0.7.6/src/pingus/screens/pingus_menu.cpp 2012-07-12 20:10:59.553397104 +0200
+@@ -153,7 +153,7 @@
+ gc.get_height()/2 - 280));
+
+ gc.print_left(Fonts::pingus_small, Vector2i(gc.get_width()/2 - 400 + 25, gc.get_height()-140),
+- "Pingus "VERSION" - Copyright (C) 1998-2011 Ingo Ruhnke <grumbel at gmail.com>\n"
++ "Pingus " VERSION " - Copyright (C) 1998-2011 Ingo Ruhnke <grumbel at gmail.com>\n"
+ "See the file AUTHORS for a complete list of contributors.\n"
+ "Pingus comes with ABSOLUTELY NO WARRANTY. This is free software, and you are\n"
+ "welcome to redistribute it under certain conditions; see the file COPYING for details.\n");
diff --git a/pingus.spec b/pingus.spec
index 8d63651..80d6f81 100644
--- a/pingus.spec
+++ b/pingus.spec
@@ -15,7 +15,7 @@ Source0: http://pingus.googlecode.com/files/%{name}-%{version}.tar.bz2
Source1: %{name}.desktop
Source2: %{name}.png
Patch0: %{name}-opt.patch
-Patch1: %{name}-gcc4.patch
+Patch1: %{name}-gcc4.7.patch
URL: http://pingus.seul.org/
BuildRequires: SDL_image-devel
BuildRequires: SDL_mixer-devel
@@ -30,6 +30,8 @@ Requires: libmikmod
Conflicts: glibc-misc < 6:2.7
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+%define specflags -fpermissive -std=c++11
+
%description
A cool lemmings game with penguins instead of lemmings!
@@ -43,15 +45,13 @@ pingüins.
%prep
%setup -q
%patch0 -p1
-#%%patch1 -p1
+%patch1 -p1
# note: it loads *.po files directly, no need to use msgfmt
mv -f data/po/sr{, at latin}.po
rm -f data/po/pingus.pot
%build
-export CXXFLAGS="%{rpmcxxflags} -std=c++0x"
-#%%scons with_xinput=true
%scons
%install
More information about the pld-cvs-commit
mailing list