<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0510200f34fd243a297d35c4f6842c59e8e2afd9">https://github.com/macports/macports-ports/commit/0510200f34fd243a297d35c4f6842c59e8e2afd9</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0510200f34fd243a297d35c4f6842c59e8e2afd9
</span>Author: Dean M Greer <38226388+Gcenx@users.noreply.github.com>
AuthorDate: Thu May 30 16:14:06 2024 -0400
<span style='display:block; white-space:pre;color:#404040;'> wine: Convert to stub
</span>---
emulators/wine/Portfile | 15 ++
x11/wine/Portfile | 389 --------------------------------------
x11/wine/files/BOOL.patch | 126 ------------
x11/wine/files/cups_headers.patch | 10 -
x11/wine/files/fix-flicker.patch | 84 --------
x11/wine/files/mach_machine.patch | 12 --
6 files changed, 15 insertions(+), 621 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/wine/Portfile b/emulators/wine/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..20cd7ba1656
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/wine/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup stub 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name wine
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+replaced_by wine-stable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+epoch 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms {macosx any >= 19}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories emulators
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {@Gcenx gmail.com:gcenx83} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run path:bin/wine:wine-stable
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/wine/Portfile b/x11/wine/Portfile
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9d770f951d5..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/wine/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,389 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup muniversal 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup compiler_blacklist_versions 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Please keep the wine, wine-devel and wine-crossover ports as similar as possible.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-name wine
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts wine-devel wine-crossover
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set my_name wine
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.0.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set branch [lindex [split ${version} .] 0].0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license LGPL-2.1+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories x11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {ryandesign @ryandesign} openmaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://www.winehq.org
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_xz yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname ${my_name}-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-dist_subdir ${my_name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set wine_distfile ${distname}${extract.suffix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set wine_gecko_version 2.47
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set wine_gecko_distfile wine_gecko-${wine_gecko_version}-x86.msi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set wine_gecko64_distfile wine_gecko-${wine_gecko_version}-x86_64.msi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set wine_mono_version 4.7.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set wine_mono_distfile wine-mono-${wine_mono_version}.msi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_parallel_build yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description A Windows API implementation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description Wine is a compatibility layer capable of running \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Windows applications. \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Instead of simulating internal Windows logic like \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a virtual machine or emulator, Wine translates \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Windows API calls into POSIX calls on-the-fly, \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- eliminating the performance and memory penalties \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- of other methods and allowing you to cleanly \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- integrate Windows applications into your desktop.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://mirrors.ibiblio.org/wine/source/${branch}/:winesource \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- http://dl.winehq.org/wine/source/${branch}/:winesource \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sourceforge:project/wine/Source/:winesource \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- http://dl.winehq.org/wine/wine-gecko/${wine_gecko_version}/:winegecko \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sourceforge:project/wine/Wine%20Gecko/${wine_gecko_version}/:winegecko \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- http://dl.winehq.org/wine/wine-mono/${wine_mono_version}/:winemono \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sourceforge:project/wine/Wine%20Mono/${wine_mono_version}/:winemono
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-extract.only ${wine_distfile}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distfiles ${wine_distfile}:winesource \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${wine_gecko_distfile}:winegecko \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${wine_gecko64_distfile}:winegecko \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${wine_mono_distfile}:winemono
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums ${wine_distfile} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 2362b565e0e710712f1e4f22e0415c32db869794 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 53a051ff61009f5c0d0f3770fac56c5d1cccd1015078f8b214d63bc6cd8f6169 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 21686868 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${wine_gecko_distfile} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 abf7cc78b49dd0623bc8fe87ae0e32bb8694e13d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3b8a361f5d63952d21caafd74e849a774994822fb96c5922b01d554f1677643a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 49266176 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${wine_gecko64_distfile} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 254da21cb2503f20d065167b385b3e83ea3ab327 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c565ea25e50ea953937d4ab01299e4306da4a556946327d253ea9b28357e4a7d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 50806272 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${wine_mono_distfile} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 0fa40e1701cd76e5590929beb20a3cb8b2c3184d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 154d68d476cdedef56f159d837fbb5eef9358a9f85de89f86c189ec4da004b3f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 56470528
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Note: Most of the X11 libs are dlopen()'d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:fontconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:freetype \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gstreamer1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gstreamer1-gst-plugins-base \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:include/turbojpeg.h:libjpeg-turbo \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:lcms2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libiconv \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libpcap \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libpng \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libxml2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libxslt \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:ncurses \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/gnutls.pc:gnutls \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:openal-soft \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:tiff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:zlib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:bison \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:flex \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set fp [open ${worksrcpath}/dlls/appwiz.cpl/addons.c r]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set file_contents [read ${fp}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- close ${fp}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set ok yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach addon {gecko mono} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set addon_version_var wine_${addon}_version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set addon_version_in_port [set ${addon_version_var}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[regexp -lineanchor "^#define [string toupper $addon]_VERSION \"(\[^\"\]+)\"$" ${file_contents} -> addon_version_in_file] == 1} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${addon_version_in_port} ne ${addon_version_in_file}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set ok no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${addon_version_var} should be ${addon_version_in_file} not ${addon_version_in_port}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set ok no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "Could not determine what ${addon_version_var} should be"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {!${ok}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles BOOL.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cups_headers.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fix-flicker.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mach_machine.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_exists universal] && [variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach arch ${universal_archs_to_use} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file mkdir ${worksrcpath}-${arch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cmd ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Wine requires the program specified in INSTALL to create intermediate
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# directories; /usr/bin/install doesn't.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# http://bugs.winehq.org/show_bug.cgi?id=35310
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.install ${worksrcpath}/tools/install-sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --without-alsa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-capi \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-cms \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-coreaudio \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-cups \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-curses \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-dbus \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-fontconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-freetype \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-gettext \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-gettextpo \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-gphoto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-glu \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-gnutls \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-gsm \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-gstreamer \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-hal \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-jpeg \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-ldap \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-mpg123 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-netapi \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-openal \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-opencl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-opengl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-osmesa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-oss \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-pcap \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-png \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-pthread \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-pulse \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-sane \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-tiff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-udev \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-v4l \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-xcomposite \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-xcursor \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-xinerama \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-xinput \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-xinput2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-xml \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-xrandr \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-xrender \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-xshape \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-xshm \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-xslt \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-xxf86vm \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-zlib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Wine has a native macOS driver since 1.5.26 so X11 is optional
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant x11 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:libGLU \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:mesa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libX11 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXcomposite \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXcursor \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXext \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXi \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXinerama \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXrandr \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXxf86vm \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libsm \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-xorgproto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xrender
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --without-osmesa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-xcomposite \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-xcursor \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-xinerama \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-xinput \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-xrandr \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-xrender \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-xshape \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-xxf86vm \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-osmesa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-xcomposite \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-xcursor \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-xinerama \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-xinput \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-xrandr \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-xrender \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-xshape \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-xxf86vm \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-x \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --x-include=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --x-lib=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} ne "darwin" || (${os.major} >= 9 && ${os.major} <= 17)} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +x11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.universal_args
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set merger_build_args(x86_64) "dlldir=\\\\\${libdir}/wine64"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set merger_destroot_args(x86_64) "dlldir=\\\\\${libdir}/wine64"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set merger_configure_args(x86_64) "--enable-win64 --libdir=${prefix}/lib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set merger_configure_args(i386) --with-wine64=${workpath}/${worksrcdir}-x86_64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${build_arch} eq "x86_64" && ${os.major} < 18} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +universal
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${universal_possible} && [variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- supported_archs i386 x86_64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- supported_archs i386
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# error: Xcode 3.x cannot build 16-bit code correctly
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append {gcc-4.2 < 5600}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# llvm-gcc-4.2 doesn't respect force_align_arg_pointer; wine builds but fails to run
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# http://bugs.winehq.org/show_bug.cgi?id=28030
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append *llvm-gcc-4.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# clang < 3.1 fails to build wine with "error: invalid operand for instruction lretw"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# http://bugs.winehq.org/show_bug.cgi?id=32872
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# clang < 3.2 have code generation problems:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# http://llvm.org/bugs/show_bug.cgi?id=9707
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append {clang < 500}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# FSF GCC cannot compile code using Apple's "blocks" language extensions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append macports-gcc-*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${universal_possible} && [variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # wine for 64-bit requires clang >= 3.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.blacklist-append {clang < 800} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gcc-4.0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gcc-4.2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- apple-gcc-4.2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- macports-clang-3.3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- macports-clang-3.4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- macports-clang-3.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.fallback-append macports-clang-5.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # On macOS, Core Text is used instead of fontconfig since Wine 1.5.10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-delete port:fontconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --with-fontconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --without-fontconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Wine uses the native Security framework on macOS since Wine 1.3.16
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-delete path:lib/pkgconfig/gnutls.pc:gnutls
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --with-gnutls
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --without-gnutls
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Vulkan is supported on macOS through MoltenVK since Wine 3.13, but because
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # it uses Metal it only works on 64-bit, and because it only builds with
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Xcode 9 or later it requires Sierra or later.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} >= 16 && ${universal_possible} && [variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:MoltenVK
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_skip_archcheck-append MoltenVK
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_configure_args(x86_64) --with-vulkan
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_configure_args(i386) --without-vulkan
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --without-vulkan
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 10} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --with-opencl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- notes {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- When using the Mac Driver, it might be useful to enable RetinaMode\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- when you're using a high DPI monitor. To do that, open up Wine's\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Registry Editor:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- wine regedit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- and then navigate to:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [HKEY_CURRENT_USER\Software\Wine\Mac Driver]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- and then set "RetinaMode" to "y". You may also want to adjust your\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DPI under the Graphics tab in winecfg.}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 9} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- known_fail yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- archive_sites
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distfiles
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${name} @${version} requires Mac OS X 10.5 or later."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "incompatible Mac OS X version"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {${os.major} > 17} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- known_fail yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- archive_sites
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distfiles
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${name} cannot be built on macOS 10.14 or later."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "incompatible macOS version"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.endian} eq "big"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- known_fail yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- archive_sites
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distfiles
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${name} can only be used on an Intel Mac or other computer with a little-endian processor."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "incompatible processor"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${destroot}${prefix}/share/wine/gecko
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 -W ${distpath} ${wine_gecko_distfile} ${wine_gecko64_distfile} ${destroot}${prefix}/share/wine/gecko
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${destroot}${prefix}/share/wine/mono
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 ${distpath}/${wine_mono_distfile} ${destroot}${prefix}/share/wine/mono
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set docdir ${prefix}/share/doc/${my_name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ANNOUNCE \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AUTHORS \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COPYING.LIB \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LICENSE \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- README \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${universal_possible} && [variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- notes-append "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- \n
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Wine supports both 32-bit and 64-bit now. It is compatible with your\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- existing 32-bit wine prefix, but it will now default to 64-bit when you\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- create a new wine prefix. The architecture can be selected using the\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WINEARCH environment variable which can be set to either \"win32\" or\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- \"win64\".
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- To create a new pure 32-bit prefix, you can run:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- \$ WINEARCH=win32 WINEPREFIX=~/.wine32 winecfg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- See the Wine FAQ for details: https://wiki.winehq.org/FAQ#Wineprefixes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex {"/announce/([0-9]+\.0(\.[0-9]+)*)"}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/wine/files/BOOL.patch b/x11/wine/files/BOOL.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8fa1b42113e..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/wine/files/BOOL.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,126 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- dlls/gdi32/freetype.c.orig 2012-02-12 23:04:21.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dlls/gdi32/freetype.c 2012-02-12 23:04:58.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -40,6 +40,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <assert.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_CARBON_CARBON_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define BOOL __carbon_BOOL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define LoadResource __carbon_LoadResource
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define CompareString __carbon_CompareString
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define GetCurrentThread __carbon_GetCurrentThread
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -57,6 +58,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define ResizePalette __carbon_ResizePalette
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define SetRectRgn __carbon_SetRectRgn
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <Carbon/Carbon.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#undef BOOL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef LoadResource
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef CompareString
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef GetCurrentThread
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- dlls/windowscodecs/icnsformat.c.orig 2012-02-12 23:54:58.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dlls/windowscodecs/icnsformat.c 2012-02-12 23:55:20.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22,6 +22,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdarg.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define BOOL BOOL_Mac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define GetCurrentProcess GetCurrentProcess_Mac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define GetCurrentThread GetCurrentThread_Mac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define LoadResource LoadResource_Mac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -49,6 +50,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define ShowCursor ShowCursor_Mac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define UnionRect UnionRect_Mac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <ApplicationServices/ApplicationServices.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#undef BOOL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef GetCurrentProcess
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef GetCurrentThread
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef LoadResource
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- dlls/wineqtdecoder/qtdatahandler.c.orig 2012-02-13 00:04:58.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dlls/wineqtdecoder/qtdatahandler.c 2012-02-13 00:05:24.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23,6 +23,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define ULONG CoreFoundation_ULONG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define HRESULT CoreFoundation_HRESULT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define BOOL __carbon_BOOL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define LoadResource __carbon_LoadResource
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define CompareString __carbon_CompareString
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define GetCurrentThread __carbon_GetCurrentThread
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -62,6 +63,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QuickTime/QuickTimeComponents.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#undef BOOL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef LoadResource
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef CompareString
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef GetCurrentThread
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- dlls/wineqtdecoder/qtsplitter.c.orig 2012-02-13 00:19:05.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dlls/wineqtdecoder/qtsplitter.c 2012-02-13 00:19:26.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23,6 +23,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define ULONG CoreFoundation_ULONG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define HRESULT CoreFoundation_HRESULT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define BOOL __carbon_BOOL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define LoadResource __carbon_LoadResource
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define CompareString __carbon_CompareString
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define GetCurrentThread __carbon_GetCurrentThread
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -63,6 +64,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QuickTime/Movies.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QuickTime/QuickTimeComponents.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#undef BOOL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef LoadResource
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef CompareString
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef GetCurrentThread
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- dlls/wineqtdecoder/qtutils.c.orig 2012-02-13 00:31:37.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dlls/wineqtdecoder/qtutils.c 2012-02-13 00:32:14.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23,6 +23,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define ULONG CoreFoundation_ULONG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define HRESULT CoreFoundation_HRESULT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define BOOL __carbon_BOOL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define LoadResource __carbon_LoadResource
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define CompareString __carbon_CompareString
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define GetCurrentThread __carbon_GetCurrentThread
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -62,6 +63,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <CoreVideo/CVPixelBuffer.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#undef BOOL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef LoadResource
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef CompareString
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef GetCurrentThread
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- dlls/wineqtdecoder/qtvdecoder.c.orig 2012-02-13 00:31:42.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dlls/wineqtdecoder/qtvdecoder.c 2012-02-13 00:32:30.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23,6 +23,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define ULONG CoreFoundation_ULONG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define HRESULT CoreFoundation_HRESULT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define BOOL __carbon_BOOL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define LoadResource __carbon_LoadResource
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define CompareString __carbon_CompareString
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define GetCurrentThread __carbon_GetCurrentThread
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -63,6 +64,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QuickTime/ImageCompression.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <CoreVideo/CVPixelBuffer.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#undef BOOL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef LoadResource
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef CompareString
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef GetCurrentThread
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- dlls/dinput/joystick_osx.c.orig 2013-05-25 11:13:00.000000000 +0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dlls/dinput/joystick_osx.c 2013-05-25 11:13:00.000000000 +0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -29,6 +29,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define LONG SInt32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define LPLONG SInt32*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define E_PENDING __carbon_E_PENDING
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define BOOL __carbon_BOOL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define ULONG __carbon_ULONG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define E_INVALIDARG __carbon_E_INVALIDARG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define E_OUTOFMEMORY __carbon_E_OUTOFMEMORY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -52,6 +53,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <IOKit/IOKitLib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <IOKit/hid/IOHIDLib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <ForceFeedback/ForceFeedback.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#undef BOOL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef ULONG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef E_INVALIDARG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef E_OUTOFMEMORY
</span><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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 15dd95800bc..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/wine/files/cups_headers.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- dlls/winspool.drv/info.c.orig 2017-10-20 07:17:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dlls/winspool.drv/info.c 2017-10-21 02:10:21.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -43,6 +43,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <signal.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_CUPS_CUPS_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <cups/cups.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# include <cups/ppd.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_CUPS_PPD_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <cups/ppd.h>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/wine/files/fix-flicker.patch b/x11/wine/files/fix-flicker.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9bdc8746ed1..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/wine/files/fix-flicker.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,84 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Patch to fix flickering in full screen. Patch updated from
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://raw.githubusercontent.com/Homebrew/formula-patches/74c2566/wine/2.14.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# See: https://bugs.winehq.org/show_bug.cgi?id=34166
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- dlls/wined3d/context.c.orig 2019-11-25 09:10:40.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dlls/wined3d/context.c 2020-04-06 05:22:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1647,7 +1647,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* This function takes care of wined3d pixel format selection. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--static int context_choose_pixel_format(const struct wined3d_device *device, HDC hdc,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static int context_choose_pixel_format(const struct wined3d_device *device, const struct wined3d_swapchain *swapchain, HDC hdc,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const struct wined3d_format *color_format, const struct wined3d_format *ds_format,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BOOL auxBuffers)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1655,12 +1655,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unsigned int current_value;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PIXELFORMATDESCRIPTOR pfd;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int iPixelFormat = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ BOOL double_buffer = TRUE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unsigned int i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TRACE("device %p, dc %p, color_format %s, ds_format %s, aux_buffers %#x.\n",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- device, hdc, debug_d3dformat(color_format->id), debug_d3dformat(ds_format->id),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- auxBuffers);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && !swapchain->desc.backbuffer_count)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ double_buffer = FALSE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- current_value = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (i = 0; i < cfg_count; ++i)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1672,7 +1676,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (cfg->iPixelType != WGL_TYPE_RGBA_ARB)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- continue;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* In window mode we need a window drawable format and double buffering. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (!(cfg->windowDrawable && cfg->doubleBuffer))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!cfg->windowDrawable || (double_buffer && !cfg->doubleBuffer))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- continue;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (cfg->redSize < color_format->red_size)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- continue;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1695,17 +1699,19 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * depth it is no problem to emulate 16-bit using e.g. 24-bit, so accept that. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (cfg->depthSize == ds_format->depth_size)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- value += 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (cfg->stencilSize == ds_format->stencil_size)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!cfg->doubleBuffer == !double_buffer)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- value += 2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (cfg->alphaSize == color_format->alpha_size)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (cfg->stencilSize == ds_format->stencil_size)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- value += 4;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (cfg->alphaSize == color_format->alpha_size)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ value += 8;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* We like to have aux buffers in backbuffer mode */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (auxBuffers && cfg->auxBuffers)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- value += 8;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ value += 16;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (cfg->redSize == color_format->red_size
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && cfg->greenSize == color_format->green_size
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && cfg->blueSize == color_format->blue_size)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- value += 16;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ value += 32;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (value > current_value)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1721,7 +1727,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- memset(&pfd, 0, sizeof(pfd));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pfd.nSize = sizeof(pfd);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pfd.nVersion = 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- pfd.dwFlags = PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER | PFD_DRAW_TO_WINDOW;/*PFD_GENERIC_ACCELERATED*/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pfd.dwFlags = PFD_SUPPORT_OPENGL | PFD_DRAW_TO_WINDOW;/*PFD_GENERIC_ACCELERATED*/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (double_buffer)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pfd.dwFlags |= PFD_DOUBLEBUFFER;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pfd.iPixelType = PFD_TYPE_RGBA;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pfd.cAlphaBits = color_format->alpha_size;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pfd.cColorBits = color_format->red_size + color_format->green_size
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2090,7 +2098,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Try to find a pixel format which matches our requirements. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (!(context->pixel_format = context_choose_pixel_format(device,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!(context->pixel_format = context_choose_pixel_format(device, context->swapchain,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- context->hdc, color_format, ds_format, aux_buffers)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return FALSE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/wine/files/mach_machine.patch b/x11/wine/files/mach_machine.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 49f4a0e8dff..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/wine/files/mach_machine.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./dlls/ntdll/nt.c.orig 2012-04-21 23:03:51.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./dlls/ntdll/nt.c 2012-04-21 23:04:14.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -34,7 +34,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <machine/cpu.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_MACH_MACHINE_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define cpu_type_t mach_cpu_type_t
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <mach/machine.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#undef cpu_type_t
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <ctype.h>
</span></pre><pre style='margin:0'>
</pre>