summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2018-10-11 21:35:45 +0000
committerDaniel Bermond2018-10-11 21:35:45 +0000
commit4da9d2460aa3e4376bb01b10ba3208bdf6c5f8c0 (patch)
tree5a28f6353d0d234e0ec4bd548a7a92c888d7d148
parentade556260cb93f2e5c6b8d2e58acd917299b64c2 (diff)
downloadaur-4da9d2460aa3e4376bb01b10ba3208bdf6c5f8c0.tar.gz
Remove freetype harmony fix (implemented by upstream)
References ---------- https://source.winehq.org/git/wine.git/commit/66e446c5ec5c7f4f072358712151d75305dfbd49
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD7
-rw-r--r--harmony-fix.diff63
3 files changed, 5 insertions, 75 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7e9016dd6d1..56317227b35 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = wine-git
pkgdesc = A compatibility layer for running Windows programs (git version)
- pkgver = 3.8.r0.g7280f7fb74
+ pkgver = 3.17.r156.gecea7a94c9
pkgrel = 1
url = https://www.winehq.org/
install = wine-git.install
@@ -124,9 +124,9 @@ pkgbase = wine-git
optdepends = cups
optdepends = samba
optdepends = dosbox
- provides = wine=3.8.r0.g7280f7fb74
- provides = bin32-wine=3.8.r0.g7280f7fb74
- provides = wine-wow64=3.8.r0.g7280f7fb74
+ provides = wine=3.17.r156.gecea7a94c9
+ provides = bin32-wine=3.17.r156.gecea7a94c9
+ provides = wine-wow64=3.17.r156.gecea7a94c9
conflicts = wine
conflicts = wine-staging
conflicts = wine-staging-git
@@ -135,11 +135,9 @@ pkgbase = wine-git
replaces = bin32-wine
options = staticlibs
source = wine-git::git://source.winehq.org/git/wine.git
- source = harmony-fix.diff
source = 30-win32-aliases.conf
source = wine-binfmt.conf
sha256sums = SKIP
- sha256sums = 50ccb5bd2067e5d2739c5f7abcef11ef096aa246f5ceea11d2c3b508fc7f77a1
sha256sums = 9901a5ee619f24662b241672a7358364617227937d5f6d3126f70528ee5111e7
sha256sums = 6dfdefec305024ca11f35ad7536565f5551f09119dda2028f194aee8f77077a4
diff --git a/PKGBUILD b/PKGBUILD
index e9ebb0662d2..00e7c6f819e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: sxe <sxxe@gmx.de>
pkgname=wine-git
-pkgver=3.8.r0.g7280f7fb74
+pkgver=3.17.r156.gecea7a94c9
pkgrel=1
pkgdesc='A compatibility layer for running Windows programs (git version)'
arch=('i686' 'x86_64')
@@ -77,11 +77,9 @@ optdepends=(
options=('staticlibs')
install="$pkgname".install
source=("$pkgname"::'git://source.winehq.org/git/wine.git'
- 'harmony-fix.diff'
'30-win32-aliases.conf'
'wine-binfmt.conf')
sha256sums=('SKIP'
- '50ccb5bd2067e5d2739c5f7abcef11ef096aa246f5ceea11d2c3b508fc7f77a1'
'9901a5ee619f24662b241672a7358364617227937d5f6d3126f70528ee5111e7'
'6dfdefec305024ca11f35ad7536565f5551f09119dda2028f194aee8f77077a4')
@@ -105,9 +103,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 fe0c8c929d4..00000000000
--- 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:
- {