diff --git a/patches/07-quartz/0001-quartz-Return-increasing-monitor-GUID-on-VMR7-monito.patch b/patches/07-quartz/0001-quartz-Return-increasing-monitor-GUID-on-VMR7-monito.patch deleted file mode 100644 index 6b32f6b1..00000000 --- a/patches/07-quartz/0001-quartz-Return-increasing-monitor-GUID-on-VMR7-monito.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a1599a4f45a76a1c1d771e52660c0cdf7e6e19d5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Tue, 31 Dec 2013 03:23:19 +0100 -Subject: quartz: Return increasing monitor GUID on VMR7 monitor enumeration - ---- - dlls/quartz/vmr9.c | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c -index 31f3f8e..53e4942 100644 ---- a/dlls/quartz/vmr9.c -+++ b/dlls/quartz/vmr9.c -@@ -1314,7 +1314,14 @@ static BOOL CALLBACK get_available_monitors_proc(HMONITOR hmon, HDC hdc, LPRECT - VMRMONITORINFO *info = args->info7++; - memset(info, 0, sizeof(*info)); - -- info->guid.pGUID = NULL; /* FIXME */ -+ if (args->numdev > 0) -+ { -+ info->guid.pGUID = &info->guid.GUID; -+ info->guid.GUID.Data4[7] = args->numdev; -+ } -+ else -+ info->guid.pGUID = NULL; -+ - CopyRect(&info->rcMonitor, &mi.rcMonitor); - info->hMon = hmon; - info->dwFlags = mi.dwFlags; --- -1.8.3.2 - diff --git a/patches/07-quartz/31d0e44f-a65b-44c3-a7cc-ab67b4ebaa73.def b/patches/07-quartz/31d0e44f-a65b-44c3-a7cc-ab67b4ebaa73.def deleted file mode 100644 index a71d930e..00000000 --- a/patches/07-quartz/31d0e44f-a65b-44c3-a7cc-ab67b4ebaa73.def +++ /dev/null @@ -1,3 +0,0 @@ -Revision: 1 -Author: Michael Müller -Title: Return increasing monitor GUID on VMR7 monitor enumeration. diff --git a/patches/patch-list.patch b/patches/patch-list.patch index bdcab034..c2d914a6 100644 --- a/patches/patch-list.patch +++ b/patches/patch-list.patch @@ -33,7 +33,7 @@ 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,30 @@ const char *wine_get_version(void) +@@ -478,6 +478,29 @@ const char *wine_get_version(void) return PACKAGE_VERSION; } @@ -50,7 +50,6 @@ index a273502..5fa0cd5 100644 + { "94186fff-6dbf-44d0-8eb1-2463d1608a0f:1", "Sebastian Lackner", "Update gl_drawable for embedded windows." }, + { "cbe240e8-2c58-430a-b61c-7fbb9d0e1e11:1", "Sebastian Lackner", "Change return value of stub SetNamedPipeHandleState to TRUE." }, + { "00273da7-72f8-4025-9e96-0c2bc95dacdb:1", "Maarten Lankhorst", "Winepulse patches extracted from https://launchpad.net/~mlankhorst/+archive/ppa/+files/wine1.7_1.7.7-0ubuntu2~saucy1.debian.tar.gz." }, -+ { "31d0e44f-a65b-44c3-a7cc-ab67b4ebaa73:1", "Michael Müller", "Return increasing monitor GUID on VMR7 monitor enumeration." }, + { "eec5dea8-879d-417b-9f97-364deaae6576:1", "Sebastian Lackner", "Add tests for IVMRMonitorConfig." }, + { NULL, NULL, NULL } +};