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 /tools | |
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 'tools')
-rwxr-xr-x | tools/scripts/clean_gitformatpatch_patchid.py | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/tools/scripts/clean_gitformatpatch_patchid.py b/tools/scripts/clean_gitformatpatch_patchid.py deleted file mode 100755 index 930e2af4e..000000000 --- a/tools/scripts/clean_gitformatpatch_patchid.py +++ /dev/null @@ -1,53 +0,0 @@ -#!/usr/bin/env python -############################################################################# -## -## Copyright (C) 2014 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$ -## -############################################################################# - -import re -import sys - -for fileName in sys.argv[1:]: - input = open(fileName) - # Replace the SHA1 in the from-line of the mbox with a dummy SHA1 to prevent unneeded changes to the patch file. - lines = [re.sub('^From \w*', 'From 0000000000000000000000000000000000000000', l) for l in input] - input.close() - output = open(fileName, 'w') - output.writelines(lines) - output.close() |