Date: Saturday, October 13, 2018 @ 20:44:18 Author: felixonmars Revision: 393342
upgpkg: wine-staging 3.18-1 Modified: wine-staging/trunk/PKGBUILD Deleted: wine-staging/trunk/harmony-fix.diff ------------------+ PKGBUILD | 10 ++------ harmony-fix.diff | 63 ----------------------------------------------------- 2 files changed, 3 insertions(+), 70 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-10-13 20:43:04 UTC (rev 393341) +++ PKGBUILD 2018-10-13 20:44:18 UTC (rev 393342) @@ -5,7 +5,7 @@ # Contributor: Giovanni Scafora <giova...@archlinux.org> pkgname=wine-staging -pkgver=3.17 +pkgver=3.18 _winever=$pkgver pkgrel=1 @@ -13,13 +13,11 @@ source=(https://dl.winehq.org/wine/source/3.x/wine-$_winever.tar.xz{,.sign} "wine-staging-v$_pkgbasever.tar.gz::https://github.com/wine-staging/wine-staging/archive/v$_pkgbasever.tar.gz"; - harmony-fix.diff 30-win32-aliases.conf wine-binfmt.conf) -sha512sums=('ea50c9e09d3fd7f41ff96a1219d43896946ac79c8cdef31ae56e10664fc3b0b6dd1f9d8cd72db874d08c431eba9c8033ea72182499666a5aa62c1056876b0a66' +sha512sums=('2137662ea69964a69d77ff5c05f271783bda49af65d605909074d465ed8087d84065156e5c509eae31b4c3a20e83a838fc71bd077b2267640b163acfa5f7366e' 'SKIP' - '2fe9e8f801b53fa9b71fd908f5403956251522851383bfdde6828c6a8545d6f50ac8c41df54d89c2f92d74dc3bb563cd6a7d8ad394002c981197b71adc1a5e13' - 'b86edf07bfc560f403fdfd5a71f97930ee2a4c3f76c92cc1a0dbb2e107be9db3bed3a727a0430d8a049583c63dd11f5d4567fb7aa69b193997c6da241acc4f2e' + 'd7c353b2302616b8ffe9f41090bc36c8869238410eda16072aed0b70e54c8a09b4a48d439fc9e4f211804945d55dc4a00a5d70efd2ca4a50f72db7607e6ef10e' '6e54ece7ec7022b3c9d94ad64bdf1017338da16c618966e8baf398e6f18f80f7b0576edf1d1da47ed77b96d577e4cbb2bb0156b0b11c183a0accf22654b0a2bb' 'bdde7ae015d8a98ba55e84b86dc05aca1d4f8de85be7e4bd6187054bfe4ac83b5a20538945b63fb073caab78022141e9545685e4e3698c97ff173cf30859e285') validpgpkeys=(5AC1A08B03BD7A313E0A955AF5E6E9EEB9461DD7 @@ -121,8 +119,6 @@ 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* # Get rid of old build dirs Deleted: harmony-fix.diff =================================================================== --- harmony-fix.diff 2018-10-13 20:43:04 UTC (rev 393341) +++ harmony-fix.diff 2018-10-13 20:44:18 UTC (rev 393342) @@ -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: - {
