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

refactor: remove unneed library gtkpixbuf

Browse source
This commit is contained in:
sithlord48 2025-03-25 21:54:13 -04:00 committed by Nick Bolton
parent db20c4b0c7
commit 7f1a234d06
3 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -37,14 +37,14 @@ 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 libgdk-pixbuf-2.0-dev libnotify-dev \ libglib2.0-dev libnotify-dev \
libxkbfile-dev qt6-base-dev qt6-tools-dev \ libxkbfile-dev qt6-base-dev qt6-tools-dev \
libgtk-3-dev libgtest-dev libgmock-dev libpugixml-dev \ libgtk-3-dev libgtest-dev libgmock-dev libpugixml-dev \
libei-dev libportal-dev libtomlplusplus-dev libcli11-dev -y >/dev/null libei-dev libportal-dev libtomlplusplus-dev libcli11-dev -y >/dev/null
elif [ ${{inputs.like}} == "fedora" ]; then elif [ ${{inputs.like}} == "fedora" ]; then
dnf install -y cmake make ninja-build gcc-c++ \ dnf install -y cmake make ninja-build gcc-c++ \
rpm-build openssl-devel glib2-devel \ rpm-build openssl-devel glib2-devel \
gdk-pixbuf2-devel libXtst-devel libnotify-devel \ libXtst-devel libnotify-devel \
libxkbfile-devel qt6-qtbase-devel qt6-qttools-devel \ libxkbfile-devel qt6-qtbase-devel qt6-qttools-devel \
gtk3-devel gtest-devel gmock-devel pugixml-devel \ gtk3-devel gtest-devel gmock-devel pugixml-devel \
libei-devel libportal-devel tomlplusplus-devel \ libei-devel libportal-devel tomlplusplus-devel \
@ -53,13 +53,13 @@ runs:
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 gdk-pixbuf-devel libXtst-devel libnotify-devel \ glib2-devel libXtst-devel libnotify-devel \
libxkbfile-devel qt6-base-devel qt6-tools-devel gtk3-devel \ libxkbfile-devel qt6-base-devel qt6-tools-devel gtk3-devel \
googletest-devel googlemock-devel pugixml-devel libei-devel \ googletest-devel googlemock-devel pugixml-devel libei-devel \
libportal-devel tomlplusplus-devel cli11-devel libportal-devel tomlplusplus-devel cli11-devel
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 gdk-pixbuf2 libxtst libnotify \ gcc openssl glib2 libxtst libnotify \
libxkbfile gtest pugixml libei libportal \ libxkbfile gtest pugixml libei libportal \
qt6-base qt6-tools gtk3 tomlplusplus cli11 qt6-base qt6-tools gtk3 tomlplusplus cli11
else else

10
cmake/Libraries.cmake
View file

@ -175,16 +175,10 @@ macro(configure_unix_libs)
find_package(PkgConfig) find_package(PkgConfig)
if(PKG_CONFIG_FOUND) if(PKG_CONFIG_FOUND)
pkg_check_modules(lib_glib REQUIRED IMPORTED_TARGET glib-2.0) pkg_check_modules(lib_glib REQUIRED IMPORTED_TARGET glib-2.0)
pkg_search_module(PC_GDKPIXBUF gdk-pixbuf-2.0)
include_directories(${PC_GDKPIXBUF_INCLUDE_DIRS})
pkg_check_modules(lib_gdkpixbuf REQUIRED IMPORTED_TARGET gdk-pixbuf-2.0)
pkg_check_modules(lib_notify REQUIRED IMPORTED_TARGET libnotify) pkg_check_modules(lib_notify REQUIRED IMPORTED_TARGET libnotify)
add_definitions(-DHAVE_LIBNOTIFY=1)
add_definitions(-DHAVE_GDK_PIXBUF=1 -DHAVE_LIBNOTIFY=1)
else() else()
message(WARNING "pkg-config not found, skipping libnotify and gdk-pixbuf") message(WARNING "pkg-config not found, skipping libnotify")
endif() endif()
endif() endif()

2
src/lib/deskflow/CMakeLists.txt
View file

@ -183,7 +183,7 @@ if(UNIX)
if(PKG_CONFIG_FOUND) if(PKG_CONFIG_FOUND)
target_link_libraries(${lib_name} target_link_libraries(${lib_name}
PRIVATE PRIVATE
PkgConfig::lib_glib PkgConfig::lib_gdkpixbuf PkgConfig::lib_notify) PkgConfig::lib_glib PkgConfig::lib_notify)
endif() endif()
endif() endif()
endif() endif()