From 485fb8d315ce875fb4d23035d00631a63bc1dc30 Mon Sep 17 00:00:00 2001 From: ignisf Date: Tue, 17 Jun 2014 15:14:20 +0300 Subject: [PATCH] Remove the icu46 submodule --- .gitmodules | 3 --- patches/link-dependencies.patch | 6 ++---- vendor/icu46 | 1 - 3 files changed, 2 insertions(+), 8 deletions(-) delete mode 160000 vendor/icu46 diff --git a/.gitmodules b/.gitmodules index ab0c9eb..87fce46 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,9 +4,6 @@ [submodule "vendor/gyp"] path = vendor/gyp url = https://git.chromium.org/git/external/gyp.git -[submodule "vendor/icu46"] - path = vendor/icu46 - url = https://git.chromium.org/git/chromium/third_party/icu46.git [submodule "vendor/buildtools"] path = vendor/buildtools url = https://chromium.googlesource.com/chromium/buildtools.git diff --git a/patches/link-dependencies.patch b/patches/link-dependencies.patch index 09c01e5..b2c5b23 100644 --- a/patches/link-dependencies.patch +++ b/patches/link-dependencies.patch @@ -1,8 +1,8 @@ diff --git a/Makefile b/Makefile -index f49be61..ad551e6 100644 +index f49be61..0626d02 100644 --- a/Makefile +++ b/Makefile -@@ -463,13 +463,7 @@ gtags.clean: +@@ -463,13 +463,5 @@ gtags.clean: # Dependencies. # Remember to keep these in sync with the DEPS file. dependencies: @@ -17,6 +17,4 @@ index f49be61..ad551e6 100644 - git fetch origin; \ - git checkout 5d89977ce55240995d1596fe420b818468f5ec37 ) + ( test -h build/gyp || ln -s ../../gyp build/gyp ) -+ ( test -d third_party || mkdir third_party ) -+ ( test -h third_party/icu || ln -s ../../icu46 third_party/icu ) + ( test -h buildtools || ln -s ../buildtools ) diff --git a/vendor/icu46 b/vendor/icu46 deleted file mode 160000 index 44fc849..0000000 --- a/vendor/icu46 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 44fc849c472ba8bf2c0f97c8e9546a99f114c182