[arch-commits] Commit in openra/repos/community-any (5 files)

[Sven-Hendrik Haase]

    Date: Sunday, May 21, 2017 @ 14:19:23
  Author: svenstaro
Revision: 228908

archrelease: copy trunk to community-any

Added:
  openra/repos/community-any/PKGBUILD
    (from rev 228907, openra/trunk/PKGBUILD)
  openra/repos/community-any/b74141666b57075be1bcc16a1d864e19988b9dfb.patch
    (from rev 228907, openra/trunk/b74141666b57075be1bcc16a1d864e19988b9dfb.patch)
  openra/repos/community-any/openra.install
    (from rev 228907, openra/trunk/openra.install)
Deleted:
  openra/repos/community-any/PKGBUILD
  openra/repos/community-any/openra.install

------------------------------------------------+
 PKGBUILD                                       |   86 ++++++++++++-----------
 b74141666b57075be1bcc16a1d864e19988b9dfb.patch |   30 ++++++++
 openra.install                                 |    8 +-
 3 files changed, 79 insertions(+), 45 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2017-05-21 14:19:06 UTC (rev 228907)
+++ PKGBUILD	2017-05-21 14:19:23 UTC (rev 228908)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-# Contributor: Matthew Bowra-Dean <matthew at ijw.co.nz>
-pkgname=openra
-pkgver=20170421
-pkgrel=1
-pkgdesc="An open-source implementation of the Red Alert engine using .NET/Mono and OpenGL"
-arch=('any')
-url="http://www.openra.net"
-license=('GPL3')
-install=openra.install
-depends=('mono' 'ttf-dejavu' 'openal' 'libgl' 'freetype2' 'sdl2' 'lua51' 'hicolor-icon-theme' 'gtk-update-icon-cache'
-         'desktop-file-utils' 'xdg-utils' 'zenity')
-makedepends=('git' 'unzip')
-options=(!strip)
-source=("git+https://github.com/OpenRA/OpenRA.git#tag=release-${pkgver}")
-md5sums=('SKIP')
-
-prepare() {
-  cd OpenRA
-
-  make version
-}
-
-build() {
-  cd OpenRA
-
-  make dependencies
-  make core
-  make tools
-}
-
-package() {
-  cd OpenRA
-
-  make prefix=/usr DESTDIR="$pkgdir" install-all
-  make prefix=/usr DESTDIR="$pkgdir" install-linux-shortcuts
-  make prefix=/usr DESTDIR="$pkgdir" install-linux-mime
-  make prefix=/usr DESTDIR="$pkgdir" install-linux-appdata
-  make prefix=/usr DESTDIR="$pkgdir" install-man-page
-}

Copied: openra/repos/community-any/PKGBUILD (from rev 228907, openra/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2017-05-21 14:19:23 UTC (rev 228908)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Contributor: Matthew Bowra-Dean <matthew at ijw.co.nz>
+pkgname=openra
+pkgver=20170421
+pkgrel=2
+pkgdesc="An open-source implementation of the Red Alert engine using .NET/Mono and OpenGL"
+arch=('any')
+url="http://www.openra.net"
+license=('GPL3')
+install=openra.install
+depends=('mono' 'ttf-dejavu' 'openal' 'libgl' 'freetype2' 'sdl2' 'lua51' 'hicolor-icon-theme' 'gtk-update-icon-cache'
+         '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')
+
+prepare() {
+  cd OpenRA
+
+  patch -Np1 < "$srcdir"/b74141666b57075be1bcc16a1d864e19988b9dfb.patch
+
+  make version
+}
+
+build() {
+  cd OpenRA
+
+  make dependencies
+  make core
+  make tools
+}
+
+package() {
+  cd OpenRA
+
+  make prefix=/usr DESTDIR="$pkgdir" install-all
+  make prefix=/usr DESTDIR="$pkgdir" install-linux-shortcuts
+  make prefix=/usr DESTDIR="$pkgdir" install-linux-mime
+  make prefix=/usr DESTDIR="$pkgdir" install-linux-appdata
+  make prefix=/usr DESTDIR="$pkgdir" install-man-page
+}

Copied: openra/repos/community-any/b74141666b57075be1bcc16a1d864e19988b9dfb.patch (from rev 228907, openra/trunk/b74141666b57075be1bcc16a1d864e19988b9dfb.patch)
===================================================================
--- b74141666b57075be1bcc16a1d864e19988b9dfb.patch	                        (rev 0)
+++ b74141666b57075be1bcc16a1d864e19988b9dfb.patch	2017-05-21 14:19:23 UTC (rev 228908)
@@ -0,0 +1,30 @@
+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++)

Deleted: openra.install
===================================================================
--- openra.install	2017-05-21 14:19:06 UTC (rev 228907)
+++ openra.install	2017-05-21 14:19:23 UTC (rev 228908)
@@ -1,4 +0,0 @@
-post_remove() {
-    echo "openra downloaded data files to ~/.openra/Content and you might want"
-    echo "to delete those."
-}

Copied: openra/repos/community-any/openra.install (from rev 228907, openra/trunk/openra.install)
===================================================================
--- openra.install	                        (rev 0)
+++ openra.install	2017-05-21 14:19:23 UTC (rev 228908)
@@ -0,0 +1,4 @@
+post_remove() {
+    echo "openra downloaded data files to ~/.openra/Content and you might want"
+    echo "to delete those."
+}