[SCM] qtwebengine packaging branch, experimental, updated. debian/5.7.1+dfsg-6.1-26-gfd52263

[Simon Quigley]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtwebengine.git;a=commitdiff;h=fd52263

The following commit has been merged in the experimental branch:
commit fd52263b0bd51b6d6bef61ff740c257cbfca85a4
Author: Simon Quigley <tsimonq2 at ubuntu.com>
Date:   Wed Jun 28 16:58:57 2017 -0500

    Make disable-last_commit_position.patch easier to maintain.
---
 debian/patches/disable-last_commit_position.patch | 105 +---------------------
 1 file changed, 1 insertion(+), 104 deletions(-)

diff --git a/debian/patches/disable-last_commit_position.patch b/debian/patches/disable-last_commit_position.patch
index 8af3735..5e567a3 100644
--- a/debian/patches/disable-last_commit_position.patch
+++ b/debian/patches/disable-last_commit_position.patch
@@ -1,115 +1,12 @@
 Description: Disable last_commit_position
  In Debian, we work off of tarballs that aren't Git repositories. We can't
  expect a Git directory to exist in the tarball, so just remove this useless
- file.
+ function.
 Author: Simon Quigley <tsimonq2 at ubuntu.com>
 Forwarded: not-needed
 Last-Update: 2017-06-25
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/3rdparty/chromium/tools/gn/last_commit_position.py
-+++ /dev/null
-@@ -1,100 +0,0 @@
--# Copyright 2014 The Chromium Authors. All rights reserved.
--# Use of this source code is governed by a BSD-style license that can be
--# found in the LICENSE file.
--
--"""Writes the most recent "Cr-Commit-Position" value on the master branch
--to a C header file.
--
--Usage: last_commit_position.py <dir> <outfile> <headerguard>
--
--  <dir>
--    Some directory inside the repo to check. This will be used as the current
--    directory when running git. It's best to pass the repo toplevel directory.
--
--  <outfile>
--    C header file to write.
--
--  <headerguard>
--    String to use as the header guard for the written file.
--"""
--
--import os
--import re
--import subprocess
--import sys
--
--def RunGitCommand(directory, command):
--  """
--  Launches git subcommand.
--
--  Errors are swallowed.
--
--  Returns:
--    A process object or None.
--  """
--  command = ['git'] + command
--  # Force shell usage under cygwin. This is a workaround for
--  # mysterious loss of cwd while invoking cygwin's git.
--  # We can't just pass shell=True to Popen, as under win32 this will
--  # cause CMD to be used, while we explicitly want a cygwin shell.
--  if sys.platform == 'cygwin':
--    command = ['sh', '-c', ' '.join(command)]
--  try:
--    proc = subprocess.Popen(command,
--                            stdout=subprocess.PIPE,
--                            stderr=subprocess.PIPE,
--                            cwd=directory,
--                            shell=(sys.platform=='win32'))
--    return proc
--  except OSError:
--    return None
--
--
--def FetchCommitPosition(directory):
--  regex = re.compile(r'\s*Cr-Commit-Position: refs/heads/master@\{#(\d+)\}\s*')
--
--  # Search this far backward in the git log. The commit position should be
--  # close to the top. We allow some slop for long commit messages, and maybe
--  # there were some local commits after the last "official" one. Having this
--  # max prevents us from searching all history in the case of an error.
--  max_lines = 2048
--
--  proc = RunGitCommand(directory, ['log'])
--  for i in range(max_lines):
--    line = proc.stdout.readline()
--    if not line:
--      return None
--
--    match = regex.match(line)
--    if match:
--      return match.group(1)
--
--  return None
--
--
--def WriteHeader(header_file, header_guard, value):
--  with open(header_file, 'w') as f:
--    f.write('''/* Generated by last_commit_position.py. */
--
--#ifndef %(guard)s
--#define %(guard)s
--
--#define LAST_COMMIT_POSITION "%(value)s"
--
--#endif
--''' % {'guard': header_guard, 'value': value})
--
--
--if len(sys.argv) != 4:
--  print "Wrong number of arguments"
--  sys.exit(1)
--
--git_directory = sys.argv[1]
--output_file = sys.argv[2]
--header_guard = sys.argv[3]
--
--value = FetchCommitPosition(git_directory)
--if not value:
--  value = 'UNKNOWN'
--
--WriteHeader(output_file, header_guard, value)
 --- a/src/3rdparty/chromium/tools/gn/BUILD.gn
 +++ b/src/3rdparty/chromium/tools/gn/BUILD.gn
 @@ -237,26 +237,6 @@ static_library("gn_lib") {

-- 
qtwebengine packaging