Skip to content

Commit

Permalink
add gtk_cmake.patch
Browse files Browse the repository at this point in the history
  • Loading branch information
hahahahbenny committed Oct 22, 2024
1 parent 94f22b2 commit 1b9d3a6
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 0 deletions.
22 changes: 22 additions & 0 deletions packages/w/wxwidgets/patches/3.2.5/gtk3_cmake.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
diff --git a/build/cmake/modules/FindGTK3.cmake b/build/cmake/modules/FindGTK3.cmake
index d2939a1..1fb0e25 100644
--- a/build/cmake/modules/FindGTK3.cmake
+++ b/build/cmake/modules/FindGTK3.cmake
@@ -29,7 +29,7 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
find_package(PkgConfig)
-pkg_check_modules(GTK3 QUIET gtk+-3.0)
+pkg_check_modules(GTK3 REQUIRED IMPORTED_TARGET gtk+-3.0)
set(VERSION_OK TRUE)
if (GTK3_VERSION)
if (GTK3_FIND_VERSION_EXACT)
@@ -48,6 +48,6 @@ set(CMAKE_REQUIRED_INCLUDES ${GTK3_INCLUDE_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)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTK3 DEFAULT_MSG GTK3_INCLUDE_DIRS GTK3_LIBRARIES VERSION_OK)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTK3 DEFAULT_MSG GTK3_INCLUDE_DIRS GTK3_LIBRARY_DIRS GTK3_LIBRARIES VERSION_OK)

-mark_as_advanced(GTK3_INCLUDE_DIRS GTK3_LIBRARIES)
+mark_as_advanced(GTK3_INCLUDE_DIRS GTK3_LIBRARY_DIRS GTK3_LIBRARIES)
1 change: 1 addition & 0 deletions packages/w/wxwidgets/xmake.lua
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +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")
end
end

Expand Down

0 comments on commit 1b9d3a6

Please sign in to comment.