fix non-fatal bug (crash when clicking on CREDITS), no revbump

(Portage version: 2.2.0_alpha186/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)

2 files changed, 63 insertions, 46 deletions

diff --git a/games-strategy/openra/ChangeLog b/games-strategy/openra/ChangeLog
index a3ced08e5475..65f247fbdb7c 100644
--- a/games-strategy/openra/ChangeLog
+++ b/games-strategy/openra/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/openra
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/openra/ChangeLog,v 1.21 2013/07/04 12:42:06 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/openra/ChangeLog,v 1.22 2013/07/05 17:19:10 hasufell Exp $
+
+  05 Jul 2013; Julian Ospald <hasufell@gentoo.org>
+  files/openra-20130514-makefile.patch:
+  fix non-fatal bug (crash when clicking on CREDITS), no revbump
 
   04 Jul 2013; Julian Ospald <hasufell@gentoo.org> -openra-20130514.ebuild:
   remove old
diff --git a/games-strategy/openra/files/openra-20130514-makefile.patch b/games-strategy/openra/files/openra-20130514-makefile.patch
index 7bc9e5486684..537b688c7dfb 100644
--- a/games-strategy/openra/files/openra-20130514-makefile.patch
+++ b/games-strategy/openra/files/openra-20130514-makefile.patch
@@ -1,7 +1,5 @@
 https://github.com/OpenRA/OpenRA/pull/3500
 
-diff --git a/Makefile b/Makefile
-index 343d413..291eb4d 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -1,34 +1,69 @@
@@ -85,9 +83,11 @@ index 343d413..291eb4d 100644
 -		mv -f $${i}.tmp $${i} ; \
 -	done
 -default: dependencies core
- 
+-
 -.DEFAULT_GOAL := default
- 
+-
++
++
 +######################## PROGRAM TARGET RULES ##########################
  #
  # Core binaries
@@ -95,7 +95,7 @@ index 343d413..291eb4d 100644
  fileformats_SRCS	:= $(shell find OpenRA.FileFormats/ -iname '*.cs')
  fileformats_TARGET	= OpenRA.FileFormats.dll
  fileformats_KIND	= library
-@@ -39,16 +74,14 @@ fileformats: $(fileformats_TARGET)
+@@ -39,16 +74,14 @@
  game_SRCS			:= $(shell find OpenRA.Game/ -iname '*.cs')
  game_TARGET			= OpenRA.Game.exe
  game_KIND			= winexe
@@ -113,7 +113,7 @@ index 343d413..291eb4d 100644
  rsdl_SRCS			:= $(shell find OpenRA.Renderer.SdlCommon/ -iname '*.cs')
  rsdl_TARGET			= OpenRA.Renderer.SdlCommon.dll
  rsdl_KIND			= library
-@@ -82,14 +115,13 @@ rnull_LIBS			= $(COMMON_LIBS) System.Windows.Forms.dll \
+@@ -82,19 +115,18 @@
  PROGRAMS 			+= rcg rgl rnull rsdl
  renderers: $(rcg_TARGET) $(rgl_TARGET) $(rnull_TARGET) $(rsdl_TARGET)
  
@@ -131,7 +131,14 @@ index 343d413..291eb4d 100644
  mod_ra_SRCS			:= $(shell find OpenRA.Mods.RA/ -iname '*.cs')
  mod_ra_TARGET			= mods/ra/OpenRA.Mods.RA.dll
  mod_ra_KIND			= library
-@@ -119,9 +151,9 @@ mod_d2k_EXTRA_CMDS	= mono --debug RALint.exe d2k
+-mod_ra_DEPS			= $(STD_MOD_DEPS)
+-mod_ra_LIBS			= $(COMMON_LIBS) $(STD_MOD_LIBS)
++mod_ra_DEPS			= $(STD_MOD_DEPS) $(utility_TARGET)
++mod_ra_LIBS			= $(COMMON_LIBS) $(STD_MOD_LIBS) $(utility_TARGET)
+ mod_ra_EXTRA_CMDS		= mono --debug RALint.exe ra
+ PROGRAMS 			+= mod_ra
+ mod_ra: $(mod_ra_TARGET)
+@@ -119,9 +151,9 @@
  PROGRAMS 		+= mod_d2k
  mod_d2k: $(mod_d2k_TARGET)
  
@@ -144,7 +151,7 @@ index 343d413..291eb4d 100644
  # Map Editor
  editor_SRCS			:= $(shell find OpenRA.Editor/ -iname '*.cs')
  editor_TARGET			= OpenRA.Editor.exe
-@@ -163,13 +195,8 @@ OpenRA.TilesetBuilder.Surface.resources:
+@@ -163,13 +195,8 @@
  	resgen2 OpenRA.TilesetBuilder/Surface.resx OpenRA.TilesetBuilder.Surface.resources 1> /dev/null
  tsbuild: OpenRA.TilesetBuilder.frmBuilder.resources OpenRA.TilesetBuilder.frmNew.resources OpenRA.TilesetBuilder.Surface.resources $(tsbuild_TARGET)
  
@@ -160,13 +167,14 @@ index 343d413..291eb4d 100644
  
  # Backend for the launcher apps - queries game/mod info and applies actions to an install
  utility_SRCS		:= $(shell find OpenRA.Utility/ -iname '*.cs')
-@@ -180,11 +207,13 @@ utility_LIBS        = $(COMMON_LIBS) $(utility_DEPS) thirdparty/ICSharpCode.Shar
+@@ -180,11 +207,13 @@
  PROGRAMS 			+= utility
  utility: $(utility_TARGET)
  
 -.PHONY: $(PHONY) $(PROGRAMS)
- 
+-
 -#
++
 +# Patches binary headers to work around a mono bug
 +fixheader.exe: packaging/fixheader.cs
 +	@echo CSC fixheader.exe
@@ -177,13 +185,11 @@ index 343d413..291eb4d 100644
  define BUILD_ASSEMBLY
  
  $$($(1)_TARGET): $$($(1)_SRCS) Makefile $$($(1)_DEPS) fixheader.exe
-@@ -203,68 +232,65 @@ endef
+@@ -203,68 +232,67 @@
  $(foreach prog,$(PROGRAMS),$(eval $(call BUILD_ASSEMBLY,$(prog))))
  
  
-+
-+########################## MAKE/INSTALL RULES ##########################
- #
+-#
 -# Install / Uninstall for *nix
 -#
 -prefix ?= /usr/local
@@ -195,6 +201,9 @@ index 343d413..291eb4d 100644
 -INSTALL = install
 -INSTALL_PROGRAM = $(INSTALL)
 -CORE = fileformats rcg rgl rsdl rnull game editor utility tsbuild
++
++########################## MAKE/INSTALL RULES ##########################
++#
 +default: dependencies core
 +
 +core: game renderers mods utility tsbuild
@@ -278,65 +287,69 @@ index 343d413..291eb4d 100644
 +
 +install-core: default
 +	@-echo "Installing OpenRA to $(DATA_INSTALL_DIR)"
-+	@$(INSTALL_DIR) $(DATA_INSTALL_DIR)
-+	@$(INSTALL_PROGRAM) $(foreach prog,$(CORE),$($(prog)_TARGET)) $(DATA_INSTALL_DIR)
-+	@$(INSTALL_DIR) $(DATA_INSTALL_DIR)/mods
-+	@$(CP_R) mods/cnc $(DATA_INSTALL_DIR)/mods/
-+	@$(INSTALL_PROGRAM) $(mod_cnc_TARGET) $(DATA_INSTALL_DIR)/mods/cnc
-+	@$(CP_R) mods/ra $(DATA_INSTALL_DIR)/mods/
-+	@$(INSTALL_PROGRAM) $(mod_ra_TARGET) $(DATA_INSTALL_DIR)/mods/ra
-+	@$(CP_R) mods/d2k $(DATA_INSTALL_DIR)/mods/
-+	@$(INSTALL_PROGRAM) $(mod_d2k_TARGET) $(DATA_INSTALL_DIR)/mods/d2k
-+
-+	@$(CP_R) glsl $(DATA_INSTALL_DIR)
-+	@$(CP_R) cg $(DATA_INSTALL_DIR)
-+	@$(CP) *.ttf $(DATA_INSTALL_DIR)
-+	@$(CP) thirdparty/Tao/* $(DATA_INSTALL_DIR)
-+	@$(INSTALL_PROGRAM) thirdparty/ICSharpCode.SharpZipLib.dll $(DATA_INSTALL_DIR)
-+	@$(INSTALL_PROGRAM) thirdparty/FuzzyLogicLibrary.dll $(DATA_INSTALL_DIR)
-+	@$(INSTALL_PROGRAM) thirdparty/SharpFont.dll $(DATA_INSTALL_DIR)
-+	@$(CP) thirdparty/SharpFont.dll.config $(DATA_INSTALL_DIR)
-+	@$(INSTALL_PROGRAM) thirdparty/Mono.Nat.dll $(DATA_INSTALL_DIR)
++	@$(INSTALL_DIR) "$(DATA_INSTALL_DIR)"
++	@$(INSTALL_PROGRAM) $(foreach prog,$(CORE),$($(prog)_TARGET)) "$(DATA_INSTALL_DIR)"
++	@$(INSTALL_DIR) "$(DATA_INSTALL_DIR)/mods"
++	@$(CP_R) mods/cnc "$(DATA_INSTALL_DIR)/mods/"
++	@$(INSTALL_PROGRAM) $(mod_cnc_TARGET) "$(DATA_INSTALL_DIR)/mods/cnc"
++	@$(CP_R) mods/ra "$(DATA_INSTALL_DIR)/mods/"
++	@$(INSTALL_PROGRAM) $(mod_ra_TARGET) "$(DATA_INSTALL_DIR)/mods/ra"
++	@$(CP_R) mods/d2k "$(DATA_INSTALL_DIR)/mods/"
++	@$(INSTALL_PROGRAM) $(mod_d2k_TARGET) "$(DATA_INSTALL_DIR)/mods/d2k"
++
++	@$(INSTALL_DATA) AUTHORS "$(DATA_INSTALL_DIR)/AUTHORS"
++
++	@$(CP_R) glsl "$(DATA_INSTALL_DIR)"
++	@$(CP_R) cg "$(DATA_INSTALL_DIR)"
++	@$(CP) *.ttf "$(DATA_INSTALL_DIR)"
++	@$(CP) thirdparty/Tao/* "$(DATA_INSTALL_DIR)"
++	@$(INSTALL_PROGRAM) thirdparty/ICSharpCode.SharpZipLib.dll "$(DATA_INSTALL_DIR)"
++	@$(INSTALL_PROGRAM) thirdparty/FuzzyLogicLibrary.dll "$(DATA_INSTALL_DIR)"
++	@$(INSTALL_PROGRAM) thirdparty/SharpFont.dll "$(DATA_INSTALL_DIR)"
++	@$(CP) thirdparty/SharpFont.dll.config "$(DATA_INSTALL_DIR)"
++	@$(INSTALL_PROGRAM) thirdparty/Mono.Nat.dll "$(DATA_INSTALL_DIR)"
  
  	@echo "#!/bin/sh" 				>  openra
  	@echo 'BINDIR=$$(dirname $$(readlink -f $$0))'	>> openra
-@@ -273,6 +299,16 @@ install: all
+@@ -273,6 +301,16 @@
  	@echo 'cd "$${DATADIR}/openra"' 		>> openra
  	@echo 'exec mono OpenRA.Game.exe "$$@"' 	>> openra
  
-+	@$(INSTALL_DIR) $(BIN_INSTALL_DIR)
-+	@$(INSTALL_PROGRAM) -m +rx openra $(BIN_INSTALL_DIR)
++	@$(INSTALL_DIR) "$(BIN_INSTALL_DIR)"
++	@$(INSTALL_PROGRAM) -m +rx openra "$(BIN_INSTALL_DIR)"
 +
 +	@-$(RM) openra
 +
 +install-tools: tools
 +	@-echo "Installing OpenRA tools to $(DATA_INSTALL_DIR)"
-+	@$(INSTALL_DIR) $(DATA_INSTALL_DIR)
-+	@$(INSTALL_PROGRAM) $(foreach prog,$(TOOLS),$($(prog)_TARGET)) $(DATA_INSTALL_DIR)
++	@$(INSTALL_DIR) "$(DATA_INSTALL_DIR)"
++	@$(INSTALL_PROGRAM) $(foreach prog,$(TOOLS),$($(prog)_TARGET)) "$(DATA_INSTALL_DIR)"
 +
  	@echo "#!/bin/sh" 				>  openra-editor
  	@echo 'BINDIR=$$(dirname $$(readlink -f $$0))'	>> openra-editor
  	@echo 'ROOTDIR="$${BINDIR%'"$(bindir)"'}"' 	>> openra-editor
-@@ -280,14 +316,42 @@ install: all
+@@ -280,14 +318,42 @@
  	@echo 'cd "$${DATADIR}/openra"'			>> openra-editor
  	@echo 'exec mono OpenRA.Editor.exe "$$@"'	>> openra-editor
  
 -	@$(INSTALL_PROGRAM) -d $(BIN_INSTALL_DIR)
 -	@$(INSTALL_PROGRAM) -m +rx openra $(BIN_INSTALL_DIR)
-+	@$(INSTALL_DIR) $(BIN_INSTALL_DIR)
- 	@$(INSTALL_PROGRAM) -m +rx openra-editor $(BIN_INSTALL_DIR)
- 
+-	@$(INSTALL_PROGRAM) -m +rx openra-editor $(BIN_INSTALL_DIR)
+-
 -	@-rm openra
 -	@-rm openra-editor
++	@$(INSTALL_DIR) "$(BIN_INSTALL_DIR)"
++	@$(INSTALL_PROGRAM) -m +rx openra-editor "$(BIN_INSTALL_DIR)"
++
 +	@-$(RM) openra-editor
  
  uninstall:
 -	@-rm -r $(INSTALL_DIR)
 -	@-rm $(DESTDIR)$(bindir)/openra
 -	@-rm $(DESTDIR)$(bindir)/openra-editor
-+	@-$(RM_R) $(DATA_INSTALL_DIR)
-+	@-$(RM_F) $(BIN_INSTALL_DIR)/openra
-+	@-$(RM_F) $(BIN_INSTALL_DIR)/openra-editor
++	@-$(RM_R) "$(DATA_INSTALL_DIR)"
++	@-$(RM_F) "$(BIN_INSTALL_DIR)/openra"
++	@-$(RM_F) "$(BIN_INSTALL_DIR)/openra-editor"
 +
 +help:
 +	@echo to compile, run: