aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2013-12-09 08:53:13 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2013-12-09 08:59:56 +0000
commit1815df4c9eaa1fecc8925be90d9817ce2993999c (patch)
treed904773c1dcee5fed383b1bb980c3528ae5b3d00
parent9830b89e311cf2134be9b946caaa70e73f021d90 (diff)
downloadalpine_aports-1815df4c9eaa1fecc8925be90d9817ce2993999c.tar.bz2
alpine_aports-1815df4c9eaa1fecc8925be90d9817ce2993999c.tar.xz
alpine_aports-1815df4c9eaa1fecc8925be90d9817ce2993999c.zip
main/wine: upgrade to 1.7.8
Diffstat
-rw-r--r--main/wine/APKBUILD14
-rw-r--r--main/wine/freetype.patch162
2 files changed, 5 insertions, 171 deletions
diff --git a/main/wine/APKBUILD b/main/wine/APKBUILD
index 70c57c01e8..b8da01d85a 100644
--- a/main/wine/APKBUILD
+++ b/main/wine/APKBUILD
@@ -1,8 +1,8 @@
1# Maintainer: Natanael Copa <ncopa@alpinelinux.org> 1# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
2pkgname=wine 2pkgname=wine
3pkgver=1.7.7 3pkgver=1.7.8
4_ver=${pkgver/_/-} 4_ver=${pkgver/_/-}
5pkgrel=2 5pkgrel=0
6pkgdesc="A compatibility layer for running Windows programs" 6pkgdesc="A compatibility layer for running Windows programs"
7url="http://www.winehq.com" 7url="http://www.winehq.com"
8arch="x86" 8arch="x86"
@@ -17,7 +17,6 @@ makedepends="fontconfig-dev openldap-dev libxslt-dev libxxf86dga-dev
17 tiff-dev v4l-utils-dev udisks2-dev 17 tiff-dev v4l-utils-dev udisks2-dev
18 autoconf automake" 18 autoconf automake"
19source="http://downloads.sourceforge.net/project/wine/Source/wine-$_ver.tar.bz2 19source="http://downloads.sourceforge.net/project/wine/Source/wine-$_ver.tar.bz2
20 freetype.patch
21 " 20 "
22 21
23_builddir="$srcdir"/$pkgname-$_ver 22_builddir="$srcdir"/$pkgname-$_ver
@@ -54,9 +53,6 @@ package() {
54 "$pkgdir"/usr/bin/wine 53 "$pkgdir"/usr/bin/wine
55} 54}
56 55
57md5sums="e3b9383439d60202b10b5e93e5b00a3b wine-1.7.7.tar.bz2 56md5sums="e66a9d73e224c099b617a1f5d718d604 wine-1.7.8.tar.bz2"
5804de15acbaea8e336f267e14efd1cd9b freetype.patch" 57sha256sums="30e17f5f863a09416f3d229666566b318dbb40f683d4ca6630012c60bb511804 wine-1.7.8.tar.bz2"
59sha256sums="110603b6bff33441356ef6e72f94a70abf3b4822be1f0fb6c84b5240e9d5aca7 wine-1.7.7.tar.bz2 58sha512sums="1fdaddb7909f818050854bf351d20f445cf6a5906b1bcc789c96ee8d5058c90815a91bbbc6444f3e4527748764f03ab5297585c174b433093a3354a827402fea wine-1.7.8.tar.bz2"
6099715e726c0fdbe879fd42254670dfac60319fcd20c4593f5ed085b8dbf8584e freetype.patch"
61sha512sums="94a4bb48261b575f7f8c8e1d6b54192dbf35b9aa595fb5afd571458cc94af2b72591facb32e7777e1ceb650a3567a3708089ab363d20b0cc4fc4984e31accb52 wine-1.7.7.tar.bz2
62352e5b14e08fd9343556efb44d044b5c4eabda27f55ec1f4458628ea4177d75843739c5bf6920a69eb8d3ceea58f3f38984c97040e4e7e150e769ddd17c52050 freetype.patch"
diff --git a/main/wine/freetype.patch b/main/wine/freetype.patch
deleted file mode 100644
index 08fd3cb9e4..0000000000
--- a/main/wine/freetype.patch
+++ /dev/null
@@ -1,162 +0,0 @@
1diff --git a/configure.ac b/configure.ac
2index 98a73f2..56bc8ce 100644
3--- a/configure.ac
4+++ b/configure.ac
5@@ -1466,27 +1466,27 @@ then
6 [WINE_CHECK_SONAME(freetype,FT_Init_FreeType,[ft_lib=yes],[ft_lib=no],[$FREETYPE_LIBS])
7 if test "$ft_lib" = "yes"
8 then
9- AC_CHECK_HEADERS(ft2build.h \
10- freetype/freetype.h \
11- freetype/ftglyph.h \
12- freetype/fttypes.h \
13- freetype/tttables.h \
14- freetype/ftsnames.h \
15- freetype/ttnameid.h \
16- freetype/ftoutln.h \
17- freetype/ftwinfnt.h \
18- freetype/ftmodapi.h \
19- freetype/ftlcdfil.h,,,
20+ AC_CHECK_HEADERS(ft2build.h \
21+ freetype.h \
22+ ftglyph.h \
23+ fttypes.h \
24+ tttables.h \
25+ ftsnames.h \
26+ ttnameid.h \
27+ ftoutln.h \
28+ ftwinfnt.h \
29+ ftmodapi.h \
30+ ftlcdfil.h,,,
31 [#ifdef HAVE_FT2BUILD_H
32 # include <ft2build.h>
33 #endif])
34- AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <ft2build.h>
35-#include <freetype/fttrigon.h>]])],[AC_DEFINE(HAVE_FREETYPE_FTTRIGON_H, 1,
36- [Define if you have the <freetype/fttrigon.h> header file.])
37+ AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <ft2build.h>
38+#include <fttrigon.h>]])],[AC_DEFINE(HAVE_FTTRIGON_H, 1,
39+ [Define if you have the <fttrigon.h> header file.])
40 wine_cv_fttrigon=yes],[wine_cv_fttrigon=no])
41- AC_CHECK_TYPES(FT_TrueTypeEngineType,,,[#include <freetype/ftmodapi.h>])
42- dnl Check that we have at least freetype/freetype.h
43- if test "$ac_cv_header_freetype_freetype_h" = "yes" -a "$wine_cv_fttrigon" = "yes"
44+ AC_CHECK_TYPES([FT_TrueTypeEngineType],,,[#include <ftmodapi.h>])
45+ dnl Check that we have at least freetype.h
46+ if test "$ac_cv_header_freetype_h" = "yes" -a "$wine_cv_fttrigon" = "yes"
47 then
48 AC_DEFINE(HAVE_FREETYPE, 1, [Define if FreeType 2 is installed])
49 else
50@@ -1496,9 +1496,9 @@ then
51 FREETYPE_LIBS=""
52 fi])
53 fi
54-WINE_ERROR_WITH(freetype,[test "x$ac_cv_header_freetype_freetype_h" != xyes -o "x$wine_cv_fttrigon" != xyes],
55+WINE_ERROR_WITH(freetype,[test "x$ac_cv_header_freetype_h" != xyes -o "x$wine_cv_fttrigon" != xyes],
56 [FreeType ${notice_platform}development files not found. Fonts will not be built.])
57-test "x$ac_cv_header_freetype_freetype_h" = xyes -a "x$wine_cv_fttrigon" = xyes || enable_fonts=${enable_fonts:-no}
58+test "x$ac_cv_header_freetype_h" = xyes -a "x$wine_cv_fttrigon" = xyes || enable_fonts=${enable_fonts:-no}
59
60 dnl **** Check for parport (currently Linux only) ****
61 AC_CACHE_CHECK([for parport header/ppdev.h], ac_cv_c_ppdev,
62diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
63index fb4f2af..517f985 100644
64--- a/dlls/gdi32/freetype.c
65+++ b/dlls/gdi32/freetype.c
66@@ -98,38 +98,38 @@ WINE_DEFAULT_DEBUG_CHANNEL(font);
67 #ifdef HAVE_FT2BUILD_H
68 #include <ft2build.h>
69 #endif
70-#ifdef HAVE_FREETYPE_FREETYPE_H
71-#include <freetype/freetype.h>
72+#ifdef HAVE_FREETYPE_H
73+#include <freetype.h>
74 #endif
75-#ifdef HAVE_FREETYPE_FTGLYPH_H
76-#include <freetype/ftglyph.h>
77+#ifdef HAVE_FTGLYPH_H
78+#include <ftglyph.h>
79 #endif
80-#ifdef HAVE_FREETYPE_TTTABLES_H
81-#include <freetype/tttables.h>
82+#ifdef HAVE_TTTABLES_H
83+#include <tttables.h>
84 #endif
85-#ifdef HAVE_FREETYPE_FTTYPES_H
86-#include <freetype/fttypes.h>
87+#ifdef HAVE_FTTYPES_H
88+#include <fttypes.h>
89 #endif
90-#ifdef HAVE_FREETYPE_FTSNAMES_H
91-#include <freetype/ftsnames.h>
92+#ifdef HAVE_FTSNAMES_H
93+#include <ftsnames.h>
94 #endif
95-#ifdef HAVE_FREETYPE_TTNAMEID_H
96-#include <freetype/ttnameid.h>
97+#ifdef HAVE_TTNAMEID_H
98+#include <ttnameid.h>
99 #endif
100-#ifdef HAVE_FREETYPE_FTOUTLN_H
101-#include <freetype/ftoutln.h>
102+#ifdef HAVE_FTOUTLN_H
103+#include <ftoutln.h>
104 #endif
105-#ifdef HAVE_FREETYPE_FTTRIGON_H
106-#include <freetype/fttrigon.h>
107+#ifdef HAVE_FTTRIGON_H
108+#include <fttrigon.h>
109 #endif
110-#ifdef HAVE_FREETYPE_FTWINFNT_H
111-#include <freetype/ftwinfnt.h>
112+#ifdef HAVE_FTWINFNT_H
113+#include <ftwinfnt.h>
114 #endif
115-#ifdef HAVE_FREETYPE_FTMODAPI_H
116-#include <freetype/ftmodapi.h>
117+#ifdef HAVE_FTMODAPI_H
118+#include <ftmodapi.h>
119 #endif
120-#ifdef HAVE_FREETYPE_FTLCDFIL_H
121-#include <freetype/ftlcdfil.h>
122+#ifdef HAVE_FTLCDFIL_H
123+#include <ftlcdfil.h>
124 #endif
125
126 #ifndef HAVE_FT_TRUETYPEENGINETYPE
127@@ -186,7 +186,7 @@ MAKE_FUNCPTR(FT_Vector_Transform);
128 MAKE_FUNCPTR(FT_Vector_Unit);
129 static FT_Error (*pFT_Outline_Embolden)(FT_Outline *, FT_Pos);
130 static FT_TrueTypeEngineType (*pFT_Get_TrueType_Engine_Type)(FT_Library);
131-#ifdef HAVE_FREETYPE_FTLCDFIL_H
132+#ifdef HAVE_FTLCDFIL_H
133 static FT_Error (*pFT_Library_SetLcdFilter)(FT_Library, FT_LcdFilter);
134 #endif
135
136@@ -924,7 +924,7 @@ static BOOL is_hinting_enabled(void)
137
138 static BOOL is_subpixel_rendering_enabled( void )
139 {
140-#ifdef HAVE_FREETYPE_FTLCDFIL_H
141+#ifdef HAVE_FTLCDFIL_H
142 static int enabled = -1;
143 if (enabled == -1)
144 {
145@@ -3918,7 +3918,7 @@ static BOOL init_freetype(void)
146 /* Don't warn if these ones are missing */
147 pFT_Outline_Embolden = wine_dlsym(ft_handle, "FT_Outline_Embolden", NULL, 0);
148 pFT_Get_TrueType_Engine_Type = wine_dlsym(ft_handle, "FT_Get_TrueType_Engine_Type", NULL, 0);
149-#ifdef HAVE_FREETYPE_FTLCDFIL_H
150+#ifdef HAVE_FTLCDFIL_H
151 pFT_Library_SetLcdFilter = wine_dlsym(ft_handle, "FT_Library_SetLcdFilter", NULL, 0);
152 #endif
153
154@@ -6706,7 +6706,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format,
155 case WINE_GGO_HBGR_BITMAP:
156 case WINE_GGO_VRGB_BITMAP:
157 case WINE_GGO_VBGR_BITMAP:
158-#ifdef HAVE_FREETYPE_FTLCDFIL_H
159+#ifdef HAVE_FTLCDFIL_H
160 {
161 switch (ft_face->glyph->format)
162 {
© 2015 Mike Crute