[113447] trunk/dports/x11/wine

[ryandesign at macports.org]

Revision: 113447
          https://trac.macports.org/changeset/113447
Author:   ryandesign at macports.org
Date:     2013-11-16 05:31:46 -0800 (Sat, 16 Nov 2013)
Log Message:
-----------
wine: update to 1.6.1

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

Removed Paths:
-------------
    trunk/dports/x11/wine/files/patch-dlls-winemac.drv-gdi.c.diff

Modified: trunk/dports/x11/wine/Portfile
===================================================================
--- trunk/dports/x11/wine/Portfile	2013-11-16 13:03:17 UTC (rev 113446)
+++ trunk/dports/x11/wine/Portfile	2013-11-16 13:31:46 UTC (rev 113447)
@@ -10,7 +10,7 @@
 name                        wine
 conflicts                   wine-devel wine-crossover
 set my_name                 wine
-version                     1.6
+version                     1.6.1
 license                     LGPL-2.1+
 categories                  x11
 maintainers                 ryandesign jwa openmaintainer
@@ -36,8 +36,8 @@
                             sourceforge:project/wine/Wine%20Gecko/${wine_gecko_version}:winegecko
 
 checksums                   ${wine_distfile} \
-                            rmd160  207ab1bb2b679ffb548599566920aceb365f20a3 \
-                            sha256  e1f130efbdcbfa211ca56ee03357ccd17a31443889b4feebdcb88248520b42ae \
+                            rmd160  b3544b271ea31336c9a3b283b4bc882f5fcb185d \
+                            sha256  d5bc2c088b555caa60a7ba1156e6ed74d791ba3c438129c75ab53805215a384c \
                             ${wine_gecko_distfile} \
                             rmd160  e5aded4dfcde2462d9802478efe5aae1552e842d \
                             sha256  f01fafa6d7aab995c38add77315c4cbc2f32f52d5d6a9350056f42b62d631fd8
@@ -97,7 +97,6 @@
 
 patchfiles                  BOOL.patch \
                             mach_machine.patch \
-                            patch-dlls-winemac.drv-gdi.c.diff \
                             tiger-shell.patch
 
 configure.ldflags-append    -framework CoreServices \

Deleted: trunk/dports/x11/wine/files/patch-dlls-winemac.drv-gdi.c.diff
===================================================================
--- trunk/dports/x11/wine/files/patch-dlls-winemac.drv-gdi.c.diff	2013-11-16 13:03:17 UTC (rev 113446)
+++ trunk/dports/x11/wine/files/patch-dlls-winemac.drv-gdi.c.diff	2013-11-16 13:31:46 UTC (rev 113447)
@@ -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:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131116/f34f6502/attachment.html>