From 92e267bc7424cbb4425bf65fe23bae7c362dcc21 Mon Sep 17 00:00:00 2001
From: "Edinaldo P. Silva" <edps@mundognu@gmail.com>
Date: Mon, 24 Apr 2017 13:58:18 +0100
Subject: system/wine-staging: Updated for version 2.6.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
---
 system/wine-staging/wine-staging.SlackBuild | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

(limited to 'system/wine-staging/wine-staging.SlackBuild')

diff --git a/system/wine-staging/wine-staging.SlackBuild b/system/wine-staging/wine-staging.SlackBuild
index 667eb3d97d..d530b2cfdd 100644
--- a/system/wine-staging/wine-staging.SlackBuild
+++ b/system/wine-staging/wine-staging.SlackBuild
@@ -30,7 +30,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=wine-staging
-VERSION=${VERSION:-2.3}
+VERSION=${VERSION:-2.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -48,9 +48,8 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 # If your video card does not support hardware accelerated OpenGL,
-# the run the script like: OPENGL=NO ./wine.SlackBuild
-
-  OPENGL=${OPENGL:-YES}
+# run the script like:   OPENGL=NO ./wine.SlackBuild
+OPENGL=${OPENGL:-YES}
 
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
@@ -66,17 +65,16 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e
-
 SRCNAM="wine-patched-staging"
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM-$VERSION
 tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
 cd $SRCNAM-$VERSION
-
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -85,15 +83,12 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # If OPENGL=YES above, then enable opengl; otherwise, disable it.
-
 if [ "$OPENGL" = "YES" ]; then
     do_opengl="with"
   else
     do_opengl="without"
 fi
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --mandir=/usr/man \
@@ -116,13 +111,22 @@ install -d $PKG/etc/fonts/conf.{avail,d}
 install -m644 $CWD/30-win32-aliases.conf $PKG/etc/fonts/conf.avail
 ln -sf /etc/fonts/conf.avail/30-win32-aliases.conf $PKG/etc/fonts/conf.d/30-win32-aliases.conf
 
-# Add a desktop menu for winecfg:
+# Create Wine menu structure:
+mkdir -p $PKG/etc/xdg/menus/applications-merged
+cp -a $CWD/wine.menu $PKG/etc/xdg/menus/applications-merged
+
+# Add a desktop menu for winecfg, wine-uninstaller and wine-browsedrive:
 mkdir -p $PKG/usr/share/{applications,icons/hicolor/scalable/apps,pixmaps}
+
 convert $CWD/wine.svg -scale 64 $PKG/usr/share/pixmaps/wine.png
 cp -a $CWD/wine.svg $PKG/usr/share/icons/hicolor/scalable/apps/
+
 convert $CWD/winecfg.png -scale 64 $PKG/usr/share/pixmaps/winecfg.png
+convert $CWD/winecfg.png -scale 64 $PKG/usr/share/pixmaps/folder-wine.png
+convert $CWD/winecfg.png -scale 64 $PKG/usr/share/pixmaps/wine-uninstaller.png
+
 cp -a programs/winecfg/winecfg.svg $PKG/usr/share/icons/hicolor/scalable/apps/
-cp -a $CWD/winecfg.desktop $PKG/usr/share/applications/
+cp -a $CWD/*.desktop $PKG/usr/share/applications/
 
 DOCS="ANNOUNCE AUTHORS COPYING.LIB LICENSE* MAINTAINERS README VERSION"
 FONTS_LICENSE="COPYING.arial COPYING.cour COPYING.msyh COPYING.times"
-- 
cgit v1.2.3