Date: Tuesday, June 12, 2018 @ 09:26:12
  Author: lcarlier
Revision: 342445

archrelease: copy trunk to multilib-x86_64

Added:
  wine-staging-nine/repos/multilib-x86_64/30-win32-aliases.conf
    (from rev 342444, wine-staging-nine/trunk/30-win32-aliases.conf)
  wine-staging-nine/repos/multilib-x86_64/PKGBUILD
    (from rev 342444, wine-staging-nine/trunk/PKGBUILD)
  wine-staging-nine/repos/multilib-x86_64/harmony-fix.diff
    (from rev 342444, wine-staging-nine/trunk/harmony-fix.diff)
  wine-staging-nine/repos/multilib-x86_64/steam.patch
    (from rev 342444, wine-staging-nine/trunk/steam.patch)
  wine-staging-nine/repos/multilib-x86_64/wine-binfmt.conf
    (from rev 342444, wine-staging-nine/trunk/wine-binfmt.conf)
  wine-staging-nine/repos/multilib-x86_64/wine.install
    (from rev 342444, wine-staging-nine/trunk/wine.install)
Deleted:
  wine-staging-nine/repos/multilib-x86_64/30-win32-aliases.conf
  wine-staging-nine/repos/multilib-x86_64/PKGBUILD
  wine-staging-nine/repos/multilib-x86_64/harmony-fix.diff
  wine-staging-nine/repos/multilib-x86_64/steam.patch
  wine-staging-nine/repos/multilib-x86_64/wine-binfmt.conf
  wine-staging-nine/repos/multilib-x86_64/wine.install

-----------------------+
 30-win32-aliases.conf |   40 ++--
 PKGBUILD              |  412 ++++++++++++++++++++++++------------------------
 harmony-fix.diff      |  126 +++++++-------
 steam.patch           |   78 ++++-----
 wine-binfmt.conf      |    4 
 wine.install          |   14 -
 6 files changed, 337 insertions(+), 337 deletions(-)

Deleted: 30-win32-aliases.conf
===================================================================
--- 30-win32-aliases.conf       2018-06-12 09:25:49 UTC (rev 342444)
+++ 30-win32-aliases.conf       2018-06-12 09:26:12 UTC (rev 342445)
@@ -1,20 +0,0 @@
-<?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>

Copied: wine-staging-nine/repos/multilib-x86_64/30-win32-aliases.conf (from rev 
342444, wine-staging-nine/trunk/30-win32-aliases.conf)
===================================================================
--- 30-win32-aliases.conf                               (rev 0)
+++ 30-win32-aliases.conf       2018-06-12 09:26:12 UTC (rev 342445)
@@ -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>

Deleted: PKGBUILD
===================================================================
--- PKGBUILD    2018-06-12 09:25:49 UTC (rev 342444)
+++ PKGBUILD    2018-06-12 09:26:12 UTC (rev 342445)
@@ -1,206 +0,0 @@
-# $Id$
-# Maintainer: Laurent Carlier <lordhea...@gmail.com>
-# Contributor: Felix Yan <felixonm...@archlinux.org>
-# Contributor: Sven-Hendrik Haase <s...@lutzhaase.com>
-# Contributor: Jan "heftig" Steffens <jan.steff...@gmail.com>
-# Contributor: Eduardo Romero <edua...@archlinux.org>
-# Contributor: Giovanni Scafora <giova...@archlinux.org>
-
-pkgname=wine-staging-nine
-pkgver=3.9
-pkgrel=2
-
-_pkgbasever=${pkgver/rc/-rc}
-_ninepatchver=${pkgver}
-#_ninepatchver=3.3
-
-source=(https://dl.winehq.org/wine/source/3.x/wine-$_pkgbasever.tar.xz{,.sign}
-        
"wine-staging-v$_pkgbasever.tar.gz::https://github.com/wine-staging/wine-staging/archive/v$_pkgbasever.tar.gz";
-        
"https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-$_ninepatchver.tar.gz";
-        30-win32-aliases.conf
-        wine-binfmt.conf
-        harmony-fix.diff
-        steam.patch)
-sha512sums=('4c4e5a741a61b9427c175e015177df5806638736f7dfd92098ed95239d41a373cbab876c054d3c948e1db6a7de359db3babd63bc194edc8c2c3be28b58f75e64'
-            'SKIP'
-            
'4f52937621b7e5a3f4b3e52ecba8c7d318c621e76c8e4ce3be176d56b382bf06e3a0453d37c3b725df63f0a7349f53a7c075148c7e1ed89a028696538e31acad'
-            
'315b79c362f860a6570e2e1d2b9754069fb471ad5ca91a244897959f246efc36f244ecba5c876c5f1238df659af5dfaac1c3ed1b8b5f28b397d1b6396d2fa800'
-            
'6e54ece7ec7022b3c9d94ad64bdf1017338da16c618966e8baf398e6f18f80f7b0576edf1d1da47ed77b96d577e4cbb2bb0156b0b11c183a0accf22654b0a2bb'
-            
'bdde7ae015d8a98ba55e84b86dc05aca1d4f8de85be7e4bd6187054bfe4ac83b5a20538945b63fb073caab78022141e9545685e4e3698c97ff173cf30859e285'
-            
'b86edf07bfc560f403fdfd5a71f97930ee2a4c3f76c92cc1a0dbb2e107be9db3bed3a727a0430d8a049583c63dd11f5d4567fb7aa69b193997c6da241acc4f2e'
-            
'f3e42a0720777256ca583f96044f6482aae8f4c707189104216f86f6c7a1b68a186c5124c72866229d46eb66c20c555ba9f32a230ec50f968faa8a12b8372b0a')
-validpgpkeys=(5AC1A08B03BD7A313E0A955AF5E6E9EEB9461DD7
-              DA23579A74D4AD9AF9D3F945CEFAC8EAAF17519D)
-
-pkgdesc="A compatibility layer for running Windows programs - Staging branch 
with the gallium-nine patches"
-url="http://www.wine-staging.com";
-arch=(x86_64)
-options=(staticlibs)
-license=(LGPL)
-
-depends=(
-  attr             lib32-attr
-  fontconfig       lib32-fontconfig
-  lcms2            lib32-lcms2
-  libxml2          lib32-libxml2
-  libxcursor       lib32-libxcursor
-  libxrandr        lib32-libxrandr
-  libxdamage       lib32-libxdamage
-  libxi            lib32-libxi
-  gettext          lib32-gettext
-  freetype2        lib32-freetype2
-  glu              lib32-glu
-  libsm            lib32-libsm
-  gcc-libs         lib32-gcc-libs
-  libpcap          lib32-libpcap
-  desktop-file-utils
-)
-
-makedepends=(autoconf ncurses bison perl fontforge flex
-  'gcc>=4.5.0-2'
-  giflib                lib32-giflib
-  libpng                lib32-libpng
-  gnutls                lib32-gnutls
-  libxinerama           lib32-libxinerama
-  libxcomposite         lib32-libxcomposite
-  libxmu                lib32-libxmu
-  libxxf86vm            lib32-libxxf86vm
-  libldap               lib32-libldap
-  mpg123                lib32-mpg123
-  openal                lib32-openal
-  v4l-utils             lib32-v4l-utils
-  alsa-lib              lib32-alsa-lib
-  libxcomposite         lib32-libxcomposite
-  mesa                  lib32-mesa
-  mesa-libgl            lib32-mesa-libgl
-  opencl-icd-loader     lib32-opencl-icd-loader
-  libxslt               lib32-libxslt
-  libpulse              lib32-libpulse
-  libva                 lib32-libva
-  gtk3                  lib32-gtk3
-  gst-plugins-base-libs lib32-gst-plugins-base-libs
-  vulkan-icd-loader     lib32-vulkan-icd-loader
-  sdl2                  lib32-sdl2
-  samba
-  opencl-headers
-  xorg-server-devel
-)
-  
-optdepends=(
-  giflib                lib32-giflib
-  libpng                lib32-libpng
-  libldap               lib32-libldap
-  gnutls                lib32-gnutls
-  mpg123                lib32-mpg123
-  openal                lib32-openal
-  v4l-utils             lib32-v4l-utils
-  libpulse              lib32-libpulse
-  alsa-plugins          lib32-alsa-plugins
-  alsa-lib              lib32-alsa-lib
-  libjpeg-turbo         lib32-libjpeg-turbo
-  libxcomposite         lib32-libxcomposite
-  libxinerama           lib32-libxinerama
-  ncurses               lib32-ncurses
-  opencl-icd-loader     lib32-opencl-icd-loader
-  libxslt               lib32-libxslt
-  libva                 lib32-libva
-  gtk3                  lib32-gtk3
-  gst-plugins-base-libs lib32-gst-plugins-base-libs
-  vulkan-icd-loader     lib32-vulkan-icd-loader
-  sdl2                  lib32-sdl2
-  cups
-  samba           dosbox
-)
-
-provides=("wine=$pkgver" "wine-wow64=$pkgver" "wine-staging=$pkgver")
-conflicts=('wine' 'wine-wow64' 'wine-staging')
-install=wine.install
-
-prepare() {
-  # Allow ccache to work
-  mv wine-$_pkgbasever $pkgname
-
-  # apply wine-staging patchset
-  pushd wine-staging-$_pkgbasever/patches
-  ./patchinstall.sh DESTDIR="$srcdir/$pkgname" --all
-  popd
-  
-  # https://bugs.winehq.org/show_bug.cgi?id=43530
-  export CFLAGS="${CFLAGS/-fno-plt/}"
-  export LDFLAGS="${LDFLAGS/,-z,now/}"
-
-  patch -d $pkgname -Np1 < harmony-fix.diff
-
-  sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i $pkgname/configure*
-
-  # steam fix
-  pushd $pkgname
-  patch -Np1 -i ../steam.patch
-  popd
-
-  # Apply the nine patchset
-  pushd $pkgname
-  patch -Np1 -i 
../wine-d3d9-patches-wine-d3d9-${_ninepatchver}/staging-helper.patch
-  patch -Np1 -i ../wine-d3d9-patches-wine-d3d9-${_ninepatchver}/wine-d3d9.patch
-  autoreconf -f
-  popd
-
-  # Get rid of old build dirs
-  rm -rf $pkgname-{32,64}-build
-  mkdir $pkgname-{32,64}-build
-}
-
-build() {
-  cd "$srcdir"
-
-  msg2 "Building Wine-64..."
-
-  cd "$srcdir/$pkgname-64-build"
-  ../$pkgname/configure \
-    --prefix=/usr \
-    --libdir=/usr/lib \
-    --with-x \
-    --with-gstreamer \
-    --with-d3d9-nine \
-    --enable-win64 \
-    --with-xattr
-
-  make
-
-  msg2 "Building Wine-32..."
-
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-  cd "$srcdir/$pkgname-32-build"
-  ../$pkgname/configure \
-    --prefix=/usr \
-    --with-x \
-    --with-gstreamer \
-    --with-d3d9-nine \
-    --with-xattr \
-    --libdir=/usr/lib32 \
-    --with-wine64="$srcdir/$pkgname-64-build"
-
-  make
-}
-
-package() {
-  msg2 "Packaging Wine-32..."
-  cd "$srcdir/$pkgname-32-build"
-  make prefix="$pkgdir/usr" \
-    libdir="$pkgdir/usr/lib32" \
-    dlldir="$pkgdir/usr/lib32/wine" install
-
-  msg2 "Packaging Wine-64..."
-  cd "$srcdir/$pkgname-64-build"
-  make prefix="$pkgdir/usr" \
-    libdir="$pkgdir/usr/lib" \
-    dlldir="$pkgdir/usr/lib/wine" install
-
-  # Font aliasing settings for Win32 applications
-  install -d "$pkgdir"/etc/fonts/conf.{avail,d}
-  install -m644 "$srcdir/30-win32-aliases.conf" "$pkgdir/etc/fonts/conf.avail"
-  ln -s ../conf.avail/30-win32-aliases.conf 
"$pkgdir/etc/fonts/conf.d/30-win32-aliases.conf"
-  install -Dm 644 "$srcdir/wine-binfmt.conf" 
"$pkgdir/usr/lib/binfmt.d/wine.conf"
-}
-
-# vim:set ts=8 sts=2 sw=2 et:

Copied: wine-staging-nine/repos/multilib-x86_64/PKGBUILD (from rev 342444, 
wine-staging-nine/trunk/PKGBUILD)
===================================================================
--- PKGBUILD                            (rev 0)
+++ PKGBUILD    2018-06-12 09:26:12 UTC (rev 342445)
@@ -0,0 +1,206 @@
+# $Id$
+# Maintainer: Laurent Carlier <lordhea...@gmail.com>
+# Contributor: Felix Yan <felixonm...@archlinux.org>
+# Contributor: Sven-Hendrik Haase <s...@lutzhaase.com>
+# Contributor: Jan "heftig" Steffens <jan.steff...@gmail.com>
+# Contributor: Eduardo Romero <edua...@archlinux.org>
+# Contributor: Giovanni Scafora <giova...@archlinux.org>
+
+pkgname=wine-staging-nine
+pkgver=3.10
+pkgrel=1
+
+_pkgbasever=${pkgver/rc/-rc}
+_ninepatchver=${pkgver}
+#_ninepatchver=3.3
+
+source=(https://dl.winehq.org/wine/source/3.x/wine-$_pkgbasever.tar.xz{,.sign}
+        
"wine-staging-v$_pkgbasever.tar.gz::https://github.com/wine-staging/wine-staging/archive/v$_pkgbasever.tar.gz";
+        
"https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-$_ninepatchver.tar.gz";
+        30-win32-aliases.conf
+        wine-binfmt.conf
+        harmony-fix.diff
+        steam.patch)
+sha512sums=('bb1a1d8e8ad7f48d9fcf48ebbf0ebbb8e3b45ea211736bd7837144ea34b373f74955d3c0ccc4cdc44020eea23c8af8e67252e1c5cd6115e11419ad5f6ef24843'
+            'SKIP'
+            
'baae31ce569c06f8ac5ffc579d8f3bb95de55c50b83c1db13eaaeaee5c8c5b3b7fb6028d69dce6645ac697692372a65be8d60532123a94e0f5fcd0778d2082c5'
+            
'6397005616ab6424ba9e5c289e935c15b3b789717d887afb28bee1b30912052d6c47495d9b91952c38da7be03382dd0dc708fea42f7fe4c6221cf315c5faa810'
+            
'6e54ece7ec7022b3c9d94ad64bdf1017338da16c618966e8baf398e6f18f80f7b0576edf1d1da47ed77b96d577e4cbb2bb0156b0b11c183a0accf22654b0a2bb'
+            
'bdde7ae015d8a98ba55e84b86dc05aca1d4f8de85be7e4bd6187054bfe4ac83b5a20538945b63fb073caab78022141e9545685e4e3698c97ff173cf30859e285'
+            
'b86edf07bfc560f403fdfd5a71f97930ee2a4c3f76c92cc1a0dbb2e107be9db3bed3a727a0430d8a049583c63dd11f5d4567fb7aa69b193997c6da241acc4f2e'
+            
'f3e42a0720777256ca583f96044f6482aae8f4c707189104216f86f6c7a1b68a186c5124c72866229d46eb66c20c555ba9f32a230ec50f968faa8a12b8372b0a')
+validpgpkeys=(5AC1A08B03BD7A313E0A955AF5E6E9EEB9461DD7
+              DA23579A74D4AD9AF9D3F945CEFAC8EAAF17519D)
+
+pkgdesc="A compatibility layer for running Windows programs - Staging branch 
with the gallium-nine patches"
+url="http://www.wine-staging.com";
+arch=(x86_64)
+options=(staticlibs)
+license=(LGPL)
+
+depends=(
+  attr             lib32-attr
+  fontconfig       lib32-fontconfig
+  lcms2            lib32-lcms2
+  libxml2          lib32-libxml2
+  libxcursor       lib32-libxcursor
+  libxrandr        lib32-libxrandr
+  libxdamage       lib32-libxdamage
+  libxi            lib32-libxi
+  gettext          lib32-gettext
+  freetype2        lib32-freetype2
+  glu              lib32-glu
+  libsm            lib32-libsm
+  gcc-libs         lib32-gcc-libs
+  libpcap          lib32-libpcap
+  desktop-file-utils
+)
+
+makedepends=(autoconf ncurses bison perl fontforge flex
+  'gcc>=4.5.0-2'
+  giflib                lib32-giflib
+  libpng                lib32-libpng
+  gnutls                lib32-gnutls
+  libxinerama           lib32-libxinerama
+  libxcomposite         lib32-libxcomposite
+  libxmu                lib32-libxmu
+  libxxf86vm            lib32-libxxf86vm
+  libldap               lib32-libldap
+  mpg123                lib32-mpg123
+  openal                lib32-openal
+  v4l-utils             lib32-v4l-utils
+  alsa-lib              lib32-alsa-lib
+  libxcomposite         lib32-libxcomposite
+  mesa                  lib32-mesa
+  mesa-libgl            lib32-mesa-libgl
+  opencl-icd-loader     lib32-opencl-icd-loader
+  libxslt               lib32-libxslt
+  libpulse              lib32-libpulse
+  libva                 lib32-libva
+  gtk3                  lib32-gtk3
+  gst-plugins-base-libs lib32-gst-plugins-base-libs
+  vulkan-icd-loader     lib32-vulkan-icd-loader
+  sdl2                  lib32-sdl2
+  samba
+  opencl-headers
+  xorg-server-devel
+)
+  
+optdepends=(
+  giflib                lib32-giflib
+  libpng                lib32-libpng
+  libldap               lib32-libldap
+  gnutls                lib32-gnutls
+  mpg123                lib32-mpg123
+  openal                lib32-openal
+  v4l-utils             lib32-v4l-utils
+  libpulse              lib32-libpulse
+  alsa-plugins          lib32-alsa-plugins
+  alsa-lib              lib32-alsa-lib
+  libjpeg-turbo         lib32-libjpeg-turbo
+  libxcomposite         lib32-libxcomposite
+  libxinerama           lib32-libxinerama
+  ncurses               lib32-ncurses
+  opencl-icd-loader     lib32-opencl-icd-loader
+  libxslt               lib32-libxslt
+  libva                 lib32-libva
+  gtk3                  lib32-gtk3
+  gst-plugins-base-libs lib32-gst-plugins-base-libs
+  vulkan-icd-loader     lib32-vulkan-icd-loader
+  sdl2                  lib32-sdl2
+  cups
+  samba           dosbox
+)
+
+provides=("wine=$pkgver" "wine-wow64=$pkgver" "wine-staging=$pkgver")
+conflicts=('wine' 'wine-wow64' 'wine-staging')
+install=wine.install
+
+prepare() {
+  # Allow ccache to work
+  mv wine-$_pkgbasever $pkgname
+
+  # apply wine-staging patchset
+  pushd wine-staging-$_pkgbasever/patches
+  ./patchinstall.sh DESTDIR="$srcdir/$pkgname" --all
+  popd
+  
+  # https://bugs.winehq.org/show_bug.cgi?id=43530
+  export CFLAGS="${CFLAGS/-fno-plt/}"
+  export LDFLAGS="${LDFLAGS/,-z,now/}"
+
+  patch -d $pkgname -Np1 < harmony-fix.diff
+
+  sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i $pkgname/configure*
+
+  # steam fix
+  pushd $pkgname
+  patch -Np1 -i ../steam.patch
+  popd
+
+  # Apply the nine patchset
+  pushd $pkgname
+  patch -Np1 -i 
../wine-d3d9-patches-wine-d3d9-${_ninepatchver}/staging-helper.patch
+  patch -Np1 -i ../wine-d3d9-patches-wine-d3d9-${_ninepatchver}/wine-d3d9.patch
+  autoreconf -f
+  popd
+
+  # Get rid of old build dirs
+  rm -rf $pkgname-{32,64}-build
+  mkdir $pkgname-{32,64}-build
+}
+
+build() {
+  cd "$srcdir"
+
+  msg2 "Building Wine-64..."
+
+  cd "$srcdir/$pkgname-64-build"
+  ../$pkgname/configure \
+    --prefix=/usr \
+    --libdir=/usr/lib \
+    --with-x \
+    --with-gstreamer \
+    --with-d3d9-nine \
+    --enable-win64 \
+    --with-xattr
+
+  make
+
+  msg2 "Building Wine-32..."
+
+  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+  cd "$srcdir/$pkgname-32-build"
+  ../$pkgname/configure \
+    --prefix=/usr \
+    --with-x \
+    --with-gstreamer \
+    --with-d3d9-nine \
+    --with-xattr \
+    --libdir=/usr/lib32 \
+    --with-wine64="$srcdir/$pkgname-64-build"
+
+  make
+}
+
+package() {
+  msg2 "Packaging Wine-32..."
+  cd "$srcdir/$pkgname-32-build"
+  make prefix="$pkgdir/usr" \
+    libdir="$pkgdir/usr/lib32" \
+    dlldir="$pkgdir/usr/lib32/wine" install
+
+  msg2 "Packaging Wine-64..."
+  cd "$srcdir/$pkgname-64-build"
+  make prefix="$pkgdir/usr" \
+    libdir="$pkgdir/usr/lib" \
+    dlldir="$pkgdir/usr/lib/wine" install
+
+  # Font aliasing settings for Win32 applications
+  install -d "$pkgdir"/etc/fonts/conf.{avail,d}
+  install -m644 "$srcdir/30-win32-aliases.conf" "$pkgdir/etc/fonts/conf.avail"
+  ln -s ../conf.avail/30-win32-aliases.conf 
"$pkgdir/etc/fonts/conf.d/30-win32-aliases.conf"
+  install -Dm 644 "$srcdir/wine-binfmt.conf" 
"$pkgdir/usr/lib/binfmt.d/wine.conf"
+}
+
+# vim:set ts=8 sts=2 sw=2 et:

Deleted: harmony-fix.diff
===================================================================
--- harmony-fix.diff    2018-06-12 09:25:49 UTC (rev 342444)
+++ harmony-fix.diff    2018-06-12 09:26:12 UTC (rev 342445)
@@ -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:
-       {

Copied: wine-staging-nine/repos/multilib-x86_64/harmony-fix.diff (from rev 
342444, wine-staging-nine/trunk/harmony-fix.diff)
===================================================================
--- harmony-fix.diff                            (rev 0)
+++ harmony-fix.diff    2018-06-12 09:26:12 UTC (rev 342445)
@@ -0,0 +1,63 @@
+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:
+       {

Deleted: steam.patch
===================================================================
--- steam.patch 2018-06-12 09:25:49 UTC (rev 342444)
+++ steam.patch 2018-06-12 09:26:12 UTC (rev 342445)
@@ -1,39 +0,0 @@
-diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
-index 6e7b23e..63eda34 100644
---- a/dlls/kernel32/process.c
-+++ b/dlls/kernel32/process.c
-@@ -2429,6 +2429,33 @@ static BOOL create_process_impl( LPCWSTR app_name, 
LPWSTR cmd_line, LPSECURITY_A
-         return FALSE;
-     if (hFile == INVALID_HANDLE_VALUE) goto done;
-
-+    /* CROSSOVER HACK: bug 13322 (winehq bug 39403)
-+     * Insert --no-sandbox in command line of Steam's web helper process to
-+     * work around problems hooking our ntdll exports. */
-+    {
-+        static const WCHAR steamwebhelperexeW[] = 
{'s','t','e','a','m','w','e','b','h','e','l','p','e','r','.','e','x','e',0};
-+        static const WCHAR nosandboxW[] = {' 
','-','-','n','o','-','s','a','n','d','b','o','x',0};
-+
-+        if (strstrW(name, steamwebhelperexeW))
-+        {
-+            LPWSTR new_command_line;
-+
-+            new_command_line = HeapAlloc(GetProcessHeap(), 0,
-+                sizeof(WCHAR) * (strlenW(tidy_cmdline) + strlenW(nosandboxW) 
+ 1));
-+
-+            if (!new_command_line) return FALSE;
-+
-+            strcpyW(new_command_line, tidy_cmdline);
-+            strcatW(new_command_line, nosandboxW);
-+
-+            TRACE("CrossOver hack changing command line to %s\n", 
debugstr_w(new_command_line));
-+
-+            if (tidy_cmdline != cmd_line) HeapFree( GetProcessHeap(), 0, 
tidy_cmdline );
-+            tidy_cmdline = new_command_line;
-+        }
-+    }
-+    /* end CROSSOVER HACK */
-+
-     /* Warn if unsupported features are used */
-
-     if (flags & (IDLE_PRIORITY_CLASS | HIGH_PRIORITY_CLASS | 
REALTIME_PRIORITY_CLASS |
-

Copied: wine-staging-nine/repos/multilib-x86_64/steam.patch (from rev 342444, 
wine-staging-nine/trunk/steam.patch)
===================================================================
--- steam.patch                         (rev 0)
+++ steam.patch 2018-06-12 09:26:12 UTC (rev 342445)
@@ -0,0 +1,39 @@
+diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
+index 6e7b23e..63eda34 100644
+--- a/dlls/kernel32/process.c
++++ b/dlls/kernel32/process.c
+@@ -2429,6 +2429,33 @@ static BOOL create_process_impl( LPCWSTR app_name, 
LPWSTR cmd_line, LPSECURITY_A
+         return FALSE;
+     if (hFile == INVALID_HANDLE_VALUE) goto done;
+
++    /* CROSSOVER HACK: bug 13322 (winehq bug 39403)
++     * Insert --no-sandbox in command line of Steam's web helper process to
++     * work around problems hooking our ntdll exports. */
++    {
++        static const WCHAR steamwebhelperexeW[] = 
{'s','t','e','a','m','w','e','b','h','e','l','p','e','r','.','e','x','e',0};
++        static const WCHAR nosandboxW[] = {' 
','-','-','n','o','-','s','a','n','d','b','o','x',0};
++
++        if (strstrW(name, steamwebhelperexeW))
++        {
++            LPWSTR new_command_line;
++
++            new_command_line = HeapAlloc(GetProcessHeap(), 0,
++                sizeof(WCHAR) * (strlenW(tidy_cmdline) + strlenW(nosandboxW) 
+ 1));
++
++            if (!new_command_line) return FALSE;
++
++            strcpyW(new_command_line, tidy_cmdline);
++            strcatW(new_command_line, nosandboxW);
++
++            TRACE("CrossOver hack changing command line to %s\n", 
debugstr_w(new_command_line));
++
++            if (tidy_cmdline != cmd_line) HeapFree( GetProcessHeap(), 0, 
tidy_cmdline );
++            tidy_cmdline = new_command_line;
++        }
++    }
++    /* end CROSSOVER HACK */
++
+     /* Warn if unsupported features are used */
+
+     if (flags & (IDLE_PRIORITY_CLASS | HIGH_PRIORITY_CLASS | 
REALTIME_PRIORITY_CLASS |
+

Deleted: wine-binfmt.conf
===================================================================
--- wine-binfmt.conf    2018-06-12 09:25:49 UTC (rev 342444)
+++ wine-binfmt.conf    2018-06-12 09:26:12 UTC (rev 342445)
@@ -1,2 +0,0 @@
-# Start WINE on Windows executables
-:DOSWin:M::MZ::/usr/bin/wine:

Copied: wine-staging-nine/repos/multilib-x86_64/wine-binfmt.conf (from rev 
342444, wine-staging-nine/trunk/wine-binfmt.conf)
===================================================================
--- wine-binfmt.conf                            (rev 0)
+++ wine-binfmt.conf    2018-06-12 09:26:12 UTC (rev 342445)
@@ -0,0 +1,2 @@
+# Start WINE on Windows executables
+:DOSWin:M::MZ::/usr/bin/wine:

Deleted: wine.install
===================================================================
--- wine.install        2018-06-12 09:25:49 UTC (rev 342444)
+++ wine.install        2018-06-12 09:26:12 UTC (rev 342445)
@@ -1,7 +0,0 @@
-post_install() {
-  echo "Run 'systemctl restart systemd-binfmt' in order to make the wine 
binfmt available on your system."
-}
-
-post_remove() {
-  echo "binfmt binary formats will be updated at reboot"
-}

Copied: wine-staging-nine/repos/multilib-x86_64/wine.install (from rev 342444, 
wine-staging-nine/trunk/wine.install)
===================================================================
--- wine.install                                (rev 0)
+++ wine.install        2018-06-12 09:26:12 UTC (rev 342445)
@@ -0,0 +1,7 @@
+post_install() {
+  echo "Run 'systemctl restart systemd-binfmt' in order to make the wine 
binfmt available on your system."
+}
+
+post_remove() {
+  echo "binfmt binary formats will be updated at reboot"
+}

Reply via email to