games/fs2open: Fix download links, .desktop.

Signed-off-by: B. Watson <yalhcru@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

2 files changed, 18 insertions, 16 deletions

diff --git a/games/fs2open/fs2open.SlackBuild b/games/fs2open/fs2open.SlackBuild
index e05dacb7553dc..b95be31e07ead 100644
--- a/games/fs2open/fs2open.SlackBuild
+++ b/games/fs2open/fs2open.SlackBuild
@@ -22,6 +22,11 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220222 bkw: Modified by SlackBuilds.org:
+# - fix download URL.
+# - force use of wxGTK3.
+# - full paths in .desktop files, get rid of Encoding=
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=fs2open
@@ -38,9 +43,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -75,9 +77,14 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+
+# 20220222 bkw: force cmake to find wxGTK3, ignoring /usr/bin/wx-config.
+mkdir -p wxtmp
+ln -s /usr/lib$LIBDIRSUFFIX/wx/config/gtk3-unicode-3.0 wxtmp/wx-config
+export PATH="$(pwd)/wxtmp:$PATH"
 
 mkdir -p build/lib/openal/OpenALsoft/src/
 cp $CWD/openal-soft-1.15.1.tar.bz2 build/lib/openal/OpenALsoft/src/
@@ -93,12 +100,9 @@ cd build
     -DFSO_USE_LUAJIT:BOOL=OFF \
     -DCMAKE_BUILD_TYPE=Release ..
   make
-  make install DESTDIR=$PKG
+  make install/strip DESTDIR=$PKG
 cd ..
 
-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
-
 # copy the pixmap
 mkdir -p $PKG/usr/share/pixmaps
 cp $TMP/$PRGNAM-$VERSION/freespace2/resources/app_icon.png $PKG/usr/share/pixmaps/fs2open.png
@@ -109,25 +113,23 @@ if [ "$ARCH" = "x86_64" ]; then
 cat << EOF > $PKG/usr/share/applications/fs2open.desktop
 [Desktop Entry]
 Type=Application
-Encoding=UTF-8
 Name=FreeSpace 2 Open
 Comment=A Linux port of FreeSpace 2
-Icon=fs2open.png
+Icon=/usr/share/pixmaps/fs2open.png
 Exec=/opt/fs2open/fs2_open_3_7_5_x64
 Terminal=false
-Categories=Application;Game;
+Categories=Game;
 EOF
 else
 cat << EOF > $PKG/usr/share/applications/fs2open.desktop
 [Desktop Entry]
 Type=Application
-Encoding=UTF-8
 Name=FreeSpace 2 Open
 Comment=A Linux port of FreeSpace 2
-Icon=fs2open.png
+Icon=/usr/share/pixmaps/fs2open.png
 Exec=/opt/fs2open/fs2_open_3_7_5
 Terminal=false
-Categories=Application;Game;
+Categories=Game;
 EOF
 fi
 
diff --git a/games/fs2open/fs2open.info b/games/fs2open/fs2open.info
index 1937a793bc398..48f53d7802f6e 100644
--- a/games/fs2open/fs2open.info
+++ b/games/fs2open/fs2open.info
@@ -1,7 +1,7 @@
 PRGNAM="fs2open"
 VERSION="ac2b864"
 HOMEPAGE="https://github.com/scp-fs2open/fs2open.github.com"
-DOWNLOAD="https://schmatzler.de/my_slackbuilds/fs2open/fs2open-ac2b864.tar.gz \
+DOWNLOAD="https://slackware.uk/~urchlay/src/fs2open-ac2b864.tar.gz \
           https://downloads.sourceforge.net/project/openal-soft/openal-soft/openal-soft-1.15.1.tar.bz2"
 MD5SUM="19d8cd7edeb98a25b49abbf92b68246c \
         ea83dec3b9655a27d28e7bc7cae9cd71"