Skip to content

F
Front-End
Unverified Commit 01c772cc authored by Marcus Tomlinson's avatar Marcus Tomlinson Committed by GitHub
Browse files
Options

Revert "Add libblkid / liblzma / libgcrypt as an explicit dependancy on Linux" (#78415) 

* Revert "Add libgcrypt as an explicit dependancy on Linux"

This reverts commit bf65b3d03ccdc1dd21c09f34d600d72b0636a784.

* libblkid & liblzma not explicitly required either
parent 0d88b7c4
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 143 deletions
dev/integration_tests/flutter_gallery/linux/flutter/CMakeLists.txt
View file @ 01c772cc
...@@ -24,7 +24,6 @@ find_package(PkgConfig REQUIRED) ...@@ -24,7 +24,6 @@ find_package(PkgConfig REQUIRED)
pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0)
pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0) pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0)
pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-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") set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/libflutter_linux_gtk.so")
...@@ -66,7 +65,6 @@ target_link_libraries(flutter INTERFACE ...@@ -66,7 +65,6 @@ target_link_libraries(flutter INTERFACE
PkgConfig::GTK PkgConfig::GTK
PkgConfig::GLIB PkgConfig::GLIB
PkgConfig::GIO PkgConfig::GIO
PkgConfig::BLKID
) )
add_dependencies(flutter flutter_assemble) add_dependencies(flutter flutter_assemble)
......
packages/flutter_tools/lib/src/base/user_messages.dart
View file @ 01c772cc
...@@ -232,12 +232,6 @@ class UserMessages { ...@@ -232,12 +232,6 @@ class UserMessages {
String pkgConfigTooOld(String minimumVersion) => 'pkg-config $minimumVersion or later is required.'; String pkgConfigTooOld(String minimumVersion) => 'pkg-config $minimumVersion or later is required.';
String get gtkLibrariesMissing => 'GTK 3.0 development libraries are required for Linux development.\n' String get gtkLibrariesMissing => 'GTK 3.0 development libraries are required for Linux development.\n'
'They are likely available from your distribution (e.g.: apt install libgtk-3-dev)'; 'They are likely available from your distribution (e.g.: apt install libgtk-3-dev)';
String get blkidLibraryMissing => 'The blkid development library is required for Linux development.\n'
'It is likely available from your distribution (e.g.: apt install libblkid-dev)';
String get lzmaLibraryMissing => 'The lzma development library is required for Linux development.\n'
'It is likely available from your distribution (e.g.: apt install liblzma-dev)';
String get gcryptLibraryMissing => 'The gcrypt development library is required for Linux development.\n'
'It is likely available from your distribution (e.g.: apt install libgcrypt20-dev)';
// Messages used in FlutterCommand // Messages used in FlutterCommand
String flutterElapsedTime(String name, String elapsedTime) => '"flutter $name" took $elapsedTime.'; String flutterElapsedTime(String name, String elapsedTime) => '"flutter $name" took $elapsedTime.';
......
packages/flutter_tools/lib/src/linux/linux_doctor.dart
View file @ 01c772cc
...@@ -151,18 +151,6 @@ class LinuxDoctorValidator extends DoctorValidator { ...@@ -151,18 +151,6 @@ class LinuxDoctorValidator extends DoctorValidator {
messages.add(ValidationMessage.error(_userMessages.gtkLibrariesMissing)); messages.add(ValidationMessage.error(_userMessages.gtkLibrariesMissing));
} }
} }
if (!await _libraryIsPresent('blkid')) {
validationType = ValidationType.missing;
messages.add(ValidationMessage.error(_userMessages.blkidLibraryMissing));
}
if (!await _libraryIsPresent('liblzma')) {
validationType = ValidationType.missing;
messages.add(ValidationMessage.error(_userMessages.lzmaLibraryMissing));
}
if (!await _libraryIsPresent('libgcrypt')) {
validationType = ValidationType.missing;
messages.add(ValidationMessage.error(_userMessages.gcryptLibraryMissing));
}
return ValidationResult(validationType, messages); return ValidationResult(validationType, messages);
} }
......
packages/flutter_tools/templates/app/linux.tmpl/flutter/CMakeLists.txt
View file @ 01c772cc
...@@ -24,9 +24,6 @@ find_package(PkgConfig REQUIRED) ...@@ -24,9 +24,6 @@ find_package(PkgConfig REQUIRED)
pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0)
pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0) pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0)
pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0) pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0)
pkg_check_modules(BLKID REQUIRED IMPORTED_TARGET blkid)
pkg_check_modules(LZMA REQUIRED IMPORTED_TARGET liblzma)
pkg_check_modules(GCRYPT REQUIRED IMPORTED_TARGET libgcrypt)
set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/libflutter_linux_gtk.so") set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/libflutter_linux_gtk.so")
...@@ -68,9 +65,6 @@ target_link_libraries(flutter INTERFACE ...@@ -68,9 +65,6 @@ target_link_libraries(flutter INTERFACE
PkgConfig::GTK PkgConfig::GTK
PkgConfig::GLIB PkgConfig::GLIB
PkgConfig::GIO PkgConfig::GIO
PkgConfig::BLKID
PkgConfig::LZMA
PkgConfig::GCRYPT
) )
add_dependencies(flutter flutter_assemble) add_dependencies(flutter flutter_assemble)
......
packages/flutter_tools/test/general.shard/linux/linux_doctor_test.dart
View file @ 01c772cc
...@@ -100,9 +100,6 @@ void main() { ...@@ -100,9 +100,6 @@ void main() {
_ninjaPresentCommand('1.10.0'), _ninjaPresentCommand('1.10.0'),
_pkgConfigPresentCommand('0.29'), _pkgConfigPresentCommand('0.29'),
..._gtkLibrariesPresentCommands(), ..._gtkLibrariesPresentCommands(),
_libraryCheckCommand('blkid'),
_libraryCheckCommand('liblzma'),
_libraryCheckCommand('libgcrypt'),
]); ]);
final DoctorValidator linuxDoctorValidator = LinuxDoctorValidator( final DoctorValidator linuxDoctorValidator = LinuxDoctorValidator(
processManager: processManager, processManager: processManager,
...@@ -126,9 +123,6 @@ void main() { ...@@ -126,9 +123,6 @@ void main() {
_ninjaPresentCommand('1.10.0'), _ninjaPresentCommand('1.10.0'),
_pkgConfigPresentCommand('0.29'), _pkgConfigPresentCommand('0.29'),
..._gtkLibrariesPresentCommands(), ..._gtkLibrariesPresentCommands(),
_libraryCheckCommand('blkid'),
_libraryCheckCommand('liblzma'),
_libraryCheckCommand('libgcrypt'),
]); ]);
final DoctorValidator linuxDoctorValidator = LinuxDoctorValidator( final DoctorValidator linuxDoctorValidator = LinuxDoctorValidator(
processManager: processManager, processManager: processManager,
...@@ -153,9 +147,6 @@ void main() { ...@@ -153,9 +147,6 @@ void main() {
_ninjaPresentCommand('1.10.0'), _ninjaPresentCommand('1.10.0'),
_pkgConfigPresentCommand('0.29'), _pkgConfigPresentCommand('0.29'),
..._gtkLibrariesPresentCommands(), ..._gtkLibrariesPresentCommands(),
_libraryCheckCommand('blkid'),
_libraryCheckCommand('liblzma'),
_libraryCheckCommand('libgcrypt'),
]); ]);
final DoctorValidator linuxDoctorValidator = LinuxDoctorValidator( final DoctorValidator linuxDoctorValidator = LinuxDoctorValidator(
processManager: processManager, processManager: processManager,
...@@ -180,9 +171,6 @@ void main() { ...@@ -180,9 +171,6 @@ void main() {
_ninjaPresentCommand('0.8.1'), _ninjaPresentCommand('0.8.1'),
_pkgConfigPresentCommand('0.29'), _pkgConfigPresentCommand('0.29'),
..._gtkLibrariesPresentCommands(), ..._gtkLibrariesPresentCommands(),
_libraryCheckCommand('blkid'),
_libraryCheckCommand('liblzma'),
_libraryCheckCommand('libgcrypt'),
]); ]);
final DoctorValidator linuxDoctorValidator = LinuxDoctorValidator( final DoctorValidator linuxDoctorValidator = LinuxDoctorValidator(
processManager: processManager, processManager: processManager,
...@@ -207,9 +195,6 @@ void main() { ...@@ -207,9 +195,6 @@ void main() {
_ninjaPresentCommand('1.10.0'), _ninjaPresentCommand('1.10.0'),
_pkgConfigPresentCommand('0.27.0'), _pkgConfigPresentCommand('0.27.0'),
..._gtkLibrariesPresentCommands(), ..._gtkLibrariesPresentCommands(),
_libraryCheckCommand('blkid'),
_libraryCheckCommand('liblzma'),
_libraryCheckCommand('libgcrypt'),
]); ]);
final DoctorValidator linuxDoctorValidator = LinuxDoctorValidator( final DoctorValidator linuxDoctorValidator = LinuxDoctorValidator(
processManager: processManager, processManager: processManager,
...@@ -234,9 +219,6 @@ void main() { ...@@ -234,9 +219,6 @@ void main() {
_ninjaPresentCommand('1.10.0'), _ninjaPresentCommand('1.10.0'),
_pkgConfigPresentCommand('0.29'), _pkgConfigPresentCommand('0.29'),
..._gtkLibrariesPresentCommands(), ..._gtkLibrariesPresentCommands(),
_libraryCheckCommand('blkid'),
_libraryCheckCommand('liblzma'),
_libraryCheckCommand('libgcrypt'),
]); ]);
final UserMessages userMessages = UserMessages(); final UserMessages userMessages = UserMessages();
final DoctorValidator linuxDoctorValidator = LinuxDoctorValidator( final DoctorValidator linuxDoctorValidator = LinuxDoctorValidator(
...@@ -261,9 +243,6 @@ void main() { ...@@ -261,9 +243,6 @@ void main() {
_ninjaPresentCommand('1.10.0'), _ninjaPresentCommand('1.10.0'),
_pkgConfigPresentCommand('0.29'), _pkgConfigPresentCommand('0.29'),
..._gtkLibrariesPresentCommands(), ..._gtkLibrariesPresentCommands(),
_libraryCheckCommand('blkid'),
_libraryCheckCommand('liblzma'),
_libraryCheckCommand('libgcrypt'),
]); ]);
final UserMessages userMessages = UserMessages(); final UserMessages userMessages = UserMessages();
final DoctorValidator linuxDoctorValidator = LinuxDoctorValidator( final DoctorValidator linuxDoctorValidator = LinuxDoctorValidator(
...@@ -288,9 +267,6 @@ void main() { ...@@ -288,9 +267,6 @@ void main() {
_missingBinaryCommand('ninja'), _missingBinaryCommand('ninja'),
_pkgConfigPresentCommand('0.29'), _pkgConfigPresentCommand('0.29'),
..._gtkLibrariesPresentCommands(), ..._gtkLibrariesPresentCommands(),
_libraryCheckCommand('blkid'),
_libraryCheckCommand('liblzma'),
_libraryCheckCommand('libgcrypt'),
]); ]);
final UserMessages userMessages = UserMessages(); final UserMessages userMessages = UserMessages();
final DoctorValidator linuxDoctorValidator = LinuxDoctorValidator( final DoctorValidator linuxDoctorValidator = LinuxDoctorValidator(
...@@ -315,9 +291,6 @@ void main() { ...@@ -315,9 +291,6 @@ void main() {
_ninjaPresentCommand('1.10.0'), _ninjaPresentCommand('1.10.0'),
_missingBinaryCommand('pkg-config'), _missingBinaryCommand('pkg-config'),
..._gtkLibrariesPresentCommands(), ..._gtkLibrariesPresentCommands(),
_libraryCheckCommand('blkid'),
_libraryCheckCommand('liblzma'),
_libraryCheckCommand('libgcrypt'),
]); ]);
final UserMessages userMessages = UserMessages(); final UserMessages userMessages = UserMessages();
final DoctorValidator linuxDoctorValidator = LinuxDoctorValidator( final DoctorValidator linuxDoctorValidator = LinuxDoctorValidator(
...@@ -342,9 +315,6 @@ void main() { ...@@ -342,9 +315,6 @@ void main() {
_ninjaPresentCommand('1.10.0'), _ninjaPresentCommand('1.10.0'),
_pkgConfigPresentCommand('0.29'), _pkgConfigPresentCommand('0.29'),
..._gtkLibrariesMissingCommands(), ..._gtkLibrariesMissingCommands(),
_libraryCheckCommand('blkid'),
_libraryCheckCommand('liblzma'),
_libraryCheckCommand('libgcrypt'),
]); ]);
final UserMessages userMessages = UserMessages(); final UserMessages userMessages = UserMessages();
final DoctorValidator linuxDoctorValidator = LinuxDoctorValidator( final DoctorValidator linuxDoctorValidator = LinuxDoctorValidator(
...@@ -363,90 +333,6 @@ void main() { ...@@ -363,90 +333,6 @@ void main() {
]); ]);
}); });
testWithoutContext('Missing validation when blkid is not available', () async {
final ProcessManager processManager = FakeProcessManager.list(<FakeCommand>[
_clangPresentCommand('4.0.1'),
_cmakePresentCommand('3.16.3'),
_ninjaPresentCommand('1.10.0'),
_pkgConfigPresentCommand('0.29'),
..._gtkLibrariesPresentCommands(),
_libraryCheckCommand('blkid', exists: false),
_libraryCheckCommand('liblzma'),
_libraryCheckCommand('libgcrypt'),
]);
final UserMessages userMessages = UserMessages();
final DoctorValidator linuxDoctorValidator = LinuxDoctorValidator(
processManager: processManager,
userMessages: userMessages,
);
final ValidationResult result = await linuxDoctorValidator.validate();
expect(result.type, ValidationType.missing);
expect(result.messages, <ValidationMessage>[
const ValidationMessage('clang version 4.0.1-6+build1'),
const ValidationMessage('cmake version 3.16.3'),
const ValidationMessage('ninja version 1.10.0'),
const ValidationMessage('pkg-config version 0.29'),
ValidationMessage.error(userMessages.blkidLibraryMissing),
]);
});
testWithoutContext('Missing validation when liblzma is not available', () async {
final ProcessManager processManager = FakeProcessManager.list(<FakeCommand>[
_clangPresentCommand('4.0.1'),
_cmakePresentCommand('3.16.3'),
_ninjaPresentCommand('1.10.0'),
_pkgConfigPresentCommand('0.29'),
..._gtkLibrariesPresentCommands(),
_libraryCheckCommand('blkid'),
_libraryCheckCommand('liblzma', exists: false),
_libraryCheckCommand('libgcrypt'),
]);
final UserMessages userMessages = UserMessages();
final DoctorValidator linuxDoctorValidator = LinuxDoctorValidator(
processManager: processManager,
userMessages: userMessages,
);
final ValidationResult result = await linuxDoctorValidator.validate();
expect(result.type, ValidationType.missing);
expect(result.messages, <ValidationMessage>[
const ValidationMessage('clang version 4.0.1-6+build1'),
const ValidationMessage('cmake version 3.16.3'),
const ValidationMessage('ninja version 1.10.0'),
const ValidationMessage('pkg-config version 0.29'),
ValidationMessage.error(userMessages.lzmaLibraryMissing),
]);
});
testWithoutContext('Missing validation when libgcrypt is not available', () async {
final ProcessManager processManager = FakeProcessManager.list(<FakeCommand>[
_clangPresentCommand('4.0.1'),
_cmakePresentCommand('3.16.3'),
_ninjaPresentCommand('1.10.0'),
_pkgConfigPresentCommand('0.29'),
..._gtkLibrariesPresentCommands(),
_libraryCheckCommand('blkid'),
_libraryCheckCommand('liblzma'),
_libraryCheckCommand('libgcrypt', exists: false),
]);
final UserMessages userMessages = UserMessages();
final DoctorValidator linuxDoctorValidator = LinuxDoctorValidator(
processManager: processManager,
userMessages: userMessages,
);
final ValidationResult result = await linuxDoctorValidator.validate();
expect(result.type, ValidationType.missing);
expect(result.messages, <ValidationMessage>[
const ValidationMessage('clang version 4.0.1-6+build1'),
const ValidationMessage('cmake version 3.16.3'),
const ValidationMessage('ninja version 1.10.0'),
const ValidationMessage('pkg-config version 0.29'),
ValidationMessage.error(userMessages.gcryptLibraryMissing),
]);
});
testWithoutContext('Missing validation when multiple dependencies are not available', () async { testWithoutContext('Missing validation when multiple dependencies are not available', () async {
final ProcessManager processManager = FakeProcessManager.list(<FakeCommand>[ final ProcessManager processManager = FakeProcessManager.list(<FakeCommand>[
_missingBinaryCommand('clang++'), _missingBinaryCommand('clang++'),
...@@ -454,9 +340,6 @@ void main() { ...@@ -454,9 +340,6 @@ void main() {
_ninjaPresentCommand('1.10.0'), _ninjaPresentCommand('1.10.0'),
_pkgConfigPresentCommand('0.29'), _pkgConfigPresentCommand('0.29'),
..._gtkLibrariesPresentCommands(), ..._gtkLibrariesPresentCommands(),
_libraryCheckCommand('blkid'),
_libraryCheckCommand('liblzma'),
_libraryCheckCommand('libgcrypt'),
]); ]);
final DoctorValidator linuxDoctorValidator = LinuxDoctorValidator( final DoctorValidator linuxDoctorValidator = LinuxDoctorValidator(
processManager: processManager, processManager: processManager,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

HIAST - GitLab