diff --git a/.github/workflows/rolling-release.yml b/.github/workflows/rolling-release.yml index ae75b0a6e..83f8e453a 100644 --- a/.github/workflows/rolling-release.yml +++ b/.github/workflows/rolling-release.yml @@ -146,7 +146,7 @@ jobs: shell: bash run: | sudo apt-get update - sudo apt-get -y install cmake ninja-build ccache libsdl2-dev libgtk2.0-dev qtbase5-dev qtbase5-dev-tools qtbase5-private-dev qt5-default qttools5-dev + sudo apt-get -y install cmake ninja-build ccache libsdl2-dev libgtk-3-dev qtbase5-dev qtbase5-dev-tools qtbase5-private-dev qt5-default qttools5-dev - name: Compile build shell: bash diff --git a/README.md b/README.md index 3959a10f2..e88bbf378 100644 --- a/README.md +++ b/README.md @@ -172,7 +172,8 @@ Requirements: Requirements (Debian/Ubuntu package names): - CMake (`cmake`) - SDL2 (`libsdl2-dev`) - - GTK2.0 for file selector (`libgtk2.0-dev`) + - GTK3.0 for file selector (`libgtk-3-dev`) + - pkgconfig (`pkg-config`) - Qt 5 (`qtbase5-dev`, `qtbase5-private-dev`, `qtbase5-dev-tools`, `qttools5-dev`) - git (`git`) (Note: needed to clone the repository and at build time) - Optional for faster building: Ninja (`ninja-build`) diff --git a/dep/nativefiledialog/CMakeLists.txt b/dep/nativefiledialog/CMakeLists.txt index 1d3d9798f..8e6593b7c 100644 --- a/dep/nativefiledialog/CMakeLists.txt +++ b/dep/nativefiledialog/CMakeLists.txt @@ -14,12 +14,13 @@ if(WIN32) elseif(APPLE) target_sources(nativefiledialog PRIVATE src/nfd_cocoa.m) else() - find_package(GTK2 2.6 COMPONENTS gtk) - if(GTK2_FOUND) + FIND_PACKAGE(PkgConfig REQUIRED) + PKG_CHECK_MODULES(GTK3 REQUIRED gtk+-3.0) + if(GTK3_FOUND) message("Using GTK for nativefiledialog") target_sources(nativefiledialog PRIVATE src/nfd_gtk.c) - target_include_directories(nativefiledialog PRIVATE ${GTK2_INCLUDE_DIRS}) - target_link_libraries(nativefiledialog PRIVATE ${GTK2_LIBRARIES}) + target_include_directories(nativefiledialog PRIVATE ${GTK3_INCLUDE_DIRS}) + target_link_libraries(nativefiledialog PRIVATE ${GTK3_LIBRARIES}) else() message(WARNING "Unknown platform for nativefiledialog") endif()