[114413] trunk/dports/x11/wine-crossover
ryandesign at macports.org
ryandesign at macports.org
Sat Dec 7 08:29:04 PST 2013
Revision: 114413
https://trac.macports.org/changeset/114413
Author: ryandesign at macports.org
Date: 2013-12-07 08:29:03 -0800 (Sat, 07 Dec 2013)
Log Message:
-----------
wine-crossover: update to 13.0.0 (#40102)
Modified Paths:
--------------
trunk/dports/x11/wine-crossover/Portfile
trunk/dports/x11/wine-crossover/files/patch-freetype-2.5.1.diff
Added Paths:
-----------
trunk/dports/x11/wine-crossover/files/patch-dlls-winemac.drv-winemac.rc.diff
trunk/dports/x11/wine-crossover/files/patch-include-distversion.h.diff
Removed Paths:
-------------
trunk/dports/x11/wine-crossover/files/patch-dlls-winemac.drv-gdi.c.diff
trunk/dports/x11/wine-crossover/files/winedbg.patch
Modified: trunk/dports/x11/wine-crossover/Portfile
===================================================================
--- trunk/dports/x11/wine-crossover/Portfile 2013-12-07 16:21:00 UTC (rev 114412)
+++ trunk/dports/x11/wine-crossover/Portfile 2013-12-07 16:29:03 UTC (rev 114413)
@@ -9,9 +9,11 @@
# When updating the version of wine, update wine_gecko to a compatible version
# per the table at http://wiki.winehq.org/Gecko
+# Crossover-specific bug reports are accepted at info at codeweavers.com
+
name wine-crossover
conflicts wine wine-devel
-version 12.5.1
+version 13.0.0
license LGPL-2.1+
categories x11
maintainers jeremyhu openmaintainer
@@ -20,7 +22,7 @@
distname crossover-sources-${version}
dist_subdir wine
set wine_distfile ${distname}${extract.suffix}
-set wine_gecko_version 2.21
+set wine_gecko_version 2.24
set wine_gecko_distfile wine_gecko-${wine_gecko_version}-x86.msi
distfiles ${wine_distfile}:winesource ${wine_gecko_distfile}:winegecko
extract.only ${wine_distfile}
@@ -28,7 +30,7 @@
build.target depend all
use_parallel_build yes
-description Wine Is Not an Emulator (1.6 with CodeWeavers modifications for CrossOver)
+description Wine Is Not an Emulator (1.7.4 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
@@ -38,11 +40,11 @@
sourceforge:project/wine/Wine%20Gecko/${wine_gecko_version}:winegecko
checksums ${wine_distfile} \
- rmd160 954ab9e7ef0df940cb167d9d55ca0d0cf663c207 \
- sha256 6448607e44e3b20880ec5e24a8c50ed9516a7ccf7a55741bb6f6e88002fce328 \
+ rmd160 db4dace01bd5eb01a6e496ff48e418d99996a7f1 \
+ sha256 54305a1509732ab20a49785c5e9055c126a6718b58c4c95197c505d5bb11f750 \
${wine_gecko_distfile} \
- rmd160 e5aded4dfcde2462d9802478efe5aae1552e842d \
- sha256 f01fafa6d7aab995c38add77315c4cbc2f32f52d5d6a9350056f42b62d631fd8
+ rmd160 109014e52d056962350681fd9d8178969cff939d \
+ sha256 6e38acae87ea66e2c1e8f2f0afe88f89eed3e6e0b431cd3da38dea814b71202c
# Note: Most of the X11 libs are dlopen()'d
depends_lib port:expat \
@@ -51,7 +53,7 @@
port:gstreamer010 \
port:gstreamer010-gst-plugins-base \
port:jpeg \
- port:lcms \
+ port:lcms2 \
port:libiconv \
port:libpng \
port:libxml2 \
@@ -80,9 +82,9 @@
patchfiles BOOL.patch \
mach_machine.patch \
- patch-dlls-winemac.drv-gdi.c.diff \
+ patch-dlls-winemac.drv-winemac.rc.diff \
patch-freetype-2.5.1.diff \
- winedbg.patch
+ patch-include-distversion.h.diff
# rebuild configure after freetype 2.5.1 patch
use_autoreconf yes
Deleted: trunk/dports/x11/wine-crossover/files/patch-dlls-winemac.drv-gdi.c.diff
===================================================================
--- trunk/dports/x11/wine-crossover/files/patch-dlls-winemac.drv-gdi.c.diff 2013-12-07 16:21:00 UTC (rev 114412)
+++ trunk/dports/x11/wine-crossover/files/patch-dlls-winemac.drv-gdi.c.diff 2013-12-07 16:29:03 UTC (rev 114413)
@@ -1,54 +0,0 @@
-Fix build on Mavericks
-http://bugs.winehq.org/show_bug.cgi?id=34162
---- dlls/winemac.drv/gdi.c.orig
-+++ dlls/winemac.drv/gdi.c
-@@ -49,7 +49,6 @@ static int vert_res; /* height in pixels of screen */
- static int desktop_horz_res; /* width in pixels of virtual desktop */
- static int desktop_vert_res; /* height in pixels of virtual desktop */
- static int bits_per_pixel; /* pixel depth of screen */
--static int palette_size; /* number of color entries in palette */
- static int device_data_valid; /* do the above variables have up-to-date values? */
-
- static CRITICAL_SECTION device_data_section;
-@@ -141,7 +140,6 @@ static void device_init(void)
- CGDirectDisplayID mainDisplay = CGMainDisplayID();
- CGSize size_mm = CGDisplayScreenSize(mainDisplay);
- CGDisplayModeRef mode = CGDisplayCopyDisplayMode(mainDisplay);
-- CGDirectPaletteRef palette;
-
- /* Initialize device caps */
- log_pixels_x = log_pixels_y = get_dpi();
-@@ -187,15 +185,6 @@ static void device_init(void)
- desktop_horz_res = desktop_rect.size.width;
- desktop_vert_res = desktop_rect.size.height;
-
-- palette = CGPaletteCreateWithDisplay(mainDisplay);
-- if (palette)
-- {
-- palette_size = CGPaletteGetNumberOfSamples(palette);
-- CGPaletteRelease(palette);
-- }
-- else
-- palette_size = 0;
--
- device_data_valid = TRUE;
- }
-
-@@ -368,7 +357,7 @@ static INT macdrv_GetDeviceCaps(PHYSDEV dev, INT cap)
- case RASTERCAPS:
- ret = (RC_BITBLT | RC_BANDING | RC_SCALING | RC_BITMAP64 | RC_DI_BITMAP |
- RC_DIBTODEV | RC_BIGFONT | RC_STRETCHBLT | RC_STRETCHDIB | RC_DEVBITS |
-- (palette_size ? RC_PALETTE : 0));
-+ (bits_per_pixel <= 8 ? RC_PALETTE : 0));
- break;
- case SHADEBLENDCAPS:
- ret = (SB_GRAD_RECT | SB_GRAD_TRI | SB_CONST_ALPHA | SB_PIXEL_ALPHA);
-@@ -393,7 +382,7 @@ static INT macdrv_GetDeviceCaps(PHYSDEV dev, INT cap)
- ret = 0;
- break;
- case SIZEPALETTE:
-- ret = palette_size;
-+ ret = bits_per_pixel <= 8 ? 1 << bits_per_pixel : 0;
- break;
- case NUMRESERVED:
- case PHYSICALWIDTH:
Added: trunk/dports/x11/wine-crossover/files/patch-dlls-winemac.drv-winemac.rc.diff
===================================================================
--- trunk/dports/x11/wine-crossover/files/patch-dlls-winemac.drv-winemac.rc.diff (rev 0)
+++ trunk/dports/x11/wine-crossover/files/patch-dlls-winemac.drv-winemac.rc.diff 2013-12-07 16:29:03 UTC (rev 114413)
@@ -0,0 +1,11 @@
+Patch provided by Josh Dubois, CrossOver product manager, CodeWeavers.
+--- dlls/winemac.drv/winemac.rc.orig 2013-11-07 15:40:10.000000000 -0600
++++ dlls/winemac.drv/winemac.rc 2013-12-07 09:42:14.000000000 -0600
+@@ -19,7 +19,6 @@
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+-FALLBACK_ICON RCDATA ../../../macosx/CrossOver/images/exeIcon.icns
+
+ #define WINE_FILEDESCRIPTION_STR "Wine Mac driver"
+ #define WINE_FILENAME_STR "winemac.drv"
Modified: trunk/dports/x11/wine-crossover/files/patch-freetype-2.5.1.diff
===================================================================
--- trunk/dports/x11/wine-crossover/files/patch-freetype-2.5.1.diff 2013-12-07 16:21:00 UTC (rev 114412)
+++ trunk/dports/x11/wine-crossover/files/patch-freetype-2.5.1.diff 2013-12-07 16:29:03 UTC (rev 114413)
@@ -1,69 +1,51 @@
Fix build with freetype 2.5.1.
http://bugs.winehq.org/show_bug.cgi?id=35010
---- configure.ac.orig 2013-10-16 10:38:18.000000000 -0500
-+++ configure.ac 2013-12-03 02:10:35.000000000 -0600
-@@ -1485,7 +1485,7 @@
+--- 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])
-+ AC_CHECK_HEADERS([ft2build.h])
- if test -d "$srcdir/../freetype"
- then
- case $host_os in
-@@ -1502,52 +1502,22 @@
- ;;
- esac
- fi
-- if test "$ft_lib" = "yes"
-+ 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])
-- if test -d "$srcdir/../freetype"
-- then
-- case $host_os in
-- darwin*|macosx*)
-- dnl Special case for in-tree build
-- FREETYPE_INCL="-I\$(top_srcdir)/../freetype/include"
-- FREETYPE_LIBS="-L\$(top_builddir)/../freetype/objs/.libs -lcxfreetype"
-- ;;
-- esac
-- fi
-- 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>
+ [`(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"
++ [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],
@@ -73,9 +55,9 @@
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 @@
+--- dlls/gdi32/freetype.c.orig
++++ dlls/gdi32/freetype.c
+@@ -77,6 +77,23 @@
#undef SetRectRgn
#endif /* HAVE_CARBON_CARBON_H */
@@ -99,7 +81,7 @@
#include "windef.h"
#include "winbase.h"
#include "winternl.h"
-@@ -97,43 +114,6 @@
+@@ -95,43 +112,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(font);
#ifdef HAVE_FREETYPE
@@ -143,16 +125,16 @@
#ifndef HAVE_FT_TRUETYPEENGINETYPE
typedef enum
{
-@@ -186,7 +166,7 @@
- MAKE_FUNCPTR(FT_Vector_Transform);
+@@ -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 @@
+@@ -924,7 +904,7 @@ static BOOL is_hinting_enabled(void)
static BOOL is_subpixel_rendering_enabled( void )
{
@@ -161,16 +143,16 @@
static int enabled = -1;
if (enabled == -1)
{
-@@ -3912,7 +3892,7 @@
- #undef LOAD_FUNCPTR
+@@ -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
-@@ -6655,7 +6635,7 @@
+@@ -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:
@@ -179,9 +161,9 @@
{
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 @@
+--- include/config.h.in.orig
++++ include/config.h.in
+@@ -132,39 +132,6 @@
/* Define if FreeType 2 is installed */
#undef HAVE_FREETYPE
Copied: trunk/dports/x11/wine-crossover/files/patch-include-distversion.h.diff (from rev 114412, trunk/dports/x11/wine-crossover/files/winedbg.patch)
===================================================================
--- trunk/dports/x11/wine-crossover/files/patch-include-distversion.h.diff (rev 0)
+++ trunk/dports/x11/wine-crossover/files/patch-include-distversion.h.diff 2013-12-07 16:29:03 UTC (rev 114413)
@@ -0,0 +1,16 @@
+Patch provided by Josh Dubois, CrossOver product manager, CodeWeavers.
+--- /dev/null 2013-12-07 10:15:02.000000000 -0600
++++ include/distversion.h 2013-12-07 10:14:51.000000000 -0600
+@@ -0,0 +1,12 @@
++/* ---------------------------------------------------------------
++ * distversion.c
++ *
++ * Copyright 2013, CodeWeavers, Inc.
++ *
++ * Information from DISTVERSION which needs to find
++ * its way into the wine tree.
++ * --------------------------------------------------------------- */
++
++#define WINDEBUG_WHAT_HAPPENED_MESSAGE "This can be caused by a problem in the program or a deficiency in Wine. You may want to check <a href=\"http://www.codeweavers.com/compatibility/\">http://www.codeweavers.com/compatibility/</a> for tips about running this application."
++
++#define WINDEBUG_USER_SUGGESTION_MESSAGE "If this problem is not present under Windows and has not been reported yet, you can save the detailed information to a file using the \"Save As\" button, then <a href=\"http://www.codeweavers.com/support/tickets/enter/\">file a bug report</a> and attach that file to the report."
Deleted: trunk/dports/x11/wine-crossover/files/winedbg.patch
===================================================================
--- trunk/dports/x11/wine-crossover/files/winedbg.patch 2013-12-07 16:21:00 UTC (rev 114412)
+++ trunk/dports/x11/wine-crossover/files/winedbg.patch 2013-12-07 16:29:03 UTC (rev 114413)
@@ -1,10 +0,0 @@
---- programs/winedbg/resource.h.orig 2013-05-01 11:14:46.000000000 -0500
-+++ programs/winedbg/resource.h 2013-05-13 14:39:21.000000000 -0500
-@@ -20,7 +20,6 @@
-
- #include <windef.h>
- #include <winuser.h>
--#include "distversion.h"
-
- #define IDD_CRASH_DLG 100
- #define IDD_DETAILS_DLG 101
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131207/1e352812/attachment-0001.html>
More information about the macports-changes
mailing list