build: Switch to GTK file picker on non-sandboxed Linux builds

This commit is contained in:
WerWolv 2023-07-15 10:01:50 +02:00
parent c1cdab72ef
commit 8500e4cba2
5 changed files with 12 additions and 8 deletions

View file

@ -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

View file

@ -9,7 +9,7 @@ pacman -S $@ --needed \
mbedtls \
freetype2 \
dbus \
xdg-desktop-portal \
gtk3 \
curl \
fmt \
yara \

View file

@ -21,5 +21,5 @@ apt install -y \
libfreetype-dev \
libdbus-1-dev \
libcurl4-gnutls-dev \
xdg-desktop-portal \
libgtk-3-dev \
ninja-build

View file

@ -11,4 +11,5 @@ dnf install -y \
mesa-libGL-devel \
glfw-devel \
lld \
mbedtls-devel
mbedtls-devel \
gtk3-devel

1
dist/rpm/imhex.spec vendored
View file

@ -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