<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a3b459daaa5cd0b718b411c813ac4cd8b47f10c6">https://github.com/macports/macports-ports/commit/a3b459daaa5cd0b718b411c813ac4cd8b47f10c6</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit a3b459daaa5cd0b718b411c813ac4cd8b47f10c6
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Jan 25 15:57:45 2017 -0600
<span style='display:block; white-space:pre;color:#404040;'> wine: Update to 2.0
</span>---
x11/wine/Portfile | 24 +++++++++++++-----------
x11/wine/files/cups_headers.patch | 10 ++++++++++
2 files changed, 23 insertions(+), 11 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/wine/Portfile b/x11/wine/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 332e1e1..326e81d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/wine/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/wine/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +12,7 @@ PortGroup compiler_blacklist_versions 1.0
</span> name wine
conflicts wine-devel wine-crossover
set my_name wine
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.8.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.0
</span> set branch [join [lrange [split ${version} .] 0 1] .]
license LGPL-2.1+
categories x11
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,9 +23,9 @@ use_bzip2 yes
</span> distname ${my_name}-${version}
dist_subdir ${my_name}
set wine_distfile ${distname}${extract.suffix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set wine_gecko_version 2.40
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set wine_gecko_version 2.47
</span> set wine_gecko_distfile wine_gecko-${wine_gecko_version}-x86.msi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set wine_mono_version 4.5.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set wine_mono_version 4.6.4
</span> set wine_mono_distfile wine-mono-${wine_mono_version}.msi
build.target depend all
use_parallel_build yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,24 +49,25 @@ distfiles ${wine_distfile}:winesource \
</span> ${wine_mono_distfile}:winemono
checksums ${wine_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 3b3aa5376daa5564a56105ad740a8fd3d421e660 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b1797896eb3b63aab8a4753cc756d6211a0e85460146a1b52063ec79c13906d3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 278dbf9a351b5efbe815d7e8d935b01ee02f245c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9756f5a2129b6a83ba701e546173cbff86caa671b0af73eb8f72c03b20c066c6 \
</span> ${wine_gecko_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 2b0e0b6c5cd7579579a27bf179f98b7a76f4f43c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 1a29d17435a52b7663cea6f30a0771f74097962b07031947719bb7b46057d302 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 abf7cc78b49dd0623bc8fe87ae0e32bb8694e13d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3b8a361f5d63952d21caafd74e849a774994822fb96c5922b01d554f1677643a \
</span> ${wine_mono_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 440a0839e6067eb02b778cbb461606a7d498897b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ac681f737f83742d786706529eb85f4bc8d6bdddd8dcdfa9e2e336b71973bc25
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 b130724ebddbfa0db702bea39d634a55bd8d064f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 91b7d58177b9a9355edf007dab94535471aebdddae12734ceb4a219d2ecc4152
</span>
# Note: Most of the X11 libs are dlopen()'d
depends_lib port:expat \
port:fontconfig \
port:freetype \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gstreamer010 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gstreamer010-gst-plugins-base \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gstreamer1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gstreamer1-gst-plugins-base \
</span> port:jpeg \
port:lcms2 \
port:libiconv \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libpcap \
</span> port:libpng \
port:libxml2 \
port:libxslt \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,6 +91,7 @@ depends_build port:bison \
</span> port:pkgconfig
patchfiles BOOL.patch \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ cups_headers.patch \
</span> mach_machine.patch \
tiger-shell.patch
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/wine/files/cups_headers.patch b/x11/wine/files/cups_headers.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..795af4b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/wine/files/cups_headers.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- dlls/winspool.drv/info.c.orig 2016-03-18 06:31:01.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ dlls/winspool.drv/info.c 2016-03-23 00:09:31.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -43,6 +43,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <signal.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_CUPS_CUPS_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <cups/cups.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# include <cups/ppd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H
</span></pre><pre style='margin:0'>
</pre>