X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=chromium-browser.spec;h=3b4206de7706f09a13d96e5eb67a9ab952a045d1;hb=29d835c3f7fb466f7c5575655aada7f8166054bc;hp=ea8fa580074c583b7d2cf7128cbd25af3bdcebba;hpb=313715aca1a37d8747f1b8d1895121032e733e19;p=packages%2Fchromium-browser.git

diff --git a/chromium-browser.spec b/chromium-browser.spec
index ea8fa58..3b4206d 100644
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -18,6 +18,7 @@
 %bcond_without	system_flac		# system flac
 %bcond_with	system_ffmpeg	# system ffmpeg instead of ffmpegsumo
 %bcond_without	system_harfbuzz	# system harfbuzz
+%bcond_without	system_icu	# system icu
 %bcond_without	system_jsoncpp	# system jsoncpp
 %bcond_without	system_libexif	# system libexif
 %bcond_without	system_libmtp	# system libmtp
@@ -71,9 +72,9 @@
 # - http://code.google.com/p/chromium/wiki/LinuxBuildInstructionsPrerequisites
 # - to look for new tarball, use update-source.sh script
 
-%define		branch		38.0.2125
-%define		basever		101
-#define		patchver	132
+%define		branch		40.0.2214
+%define		basever		69
+#define		patchver	95
 %define		gyp_rev	1014
 Summary:	A WebKit powered web browser
 Name:		chromium-browser
@@ -86,10 +87,10 @@ Release:	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:	f2ec6a50864d8b2ddcda0baef50e9c33
+# Source0-md5:	238cbf816f3d3c01a58894a32eb9995d
 %if "%{?patchver}" != ""
 Patch0:		http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{version}.patch.xz
-# Patch0-md5:	4eafe1e64bd47a11dbfaf61a2dd50b6e
+# Patch0-md5:	1e03edf9545804bbc54ab3a77b1f4603
 %endif
 Source1:	%{name}.default
 Source2:	%{name}.sh
@@ -113,11 +114,11 @@ Patch24:	nacl-verbose.patch
 Patch25:	gnome3-volume-control.patch
 Patch26:	master-prefs-path.patch
 Patch28:	system-mesa.patch
-Patch30:	system-ply.patch
 Patch31:	system-jinja.patch
 Patch32:	remove_bundled_libraries-stale.patch
 Patch35:	etc-dir.patch
 Patch36:	angle.patch
+Patch37:	%{name}-build.patch
 URL:		http://www.chromium.org/Home
 %{?with_gconf:BuildRequires:	GConf2-devel}
 %{?with_system_mesa:BuildRequires:	Mesa-libGL-devel >= 9.1}
@@ -152,7 +153,7 @@ BuildRequires:	hicolor-icon-theme
 BuildRequires:	libevent-devel
 %{?with_system_libexif:BuildRequires:	libexif-devel >= 1:0.6.21}
 %{?with_keyring:BuildRequires:	libgnome-keyring-devel}
-BuildRequires:	libicu-devel >= 4.6
+%{?with_system_icu:BuildRequires:	libicu-devel >= 4.6}
 %{!?with_libjpegturbo:BuildRequires:	libjpeg-devel}
 %{?with_libjpegturbo:BuildRequires:	libjpeg-turbo-devel >= 1.2.0}
 %{?with_system_libmtp:BuildRequires:	libmtp-devel >= 1.1.3}
@@ -179,6 +180,7 @@ BuildRequires:	pkgconfig
 %{?with_system_protobuf:BuildRequires:	protobuf-devel}
 %{?with_pulseaudio:BuildRequires:	pulseaudio-devel}
 BuildRequires:	python
+BuildRequires:	python-BeautifulSoup
 #BuildRequires:	python-gyp >= 1-%{gyp_rev}
 BuildRequires:	python-jinja2 >= 2.7
 BuildRequires:	python-modules
@@ -318,11 +320,11 @@ ln -s %{SOURCE7} .
 %{?with_nacl:%patch18 -p1}
 %patch24 -p1
 %patch26 -p2
-#%patch30 -p1
-#%patch31 -p0
+%patch31 -p0
 %patch32 -p1
 %patch35 -p1
 %patch36 -p1
+%patch37 -p1
 
 %{?with_dev:exit 0}
 
@@ -382,7 +384,8 @@ fi
 if [ ! -d third_party/ffmpeg/build.%{target_arch}.linux ]; then
 	# Re-configure bundled ffmpeg
 	cd third_party/ffmpeg
-	chromium/scripts/build_ffmpeg.py linux %{target_arch}
+	chromium/scripts/build_ffmpeg.py linux %{target_arch} \
+		--branding Chromium
 	chromium/scripts/copy_config.sh
 	chromium/scripts/generate_gyp.py
 	cd -
@@ -403,7 +406,7 @@ flags="
 	%{!?debug:-Dwerror= -Ddisable_fatal_linker_warnings=} \
 	%{!?debuginfo:-Dfastbuild=1 -Dremove_webcore_debug_symbols=1} \
 	%{?with_shared_libs:-Dlibrary=shared_library} \
-	%{!?with_system_ffmpeg:-Dbuild_ffmpegsumo=1} -Dproprietary_codecs=1 \
+	%{!?with_system_ffmpeg:-Dbuild_ffmpegsumo=1} \
 	-Dinclude_tests__=0 \
 %if %{with nacl}
 	-Dnaclsdk_mode=custom:/usr/x86_64-nacl \
@@ -440,6 +443,7 @@ flags="
 	%{gyp_with system_ffmpeg} -Dmedia_use_ffmpeg=1 \
 	%{gyp_with system_flac} \
 	%{gyp_with system_harfbuzz} \
+	%{gyp_with system_icu} %{?with_system_icu:-Dicu_use_data_file_flag=0} \
 	%{gyp_with system_jsoncpp} \
 	%{gyp_with system_libexif} \
 	%{gyp_with system_libmtp} \
@@ -461,7 +465,6 @@ flags="
 	%{gyp_with system_zlib} \
 	-Duse_system_bzip2=1 \
 	-Duse_system_expat=1 \
-	-Duse_system_icu=1 -Dicu_use_data_file_flag=0 \
 	-Duse_system_libevent=1 \
 	-Duse_system_libjpeg=1 \
 	-Duse_system_libpng=1 \