summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB. Watson <yalhcru@gmail.com>2022-02-19 11:09:56 -0500
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2022-02-20 15:12:42 +0700
commit3131127b42c47667d49fed1ad8cba8fcc6186e7e (patch)
treec982c5886ea86cc23dff3f3d9f3de61cfd302a4d
parentb1e0ad67936d0157815e2fbd1302b9d28eb020b1 (diff)
downloadslackbuilds-3131127b42c47667d49fed1ad8cba8fcc6186e7e.tar.gz
games/arnold-cpc: Fix 15.0 build.
Signed-off-by: B. Watson <yalhcru@gmail.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--games/arnold-cpc/arnold-cpc.SlackBuild18
-rw-r--r--games/arnold-cpc/arnold-cpc.desktop2
2 files changed, 10 insertions, 10 deletions
diff --git a/games/arnold-cpc/arnold-cpc.SlackBuild b/games/arnold-cpc/arnold-cpc.SlackBuild
index ab7717623f..1b679f4e70 100644
--- a/games/arnold-cpc/arnold-cpc.SlackBuild
+++ b/games/arnold-cpc/arnold-cpc.SlackBuild
@@ -22,6 +22,10 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 20220219 bkw: Modified by SlackBuilds.org:
+# - fix 15.0 build.
+# - absolute path to icon in .desktop file (because it's not in /usr/share/icons).
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=arnold-cpc
@@ -42,9 +46,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
@@ -79,12 +80,14 @@ cd $SRCDIR
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 {} \+
cd src
+SLKCFLAGS+=" -fcommon"
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
@@ -99,14 +102,11 @@ CXXFLAGS="$SLKCFLAGS" \
make # compile source
# no make install support here
-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
-
cd ..
# install executable
mkdir -p $PKG/usr/bin
-install -D -m0755 $SRCDIR $PKG/usr/bin/$SRCDIR
+install -s -D -m0755 $SRCDIR $PKG/usr/bin/$SRCDIR
# install .desktop file created for this script
mkdir -p $PKG/usr/share/applications
diff --git a/games/arnold-cpc/arnold-cpc.desktop b/games/arnold-cpc/arnold-cpc.desktop
index 0ca8d17a36..08b6b7a746 100644
--- a/games/arnold-cpc/arnold-cpc.desktop
+++ b/games/arnold-cpc/arnold-cpc.desktop
@@ -2,7 +2,7 @@
Name=Arnold CPC
Comment=Amstrad CPC emulator using SDL with a GTK+ interface
Exec=arnold
-Icon=arnold-cpc
+Icon=/usr/share/pixmaps/arnold-cpc.png
Terminal=false
Type=Application
Categories=Game;Emulator;