Skip to content

Commit 6608b60

Browse files
[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 flutter/flutter#78562
1 parent 8febbba commit 6608b60

File tree

4 files changed

+1
-7
lines changed

4 files changed

+1
-7
lines changed

.ci/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ RUN apt-get install -y clang-format
2323
# - build tools.
2424
RUN apt-get install -y clang cmake ninja-build file pkg-config
2525
# - libraries.
26-
RUN apt-get install -y libgtk-3-dev libblkid-dev liblzma-dev libgcrypt20-dev
26+
RUN apt-get install -y libgtk-3-dev
2727
# - xvfb to allow running headless.
2828
RUN apt-get install -y xvfb libegl1-mesa
2929

packages/path_provider/path_provider/example/linux/flutter/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ find_package(PkgConfig REQUIRED)
2424
pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0)
2525
pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0)
2626
pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0)
27-
pkg_check_modules(BLKID REQUIRED IMPORTED_TARGET blkid)
2827

2928
set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/libflutter_linux_gtk.so")
3029

@@ -66,7 +65,6 @@ target_link_libraries(flutter INTERFACE
6665
PkgConfig::GTK
6766
PkgConfig::GLIB
6867
PkgConfig::GIO
69-
PkgConfig::BLKID
7068
)
7169
add_dependencies(flutter flutter_assemble)
7270

packages/path_provider/path_provider_linux/example/linux/flutter/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ find_package(PkgConfig REQUIRED)
2424
pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0)
2525
pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0)
2626
pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0)
27-
pkg_check_modules(BLKID REQUIRED IMPORTED_TARGET blkid)
2827

2928
set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/libflutter_linux_gtk.so")
3029

@@ -66,7 +65,6 @@ target_link_libraries(flutter INTERFACE
6665
PkgConfig::GTK
6766
PkgConfig::GLIB
6867
PkgConfig::GIO
69-
PkgConfig::BLKID
7068
)
7169
add_dependencies(flutter flutter_assemble)
7270

packages/shared_preferences/shared_preferences/example/linux/flutter/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ find_package(PkgConfig REQUIRED)
2424
pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0)
2525
pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0)
2626
pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0)
27-
pkg_check_modules(BLKID REQUIRED IMPORTED_TARGET blkid)
2827

2928
set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/libflutter_linux_gtk.so")
3029

@@ -66,7 +65,6 @@ target_link_libraries(flutter INTERFACE
6665
PkgConfig::GTK
6766
PkgConfig::GLIB
6867
PkgConfig::GIO
69-
PkgConfig::BLKID
7068
)
7169
add_dependencies(flutter flutter_assemble)
7270

0 commit comments

Comments
 (0)