From ccdf3d98ff569aa8c553aa24e760da8663fc5c63 Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Wed, 18 Sep 2019 20:35:15 -0500 Subject: [PATCH] uxtheme-GTK_Theming: Depend on uxtheme-CloseThemeClass. --- patches/patchinstall.sh | 10 ++++++++++ patches/uxtheme-GTK_Theming/definition | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 5723b348..42935a65 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -1642,6 +1642,13 @@ if test "$enable_windowscodecs_TIFF_Support" -eq 1; then enable_windowscodecs_GIF_Encoder=1 fi +if test "$enable_uxtheme_GTK_Theming" -eq 1; then + if test "$enable_uxtheme_CloseThemeClass" -gt 1; then + abort "Patchset uxtheme-CloseThemeClass disabled, but uxtheme-GTK_Theming depends on that." + fi + enable_uxtheme_CloseThemeClass=1 +fi + if test "$enable_stdole32_tlb_SLTG_Typelib" -eq 1; then if test "$enable_widl_SLTG_Typelib_Support" -gt 1; then abort "Patchset widl-SLTG_Typelib_Support disabled, but stdole32.tlb-SLTG_Typelib depends on that." @@ -6376,6 +6383,9 @@ fi # Patchset uxtheme-GTK_Theming # | +# | This patchset has the following (direct or indirect) dependencies: +# | * uxtheme-CloseThemeClass +# | # | Modified files: # | * configure.ac, dlls/uxtheme/Makefile.in, dlls/uxtheme/buffer.c, dlls/uxtheme/draw.c, dlls/uxtheme/gtk-button.c, # | dlls/uxtheme/gtk-combobox.c, dlls/uxtheme/gtk-edit.c, dlls/uxtheme/gtk-header.c, dlls/uxtheme/gtk-listbox.c, diff --git a/patches/uxtheme-GTK_Theming/definition b/patches/uxtheme-GTK_Theming/definition index ad66ec1b..c9910c72 100644 --- a/patches/uxtheme-GTK_Theming/definition +++ b/patches/uxtheme-GTK_Theming/definition @@ -1,4 +1,4 @@ # based on https://github.com/akulinchev/uxthemegtk # sha1: ecbca8e848834180092d9078be0762a60617fcd7 - +Depends: uxtheme-CloseThemeClass Fixes: Add support for GTK3 theming