From 8fc0710def8831a402b2f703a37b455e06a64986 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Fri, 19 Apr 2024 07:51:57 +1000 Subject: [PATCH] Rebase against b87589757b82b36a8a58ca26f6dcabb550826ceb. --- .../0001-winemac.drv-No-Flicker-patch.patch | 18 +++++++++--------- staging/upstream-commit | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/patches/winemac.drv-no-flicker-patch/0001-winemac.drv-No-Flicker-patch.patch b/patches/winemac.drv-no-flicker-patch/0001-winemac.drv-No-Flicker-patch.patch index e67b786d..8e44036a 100644 --- a/patches/winemac.drv-no-flicker-patch/0001-winemac.drv-No-Flicker-patch.patch +++ b/patches/winemac.drv-no-flicker-patch/0001-winemac.drv-No-Flicker-patch.patch @@ -1,4 +1,4 @@ -From 2bb3073bab5575a0a346ed25cde1a52da6f70a36 Mon Sep 17 00:00:00 2001 +From 19d54067c5e9a44b4f4f319cd61232665f7fb01a Mon Sep 17 00:00:00 2001 From: Ken Thomases Date: Tue, 22 Jun 2021 07:56:43 +1000 Subject: [PATCH] winemac.drv: No Flicker patch @@ -10,7 +10,7 @@ Subject: [PATCH] winemac.drv: No Flicker patch 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h -index a1cdcc76ebc..14db3930474 100644 +index f5793006c35..0aa4d651d70 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -44,6 +44,7 @@ @@ -22,20 +22,20 @@ index a1cdcc76ebc..14db3930474 100644 extern const char* debugstr_cf(CFTypeRef t); diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c -index b40bf02f267..bc630305175 100644 +index acfad65ea81..aff0181e253 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c -@@ -60,6 +60,7 @@ int use_precise_scrolling = TRUE; - int gl_surface_mode = GL_SURFACE_IN_FRONT_OPAQUE; +@@ -61,6 +61,7 @@ int gl_surface_mode = GL_SURFACE_IN_FRONT_OPAQUE; int retina_enabled = FALSE; int enable_app_nap = FALSE; + int eager_dock_icon_hiding = TRUE; +BOOL force_backing_store = FALSE; CFDictionaryRef localized_strings; -@@ -378,6 +379,9 @@ static void setup_options(void) - if (!get_config_key(hkey, appkey, "EnableAppNap", buffer, sizeof(buffer))) - enable_app_nap = IS_OPTION_TRUE(buffer[0]); +@@ -382,6 +383,9 @@ static void setup_options(void) + if (!get_config_key(hkey, appkey, "EagerDockIconHiding", buffer, sizeof(buffer))) + eager_dock_icon_hiding = IS_OPTION_TRUE(buffer[0]); + if (!get_config_key(hkey, appkey, "ForceOpenGLBackingStore", buffer, sizeof(buffer))) + force_backing_store = IS_OPTION_TRUE(buffer[0]); @@ -57,5 +57,5 @@ index f78454ed149..205c0816d44 100644 if (core) -- -2.42.0 +2.43.0 diff --git a/staging/upstream-commit b/staging/upstream-commit index 96cef560..f25e2e66 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -04b829e81b3da1e98964dee4df0be4c876745f00 +b87589757b82b36a8a58ca26f6dcabb550826ceb