system/wine-staging: Updated for version 2.6.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

5 files changed, 47 insertions, 15 deletions

diff --git a/system/wine-staging/wine-browsedrive.desktop b/system/wine-staging/wine-browsedrive.desktop
new file mode 100644
index 0000000000..4454f7abd7
--- /dev/null
+++ b/system/wine-staging/wine-browsedrive.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Browse C: Drive
+Comment=Browse your virtual C: drive
+Exec=wine winebrowser c:
+Terminal=false
+Type=Application
+Icon=folder-wine
+Categories=System;X-Wine;
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"
diff --git a/system/wine-staging/wine-staging.info b/system/wine-staging/wine-staging.info
index 2f14977b68..56d72cd325 100644
--- a/system/wine-staging/wine-staging.info
+++ b/system/wine-staging/wine-staging.info
@@ -1,8 +1,8 @@
 PRGNAM="wine-staging"
-VERSION="2.3"
+VERSION="2.6"
 HOMEPAGE="http://www.wine-staging.com/"
-DOWNLOAD="https://github.com/wine-compholio/wine-patched/archive/staging-2.3/wine-patched-staging-2.3.tar.gz"
-MD5SUM="0f28988f92ce676bf8016444137b589d"
+DOWNLOAD="https://github.com/wine-compholio/wine-patched/archive/staging-2.6/wine-patched-staging-2.6.tar.gz"
+MD5SUM="266e138338e4e49a407782334d0a7613"
 DOWNLOAD_x86_64="UNSUPPORTED"
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/wine-staging/wine-uninstaller.desktop b/system/wine-staging/wine-uninstaller.desktop
new file mode 100644
index 0000000000..0a26ce2c4a
--- /dev/null
+++ b/system/wine-staging/wine-uninstaller.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Uninstall Wine Software
+Comment=Uninstall Windows applications for Wine
+Exec=wine uninstaller
+Terminal=false
+Type=Application
+Icon=wine-uninstaller
+Categories=System;X-Wine;
diff --git a/system/wine-staging/wine.menu b/system/wine-staging/wine.menu
new file mode 100644
index 0000000000..cf32bd67b0
--- /dev/null
+++ b/system/wine-staging/wine.menu
@@ -0,0 +1,12 @@
+<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
+"http://www.freedesktop.org/standards/menu-spec/menu-1.0.dtd">
+<Menu>
+  <Name>Applications</Name>
+  <Menu>
+    <Name>wine-wine</Name>
+    <Directory>wine-wine.directory</Directory>
+    <Include>
+      <Category>Wine</Category>
+    </Include>
+  </Menu>
+</Menu>
\ No newline at end of file