X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=chromium-browser.spec;h=487408e0eb89d4b3a8d0b11245034cf754378d65;hb=72c57d7e37bcfa10d98c0286ceab5fabc48a74fa;hp=eb99dd7615261e1ecc8c9c1229c9fcc90f22acf0;hpb=6144c06ade5165a2cee8c60153fadf7fa2b9d745;p=packages%2Fchromium-browser.git

diff --git a/chromium-browser.spec b/chromium-browser.spec
index eb99dd7..487408e 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
@@ -27,7 +28,8 @@
 %bcond_with	system_mesa		# system Mesa
 %bcond_without	system_minizip	# system minizip
 %bcond_without	system_opus		# system opus codec support, http://www.opus-codec.org/examples/
-%bcond_without	system_protobuf	# system protobuf
+# protobuf broken: https://bugs.gentoo.org/show_bug.cgi?id=525560
+%bcond_with	system_protobuf	# system protobuf
 %bcond_without	system_re2		# system re2
 %bcond_without	system_snappy	# system snappy
 %bcond_without	system_speex	# system speex
@@ -71,9 +73,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	111
+%define		branch		43.0.2357
+%define		basever		65
+%define		patchver	134
 %define		gyp_rev	1014
 Summary:	A WebKit powered web browser
 Name:		chromium-browser
@@ -82,14 +84,14 @@ Version:	%{branch}.%{patchver}
 %else
 Version:	%{branch}.%{basever}
 %endif
-Release:	2
+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:	4aa590c1965817cfb693df7f8404e0b6
 %if "%{?patchver}" != ""
 Patch0:		http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{version}.patch.xz
-# Patch0-md5:	57168f91124d4b3dd26e4f9f41771830
+# Patch0-md5:	0cfc52a089350571474c308dab1327ee
 %endif
 Source1:	%{name}.default
 Source2:	%{name}.sh
@@ -99,8 +101,8 @@ Source6:	update-source.sh
 Source7:	clean-source.sh
 Source8:	get-source.sh
 Source9:	master_preferences.json
+# https://github.com/Kelvin-Ng/Kelvin-Gentoo-Overlay/tree/master/www-client/chromium/files
 Patch2:		enable-video-decode-accel.patch
-Patch4:		path-libpdf.patch
 Patch7:		dlopen_sonamed_gl.patch
 Patch8:		chromium_useragent.patch.in
 # https://bugs.gentoo.org/show_bug.cgi?id=393471
@@ -113,11 +115,14 @@ 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
+Patch38:	vaapi_include.patch
+Patch39:	libsecret.patch
+Patch40:	system-libvpx.patch
 URL:		http://www.chromium.org/Home
 %{?with_gconf:BuildRequires:	GConf2-devel}
 %{?with_system_mesa:BuildRequires:	Mesa-libGL-devel >= 9.1}
@@ -152,15 +157,16 @@ 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}
 BuildRequires:	libpng-devel
+BuildRequires:	libsecret-devel
 %{?with_selinux:BuildRequires:	libselinux-devel}
 BuildRequires:	libstdc++-devel
 %{?with_system_libusb:BuildRequires:	libusb-devel >= 1.0}
-%{?with_system_libvpx:BuildRequires:	libvpx-devel >= 1.3.0}
+%{?with_system_libvpx:BuildRequires:	libvpx-devel >= 1.4.0}
 %{?with_system_libwebp:BuildRequires:	libwebp-devel >= 0.4.0}
 BuildRequires:	libxml2-devel
 BuildRequires:	libxslt-devel
@@ -179,6 +185,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
@@ -210,12 +217,13 @@ Requires:	fonts-Type1-urw
 Requires:	hicolor-icon-theme
 Requires:	libevent >= 2.0.21
 %{?with_libjpegturbo:Requires:	libjpeg-turbo >= 1.2.0}
-%{?with_system_libvpx:Requires:	libvpx >= 1.3.0}
+%{?with_system_libvpx:Requires:	libvpx >= 1.4.0}
 Requires:	lsb-release
 %{?with_system_re2:Requires:	re2 >= 20130115-2}
 %{?with_system_protobuf:Requires:	protobuf-libs >= 2.5.0-2}
 Requires:	shared-mime-info
 %{?with_system_sqlite:Requires:	sqlite3(icu)}
+Requires:	uname(release) >= 3.17
 Requires:	xdg-utils >= 1.0.2-4
 Requires:	xorg-lib-libX11 >= 1.4.99.1
 Provides:	wwwbrowser
@@ -307,8 +315,7 @@ sed -e 's/@BUILD_DIST@/PLD %{pld_version}/g' \
 %{__sed} -e 's,@localedir@,%{_datadir}/%{name},' %{SOURCE5} > find-lang.sh
 ln -s %{SOURCE7} .
 
-#%patch2 -p1 NOT COMPILING
-%patch4 -p3
+#%patch2 -p1 CHECK
 %patch7 -p1
 %patch15 -p2
 %{!?with_libjpegturbo:%patch11 -p0}
@@ -318,11 +325,14 @@ 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
+#%patch38 -p1 CHECK
+%patch39 -p1
+%patch40 -p0
 
 %{?with_dev:exit 0}
 
@@ -395,6 +405,7 @@ third_party/libaddressinput/chromium/tools/update-strings.py
 flags="
 	-Dtarget_arch=%{target_arch} \
 	-Dpython_arch=%{target_arch} \
+	-Dproprietary_codecs=1 \
 	-Dffmpeg_branding=Chromium \
 	-Dsystem_libdir=%{_lib} \
 	-Dpython_ver=%{py_ver} \
@@ -441,6 +452,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} \
@@ -462,7 +474,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 \
@@ -532,7 +543,7 @@ install -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/%{name}
 	}
 ' $RPM_BUILD_ROOT%{_bindir}/%{name}
 cp -a locales resources $RPM_BUILD_ROOT%{_datadir}/%{name}
-cp -p *.pak $RPM_BUILD_ROOT%{_libdir}/%{name}
+cp -p *.pak *.bin $RPM_BUILD_ROOT%{_libdir}/%{name}
 ln -s %{_datadir}/%{name}/locales $RPM_BUILD_ROOT%{_libdir}/%{name}/locales
 ln -s %{_datadir}/%{name}/resources $RPM_BUILD_ROOT%{_libdir}/%{name}/resources
 cp -p chrome.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
@@ -541,7 +552,6 @@ install -p chrome_sandbox $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome-sandbox
 %if %{without system_ffmpeg}
 install -p libffmpegsumo.so $RPM_BUILD_ROOT%{_libdir}/%{name}
 %endif
-install -p libpdf.so $RPM_BUILD_ROOT%{_libdir}/%{name}
 cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}
 cp -p %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/master_preferences
 
@@ -626,12 +636,11 @@ fi
 %{_libdir}/%{name}/content_resources.pak
 %{_libdir}/%{name}/keyboard_resources.pak
 %{_libdir}/%{name}/resources.pak
+%{_libdir}/%{name}/natives_blob.bin
+%{_libdir}/%{name}/snapshot_blob.bin
 %{_libdir}/%{name}/locales
 %{_libdir}/%{name}/resources
 
-# conflicts with browser-plugin-chrome-pdf?
-%attr(755,root,root) %{_libdir}/%{name}/libpdf.so
-
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/locales
 %{_datadir}/%{name}/locales/en-US.pak