<!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>[144100] trunk/dports/x11/wine-crossover</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/144100">144100</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2016-01-01 10:50:57 -0800 (Fri, 01 Jan 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>wine-crossover-devel: Bump to 15.0.0</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsx11winecrossoverPortfile">trunk/dports/x11/wine-crossover/Portfile</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsx11winecrossoverfilestigershellpatch">trunk/dports/x11/wine-crossover/files/tiger-shell.patch</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsx11winecrossoverPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/x11/wine-crossover/Portfile (144099 => 144100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/wine-crossover/Portfile        2016-01-01 18:19:43 UTC (rev 144099)
+++ trunk/dports/x11/wine-crossover/Portfile        2016-01-01 18:50:57 UTC (rev 144100)
</span><span class="lines">@@ -2,6 +2,7 @@
</span><span class="cx"> # $Id$
</span><span class="cx"> 
</span><span class="cx"> PortSystem                  1.0
</span><ins>+PortGroup                   archcheck 1.0
</ins><span class="cx"> PortGroup                   compiler_blacklist_versions 1.0
</span><span class="cx"> 
</span><span class="cx"> # Please keep the wine, wine-devel and wine-crossover ports as similar as possible.
</span><span class="lines">@@ -15,7 +16,7 @@
</span><span class="cx"> name                        wine-crossover
</span><span class="cx"> conflicts                   wine wine-devel
</span><span class="cx"> set my_name                 wine
</span><del>-version                     14.1.10
</del><ins>+version                     15.0.0
</ins><span class="cx"> license                     LGPL-2.1+
</span><span class="cx"> categories                  x11
</span><span class="cx"> maintainers                 jeremyhu openmaintainer
</span><span class="lines">@@ -24,7 +25,7 @@
</span><span class="cx"> distname                    crossover-sources-${version}
</span><span class="cx"> dist_subdir                 ${my_name}
</span><span class="cx"> set wine_distfile           ${distname}${extract.suffix}
</span><del>-set wine_gecko_version      2.24
</del><ins>+set wine_gecko_version      2.40
</ins><span class="cx"> set wine_gecko_distfile     wine_gecko-${wine_gecko_version}-x86.msi
</span><span class="cx"> set wine_mono_version       4.5.6
</span><span class="cx"> set wine_mono_distfile      wine-mono-${wine_mono_version}.msi
</span><span class="lines">@@ -32,7 +33,7 @@
</span><span class="cx"> build.target                depend all
</span><span class="cx"> use_parallel_build          yes
</span><span class="cx"> 
</span><del>-description                 Wine Is Not an Emulator (1.7.25 with CodeWeavers modifications for CrossOver)
</del><ins>+description                 Wine Is Not an Emulator (1.8-rc2 with CodeWeavers modifications for CrossOver)
</ins><span class="cx"> 
</span><span class="cx"> long_description            Wine is an implementation of the Windows APIs on top of X11. \
</span><span class="cx">                             This version contains the Codeweavers patches for CrossOver
</span><span class="lines">@@ -49,11 +50,11 @@
</span><span class="cx">                             ${wine_mono_distfile}:winemono
</span><span class="cx"> 
</span><span class="cx"> checksums                   ${wine_distfile} \
</span><del>-                            rmd160  f73219db0040ea1bbf11b44d61d72168317192aa \
-                            sha256  6279ce3f94848c9e3fdc9394269206e8a5cc1e7d275b48cd1bea41b2b036a3de \
</del><ins>+                            rmd160  27aa2c790879b7ff85d970ca778d528bb83fe19c \
+                            sha256  62af948c5e5b8814a344fc9c27ab22e06eaeb3e69036aa9deb1c437d8818cf8d \
</ins><span class="cx">                             ${wine_gecko_distfile} \
</span><del>-                            rmd160  109014e52d056962350681fd9d8178969cff939d \
-                            sha256  6e38acae87ea66e2c1e8f2f0afe88f89eed3e6e0b431cd3da38dea814b71202c \
</del><ins>+                            rmd160  2b0e0b6c5cd7579579a27bf179f98b7a76f4f43c \
+                            sha256  1a29d17435a52b7663cea6f30a0771f74097962b07031947719bb7b46057d302 \
</ins><span class="cx">                             ${wine_mono_distfile} \
</span><span class="cx">                             rmd160  440a0839e6067eb02b778cbb461606a7d498897b \
</span><span class="cx">                             sha256  ac681f737f83742d786706529eb85f4bc8d6bdddd8dcdfa9e2e336b71973bc25
</span><span class="lines">@@ -85,19 +86,45 @@
</span><span class="cx">                             port:libGLU \
</span><span class="cx">                             port:mesa
</span><span class="cx"> 
</span><ins>+archcheck.files             lib/libexpat.dylib \
+                            lib/libfontconfig.dylib \
+                            lib/libfreetype.dylib \
+                            lib/libjpeg.dylib \
+                            lib/liblcms2.dylib \
+                            lib/libiconv.dylib \
+                            lib/libpng.dylib \
+                            lib/libxml2.dylib \
+                            lib/libxslt.dylib \
+                            lib/libncurses.dylib \
+                            lib/libgnutls.dylib \
+                            lib/libtiff.dylib \
+                            lib/libz.dylib \
+                            lib/libSM.dylib \
+                            lib/libXcomposite.dylib \
+                            lib/libXcursor.dylib \
+                            lib/libXi.dylib \
+                            lib/libXinerama.dylib \
+                            lib/libXrandr.dylib \
+                            lib/libXxf86vm.dylib \
+                            lib/libXrender.dylib \
+                            lib/libGLU.dylib \
+                            lib/libGL.dylib
+
</ins><span class="cx"> depends_build               port:bison \
</span><span class="cx">                             port:flex \
</span><span class="cx">                             port:pkgconfig
</span><span class="cx"> 
</span><del>-# Extract only the wine directory. We don't need the others, and their presence
-# interferes with the wine build (which uses parts of them if present).
-extract.post_args-append    ${worksrcdir}
-
</del><span class="cx"> patchfiles                  BOOL.patch \
</span><span class="cx">                             mach_machine.patch \
</span><span class="cx">                             kVK_RightCommand_macro.patch \
</span><del>-                            patch-include-distversion.h.diff
</del><ins>+                            patch-include-distversion.h.diff \
+                            tiger-shell.patch
</ins><span class="cx"> 
</span><ins>+# Wine requires the program specified in INSTALL to create intermediate
+# directories; /usr/bin/install doesn't.
+# http://bugs.winehq.org/show_bug.cgi?id=35310
+configure.install           ${worksrcpath}/tools/install-sh
+
</ins><span class="cx"> configure.ldflags-append    -framework CoreServices \
</span><span class="cx">                             -lz
</span><span class="cx"> 
</span><span class="lines">@@ -184,7 +211,7 @@
</span><span class="cx"> 
</span><span class="cx"> post-destroot {
</span><span class="cx">     xinstall -d ${destroot}${prefix}/libexec/wine
</span><del>-    file rename ${destroot}${prefix}/bin/wineloader ${destroot}${prefix}/libexec/wine/wine
</del><ins>+    file rename ${destroot}${prefix}/bin/wine ${destroot}${prefix}/libexec/wine/wine
</ins><span class="cx"> 
</span><span class="cx">     xinstall ${filespath}/wine.in ${destroot}${prefix}/bin/wine
</span><span class="cx">     reinplace s|@PREFIX@|${prefix}|g ${destroot}${prefix}/bin/wine
</span></span></pre></div>
<a id="trunkdportsx11winecrossoverfilestigershellpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/x11/wine-crossover/files/tiger-shell.patch (0 => 144100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/wine-crossover/files/tiger-shell.patch                                (rev 0)
+++ trunk/dports/x11/wine-crossover/files/tiger-shell.patch        2016-01-01 18:50:57 UTC (rev 144100)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- dlls/shell32/trash.c.orig        2012-04-08 22:35:02.000000000 -0700
++++ dlls/shell32/trash.c        2012-04-08 22:36:59.000000000 -0700
+@@ -60,7 +60,7 @@

+ WINE_DEFAULT_DEBUG_CHANNEL(trash);

+-#ifdef HAVE_CORESERVICES_CORESERVICES_H
++#if defined(HAVE_CORESERVICES_CORESERVICES_H) &amp;&amp; __MAC_OS_X_VERSION_MIN_REQUIRED &gt;= 1050

+ BOOL TRASH_CanTrashFile(LPCWSTR wszPath)
+ {
</ins></span></pre>
</div>
</div>

</body>
</html>