From 7f1a234d060f27d63227f959916823cb05ece213 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Tue, 25 Mar 2025 21:54:13 -0400 Subject: [PATCH] refactor: remove unneed library gtkpixbuf --- .github/actions/install-dependencies/action.yml | 8 ++++---- cmake/Libraries.cmake | 10 ++-------- src/lib/deskflow/CMakeLists.txt | 2 +- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/.github/actions/install-dependencies/action.yml b/.github/actions/install-dependencies/action.yml index 14b77405b..44964cb97 100644 --- a/.github/actions/install-dependencies/action.yml +++ b/.github/actions/install-dependencies/action.yml @@ -37,14 +37,14 @@ 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 libgdk-pixbuf-2.0-dev libnotify-dev \ + libglib2.0-dev libnotify-dev \ libxkbfile-dev qt6-base-dev qt6-tools-dev \ libgtk-3-dev libgtest-dev libgmock-dev libpugixml-dev \ libei-dev libportal-dev libtomlplusplus-dev libcli11-dev -y >/dev/null elif [ ${{inputs.like}} == "fedora" ]; then dnf install -y cmake make ninja-build gcc-c++ \ 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 \ gtk3-devel gtest-devel gmock-devel pugixml-devel \ libei-devel libportal-devel tomlplusplus-devel \ @@ -53,13 +53,13 @@ runs: zypper refresh zypper install -y --force-resolution \ 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 \ googletest-devel googlemock-devel pugixml-devel libei-devel \ libportal-devel tomlplusplus-devel cli11-devel elif [ ${{ inputs.like }} == "arch" ]; then pacman -Syu --noconfirm base-devel cmake ninja \ - gcc openssl glib2 gdk-pixbuf2 libxtst libnotify \ + gcc openssl glib2 libxtst libnotify \ libxkbfile gtest pugixml libei libportal \ qt6-base qt6-tools gtk3 tomlplusplus cli11 else diff --git a/cmake/Libraries.cmake b/cmake/Libraries.cmake index 91a1e48e4..c1eee27c7 100644 --- a/cmake/Libraries.cmake +++ b/cmake/Libraries.cmake @@ -175,16 +175,10 @@ macro(configure_unix_libs) find_package(PkgConfig) if(PKG_CONFIG_FOUND) 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) - - add_definitions(-DHAVE_GDK_PIXBUF=1 -DHAVE_LIBNOTIFY=1) + add_definitions(-DHAVE_LIBNOTIFY=1) else() - message(WARNING "pkg-config not found, skipping libnotify and gdk-pixbuf") + message(WARNING "pkg-config not found, skipping libnotify") endif() endif() diff --git a/src/lib/deskflow/CMakeLists.txt b/src/lib/deskflow/CMakeLists.txt index 15373c731..0f552434f 100644 --- a/src/lib/deskflow/CMakeLists.txt +++ b/src/lib/deskflow/CMakeLists.txt @@ -183,7 +183,7 @@ if(UNIX) if(PKG_CONFIG_FOUND) target_link_libraries(${lib_name} PRIVATE - PkgConfig::lib_glib PkgConfig::lib_gdkpixbuf PkgConfig::lib_notify) + PkgConfig::lib_glib PkgConfig::lib_notify) endif() endif() endif()