5 files changed, 48 insertions, 37 deletions
diff --git a/games/widelands/doinst.sh b/games/widelands/doinst.sh
index 3857649f506a8..11813c3101713 100644
--- a/games/widelands/doinst.sh
+++ b/games/widelands/doinst.sh
@@ -1,3 +1,9 @@
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications &> /dev/null
 fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/games/widelands/widelands-1.0-boost-1.77.patch b/games/widelands/widelands-1.0-boost-1.77.patch
new file mode 100644
index 0000000000000..69c1cb8caf438
--- /dev/null
+++ b/games/widelands/widelands-1.0-boost-1.77.patch
@@ -0,0 +1,16 @@
+https://bugs.gentoo.org/808747
+
+https://github.com/widelands/widelands/commit/316eaea
+From: matthiakl <t-m.42@mailpost.spdns.org>
+Date: Sat, 14 Aug 2021 19:24:08 +0200
+Subject: [PATCH] Added missing direct incude (#5025)
+--- a/src/network/bufferedconnection.h
++++ b/src/network/bufferedconnection.h
+@@ -20,6 +20,7 @@
+ #ifndef WL_NETWORK_BUFFEREDCONNECTION_H
+ #define WL_NETWORK_BUFFEREDCONNECTION_H
+ 
++#include <map>
+ #include <memory>
+ #include <mutex>
+ #include <thread>
diff --git a/games/widelands/widelands.SlackBuild b/games/widelands/widelands.SlackBuild
index e3d5408257568..8af1205fddc26 100644
--- a/games/widelands/widelands.SlackBuild
+++ b/games/widelands/widelands.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for widelands
 
-# Copyright 2008-2017 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2008-2021 Heinz Wiesinger, Amsterdam, The Netherlands
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -11,21 +11,21 @@
 # 1. Redistributions of this script must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 #
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=widelands
-VERSION=${VERSION:-build21}
+VERSION=${VERSION:-1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -70,7 +70,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION-source.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -79,32 +79,31 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# Fix building against boost 1.77.0
+patch -p1 -i $CWD/widelands-1.0-boost-1.77.patch
+
 mkdir -p build1
 cd build1
   cmake \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_PREFIX=/usr/bin \
     -DCMAKE_BUILD_TYPE=Release \
-    -DWL_INSTALL_PREFIX=/usr \
     -DWL_INSTALL_DATADIR=/usr/share/widelands \
+    -DWL_INSTALL_BASEDIR=/usr/doc/$PRGNAM-$VERSION \
+    -DGTK_UPDATE_ICON_CACHE=OFF \
     ..
   make
   make install DESTDIR=$PKG
 cd ..
 
-mkdir -p $PKG/usr/bin
-mv $PKG/usr/{widelands,wl_map_object_info,wl_map_info,wl_create_spritesheet} $PKG/usr/bin
-
-mkdir -p $PKG/usr/share/applications
-install -m 0644 $CWD/widelands.desktop \
-  $PKG/usr/share/applications/widelands.desktop
+mv $PKG/usr/share/man $PKG/usr/
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-mv $PKG/usr/{VERSION,ChangeLog,CREDITS,COPYING} $PKG/usr/doc/$PRGNAM-$VERSION
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/games/widelands/widelands.desktop b/games/widelands/widelands.desktop
deleted file mode 100644
index 8c62d39991006..0000000000000
--- a/games/widelands/widelands.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Widelands
-Name[de]=Widelands
-Comment="Settlers II" clone
-Comment[de]= Ein "Siedler II" Clone
-Exec=widelands
-Icon=/usr/share/games/widelands/pics/wl-ico-48.png
-Terminal=false
-Type=Application
-Categories=Game;StrategyGame;
diff --git a/games/widelands/widelands.info b/games/widelands/widelands.info
index 0287fabcc3dd3..a9a9e667ed950 100644
--- a/games/widelands/widelands.info
+++ b/games/widelands/widelands.info
@@ -1,10 +1,10 @@
 PRGNAM="widelands"
-VERSION="build21"
+VERSION="1.0"
 HOMEPAGE="http://www.widelands.org"
-DOWNLOAD="https://launchpad.net/widelands/build21/build21/+download/widelands-build21-source.tar.gz"
-MD5SUM="2933da247b2009f5608e92624d606851"
+DOWNLOAD="https://github.com/widelands/widelands/archive/v1.0/widelands-1.0.tar.gz"
+MD5SUM="ac576b20273205a09bc1e6dc19550499"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="lua"
+REQUIRES=""
 MAINTAINER="Heinz Wiesinger"
 EMAIL="pprkut@slackbuilds.org"