diff options
author | Andras Becsi <andras.becsi@digia.com> | 2014-05-22 20:43:17 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-06-05 00:23:00 +0200 |
commit | 4f195e3b634b2cb96e6f74d8b9d90f77a44830f5 (patch) | |
tree | 4c82d144e5b384045bdc32ca2adee82684377a9d /patches/patch-chromium.sh | |
parent | 45c0bba8a40bb87a386fad02ca51371a44f475ba (diff) |
Remove separately maintained patches from repository
We maintain them on top of the Chromium snapshot.
A new script tools/scripts/patch_upstream.py replaced
patches/patch-chromium.sh with the recent snapshot update.
The patches that we have on top of the baseline version
are prepared from the chromium snapshot and applied on
the upstream chromium checkout.
A consequence of this is that init-repository.py -u
from now on requires a snapshot checkout as well.
Change-Id: I639c45904b72952804e5227ebc948a8859cf74dd
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'patches/patch-chromium.sh')
-rwxr-xr-x | patches/patch-chromium.sh | 69 |
1 files changed, 0 insertions, 69 deletions
diff --git a/patches/patch-chromium.sh b/patches/patch-chromium.sh deleted file mode 100755 index 9c672ebf9..000000000 --- a/patches/patch-chromium.sh +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/sh -############################################################################# -## -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -## Contact: http://www.qt-project.org/legal -## -## This file is part of the QtWebEngine of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and Digia. For licensing terms and -## conditions see http://qt.digia.com/licensing. For further information -## use the contact form at http://qt.digia.com/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 as published by the Free Software -## Foundation and appearing in the file LICENSE.LGPL included in the -## packaging of this file. Please review the following information to -## ensure the GNU Lesser General Public License version 2.1 requirements -## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## In addition, as a special exception, Digia gives you certain additional -## rights. These rights are described in the Digia Qt LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3.0 as published by the Free Software -## Foundation and appearing in the file LICENSE.GPL included in the -## packaging of this file. Please review the following information to -## ensure the GNU General Public License version 3.0 requirements will be -## met: http://www.gnu.org/copyleft/gpl.html. -## -## -## $QT_END_LICENSE$ -## -############################################################################# - -PATCH_DIR="$( cd "$( dirname "$0" )"/chromium && pwd )" - -if [ -z "$CHROMIUM_SRC_DIR" ]; then - CHROMIUM_SRC_DIR="$( cd `git config qtwebengine.chromiumsrcdir` && pwd )" -fi - -if [ ! -d "$CHROMIUM_SRC_DIR" ]; then - echo "CHROMIUM_SRC_DIR pointing to a non existing directory. $CHROMIUM_SRC_DIR" - exit 1; -fi - -for MODULE in \ - / \ - /third_party/WebKit \ - /third_party/libjingle/source/talk \ - /third_party/libvpx \ - /third_party/openssl \ - /third_party/icu \ - /tools/gyp \ - /tools/grit \ - /v8 -do - cd $CHROMIUM_SRC_DIR$MODULE - echo "Entering $PWD" - git tag -f first-parent - git am $PATCH_DIR$MODULE/0* -done |