smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build: remove glib2 dependency

Browse source
This commit is contained in:
sithlord48 2026-07-19 09:30:16 -04:00 committed by Nick Bolton
parent d9c01486e8
commit 778950c247
5 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
.github/actions/install-dependencies/action.yml vendored
View file

@ -36,21 +36,22 @@ runs:
apt update -qqq > /dev/null apt update -qqq > /dev/null
apt install -qqq cmake build-essential ninja-build \ apt install -qqq cmake build-essential ninja-build \
xorg-dev libx11-dev libxtst-dev libssl-dev \ 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 libgtk-3-dev libei-dev libportal-dev help2man doxygen -y >/dev/null
elif [ ${{inputs.like}} == "fedora" ]; then elif [ ${{inputs.like}} == "fedora" ]; then
dnf install -y cmake make ninja-build gcc-c++ rpm-build openssl-devel \ 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 gtk3-devel libei-devel libportal-devel help2man doxygen
elif [ ${{inputs.like}} == "suse" ]; then elif [ ${{inputs.like}} == "suse" ]; then
zypper refresh zypper refresh
zypper install -y --force-resolution \ zypper install -y --force-resolution \
cmake make ninja gcc-c++ rpm-build libopenssl-devel \ cmake make ninja gcc-c++ rpm-build libopenssl-devel \
glib2-devel libXtst-devel libxkbfile-devel qt6-base-devel qt6-tools-devel \ libXtst-devel libxkbfile-devel qt6-base-devel qt6-tools-devel \
qt6-linguist-devel gtk3-devel doxygen libei-devel libportal-devel help2man qt6-linguist-devel gtk3-devel doxygen \
libei-devel libportal-devel help2man
elif [ ${{ inputs.like }} == "arch" ]; then elif [ ${{ inputs.like }} == "arch" ]; then
pacman -Syu --noconfirm base-devel cmake ninja \ 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 qt6-base qt6-tools qt6-svg qt6-translations qt6-declarative gtk3 help2man doxygen graphviz rsync
else else
echo "Unknown like" echo "Unknown like"

4
.github/workflows/continuous-integration.yml vendored
View file

@ -360,8 +360,8 @@ jobs:
run: | run: |
pkg install -y cmake ninja gmake gcc12 openssl \ pkg install -y cmake ninja gmake gcc12 openssl \
glib libX11 libXtst libxkbfile qt6-base qt6-tools \ libX11 libXtst libxkbfile qt6-base qt6-tools gtk3 \
gtk3 pkgconf libei libportal doxygen pkgconf libei libportal doxygen
${{env.CMAKE_CONFIGURE}} -G Ninja ${{env.CMAKE_CONFIGURE}} -G Ninja
cmake --build build -j16 cmake --build build -j16
flatpak: flatpak:

3
cmake/Libraries.cmake
View file

@ -97,8 +97,7 @@ macro(configure_unix_libs)
find_package(PkgConfig) find_package(PkgConfig)
if(PKG_CONFIG_FOUND) if(PKG_CONFIG_FOUND)
pkg_check_modules(LIBXKBCOMMON REQUIRED xkbcommon) pkg_check_modules(LIBXKBCOMMON REQUIRED xkbcommon)
pkg_check_modules(GLIB2 REQUIRED glib-2.0) include_directories(${LIBXKBCOMMON_INCLUDE_DIRS})
include_directories(${LIBXKBCOMMON_INCLUDE_DIRS} ${GLIB2_INCLUDE_DIRS})
message(STATUS "xkbcommon version: ${LIBXKBCOMMON_VERSION}") message(STATUS "xkbcommon version: ${LIBXKBCOMMON_VERSION}")
else() else()

1
deploy/linux/arch/PKGBUILD.in
View file

@ -14,7 +14,6 @@ conflicts=('synergy-git' 'synergy-1.6' 'synergy1-bin' 'synergy2-bin' 'synergy3-b
provides=("$_basename") provides=("$_basename")
depends=( depends=(
gcc-libs gcc-libs
glib2
glibc glibc
hicolor-icon-theme hicolor-icon-theme
libei libei

5
src/lib/platform/CMakeLists.txt
View file

@ -14,8 +14,8 @@ if(UNIX AND NOT APPLE)
include(CMakePushCheckState) include(CMakePushCheckState)
include(CheckSymbolExists) include(CheckSymbolExists)
cmake_push_check_state(RESET) cmake_push_check_state(RESET)
set(CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES};${LIBPORTAL_INCLUDE_DIRS};${GLIB2_INCLUDE_DIRS}") set(CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES};${LIBPORTAL_INCLUDE_DIRS};")
set(CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES};${LIBPORTAL_LINK_LIBRARIES};${GLIB2_LINK_LIBRARIES}") 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_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) check_symbol_exists(xdp_session_request_clipboard "libportal/portal-helpers.h;libportal/clipboard.h" HAVE_LP_CLIPBOARD)
cmake_pop_check_state() cmake_pop_check_state()
@ -204,7 +204,6 @@ if(UNIX)
Qt6::DBus Qt6::DBus
Qt6::Gui Qt6::Gui
${LIBXKBCOMMON_LINK_LIBRARIES} ${LIBXKBCOMMON_LINK_LIBRARIES}
${GLIB2_LINK_LIBRARIES}
${LIBEI_LINK_LIBRARIES} ${LIBPORTAL_LINK_LIBRARIES}) ${LIBEI_LINK_LIBRARIES} ${LIBPORTAL_LINK_LIBRARIES})
endif() endif()
endif() endif()