evolvotron: update to r706, attempt to build on -current against Qt5. Result segfaults...

1 files changed, 26 insertions, 20 deletions

diff --git a/evolvotron/build/evolvotron.SlackBuild b/evolvotron/build/evolvotron.SlackBuild
index bcf4ce92..463cc7e5 100755
--- a/evolvotron/build/evolvotron.SlackBuild
+++ b/evolvotron/build/evolvotron.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright 2006, 2008, 2010, 2011, 2013  Eric Hameleers, Eindhoven, NL
+# Copyright 2006, 2008, 2010, 2011, 2013, 2019  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -40,6 +40,8 @@
 #             * Rebuilt for Slackware 13.37.
 # 0.6.3-1:    08/feb/2013 by Eric Hameleers <alien@slackware.com>
 #             * New release.
+# 0.7.2-1:    30/may/2019 by Eric Hameleers <alien@slackware.com>
+#             * New release.
 # 
 # Run 'sh evolvotron.SlackBuild' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -50,8 +52,8 @@
 # Set initial variables:
 
 PRGNAM=evolvotron
-VERSION=${VERSION:-0.6.3}
-#VERSION=${VERSION:-r647}
+#VERSION=${VERSION:-0.7.2}
+VERSION=${VERSION:-r706}
 BUILD=${BUILD:-1}
 TAG=${TAG:-alien}
 
@@ -66,8 +68,8 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 SOURCE="$SRCDIR/${PRGNAM}-${VERSION}.tar.gz"
-SRCURL="http://downloads.sourceforge.net/${PRGNAM}/${PRGNAM}-${VERSION}.tar.gz"
-#SRCURL=""
+#SRCURL="http://downloads.sourceforge.net/${PRGNAM}/${PRGNAM}-${VERSION}.tar.gz"
+SRCURL=""
 
 ##
 ## --- with a little luck, you won't have to edit below this point --- ##
@@ -77,7 +79,7 @@ SRCURL="http://downloads.sourceforge.net/${PRGNAM}/${PRGNAM}-${VERSION}.tar.gz"
 MARCH=$( uname -m )
 if [ -z "$ARCH" ]; then
   case "$MARCH" in
-    i?86)    export ARCH=i486 ;;
+    i?86)    export ARCH=i586 ;;
     armv7hl) export ARCH=$MARCH ;;
     arm*)    export ARCH=arm ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
@@ -149,7 +151,7 @@ src_checkout() {
      fi
      mkdir $PRGNAM-${VERSION} \
        && cd $PRGNAM-${VERSION} \
-       && svn checkout --revision $REV http://evolvotron.svn.sourceforge.net/svnroot/evolvotron/trunk . \
+       && svn checkout --revision $REV https://svn.code.sf.net/p/evolvotron/code/trunk . \
        && find . -type d -name '.svn' -depth | xargs rm -rf \
        && chown -R root:root . \
        && cd .. \
@@ -165,18 +167,23 @@ src_checkout() {
 if ! [ -f ${SOURCE} ]; then
   echo "Source '$(basename ${SOURCE})' not available yet..."
   # Check if the $SRCDIR is writable at all - if not, download to $OUTPUT
-  [ -w "$SRCDIR" ] || SOURCE="$OUTPUT/$(basename $SOURCE)"
+  [ -w "$SRCDIR" ] || SOURCE="$OUTPUT/$(basename ${SOURCE})"
   if [ -f ${SOURCE} ]; then echo "Ah, found it!"; continue; fi
   if ! [ "x${SRCURL}" == "x" ]; then
     echo "Will download file to $(dirname $SOURCE)"
-    wget -nv -T 20 -O "${SOURCE}" "${SRCURL}" || true
+    wget --no-check-certificate -nv -T 20 -O "${SOURCE}" "${SRCURL}" || true
     if [ $? -ne 0 -o ! -s "${SOURCE}" ]; then
-      echo "Downloading '$(basename ${SOURCE})' failed... aborting the build."
+      echo "Fail to download '$(basename ${SOURCE})'. Aborting the build."
       mv -f "${SOURCE}" "${SOURCE}".FAIL
       exit 1
     fi
   else
-    echo "File '$(basename ${SOURCE})' not available... aborting the build."
+    # Try if we have a SVN/CVS download routine for ${SOURCE}
+    echo "Will checkout sources to $(dirname $SOURCE)"
+    src_checkout 0 "${SOURCE}" 2>&1 > $OUTPUT/checkout-$(basename ${SOURCE}).log
+  fi
+  if [ ! -f "${SOURCE}" -o ! -s "${SOURCE}" ]; then
+    echo "File '$(basename ${SOURCE})' not available. Aborting the build."
     exit 1
   fi
 fi
@@ -198,20 +205,17 @@ tar -xvf ${SOURCE}
 mv ${PRGNAM} ${PRGNAM}-${VERSION} 2>/dev/null || true
 cd ${PRGNAM}-${VERSION}
 
-# Qt4 fix:
-sed -i -e 's/qmake-qt4/qmake/g' $(grep -lr -- -qt4 .)
-
 chown -R root:root .
 chmod -R u+w,go+r-w,a+X-s .
 
 echo Building ...
 # This avoids compiling a version number into .la files:
-QTDIR=/usr/lib${LIBDIRSUFFIX}/qt ; export QTDIR
+QTDIR=/usr/lib${LIBDIRSUFFIX}/qt5 ; export QTDIR
 
-LDFLAGS="$SLKLDFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-CFLAGS="$SLKCFLAGS" \
-./configure 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
+export LDFLAGS="$SLKLDFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+export CFLAGS="$SLKCFLAGS"
+qmake-qt5 "VERSION_NUMBER=$(./VERSION)" main.pro 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
 make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
 
 # Install all the needed stuff to the package dir
@@ -224,6 +228,8 @@ mkdir -p $PKG/usr/man/man1
 cp man/man1/*.1 $PKG/usr/man/man1
 
 # Add a .desktop file:
+mkdir -p $PKG/usr/share/pixmaps
+cp -ia $SRCDIR/${PRGNAM}.png $PKG/usr/share/pixmaps/
 mkdir -p $PKG/usr/share/applications
 cat <<EOT > $PKG/usr/share/applications/${PRGNAM}.desktop
 [Desktop Entry]
@@ -233,7 +239,7 @@ SwallowExec=
 Name=Evolvotron
 MimeType=
 Exec=evolvotron
-Icon=/usr/share/pixmaps/Paint.xpm
+Icon=evolvotron
 TerminalOptions=
 Path=
 Type=Application