[Pkg-chromium-commit] [pkg-chromium] 03/03: release 66.0.3359.26-1
Michael Gilbert
mgilbert at moszumanska.debian.org
Sun Apr 1 15:49:31 UTC 2018
This is an automated email from the git hooks/post-receive script.
mgilbert pushed a commit to branch experimental
in repository pkg-chromium.
commit f394f08e1cdc4997f78763b49bf30dbed32befcf
Author: Michael Gilbert <mgilbert at debian.org>
Date: Sun Apr 1 15:51:53 2018 +0000
release 66.0.3359.26-1
---
debian/changelog | 7 +++++++
debian/control | 1 -
debian/copyright | 25 ++++++++++++++++++++++---
debian/rules | 38 ++++++++++++++++++++++++--------------
debian/scripts/mk-origtargz.patch | 2 +-
debian/scripts/unbundle | 5 ++---
6 files changed, 56 insertions(+), 22 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5790cf0..d875bd9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+chromium-browser (66.0.3359.26-1) experimental; urgency=medium
+
+ * New upstream release.
+ * Use threaded compression while repacking the upstream tarball.
+
+ -- Michael Gilbert <mgilbert at debian.org> Mon, 26 Mar 2018 00:53:25 +0000
+
chromium-browser (66.0.3359.22-3) experimental; urgency=medium
* Build pdfium using the system openjpeg library.
diff --git a/debian/control b/debian/control
index f710ae3..b88f13b 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,6 @@ Build-Depends:
ninja-build,
python-jinja2,
ca-certificates,
- time,
wget,
flex,
yasm,
diff --git a/debian/copyright b/debian/copyright
index 3dfbdf9..da37f5a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,23 +7,41 @@ Files-Excluded:
*.so
*.elf
*.swf
+ *.orig
*config.sub
*config.guess
*jquery*.min.js
buildtools
+ ui/chromeos
+ chrome/browser/resources/chromeos
+ chrome/browser/resources/default_apps
tools/emacs
+ tools/perf/measurements/test_data
tools/perf/page_sets/tough_scheduling_cases/*.min.js
native_client*
android_webview
third_party/icu
+ third_party/flac
third_party/llvm
third_party/libxslt
third_party/eu-strip
+ third_party/freetype
third_party/android*
third_party/depot_tools
third_party/bidichecker
third_party/flot/*.js
third_party/yasm/source
+ third_party/zlib/adler*
+ third_party/zlib/crc32*
+ third_party/zlib/deflate*
+ third_party/zlib/gzguts*
+ third_party/zlib/in*
+ third_party/zlib/names*
+ third_party/zlib/trees*
+ third_party/zlib/x86*
+ third_party/zlib/z*
+ third_party/zlib/contrib
+ third_party/zlib/patches
third_party/skia/platform_tools
third_party/skia/resources/icc_profiles
third_party/ffmpeg/doc
@@ -43,18 +61,19 @@ Files-Excluded:
third_party/mesa/src/src/gallium/state_trackers/d3d1x/w32api
third_party/catapult/tracing/test_data
third_party/google_input_tools/src/chrome/os/inputview/_locales/*.js
+ v8/third_party
+ v8/benchmarks/regexp.js
base/test/data
base/third_party/nspr
+ base/third_party/libevent
third_party/binutils
- v8/benchmarks/regexp.js
- v8/third_party/eu-strip
- v8/third_party/binutils
third_party/libxml/mac
third_party/libxml/linux
third_party/libxml/win32
third_party/node
third_party/mocha/mocha.js
third_party/chaijs/chai.js
+ third_party/swiftshader/third_party/LLVM
third_party/devtools-node-modules
third_party/catapult/third_party/flot
third_party/catapult/third_party/chai
diff --git a/debian/rules b/debian/rules
index f1775d1..a34f2f8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -77,8 +77,9 @@ defines+=use_gold=true \
# can't use system ots (open text *summarizer*) since that's not google's ots (open text *sanitizer*)
# handle parallel build options
+njobs=1
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-njobs=-j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+njobs=$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
endif
# paths to files needed by flot
@@ -89,7 +90,7 @@ flotpaths=/usr/share/javascript/jquery/*min.js \
dh $@
out/Release/gn:
- ./tools/gn/bootstrap/bootstrap.py -s $(njobs)
+ ./tools/gn/bootstrap/bootstrap.py -s -j$(njobs)
override_dh_auto_configure:
# output compiler information
@@ -101,7 +102,7 @@ override_dh_auto_configure:
override_dh_auto_build-arch: out/Release/gn
./out/Release/gn gen out/Release --args="$(defines)"
- ninja $(njobs) -C out/Release chrome chrome_sandbox content_shell chromedriver
+ ninja -j$(njobs) -C out/Release chrome chrome_sandbox content_shell chromedriver
cp out/Release/chrome out/Release/chromium
cp out/Release/content_shell out/Release/chromium-shell
cp out/Release/chrome_sandbox out/Release/chrome-sandbox
@@ -112,7 +113,7 @@ override_dh_auto_build-arch: out/Release/gn
override_dh_auto_build-indep: out/Release/gn
./out/Release/gn gen out/Release --args="$(defines)"
- ninja $(njobs) -C out/Release packed_resources
+ ninja -j$(njobs) -C out/Release packed_resources
rm -f out/Release/locales/en-US.pak
override_dh_auto_install-arch:
@@ -148,19 +149,28 @@ override_dh_auto_clean:
url=https://gsdview.appspot.com/chromium-browser-official
version=$(shell dpkg-parsechangelog -S Version | sed s/-.*//)
extract=chromium-$(version)
-tarball=$(extract).tar.xz
-debian=chromium-browser_$(version)
-output=$(debian).orig.tar.xz
-removed=$(debian).files-removed
+tarfile=$(extract).tar
+tarball=$(tarfile).xz
+debvers=../chromium-browser_$(version)
+origtxz=$(debvers).orig.tar.xz
+removed=$(debvers).files-removed
+seconds=$(debvers).seconds
get-orig-source:
wget -nv --show-progress -c $(url)/$(tarball) -O ../$(tarball)
cp /usr/bin/mk-origtargz debian/scripts
patch -p1 < debian/scripts/mk-origtargz.patch
- /usr/bin/time --portability ./debian/scripts/mk-origtargz ../$(tarball) > ../$(removed)
+ date +%s > $(seconds)
+ ./debian/scripts/mk-origtargz ../$(tarball) > $(removed)
+ echo $$(($$(date +%s) - $$(cat $(seconds)))) seconds
test ! -e $(extract) || rm -rf $(extract)
- /usr/bin/time --portability tar xaf ../$(tarball)
- while read line; do rm -rf $$line; done < ../$(removed)
- test ! -e ../$(output) || rm -f ../$(output)
- /usr/bin/time --portability tar caf ../$(output) $(extract)
- /usr/bin/time --portability rm -rf $(extract)
+ tar xf ../$(tarball)
+ echo $$(($$(date +%s) - $$(cat $(seconds)))) seconds
+ while read line; do rm -rf $$line; done < $(removed)
+ echo $$(($$(date +%s) - $$(cat $(seconds)))) seconds
+ test ! -e $(origtxz) || rm -f $(origtxz)
+ tar cf - $(extract) | xz -5 -T $(njobs) - > $(origtxz)
+ echo $$(($$(date +%s) - $$(cat $(seconds)))) seconds
+ rm -rf $(extract)
+ echo $$(($$(date +%s) - $$(cat $(seconds)))) seconds | tee seconds
+ @mv -f seconds $(seconds)
diff --git a/debian/scripts/mk-origtargz.patch b/debian/scripts/mk-origtargz.patch
index 26f59de..cc84fd9 100644
--- a/debian/scripts/mk-origtargz.patch
+++ b/debian/scripts/mk-origtargz.patch
@@ -1,6 +1,6 @@
--- a/debian/scripts/mk-origtargz 2017-10-27 12:52:18.000000000 +0000
+++ b/debian/scripts/mk-origtargz 2017-11-26 23:39:05.818091051 +0000
-@@ -550,6 +550,11 @@
+@@ -551,6 +551,11 @@
}
if ($deletecount) {
diff --git a/debian/scripts/unbundle b/debian/scripts/unbundle
index 20665d3..24ffb43 100755
--- a/debian/scripts/unbundle
+++ b/debian/scripts/unbundle
@@ -35,12 +35,11 @@ for lib,rule in replace_gn_files.REPLACEMENTS.items():
# remove the gn file that builds the embedded library
if os.path.lexists(rule):
os.remove(rule)
- else:
- # otherwise, create the missing directory
- os.mkdir(libdir)
# create a symlink to the unbundle gn file
symlink = "ln -s "
path = os.path.split(rule)
+ if not os.path.exists(path[0]):
+ os.mkdir(path[0])
while path[0] != '':
path = os.path.split(path[0])
symlink += '../'
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-chromium/pkg-chromium.git
More information about the Pkg-chromium-commit
mailing list