[glob2] fix missing returns in nonvoid functions modify desktop-file

[cheese]

commit 708cc82d77eb33f5b9e6431687a1f6b5e491327b
Author: josef radinger <cheese at nosuchhost.net>
Date:   Sat Feb 7 18:36:46 2015 +0100

    fix missing returns in nonvoid functions
    modify desktop-file

 .gitignore                                         |    1 +
 ...2-fix_missing_return_in_nonvoid_functions.patch |  102 ++++++++++++++++++++
 glob2.spec                                         |   10 ++-
 sources                                            |    1 +
 4 files changed, 112 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ffcc7b9..1df7b24 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 glob2-0.9.4.4.tar.gz
 /glob2-private.patch
+/glob2-fix_missing_return_in_nonvoid_functions.patch
diff --git a/glob2-fix_missing_return_in_nonvoid_functions.patch b/glob2-fix_missing_return_in_nonvoid_functions.patch
new file mode 100644
index 0000000..5c08d36
--- /dev/null
+++ b/glob2-fix_missing_return_in_nonvoid_functions.patch
@@ -0,0 +1,102 @@
+--- src/SimplexNoise.cpp.orig	2009-08-29 22:39:06.000000000 +0200
++++ src/SimplexNoise.cpp	2010-02-02 02:28:21.000000000 +0100
+@@ -181,6 +181,7 @@
+ 		case 14: return  z + y;
+ 		case 15: return y-z;// - y;
+ 		}//switch
++        return 0;
+ 	}
+ 
+ 	int hashGridPoint(int gx, int gy, int gz) {
+--- src/YOGClientDownloadableMapList.cpp.orig	2009-08-29 22:39:07.000000000 +0200
++++ src/YOGClientDownloadableMapList.cpp	2010-02-02 02:28:21.000000000 +0100
+@@ -91,6 +91,7 @@
+ 			return *i;
+ 		}
+ 	}
++    return *(maps.begin());
+ }
+ 
+ 
+@@ -118,6 +119,7 @@
+ 			return thumbnails[i - maps.begin()];
+ 		}
+ 	}
++    return thumbnails[0];
+ }
+ 
+ 
+--- src/YOGPlayerPrivateInfo.cpp.orig	2010-02-02 02:28:35.000000000 +0100
++++ src/YOGPlayerPrivateInfo.cpp	2010-02-02 02:28:58.000000000 +0100
+@@ -44,13 +44,13 @@
+ 
+ bool YOGPlayerPrivateInfo::operator==(const YOGPlayerPrivateInfo& rhs) const
+ {
+-
++    return false;
+ }
+ 
+ 
+ 
+ bool YOGPlayerPrivateInfo::operator!=(const YOGPlayerPrivateInfo& rhs) const
+ {
+-
++    return false;
+ }
+ 
+--- src/YOGClientMapDownloadScreen.cpp.orig	2009-08-29 22:39:07.000000000 +0200
++++ src/YOGClientMapDownloadScreen.cpp	2010-02-02 02:28:21.000000000 +0100
+@@ -397,4 +397,5 @@
+ 			return GAGCore::naturalStringSort(lhs.getMapHeader().getMapName(), rhs.getMapHeader().getMapName());
+ 		}
+ 	}
++    return false;
+ }
+--- src/YOGServer.cpp.orig	2009-08-29 22:39:07.000000000 +0200
++++ src/YOGServer.cpp	2010-02-02 02:28:21.000000000 +0100
+@@ -399,6 +399,7 @@
+ 			return *i;
+ 		}
+ 	}
++    return *(gameList.begin());
+ }
+ 
+ 
+--- src/UnitConsts.cpp.orig	2009-08-29 22:39:06.000000000 +0200
++++ src/UnitConsts.cpp	2010-02-02 02:28:21.000000000 +0100
+@@ -34,4 +34,5 @@
+ 		return Toolkit::getStringTable()->getString("[Warrior]");
+ 	if(type == EXPLORER)
+ 		return Toolkit::getStringTable()->getString("[Explorer]");
++	return Toolkit::getStringTable()->getString("[Worker]");
+ }
+--- src/YOGClientPlayerListManager.cpp.orig	2009-08-29 22:39:07.000000000 +0200
++++ src/YOGClientPlayerListManager.cpp	2010-02-02 02:28:21.000000000 +0100
+@@ -100,6 +100,7 @@
+ 		if(i->getPlayerName() == name)
+ 			return *i;
+ 	}
++    return *(players.begin());
+ }
+ 
+ 
+--- src/WinningConditions.cpp.orig	2009-08-29 22:39:06.000000000 +0200
++++ src/WinningConditions.cpp	2010-02-02 02:28:21.000000000 +0100
+@@ -71,6 +71,7 @@
+ 		}
+ 		break;
+ 	}
++    assert(false);
+ }
+ 
+ 
+--- src/NetGamePlayerManager.cpp.orig	2009-08-29 22:39:06.000000000 +0200
++++ src/NetGamePlayerManager.cpp	2010-02-02 02:28:21.000000000 +0100
+@@ -181,6 +181,7 @@
+ 			return readyToStart[x];
+ 		}
+ 	}
++    return false;
+ }
+ 
+ 
diff --git a/glob2.spec b/glob2.spec
index 125255b..3d185c5 100644
--- a/glob2.spec
+++ b/glob2.spec
@@ -1,6 +1,6 @@
 Name:           glob2
 Version:        0.9.4.4
-Release:        24%{?dist}
+Release:        25%{?dist}
 Summary:        An innovative RTS game
 
 Group:          Amusements/Games
@@ -15,6 +15,7 @@ Patch3:         glob2-0.9.4.1-gcc44.patch
 # https://savannah.nongnu.org/bugs/index.php?39593
 Patch4:         glob2_SConstruct.patch
 Patch5:		glob2-private.patch
+Patch6:		glob2-fix_missing_return_in_nonvoid_functions.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils,zlib-devel,speex-devel,boost-devel
@@ -43,9 +44,10 @@ Online Gaming (or YOG for short).
 %patch3 -p0
 %patch4 -p1
 %patch5 -p1
+%patch6 -p0
 
 sed -i -e '3d' -e '12d' data/glob2.desktop
-sed -i s#"Icon=glob2-icon-48x48"#"Icon=glob2.png"# data/glob2.desktop
+sed -i s#"Icon=glob2-icon-48x48"#"Icon=glob2"# data/glob2.desktop
 
 chmod -x campaigns/Tutorial_Campaign.txt
 sed -i 's/\r//' campaigns/Tutorial_Campaign.txt
@@ -104,6 +106,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Feb 7 2015 josef radinger <cheese at nosuchhost.net> - 0.9.4.4-25
+- adding glob2-fix_missing_return_in_nonvoid_functions.patch, taken from opensuse
+- remove extension from Icon in desktop-file
+
 * Tue Jan 27 2015 Petr Machata <pmachata at redhat.com> - 0.9.4.4-24
 - Rebuild for boost 1.57.0
 
diff --git a/sources b/sources
index c03c8a6..a125cb2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 94c527325f355a29a2807f8f18a6e6a8  glob2-0.9.4.4.tar.gz
 efbeaafdd2926a3e1ed07ed1aa19223f  glob2-private.patch
+c1b320f20187a5dd6fd486df69690738  glob2-fix_missing_return_in_nonvoid_functions.patch