mirror of
https://github.com/flutter/packages.git
synced 2025-06-22 08:00:16 +08:00
[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
This commit is contained in:
@ -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
|
||||
|
||||
|
@ -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)
|
||||
|
||||
|
@ -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)
|
||||
|
||||
|
@ -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)
|
||||
|
||||
|
Reference in New Issue
Block a user