From 6608b604b0e79cc5f99d06dbea12891ff8d65bab Mon Sep 17 00:00:00 2001 From: stuartmorgan Date: Mon, 15 May 2023 11:08:00 -0700 Subject: [PATCH] [ci] Remove unnecessary Linux libraries (#3975) The Linux desktop template included some libraries as explicit dependencies unnecessarily, which were later removed from the template once we realized `snap` support didn't actually require them. This removes them from the Dockerfile, and from the CMakeLists.txt that still reference them. Fixes https://github.com/flutter/flutter/issues/78562 --- .ci/Dockerfile | 2 +- .../path_provider/example/linux/flutter/CMakeLists.txt | 2 -- .../path_provider_linux/example/linux/flutter/CMakeLists.txt | 2 -- .../shared_preferences/example/linux/flutter/CMakeLists.txt | 2 -- 4 files changed, 1 insertion(+), 7 deletions(-) diff --git a/.ci/Dockerfile b/.ci/Dockerfile index 224b9d72de..d1ddf61c92 100644 --- a/.ci/Dockerfile +++ b/.ci/Dockerfile @@ -23,7 +23,7 @@ RUN apt-get install -y clang-format # - build tools. RUN apt-get install -y clang cmake ninja-build file pkg-config # - libraries. -RUN apt-get install -y libgtk-3-dev libblkid-dev liblzma-dev libgcrypt20-dev +RUN apt-get install -y libgtk-3-dev # - xvfb to allow running headless. RUN apt-get install -y xvfb libegl1-mesa diff --git a/packages/path_provider/path_provider/example/linux/flutter/CMakeLists.txt b/packages/path_provider/path_provider/example/linux/flutter/CMakeLists.txt index 4f48a7ced5..94f43ff7fa 100644 --- a/packages/path_provider/path_provider/example/linux/flutter/CMakeLists.txt +++ b/packages/path_provider/path_provider/example/linux/flutter/CMakeLists.txt @@ -24,7 +24,6 @@ find_package(PkgConfig REQUIRED) pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0) pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0) -pkg_check_modules(BLKID REQUIRED IMPORTED_TARGET blkid) set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/libflutter_linux_gtk.so") @@ -66,7 +65,6 @@ target_link_libraries(flutter INTERFACE PkgConfig::GTK PkgConfig::GLIB PkgConfig::GIO - PkgConfig::BLKID ) add_dependencies(flutter flutter_assemble) diff --git a/packages/path_provider/path_provider_linux/example/linux/flutter/CMakeLists.txt b/packages/path_provider/path_provider_linux/example/linux/flutter/CMakeLists.txt index 4f48a7ced5..94f43ff7fa 100644 --- a/packages/path_provider/path_provider_linux/example/linux/flutter/CMakeLists.txt +++ b/packages/path_provider/path_provider_linux/example/linux/flutter/CMakeLists.txt @@ -24,7 +24,6 @@ find_package(PkgConfig REQUIRED) pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0) pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0) -pkg_check_modules(BLKID REQUIRED IMPORTED_TARGET blkid) set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/libflutter_linux_gtk.so") @@ -66,7 +65,6 @@ target_link_libraries(flutter INTERFACE PkgConfig::GTK PkgConfig::GLIB PkgConfig::GIO - PkgConfig::BLKID ) add_dependencies(flutter flutter_assemble) diff --git a/packages/shared_preferences/shared_preferences/example/linux/flutter/CMakeLists.txt b/packages/shared_preferences/shared_preferences/example/linux/flutter/CMakeLists.txt index 4f48a7ced5..94f43ff7fa 100644 --- a/packages/shared_preferences/shared_preferences/example/linux/flutter/CMakeLists.txt +++ b/packages/shared_preferences/shared_preferences/example/linux/flutter/CMakeLists.txt @@ -24,7 +24,6 @@ find_package(PkgConfig REQUIRED) pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0) pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0) -pkg_check_modules(BLKID REQUIRED IMPORTED_TARGET blkid) set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/libflutter_linux_gtk.so") @@ -66,7 +65,6 @@ target_link_libraries(flutter INTERFACE PkgConfig::GTK PkgConfig::GLIB PkgConfig::GIO - PkgConfig::BLKID ) add_dependencies(flutter flutter_assemble)