From 5237e46b957020718a4a04929f629d6377bacbe1 Mon Sep 17 00:00:00 2001
From: "Edinaldo P. Silva" <edps.mundognu@gmail.com>
Date: Sat, 20 Oct 2018 19:45:54 +0100
Subject: system/wine-staging: Updated for version 3.18.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
---
 system/wine-staging/harmony-fix.diff        | 63 -----------------------------
 system/wine-staging/wine-staging.SlackBuild | 13 ++----
 system/wine-staging/wine-staging.info       | 10 ++---
 3 files changed, 9 insertions(+), 77 deletions(-)
 delete mode 100644 system/wine-staging/harmony-fix.diff

diff --git a/system/wine-staging/harmony-fix.diff b/system/wine-staging/harmony-fix.diff
deleted file mode 100644
index fe0c8c929d4ac..0000000000000
--- a/system/wine-staging/harmony-fix.diff
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -u -r wine/dlls/gdi32/freetype.c wine-ft281/dlls/gdi32/freetype.c
---- wine/dlls/gdi32/freetype.c	2017-10-04 18:01:36.000000000 +0200
-+++ wine-ft281/dlls/gdi32/freetype.c	2017-10-10 10:29:17.506632615 +0200
-@@ -996,18 +996,23 @@
- 
- static BOOL is_subpixel_rendering_enabled( void )
- {
--#ifdef FT_LCD_FILTER_H
-     static int enabled = -1;
-     if (enabled == -1)
-     {
--        enabled = (pFT_Library_SetLcdFilter &&
--                   pFT_Library_SetLcdFilter( NULL, 0 ) != FT_Err_Unimplemented_Feature);
-+        /* >= 2.8.1 provides LCD rendering without filters */
-+        if (FT_Version.major > 2 ||
-+            FT_Version.major == 2 && FT_Version.minor > 8 ||
-+            FT_Version.major == 2 && FT_Version.minor == 8 && FT_Version.patch >= 1)
-+            enabled = TRUE;
-+#ifdef FT_LCD_FILTER_H
-+        else if (pFT_Library_SetLcdFilter &&
-+                 pFT_Library_SetLcdFilter( NULL, 0 ) != FT_Err_Unimplemented_Feature)
-+            enabled = TRUE;
-+#endif
-+        else enabled = FALSE;
-         TRACE("subpixel rendering is %senabled\n", enabled ? "" : "NOT ");
-     }
-     return enabled;
--#else
--    return FALSE;
--#endif
- }
- 
- 
-@@ -7271,7 +7276,6 @@
-     case WINE_GGO_HBGR_BITMAP:
-     case WINE_GGO_VRGB_BITMAP:
-     case WINE_GGO_VBGR_BITMAP:
--#ifdef FT_LCD_FILTER_H
-       {
-         switch (ft_face->glyph->format)
-         {
-@@ -7357,8 +7361,11 @@
-             if ( needsTransform )
-                 pFT_Outline_Transform (&ft_face->glyph->outline, &transMatTategaki);
- 
-+#ifdef FT_LCD_FILTER_H
-             if ( pFT_Library_SetLcdFilter )
-                 pFT_Library_SetLcdFilter( library, FT_LCD_FILTER_DEFAULT );
-+#endif
-+
-             pFT_Render_Glyph (ft_face->glyph, render_mode);
- 
-             src = ft_face->glyph->bitmap.buffer;
-@@ -7439,9 +7446,6 @@
- 
-         break;
-       }
--#else
--      return GDI_ERROR;
--#endif
- 
-     case GGO_NATIVE:
-       {
diff --git a/system/wine-staging/wine-staging.SlackBuild b/system/wine-staging/wine-staging.SlackBuild
index 10a0e65e2db53..e938d5adb7944 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:-3.17}
+VERSION=${VERSION:-3.18}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -120,9 +120,6 @@ find -L . \
 # Fix for flex.
 patch -p1 --verbose < $CWD/0001-winhlp32-Workaround-a-bug-in-Flex.patch
 
-# freetype harmony fix.
-patch -Np1 < $CWD/harmony-fix.diff
-
 # fix path of opencl headers.
 sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i configure*
 
@@ -158,17 +155,15 @@ if [ -n "$WIN64" ]; then
     --disable-tests \
     --build=$BUILD_ARCH
 
-#NUMJOBS=${NUMJOBS:-"-s -j6 -l7"}
-#make $NUMJOBS depend || exit 1
-#make $NUMJOBS || exit 1
-
   make depend
   make
+  #NUMJOBS=${NUMJOBS:-"-s -j6 -l7"}
+  #make depend $NUMJOBS || exit 1
+  #make $NUMJOBS || exit 1
   make install DESTDIR=$PKG
   cd ..
 fi
 
-
 if [ -z "$NOWIN32" ]; then
   mkdir wine32
   cd wine32
diff --git a/system/wine-staging/wine-staging.info b/system/wine-staging/wine-staging.info
index a1bdb32591e99..b05273ace9e2f 100644
--- a/system/wine-staging/wine-staging.info
+++ b/system/wine-staging/wine-staging.info
@@ -1,10 +1,10 @@
 PRGNAM="wine-staging"
-VERSION="3.17"
+VERSION="3.18"
 HOMEPAGE="https://wiki.winehq.org/Wine-Staging"
-DOWNLOAD="https://dl.winehq.org/wine/source/3.x/wine-3.17.tar.xz \
-          https://github.com/wine-staging/wine-staging/archive/v3.17/wine-staging-3.17.tar.gz"
-MD5SUM="1b852a6e0e047525be75660914b3136b \
-        01f1aac33baee919616b7d456915f42c"
+DOWNLOAD="https://dl.winehq.org/wine/source/3.x/wine-3.18.tar.xz \
+          https://github.com/wine-staging/wine-staging/archive/v3.18/wine-staging-3.18.tar.gz"
+MD5SUM="8a86c199685c1463750c1fae8b499526 \
+        9c910af9d502414465a439391d1a1bf6"
 DOWNLOAD_x86_64="UNSUPPORTED"
 MD5SUM_x86_64=""
 REQUIRES=""
-- 
cgit v1.2.3