From b4d8b2f64f4425d5a93011f97c0a7f0a7563447a Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Thu, 8 May 2025 12:14:47 +1000 Subject: [PATCH] Rebase against d8a271c053bb23171355854d7af155b3bda7e8a9. --- patches/shell32-ACE_Viewer/definition | 1 + patches/shell32-Progress_Dialog/definition | 1 + staging/upstream-commit | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/patches/shell32-ACE_Viewer/definition b/patches/shell32-ACE_Viewer/definition index 04a44434..9c0290e2 100644 --- a/patches/shell32-ACE_Viewer/definition +++ b/patches/shell32-ACE_Viewer/definition @@ -1,2 +1,3 @@ Fixes: Implement a basic security property tab Depends: shell32-Progress_Dialog +Disabled: True diff --git a/patches/shell32-Progress_Dialog/definition b/patches/shell32-Progress_Dialog/definition index d3238760..feebfebd 100644 --- a/patches/shell32-Progress_Dialog/definition +++ b/patches/shell32-Progress_Dialog/definition @@ -1,2 +1,3 @@ Fixes: Support for shell32 file operation progress dialog Depends: kernel32-CopyFileEx +Disabled: True diff --git a/staging/upstream-commit b/staging/upstream-commit index 3b5bc04d..76c46e6a 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -226a7eeabbc13345e49da1ff8c018d6f06211c66 +d8a271c053bb23171355854d7af155b3bda7e8a9