Date: Sunday, March 4, 2018 @ 13:23:38
Author: lcarlier
Revision: 302390
archrelease: copy trunk to multilib-x86_64
Added:
wine-staging-nine/repos/multilib-x86_64/30-win32-aliases.conf
(from rev 302389, wine-staging-nine/trunk/30-win32-aliases.conf)
wine-staging-nine/repos/multilib-x86_64/PKGBUILD
(from rev 302389, wine-staging-nine/trunk/PKGBUILD)
wine-staging-nine/repos/multilib-x86_64/harmony-fix.diff
(from rev 302389, wine-staging-nine/trunk/harmony-fix.diff)
wine-staging-nine/repos/multilib-x86_64/steam.patch
(from rev 302389, wine-staging-nine/trunk/steam.patch)
wine-staging-nine/repos/multilib-x86_64/wine-binfmt.conf
(from rev 302389, wine-staging-nine/trunk/wine-binfmt.conf)
wine-staging-nine/repos/multilib-x86_64/wine.install
(from rev 302389, 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
-----------------------+
30-win32-aliases.conf | 40 ++--
PKGBUILD | 420 +++++++++++++++++++++++-------------------------
harmony-fix.diff | 126 +++++++-------
steam.patch | 78 ++++----
wine-binfmt.conf | 2
wine.install | 7
6 files changed, 337 insertions(+), 336 deletions(-)
Deleted: 30-win32-aliases.conf
===================================================================
--- 30-win32-aliases.conf 2018-03-04 13:23:22 UTC (rev 302389)
+++ 30-win32-aliases.conf 2018-03-04 13:23:38 UTC (rev 302390)
@@ -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
302389, wine-staging-nine/trunk/30-win32-aliases.conf)
===================================================================
--- 30-win32-aliases.conf (rev 0)
+++ 30-win32-aliases.conf 2018-03-04 13:23:38 UTC (rev 302390)
@@ -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-03-04 13:23:22 UTC (rev 302389)
+++ PKGBUILD 2018-03-04 13:23:38 UTC (rev 302390)
@@ -1,214 +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=2.21
-pkgrel=1
-
-_pkgbasever=${pkgver/rc/-rc}
-#_ninepatchver=${pkgver}
-_ninepatchver=2.20
-
-source=("https://github.com/wine-compholio/wine-patched/archive/staging-$_pkgbasever.tar.gz";
-
"https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-$_ninepatchver.tar.gz";
- harmony-fix.diff
- 30-win32-aliases.conf
- steam.patch)
-sha512sums=('4e3fe2eb81360bfa095194ab5b9647636cbeac0dc3955e6a3ee26062f650c66a4bd2353a1cd8063f9b7c65a6bcc1f892cc7c1d0f00c3c8525a124ec2109d1e86'
-
'f1fa4882514d0bbb77a7244448a9153cddd5029fca49c5221783fafc13f30888b606c6be4417ecdf85bd80a659ecf54c57ea5aedd49acb87cdc9b42d98f68dc0'
-
'b86edf07bfc560f403fdfd5a71f97930ee2a4c3f76c92cc1a0dbb2e107be9db3bed3a727a0430d8a049583c63dd11f5d4567fb7aa69b193997c6da241acc4f2e'
-
'6e54ece7ec7022b3c9d94ad64bdf1017338da16c618966e8baf398e6f18f80f7b0576edf1d1da47ed77b96d577e4cbb2bb0156b0b11c183a0accf22654b0a2bb'
-
'f3e42a0720777256ca583f96044f6482aae8f4c707189104216f86f6c7a1b68a186c5124c72866229d46eb66c20c555ba9f32a230ec50f968faa8a12b8372b0a')
-
-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' 'gcc-multilib>=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
- 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
- cups
- samba dosbox
-)
-
-if [[ $CARCH == i686 ]]; then
- # Strip lib32 etc. on i686
- _depends=(${_depends[@]/*32-*/})
- makedepends=(${makedepends[@]/*32-*/} ${_depends[@]})
- makedepends=(${makedepends[@]/*-multilib*/})
- optdepends=(${optdepends[@]/*32-*/})
- provides=("wine=$pkgver" "wine-staging=$pkgver")
- conflicts=('wine' 'wine-staging')
-else
- makedepends=(${makedepends[@]} ${_depends[@]})
- provides=("wine=$pkgver" "wine-wow64=$pkgver" "wine-staging=$pkgver")
- conflicts=('wine' 'wine-wow64' 'wine-staging')
-fi
-
-prepare() {
- # Allow ccache to work
- mv wine-patched-staging-$_pkgbasever $pkgname
-
- # 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-build
-}
-
-build() {
- cd "$srcdir"
-
- if [[ $CARCH == x86_64 ]]; then
- msg2 "Building Wine-64..."
-
- mkdir $pkgname-64-build
- cd "$srcdir/$pkgname-64-build"
- ../$pkgname/configure \
- --prefix=/usr \
- --libdir=/usr/lib \
- --with-x \
- --with-gstreamer \
- --with-d3d9-nine \
- --enable-win64 \
- --with-xattr
-
- make
-
- _wine32opts=(
- --libdir=/usr/lib32
- --with-wine64="$srcdir/$pkgname-64-build"
- )
-
- export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
- fi
-
- msg2 "Building Wine-32..."
- cd "$srcdir/$pkgname-32-build"
- ../$pkgname/configure \
- --prefix=/usr \
- --with-x \
- --with-gstreamer \
- --with-d3d9-nine \
- --with-xattr \
- "${_wine32opts[@]}"
-
- make
-}
-
-package() {
- depends=(${_depends[@]})
-
- msg2 "Packaging Wine-32..."
- cd "$srcdir/$pkgname-32-build"
-
- if [[ $CARCH == i686 ]]; then
- make prefix="$pkgdir/usr" install
- else
- 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
- fi
-
- # 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"
-}
-
-# vim:set ts=8 sts=2 sw=2 et:
Copied: wine-staging-nine/repos/multilib-x86_64/PKGBUILD (from rev 302389,
wine-staging-nine/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-03-04 13:23:38 UTC (rev 302390)
@@ -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.3
+pkgrel=1
+
+_pkgbasever=${pkgver/rc/-rc}
+#_ninepatchver=${pkgver}
+_ninepatchver=2.21
+
+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=('c9e4c75e94d745837208bf877b19c4e4e46df1e78082d21e716f52c9f9d93eaabbec8bf34783cda68e4275f53e37929b81ac128e5b8a13c1e5035223b2621d6a'
+ 'SKIP'
+
'02d48a9c403b93d01ca37b74af5dc81f86e49c72d67f194c71ccebd4556fa72c473728a1b1f9d5325c6f85f4e41bb7072a1183a2d81cafa8888e00dc53d12166'
+
'64edab41be95adb1dc81c040b13901fbc7fd54467e1306639e3d459c41521d61ebf09e7028688166af8fd0f238063e125d8985a4fc66b185fade996ed596bb2a'
+
'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-03-04 13:23:22 UTC (rev 302389)
+++ harmony-fix.diff 2018-03-04 13:23:38 UTC (rev 302390)
@@ -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
302389, wine-staging-nine/trunk/harmony-fix.diff)
===================================================================
--- harmony-fix.diff (rev 0)
+++ harmony-fix.diff 2018-03-04 13:23:38 UTC (rev 302390)
@@ -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-03-04 13:23:22 UTC (rev 302389)
+++ steam.patch 2018-03-04 13:23:38 UTC (rev 302390)
@@ -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 302389,
wine-staging-nine/trunk/steam.patch)
===================================================================
--- steam.patch (rev 0)
+++ steam.patch 2018-03-04 13:23:38 UTC (rev 302390)
@@ -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 |
+
Copied: wine-staging-nine/repos/multilib-x86_64/wine-binfmt.conf (from rev
302389, wine-staging-nine/trunk/wine-binfmt.conf)
===================================================================
--- wine-binfmt.conf (rev 0)
+++ wine-binfmt.conf 2018-03-04 13:23:38 UTC (rev 302390)
@@ -0,0 +1,2 @@
+# Start WINE on Windows executables
+:DOSWin:M::MZ::/usr/bin/wine:
Copied: wine-staging-nine/repos/multilib-x86_64/wine.install (from rev 302389,
wine-staging-nine/trunk/wine.install)
===================================================================
--- wine.install (rev 0)
+++ wine.install 2018-03-04 13:23:38 UTC (rev 302390)
@@ -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"
+}
