aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB. Watson <yalhcru@gmail.com>2022-04-06 16:35:50 -0400
committerB. Watson <yalhcru@gmail.com>2022-04-06 16:35:50 -0400
commit5568222f96b4d31e839931951ce93e930bd8b8f7 (patch)
treed9a5248fcf1048c036c9a65672a38e19c16b5691
parent4066051cb5234c57ad676996a31f0765e8fa0f58 (diff)
system/dosbox: Fix icon and .desktop.
Signed-off-by: B. Watson <yalhcru@gmail.com>
-rw-r--r--system/dosbox/dosbox.SlackBuild20
-rw-r--r--system/dosbox/dosbox.desktop2
2 files changed, 12 insertions, 10 deletions
diff --git a/system/dosbox/dosbox.SlackBuild b/system/dosbox/dosbox.SlackBuild
index 5ee4e95b2e23..ce3408e23130 100644
--- a/system/dosbox/dosbox.SlackBuild
+++ b/system/dosbox/dosbox.SlackBuild
@@ -27,12 +27,16 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 20220406 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - do not try to use a .ico icon in the .desktop file (png instead).
+# - remove useless INSTALL from doc dir.
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=dosbox
VERSION=${VERSION:-0.74.3}
SRCVER=$(sed 's/\(.*\)\./\1-/' <<< $VERSION)
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -44,9 +48,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
@@ -81,9 +82,9 @@ cd $PRGNAM-$SRCVER
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 {} \+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
@@ -106,11 +107,12 @@ for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i
install -D -m 0644 $CWD/dosbox.desktop \
$PKG/usr/share/applications/dosbox.desktop
-# Add the dosbox.ico file to /usr/share/pixmaps
-install -D -m 0644 src/dosbox.ico $PKG/usr/share/pixmaps/dosbox.ico
+# 20220406 bkw: convert the .ico icon to a .png.
+mkdir -p $PKG/usr/share/pixmaps
+convert 'src/dosbox.ico[1]' $PKG/usr/share/pixmaps/dosbox.png
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS \
+cp -a AUTHORS COPYING ChangeLog NEWS README THANKS \
docs/PORTING docs/README.video $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/system/dosbox/dosbox.desktop b/system/dosbox/dosbox.desktop
index 3741d36079b8..6b01168321fe 100644
--- a/system/dosbox/dosbox.desktop
+++ b/system/dosbox/dosbox.desktop
@@ -4,7 +4,7 @@ Name=dosbox
Comment=DOS Emulator
GenericName=dosbox
Exec=dosbox
-Icon=/usr/share/pixmaps/dosbox.ico
+Icon=/usr/share/pixmaps/dosbox.png
Terminal=false
Type=Application
Categories=System;