[packages/chromium-browser/dev-41: 1/2] up to 41.0.2272.101

glen glen at pld-linux.org
Sun Mar 22 21:18:43 CET 2015


commit 810e0294394925470bc021196f18981413ef1c44
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Mar 22 15:19:04 2015 +0200

    up to 41.0.2272.101

 chromium-browser.spec | 14 +++++++-------
 clean-source.sh       | 28 ++++++++++++++++++++--------
 2 files changed, 27 insertions(+), 15 deletions(-)
---
diff --git a/chromium-browser.spec b/chromium-browser.spec
index 4ffcf78..f784d68 100644
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -73,9 +73,9 @@
 # - http://code.google.com/p/chromium/wiki/LinuxBuildInstructionsPrerequisites
 # - to look for new tarball, use update-source.sh script
 
-%define		branch		40.0.2214
-%define		basever		91
-%define		patchver	115
+%define		branch		41.0.2272
+%define		basever		101
+#define		patchver	115
 %define		gyp_rev	1014
 Summary:	A WebKit powered web browser
 Name:		chromium-browser
@@ -84,11 +84,11 @@ Version:	%{branch}.%{patchver}
 %else
 Version:	%{branch}.%{basever}
 %endif
-Release:	2
+Release:	0.1
 License:	BSD%{!?with_system_ffmpeg:, LGPL v2+ (ffmpeg)}
 Group:		X11/Applications/Networking
 Source0:	http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{branch}.%{basever}.tar.xz
-# Source0-md5:	662f134029f2d6484873ec3c93a8e049
+# Source0-md5:	a493cd513f2724eb63d6721707e11c4a
 %if "%{?patchver}" != ""
 Patch0:		http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{version}.patch.xz
 # Patch0-md5:	220ea8a869cd83b310dff7d227ed6280
@@ -312,7 +312,7 @@ sed -e 's/@BUILD_DIST@/PLD %{pld_version}/g' \
 %{__sed} -e 's, at localedir@,%{_datadir}/%{name},' %{SOURCE5} > find-lang.sh
 ln -s %{SOURCE7} .
 
-%patch2 -p1 
+#%patch2 -p1 CHECK
 %patch4 -p3
 %patch7 -p1
 %patch15 -p2
@@ -328,7 +328,7 @@ ln -s %{SOURCE7} .
 %patch35 -p1
 %patch36 -p1
 %patch37 -p1
-%patch38 -p1
+#%patch38 -p1 CHECK
 
 %{?with_dev:exit 0}
 
diff --git a/clean-source.sh b/clean-source.sh
index 27ea57d..c679074 100755
--- a/clean-source.sh
+++ b/clean-source.sh
@@ -8,6 +8,7 @@ export LC_ALL=C
 # "v8=0" means "do not remove v8"
 eval "$@"
 
+# {{{ remove nonessential dirs
 # Strip tarball from some big directories not needed on the linux platform
 # https://code.google.com/p/chromium/wiki/LinuxPackaging
 # initial list from src/tools/export_tarball/export_tarball.py
@@ -526,7 +527,8 @@ remove_nonessential_dirs() {
 		')' \
 	-print -delete
 }
-
+# }}}
+# {{{ almost_strip_dirs
 # There are directories we want to strip, but that are unnecessarily required by the build-system
 # So we drop everything but the gyp/gypi files
 almost_strip_dirs() {
@@ -562,8 +564,8 @@ almost_strip_dirs() {
 		'!' -path 'tools/zip2msi.py' \
 		-print -delete
 }
-
-# clean third party
+# }}}
+# {{{ clean third party
 # list based from archlinux PKGBUILD
 # https://aur.archlinux.org/packages/ch/chromium-dev/PKGBUILD
 clean_third_party() {
@@ -677,11 +679,13 @@ clean_third_party() {
 		'!' -path 'third_party/libvpx/*' \
 		'!' -path 'third_party/markupsafe/*' \
 		'!' -path 'third_party/opus/*' \
+		'!' -path 'third_party/libudev/*' \
 		-print -delete
 
 	rm -vf third_party/expat/files/lib/expat.h
 }
-
+# }}}
+# {{{ remove_bin_only
 # parts based on ubuntu debian/rules
 # http://bazaar.launchpad.net/~chromium-team/chromium-browser/chromium-browser.head/view/head:/debian/rules
 remove_bin_only() {
@@ -698,7 +702,8 @@ remove_bin_only() {
 		-name \*.dylib \
 	\) -exec rm -fv {} \;
 }
-
+# }}}
+# {{{ strip_system_dirs
 # removes dir, if the bcond is not turned off
 strip_system_dirs() {
 	local dir lib bcond args
@@ -719,7 +724,8 @@ strip_system_dirs() {
 	done
 	set +f
 }
-
+# }}}
+# {{{ remove_tests
 # remove test data and files
 # some scanned with find -name tests -o -name test -o -name test_data -o name testdata
 # and find -iname *test*
@@ -1032,7 +1038,8 @@ remove_tests() {
 	')' \
 		-print -delete || :
 }
-
+# }}}
+# {{{ remove_bundled_libraries
 # Remove most bundled libraries. Some are still needed.
 # Sync this with gentoo/chromium-*.ebuild
 # NOTE: argument list to script specifies paths to preserve
@@ -1088,10 +1095,10 @@ remove_bundled_libraries() {
 		'third_party/libjingle' \
 		'third_party/libphonenumber' \
 		'third_party/libsrtp' \
+		'third_party/libudev' \
 		'third_party/libusb' \
 		'third_party/libvpx' \
 		'third_party/libvpx/source/libvpx/third_party/x86inc' \
-		'third_party/libwebm' \
 		'third_party/libxml/chromium' \
 		'third_party/libXNVCtrl' \
 		'third_party/libyuv' \
@@ -1105,6 +1112,8 @@ remove_bundled_libraries() {
 		'third_party/opus' \
 		'third_party/ots' \
 		'third_party/pdfium' \
+		'third_party/pdfium/third_party/bigint' \
+		'third_party/pdfium/third_party/freetype' \
 		'third_party/pdfium/third_party/logging.h' \
 		'third_party/pdfium/third_party/macros.h' \
 		'third_party/pdfium/third_party/numerics' \
@@ -1140,6 +1149,7 @@ remove_bundled_libraries() {
 		--do-print \
 		--do-remove
 }
+# }}}
 
 remove_bundled_libraries > REMOVED-bundled_libraries.txt
 
@@ -1206,3 +1216,5 @@ fi
 for a in REMOVED-*.txt; do
 	cat $a
 done
+
+# vim:fdm=marker
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list