From 5dcd2b1fc3fdbd141458e96a15178de838320452 Mon Sep 17 00:00:00 2001 From: hahahahbenny <1292983376@qq.com> Date: Tue, 22 Oct 2024 16:48:46 +0800 Subject: [PATCH] add link_directories to gtk3_cmake.patch --- packages/w/wxwidgets/patches/3.2.5/gtk3_cmake.patch | 8 ++++++-- packages/w/wxwidgets/xmake.lua | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/w/wxwidgets/patches/3.2.5/gtk3_cmake.patch b/packages/w/wxwidgets/patches/3.2.5/gtk3_cmake.patch index 44ecad3247f..1e0f9a272f8 100644 --- a/packages/w/wxwidgets/patches/3.2.5/gtk3_cmake.patch +++ b/packages/w/wxwidgets/patches/3.2.5/gtk3_cmake.patch @@ -1,5 +1,5 @@ diff --git a/build/cmake/modules/FindGTK3.cmake b/build/cmake/modules/FindGTK3.cmake -index d2939a1..1fb0e25 100644 +index d2939a1..b8f5fab 100644 --- a/build/cmake/modules/FindGTK3.cmake +++ b/build/cmake/modules/FindGTK3.cmake @@ -29,7 +29,7 @@ @@ -11,7 +11,11 @@ index d2939a1..1fb0e25 100644 set(VERSION_OK TRUE) if (GTK3_VERSION) if (GTK3_FIND_VERSION_EXACT) -@@ -48,6 +48,6 @@ set(CMAKE_REQUIRED_INCLUDES ${GTK3_INCLUDE_DIRS}) +@@ -45,9 +45,10 @@ endif () + # Check for GDK Wayland support + include(CheckSymbolExists) + set(CMAKE_REQUIRED_INCLUDES ${GTK3_INCLUDE_DIRS}) ++link_directories(${GTK3_LIBRARY_DIRS}) check_symbol_exists(GDK_WINDOWING_WAYLAND "gdk/gdk.h" wxHAVE_GDK_WAYLAND) check_symbol_exists(GDK_WINDOWING_X11 "gdk/gdk.h" wxHAVE_GDK_X11) include(FindPackageHandleStandardArgs) diff --git a/packages/w/wxwidgets/xmake.lua b/packages/w/wxwidgets/xmake.lua index fce58264cc2..8c17b034f3d 100644 --- a/packages/w/wxwidgets/xmake.lua +++ b/packages/w/wxwidgets/xmake.lua @@ -69,7 +69,7 @@ package("wxwidgets") add_deps("libjpeg", "libpng", "nanosvg", "expat", "zlib", "pango", "glib") if is_plat("linux") then add_deps("opengl", "at-spi2-core") - add_patches("3.2.5", "patches/3.2.5/gtk3_cmake.patch", "39f9a47c0136369d6a68af554496d8d1a154be87f59fa8c07746f0a8794a9932") + add_patches("3.2.5", "patches/3.2.5/gtk3_cmake.patch", "70a5d13d6839d851a4b6d60e0f0b1c5c7624f1c738cee21db2c8ccf030e151bc") end end