[128988] trunk/dports/x11/wine-crossover

2 Dec 2014

Revision: 128988
          https://trac.macports.org/changeset/128988
Author:   ryandesign@macports.org
Date:     2014-12-02 00:21:58 -0800 (Tue, 02 Dec 2014)
Log Message:
-----------
wine-crossover: update to 14.0.3

Modified Paths:
--------------
    trunk/dports/x11/wine-crossover/Portfile

Removed Paths:
-------------
    trunk/dports/x11/wine-crossover/files/patch-freetype-2.5.1.diff

Modified: trunk/dports/x11/wine-crossover/Portfile
===================================================================

--- trunk/dports/x11/wine-crossover/Portfile	2014-12-02 07:10:36 UTC (rev 128987)
+++ trunk/dports/x11/wine-crossover/Portfile	2014-12-02 08:21:58 UTC (rev 128988)
@@ -14,8 +14,7 @@
 
 name                        wine-crossover
 conflicts                   wine wine-devel
-version                     13.1.2
-revision                    3
+version                     14.0.3
 license                     LGPL-2.1+
 categories                  x11
 maintainers                 jeremyhu openmaintainer
@@ -32,7 +31,7 @@
 build.target                depend all
 use_parallel_build          yes
 
-description                 Wine Is Not an Emulator (1.7.4 with CodeWeavers modifications for CrossOver)
+description                 Wine Is Not an Emulator (1.7.25 with CodeWeavers modifications for CrossOver)
 
 long_description            Wine is an implementation of the Windows APIs on top of X11. \
                             This version contains the Codeweavers patches for CrossOver
@@ -49,8 +48,8 @@
                             ${wine_mono_distfile}:winemono
 
 checksums                   ${wine_distfile} \
-                            rmd160  d4f83fd5f593fec251a6441ad6aab043d81d6a30 \
-                            sha256  e3a1877cfa5582c4a61f0e8c6823a0d8313d144f80e151df0b5e2edb2d3e37c7 \
+                            rmd160  3ae98b2d8317baca5846fea21cf23cde18b783d0 \
+                            sha256  c08a63d98f3593575a53be29c518582c35fc6582af482c72575b247992dc1e53 \
                             ${wine_gecko_distfile} \
                             rmd160  109014e52d056962350681fd9d8178969cff939d \
                             sha256  6e38acae87ea66e2c1e8f2f0afe88f89eed3e6e0b431cd3da38dea814b71202c \
@@ -94,12 +93,8 @@
 
 patchfiles                  BOOL.patch \
                             mach_machine.patch \
-                            patch-freetype-2.5.1.diff \
                             patch-include-distversion.h.diff
 
-# rebuild configure after freetype 2.5.1 patch
-use_autoreconf              yes
-
 configure.ldflags-append    -framework CoreServices \
                             -lz
 

Deleted: trunk/dports/x11/wine-crossover/files/patch-freetype-2.5.1.diff
===================================================================
--- trunk/dports/x11/wine-crossover/files/patch-freetype-2.5.1.diff	2014-12-02 07:10:36 UTC (rev 128987)
+++ trunk/dports/x11/wine-crossover/files/patch-freetype-2.5.1.diff	2014-12-02 08:21:58 UTC (rev 128988)
@@ -1,205 +0,0 @@
-Fix build with freetype 2.5.1.
-http://bugs.winehq.org/show_bug.cgi?id=35010
---- configure.ac.orig	
-+++ configure.ac	
-@@ -1463,42 +1463,22 @@ then
-     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])
- 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	
-+++ dlls/gdi32/freetype.c	
-@@ -77,6 +77,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"
-@@ -95,43 +112,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(font);
- 
- #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_Error (*pFT_Outline_Embolden)(FT_Outline *, FT_Pos);
- 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_hinting_enabled(void)
- 
- static BOOL is_subpixel_rendering_enabled( void )
- {
--#ifdef HAVE_FREETYPE_FTLCDFIL_H
-+#ifdef FT_LCD_FILTER_H
-     static int enabled = -1;
-     if (enabled == -1)
-     {
-@@ -3918,7 +3898,7 @@ static BOOL init_freetype(void)
-     /* Don't warn if these ones are missing */
-     pFT_Outline_Embolden = wine_dlsym(ft_handle, "FT_Outline_Embolden", NULL, 0);
-     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
- 
-@@ -6706,7 +6686,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format,
-     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	
-+++ include/config.h.in	
-@@ -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
-

    

ryandesign＠macports.org

tags

participants (1)