diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-05-14 18:26:08 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2020-05-20 13:54:54 +0000 |
| commit | b1851a4ad037f193a01f8700d52269e093eed35f (patch) | |
| tree | 5dc621ffd7fbe191a6a22dd93dd94645087b6258 /gfx/graphite2/moz-gr-update.sh | |
| parent | 935ce8fa8e50c7d043dda94b442fcdd5fcb8def5 (diff) | |
| download | UXP-b1851a4ad037f193a01f8700d52269e093eed35f.tar UXP-b1851a4ad037f193a01f8700d52269e093eed35f.tar.gz UXP-b1851a4ad037f193a01f8700d52269e093eed35f.tar.lz UXP-b1851a4ad037f193a01f8700d52269e093eed35f.tar.xz UXP-b1851a4ad037f193a01f8700d52269e093eed35f.zip | |
Issue #80 - de-unify and fix up gfx/graphite2
With de-unified building we have to re-apply the fix-up
for <cstdio>, and additionally the same for <cstring>
to prevent the compiler picking the wrong versions of
standard functions.
Diffstat (limited to 'gfx/graphite2/moz-gr-update.sh')
| -rw-r--r-- | gfx/graphite2/moz-gr-update.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gfx/graphite2/moz-gr-update.sh b/gfx/graphite2/moz-gr-update.sh index faaab1b17..b14102d1f 100644 --- a/gfx/graphite2/moz-gr-update.sh +++ b/gfx/graphite2/moz-gr-update.sh @@ -33,9 +33,10 @@ echo "$TARBALL" >> gfx/graphite2/README.mozilla echo "" echo "See" $0 "for update procedure." >> gfx/graphite2/README.mozilla -# fix up includes because of bug 721839 (cstdio) and bug 803066 (Windows.h) -#find gfx/graphite2/ -name "*.cpp" -exec perl -p -i -e "s/<cstdio>/<stdio.h>/;s/Windows.h/windows.h/;" {} \; -#find gfx/graphite2/ -name "*.h" -exec perl -p -i -e "s/<cstdio>/<stdio.h>/;s/Windows.h/windows.h/;" {} \; +# fix up includes because of BZ bug 721839 (cstdio) and BZ bug 803066 (Windows.h) +# Additional issue with inclusion of <cstring> in non-unified mode (Issue #80) +find gfx/graphite2/ -name "*.cpp" -exec perl -p -i -e "s/<cstdio>/<stdio.h>/;s/<cstring>/<string.h>/;s/Windows.h/windows.h/;" {} \; +find gfx/graphite2/ -name "*.h" -exec perl -p -i -e "s/<cstdio>/<stdio.h>/;s/<cstring>/<string.h>/;s/Windows.h/windows.h/;" {} \; # summarize what's been touched echo Updated to $RELEASE. |