diff options
Diffstat (limited to 'patches/patch-chromium.sh')
-rwxr-xr-x | patches/patch-chromium.sh | 53 |
1 files changed, 13 insertions, 40 deletions
diff --git a/patches/patch-chromium.sh b/patches/patch-chromium.sh index 7dd0f153e..c3a33aa22 100755 --- a/patches/patch-chromium.sh +++ b/patches/patch-chromium.sh @@ -40,9 +40,7 @@ ## ############################################################################# -# Script used temporarily to invoke gclient and apply our patches - -PATCH_DIR="$( cd "$( dirname "$0" )" && pwd )" +PATCH_DIR="$( cd "$( dirname "$0" )"/chromium && pwd )" if [ -z "$CHROMIUM_SRC_DIR" ]; then CHROMIUM_SRC_DIR="$( cd `git config qtwebengine.chromiumsrcdir` && pwd )" @@ -53,40 +51,15 @@ if [ ! -d "$CHROMIUM_SRC_DIR" ]; then exit 1; fi -cd $CHROMIUM_SRC_DIR -echo "Entering $PWD" - -git am $PATCH_DIR/0002-Add-WebEngineContext-to-RunLoop-s-friends.patch -git am $PATCH_DIR/0001-Mac-Use-libc-instead-of-stdlibc.patch -git am $PATCH_DIR/0002-Clang-libc-does-not-support-incomplete-types-in-temp.patch -git am $PATCH_DIR/0001-Mac-Do-not-modify-the-child-path.patch -git am $PATCH_DIR/0001-Do-not-warn-for-header-hygiene.patch -git am $PATCH_DIR/0001-Build-files-necessary-for-touch-and-gestures.patch -git am $PATCH_DIR/0001-remove-Wno-deprecated-register-from-common.gypi.patch -git am $PATCH_DIR/0001-Solve-conflicts-when-including-both-QtOpenGL-headers.patch -git am $PATCH_DIR/0001-Do-not-forward-declare-UIResourceRequest-Identity-an.patch -git am $PATCH_DIR/0001-Fix-the-build-with-a-GL-ES2-configured-Qt.patch -git am $PATCH_DIR/0001-Hide-the-definition-of-MessagePumpGtk-GetDefaultXDis.patch -git am $PATCH_DIR/0001-Add-accessors-for-the-Qt-delegated-renderer-integrat.patch -git am $PATCH_DIR/0001-Add-seams-to-setup-GL-contexts-sharing-with-QtQuick.patch -git am $PATCH_DIR/0001-Declare-a-Qt-IPC-message-class.patch - -cd $CHROMIUM_SRC_DIR/third_party/WebKit -echo "Entering $PWD" - -git am $PATCH_DIR/0001-Remove-leftovers-from-WebKitSystemInterface.patch - -cd $CHROMIUM_SRC_DIR/third_party/libjingle/source/talk -echo "Entering $PWD" - -git am $PATCH_DIR/0001-Do-not-forward-declare-WebRtcVoiceChannelInfo.patch - -cd $CHROMIUM_SRC_DIR/tools/gyp -echo "Entering $PWD" - -git am $PATCH_DIR/0001-GYP-Fix-build-with-toplevel-dir.patch -git am $PATCH_DIR/0001-Add-support-for-libc-to-xcode_emulation.py.patch - -cd $CHROMIUM_SRC_DIR/tools/grit -git am $PATCH_DIR/0001-GRIT-Allow-grd-files-outside-of-chromium-source-dir.patch - +for MODULE in \ + / \ + /third_party/WebKit \ + /third_party/libjingle/source/talk \ + /tools/gyp \ + /tools/grit +do + cd $CHROMIUM_SRC_DIR$MODULE + echo "Entering $PWD" + git tag -f first-parent + git am $PATCH_DIR$MODULE/0* +done |