diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b1045f465..37fe0e645 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -285,10 +285,11 @@ jobs: -DCMAKE_C_COMPILER_LAUNCHER=ccache \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DIMHEX_PATTERNS_PULL_MASTER=ON \ - -DIMHEX_COMMIT_HASH_SHORT="${{env.COMMIT_SHA_SHORT}}" \ - -DIMHEX_COMMIT_HASH_LONG="${{env.COMMIT_SHA_LONG}}" \ - -DIMHEX_COMMIT_BRANCH="${{env.COMMIT_BRANCH}}" \ - -DIMHEX_ENABLE_LTO=ON \ + -DIMHEX_COMMIT_HASH_SHORT="${{ env.COMMIT_SHA_SHORT }}" \ + -DIMHEX_COMMIT_HASH_LONG="${{ env.COMMIT_SHA_LONG}}" \ + -DIMHEX_COMMIT_BRANCH="${{ env.COMMIT_BRANCH }}" \ + -DIMHEX_ENABLE_LTO=ON \ + -DIMHEX_USE_GTK_FILE_PICKER=ON \ .. DESTDIR=DebDir ninja install @@ -443,7 +444,8 @@ jobs: -DIMHEX_COMMIT_HASH_SHORT="${GITHUB_SHA::7}" \ -DIMHEX_COMMIT_HASH_LONG="${GITHUB_SHA}" \ -DIMHEX_COMMIT_BRANCH="${GITHUB_REF##*/}" \ - -DIMHEX_ENABLE_LTO=ON \ + -DIMHEX_ENABLE_LTO=ON \ + -DIMHEX_USE_GTK_FILE_PICKER=ON \ .. DESTDIR=installDir ninja install diff --git a/dist/get_deps_archlinux.sh b/dist/get_deps_archlinux.sh index 71135af22..dbd14b73b 100755 --- a/dist/get_deps_archlinux.sh +++ b/dist/get_deps_archlinux.sh @@ -9,7 +9,7 @@ pacman -S $@ --needed \ mbedtls \ freetype2 \ dbus \ - xdg-desktop-portal \ + gtk3 \ curl \ fmt \ yara \ diff --git a/dist/get_deps_debian.sh b/dist/get_deps_debian.sh index 548dbf765..0686eed8d 100755 --- a/dist/get_deps_debian.sh +++ b/dist/get_deps_debian.sh @@ -21,5 +21,5 @@ apt install -y \ libfreetype-dev \ libdbus-1-dev \ libcurl4-gnutls-dev \ - xdg-desktop-portal \ + libgtk-3-dev \ ninja-build diff --git a/dist/get_deps_fedora.sh b/dist/get_deps_fedora.sh index e404e5c4b..86012b45f 100755 --- a/dist/get_deps_fedora.sh +++ b/dist/get_deps_fedora.sh @@ -11,4 +11,5 @@ dnf install -y \ mesa-libGL-devel \ glfw-devel \ lld \ - mbedtls-devel \ No newline at end of file + mbedtls-devel \ + gtk3-devel \ No newline at end of file diff --git a/dist/rpm/imhex.spec b/dist/rpm/imhex.spec index 15623df87..a63c0f5ad 100644 --- a/dist/rpm/imhex.spec +++ b/dist/rpm/imhex.spec @@ -77,6 +77,7 @@ CXXFLAGS+=" -std=gnu++2b" -D USE_SYSTEM_LLVM=ON \ -D USE_SYSTEM_YARA=ON \ -D USE_SYSTEM_NFD=ON \ + -D IMHEX_USE_GTK_FILE_PICKER=ON \ # when capstone >= 5.x is released we should be able to build against \ # system libs of it \ # -D USE_SYSTEM_CAPSTONE=ON