From 778950c247832d4364f6eee65b993b3b2b284581 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Sun, 19 Jul 2026 09:30:16 -0400 Subject: [PATCH] build: remove glib2 dependency --- .github/actions/install-dependencies/action.yml | 11 ++++++----- .github/workflows/continuous-integration.yml | 4 ++-- cmake/Libraries.cmake | 3 +-- deploy/linux/arch/PKGBUILD.in | 1 - src/lib/platform/CMakeLists.txt | 5 ++--- 5 files changed, 11 insertions(+), 13 deletions(-) diff --git a/.github/actions/install-dependencies/action.yml b/.github/actions/install-dependencies/action.yml index f6ed22f52..0f5dc8e7b 100644 --- a/.github/actions/install-dependencies/action.yml +++ b/.github/actions/install-dependencies/action.yml @@ -36,21 +36,22 @@ runs: apt update -qqq > /dev/null apt install -qqq cmake build-essential ninja-build \ xorg-dev libx11-dev libxtst-dev libssl-dev \ - libglib2.0-dev libxkbfile-dev qt6-base-dev qt6-tools-dev \ + libxkbfile-dev qt6-base-dev qt6-tools-dev \ libgtk-3-dev libei-dev libportal-dev help2man doxygen -y >/dev/null elif [ ${{inputs.like}} == "fedora" ]; then dnf install -y cmake make ninja-build gcc-c++ rpm-build openssl-devel \ - glib2-devel libXtst-devel libxkbfile-devel qt6-qtbase-devel qt6-qttools-devel \ + libXtst-devel libxkbfile-devel qt6-qtbase-devel qt6-qttools-devel \ gtk3-devel libei-devel libportal-devel help2man doxygen elif [ ${{inputs.like}} == "suse" ]; then zypper refresh zypper install -y --force-resolution \ cmake make ninja gcc-c++ rpm-build libopenssl-devel \ - glib2-devel libXtst-devel libxkbfile-devel qt6-base-devel qt6-tools-devel \ - qt6-linguist-devel gtk3-devel doxygen libei-devel libportal-devel help2man + libXtst-devel libxkbfile-devel qt6-base-devel qt6-tools-devel \ + qt6-linguist-devel gtk3-devel doxygen \ + libei-devel libportal-devel help2man elif [ ${{ inputs.like }} == "arch" ]; then pacman -Syu --noconfirm base-devel cmake ninja \ - gcc openssl glib2 libxtst libxkbfile libei libportal \ + gcc openssl libxtst libxkbfile gtest libei libportal \ qt6-base qt6-tools qt6-svg qt6-translations qt6-declarative gtk3 help2man doxygen graphviz rsync else echo "Unknown like" diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index d95ef450d..53fc966c7 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -360,8 +360,8 @@ jobs: run: | pkg install -y cmake ninja gmake gcc12 openssl \ - glib libX11 libXtst libxkbfile qt6-base qt6-tools \ - gtk3 pkgconf libei libportal doxygen + libX11 libXtst libxkbfile qt6-base qt6-tools gtk3 \ + pkgconf libei libportal doxygen ${{env.CMAKE_CONFIGURE}} -G Ninja cmake --build build -j16 flatpak: diff --git a/cmake/Libraries.cmake b/cmake/Libraries.cmake index 6d1007abe..a8edc0643 100644 --- a/cmake/Libraries.cmake +++ b/cmake/Libraries.cmake @@ -97,8 +97,7 @@ macro(configure_unix_libs) find_package(PkgConfig) if(PKG_CONFIG_FOUND) pkg_check_modules(LIBXKBCOMMON REQUIRED xkbcommon) - pkg_check_modules(GLIB2 REQUIRED glib-2.0) - include_directories(${LIBXKBCOMMON_INCLUDE_DIRS} ${GLIB2_INCLUDE_DIRS}) + include_directories(${LIBXKBCOMMON_INCLUDE_DIRS}) message(STATUS "xkbcommon version: ${LIBXKBCOMMON_VERSION}") else() diff --git a/deploy/linux/arch/PKGBUILD.in b/deploy/linux/arch/PKGBUILD.in index 67d6cc546..5f160a902 100644 --- a/deploy/linux/arch/PKGBUILD.in +++ b/deploy/linux/arch/PKGBUILD.in @@ -14,7 +14,6 @@ conflicts=('synergy-git' 'synergy-1.6' 'synergy1-bin' 'synergy2-bin' 'synergy3-b provides=("$_basename") depends=( gcc-libs - glib2 glibc hicolor-icon-theme libei diff --git a/src/lib/platform/CMakeLists.txt b/src/lib/platform/CMakeLists.txt index 4916a5ab2..bfb9e8394 100644 --- a/src/lib/platform/CMakeLists.txt +++ b/src/lib/platform/CMakeLists.txt @@ -14,8 +14,8 @@ if(UNIX AND NOT APPLE) include(CMakePushCheckState) include(CheckSymbolExists) cmake_push_check_state(RESET) - set(CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES};${LIBPORTAL_INCLUDE_DIRS};${GLIB2_INCLUDE_DIRS}") - set(CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES};${LIBPORTAL_LINK_LIBRARIES};${GLIB2_LINK_LIBRARIES}") + set(CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES};${LIBPORTAL_INCLUDE_DIRS};") + set(CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES};${LIBPORTAL_LINK_LIBRARIES};") check_symbol_exists(xdp_input_capture_session_get_restore_token "libportal/inputcapture.h" HAVE_IC_RESTORE) check_symbol_exists(xdp_session_request_clipboard "libportal/portal-helpers.h;libportal/clipboard.h" HAVE_LP_CLIPBOARD) cmake_pop_check_state() @@ -204,7 +204,6 @@ if(UNIX) Qt6::DBus Qt6::Gui ${LIBXKBCOMMON_LINK_LIBRARIES} - ${GLIB2_LINK_LIBRARIES} ${LIBEI_LINK_LIBRARIES} ${LIBPORTAL_LINK_LIBRARIES}) endif() endif()