Mirror/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-07-13 03:09:51 +03:00
Code Issues Wiki Activity

testing/flutter: upgrade to 3.32.2

Browse source
This commit is contained in:
LN Liberda 2025-05-21 00:01:55 +02:00 • committed by Patrycja Rosa
parent c7bb7632a2
commit afd909155c
16 changed files with 135 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

10
testing/dart/APKBUILD
View file

@ -2,9 +2,9 @@
# Maintainer: lauren n. liberda <lauren@selfisekai.rocks> # Maintainer: lauren n. liberda <lauren@selfisekai.rocks>
pkgname=dart pkgname=dart
# upgrade checklist: https://md.sdomi.pl/Q-ECZTJ2Qqyp3ahfJuYSBw # upgrade checklist: https://md.sdomi.pl/Q-ECZTJ2Qqyp3ahfJuYSBw
pkgver=3.7.1 pkgver=3.8.1
pkgrel=1 pkgrel=0
_bootstrap=3.7.0_alpha232_p0 _bootstrap=3.8.0_alpha237_p0
pkgdesc="Dart is a client-optimized language for fast apps on any platform" pkgdesc="Dart is a client-optimized language for fast apps on any platform"
url="https://dart.dev/" url="https://dart.dev/"
arch="aarch64 armv7 x86_64" arch="aarch64 armv7 x86_64"
@ -216,7 +216,7 @@ sdk() {
dartdevc dartdevc
gen_kernel_aot gen_kernel_aot
kernel-service kernel-service
kernel_worker kernel_worker_aot
" "
for snap in $_snapshots; do for snap in $_snapshots; do
amove usr/lib/dart/bin/snapshots/$snap.dart.snapshot amove usr/lib/dart/bin/snapshots/$snap.dart.snapshot
@ -229,7 +229,7 @@ sdk() {
} }
sha512sums=" sha512sums="
c8cb1682940a6215e11ad1a4e5361a5627d37fc1d0a58cbef5dd2917a174649ea8826fd08eab6b5659045826c3df03cd4ea78b1bd014ef413e1b05aaa6fb3ded dart-sdk-3.7.1.tar.zst 291e973d32935e677f74a9b19aa3d05c43953846dad3f5fa7a21f2649ca72f22b9bcd8f609654150a2eff1b5be25d18dd6db66e68b5671cf5ae6fb217fc3a8eb dart-sdk-3.8.1.tar.zst
0b0980bc0b699de97e76addf6676e22c8f9544936e36903131b40f34fb915467e80e959c410ddb4519a001814c16d19af9eaaed5fd8fcb795d7bfe9e6d9df661 dart-wrapper.sh 0b0980bc0b699de97e76addf6676e22c8f9544936e36903131b40f34fb915467e80e959c410ddb4519a001814c16d19af9eaaed5fd8fcb795d7bfe9e6d9df661 dart-wrapper.sh
3ae8364a172b029cf0b45cd4fd1ac192a20772c84924bb59a1775339ed6314cf81c398b078823fd9f07abc1b0de4b5704c76ce84c64f8924e645f00cfcda4ff3 build-config.patch 3ae8364a172b029cf0b45cd4fd1ac192a20772c84924bb59a1775339ed6314cf81c398b078823fd9f07abc1b0de4b5704c76ce84c64f8924e645f00cfcda4ff3 build-config.patch
03562a3fa935b6819458acdfcadf24f71accf73e2000d158c1fe41aca068b21fb158350a32911c322672b592beefea1e9c7e4675a98418804e60000049a656c8 gcc13.patch 03562a3fa935b6819458acdfcadf24f71accf73e2000d158c1fe41aca068b21fb158350a32911c322672b592beefea1e9c7e4675a98418804e60000049a656c8 gcc13.patch

64
testing/flutter/APKBUILD
View file

@ -2,13 +2,13 @@
# Maintainer: lauren n. liberda <lauren@selfisekai.rocks> # Maintainer: lauren n. liberda <lauren@selfisekai.rocks>
pkgname=flutter pkgname=flutter
# upgrade checklist: https://md.sdomi.pl/Q-ECZTJ2Qqyp3ahfJuYSBw # upgrade checklist: https://md.sdomi.pl/Q-ECZTJ2Qqyp3ahfJuYSBw
pkgver=3.29.1 pkgver=3.32.2
pkgrel=1 pkgrel=0
pkgdesc="Cross-platform apps, built in Omelas" pkgdesc="Cross-platform apps, built in Omelas"
url="https://flutter.dev/" url="https://flutter.dev/"
arch="aarch64 x86_64" # officially supported for linux desktop arch="aarch64 x86_64" # officially supported for linux desktop
license="BSD-3-Clause" license="BSD-3-Clause"
_dartver=3.7.1 _dartver=3.8.1
_depends_common=" _depends_common="
bash bash
clang clang
@ -100,18 +100,17 @@ source="
pmos-if-touch-is-a-mouse-then-mouse-is-touch.patch pmos-if-touch-is-a-mouse-then-mouse-is-touch.patch
geometry-floats.patch.engine git-revision.patch
git-revision.patch.engine target-musl.patch
target-musl.patch.engine musl-no-execinfo.patch
musl-no-execinfo.patch.engine musl-no-mallinfo.patch
musl-no-mallinfo.patch.engine not-in-git.patch
not-in-git.patch.engine no-vpython.patch
no-vpython.patch.engine shared-libcxx.patch
shared-libcxx.patch.engine libstdc++13.patch
libstdc++13.patch.engine system-icu.patch
system-icu.patch.engine unbundle-engine.patch
unbundle.patch.engine unbundle-icu.patch
unbundle-icu.patch.engine
unbundle-icu.patch.dart unbundle-icu.patch.dart
@ -154,6 +153,7 @@ solutions = [{
'custom_vars': { 'custom_vars': {
'download_android_deps': False, 'download_android_deps': False,
'download_dart_sdk': True, 'download_dart_sdk': True,
'download_fuchsia_deps': False,
}, },
}] }]
target_cpu = ['x64', 'arm', 'arm64', 'riscv64'] target_cpu = ['x64', 'arm', 'arm64', 'riscv64']
@ -172,6 +172,7 @@ target_cpu_only = True
tar -cf flutter-$_canonver.tar \ tar -cf flutter-$_canonver.tar \
--exclude="ChangeLog*" \ --exclude="ChangeLog*" \
--exclude=".build-id" \ --exclude=".build-id" \
--exclude=".tpot_cipd" \
--exclude-backups \ --exclude-backups \
--exclude-caches-all \ --exclude-caches-all \
--exclude-vcs \ --exclude-vcs \
@ -189,10 +190,6 @@ prepare() {
msg "Applying more patches" msg "Applying more patches"
for x in $source; do for x in $source; do
case "$x" in case "$x" in
*.patch.engine)
msg "$x"
patch -p1 -i "$srcdir"/$x -d engine/src
;;
*.patch.dart) *.patch.dart)
msg "$x" msg "$x"
patch -p1 -i "$srcdir"/$x -d engine/src/flutter/third_party/dart patch -p1 -i "$srcdir"/$x -d engine/src/flutter/third_party/dart
@ -485,7 +482,7 @@ tool_developer() {
} }
sha512sums=" sha512sums="
054256cbe197cc15b0dd358a93719212f79819a4c93de187c53ba56061d13a26ecd362f203104be1336785ecebbc32cfbc74529916ad1f9e15ea653ad9b91488 flutter-3.29.1.tar.zst dd39affb58d30d27ce33fc91b030f3795f27251e7c4d3629fd1a305aaf9c6cf1aa010917a0a75caef87301fde6a2ee3422a432270c37695b25386c67a4eabbba flutter-3.32.2.tar.zst
604f9a256fb1ec8c1b3eb6636baa97f195012b89b68197aef28104ed59dbcb70bde4fc1c7e154018999beabda160b60fa1378bcc1cd1ebe71c79071f40ebb26f fonts-3012db47f3130e62f7cc0beabff968a33cbec8d8.zip.noauto 604f9a256fb1ec8c1b3eb6636baa97f195012b89b68197aef28104ed59dbcb70bde4fc1c7e154018999beabda160b60fa1378bcc1cd1ebe71c79071f40ebb26f fonts-3012db47f3130e62f7cc0beabff968a33cbec8d8.zip.noauto
fcce6b1659f3a4ee7849bf7f65a9b8e9b3046fc0cfae70d364efabbff2d6c1ed41e6e9009e5fabc522117cbd2f92c5c664f64426e2606fce6b69d9960dd6ca63 gradle-wrapper-fd5c1f2c013565a3bea56ada6df9d2b8e96d56aa.tar.gz.noauto fcce6b1659f3a4ee7849bf7f65a9b8e9b3046fc0cfae70d364efabbff2d6c1ed41e6e9009e5fabc522117cbd2f92c5c664f64426e2606fce6b69d9960dd6ca63 gradle-wrapper-fd5c1f2c013565a3bea56ada6df9d2b8e96d56aa.tar.gz.noauto
69a6df90f67f03a73a3e5d334b4f31188e2084775e1fe53744eb9cac89314355ba1bff33d93cbf6d2ac231d9a2511a71d9abd57878c2ff4d48e75725452556e4 alpine-target.patch 69a6df90f67f03a73a3e5d334b4f31188e2084775e1fe53744eb9cac89314355ba1bff33d93cbf6d2ac231d9a2511a71d9abd57878c2ff4d48e75725452556e4 alpine-target.patch
@ -493,22 +490,21 @@ cec69e02f72084f29ea27c9d3c5301091016f69f2f63055138bc09d7ba87a7e8709e15b9b0541a0a
f47f3bb1e97c79bdaf5fdd3b466936a335d80d48bffafa7c015a32d97a665d5450e63a33fd5eb0560215de57d556721eaa92db05848257427dd582b10543adda no-lock.patch f47f3bb1e97c79bdaf5fdd3b466936a335d80d48bffafa7c015a32d97a665d5450e63a33fd5eb0560215de57d556721eaa92db05848257427dd582b10543adda no-lock.patch
55a4973e001b425d65b419f92cfe9880a86a47b357e11b82da10d4c27eb8d12b72fbbcf28e25d555dd4e91eeb263089c7ea7a407491691ae591a362d1e314255 no-runtime-download.patch 55a4973e001b425d65b419f92cfe9880a86a47b357e11b82da10d4c27eb8d12b72fbbcf28e25d555dd4e91eeb263089c7ea7a407491691ae591a362d1e314255 no-runtime-download.patch
91e598d9da383519f107c75669d8ec71f85afea38fa9e9a89e2f6c6088ce27f3107ab57e68931c5b27aec73788c9cd81123bcfae87152d878a170465aec9a193 opt-in-analytics.patch 91e598d9da383519f107c75669d8ec71f85afea38fa9e9a89e2f6c6088ce27f3107ab57e68931c5b27aec73788c9cd81123bcfae87152d878a170465aec9a193 opt-in-analytics.patch
d3a31d863d3ded51484d67d7874e0776709dc42e70d2240bf093218ad1d45703e9be2fd25a3c6d58d684226527745d3e9490d9453abcb1aa90a7fc1781d61baf system-dart.patch e35777ac857d58042b9ac90859c80482cdb2f06a14f20163f6d5cdd2cc40a13dc4c6ba3c4bf303d63be0825d2c591ffe4dbbf3c53a40a81d711da0539798cfc2 system-dart.patch
a809cc1ad8598a4f8fe0cef01116b521c3aa8171c9099bb7eb2c0048c1d4283481b7495a125eafb9318f6a92e7bbfd7c5a59f30b925fd8c72fb367473ff3719d unbundle.patch a809cc1ad8598a4f8fe0cef01116b521c3aa8171c9099bb7eb2c0048c1d4283481b7495a125eafb9318f6a92e7bbfd7c5a59f30b925fd8c72fb367473ff3719d unbundle.patch
9af7c6e68c891dfdcb794cd7bd3090b1035c0f6a5c8edd13aeb08a268a103f4a6b99600a2a34d0897a958363f9fbc6d9a23cb0bb9823703204f167f2d5766fc7 version.patch e2ab793319f42b9996b65260414e429d91af5f8fb52a1463e5cc62b5e33b51df3f5c31501e06fb09c4672bfce52637e6373780112c7a377ddb387000630fd607 version.patch
38673902256ee546c45cefd8e82f310ab7207ac50a038efcbf34c67dee04d626fa37462456729e7725729495ecd4ed7c0b16b72967ef768153d189d7b10c7439 pmos-if-touch-is-a-mouse-then-mouse-is-touch.patch 38673902256ee546c45cefd8e82f310ab7207ac50a038efcbf34c67dee04d626fa37462456729e7725729495ecd4ed7c0b16b72967ef768153d189d7b10c7439 pmos-if-touch-is-a-mouse-then-mouse-is-touch.patch
49afc6fb142680d42a27716a1f2fcb39a1240934a02d04117ec7cc6bf1da29a960f3bd25215da1211664da48c2cf5a3fda9d684197eee9606ddc76c36801b17e geometry-floats.patch.engine de594cddd70f8fada86dcc73cd37f5638b560d0b4015355cc088a912d0e58b6c8e8d9cd2cea582907720675c0014e475a4e642b3d2dc42a71157f85f6530168a git-revision.patch
2c74f25be53500f1b91bd920751dae72913167f7c45aa5aeec28a1712cc723ae469957ebbae60c230439af15483d5186052cef8e4f0e2caf3111d5b73234ed0d git-revision.patch.engine 9f4bf6a2182dd1887f58db02468f1e512e482279e56604d11c4cdffee82a933e2e01c1db1bd35d7110c090cab96253a1b8fc3eb4de977c46f9cfadb8facb5078 target-musl.patch
d60578a06001d3c6393b4f429f8cf32d50289c34b5157404ddb945d4e52c7c6733f4659128b3dfce9dc02efd9b498b75c1f3ec7533ccceaab9496577a5d628f8 target-musl.patch.engine 656c39aa5a0395029c5d75b747c1a1cf3ec3480d9e6faea578f5c5de5ee19c891008b687c1641b83f11b535a75fed5e674139ec03ce97edbc5f7d957d28f7f05 musl-no-execinfo.patch
d2c55af9dc64c380905cd5d9bc792cec2e37063265cc84643b77995f9787d2239fe34f596a575ac6aa9eae5d82cd55dcd1ed20d59f58c631291064a8c9ae47c0 musl-no-execinfo.patch.engine b3675f9e63f2ef18d7087acf439ef8a33a732a0cf09f30e13cb6a9e80f5b427524c7c300c3948a44c18f4578093a8fe2f47d215ed05ec199ed22646adcc607e4 musl-no-mallinfo.patch
5794a5f9f8532dc6615bc7c89c2f5953ad09a4e8cc1ef7618c9fa8a7816488714ab972b83fef0ff87da797404e182c516975d3376493b906be067edcda015914 musl-no-mallinfo.patch.engine 73372422e646dca55ab05675e77b6788f858157a5728e413d2f02a372d6c987cc91c1649e5b919c82c01cb66365a0eb431226a5bf44ab44e573d7e3f8b303faa not-in-git.patch
592e4d2239162f7c8f34a54b80d9d67fecd1d65924e06f23851362d6fecd6eed6f6ade18f463b5b9197641bdbf30be6717f19466d8c4a2b831d766cb68822dff not-in-git.patch.engine 2e06cf1603a98e34a0fa0649c55c5e08d321f4016e193338df1fd9f43646cfb3ec98722bd80de5daac6a9794f52bb1fc904ea789ee8a4550e8f21337c45abf9f no-vpython.patch
6634043f5618835dd9f33a3ec473cdf11bfae2456ee670e2ea24c14f8f1f9d45f9dc273dcb035400d18404e74833c4df1d57e78a00de8010aa7e1e68099db6cd no-vpython.patch.engine 0ab3da56dceb720fb89e65964f1f720db7dad3001dacaf572e94b73e5bdc3973642d7b4264950f40345473b807c206a418351532fcc057f6ed216296dd91d23b shared-libcxx.patch
e138d2b393db3aa1328199fc4d1ac4b2e0ef8384faf04bf077c6fd97ef9813f94b7f25fccbe5fed4919d7ec0bbd800289b5d3a9b8bc654cbe5c5574fb6bee329 shared-libcxx.patch.engine f366401388627579dbe0ffac6044ee510b1b365ef703c0883eb3ac11c759ea19bceb9b4b4ebb21f187f4ee2e91dd232afbb71dee7d3f668f249ba7335c5c8758 libstdc++13.patch
1c7c06470881151ecd899b79e9ca5fb7661183c3124cfcfb711ceacbc8527ee50ba943307346db31dc72d3e8c102de690327730399887543cc5ca41ac2c41159 libstdc++13.patch.engine 85f45aaab4e76f77cea158d4b6b743641c41107dd696c752fab642eb532d5afbce975c837bb16f96d8df9dc5ba53e3eb88a65bcd30daa6a4b11fb46aff5420f9 system-icu.patch
56ab8c8ee82be1e39698605888b71a829ac59e309d1d02f932794b0ed4b0f2e8e7382e4530217723234733509a7a0c65e0e7627084c88687f00ab464cdd307c1 system-icu.patch.engine fc9b25804091f7b05cf6b51cd69f6065052f330e0392fb8f2ad82ed31cee84a94fa42852e7c59062e1232cadb300421eed72f7e32827581fd4d4fc8799cf5fc7 unbundle-engine.patch
160813c47cc3d12b2623208566b81be167781d2f16b1e57493ba565a0efc8b78b30c9af1f2962cfa7e9e96b61bf0357427af38f9130e219875528bdcd1588c66 unbundle.patch.engine 5762c2caeeef074afeab2f055ae7ec7bd11a017e6dc62bf41cd2e493322d5f03fdacec03ac9721aaf95b8cef72b3b2fe73586efab229cce7403bf8f2df27bdd9 unbundle-icu.patch
897df86c37e8d42296141e13da646b35a135391bdf78c922479d1e4f7af849e47213bc0bcc65415828c9ef794b855d4c5832c6ad781c78efb6c57bda8a7669de unbundle-icu.patch.engine
04478a0927c4f1c316346fc0e53386a841493b1e5c7facb4e2a2fffd11b5110a3779bca8bc5a33510964d320f24e883b6afc653c48849380c5b9097611a3eb55 unbundle-icu.patch.dart 04478a0927c4f1c316346fc0e53386a841493b1e5c7facb4e2a2fffd11b5110a3779bca8bc5a33510964d320f24e883b6afc653c48849380c5b9097611a3eb55 unbundle-icu.patch.dart
38e6484b18cff811be30da4f770b281cbffccbcbd813121d55eb869edfca7e4ff751d59e6bfcc79c23d427d021d0fd363a7eff26bbc11a5dc90de2be1a153c4e flutter 38e6484b18cff811be30da4f770b281cbffccbcbd813121d55eb869edfca7e4ff751d59e6bfcc79c23d427d021d0fd363a7eff26bbc11a5dc90de2be1a153c4e flutter
" "

11
testing/flutter/geometry-floats.patch.engine
View file

@ -1,11 +0,0 @@
--- ./flutter/impeller/entity/geometry/round_superellipse_geometry.cc.orig
+++ ./flutter/impeller/entity/geometry/round_superellipse_geometry.cc
@@ -419,7 +419,7 @@
Point pointM{size / 2 - g, size / 2 - g};
Point pointS{s, s};
Point pointJ =
- Point{pow(abs(sinf(thetaJ)), 2 / n), pow(abs(cosf(thetaJ)), 2 / n)} * a +
+ Point{std::powf(std::fabs(sinf(thetaJ)), 2 / n), std::powf(std::fabs(cosf(thetaJ)), 2 / n)} * a +
pointS;
Matrix translationS = Matrix::MakeTranslation(pointS);

8
testing/flutter/git-revision.patch.engine → testing/flutter/git-revision.patch
View file

@ -1,5 +1,5 @@
--- a/flutter/build/git_revision.py --- a/engine/src/flutter/build/git_revision.py
+++ b/flutter/build/git_revision.py +++ b/engine/src/flutter/build/git_revision.py
@@ -22,18 +22,7 @@ @@ -22,18 +22,7 @@
if not os.path.exists(repository): if not os.path.exists(repository):
raise IOError('path does not exist') raise IOError('path does not exist')
@ -20,8 +20,8 @@
def main(): def main():
--- ./flutter/tools/gn.orig --- ./engine/src/flutter/tools/gn.orig
+++ ./flutter/tools/gn +++ ./engine/src/flutter/tools/gn
@@ -286,18 +286,7 @@ @@ -286,18 +286,7 @@
if not os.path.exists(repository): if not os.path.exists(repository):
raise IOError('path does not exist') raise IOError('path does not exist')

4
testing/flutter/libstdc++13.patch.engine → testing/flutter/libstdc++13.patch
View file

@ -1,7 +1,7 @@
missing libstdc++13 includes missing libstdc++13 includes
-- --
--- ./flutter/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h.orig --- ./engine/src/flutter/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h.orig
+++ ./flutter/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h +++ ./engine/src/flutter/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
@@ -2566,6 +2566,7 @@ @@ -2566,6 +2566,7 @@
#undef VMA_IMPLEMENTATION #undef VMA_IMPLEMENTATION

4
testing/flutter/musl-no-execinfo.patch.engine → testing/flutter/musl-no-execinfo.patch
View file

@ -1,5 +1,5 @@
--- a/flutter/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h --- a/engine/src/flutter/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
+++ b/flutter/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h +++ b/engine/src/flutter/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
@@ -58,7 +58,7 @@ @@ -58,7 +58,7 @@
#define HAVE_ERRNO_H 1 #define HAVE_ERRNO_H 1

8
testing/flutter/musl-no-mallinfo.patch.engine → testing/flutter/musl-no-mallinfo.patch
View file

@ -1,5 +1,5 @@
--- ./flutter/third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc --- ./engine/src/flutter/third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc
+++ ./flutter/third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc.orig +++ ./engine/src/flutter/third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc.orig
@@ -86,11 +86,11 @@ @@ -86,11 +86,11 @@
} }
@ -15,8 +15,8 @@
mi = ::mallinfo(); mi = ::mallinfo();
return mi.uordblks; return mi.uordblks;
--- ./flutter/third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h.orig 2019-09-30 13:03:42.556880537 -0400 --- ./engine/src/flutter/third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h.orig 2019-09-30 13:03:42.556880537 -0400
+++ ./flutter/third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h 2019-09-30 13:07:27.989821227 -0400 +++ ./engine/src/flutter/third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h 2019-09-30 13:07:27.989821227 -0400
@@ -122,7 +122,9 @@ @@ -122,7 +122,9 @@
/* #undef HAVE_MALLCTL */ /* #undef HAVE_MALLCTL */

4
testing/flutter/no-vpython.patch.engine → testing/flutter/no-vpython.patch
View file

@ -1,5 +1,5 @@
--- ./.gn.orig --- ./engine/src/.gn.orig
+++ ./.gn +++ ./engine/src/.gn
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
# Use vpython3 from depot_tools for exec_script() calls. # Use vpython3 from depot_tools for exec_script() calls.

4
testing/flutter/not-in-git.patch.engine → testing/flutter/not-in-git.patch
View file

@ -1,5 +1,5 @@
--- ./flutter/tools/pub_get_offline.py.orig --- ./engine/src/flutter/tools/pub_get_offline.py.orig
+++ ./flutter/tools/pub_get_offline.py +++ ./engine/src/flutter/tools/pub_get_offline.py
@@ -148,10 +148,6 @@ @@ -148,10 +148,6 @@
SRC_ROOT, 'flutter', 'third_party', 'dart', 'tools', 'sdks', 'dart-sdk', 'bin' SRC_ROOT, 'flutter', 'third_party', 'dart', 'tools', 'sdks', 'dart-sdk', 'bin'
) )

12
testing/flutter/shared-libcxx.patch.engine → testing/flutter/shared-libcxx.patch
View file

@ -1,5 +1,5 @@
--- ./build/config/BUILDCONFIG.gn.orig --- ./engine/src/build/config/BUILDCONFIG.gn.orig
+++ ./build/config/BUILDCONFIG.gn +++ ./engine/src/build/config/BUILDCONFIG.gn
@@ -324,7 +324,7 @@ @@ -324,7 +324,7 @@
is_clang = true is_clang = true
} }
@ -9,8 +9,8 @@
if (is_msan && !is_linux) { if (is_msan && !is_linux) {
assert(false, "Memory sanitizer is only available on Linux.") assert(false, "Memory sanitizer is only available on Linux.")
--- ./flutter/third_party/flatbuffers/include/flatbuffers/util.h.orig --- ./engine/src/flutter/third_party/flatbuffers/include/flatbuffers/util.h.orig
+++ ./flutter/third_party/flatbuffers/include/flatbuffers/util.h +++ ./engine/src/flutter/third_party/flatbuffers/include/flatbuffers/util.h
@@ -202,7 +202,7 @@ @@ -202,7 +202,7 @@
// clang-format off // clang-format off
@ -20,8 +20,8 @@
class ClassicLocale { class ClassicLocale {
#ifdef _MSC_VER #ifdef _MSC_VER
typedef _locale_t locale_type; typedef _locale_t locale_type;
--- ./flutter/third_party/flatbuffers/src/util.cpp.orig --- ./engine/src/flutter/third_party/flatbuffers/src/util.cpp.orig
+++ ./flutter/third_party/flatbuffers/src/util.cpp +++ ./engine/src/flutter/third_party/flatbuffers/src/util.cpp
@@ -252,7 +252,7 @@ @@ -252,7 +252,7 @@
} }

11
testing/flutter/system-dart.patch
View file

@ -21,17 +21,6 @@ Thanks a lot, Braid
- -
-exec "${dart_bin_dir}/dart" "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.dart" "${@:1}" -exec "${dart_bin_dir}/dart" "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.dart" "${@:1}"
+exec "${DART_ROOT:-"/usr/lib/dart"}/bin/dart" "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.dart" "${@:1}" +exec "${DART_ROOT:-"/usr/lib/dart"}/bin/dart" "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.dart" "${@:1}"
--- ./packages/flutter_tools/gradle/src/main/groovy/flutter.groovy.orig
+++ ./packages/flutter_tools/gradle/src/main/groovy/flutter.groovy
@@ -324,7 +324,7 @@
}
String flutterExecutableName = Os.isFamily(Os.FAMILY_WINDOWS) ? "flutter.bat" : "flutter"
- flutterExecutable = Paths.get(flutterRoot.absolutePath, "bin", flutterExecutableName).toFile()
+ flutterExecutable = Paths.get("/usr", "bin", flutterExecutableName).toFile()
// Validate that the provided Gradle, Java, AGP, and KGP versions are all within our
// supported range.
--- ./packages/flutter_tools/lib/src/artifacts.dart.orig --- ./packages/flutter_tools/lib/src/artifacts.dart.orig
+++ ./packages/flutter_tools/lib/src/artifacts.dart +++ ./packages/flutter_tools/lib/src/artifacts.dart
@@ -2,6 +2,8 @@ @@ -2,6 +2,8 @@

8
testing/flutter/system-icu.patch.engine → testing/flutter/system-icu.patch
View file

@ -11,8 +11,8 @@ the position that it was, is now the position that it isn't.
XXX: remove this field and whatever is trying to override the icu default with it XXX: remove this field and whatever is trying to override the icu default with it
--- a/flutter/shell/platform/linux/fl_dart_project.cc --- a/engine/src/flutter/shell/platform/linux/fl_dart_project.cc
+++ b/flutter/shell/platform/linux/fl_dart_project.cc +++ b/engine/src/flutter/shell/platform/linux/fl_dart_project.cc
@@ -64,7 +64,7 @@ @@ -64,7 +64,7 @@
self->assets_path = self->assets_path =
g_build_filename(executable_dir, "data", "flutter_assets", nullptr); g_build_filename(executable_dir, "data", "flutter_assets", nullptr);
@ -22,8 +22,8 @@ XXX: remove this field and whatever is trying to override the icu default with i
return self; return self;
} }
--- ./flutter/build/archives/BUILD.gn.orig --- ./engine/src/flutter/build/archives/BUILD.gn.orig
+++ ./flutter/build/archives/BUILD.gn +++ ./engine/src/flutter/build/archives/BUILD.gn
@@ -72,10 +72,6 @@ @@ -72,10 +72,6 @@
} }
files += [ files += [

20
testing/flutter/target-musl.patch.engine → testing/flutter/target-musl.patch
View file

@ -12,10 +12,10 @@ Subject: [PATCH 1/2] add gn args specifying libc for linux
create mode 100755 build/config/linux/detect_host_libc.py create mode 100755 build/config/linux/detect_host_libc.py
create mode 100644 build/config/linux/libc.gni create mode 100644 build/config/linux/libc.gni
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn diff --git a/engine/src/build/config/compiler/BUILD.gn b/engine/src/build/config/compiler/BUILD.gn
index 4c9a1ee..155d433 100644 index 4c9a1ee..155d433 100644
--- ./build/config/compiler/BUILD.gn.orig --- ./engine/src/build/config/compiler/BUILD.gn.orig
+++ ./build/config/compiler/BUILD.gn +++ ./engine/src/build/config/compiler/BUILD.gn
@@ -12,6 +12,9 @@ @@ -12,6 +12,9 @@
if (is_win) { if (is_win) {
import("//build/config/win/visual_studio_version.gni") import("//build/config/win/visual_studio_version.gni")
@ -54,11 +54,11 @@ index 4c9a1ee..155d433 100644
if (is_wasm) { if (is_wasm) {
default_warning_flags += [ default_warning_flags += [
diff --git a/build/config/linux/detect_host_libc.py b/build/config/linux/detect_host_libc.py diff --git a/engine/src/build/config/linux/detect_host_libc.py b/engine/src/build/config/linux/detect_host_libc.py
new file mode 100755 new file mode 100755
index 0000000..1ebb498 index 0000000..1ebb498
--- /dev/null --- /dev/null
+++ b/build/config/linux/detect_host_libc.py +++ b/engine/src/build/config/linux/detect_host_libc.py
@@ -0,0 +1,42 @@ @@ -0,0 +1,42 @@
+#!/usr/bin/env python3 +#!/usr/bin/env python3
+# +#
@ -102,11 +102,11 @@ index 0000000..1ebb498
+ +
+if __name__ == '__main__': +if __name__ == '__main__':
+ sys.exit(main()) + sys.exit(main())
diff --git a/build/config/linux/libc.gni b/build/config/linux/libc.gni diff --git a/engine/src/build/config/linux/libc.gni b/engine/src/build/config/linux/libc.gni
new file mode 100644 new file mode 100644
index 0000000..653f312 index 0000000..653f312
--- /dev/null --- /dev/null
+++ b/build/config/linux/libc.gni +++ b/engine/src/build/config/linux/libc.gni
@@ -0,0 +1,51 @@ @@ -0,0 +1,51 @@
+# Copyright (c) 2013 The Flutter Authors. All rights reserved. +# Copyright (c) 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be +# Use of this source code is governed by a BSD-style license that can be
@ -159,10 +159,10 @@ index 0000000..653f312
+ +
+is_host_glibc = host_libc == "gnu" +is_host_glibc = host_libc == "gnu"
+is_host_musl = host_libc == "musl" +is_host_musl = host_libc == "musl"
diff --git a/build/toolchain/linux/BUILD.gn b/build/toolchain/linux/BUILD.gn diff --git a/engine/src/build/toolchain/linux/BUILD.gn b/engine/src/build/toolchain/linux/BUILD.gn
index 05630d0..b1288ce 100644 index 05630d0..b1288ce 100644
--- a/build/toolchain/linux/BUILD.gn --- a/engine/src/build/toolchain/linux/BUILD.gn
+++ b/build/toolchain/linux/BUILD.gn +++ b/engine/src/build/toolchain/linux/BUILD.gn
@@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.

54
testing/flutter/unbundle.patch.engine → testing/flutter/unbundle-engine.patch
View file

@ -1,8 +1,8 @@
diff --git a/build/linux/unbundle/freetype2.gn b/build/linux/unbundle/freetype2.gn diff --git a/engine/src/build/linux/unbundle/freetype2.gn b/engine/src/build/linux/unbundle/freetype2.gn
new file mode 100644 new file mode 100644
index 0000000..3b8cafb index 0000000..3b8cafb
--- /dev/null --- /dev/null
+++ b/build/linux/unbundle/freetype2.gn +++ b/engine/src/build/linux/unbundle/freetype2.gn
@@ -0,0 +1,35 @@ @@ -0,0 +1,35 @@
+# Copyright 2013 The Flutter Authors. All rights reserved. +# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be +# Use of this source code is governed by a BSD-style license that can be
@ -39,11 +39,11 @@ index 0000000..3b8cafb
+ ":system_freetype2", + ":system_freetype2",
+ ] + ]
+} +}
diff --git a/build/linux/unbundle/harfbuzz.gn b/build/linux/unbundle/harfbuzz.gn diff --git a/engine/src/build/linux/unbundle/harfbuzz.gn b/engine/src/build/linux/unbundle/harfbuzz.gn
new file mode 100644 new file mode 100644
index 0000000..72d3e06 index 0000000..72d3e06
--- /dev/null --- /dev/null
+++ b/build/linux/unbundle/harfbuzz.gn +++ b/engine/src/build/linux/unbundle/harfbuzz.gn
@@ -0,0 +1,31 @@ @@ -0,0 +1,31 @@
+# Copyright 2013 The Flutter Authors. All rights reserved. +# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be +# Use of this source code is governed by a BSD-style license that can be
@ -76,11 +76,11 @@ index 0000000..72d3e06
+ ] + ]
+ public_configs = [ ":system_harfbuzz_subset" ] + public_configs = [ ":system_harfbuzz_subset" ]
+} +}
diff --git a/build/linux/unbundle/icu.gn b/build/linux/unbundle/icu.gn diff --git a/engine/src/build/linux/unbundle/icu.gn b/engine/src/build/linux/unbundle/icu.gn
new file mode 100644 new file mode 100644
index 0000000..9e54d4e index 0000000..9e54d4e
--- /dev/null --- /dev/null
+++ b/build/linux/unbundle/icu.gn +++ b/engine/src/build/linux/unbundle/icu.gn
@@ -0,0 +1,264 @@ @@ -0,0 +1,264 @@
+# Copyright 2016 The Chromium Authors +# Copyright 2016 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be +# Use of this source code is governed by a BSD-style license that can be
@ -346,11 +346,11 @@ index 0000000..9e54d4e
+ ] + ]
+ additional_includes = [ "flutter" ] + additional_includes = [ "flutter" ]
+} +}
diff --git a/build/linux/unbundle/libjpeg-turbo.gn b/build/linux/unbundle/libjpeg-turbo.gn diff --git a/engine/src/build/linux/unbundle/libjpeg-turbo.gn b/engine/src/build/linux/unbundle/libjpeg-turbo.gn
new file mode 100644 new file mode 100644
index 0000000..be0c674 index 0000000..be0c674
--- /dev/null --- /dev/null
+++ b/build/linux/unbundle/libjpeg-turbo.gn +++ b/engine/src/build/linux/unbundle/libjpeg-turbo.gn
@@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
+# Copyright 2013 The Flutter Authors. All rights reserved. +# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be +# Use of this source code is governed by a BSD-style license that can be
@ -363,11 +363,11 @@ index 0000000..be0c674
+group("libjpeg") { +group("libjpeg") {
+ public_configs = [ ":libjpeg_config" ] + public_configs = [ ":libjpeg_config" ]
+} +}
diff --git a/build/linux/unbundle/libpng.gn b/build/linux/unbundle/libpng.gn diff --git a/engine/src/build/linux/unbundle/libpng.gn b/engine/src/build/linux/unbundle/libpng.gn
new file mode 100644 new file mode 100644
index 0000000..91e0ee4 index 0000000..91e0ee4
--- /dev/null --- /dev/null
+++ b/build/linux/unbundle/libpng.gn +++ b/engine/src/build/linux/unbundle/libpng.gn
@@ -0,0 +1,23 @@ @@ -0,0 +1,23 @@
+# Copyright 2016 The Chromium Authors +# Copyright 2016 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be +# Use of this source code is governed by a BSD-style license that can be
@ -392,11 +392,11 @@ index 0000000..91e0ee4
+ deps = [ ":libpng_shim" ] + deps = [ ":libpng_shim" ]
+ public_configs = [ ":libpng_config" ] + public_configs = [ ":libpng_config" ]
+} +}
diff --git a/build/linux/unbundle/libwebp.gn b/build/linux/unbundle/libwebp.gn diff --git a/engine/src/build/linux/unbundle/libwebp.gn b/engine/src/build/linux/unbundle/libwebp.gn
new file mode 100644 new file mode 100644
index 0000000..708cc9c index 0000000..708cc9c
--- /dev/null --- /dev/null
+++ b/build/linux/unbundle/libwebp.gn +++ b/engine/src/build/linux/unbundle/libwebp.gn
@@ -0,0 +1,35 @@ @@ -0,0 +1,35 @@
+# Copyright 2016 The Chromium Authors +# Copyright 2016 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be +# Use of this source code is governed by a BSD-style license that can be
@ -433,11 +433,11 @@ index 0000000..708cc9c
+group("libwebp") { +group("libwebp") {
+ deps = [ ":libwebp_webp" ] + deps = [ ":libwebp_webp" ]
+} +}
diff --git a/build/linux/unbundle/libxml.gn b/build/linux/unbundle/libxml.gn diff --git a/engine/src/build/linux/unbundle/libxml.gn b/engine/src/build/linux/unbundle/libxml.gn
new file mode 100644 new file mode 100644
index 0000000..b42d044 index 0000000..b42d044
--- /dev/null --- /dev/null
+++ b/build/linux/unbundle/libxml.gn +++ b/engine/src/build/linux/unbundle/libxml.gn
@@ -0,0 +1,13 @@ @@ -0,0 +1,13 @@
+# Copyright 2016 The Chromium Authors +# Copyright 2016 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be +# Use of this source code is governed by a BSD-style license that can be
@ -452,11 +452,11 @@ index 0000000..b42d044
+source_set("libxml") { +source_set("libxml") {
+ public_configs = [ ":system_libxml" ] + public_configs = [ ":system_libxml" ]
+} +}
diff --git a/build/linux/unbundle/replace_gn_files.py b/build/linux/unbundle/replace_gn_files.py diff --git a/engine/src/build/linux/unbundle/replace_gn_files.py b/engine/src/build/linux/unbundle/replace_gn_files.py
new file mode 100755 new file mode 100755
index 0000000..b8b24c6 index 0000000..b8b24c6
--- /dev/null --- /dev/null
+++ b/build/linux/unbundle/replace_gn_files.py +++ b/engine/src/build/linux/unbundle/replace_gn_files.py
@@ -0,0 +1,101 @@ @@ -0,0 +1,101 @@
+#!/usr/bin/env python3 +#!/usr/bin/env python3
+# Copyright 2016 The Chromium Authors +# Copyright 2016 The Chromium Authors
@ -497,7 +497,7 @@ index 0000000..b8b24c6
+ # + #
+ 'fontconfig': 'third_party/fontconfig/BUILD.gn', + 'fontconfig': 'third_party/fontconfig/BUILD.gn',
+ 'freetype2': 'flutter/third_party/freetype2/BUILD.gn', + 'freetype2': 'flutter/third_party/freetype2/BUILD.gn',
+ 'harfbuzz': 'flutter/third_party/harfbuzz/BUILD.gn', + 'harfbuzz': 'flutter/build/secondary/flutter/third_party/harfbuzz/BUILD.gn',
+ 'icu': 'flutter/third_party/icu/BUILD.gn', + 'icu': 'flutter/third_party/icu/BUILD.gn',
+ 'libjpeg-turbo': 'flutter/third_party/libjpeg-turbo/BUILD.gn', + 'libjpeg-turbo': 'flutter/third_party/libjpeg-turbo/BUILD.gn',
+ 'libpng': 'flutter/third_party/libpng/BUILD.gn', + 'libpng': 'flutter/third_party/libpng/BUILD.gn',
@ -559,11 +559,11 @@ index 0000000..b8b24c6
+ +
+if __name__ == '__main__': +if __name__ == '__main__':
+ sys.exit(DoMain(sys.argv[1:])) + sys.exit(DoMain(sys.argv[1:]))
diff --git a/build/linux/unbundle/sqlite.gn b/build/linux/unbundle/sqlite.gn diff --git a/engine/src/build/linux/unbundle/sqlite.gn b/engine/src/build/linux/unbundle/sqlite.gn
new file mode 100644 new file mode 100644
index 0000000..e6c653d index 0000000..e6c653d
--- /dev/null --- /dev/null
+++ b/build/linux/unbundle/sqlite.gn +++ b/engine/src/build/linux/unbundle/sqlite.gn
@@ -0,0 +1,20 @@ @@ -0,0 +1,20 @@
+# Copyright 2013 The Flutter Authors. All rights reserved. +# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be +# Use of this source code is governed by a BSD-style license that can be
@ -585,11 +585,11 @@ index 0000000..e6c653d
+ public_deps = [ ":sqlite_shim" ] + public_deps = [ ":sqlite_shim" ]
+ public_configs = [ ":system_sqlite" ] + public_configs = [ ":system_sqlite" ]
+} +}
diff --git a/build/linux/unbundle/zlib.gn b/build/linux/unbundle/zlib.gn diff --git a/engine/src/build/linux/unbundle/zlib.gn b/engine/src/build/linux/unbundle/zlib.gn
new file mode 100644 new file mode 100644
index 0000000..6daf3c6 index 0000000..6daf3c6
--- /dev/null --- /dev/null
+++ b/build/linux/unbundle/zlib.gn +++ b/engine/src/build/linux/unbundle/zlib.gn
@@ -0,0 +1,72 @@ @@ -0,0 +1,72 @@
+# Copyright 2016 The Chromium Authors +# Copyright 2016 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be +# Use of this source code is governed by a BSD-style license that can be
@ -663,11 +663,11 @@ index 0000000..6daf3c6
+ ] + ]
+ deps = [ ":zlib" ] + deps = [ ":zlib" ]
+} +}
diff --git a/build/shim_headers.gni b/build/shim_headers.gni diff --git a/engine/src/build/shim_headers.gni b/engine/src/build/shim_headers.gni
new file mode 100644 new file mode 100644
index 0000000..1d24e0a index 0000000..1d24e0a
--- /dev/null --- /dev/null
+++ b/build/shim_headers.gni +++ b/engine/src/build/shim_headers.gni
@@ -0,0 +1,42 @@ @@ -0,0 +1,42 @@
+# Copyright 2016 The Chromium Authors +# Copyright 2016 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be +# Use of this source code is governed by a BSD-style license that can be
@ -711,11 +711,11 @@ index 0000000..1d24e0a
+ all_dependent_configs = [ ":${config_name}" ] + all_dependent_configs = [ ":${config_name}" ]
+ } + }
+} +}
diff --git a/tools/generate_shim_headers.py b/tools/generate_shim_headers.py diff --git a/engine/src/tools/generate_shim_headers.py b/engine/src/tools/generate_shim_headers.py
new file mode 100644 new file mode 100644
index 0000000..aaa16f8 index 0000000..aaa16f8
--- /dev/null --- /dev/null
+++ b/tools/generate_shim_headers.py +++ b/engine/src/tools/generate_shim_headers.py
@@ -0,0 +1,116 @@ @@ -0,0 +1,116 @@
+#!/usr/bin/env python +#!/usr/bin/env python
+# Copyright 2012 The Chromium Authors +# Copyright 2012 The Chromium Authors
@ -834,7 +834,7 @@ index 0000000..aaa16f8
+if __name__ == '__main__': +if __name__ == '__main__':
+ DoMain(sys.argv[1:]) + DoMain(sys.argv[1:])
--- /dev/null --- /dev/null
+++ ./build/linux/unbundle/vulkan-SPIRV-Headers.gn +++ ./engine/src/build/linux/unbundle/vulkan-SPIRV-Headers.gn
@@ -0,0 +1,19 @@ @@ -0,0 +1,19 @@
+# This shim can only be used if you build Chromium without DAWN +# This shim can only be used if you build Chromium without DAWN
+ +
@ -856,7 +856,7 @@ index 0000000..aaa16f8
+ deps = [ ":vulkan-SPIRV-Headers_shim" ] + deps = [ ":vulkan-SPIRV-Headers_shim" ]
+} +}
--- /dev/null --- /dev/null
+++ ./build/linux/unbundle/vulkan-SPIRV-Tools.gn +++ ./engine/src/build/linux/unbundle/vulkan-SPIRV-Tools.gn
@@ -0,0 +1,73 @@ @@ -0,0 +1,73 @@
+# This shim can only be used if you build Chromium without DAWN +# This shim can only be used if you build Chromium without DAWN
+ +

33
testing/flutter/unbundle-icu.patch.engine → testing/flutter/unbundle-icu.patch
View file

@ -1,5 +1,5 @@
--- ./flutter/shell/platform/embedder/BUILD.gn.orig --- ./engine/src/flutter/shell/platform/embedder/BUILD.gn.orig
+++ ./flutter/shell/platform/embedder/BUILD.gn +++ ./engine/src/flutter/shell/platform/embedder/BUILD.gn
@@ -458,13 +458,6 @@ @@ -458,13 +458,6 @@
] ]
} }
@ -24,8 +24,8 @@
] ]
diff --git a/flutter/impeller/toolkit/interop/BUILD.gn b/flutter/impeller/toolkit/interop/BUILD.gn diff --git a/flutter/impeller/toolkit/interop/BUILD.gn b/flutter/impeller/toolkit/interop/BUILD.gn
index 500410359d..a78c1fa418 100644 index 500410359d..a78c1fa418 100644
--- a/flutter/impeller/toolkit/interop/BUILD.gn --- a/engine/src/flutter/impeller/toolkit/interop/BUILD.gn
+++ b/flutter/impeller/toolkit/interop/BUILD.gn +++ b/engine/src/flutter/impeller/toolkit/interop/BUILD.gn
@@ -5,14 +5,6 @@ @@ -5,14 +5,6 @@
import("//flutter/build/zip_bundle.gni") import("//flutter/build/zip_bundle.gni")
import("//flutter/impeller/tools/impeller.gni") import("//flutter/impeller/tools/impeller.gni")
@ -38,22 +38,21 @@ index 500410359d..a78c1fa418 100644
- deps = [] - deps = []
-} -}
- -
impeller_component("interop") { # The public C/C++ Impeller API.
sources = [ impeller_component("interop_api") {
"color_filter.cc", public = [
@@ -67,8 +59,6 @@ impeller_component("interop") { @@ -72,7 +64,6 @@
"//flutter/fml",
"//flutter/third_party/txt",
] ]
-
- deps = [ ":embedded_icu_data" ]
}
impeller_component("library") { public_deps = [
diff --git a/flutter/impeller/toolkit/interop/typography_context.cc b/flutter/impeller/toolkit/interop/typography_context.cc - ":embedded_icu_data",
":interop_api",
"../../base",
"../../display_list",
diff --git a/engine/src/flutter/impeller/toolkit/interop/typography_context.cc b/engine/src/flutter/impeller/toolkit/interop/typography_context.cc
index ed863fa61e..737d087907 100644 index ed863fa61e..737d087907 100644
--- a/flutter/impeller/toolkit/interop/typography_context.cc --- a/engine/src/flutter/impeller/toolkit/interop/typography_context.cc
+++ b/flutter/impeller/toolkit/interop/typography_context.cc +++ b/engine/src/flutter/impeller/toolkit/interop/typography_context.cc
@@ -9,7 +9,6 @@ @@ -9,7 +9,6 @@
#include "flutter/fml/icu_util.h" #include "flutter/fml/icu_util.h"
#include "flutter/third_party/txt/src/txt/platform.h" #include "flutter/third_party/txt/src/txt/platform.h"

37
testing/flutter/version.patch
View file

@ -32,20 +32,25 @@
return _FlutterVersionGit._( return _FlutterVersionGit._(
clock: clock, clock: clock,
flutterRoot: flutterRoot, flutterRoot: flutterRoot,
@@ -192,11 +189,7 @@ @@ -198,16 +195,7 @@
// TODO(fujino): calculate this relative to frameworkCommitDate for final String flutterRoot;
// _FlutterVersionFromFile so we don't need a git call.
String get frameworkAge { String _getTimeSinceCommit({String? revision}) {
- return _frameworkAge ??= _runGit( - return _runGit(
- FlutterVersion.gitLog(<String>['-n', '1', '--pretty=format:%ar']).join(' '), - FlutterVersion.gitLog(<String>[
- '-n',
- '1',
- '--pretty=format:%ar',
- if (revision != null) revision,
- ]).join(' '),
- globals.processUtils, - globals.processUtils,
- flutterRoot, - flutterRoot,
- ); - );
+ return _frameworkAge ??= 'unknown (alpine package)'; + return 'unknown (alpine package)';
} }
void ensureVersionFile(); // TODO(fujino): calculate this relative to frameworkCommitDate for
@@ -281,44 +274,7 @@ @@ -310,44 +298,7 @@
/// Returns null if the cached version is out-of-date or missing, and we are /// Returns null if the cached version is out-of-date or missing, and we are
/// unable to reach the server to get the latest version. /// unable to reach the server to get the latest version.
Future<DateTime?> _getLatestAvailableFlutterDate() async { Future<DateTime?> _getLatestAvailableFlutterDate() async {
@ -91,7 +96,7 @@
} }
/// The date of the latest framework commit in the remote repository. /// The date of the latest framework commit in the remote repository.
@@ -404,30 +360,13 @@ @@ -433,30 +384,13 @@
bool lenient = false, bool lenient = false,
required String? workingDirectory, required String? workingDirectory,
}) { }) {
@ -129,7 +134,7 @@
} }
class _FlutterVersionFromFile extends FlutterVersion { class _FlutterVersionFromFile extends FlutterVersion {
@@ -513,9 +452,7 @@ @@ -547,9 +481,7 @@
final String devToolsVersion; final String devToolsVersion;
@override @override
@ -140,7 +145,7 @@
} }
class _FlutterVersionGit extends FlutterVersion { class _FlutterVersionGit extends FlutterVersion {
@@ -586,27 +523,14 @@ @@ -630,27 +562,14 @@
} }
@override @override
@ -170,7 +175,7 @@
/// Checks if the provided [version] is tracking a standard remote. /// Checks if the provided [version] is tracking a standard remote.
/// ///
@@ -632,52 +556,6 @@ @@ -676,52 +595,6 @@
/// ///
/// Returns [VersionCheckError] if the tracking remote is not standard. /// Returns [VersionCheckError] if the tracking remote is not standard.
VersionCheckError? run() { VersionCheckError? run() {
@ -223,7 +228,7 @@
return null; return null;
} }
@@ -844,7 +722,7 @@ @@ -888,7 +761,7 @@
} }
String _runGit(String command, ProcessUtils processUtils, String? workingDirectory) { String _runGit(String command, ProcessUtils processUtils, String? workingDirectory) {
@ -232,7 +237,7 @@
} }
/// Runs [command] in the root of the Flutter installation and returns the /// Runs [command] in the root of the Flutter installation and returns the
@@ -871,7 +749,7 @@ @@ -915,7 +788,7 @@
if (revision == null) { if (revision == null) {
return ''; return '';
} }
@ -241,7 +246,7 @@
} }
/// Version of Flutter SDK parsed from Git. /// Version of Flutter SDK parsed from Git.
@@ -932,46 +810,10 @@ @@ -976,46 +849,10 @@
bool fetchTags = false, bool fetchTags = false,
String gitRef = 'HEAD', String gitRef = 'HEAD',
}) { }) {