[arch-commits] Commit in openra/trunk (2 files)

[Sven-Hendrik Haase]

    Date: Monday, May 29, 2017 @ 11:52:50
  Author: svenstaro
Revision: 230860

upgpkg: openra 20170527-1

Modified:
  openra/trunk/PKGBUILD
Deleted:
  openra/trunk/b74141666b57075be1bcc16a1d864e19988b9dfb.patch

------------------------------------------------+
 PKGBUILD                                       |   12 +++------
 b74141666b57075be1bcc16a1d864e19988b9dfb.patch |   30 -----------------------
 2 files changed, 4 insertions(+), 38 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-05-29 10:46:58 UTC (rev 230859)
+++ PKGBUILD	2017-05-29 11:52:50 UTC (rev 230860)
@@ -2,8 +2,8 @@
 # Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
 # Contributor: Matthew Bowra-Dean <matthew at ijw.co.nz>
 pkgname=openra
-pkgver=20170421
-pkgrel=2
+pkgver=20170527
+pkgrel=1
 pkgdesc="An open-source implementation of the Red Alert engine using .NET/Mono and OpenGL"
 arch=('any')
 url="http://www.openra.net"
@@ -13,16 +13,12 @@
          'desktop-file-utils' 'xdg-utils' 'zenity')
 makedepends=('git' 'unzip')
 options=(!strip)
-source=("git+https://github.com/OpenRA/OpenRA.git#tag=release-${pkgver}"
-        b74141666b57075be1bcc16a1d864e19988b9dfb.patch)
-md5sums=('SKIP'
-         'ef4913d8de94aa2d77cf9bb252987ca2')
+source=("git+https://github.com/OpenRA/OpenRA.git#tag=release-${pkgver}")
+md5sums=('SKIP')
 
 prepare() {
   cd OpenRA
 
-  patch -Np1 < "$srcdir"/b74141666b57075be1bcc16a1d864e19988b9dfb.patch
-
   make version
 }
 

Deleted: b74141666b57075be1bcc16a1d864e19988b9dfb.patch
===================================================================
--- b74141666b57075be1bcc16a1d864e19988b9dfb.patch	2017-05-29 10:46:58 UTC (rev 230859)
+++ b74141666b57075be1bcc16a1d864e19988b9dfb.patch	2017-05-29 11:52:50 UTC (rev 230860)
@@ -1,30 +0,0 @@
-From b74141666b57075be1bcc16a1d864e19988b9dfb Mon Sep 17 00:00:00 2001
-From: Paul Chote <pchote at users.noreply.github.com>
-Date: Thu, 18 May 2017 08:58:52 +0100
-Subject: [PATCH] Implement a workaround for the mono 5.0 cursor enumerator
- bug.
-
----
- OpenRA.Game/Orders/UnitOrderGenerator.cs | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/OpenRA.Game/Orders/UnitOrderGenerator.cs b/OpenRA.Game/Orders/UnitOrderGenerator.cs
-index 92862b8eb38..0a5b459709c 100644
---- a/OpenRA.Game/Orders/UnitOrderGenerator.cs
-+++ b/OpenRA.Game/Orders/UnitOrderGenerator.cs
-@@ -139,8 +139,15 @@ static UnitOrderResult OrderForUnit(Actor self, Target target, List<Actor> actor
- 			if (mi.Modifiers.HasModifier(Modifiers.Alt))
- 				modifiers |= TargetModifiers.ForceMove;
- 
-+			// The Select(x => x) is required to work around an issue on mono 5.0
-+			// where calling OrderBy* on SelectManySingleSelectorIterator can in some
-+			// circumstances (which we were unable to identify) replace entries in the
-+			// enumeration with duplicates of other entries.
-+			// Other action that replace the SelectManySingleSelectorIterator with a
-+			// different enumerator type (e.g. .Where(true) or .ToList()) also work.
- 			var orders = self.TraitsImplementing<IIssueOrder>()
- 				.SelectMany(trait => trait.Orders.Select(x => new { Trait = trait, Order = x }))
-+				.Select(x => x)
- 				.OrderByDescending(x => x.Order.OrderPriority);
- 
- 			for (var i = 0; i < 2; i++)