Hello community,
here is the log from the commit of package pingus for openSUSE:Factory checked
in at 2012-03-29 07:46:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pingus (Old)
and /work/SRC/openSUSE:Factory/.pingus.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pingus", Maintainer is "prus...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/pingus/pingus.changes 2012-01-30
12:27:57.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.pingus.new/pingus.changes 2012-03-29
07:47:08.000000000 +0200
@@ -1,0 +2,7 @@
+Sun Mar 25 12:18:17 UTC 2012 - dims...@opensuse.org
+
+- Add pingus-gcc47.patch: Fix build with gcc 4.7.
+- Disable wiimote support (using a with_wiimote defines) for now on
+ openSUSE > 12.1, as bluez needs to be fixed first.
+
+-------------------------------------------------------------------
New:
----
pingus-gcc47.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pingus.spec ++++++
--- /var/tmp/diff_new_pack.U30vDK/_old 2012-03-29 07:47:09.000000000 +0200
+++ /var/tmp/diff_new_pack.U30vDK/_new 2012-03-29 07:47:09.000000000 +0200
@@ -16,6 +16,12 @@
#
+%if 0%{?suse_version} > 1210
+%define with_wiimote False
+%else
+%define with_wiimote True
+%endif
+
Name: pingus
Version: 0.7.6
Release: 0
@@ -23,7 +29,7 @@
License: GPL-3.0+
Group: Amusements/Games/Action/Arcade
Url: http://pingus.seul.org/
-Source: http://pingus.seul.org/files/pingus-%{version}.tar.bz2
+Source: http://pingus.googlecode.com/files/pingus-%{version}.tar.bz2
Source2: %{name}.desktop
Source3: %{name}.png
# PATCH-FEATURE-OPENSUSE pingus-cwiid_with_bluez.patch
pascal.ble...@opensuse.org -- adds wii support
@@ -34,6 +40,8 @@
Patch3: remove-debug_fix-includes.patch
# PATCH-FIX-OPENSUSE makefile-fixes.patch db...@novell.com -- use /usr for
prefix
Patch4: makefile-fixes.patch
+# PATCH-FIX-UPSTREAM pingus-gcc47.patch dims...@opensuse.org -- Fix build with
gcc 4.7
+Patch5: pingus-gcc47.patch
BuildRequires: SDL_image-devel
BuildRequires: SDL_mixer-devel
BuildRequires: bluez-devel
@@ -57,10 +65,11 @@
%patch2
%patch3
%patch4
+%patch5 -p1
%build
mkdir -p build
-scons %{?_smp_mflags} CCFLAGS="%{optflags}" with_wiimote=True
with_linuxusbmouse=True with_linuxevdev=True with_xinput=True
+scons %{?_smp_mflags} CCFLAGS="%{optflags}" with_wiimote=%{with_wiimote}
with_linuxusbmouse=True with_linuxevdev=True with_xinput=True
%install
%make_install
++++++ pingus-gcc47.patch ++++++
Index: pingus-0.7.6/src/pingus/pingus_main.cpp
===================================================================
--- pingus-0.7.6.orig/src/pingus/pingus_main.cpp
+++ pingus-0.7.6/src/pingus/pingus_main.cpp
@@ -465,7 +465,7 @@ PingusMain::init_path_finder()
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)
Index: pingus-0.7.6/src/pingus/screens/pingus_menu.cpp
===================================================================
--- pingus-0.7.6.orig/src/pingus/screens/pingus_menu.cpp
+++ pingus-0.7.6/src/pingus/screens/pingus_menu.cpp
@@ -153,7 +153,7 @@ PingusMenu::draw_background(DrawingConte
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
<grum...@gmail.com>\n"
+ "Pingus " VERSION " - Copyright (C) 1998-2011 Ingo Ruhnke
<grum...@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");
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
