From f05391a69f38107ff3f70431032a5520741147d8 Mon Sep 17 00:00:00 2001 From: Moonchild Date: Thu, 14 May 2020 18:26:08 +0000 Subject: Issue #80 - de-unify and fix up gfx/graphite2 With de-unified building we have to re-apply the fix-up for , and additionally the same for to prevent the compiler picking the wrong versions of standard functions. --- gfx/graphite2/moz-gr-update.sh | 7 ++++--- gfx/graphite2/src/Code.cpp | 4 ++-- gfx/graphite2/src/Face.cpp | 2 +- gfx/graphite2/src/FeatureMap.cpp | 2 +- gfx/graphite2/src/FileFace.cpp | 2 +- gfx/graphite2/src/Pass.cpp | 2 +- gfx/graphite2/src/Segment.cpp | 2 +- gfx/graphite2/src/TtfUtil.cpp | 2 +- gfx/graphite2/src/call_machine.cpp | 2 +- gfx/graphite2/src/direct_machine.cpp | 2 +- gfx/graphite2/src/gr_logging.cpp | 2 +- gfx/graphite2/src/inc/Compression.h | 2 +- gfx/graphite2/src/inc/Face.h | 2 +- gfx/graphite2/src/inc/FeatureVal.h | 2 +- gfx/graphite2/src/inc/FileFace.h | 2 +- gfx/graphite2/src/inc/List.h | 2 +- gfx/graphite2/src/inc/Machine.h | 2 +- gfx/graphite2/src/inc/json.h | 2 +- gfx/graphite2/src/inc/locale2lcid.h | 2 +- gfx/graphite2/src/json.cpp | 2 +- gfx/graphite2/src/moz.build | 13 ++++--------- 21 files changed, 28 insertions(+), 32 deletions(-) (limited to 'gfx') 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///;s/Windows.h/windows.h/;" {} \; -#find gfx/graphite2/ -name "*.h" -exec perl -p -i -e "s///;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 in non-unified mode (Issue #80) +find gfx/graphite2/ -name "*.cpp" -exec perl -p -i -e "s///;s///;s/Windows.h/windows.h/;" {} \; +find gfx/graphite2/ -name "*.h" -exec perl -p -i -e "s///;s///;s/Windows.h/windows.h/;" {} \; # summarize what's been touched echo Updated to $RELEASE. diff --git a/gfx/graphite2/src/Code.cpp b/gfx/graphite2/src/Code.cpp index 92ba92379..119af9c85 100644 --- a/gfx/graphite2/src/Code.cpp +++ b/gfx/graphite2/src/Code.cpp @@ -32,7 +32,7 @@ of the License or (at your option) any later version. #include #include #include -#include +#include #include "graphite2/Segment.h" #include "inc/Code.h" #include "inc/Face.h" @@ -42,7 +42,7 @@ of the License or (at your option) any later version. #include "inc/Rule.h" #include "inc/Silf.h" -#include +#include #ifdef NDEBUG #ifdef __GNUC__ diff --git a/gfx/graphite2/src/Face.cpp b/gfx/graphite2/src/Face.cpp index 81b5ced8c..45664ca8c 100644 --- a/gfx/graphite2/src/Face.cpp +++ b/gfx/graphite2/src/Face.cpp @@ -24,7 +24,7 @@ Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public License, as published by the Free Software Foundation, either version 2 of the License or (at your option) any later version. */ -#include +#include #include "graphite2/Segment.h" #include "inc/CmapCache.h" #include "inc/debug.h" diff --git a/gfx/graphite2/src/FeatureMap.cpp b/gfx/graphite2/src/FeatureMap.cpp index d0fc55ddf..ab3b447f9 100644 --- a/gfx/graphite2/src/FeatureMap.cpp +++ b/gfx/graphite2/src/FeatureMap.cpp @@ -24,7 +24,7 @@ Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public License, as published by the Free Software Foundation, either version 2 of the License or (at your option) any later version. */ -#include +#include #include "inc/Main.h" #include "inc/bits.h" diff --git a/gfx/graphite2/src/FileFace.cpp b/gfx/graphite2/src/FileFace.cpp index d1510d3e9..62b9c1fd2 100644 --- a/gfx/graphite2/src/FileFace.cpp +++ b/gfx/graphite2/src/FileFace.cpp @@ -24,7 +24,7 @@ Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public License, as published by the Free Software Foundation, either version 2 of the License or (at your option) any later version. */ -#include +#include #include "inc/FileFace.h" diff --git a/gfx/graphite2/src/Pass.cpp b/gfx/graphite2/src/Pass.cpp index 683143c50..4e9085d48 100644 --- a/gfx/graphite2/src/Pass.cpp +++ b/gfx/graphite2/src/Pass.cpp @@ -28,7 +28,7 @@ of the License or (at your option) any later version. #include "inc/debug.h" #include "inc/Endian.h" #include "inc/Pass.h" -#include +#include #include #include #include diff --git a/gfx/graphite2/src/Segment.cpp b/gfx/graphite2/src/Segment.cpp index 3020bfd36..cb53de356 100644 --- a/gfx/graphite2/src/Segment.cpp +++ b/gfx/graphite2/src/Segment.cpp @@ -25,7 +25,7 @@ License, as published by the Free Software Foundation, either version 2 of the License or (at your option) any later version. */ #include "inc/UtfCodec.h" -#include +#include #include #include "inc/bits.h" diff --git a/gfx/graphite2/src/TtfUtil.cpp b/gfx/graphite2/src/TtfUtil.cpp index 75e8da11c..c2f9a4675 100644 --- a/gfx/graphite2/src/TtfUtil.cpp +++ b/gfx/graphite2/src/TtfUtil.cpp @@ -43,7 +43,7 @@ Description //#include #include #include -#include +#include #include #include //#include diff --git a/gfx/graphite2/src/call_machine.cpp b/gfx/graphite2/src/call_machine.cpp index 09c2038c4..0afe9191e 100644 --- a/gfx/graphite2/src/call_machine.cpp +++ b/gfx/graphite2/src/call_machine.cpp @@ -33,7 +33,7 @@ of the License or (at your option) any later version. // opcodes) but is slower that the direct threaded interpreter by a factor of 2 #include -#include +#include #include #include "inc/Machine.h" #include "inc/Segment.h" diff --git a/gfx/graphite2/src/direct_machine.cpp b/gfx/graphite2/src/direct_machine.cpp index 7d80438fb..597c2d234 100644 --- a/gfx/graphite2/src/direct_machine.cpp +++ b/gfx/graphite2/src/direct_machine.cpp @@ -38,7 +38,7 @@ of the License or (at your option) any later version. #include -#include +#include #include "inc/Machine.h" #include "inc/Segment.h" #include "inc/Slot.h" diff --git a/gfx/graphite2/src/gr_logging.cpp b/gfx/graphite2/src/gr_logging.cpp index 3e453ba8e..a4afcc2a5 100644 --- a/gfx/graphite2/src/gr_logging.cpp +++ b/gfx/graphite2/src/gr_logging.cpp @@ -24,7 +24,7 @@ Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public License, as published by the Free Software Foundation, either version 2 of the License or (at your option) any later version. */ -#include +#include #include "graphite2/Log.h" #include "inc/debug.h" diff --git a/gfx/graphite2/src/inc/Compression.h b/gfx/graphite2/src/inc/Compression.h index 61351c416..047df7a3d 100644 --- a/gfx/graphite2/src/inc/Compression.h +++ b/gfx/graphite2/src/inc/Compression.h @@ -29,7 +29,7 @@ of the License or (at your option) any later version. #include #include -#include +#include namespace { diff --git a/gfx/graphite2/src/inc/Face.h b/gfx/graphite2/src/inc/Face.h index 43ea43196..1ee39b0e3 100644 --- a/gfx/graphite2/src/inc/Face.h +++ b/gfx/graphite2/src/inc/Face.h @@ -26,7 +26,7 @@ of the License or (at your option) any later version. */ #pragma once -#include +#include #include "graphite2/Font.h" diff --git a/gfx/graphite2/src/inc/FeatureVal.h b/gfx/graphite2/src/inc/FeatureVal.h index 5fbcf0820..c79392eae 100644 --- a/gfx/graphite2/src/inc/FeatureVal.h +++ b/gfx/graphite2/src/inc/FeatureVal.h @@ -25,7 +25,7 @@ License, as published by the Free Software Foundation, either version 2 of the License or (at your option) any later version. */ #pragma once -#include +#include #include #include "inc/Main.h" #include "inc/List.h" diff --git a/gfx/graphite2/src/inc/FileFace.h b/gfx/graphite2/src/inc/FileFace.h index 81e501bab..dfcf3e8d3 100644 --- a/gfx/graphite2/src/inc/FileFace.h +++ b/gfx/graphite2/src/inc/FileFace.h @@ -32,7 +32,7 @@ of the License or (at your option) any later version. #ifndef GRAPHITE2_NFILEFACE -#include +#include #include #include "graphite2/Font.h" diff --git a/gfx/graphite2/src/inc/List.h b/gfx/graphite2/src/inc/List.h index 020560235..d3839441e 100644 --- a/gfx/graphite2/src/inc/List.h +++ b/gfx/graphite2/src/inc/List.h @@ -30,7 +30,7 @@ of the License or (at your option) any later version. #include #include -#include +#include #include #include diff --git a/gfx/graphite2/src/inc/Machine.h b/gfx/graphite2/src/inc/Machine.h index 1a01b7a43..4ac62b9e1 100644 --- a/gfx/graphite2/src/inc/Machine.h +++ b/gfx/graphite2/src/inc/Machine.h @@ -31,7 +31,7 @@ of the License or (at your option) any later version. // interface. #pragma once -#include +#include #include #include "inc/Main.h" diff --git a/gfx/graphite2/src/inc/json.h b/gfx/graphite2/src/inc/json.h index 90b8573d6..e9826832e 100644 --- a/gfx/graphite2/src/inc/json.h +++ b/gfx/graphite2/src/inc/json.h @@ -32,7 +32,7 @@ of the License or (at your option) any later version. #include "inc/Main.h" #include -#include +#include #include "inc/List.h" namespace graphite2 { diff --git a/gfx/graphite2/src/inc/locale2lcid.h b/gfx/graphite2/src/inc/locale2lcid.h index 25d5c0a3c..ec5e867c4 100644 --- a/gfx/graphite2/src/inc/locale2lcid.h +++ b/gfx/graphite2/src/inc/locale2lcid.h @@ -25,7 +25,7 @@ License, as published by the Free Software Foundation, either version 2 of the License or (at your option) any later version. */ #pragma once -#include +#include #include #include "inc/Main.h" diff --git a/gfx/graphite2/src/json.cpp b/gfx/graphite2/src/json.cpp index d6e5518a1..48a563ce0 100644 --- a/gfx/graphite2/src/json.cpp +++ b/gfx/graphite2/src/json.cpp @@ -29,7 +29,7 @@ of the License or (at your option) any later version. #if !defined GRAPHITE2_NTRACING -#include +#include #include #include "inc/json.h" diff --git a/gfx/graphite2/src/moz.build b/gfx/graphite2/src/moz.build index c95c2089d..4cbb1f7ed 100644 --- a/gfx/graphite2/src/moz.build +++ b/gfx/graphite2/src/moz.build @@ -13,16 +13,16 @@ EXPORTS.graphite2 += [ ] if CONFIG['GNU_CC']: - UNIFIED_SOURCES += [ + SOURCES += [ 'direct_machine.cpp' ] else: - UNIFIED_SOURCES += [ + SOURCES += [ 'call_machine.cpp' ] # This should contain all of the _SOURCES from files.mk, except *_machine.cpp -UNIFIED_SOURCES += [ +SOURCES += [ 'CachedFace.cpp', 'CmapCache.cpp', 'Code.cpp', @@ -44,6 +44,7 @@ UNIFIED_SOURCES += [ 'Intervals.cpp', 'json.cpp', 'Justifier.cpp', + 'NameTable.cpp', 'Pass.cpp', 'Position.cpp', 'SegCache.cpp', @@ -57,12 +58,6 @@ UNIFIED_SOURCES += [ 'UtfCodec.cpp', ] -# Excluded from UNIFIED_SOURCES because from other files breaks it, -# see bug 1272647. -SOURCES += [ - 'NameTable.cpp', -] - # tell graphite2 not to export symbols, we'll be linking it directly with # thebes DEFINES['GRAPHITE2_STATIC'] = True -- cgit v1.2.3