<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[115754] trunk/dports/x11/wine</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/115754">115754</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2014-01-10 13:24:47 -0800 (Fri, 10 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>wine: update to 1.6.2</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsx11winePortfile">trunk/dports/x11/wine/Portfile</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsx11winefilespatchfreetype251diff">trunk/dports/x11/wine/files/patch-freetype-2.5.1.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsx11winePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/x11/wine/Portfile (115753 => 115754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/wine/Portfile 2014-01-10 21:07:28 UTC (rev 115753)
+++ trunk/dports/x11/wine/Portfile 2014-01-10 21:24:47 UTC (rev 115754)
</span><span class="lines">@@ -13,8 +13,7 @@
</span><span class="cx"> name wine
</span><span class="cx"> conflicts wine-devel wine-crossover
</span><span class="cx"> set my_name wine
</span><del>-version 1.6.1
-revision 1
</del><ins>+version 1.6.2
</ins><span class="cx"> license LGPL-2.1+
</span><span class="cx"> categories x11
</span><span class="cx"> maintainers ryandesign jwa openmaintainer
</span><span class="lines">@@ -40,8 +39,8 @@
</span><span class="cx"> sourceforge:project/wine/Wine%20Gecko/${wine_gecko_version}:winegecko
</span><span class="cx">
</span><span class="cx"> checksums ${wine_distfile} \
</span><del>- rmd160 b3544b271ea31336c9a3b283b4bc882f5fcb185d \
- sha256 d5bc2c088b555caa60a7ba1156e6ed74d791ba3c438129c75ab53805215a384c \
</del><ins>+ rmd160 7252851af5e9f748750685900c918e4fcb31c1f6 \
+ sha256 f0ab9eede5a0ccacbf6e50682649f9377b9199e49cf55641f1787cf72405acbe \
</ins><span class="cx"> ${wine_gecko_distfile} \
</span><span class="cx"> rmd160 e5aded4dfcde2462d9802478efe5aae1552e842d \
</span><span class="cx"> sha256 f01fafa6d7aab995c38add77315c4cbc2f32f52d5d6a9350056f42b62d631fd8
</span><span class="lines">@@ -101,12 +100,8 @@
</span><span class="cx">
</span><span class="cx"> patchfiles BOOL.patch \
</span><span class="cx"> mach_machine.patch \
</span><del>- patch-freetype-2.5.1.diff \
</del><span class="cx"> tiger-shell.patch
</span><span class="cx">
</span><del>-# rebuild configure after freetype 2.5.1 patch
-use_autoreconf yes
-
</del><span class="cx"> configure.ldflags-append -framework CoreServices \
</span><span class="cx"> -lz
</span><span class="cx">
</span><span class="lines">@@ -153,7 +148,7 @@
</span><span class="cx">
</span><span class="cx"> # llvm-gcc-4.2 doesn't respect force_align_arg_pointer; wine builds but fails to run
</span><span class="cx"> # http://bugs.winehq.org/show_bug.cgi?id=28030
</span><del>-compiler.blacklist-append llvm-gcc-4.2 macports-llvm-gcc-4.2
</del><ins>+compiler.blacklist-append *llvm-gcc-4.2
</ins><span class="cx">
</span><span class="cx"> # clang < 3.1 fails to build wine with "error: invalid operand for instruction lretw"
</span><span class="cx"> # http://bugs.winehq.org/show_bug.cgi?id=32872
</span></span></pre></div>
<a id="trunkdportsx11winefilespatchfreetype251diff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/x11/wine/files/patch-freetype-2.5.1.diff (115753 => 115754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/wine/files/patch-freetype-2.5.1.diff 2014-01-10 21:07:28 UTC (rev 115753)
+++ trunk/dports/x11/wine/files/patch-freetype-2.5.1.diff 2014-01-10 21:24:47 UTC (rev 115754)
</span><span class="lines">@@ -1,206 +0,0 @@
</span><del>-Fix build with freetype 2.5.1.
-http://bugs.winehq.org/show_bug.cgi?id=35010
---- configure.ac.orig 2013-11-15 13:30:24.000000000 -0600
-+++ configure.ac 2013-12-02 01:04:51.000000000 -0600
-@@ -1467,43 +1467,23 @@
- WINE_PACKAGE_FLAGS(FREETYPE,[freetype2],[-lfreetype],
- [`(freetype-config --cflags || freetype2-config --cflags) 2>/dev/null`],
- [`(freetype-config --libs || freetype2-config --libs) 2>/dev/null`])
-- WINE_CHECK_SONAME(freetype,FT_Init_FreeType,[ft_lib=yes],[ft_lib=no],[$FREETYPE_LIBS])
-- if test "$ft_lib" = "yes"
-+ AC_CHECK_HEADERS([ft2build.h])
-+ if test "$ac_cv_header_ft2build_h" = "yes"
- then
-- AC_CHECK_HEADERS(ft2build.h \
-- freetype/freetype.h \
-- freetype/ftglyph.h \
-- freetype/fttypes.h \
-- freetype/tttables.h \
-- freetype/ftsnames.h \
-- freetype/ttnameid.h \
-- freetype/ftoutln.h \
-- freetype/ftwinfnt.h \
-- freetype/ftmodapi.h \
-- freetype/ftlcdfil.h,,,
-- [#ifdef HAVE_FT2BUILD_H
-- # include <ft2build.h>
-- #endif])
-- AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <ft2build.h>
-- #include <freetype/fttrigon.h>]])],[AC_DEFINE(HAVE_FREETYPE_FTTRIGON_H, 1,
-- [Define if you have the <freetype/fttrigon.h> header file.])
-- wine_cv_fttrigon=yes],[wine_cv_fttrigon=no])
-- AC_CHECK_TYPES(FT_TrueTypeEngineType,,,[#include <freetype/ftmodapi.h>])
-- dnl Check that we have at least freetype/freetype.h
-- if test "$ac_cv_header_freetype_freetype_h" = "yes" -a "$wine_cv_fttrigon" = "yes"
-- then
-- AC_DEFINE(HAVE_FREETYPE, 1, [Define if FreeType 2 is installed])
-- else
-- FREETYPE_LIBS=""
-- fi
-+ WINE_CHECK_SONAME(freetype,FT_Init_FreeType,
-+ [AC_DEFINE(HAVE_FREETYPE, 1, [Define if FreeType 2 is installed])
-+ AC_CHECK_TYPES(FT_TrueTypeEngineType,,,[#include <ft2build.h>
-+#include FT_MODULE_H])],
-+ [FREETYPE_LIBS=""],[$FREETYPE_LIBS])
- else
-+ FREETYPE_CFLAGS=""
- FREETYPE_LIBS=""
- fi
- CPPFLAGS="$ac_save_CPPFLAGS"
- fi
--WINE_ERROR_WITH(freetype,[test "x$ac_cv_header_freetype_freetype_h" != xyes -o "x$wine_cv_fttrigon" != xyes],
-+WINE_ERROR_WITH(freetype,[test "x$ac_cv_lib_soname_freetype" = x],
- [FreeType ${notice_platform}development files not found. Fonts will not be built.])
--test "x$ac_cv_header_freetype_freetype_h" = xyes -a "x$wine_cv_fttrigon" = xyes || enable_fonts=${enable_fonts:-no}
-+test "x$ac_cv_lib_soname_freetype" = x && enable_fonts=${enable_fonts:-no}
-
- dnl **** Check for parport (currently Linux only) ****
- AC_CACHE_CHECK([for parport header/ppdev.h], ac_cv_c_ppdev,
---- dlls/gdi32/freetype.c.orig 2013-11-30 18:22:25.000000000 -0600
-+++ dlls/gdi32/freetype.c 2013-11-30 18:22:25.000000000 -0600
-@@ -79,6 +79,23 @@
- #undef SetRectRgn
- #endif /* HAVE_CARBON_CARBON_H */
-
-+#ifdef HAVE_FT2BUILD_H
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
-+#include FT_GLYPH_H
-+#include FT_TYPES_H
-+#include FT_TRUETYPE_TABLES_H
-+#include FT_SFNT_NAMES_H
-+#include FT_TRUETYPE_IDS_H
-+#include FT_OUTLINE_H
-+#include FT_TRIGONOMETRY_H
-+#include FT_MODULE_H
-+#include FT_WINFONTS_H
-+#ifdef FT_LCD_FILTER_H
-+#include FT_LCD_FILTER_H
-+#endif
-+#endif /* HAVE_FT2BUILD_H */
-+
- #include "windef.h"
- #include "winbase.h"
- #include "winternl.h"
-@@ -97,43 +114,6 @@
-
- #ifdef HAVE_FREETYPE
-
--#ifdef HAVE_FT2BUILD_H
--#include <ft2build.h>
--#endif
--#ifdef HAVE_FREETYPE_FREETYPE_H
--#include <freetype/freetype.h>
--#endif
--#ifdef HAVE_FREETYPE_FTGLYPH_H
--#include <freetype/ftglyph.h>
--#endif
--#ifdef HAVE_FREETYPE_TTTABLES_H
--#include <freetype/tttables.h>
--#endif
--#ifdef HAVE_FREETYPE_FTTYPES_H
--#include <freetype/fttypes.h>
--#endif
--#ifdef HAVE_FREETYPE_FTSNAMES_H
--#include <freetype/ftsnames.h>
--#endif
--#ifdef HAVE_FREETYPE_TTNAMEID_H
--#include <freetype/ttnameid.h>
--#endif
--#ifdef HAVE_FREETYPE_FTOUTLN_H
--#include <freetype/ftoutln.h>
--#endif
--#ifdef HAVE_FREETYPE_FTTRIGON_H
--#include <freetype/fttrigon.h>
--#endif
--#ifdef HAVE_FREETYPE_FTWINFNT_H
--#include <freetype/ftwinfnt.h>
--#endif
--#ifdef HAVE_FREETYPE_FTMODAPI_H
--#include <freetype/ftmodapi.h>
--#endif
--#ifdef HAVE_FREETYPE_FTLCDFIL_H
--#include <freetype/ftlcdfil.h>
--#endif
--
- #ifndef HAVE_FT_TRUETYPEENGINETYPE
- typedef enum
- {
-@@ -186,7 +166,7 @@
- MAKE_FUNCPTR(FT_Vector_Transform);
- MAKE_FUNCPTR(FT_Vector_Unit);
- static FT_TrueTypeEngineType (*pFT_Get_TrueType_Engine_Type)(FT_Library);
--#ifdef HAVE_FREETYPE_FTLCDFIL_H
-+#ifdef FT_LCD_FILTER_H
- static FT_Error (*pFT_Library_SetLcdFilter)(FT_Library, FT_LcdFilter);
- #endif
-
-@@ -924,7 +904,7 @@
-
- static BOOL is_subpixel_rendering_enabled( void )
- {
--#ifdef HAVE_FREETYPE_FTLCDFIL_H
-+#ifdef FT_LCD_FILTER_H
- static int enabled = -1;
- if (enabled == -1)
- {
-@@ -3912,7 +3892,7 @@
- #undef LOAD_FUNCPTR
- /* Don't warn if these ones are missing */
- pFT_Get_TrueType_Engine_Type = wine_dlsym(ft_handle, "FT_Get_TrueType_Engine_Type", NULL, 0);
--#ifdef HAVE_FREETYPE_FTLCDFIL_H
-+#ifdef FT_LCD_FILTER_H
- pFT_Library_SetLcdFilter = wine_dlsym(ft_handle, "FT_Library_SetLcdFilter", NULL, 0);
- #endif
-
-@@ -6655,7 +6635,7 @@
- case WINE_GGO_HBGR_BITMAP:
- case WINE_GGO_VRGB_BITMAP:
- case WINE_GGO_VBGR_BITMAP:
--#ifdef HAVE_FREETYPE_FTLCDFIL_H
-+#ifdef FT_LCD_FILTER_H
- {
- switch (ft_face->glyph->format)
- {
---- include/config.h.in.orig 2013-11-15 13:30:24.000000000 -0600
-+++ include/config.h.in 2013-12-01 03:04:06.000000000 -0600
-@@ -132,39 +132,6 @@
- /* Define if FreeType 2 is installed */
- #undef HAVE_FREETYPE
-
--/* Define to 1 if you have the <freetype/freetype.h> header file. */
--#undef HAVE_FREETYPE_FREETYPE_H
--
--/* Define to 1 if you have the <freetype/ftglyph.h> header file. */
--#undef HAVE_FREETYPE_FTGLYPH_H
--
--/* Define to 1 if you have the <freetype/ftlcdfil.h> header file. */
--#undef HAVE_FREETYPE_FTLCDFIL_H
--
--/* Define to 1 if you have the <freetype/ftmodapi.h> header file. */
--#undef HAVE_FREETYPE_FTMODAPI_H
--
--/* Define to 1 if you have the <freetype/ftoutln.h> header file. */
--#undef HAVE_FREETYPE_FTOUTLN_H
--
--/* Define to 1 if you have the <freetype/ftsnames.h> header file. */
--#undef HAVE_FREETYPE_FTSNAMES_H
--
--/* Define if you have the <freetype/fttrigon.h> header file. */
--#undef HAVE_FREETYPE_FTTRIGON_H
--
--/* Define to 1 if you have the <freetype/fttypes.h> header file. */
--#undef HAVE_FREETYPE_FTTYPES_H
--
--/* Define to 1 if you have the <freetype/ftwinfnt.h> header file. */
--#undef HAVE_FREETYPE_FTWINFNT_H
--
--/* Define to 1 if you have the <freetype/ttnameid.h> header file. */
--#undef HAVE_FREETYPE_TTNAMEID_H
--
--/* Define to 1 if you have the <freetype/tttables.h> header file. */
--#undef HAVE_FREETYPE_TTTABLES_H
--
- /* Define to 1 if the system has the type `fsblkcnt_t'. */
- #undef HAVE_FSBLKCNT_T
-
</del></span></pre>
</div>
</div>
</body>
</html>