system/wine-staging: Updated for version 2.1.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

6 files changed, 175 insertions, 7 deletions

diff --git a/system/wine-staging/30-win32-aliases.conf b/system/wine-staging/30-win32-aliases.conf
new file mode 100644
index 000000000000..99ae1f7b83a5
--- /dev/null
+++ b/system/wine-staging/30-win32-aliases.conf
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <alias binding="same">
+    <family>MS Shell Dlg</family>
+    <accept><family>Microsoft Sans Serif</family></accept>
+    <default><family>sans-serif</family></default>
+  </alias>
+  <alias binding="same">
+    <family>MS Shell Dlg 2</family>
+    <accept><family>Tahoma</family></accept>
+    <default><family>sans-serif</family></default>
+  </alias>
+
+  <alias binding="same">
+    <family>MS Sans Serif</family>
+    <prefer><family>Microsoft Sans Serif</family></prefer>
+    <default><family>sans-serif</family></default>
+  </alias>
+</fontconfig>
diff --git a/system/wine-staging/wine-staging.SlackBuild b/system/wine-staging/wine-staging.SlackBuild
index 1680b2d8e7b7..e94005e71001 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.0}
+VERSION=${VERSION:-2.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -83,7 +83,7 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 rm -rf wine-$VERSION
-tar xvf $CWD/wine-$VERSION.tar.bz2
+tar xvf $CWD/wine-$VERSION.tar.xz
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
 
 # Apply Staging patches:
@@ -211,6 +211,19 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
+# Add font configuration:
+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 the wine and winecfg programs:
+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
+cp -a programs/winecfg/winecfg.svg $PKG/usr/share/icons/hicolor/scalable/apps/
+cp -a $CWD/winecfg.desktop $PKG/usr/share/applications/
+
 DOCS="ANNOUNCE AUTHORS COPYING.LIB LICENSE* MAINTAINERS README VERSION"
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/system/wine-staging/wine-staging.info b/system/wine-staging/wine-staging.info
index 1848b9547169..4b90d43ee40b 100644
--- a/system/wine-staging/wine-staging.info
+++ b/system/wine-staging/wine-staging.info
@@ -1,10 +1,10 @@
 PRGNAM="wine-staging"
-VERSION="2.0"
+VERSION="2.1"
 HOMEPAGE="http://www.wine-staging.com/"
-DOWNLOAD="https://dl.winehq.org/wine/source/2.0/wine-2.0.tar.bz2 \
-          https://github.com/wine-compholio/wine-staging/archive/v2.0/wine-staging-2.0.tar.gz"
-MD5SUM="fde8a855080279f74fb2e9ccec926db7 \
-        3b919e4f8ea7ed7bcc22f311213b2868"
+DOWNLOAD="https://dl.winehq.org/wine/source/2.x/wine-2.1.tar.xz \
+          https://github.com/wine-compholio/wine-staging/archive/v2.1/wine-staging-2.1.tar.gz"
+MD5SUM="ff793738a8274af3ae71dc143dda89e8 \
+        642627da85a22f08f968c3b1ee5c7ec5"
 DOWNLOAD_x86_64="UNSUPPORTED"
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/wine-staging/wine.svg b/system/wine-staging/wine.svg
new file mode 100644
index 000000000000..15fa028df228
--- /dev/null
+++ b/system/wine-staging/wine.svg
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="48"
+   height="48"
+   id="svg2211">
+  <defs
+     id="defs2214">
+    <linearGradient
+       id="linearGradient16837">
+      <stop
+         style="stop-color:#830000;stop-opacity:1"
+         offset="0"
+         id="stop16839" />
+      <stop
+         style="stop-color:#830000;stop-opacity:0"
+         offset="1"
+         id="stop16841" />
+    </linearGradient>
+    <linearGradient
+       x1="-28.128548"
+       y1="34.637081"
+       x2="15.779508"
+       y2="34.637081"
+       id="linearGradient16843"
+       xlink:href="#linearGradient16837"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(20.517241,0.9655172)" />
+    <linearGradient
+       x1="-28.128548"
+       y1="34.637081"
+       x2="15.779508"
+       y2="34.637081"
+       id="linearGradient17343"
+       xlink:href="#linearGradient16837"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(20.657279,0.6042969)" />
+    <linearGradient
+       x1="-28.128548"
+       y1="34.637081"
+       x2="15.779508"
+       y2="34.637081"
+       id="linearGradient18759"
+       xlink:href="#linearGradient16837"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(47.310344,-4.1379303e-8)" />
+    <filter
+       id="filter22949">
+      <feGaussianBlur
+         id="feGaussianBlur22951"
+         stdDeviation="1.7303666"
+         inkscape:collect="always" />
+    </filter>
+    <linearGradient
+       x1="-28.128548"
+       y1="34.637081"
+       x2="15.779508"
+       y2="34.637081"
+       id="linearGradient22955"
+       xlink:href="#linearGradient16837"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(47.209002,-0.119841)" />
+    <filter
+       id="filter23926">
+      <feGaussianBlur
+         id="feGaussianBlur23928"
+         stdDeviation="0.84094198"
+         inkscape:collect="always" />
+    </filter>
+    <linearGradient
+       x1="-28.128548"
+       y1="34.637081"
+       x2="15.779508"
+       y2="34.637081"
+       id="linearGradient23958"
+       xlink:href="#linearGradient16837"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(20.657279,0.6042969)" />
+    <linearGradient
+       x1="-28.128548"
+       y1="34.637081"
+       x2="15.779508"
+       y2="34.637081"
+       id="linearGradient23960"
+       xlink:href="#linearGradient16837"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(47.310344,-4.1379303e-8)" />
+    <linearGradient
+       x1="-28.128548"
+       y1="34.637081"
+       x2="15.779508"
+       y2="34.637081"
+       id="linearGradient23962"
+       xlink:href="#linearGradient16837"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(47.209002,-0.119841)" />
+  </defs>
+  <g
+     transform="matrix(0.5709735,0,0,0.5588143,8.1495857,-0.1431587)"
+     id="g23930">
+    <path
+       d="M 29.375,0.28125 C 28.102103,0.3649462 27.19036,0.66296531 26.8125,1.21875 C 21.42803,15.481257 14.693639,34.678782 19.03125,45.8125 C 23.30836,56.790927 22.212627,60.814566 19.53125,67.28125 C 15.12592,77.9056 10.006399,70.959231 2.40625,73.3125 C -5.3428301,75.711882 38.921067,91.52207 33.28125,84.25 C 27.455426,76.738091 19.97962,78.175374 22.65625,67.8125 C 25.516537,56.738587 26.630107,58.503996 36.90625,50.4375 C 47.42111,42.183617 49.312423,23.876037 54.03125,10.21875 C 53.631317,5.5825943 36.248645,-0.1707095 29.375,0.28125 z M 29.9375,2.15625 C 35.935385,1.8655695 53.047474,7.9445948 52.09375,11.1875 C 47.566036,24.291666 44.719193,42.892821 34.3125,50.34375 C 29.495544,53.792568 22.601138,50.398337 20.40625,45.8125 C 16.244311,35.129697 22.7711,16.716126 27.9375,3.03125 C 28.100316,2.4826998 28.826781,2.2100797 29.9375,2.15625 z "
+       style="opacity:1;fill:#0a0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter17327)"
+       id="path17048" />
+    <path
+       d="M 20.926735,45.656177 C 23.121623,50.242013 29.794442,53.351015 34.806492,50.192415 C 42.799392,45.15528 46.633208,32.337272 50.195406,19.715865 C 48.346783,17.311385 44.321959,15.129119 36.032026,19.943794 C 27.37856,24.969602 26.07073,19.707848 23.135927,17.842519 C 18.935044,30.561877 18.213073,39.318202 20.926735,45.656177 z "
+       style="fill:url(#linearGradient23958);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter17361)"
+       id="path17341" />
+    <path
+       d="M 20.786698,46.017397 C 22.981586,50.603233 29.654405,53.712235 34.666455,50.553635 C 42.659355,45.5165 46.493171,32.698492 50.055369,20.077085 C 48.206746,17.672605 44.181922,15.490339 35.891989,20.305014 C 27.238523,25.330822 25.930693,20.069068 22.99589,18.203739 C 18.795007,30.923097 18.073036,39.679422 20.786698,46.017397 z "
+       style="fill:url(#linearGradient23960);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="path14897" />
+    <path
+       d="M 20.685356,45.897556 C 22.880244,50.483392 29.553063,53.592394 34.565113,50.433794 C 42.558013,45.396659 46.391829,32.578651 49.954027,19.957244 C 48.105404,17.552764 44.08058,15.370498 35.790647,20.185173 C 27.137181,25.210981 25.829351,19.949227 22.894548,18.083898 C 18.693665,30.803256 17.971694,39.559581 20.685356,45.897556 z "
+       style="fill:url(#linearGradient23962);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter23926)"
+       id="path22953" />
+    <path
+       d="M 29.37158,0.28649562 C 28.098683,0.37019162 27.18694,0.66821162 26.80908,1.2239956 C 21.42461,15.486503 14.690219,34.684028 19.02783,45.817746 C 23.30494,56.796173 22.209207,60.819812 19.52783,67.286496 C 15.1225,77.910846 10.002979,70.964477 2.40283,73.317746 C -5.3462499,75.717128 38.917647,91.527319 33.27783,84.255246 C 27.452006,76.743337 19.9762,78.18062 22.65283,67.817746 C 25.513117,56.743833 26.626687,58.509242 36.90283,50.442746 C 47.41769,42.188863 49.309003,23.881283 54.02783,10.223996 C 53.627897,5.5878406 36.245225,-0.16546338 29.37158,0.28649562 z M 29.93408,2.1614956 C 35.931965,1.8708156 53.044054,7.9498406 52.09033,11.192746 C 47.562616,24.296912 44.715773,42.898067 34.30908,50.348996 C 29.492124,53.797814 22.597718,50.403583 20.40283,45.817746 C 16.240891,35.134943 22.76768,16.721372 27.93408,3.0364956 C 28.096896,2.4879456 28.823361,2.2153256 29.93408,2.1614956 z "
+       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter22949)"
+       id="path20995" />
+  </g>
+</svg>
diff --git a/system/wine-staging/winecfg.desktop b/system/wine-staging/winecfg.desktop
new file mode 100644
index 000000000000..782679cd80fe
--- /dev/null
+++ b/system/wine-staging/winecfg.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Exec=winecfg
+Icon=winecfg
+Terminal=false
+Name=Wine Configuration
+Comment=Configure Wine
+Type=Application
+Categories=Application;Settings
diff --git a/system/wine-staging/winecfg.png b/system/wine-staging/winecfg.png
new file mode 100644
index 000000000000..48812f040a58
--- /dev/null
+++ b/system/wine-staging/winecfg.png