diff options
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | PKGBUILD | 7 | ||||
| -rw-r--r-- | harmony-fix.diff | 63 |
3 files changed, 6 insertions, 76 deletions
@@ -1,6 +1,6 @@ pkgbase = wine-staging-git pkgdesc = A compatibility layer for running Windows programs (staging branch, git version) - pkgver = 3.8.r0.geb684dd9+wine.3.8.r0.g7280f7fb74 + pkgver = 3.17.r13.g4beed4a3+wine.3.17.r144.g9f05343013 pkgrel = 1 url = https://www.wine-staging.com/ install = wine-staging-git.install @@ -138,10 +138,10 @@ pkgbase = wine-staging-git optdepends = cups optdepends = samba optdepends = dosbox - provides = wine=3.8.r0.g7280f7fb74 - provides = wine-wow64=3.8.r0.g7280f7fb74 - provides = wine-git=3.8.r0.g7280f7fb74 - provides = wine-staging=3.8.r0.geb684dd9 + provides = wine=3.17.r144.g9f05343013 + provides = wine-wow64=3.17.r144.g9f05343013 + provides = wine-git=3.17.r144.g9f05343013 + provides = wine-staging=3.17.r13.g4beed4a3 conflicts = wine conflicts = wine-wow64 conflicts = wine-git @@ -149,12 +149,10 @@ pkgbase = wine-staging-git options = staticlibs source = wine-git::git://source.winehq.org/git/wine.git source = wine-staging-git::git+https://github.com/wine-staging/wine-staging.git - source = harmony-fix.diff source = 30-win32-aliases.conf source = wine-binfmt.conf sha256sums = SKIP sha256sums = SKIP - sha256sums = 50ccb5bd2067e5d2739c5f7abcef11ef096aa246f5ceea11d2c3b508fc7f77a1 sha256sums = 9901a5ee619f24662b241672a7358364617227937d5f6d3126f70528ee5111e7 sha256sums = 6dfdefec305024ca11f35ad7536565f5551f09119dda2028f194aee8f77077a4 @@ -1,7 +1,7 @@ # Maintainer: Daniel Bermond < yahoo-com: danielbermond > pkgname=wine-staging-git -pkgver=3.8.r0.geb684dd9+wine.3.8.r0.g7280f7fb74 +pkgver=3.17.r13.g4beed4a3+wine.3.17.r144.g9f05343013 pkgrel=1 pkgdesc='A compatibility layer for running Windows programs (staging branch, git version)' arch=('i686' 'x86_64') @@ -83,12 +83,10 @@ options=('staticlibs') install="$pkgname".install source=('wine-git'::'git://source.winehq.org/git/wine.git' "$pkgname"::'git+https://github.com/wine-staging/wine-staging.git' - 'harmony-fix.diff' '30-win32-aliases.conf' 'wine-binfmt.conf') sha256sums=('SKIP' 'SKIP' - '50ccb5bd2067e5d2739c5f7abcef11ef096aa246f5ceea11d2c3b508fc7f77a1' '9901a5ee619f24662b241672a7358364617227937d5f6d3126f70528ee5111e7' '6dfdefec305024ca11f35ad7536565f5551f09119dda2028f194aee8f77077a4') @@ -131,9 +129,6 @@ prepare() { # fix path of opencl headers sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i configure* - - # freetype harmony fix - patch -Np1 -i "${srcdir}/harmony-fix.diff" } pkgver() { diff --git a/harmony-fix.diff b/harmony-fix.diff deleted file mode 100644 index fe0c8c929d4a..000000000000 --- a/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: - { |