Release v6.18

This patchset is causing causing an issue with upstream.
Currently disable for release.

https://bugs.winehq.org/show_bug.cgi?id=51777

.github/FUNDING.yml

@@ -0,0 +1,13 @@
+# These are supported funding model platforms
+
+#github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+#patreon: # Replace with a single Patreon username
+#open_collective: # Replace with a single Open Collective username
+#ko_fi: # Replace with a single Ko-fi username
+#tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+#community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+#liberapay: # Replace with a single Liberapay username
+#issuehunt: # Replace with a single IssueHunt username
+#otechie: # Replace with a single Otechie username
+
+patreon: winestaging

.github/workflows/macOS.yml

@@ -0,0 +1,129 @@
+name: MacOS
+
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  wine-staging:
+    runs-on:  macos-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install dependencies
+        run: |
+          brew update
+          brew install --cask xquartz
+          brew install  bison \
+                        faudio \
+                        gphoto2 \
+                        gst-plugins-base \
+                        jxrlib \
+                        little-cms2 \
+                        mingw-w64 \
+                        molten-vk \
+                        mpg123
+
+      - name: Add bison & krb5 to $PATH
+        run: |
+          set -eu
+          echo "$(brew --prefix bison)/bin" >> $GITHUB_PATH
+          echo "$(brew --prefix krb5)/bin" >> $GITHUB_PATH
+
+      - name: Get upstream-commit
+        run: |
+          mkdir $GITHUB_WORKSPACE/wine
+          cd wine
+          git init
+          git fetch git://source.winehq.org/git/wine.git $($GITHUB_WORKSPACE/patches/patchinstall.sh --upstream-commit) --depth=1
+          git checkout $($GITHUB_WORKSPACE/patches/patchinstall.sh --upstream-commit)
+
+      - name: Run patchinstall.sh --all
+        run: |
+          $GITHUB_WORKSPACE/patches/patchinstall.sh DESTDIR=$GITHUB_WORKSPACE/wine --all
+
+      - name: Configure wine64
+        env:
+          LDFLAGS: "-Wl,-rpath,/opt/X11/lib"
+          # Avoid weird linker errors with Xcode 10 and later
+          MACOSX_DEPLOYMENT_TARGET: "10.14"
+        run: |
+          cd $GITHUB_WORKSPACE/wine
+          ./configure   --enable-win64 \
+                        --without-alsa \
+                        --without-capi \
+                        --without-dbus \
+                        --without-inotify \
+                        --without-oss \
+                        --without-pulse \
+                        --without-udev \
+                        --without-v4l2 \
+                        --x-include=/opt/X11/include \
+                        --x-lib=/opt/X11/lib
+
+      - name: Build wine64
+        run: |
+          cd $GITHUB_WORKSPACE/wine
+          make -j$(sysctl -n hw.ncpu 2>/dev/null)
+
+  wine-devel:
+    runs-on:  macos-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install dependencies
+        run: |
+          brew update
+          brew install --cask xquartz
+          brew install  bison \
+                        faudio \
+                        gphoto2 \
+                        gst-plugins-base \
+                        jxrlib \
+                        little-cms2 \
+                        mingw-w64 \
+                        molten-vk \
+                        mpg123
+
+      - name: Add bison & krb5 to $PATH
+        run: |
+          set -eu
+          echo "$(brew --prefix bison)/bin" >> $GITHUB_PATH
+          echo "$(brew --prefix krb5)/bin" >> $GITHUB_PATH
+
+      - name: Get upstream-commit
+        run: |
+          mkdir $GITHUB_WORKSPACE/wine
+          cd wine
+          git init
+          git fetch git://source.winehq.org/git/wine.git $($GITHUB_WORKSPACE/patches/patchinstall.sh --upstream-commit) --depth=1
+          git checkout $($GITHUB_WORKSPACE/patches/patchinstall.sh --upstream-commit)
+
+      - name: Configure wine64
+        env:
+          LDFLAGS: "-Wl,-rpath,/opt/X11/lib"
+          # Avoid weird linker errors with Xcode 10 and later
+          MACOSX_DEPLOYMENT_TARGET: "10.14"
+        run: |
+          cd $GITHUB_WORKSPACE/wine
+
+          cd $GITHUB_WORKSPACE/wine
+          ./configure   --enable-win64 \
+                        --without-alsa \
+                        --without-capi \
+                        --without-dbus \
+                        --without-inotify \
+                        --without-oss \
+                        --without-pulse \
+                        --without-udev \
+                        --without-v4l2 \
+                        --x-include=/opt/X11/include \
+                        --x-lib=/opt/X11/lib
+
+      - name: Build wine64
+        run: |
+          cd $GITHUB_WORKSPACE/wine
+          make -j$(sysctl -n hw.ncpu 2>/dev/null)

.gitignore

@@ -0,0 +1,3 @@
+staging/wine
+*.pyc
+.patchupdate.cache

README.md

@@ -1,22 +1,110 @@
-wine-compholio-daily
-====================
+What is Wine Staging?
+---------------------
 
-Daily updates for the Wine "Compholio" Edition.
+**Wine Staging** is the testing area of winehq.org. It contains bug fixes and
+features, which have not been integrated into the development branch yet. The
+idea of Wine Staging is to provide experimental features faster to end users and
+to give developers the possibility to discuss and improve their patches before
+they are integrated into the main branch. More information about Wine Staging
+can also be found [on the WineHQ wiki](https://wiki.winehq.org/Wine-Staging).
 
-Current patches include:
-* Support for interface change notifications (http://bugs.winehq.org/show_bug.cgi?id=32328)
-* Support for stored file ACLs (http://bugs.winehq.org/show_bug.cgi?id=31858)
-* Support for inherited file ACLs (http://bugs.winehq.org/show_bug.cgi?id=34406)
-* Support for Junction Points (http://bugs.winehq.org/show_bug.cgi?id=12401)
-* Support for TransmitFile (http://bugs.winehq.org/show_bug.cgi?id=5048)
-* Support for GetVolumePathName
-* Implement an Arial replacement font (http://bugs.winehq.org/show_bug.cgi?id=32323)
-* Workaround for TransactNamedPipe not being supported (http://bugs.winehq.org/show_bug.cgi?id=17273)
-* Avoid unloading modules while hook is still active (http://bugs.winehq.org/show_bug.cgi?id=22091)
-* Add missing DBG_PRINTEXCEPTION_C exception in OutputDebugStringA (http://bugs.winehq.org/show_bug.cgi?id=35646)
-* XEMBED support for embedding Wine windows inside Linux applications
-* Reduced SetTimer minimum value from 15 ms to 5 ms (improves Silverlight framerates)
-* Lockfree algorithm for filedescriptor cache (improves file access speed)
-* Workaround for shlwapi URLs with relative paths
-* Support for PulseAudio backend for audio
-* Other Pipelight specific enhancements
+Installation
+------------
+
+Ready-to-use packages for Wine Staging are available for a variety of Linux
+distributions and for Mac OS X. Just follow the [installation
+instructions](https://wiki.winehq.org/Download) for your operating system.
+
+On most distributions the `wine-staging` package is installed to
+`/opt/wine-staging`, such that multiple Wine versions can be installed in
+parallel. If this is the case for your distribution, you will have to type
+`/opt/wine-staging/bin/wine` instead of just `wine`. The same also applies for
+other wine-specific programs like `winecfg`. To learn more about how to use
+Wine Staging, please take a look at the
+[usage instructions](https://wiki.winehq.org/Wine-Staging_Usage).
+
+Building
+--------
+
+Wine Staging is maintained as a set of patches which has to be applied on top of
+the development branch. In order to build Wine Staging, the first step is to
+setup a build environment for Wine, including all required dependencies. A lot
+of information about that is collected in the
+[WineHQ Wiki](http://wiki.winehq.org/BuildingWine).
+
+In order to apply all Wine Staging patches it is recommended to use the
+`patchinstall.sh` utility which takes care of applying all patches in the
+correct order. For reference, the possible commandline arguments are:
+
+```
+Usage: ./patchinstall.sh [DESTDIR=path] [--all] [-W patchset] [patchset ...]
+
+Autogenerated script to apply all Wine Staging patches on your Wine
+source tree.
+
+Configuration:
+  DESTDIR=path         Specify the path to the wine source tree
+  --all                Select all patches
+  --force-autoconf     Run autoreconf and tools/make_requests after each patch
+  --help               Display this help and exit
+  --no-autoconf        Do not run autoreconf and tools/make_requests
+  --no-patchlist       Do not apply patchlist (needed for 'wine --patches')
+  --upstream-commit    Print the upstream Wine commit SHA1 and exit
+  --version            Show version information and exit
+  -W patchset          Exclude a specific patchset
+
+Backends:
+  --backend=patch      Use regular 'patch' utility to apply patches (default)
+  --backend=eapply     Use 'eapply' to apply patches (Gentoo only)
+  --backend=epatch     Use 'epatch' to apply patches (Gentoo only, deprecated)
+  --backend=git-am     Use 'git am' to apply patches
+  --backend=git-apply  Use 'git apply' to apply patches
+  --backend=stg        Import the patches using stacked git
+```
+
+If you want to apply *all* patches with the `patch` utility, the commandline
+should look similar to this:
+```
+./patches/patchinstall.sh DESTDIR="/path/to/wine" --all
+```
+
+Before you proceed with the compilation, please make sure that you installed all
+additional build dependencies required for the Wine Staging features you are
+interested in (check output of `./configure`). More information about building
+Wine Staging, optional build dependencies, and hints for packagers are collected
+in our [Wiki](https://wiki.winehq.org/Wine-Staging).
+
+Contributing
+------------
+
+For information on contributing to Wine-Staging, please see
+<https://wiki.winehq.org/Wine-Staging_Contributing>. Note that GitHub pull
+requests are strongly dispreferred, especially for patches.
+
+Donations
+---------
+
+wine-staging is a large set of experimental patches which provide various
+improvements to WINE, but are not quite suitable for upstreaming. This set of
+patches has been continuously managed for many years by a small group of
+volunteers. The way this works is that we often review patches attached to
+various bug reports found at https://bugs.winehq.org/ which may fix bugs, but
+may not be quite suitable to be upstreamed due to needing some cleanup or more
+proper implementation. In the event that this happens, we add the patches to
+wine-staging instead, and keep them updated and maintained as well as attempt to
+clean them up to be upstreamed. We also both write and verify patches which fix
+various bugs that may not have patches, and in turn allow them run better using
+WINE. This includes testing on various hardware, games, and applications.
+
+Any expenses for applications, games, or hardware which we do not own comes out
+of pocket. In order to alleviate these expenses, we are now accepting donations.
+This in turn allows us to continue to perform testing, provide fixes, and get
+them upstreamed, ultimately aiming to provide a better experience for all WINE
+users. All of our work is provided publicly for free and can be found at
+<https://github.com/wine-staging/wine-staging>. We do not expect to be paid for
+any of the work provided, nor will donators receive any special benefits or
+compensation.
+
+Donations are recieved through Patreon. Anyone interested may donate here:
+
+https://www.patreon.com/winestaging

debian/changelog

@@ -1,205 +0,0 @@
-wine-compholio (1.7.20) unstable; urgency=low
-  * Remove several patches (accepted upstream).
-  * Fix recommendation for odbc and add libgsm1.
-  * Disabled gstreamer (broken with glib >= 2.32.0).
-  * Updated scripts to be compatible with BSD systems.
-  * Update winepulse patches to latest revision (extracted from 1.7.19).
-  * Force autoreconf even when timestamp seems to indicate that it is not necessary.
-  * Added patches for default security descriptor ownership and DACLs for processes.
-  * Added a patch to avoid a race-condition when unloading modules while a hook is active.
-  * Add patch to fix issues with Obsidium copy protection.
- -- Erich E. Hoover <erich.e.hoover@gmail.com>  Sat, 14 Jun 2014 18:15:12 +0200
-
-wine-compholio (1.7.19-1) unstable; urgency=low
-  * Added a patch to fix return value for FSCTL_PIPE_WAIT (required for Unity3D).
-  * Added a patch to stub TokenAppContainerSid in NtQueryInformationToken (required for Unity3D).
-  * Added a patch to optimize the file descriptor cache by using lockfree algorithms.
-  * Add additional checks in XATTR patch to ensure wineserver doesn't crash if data is corrupted.
-  * Add support for extended attributes on FreeBSD systems.
-  * Added a patch to fix ntdll/exception test failures on x86_64.
-  * Allow to change 'strict draw ordering' at runtime.
-  * Add ability to test if all dynamic libraries are installed with "wine --check-libs".
-  * Added a patch to query if direct rendering is enabled via GLX extension.
- -- Sebastian Lackner <sebastian@fds-team.de>  Mon, 02 Jun 2014 23:50:23 +0200
-
-wine-compholio (1.7.19) unstable; urgency=low
-  * Updated SIO_ADDRESS_LIST_CHANGE patches.
- -- Erich E. Hoover <erich.e.hoover@gmail.com>  Tue, 06 May 2014 15:42:32 -0600
-
-wine-compholio (1.7.18-1) unstable; urgency=low
-  * Fix some issues on BSD systems.
-  * Add additional patches to silence a few FIXMEs.
-  * Rebase 02-ACL_Extended_Attributes patches.
- -- Sebastian Lackner <sebastian@fds-team.de>  Tue, 13 May 2014 20:47:23 +0200
-
-wine-compholio (1.7.18) unstable; urgency=low
-  * Updated SetTimer patch (10 ms accepted upstream).
- -- Erich E. Hoover <erich.e.hoover@gmail.com>  Fri, 02 May 2014 13:05:13 -0600
-
-wine-compholio (1.7.17) unstable; urgency=low
-  * Split Arial replacement into two patches.
-  * Removed dynamic unwind patches (accepted upstream).
-  * Removed linguistic casing patches (accepted upstream).
-  * ACL data is now stored in binary instead of converting it to ASCII.
- -- Erich E. Hoover <erich.e.hoover@gmail.com>  Fri, 18 Apr 2014 16:03:57 -0600
-
-wine-compholio (1.7.16-1) unstable; urgency=low
-  * Fix build failure caused by dynamic unwind functions.
-  * Dropped liblcms2-dev dependency for old Ubuntu versions.
- -- Sebastian Lackner <sebastian@fds-team.de>  Sat, 05 Apr 2014 03:48:25 +0200
-
-wine-compholio (1.7.16) unstable; urgency=low
-  * Add stub for RtlInstallFunctionTableCallback.
-  * Further split out the SIO_ADDRESS_LIST_CHANGE patches.
-  * Add proper implementation for dynamic unwind functions, removed stub implementation.
-  * Fix lcms dependency (Wine requires lcms2 instead of lcms1), add build dependency to libsane-dev.
- -- Erich E. Hoover <erich.e.hoover@gmail.com>  Fri, 04 Apr 2014 17:27:52 -0600
-
-wine-compholio (1.7.15-1) unstable; urgency=low
-  * Build 64 bit version of Wine.
-  * First SIO_ADDRESS_LIST_CHANGE patch accepted upstream.
-  * Added stub dll for DirectX Video Acceleration (dxva2.dll).
-  * Update DXVA2 patches (additional implementation details, parts accepted upstream).
- -- Erich E. Hoover <erich.e.hoover@gmail.com>  Tue, 25 Mar 2014 06:08:01 +0100
-
-wine-compholio (1.7.15) unstable; urgency=low
-  * Fixed build dependencies for Debian Sid.
-  * Fixed free() of a const variable (Bug #1).
-  * Removed get_dir_unix_fd (no longer used, fixes compiling with "-Werror").
-  * Removed 'register user administrative tools shell folder' patch (accepted upstream).
- -- Erich E. Hoover <erich.e.hoover@gmail.com>  Sun, 23 Mar 2014 12:53:32 +0100
-
-wine-compholio (1.7.14) unstable; urgency=low
-  * Minor updates to the ACL patches.
-  * Added Liberation Sans (SIL Open Font License) as an Arial replacement.
- -- Erich E. Hoover <erich.e.hoover@gmail.com>  Fri, 07 Mar 2014 13:59:11 -0700
-
-wine-compholio (1.7.13-1) unstable; urgency=low
-  * Fixed a typo in the configure check for extended attributes.
- -- Erich E. Hoover <erich.e.hoover@gmail.com>  Fri, 21 Feb 2014 09:00:00 -0700
-
-wine-compholio (1.7.13) unstable; urgency=low
-  * Added support for inherited file ACLs.
-  * Further separated the file ACL patches.
-  * Updated linguistic casing patches to include tests.
-  * Updated the patch list template to be compatible with 'git am'.
-  * Moved the patching code out of the debian rules into a Makefile.
-  * Removed the named pipe security access patch (accepted upstream).
-  * Explicitly run configure with '--with-xattr' when building debian packages.
-  * Will now fail on configure when '--with-xattr' is passed and xattr.h cannot be found.
- -- Erich E. Hoover <erich.e.hoover@gmail.com>  Thu, 20 Feb 2014 18:48:03 -0700
-
-wine-compholio (1.7.12-1) unstable; urgency=low
-  * Fixed PulseAudio patches to apply with 'git am'.
-  * Fixed PulseAudio driver configure file for upstream Wine 1.7.12.
-  * Fixed PulseAudio driver pthread dependency for upstream Wine 1.7.12.
- -- Erich E. Hoover <erich.e.hoover@gmail.com>  Fri, 07 Feb 2014 17:52:32 -0700
-
-wine-compholio (1.7.12) unstable; urgency=low
-  * Added new patches to support GetVolumePathName.
- -- Erich E. Hoover <erich.e.hoover@gmail.com>  Fri, 07 Feb 2014 14:57:33 -0700
-
-wine-compholio (1.7.11) unstable; urgency=low
-  * Added SRWLock patch.
-  * Added new patches to support TransmitFile.
-  * Added new patches to support Junction Points.
-  * Moved pipelight-specific patches to a separate folder.
-  * Removed SRWLock patch included in upstream Wine 1.7.11.
-  * Reduced SetTimer minimum limitation from 15 ms to 5 ms.
-  * Added support for security access parameters for named pipes.
-  * Added WINE_STRICT_DRAW_ORDERING command line environment variable.
-  * Fixed a path length bug in the ACL inheritance patch (assumed DOS limitation).
-  * Added some workarounds for shlwapi url functions not handling relative paths well.
- -- Erich E. Hoover <erich.e.hoover@gmail.com>  Fri, 17 Jan 2014 12:27:32 -0700
-
-wine-compholio (1.7.10) unstable; urgency=low
-  * Removed monitor enumeration patch included in upstream Wine 1.7.10.
-  * Updated SIO_ADDRESS_LIST_CHANGE patch with latest proposed version.
-  * Added new patch to support linux windowlessmode (required for Qt5 browsers).
- -- Erich E. Hoover <erich.e.hoover@gmail.com>  Fri, 03 Jan 2014 12:19:14 -0700
-
-wine-compholio (1.7.9) unstable; urgency=low
-  * Added a new patch for windowless mode for Qt5 browsers.
- -- Erich E. Hoover <erich.e.hoover@gmail.com>  Fri, 27 Dec 2013 12:03:22 -0700
-
-wine-compholio (1.7.8-1) unstable; urgency=low
-  * Fixed several build problems.
- -- Erich E. Hoover <erich.e.hoover@gmail.com>  Sat, 07 Dec 2013 10:49:03 -0700
-
-wine-compholio (1.7.8) unstable; urgency=low
-  * Added PulseAudio support patches.
-  * Updated SIO_ADDRESS_LIST_CHANGE patches.
-  * Separated out patches into logical subfolders.
-  * Updated XEMBED patch to work with latest upstream Wine.
- -- Erich E. Hoover <erich.e.hoover@gmail.com>  Fri, 06 Dec 2013 13:26:24 -0700
-
-wine-compholio (1.7.7) unstable; urgency=low
-  * Remove patches included in upstream Wine 1.7.7.
-  * Rebase ACL extended attribute patches against upstream Wine 1.7.7.
-  * Rebase SIO_ADDRESS_LIST_CHANGE patches against upstream Wine 1.7.7.
-  * Added the ability to return the list of patches with "wine --patches".
-  * Added a patch to workaround a Silverlight issue with multiple monitors.
- -- Erich E. Hoover <erich.e.hoover@gmail.com>  Fri, 22 Nov 2013 14:24:53 -0700
-
-wine-compholio (1.7.6-1) unstable; urgency=low
-  * Work around a build problem with Wine 1.7.6.
- -- Erich E. Hoover <erich.e.hoover@gmail.com>  Tue, 12 Nov 2013 14:16:16 -0700
-
-wine-compholio (1.7.6) unstable; urgency=low
-  * Rebased VMR7 patches against upstream Wine 1.7.6.
-  * Rebased SIO_ADDRESS_LIST_CHANGE patches against upstream Wine 1.7.6.
- -- Erich E. Hoover <erich.e.hoover@gmail.com>  Sun, 10 Nov 2013 17:26:30 -0700
-
-wine-compholio (1.7.5-1) unstable; urgency=low
-  * Included new patch to fix running TestOut under Silverlight.
- -- Erich E. Hoover <erich.e.hoover@gmail.com>  Thu, 07 Nov 2013 11:18:23 -0700
-
-wine-compholio (1.7.5) unstable; urgency=low
-  * Rebased changes against upstream Wine 1.7.5.
- -- Erich E. Hoover <erich.e.hoover@gmail.com>  Wed, 30 Oct 2013 08:05:51 -0600
-
-wine-compholio (1.7.4-2) unstable; urgency=low
-  * Updated XEmbed patches from Sebastian Lackner.
- -- Erich E. Hoover <erich.e.hoover@gmail.com>  Mon, 28 Oct 2013 10:00:43 -0600
-
-wine-compholio (1.7.4-1) unstable; urgency=low
-  * Fix an issue with Ubuntu 13.10 post-install behavior.
- -- Erich E. Hoover <erich.e.hoover@gmail.com>  Sun, 13 Oct 2013 15:13:48 -0600
-
-wine-compholio (1.7.4) unstable; urgency=low
-  * Rebased changes against upstream Wine 1.7.4.
- -- Erich E. Hoover <erich.e.hoover@gmail.com>  Sat, 12 Oct 2013 13:30:33 -0600
-
-wine-compholio (1.7.3) unstable; urgency=low
-  * Removed patches already included in upstream Wine 1.7.3.
-  * Rebased ACL extended attributes patch against upstream Wine 1.7.3.
-  * Update SIO_ADDRESS_LIST_CHANGE patches to new server-based method.
- -- Erich E. Hoover <erich.e.hoover@gmail.com>  Thu, 03 Oct 2013 15:16:26 -0600
-
-wine-compholio (1.7.2) unstable; urgency=low
-  * Rebased changes against upstream Wine 1.7.2.
- -- Erich E. Hoover <erich.e.hoover@gmail.com>  Mon, 30 Sep 2013 12:21:43 -0600
-
-wine-compholio (1.7.1) unstable; urgency=low
-  * Rebased changes against upstream Wine 1.7.1.
- -- Erich E. Hoover <erich.e.hoover@gmail.com>  Mon, 30 Sep 2013 11:42:34 -0600
-
-wine-compholio (1.7.0-7) unstable; urgency=low
-  * Updated all changed patches and backported upstream commits.
- -- Erich E. Hoover <erich.e.hoover@gmail.com>  Mon, 30 Sep 2013 11:41:43 -0600
-
-wine-compholio (1.7.0-6) unstable; urgency=low
-  * Included fix for Watchever from Andreas Loibl.
- -- Erich E. Hoover <ehoover@mines.edu>  Fri, 06 Sep 2013 16:33:33 -0600
-
-wine-compholio (1.7.0-5) unstable; urgency=low
-  * Updated patches for LOVEFiLM from Sebastian Lackner and Michael Müller.
- -- Erich E. Hoover <ehoover@mines.edu>  Fri, 06 Sep 2013 16:33:33 -0600
-
-wine-compholio (1.7.0-4) unstable; urgency=low
-  * Hopefully fixed build script problem.
- -- Erich E. Hoover <ehoover@mines.edu>  Tue, 27 Aug 2013 09:51:15 -0600
-
-wine-compholio (1.7.0-3) unstable; urgency=low
-  * Added D3D acceleration fix from Michael Müller.
- -- Erich E. Hoover <ehoover@mines.edu>  Fri, 16 Apr 2010 12:20:00 -0600

debian/compat

@@ -1 +0,0 @@
-7

debian/control

@@ -1,268 +0,0 @@
-Source: wine-compholio
-Section: otherosfs
-Priority: optional
-Maintainer: Erich E. Hoover <ehoover@mines.edu>
-XSBC-Original-Maintainer: Scott Ritchie <scottritchie@ubuntu.com>
-Build-Depends: autotools-dev,
-               autoconf,
-               bison,
-               bsdmainutils,
-               coreutils,
-               debhelper (>= 7),
-               docbook-to-man,
-               docbook-utils,
-               docbook-xsl,
-               flex,
-               fontforge,
-               gawk,
-               gcc-4.5 | gcc-4.7 | ubuntu-desktop (<< 1.207),
-               gettext,
-               gzip,
-               libacl1-dev,
-               libasound2-dev,
-               libcapi20-dev,
-               libcups2-dev,
-               libdbus-1-dev,
-               libesd0 | libesd-alsa0,
-               libesd0-dev,
-               libfontconfig1-dev | libfontconfig-dev,
-               libfreetype6-dev,
-               libgl1-mesa-dev | nvidia-glx-dev | fglrx-driver-dev | libgl-dev,
-               libglu1-mesa-dev | libglu-dev,
-               libgnutls-dev,
-               libgphoto2-dev | libgphoto2-6-dev | libgphoto2-2-dev (>= 2.4.6),
-               libgsm1-dev,
-               libice-dev,
-               libjpeg-dev,
-               liblcms2-dev | ubuntu-desktop (<< 1.267),
-               libldap2-dev, libldap-dev,
-               libmpg123-dev,
-               libncurses5-dev | libncurses-dev,
-               libopenal-dev (>= 1:1.12) | ubuntu-desktop (<< 1.207),
-               libpng12-dev,
-               libpulse-dev,
-               libsane-dev,
-               libssl-dev,
-               libstdc++6-4.5-dev | libstdc++-dev,
-               libtiff5-dev | libtiff4-dev | libtiff-dev,
-               libv4l-dev,
-               libx11-dev,
-               libxcomposite-dev,
-               libxcursor-dev,
-               libxext-dev,
-               libxi-dev,
-               libxinerama-dev,
-               libxml2-dev,
-               libxrandr-dev,
-               libxrender-dev,
-               libxslt1-dev,
-               libxt-dev,
-               libxxf86vm-dev,
-               linux-kernel-headers,
-               linux-libc-dev,
-               prelink,
-               quilt (>= 0.46-7~),
-               sharutils,
-               unixodbc-dev,
-               x11proto-xinerama-dev
-Standards-Version: 3.9.2
-
-Package: wine-compholio-i386
-Architecture: i386
-Multi-Arch: foreign
-Pre-Depends: dpkg (>= 1.14.12ubuntu3), ${misc:Pre-Depends}
-Depends:    ${shlibs:Depends},
-            libasound2-plugins,
-            libncurses5
-Recommends: libcapi20-3,
-            libcups2,
-            libdbus-1-3,
-            libfontconfig1 | libfontconfig,
-            libfreetype6,
-            libgnutls26,
-            libgphoto2-6 | libgphoto2-2 (>= 2.4.6),
-            libgphoto2-port10 | libgphoto2-port0 (>= 2.4.6),
-            libjpeg8,
-            libopenal1 (>= 1:1.12),
-            libosmesa6,
-            libpng12-0,
-            libpulse0,
-            libsane,
-            libssl1.0.0,
-            libtiff5 | libtiff4,
-            libv4l-0,
-            libxcomposite1,
-            libxcursor1,
-            libxi6,
-            libxinerama1,
-            libxrandr2,
-            libxrender1,
-            libxslt1.1,
-            libxt6,
-            libxxf86vm1,
-            libodbc1,
-            libgsm1
-Section: otherosfs
-Priority: optional
-Replaces: wine-compholio (<< 1.7.15-1~)
-Breaks: wine-compholio (<< 1.7.15-1~)
-Description: The Compholio Edition is a special build of the popular Wine software
- with patches representing my current staging tree for Wine.
- Currently these patches fix:
-  * Netflix on Firefox hangs with loading bar at 100% (Bug 31993).
-  * Netflix on Firefox fails with Internet Connection Problem when loading bar is
- at 99% (Bug 31858).
- .
- Microsoft Windows Compatibility Layer (Binary Emulator and Library)
- Wine is a compatibility layer for running Windows applications on Linux.
- Applications are run at full speed without the need of cpu emulation. Wine
- does not require Microsoft Windows, however it can use native system dll
- files in place of its own if they are available.
- .
- This package provides support for loading 32-bit x86 Windows applications
- .
- This package is based on a recent Wine beta.  While many more applications will
- work, there may be some loss of functionality compared with the stable release
- provided by the regular wine package.
-
-Package: wine-compholio-amd64
-Architecture: amd64
-Multi-Arch: foreign
-Pre-Depends: dpkg (>= 1.14.12ubuntu3), ${misc:Pre-Depends}
-Depends:    ${shlibs:Depends},
-            libasound2-plugins,
-            libncurses5
-Recommends: libcapi20-3,
-            libcups2,
-            libdbus-1-3,
-            libfontconfig1 | libfontconfig,
-            libfreetype6,
-            libgnutls26,
-            libgphoto2-6 | libgphoto2-2 (>= 2.4.6),
-            libgphoto2-port10 | libgphoto2-port0 (>= 2.4.6),
-            libjpeg8,
-            libopenal1 (>= 1:1.12),
-            libosmesa6,
-            libpng12-0,
-            libpulse0,
-            libsane,
-            libssl1.0.0,
-            libtiff5 | libtiff4,
-            libv4l-0,
-            libxcomposite1,
-            libxcursor1,
-            libxi6,
-            libxinerama1,
-            libxrandr2,
-            libxrender1,
-            libxslt1.1,
-            libxt6,
-            libxxf86vm1,
-            libodbc1,
-            libgsm1
-Section: otherosfs
-Priority: optional
-Replaces: wine-compholio (<< 1.7.15-1~)
-Breaks: wine-compholio (<< 1.7.15-1~)
-Description: The Compholio Edition is a special build of the popular Wine software
- with patches representing my current staging tree for Wine.
- Currently these patches fix:
-  * Netflix on Firefox hangs with loading bar at 100% (Bug 31993).
-  * Netflix on Firefox fails with Internet Connection Problem when loading bar is
- at 99% (Bug 31858).
- .
- Microsoft Windows Compatibility Layer (Binary Emulator and Library)
- Wine is a compatibility layer for running Windows applications on Linux.
- Applications are run at full speed without the need of cpu emulation. Wine
- does not require Microsoft Windows, however it can use native system dll
- files in place of its own if they are available.
- .
- This package provides support for loading 64-bit x86 Windows applications
- .
- This package is based on a recent Wine beta.  While many more applications will
- work, there may be some loss of functionality compared with the stable release
- provided by the regular wine package.
-
-Package: wine-compholio
-Architecture: i386 amd64
-Multi-Arch: foreign
-Pre-Depends: dpkg (>= 1.14.12ubuntu3), ${misc:Pre-Depends}
-Depends:    ${misc:Depends}, ${shlibs:Depends},
-            wine-compholio-i386  (= ${binary:Version}) [i386 amd64],
-            wine-compholio-amd64 (= ${binary:Version}) [amd64],
-Section: otherosfs
-Priority: optional
-Description: The Compholio Edition is a special build of the popular Wine software
- with patches representing my current staging tree for Wine.
- Currently these patches fix:
-  * Netflix on Firefox hangs with loading bar at 100% (Bug 31993).
-  * Netflix on Firefox fails with Internet Connection Problem when loading bar is
- at 99% (Bug 31858).
- .
- Microsoft Windows Compatibility Layer (Binary Emulator and Library)
- Wine is a compatibility layer for running Windows applications on Linux.
- Applications are run at full speed without the need of cpu emulation. Wine
- does not require Microsoft Windows, however it can use native system dll
- files in place of its own if they are available.
- .
- This package includes a program loader for running unmodified Windows executables
- as well as the Wine project's free version of the Windows API for running programs
- ported from Windows.
- .
- This package is based on a recent Wine beta.  While many more applications will
- work, there may be some loss of functionality compared with the stable release
- provided by the regular wine package.
-
-Package: wine-compholio-dev
-Architecture: i386 amd64
-Pre-Depends: dpkg (>= 1.14.12ubuntu3), ${misc:Pre-Depends}
-Depends:    libc6-dev,
-            ${shlibs:Depends},
-            wine-compholio-i386  (= ${binary:Version}) [i386 amd64],
-            wine-compholio-amd64 (= ${binary:Version}) [amd64],
-Section: libdevel
-Priority: optional
-Replaces: wine-compholio (<< 1.7.15-1~)
-Breaks: wine-compholio (<< 1.7.15-1~)
-Description: The Compholio Edition is a special build of the popular Wine software
- with patches representing my current staging tree for Wine.
- Currently these patches fix:
-  * Netflix on Firefox hangs with loading bar at 100% (Bug 31993).
-  * Netflix on Firefox fails with Internet Connection Problem when loading bar is
- at 99% (Bug 31858).
- .
- Microsoft Windows Compatibility Layer (Binary Emulator and Library)
- Wine is a compatibility layer for running Windows applications on Linux.
- Applications are run at full speed without the need of cpu emulation. Wine
- does not require Microsoft Windows, however it can use native system dll
- files in place of its own if they are available.
- .
- This package consists of the development files needed to compile programs
- using wine's free version of the Microsoft Windows API.
-
-Package: wine-compholio-dbg
-Architecture: i386 amd64
-Multi-Arch: same
-Pre-Depends: dpkg (>= 1.14.12ubuntu3), ${misc:Pre-Depends}
-Depends:    ${shlibs:Depends},
-            wine-compholio-i386  (= ${binary:Version}) [i386 amd64],
-            wine-compholio-amd64 (= ${binary:Version}) [amd64],
-Section: debug
-Priority: optional
-Replaces: wine-compholio (<< 1.7.15-1~)
-Breaks: wine-compholio (<< 1.7.15-1~)
-Description: The Compholio Edition is a special build of the popular Wine software
- with patches representing my current staging tree for Wine.
- Currently these patches fix:
-  * Netflix on Firefox hangs with loading bar at 100% (Bug 31993).
-  * Netflix on Firefox fails with Internet Connection Problem when loading bar is
- at 99% (Bug 31858).
- .
- Microsoft Windows Compatibility Layer (Binary Emulator and Library)
- Wine is a compatibility layer for running Windows applications on Linux.
- Applications are run at full speed without the need of cpu emulation. Wine
- does not require Microsoft Windows, however it can use native system dll
- files in place of its own if they are available.
- .
- This package includes debugging symbols useful for reporting crashes and other
- failures.

debian/postinst

@@ -1,23 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = "upgrade" ] ; then
-	if ps -C wineserver > /dev/null && test -d /var/lib/update-notifier/user.d/ ; then
-		cp -f /usr/share/wine/wineserver-restart-required.update-notifier /var/lib/update-notifier/user.d/wineserver-restart-required
-	fi
-fi
-
-service procps start || /etc/init.d/procps restart
-
-# Automatically added by dh_installmime
-if [ "$1" = "configure" ] && [ -x "`which update-mime 2>/dev/null`" ]; then
-	update-mime
-fi
-# End automatically added section
-# Automatically added by dh_makeshlibs
-if [ "$1" = "configure" ]; then
-	ldconfig
-fi
-# End automatically added section
-
-
-

debian/postrm

@@ -1,10 +0,0 @@
-#!/bin/sh
-set -e
-# Automatically added by dh_installmime
-if which update-mime >/dev/null 2>&1; then update-mime; fi
-# End automatically added section
-# Automatically added by dh_makeshlibs
-if [ "$1" = "remove" ]; then
-	ldconfig
-fi
-# End automatically added section

debian/prerm

@@ -1,9 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = "remove" ] ; then
-  if [ -x /usr/sbin/update-binfmts ]; then
-    /usr/sbin/update-binfmts --package wine --remove wine /usr/bin/wine || true
-  fi
-fi
-
-

debian/rules

@@ -1,46 +0,0 @@
-#!/usr/bin/make -f
-
-# Use gcc-4.5 if it's available
-ifeq ($(shell which gcc-4.5),)
-	CC = gcc
-else
-	CC = gcc-4.5
-endif
-
-%:
-	dh $@ --parallel
-
-override_dh_auto_configure:
-
-	# Apply our patches, reconfigure, and update the wineserver protocol request data
-	make -C "$(CURDIR)/patches/" DESTDIR="$(CURDIR)" install
-
-ifeq ($(DEB_BUILD_ARCH), amd64)
-	./configure --prefix=/opt/wine-compholio --libdir=\$${prefix}/lib64 --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-win64 --without-gstreamer --with-xattr $(CONFFLAGS)
-else
-	./configure --prefix=/opt/wine-compholio --libdir=\$${prefix}/lib --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --without-gstreamer --with-xattr $(CONFFLAGS)
-endif
-
-override_dh_auto_test:
-	# Wine's test suite does not pass on build daemons, skip it for now
-
-override_dh_installdocs:
-	dh_installdocs --link-doc=wine-compholio
-
-override_dh_install:
-	dh_install --fail-missing
-	# These files will end up in multiple packages otherwise
-	rm -f debian/wine-compholio/opt/wine-compholio/bin/wine
-	rm -f debian/wine-compholio/opt/wine-compholio/bin/wine-preloader
-	rm -f debian/wine-compholio/opt/wine-compholio/bin/wine64
-	rm -f debian/wine-compholio/opt/wine-compholio/bin/wine64-preloader
-
-override_dh_strip:
-	dh_strip -Xwine-pthread -Xwine-kthread --dbg-package=wine-compholio-dbg
-
-override_dh_shlibdeps:
-ifeq ($(DEB_HOST_ARCH),amd64)
-	dh_shlibdeps -l $(CURDIR)/debian/tmp/opt/wine-compholio/lib64/
-else
-	dh_shlibdeps -l $(CURDIR)/debian/tmp/opt/wine-compholio/lib/
-endif

debian/tools/generate-patchlist.sh

@@ -1,89 +0,0 @@
-#!/bin/sh
-PATCH_DATA="";
-
-for FILE in patches/*/*.def; do
-	UUID=$(echo "${FILE}" | sed -e 's|^.*/||g' -e 's|\.def$||g');
-	REVISION=$(cat "${FILE}" | sed -n 's|Revision: \(.*\)|\1|p');
-	AUTHOR=$(cat "${FILE}" | sed -n 's|Author: \(.*\)|\1|p');
-	TITLE=$(cat "${FILE}" | sed -n 's|Title: \(.*\)|\1|p');
-	if [ "${AUTHOR}" = "" ] && [ "${TITLE}" = "" ]; then
-		continue;
-	fi
-	if [ "${PATCH_DATA}" != "" ]; then
-		PATCH_DATA="${PATCH_DATA}
-";
-	fi
-	PATCH_DATA="${PATCH_DATA}+    { \"${UUID}:${REVISION}\", \"${AUTHOR}\", \"${TITLE}\" },";
-done
-
-PATCH_LINES=$(echo "${PATCH_DATA}" | wc -l);
-PATCH_LINES=$((${PATCH_LINES}+20));
-
-cat <<EOF
-From: "FDS-Team" <webmaster@fds-team.de>
-Subject: Autogenerated patch list.
-
----
-diff --git a/libs/wine/config.c b/libs/wine/config.c
-index a273502..5fa0cd5 100644
---- a/libs/wine/config.c
-+++ b/libs/wine/config.c
-@@ -478,6 +478,${PATCH_LINES} @@ const char *wine_get_version(void)
-     return PACKAGE_VERSION;
- }
- 
-+struct wine_patch {
-+    const char *hash;
-+    const char *author;
-+    const char *title;
-+} wine_patch_data[] = {
-${PATCH_DATA}
-+    { NULL, NULL, NULL }
-+};
-+
-+/* return the applied non-standard patches */
-+const void * wine_get_patches(void)
-+{
-+    return &wine_patch_data[0];
-+}
-+
- /* return the build id string */
- const char *wine_get_build_id(void)
- {
-diff --git a/libs/wine/wine.def b/libs/wine/wine.def
-index ed315bd..5b42029 100644
---- a/libs/wine/wine.def
-+++ b/libs/wine/wine.def
-@@ -83,6 +83,7 @@ EXPORTS
-     wine_get_sortkey
-     wine_get_user_name
-     wine_get_version
-+    wine_get_patches
-     wine_init
-     wine_init_argv0_path
-     wine_is_dbcs_leadbyte
-diff --git a/libs/wine/wine.map b/libs/wine/wine.map
-index 2159fac..7cb2918 100644
---- a/libs/wine/wine.map
-+++ b/libs/wine/wine.map
-@@ -90,6 +90,7 @@ WINE_1.0
-     wine_get_ss;
-     wine_get_user_name;
-     wine_get_version;
-+    wine_get_patches;
-     wine_init;
-     wine_init_argv0_path;
-     wine_is_dbcs_leadbyte;
-diff --git a/include/wine/library.h b/include/wine/library.h
-index 242bb69..aa9e585 100644
---- a/include/wine/library.h
-+++ b/include/wine/library.h
-@@ -43,6 +43,7 @@ extern const char *wine_get_data_dir(void);
- extern const char *wine_get_server_dir(void);
- extern const char *wine_get_user_name(void);
- extern const char *wine_get_version(void);
-+extern const void *wine_get_patches(void);
- extern const char *wine_get_build_id(void);
- extern void wine_init_argv0_path( const char *argv0 );
- extern void wine_exec_wine_binary( const char *name, char **argv, const char *env_var );
-EOF

debian/wine-compholio-amd64.install

@@ -1,4 +0,0 @@
-/opt/wine-compholio/lib64/libwine.so*
-/opt/wine-compholio/lib64/wine
-/opt/wine-compholio/bin/wine64
-/opt/wine-compholio/bin/wine64-preloader

debian/wine-compholio-dev.install

@@ -1 +0,0 @@
-/opt/wine-compholio/include

debian/wine-compholio-i386.install

@@ -1,4 +0,0 @@
-/opt/wine-compholio/lib/libwine.so*
-/opt/wine-compholio/lib/wine
-/opt/wine-compholio/bin/wine
-/opt/wine-compholio/bin/wine-preloader

debian/wine-compholio.docs

@@ -1,4 +0,0 @@
-documentation/README.*
-ANNOUNCE
-AUTHORS
-README