diff options
author | Vincent Ambo <mail@tazj.in> | 2021-09-21T10·03+0300 |
---|---|---|
committer | Vincent Ambo <mail@tazj.in> | 2021-09-21T11·29+0300 |
commit | 43b1791ec601732ac31195df96781a848360a9ac (patch) | |
tree | daae8d638343295d2f1f7da955e556ef4c958864 /third_party/git/contrib/update-unicode | |
parent | 2d8e7dc9d9c38127ec4ebd13aee8e8f586a43318 (diff) |
chore(3p/git): Unvendor git and track patches instead r/2903
This was vendored a long time ago under the expectation that keeping it in sync with cgit would be easier this way, but it has proven not to be a big issue. On the other hand, a vendored copy of git is an annoying maintenance burden. It is much easier to rebase the single (dottime) patch that we have. This removes the vendored copy of git and instead passes the git source code to cgit via `pkgs.srcOnly`, which includes the applied patch so that cgit can continue rendering dottime. Change-Id: If31f62dea7ce688fd1b9050204e9378019775f2b
Diffstat (limited to 'third_party/git/contrib/update-unicode')
-rw-r--r-- | third_party/git/contrib/update-unicode/.gitignore | 3 | ||||
-rw-r--r-- | third_party/git/contrib/update-unicode/README | 20 | ||||
-rwxr-xr-x | third_party/git/contrib/update-unicode/update_unicode.sh | 33 |
3 files changed, 0 insertions, 56 deletions
diff --git a/third_party/git/contrib/update-unicode/.gitignore b/third_party/git/contrib/update-unicode/.gitignore deleted file mode 100644 index b0ebc6aad214..000000000000 --- a/third_party/git/contrib/update-unicode/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -uniset/ -UnicodeData.txt -EastAsianWidth.txt diff --git a/third_party/git/contrib/update-unicode/README b/third_party/git/contrib/update-unicode/README deleted file mode 100644 index 151a1970419f..000000000000 --- a/third_party/git/contrib/update-unicode/README +++ /dev/null @@ -1,20 +0,0 @@ -TL;DR: Run update_unicode.sh after the publication of a new Unicode -standard and commit the resulting unicode-widths.h file. - -The long version -================ - -The Git source code ships the file unicode-widths.h which contains -tables of zero and double width Unicode code points, respectively. -These tables are generated using update_unicode.sh in this directory. -update_unicode.sh itself uses a third-party tool, uniset, to query two -Unicode data files for the interesting code points. - -On first run, update_unicode.sh clones uniset from Github and builds it. -This requires a current-ish version of autoconf (2.69 works per December -2016). - -On each run, update_unicode.sh checks whether more recent Unicode data -files are available from the Unicode consortium, and rebuilds the header -unicode-widths.h with the new data. The new header can then be -committed. diff --git a/third_party/git/contrib/update-unicode/update_unicode.sh b/third_party/git/contrib/update-unicode/update_unicode.sh deleted file mode 100755 index aa90865befa4..000000000000 --- a/third_party/git/contrib/update-unicode/update_unicode.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -#See http://www.unicode.org/reports/tr44/ -# -#Me Enclosing_Mark an enclosing combining mark -#Mn Nonspacing_Mark a nonspacing combining mark (zero advance width) -#Cf Format a format control character -# -cd "$(dirname "$0")" -UNICODEWIDTH_H=$(git rev-parse --show-toplevel)/unicode-width.h - -wget -N http://www.unicode.org/Public/UCD/latest/ucd/UnicodeData.txt \ - http://www.unicode.org/Public/UCD/latest/ucd/EastAsianWidth.txt && -if ! test -d uniset; then - git clone https://github.com/depp/uniset.git && - ( cd uniset && git checkout 4b186196dd ) -fi && -( - cd uniset && - if ! test -x uniset; then - autoreconf -i && - ./configure --enable-warnings=-Werror CFLAGS='-O0 -ggdb' - fi && - make -) && -UNICODE_DIR=. && export UNICODE_DIR && -cat >$UNICODEWIDTH_H <<-EOF -static const struct interval zero_width[] = { - $(uniset/uniset --32 cat:Me,Mn,Cf + U+1160..U+11FF - U+00AD) -}; -static const struct interval double_width[] = { - $(uniset/uniset --32 eaw:F,W) -}; -EOF |