Skip to content

Commit

Permalink
Fixed libgconf2 not available on Ubuntu 24.
Browse files Browse the repository at this point in the history
  • Loading branch information
nmoinvaz committed Dec 20, 2024
1 parent f2cd314 commit 884f68e
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 6 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/ubuntu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,11 @@ jobs:
- name: Install dependencies
run: |
sudo apt update
sudo apt install -y ninja-build libgconf2-dev
sudo apt install -y ninja-build
if [ "$major_version" -le "22" ]; then
sudo apt install -y libgconf2-dev
fi
major_version=$(lsb_release -rs | cut -d'.' -f1)
if [ "$major_version" -ge "24" ]; then
sudo apt install -y llvm-15 libjavascriptcoregtk-4.1-dev
Expand Down
13 changes: 8 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,13 @@ elseif(APPLE)
wpad_dhcp_mac.h)
endif()
elseif(UNIX)
pkg_check_modules(GConf gconf-2.0)
if (GConf_FOUND)
list(APPEND PROXYRES_SRCS config_gnome2.c config_gnome2.h)
endif()
list(APPEND PROXYRES_SRCS
config_env.c
config_env.h
config_gnome2.c
config_gnome2.h
config_gnome3.c
config_gnome3.h
config_kde.c
Expand Down Expand Up @@ -287,9 +289,10 @@ elseif(UNIX)
pkg_check_modules(deps REQUIRED IMPORTED_TARGET glib-2.0)
target_link_libraries(proxyres PkgConfig::deps)

pkg_check_modules(GConf REQUIRED gconf-2.0)
# Don't link libraries at compile time since we dynamically load them at runtime
target_include_directories(proxyres PRIVATE ${GConf_INCLUDE_DIRS})
if (GConf_FOUND)
# Don't link libraries at compile time since we dynamically load them at runtime
target_include_directories(proxyres PRIVATE ${GConf_INCLUDE_DIRS})
endif()

pkg_search_module(JSCoreGTK REQUIRED javascriptcoregtk-4.1 javascriptcoregtk-4.0 javascriptcoregtk-3.0 javascriptcoregtk-1.0)
# Don't link libraries at compile time since we dynamically load them at runtime
Expand Down

0 comments on commit 884f68e

Please sign in to comment.