[packages/chromium-browser: 7/10] print files deleted by remove_bundled_libraries

[glen]

commit 708e64c219ba018e28f864bd161fad9f58c91459
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Nov 17 13:24:34 2013 +0200

    print files deleted by remove_bundled_libraries

 chromium-browser.spec                |  2 ++
 get-source.sh                        |  2 ++
 remove_bundled_libraries-stale.patch | 28 ++++++++++++++++++++++++++++
 3 files changed, 32 insertions(+)
---
diff --git a/chromium-browser.spec b/chromium-browser.spec
index e2204df..c7041fe 100644
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -106,6 +106,7 @@ Patch28:	system-mesa.patch
 Patch29:	system-icu.patch
 Patch30:	system-ply.patch
 Patch31:	system-jinja.patch
+Patch32:	remove_bundled_libraries-stale.patch
 URL:		http://www.chromium.org/Home
 %{?with_gconf:BuildRequires:	GConf2-devel}
 %{?with_system_mesa:BuildRequires:	Mesa-libGL-devel >= 9.1}
@@ -302,6 +303,7 @@ ln -s %{SOURCE7} .
 %patch29 -p0
 %patch30 -p1
 %patch31 -p0
+%patch32 -p1
 
 sh -x clean-source.sh \
 	%{!?with_nacl:nacl=0} \
diff --git a/get-source.sh b/get-source.sh
index 6fc7392..5256e56 100755
--- a/get-source.sh
+++ b/get-source.sh
@@ -63,7 +63,9 @@ set -x
 	awk '/^#define/ && /(MAJOR|MINOR)_VERSION|BUILD_NUMBER|PATCH_LEVEL/ { printf("%s=%s\n", $2, $3) }' v8/src/version.cc | tee -a v8.sh
 
 	if [ "$CHANNEL" != "dev" ]; then
+		patch -p1 < $WORK_DIR/remove_bundled_libraries-stale.patch
 		sh -x $WORK_DIR/clean-source.sh emptydirs=1 v8=0 mesa=0 sqlite=0 libwebp=0
+		patch -p1 -R < $WORK_DIR/remove_bundled_libraries-stale.patch
 	fi
 
 	# do not keep REMOVED*.txt in tarball. they are visible in .log anyway
diff --git a/remove_bundled_libraries-stale.patch b/remove_bundled_libraries-stale.patch
new file mode 100644
index 0000000..a013f8d
--- /dev/null
+++ b/remove_bundled_libraries-stale.patch
@@ -0,0 +1,28 @@
+--- chromium-browser-31.0.1650.57/build/linux/unbundle/remove_bundled_libraries.py	2013-11-16 22:18:32.618209221 +0200
++++ chromium-browser-31.0.1650.57/build/linux/unbundle/remove_bundled_libraries.py	2013-11-16 23:34:12.718095629 +0200
+@@ -27,6 +27,7 @@
+ 
+   parser = optparse.OptionParser()
+   parser.add_option('--do-remove', action='store_true')
++  parser.add_option('--do-print', action='store_true')
+ 
+   options, args = parser.parse_args(argv)
+ 
+@@ -62,6 +63,8 @@
+ 
+       if options.do_remove:
+         # Delete the file - best way to ensure it's not used during build.
++        if not options.do_print:
++            print path
+         os.remove(path)
+       else:
+         # By default just print paths that would be removed.
+@@ -74,7 +77,7 @@
+   for exclusion, used in exclusion_used.iteritems():
+     if not used:
+       print '%s does not exist' % exclusion
+-      exit_code = 1
++      exit_code = 0
+ 
+   if not options.do_remove:
+     print ('To actually remove files printed above, please pass ' +
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/chromium-browser.git/commitdiff/719e6b64d8466b4731cda074d265a27ad7ec1012