X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=chromium-browser.spec;h=487408e0eb89d4b3a8d0b11245034cf754378d65;hb=72c57d7e37bcfa10d98c0286ceab5fabc48a74fa;hp=90de9863c722a9dc9a9ca6a5e07fe3f52949ce55;hpb=a8cb8e5106a853244f2ef93ac5dedb853239caff;p=packages%2Fchromium-browser.git diff --git a/chromium-browser.spec b/chromium-browser.spec index 90de986..487408e 100644 --- a/chromium-browser.spec +++ b/chromium-browser.spec @@ -28,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 @@ -72,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 95 +%define branch 43.0.2357 +%define basever 65 +%define patchver 134 %define gyp_rev 1014 Summary: A WebKit powered web browser Name: chromium-browser @@ -87,10 +88,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: 662f134029f2d6484873ec3c93a8e049 +# Source0-md5: 4aa590c1965817cfb693df7f8404e0b6 %if "%{?patchver}" != "" Patch0: http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{version}.patch.xz -# Patch0-md5: 1e03edf9545804bbc54ab3a77b1f4603 +# Patch0-md5: 0cfc52a089350571474c308dab1327ee %endif Source1: %{name}.default Source2: %{name}.sh @@ -100,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 @@ -119,6 +120,9 @@ 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} @@ -158,10 +162,11 @@ BuildRequires: libevent-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 @@ -212,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 @@ -309,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} @@ -325,6 +330,9 @@ ln -s %{SOURCE7} . %patch35 -p1 %patch36 -p1 %patch37 -p1 +#%patch38 -p1 CHECK +%patch39 -p1 +%patch40 -p0 %{?with_dev:exit 0} @@ -397,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} \ @@ -534,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 @@ -543,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 @@ -628,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