From c597bba45fac560b9675540582e3c3838bb97464 Mon Sep 17 00:00:00 2001
From: gnastyle <BM-2cTv4XtvC9UQ8TdFCfPNySv2omc8T6m3sv@bitmessage.ch>
Date: Wed, 27 Apr 2016 14:22:11 +0200
Subject: [PATCH] freecol: update to 0.11.6

---
 freecol/PKGBUILD     | 30 ++++++++++--------------------
 freecol/main.desktop |  2 +-
 freecol/main.sh      |  8 ++------
 3 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/freecol/PKGBUILD b/freecol/PKGBUILD
index 66cac2e1d..f2e5cc6a3 100644
--- a/freecol/PKGBUILD
+++ b/freecol/PKGBUILD
@@ -1,40 +1,30 @@
-#
-# Games Packages for Chakra, part of chakraos.org
-#
-# Maintainer: Adrián Chaves Fernández (Gallaecio) <adriyetichaves gmail.com>
-
 pkgname=freecol
 _pkgname=FreeCol
-pkgver=0.11.2
+pkgver=0.11.6
 pkgrel=1
 pkgdesc="A turn-based strategy game based on Colonization"
 arch=('x86_64')
 url="http://www.freecol.org/"
 license=('GPL')
 depends=('java-runtime')
-#makedepends=('apache-ant')
 categories=('games')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-src.zip
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.zip
         main.desktop
         main.sh)
-md5sums=('25ff61ef058d34bc62c276d33c066639'
-         '68922dfb7c1db20c13c4eb6930f9bd93'
-         '058e8125acc3b475e90cb2be7cd8f55a')
-
-build() {
-  cd "$srcdir/$pkgname"
-}
+sha1sums=('084acb6c3c86ce7b1935dfc9a60596ab9547c8fe'
+          '1c0b0f685bf88a3c3618bcf6414ace6cddf1ffd0'
+          'f14f60f487e96ce5bd848357e5ba5a2c4d7d2fd2')
 
 package() {
   cd "$srcdir/$pkgname"
 
-  install -Dm644 FreeCol.jar "$pkgdir/usr/share/java/$pkgname/FreeCol.jar"
-  install -Dm644 doc/FreeCol.tex "$pkgdir/usr/share/doc/$pkgname/FreeCol.pdf"
+  install -Dm644 FreeCol.jar "$pkgdir/usr/share/$pkgname/FreeCol.jar"
+  install -Dm644 FreeCol.pdf "$pkgdir/usr/share/doc/$pkgname/FreeCol.pdf"
   install -Dm644 $pkgname.xpm "$pkgdir/usr/share/pixmaps/$pkgname.xpm"
   install -Dm644 ../main.desktop "$pkgdir/usr/share/applications/$pkgname.desktop"
   install -Dm755 ../main.sh "$pkgdir/usr/bin/$pkgname"
 
-  cp -r data jars "$pkgdir/usr/share/java/$pkgname/"
-  find "$pkgdir/usr/share/java/$pkgname" -type d -exec chmod 755 '{}' \;
-  find "$pkgdir/usr/share/java/$pkgname" -type f -exec chmod 644 '{}' \;
+  cp -r data jars "$pkgdir/usr/share/$pkgname/"
+  find "$pkgdir/usr/share/$pkgname" -type d -exec chmod 755 '{}' \;
+  find "$pkgdir/usr/share/$pkgname" -type f -exec chmod 644 '{}' \;
 }
diff --git a/freecol/main.desktop b/freecol/main.desktop
index 6065678ad..bdbf1a4d6 100644
--- a/freecol/main.desktop
+++ b/freecol/main.desktop
@@ -8,5 +8,5 @@ Comment=A turn-based strategy game based on Colonization™.
 Comment[gl]=Un xogo de estratexia por quendas baseado no Colonization™.
 TryExec=/usr/bin/freecol
 Exec=freecol
-Icon=/usr/share/pixmaps/freecol.xpm
+Icon=freecol
 Categories=Game;StrategyGame;
diff --git a/freecol/main.sh b/freecol/main.sh
index 974a2728f..4442521f8 100644
--- a/freecol/main.sh
+++ b/freecol/main.sh
@@ -1,9 +1,5 @@
 #!/bin/bash
 
-FC_PATH=/usr/share/java/freecol
-LOG_PATH=/tmp/freecol
+FC_PATH=/usr/share/freecol
 
-[ ! -d "$LOG_PATH" ] && install -dm755 $LOG_PATH
-cd $LOG_PATH
-java -Xmx256M -jar $FC_PATH/freecol.jar "$@" --freecol-data $FC_PATH/data \
-  &> ./messages.log
+java -Xmx512M -jar $FC_PATH/FreeCol.jar "$@" --freecol-data $FC_PATH/data --no-intro