#
# Conditional build:
+%bcond_without cups # with cups
%bcond_without debuginfo # disable debuginfo creation (it is huge)
-%bcond_without ffmpegsumo # build with ffmpegsumo
+%bcond_without gconf # with GConf
%bcond_without kerberos # build with kerberos support (dlopened if support compiled, library names in src/net/http/http_auth_gssapi_posix.cc)
%bcond_without keyring # with keyring support (gnome-keyring dlopened, kwalletd via dbus)
-%bcond_without cups # with cups
-%bcond_without gconf # with GConf
+%bcond_without libjpegturbo # use libjpeg-turbo features
+%bcond_without nacl # build Native Client support
%bcond_without pulseaudio # with pulseaudio
-%bcond_with nacl # build Native Client support
%bcond_without sandboxing # with sandboxing
%bcond_with selinux # with SELinux (need policy first)
%bcond_with shared_libs # with shared libs
%bcond_with sse2 # use SSE2 instructions
-%bcond_with tcmalloc # use tcmalloc
-%bcond_with system_sqlite # with system sqlite
-%bcond_without system_flac # with system flac
-%bcond_without system_libwebp # with system libwebp
-%bcond_without system_speex # with system speex
-%bcond_with system_v8 # with system v8
-%bcond_without system_vpx # with system vpx
-%bcond_without system_yasm # with system yasm
-%bcond_without system_zlib # with system zlib
-%bcond_without libjpegturbo # use libjpeg-turbo features
-%bcond_with verbose # verbose build (V=1)
+%bcond_without system_flac # system flac
+%bcond_with system_ffmpeg # system ffmpeg instead of ffmpegsumo
+%bcond_without system_harfbuzz # system harfbuzz
+%bcond_without system_jsoncpp # system jsoncpp
+%bcond_without system_libexif # system libexif
+%bcond_without system_libmtp # system libmtp
+%bcond_without system_libusb # system libusb-1
+%bcond_without system_libwebp # system libwebp
+%bcond_without system_libxnvctrl # system libxnvctrl
+%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
+%bcond_without system_speex # system speex
+%bcond_with system_sqlite # system sqlite
+%bcond_without system_libsrtp # system srtp (can be used if using bundled libjingle)
+%bcond_with system_v8 # system v8
+%bcond_without system_libvpx # system libvpx
+%bcond_without system_yasm # system yasm
+%bcond_without system_zlib # system zlib
+%bcond_without tcmalloc # use tcmalloc
+%bcond_without verbose # verbose build (V=1)
+
+%if %{with nacl}
+# temporary hack as seems this does not work: http://codereview.chromium.org/8890043
+# nacl_bootstrap.c:(.text.load_elf_file+0x707): undefined reference to `__stack_chk_fail'
+#14:08:04 @baggins> glen: yes, I added SSP in rpm5, add -lssp to link flags to fix it
+#14:19:42 @baggins> it doesn't hurt to add -lssp here and there, and we'll be a bit more secure
+#14:51:06 @baggins> as-needed will take care of unneeded lib
+#14:52:03 @baggins> -lssp comes with gcc
+%define _ssp_cflags %{nil}
+%endif
# TODO
# - check system sqlite linking problems
# - find system deps: find -name '*.gyp*' | xargs grep 'use_system.*=='
# - use_system_ssl (use_openssl: http://crbug.com/62803)
-# - use_system_ffmpeg && build_ffmpegsumo
# - use_system_hunspell
# - use_system_stlport
# - other defaults: src/build/common.gypi
+# - system usb-ids stuff
+# - libpci: link, because xserver loads it anyway
# NOTES:
# - mute BEEP mixer if you do not want to hear horrible system bell when
# pressing home/end in url bar or more ^F search results on page.
-# - build -bp: 1.2G
-# - build i686: -bc: 2.7G; -bb: ~1.0GB
-# - build x86_64: ~1.9G
+# - space considerations:
+# - unpacked sources: ~574MiB
+# - built code: ~1.4GiB (x86_64/i686)
# - http://code.google.com/p/chromium/wiki/LinuxBuildInstructionsPrerequisites
# - to look for new tarball, use update-source.sh script
# NOTE TO USERS:
-# To use chromium nightly builds for pld-th save to /etc/poldek/repos.d (as chromium-nightly.conf):
-# http://carme.pld-linux.org/~glen/chromium-browser/th/i686/chromium-nightly.conf
-# or:
+# To use chromium nightly beta builds for pld-th save to /etc/poldek/repos.d (as chromium-nightly.conf):
# http://carme.pld-linux.org/~glen/chromium-browser/th/x86_64/chromium-nightly.conf
+# http://carme.pld-linux.org/~glen/chromium-browser/th/i686/chromium-nightly.conf
%define gyp_rev 1014
Summary: A WebKit powered web browser
Name: chromium-browser
-Version: 20.0.1132.47
-Release: 1
+Version: 25.0.1364.26
+Release: 0.24
License: BSD, LGPL v2+ (ffmpeg)
Group: X11/Applications/Networking
-Source0: http://carme.pld-linux.org/~glen/chromium-browser/src/beta/%{name}-%{version}.tar.xz
-# Source0-md5: 282c717fbfaee8acd6d5bf4f676019a2
+Source0: http://carme.pld-linux.org/~glen/chromium-browser/src/dev/%{name}-%{version}.tar.gz
+# Source0-md5: 2995d5aa3f1ecb470e60e0984229fcce
Source1: %{name}.default
Source2: %{name}.sh
Source3: %{name}.desktop
Source6: update-source.sh
Source7: clean-source.sh
Source8: get-source.sh
-Patch0: system-libs.patch
+Source9: master_preferences.json
Patch1: plugin-searchdirs.patch
-Patch2: gyp-system-minizip.patch
+#Patch2: system-nspr.patch
Patch3: disable_dlog_and_dcheck_in_release_builds.patch
-Patch5: options-support.patch
+Patch4: path-libpdf.patch
Patch6: get-webkit_revision.patch
Patch7: dlopen_sonamed_gl.patch
Patch8: chromium_useragent.patch.in
-Patch9: system-expat.patch
-Patch10: %{name}-pulse.patch
+Patch9: chromium-ppapi.patch
+Patch10: system-libxnvctrl.patch
# https://bugs.gentoo.org/show_bug.cgi?id=393471
# libjpeg-turbo >= 1.1.90 supports that feature
Patch11: chromium-revert-jpeg-swizzle-r2.patch
-Patch12: tcmalloc.patch
-Patch13: %{name}-c++.patch
-Patch14: chromium-alignment-r0.patch
+Patch12: system-ffmpeg.patch
+Patch13: system-libpng.patch
+Patch14: system-opus.patch
+Patch15: nacl-build-irt.patch
+Patch16: nacl-linkingfix.patch
+Patch18: nacl-no-untar.patch
+Patch19: system-jsoncpp.patch
+Patch23: no-pnacl.patch
+Patch24: nacl-verbose.patch
+Patch25: gnome3-volume-control.patch
+Patch26: master-prefs-path.patch
+Patch27: tcmalloc-glibc2.16.patch
URL: http://www.chromium.org/Home
%{?with_gconf:BuildRequires: GConf2-devel}
BuildRequires: OpenGL-GLU-devel
BuildRequires: atk-devel
BuildRequires: bison
BuildRequires: bzip2-devel
+%{?with_nacl:BuildRequires: crossnacl-binutils >= 2.20.1}
+%{?with_nacl:BuildRequires: crossnacl-gcc >= 4.4.3}
+%{?with_nacl:BuildRequires: crossnacl-gcc-c++ >= 4.4.3}
+%{?with_nacl:BuildRequires: crossnacl-newlib >= 1.20.0-3}
%{?with_cups:BuildRequires: cups-devel}
BuildRequires: dbus-glib-devel
BuildRequires: expat-devel
-%{?with_system_flac:BuildRequires: flac-devel}
+%{?with_system_ffmpeg:BuildRequires: ffmpeg-devel >= 1.0}
+%{?with_system_flac:BuildRequires: flac-devel >= 1.2.1-7}
BuildRequires: flex
BuildRequires: fontconfig-devel
BuildRequires: glib2-devel
BuildRequires: gperf
+BuildRequires: gtest-devel
BuildRequires: gtk+2-devel
+%{?with_system_harfbuzz:BuildRequires: harfbuzz-devel}
%{?with_kerberos:BuildRequires: heimdal-devel}
BuildRequires: hicolor-icon-theme
+%{?with_system_jsoncpp:BuildRequires: jsoncpp-devel}
+%{?with_system_libxvnctrl:BuildRequires: libXNVCtrl-devel >= 310.19}
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_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
%{?with_selinux:BuildRequires: libselinux-devel}
BuildRequires: libstdc++-devel
-%{?with_system_vpx:BuildRequires: libvpx-devel >= 0.9.5-2}
-%{?with_system_libwebp:BuildRequires: libwebp-devel >= 0.1.3}
+%{?with_system_libusb:BuildRequires: libusb-devel >= 1.0}
+%{?with_system_libvpx:BuildRequires: libvpx-devel >= 0.9.5-2}
+%{?with_system_libwebp:BuildRequires: libwebp-devel >= 0.1.99}
BuildRequires: libxml2-devel
BuildRequires: libxslt-devel
BuildRequires: lzma
-BuildRequires: minizip-devel
-%{?with_nacl:BuildRequires: nacl-toolchain-newlib >= 0.6941}
+%{?with_system_minizip:BuildRequires: minizip-devel}
BuildRequires: nspr-devel
BuildRequires: nss-devel >= 1:3.12.3
+%{?with_system_opus:BuildRequires: opus-devel >= 1.0.2}
BuildRequires: pam-devel
BuildRequires: pango-devel
BuildRequires: perl-modules
BuildRequires: pkgconfig
+%{?with_system_protobuf:BuildRequires: protobuf-devel}
%{?with_pulseaudio:BuildRequires: pulseaudio-devel}
BuildRequires: python
#BuildRequires: python-gyp >= 1-%{gyp_rev}
BuildRequires: rpmbuild(macros) >= 1.453
%{?with_system_speex:BuildRequires: speex-devel >= 1:1.2-rc1}
BuildRequires: sqlite3-devel >= 3.6.1
+%{?with_system_libsrtp:BuildRequires: srtp-devel >= 1.4.4}
BuildRequires: subversion
BuildRequires: tar >= 1:1.22
BuildRequires: udev-devel
%{?with_system_zlib:BuildRequires: zlib-devel}
Requires: browser-plugins >= 2.0
Requires: desktop-file-utils
+%{?with_system_flac:Requires: flac >= 1.2.1-7}
Requires: hicolor-icon-theme
%{?with_libjpegturbo:Requires: libjpeg-turbo >= 1.2.0}
-%{?with_system_vpx:Requires: libvpx >= 0.9.5-2}
+%{?with_system_libvpx:Requires: libvpx >= 0.9.5-2}
Requires: xdg-utils >= 1.0.2-4
Provides: wwwbrowser
Obsoletes: chromium-browser-bookmark_manager < 5.0.388.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define find_lang sh find-lang.sh %{buildroot}
+
# Usage: gyp_with BCOND_NAME [OPTION_NAME]
%define gyp_with() %{expand:%%{?with_%{1}:-D%{?2:use_%{2}}%{!?2:use_%{1}}=1}%%{!?with_%{1}:-D%{?2:use_%{2}}%{!?2:use_%{1}}=0}}
v8_ver=$(awk 'NR=1 {print $NF; exit}' src/v8/ChangeLog || :)
-# Populate the LASTCHANGE file template as we no longer have the VCS files at this point
-#echo "%{svnver}" > src/build/LASTCHANGE.in
-
# add chromium and pld to useragent
%define pld_version %(echo %{pld_release} | sed -e 'y/[at]/[AT]/')
sed -e 's/@BUILD_DIST@/PLD %{pld_version}/g' \
%{__sed} -e 's,@localedir@,%{_libdir}/%{name},' %{SOURCE5} > find-lang.sh
ln -s %{SOURCE7} src
-%patch0 -p1
%patch1 -p1
-%patch2 -p1
%patch3 -p1
-%patch5 -p1
+%patch4 -p1
%patch6 -p1
%patch7 -p1
+%patch15 -p1
cd src
-%patch9 -p1
-%patch10 -p1
+%patch9 -p0
+#%patch2 -p1
%{!?with_libjpegturbo:%patch11 -p0}
-%patch12 -p0
+%patch12 -p1
%patch13 -p0
-%patch14 -p0
+%patch14 -p2
+%patch16 -p1
+%patch19 -p1
+%patch25 -p1
+%patch27 -p1
cd ..
+%patch18 -p1
+%patch23 -p1
+%patch24 -p1
+%patch26 -p1
cd src
-sh -x clean-source.sh %{!?with_system_v8:v8=0} %{!?with_nacl:nacl=0} libxml=0
+
+# Missing gyp files in tarball.
+# https://code.google.com/p/chromium/issues/detail?id=144823
+if [ -e chrome/test/data/nacl/nacl_test_data.gyp ]; then
+ echo "tarball fixed, please remove workaround"
+ exit 1
+fi
+
+install -d chrome/test/data/nacl
+cat > chrome/test/data/nacl/nacl_test_data.gyp <<-EOF
+{
+ 'targets': [
+ {
+ 'target_name': 'nacl_tests',
+ 'type': 'none',
+ },
+ ],
+}
+EOF
+
+sh -x clean-source.sh \
+ %{!?with_nacl:nacl=0} \
+ %{!?with_system_protobuf:protobuf=0} \
+ %{!?with_system_v8:v8=0} \
+ %{!?with_system_zlib:zlib=0} \
+ %{nil}
%build
cd src
-test -e Makefile || %{__python} build/gyp_chromium --format=make build/all.gyp \
+
+%if %{with nacl}
+rm -rf native_client/toolchain/linux_x86_newlib
+if [ ! -d native_client/toolchain/linux_x86_newlib ]; then
+# Make symlinks for NaCL
+install -d native_client/toolchain/linux_x86_newlib/x86_64-nacl/{bin,nacl}
+
+cd native_client/toolchain/linux_x86_newlib
+ln -s x86_64-nacl/bin bin
+cd x86_64-nacl/bin
+__cc='%{__cc}'
+if [ "${__cc#ccache}" != "$__cc" ]; then
+ echo 'exec ccache %{_bindir}/x86_64-nacl-gcc "$@"' > gcc
+ echo 'exec ccache %{_bindir}/x86_64-nacl-g++ "$@"' > g++
+ %{__sed} -i -e '1i#!/bin/sh' gcc g++
+ chmod +x gcc g++
+else
+ ln -s %{_bindir}/x86_64-nacl-gcc gcc
+ ln -s %{_bindir}/x86_64-nacl-g++ g++
+fi
+ln -s gcc x86_64-nacl-gcc
+ln -s g++ x86_64-nacl-g++
+ln -s %{_bindir}/x86_64-nacl-ar .
+ln -s %{_bindir}/x86_64-nacl-ar ar
+ln -s %{_bindir}/x86_64-nacl-as as
+ln -s %{_bindir}/x86_64-nacl-ranlib .
+ln -s %{_bindir}/x86_64-nacl-ranlib ranlib
+ln -s %{_bindir}/x86_64-nacl-strip .
+ln -s %{_bindir}/x86_64-nacl-strip strip
+ln -s %{_prefix}/x86_64-nacl/lib ../lib
+ln -s %{_prefix}/x86_64-nacl/lib32 ../lib32
+ln -s %{_prefix}/x86_64-nacl/include ../nacl/include
+cd ../../../../..
+fi
+%endif
+
+test %{_specdir}/%{name}.spec -nt Makefile && %{__rm} -f Makefile
+test -e Makefile || %{__python} build/gyp_chromium \
+ --format=make \
+ -Goutput_dir=../out \
+ build/all.gyp \
%ifarch %{ix86}
-Dtarget_arch=ia32 \
%endif
%{!?debug:-Dwerror=} \
%{!?debuginfo:-Dfastbuild=1 -Dremove_webcore_debug_symbols=1} \
%{?with_shared_libs:-Dlibrary=shared_library} \
- -Dbuild_ffmpegsumo=%{?with_ffmpegsumo:1}%{!?with_ffmpegsumo:0} \
- -Dffmpeg_branding=Chrome \
- -Dproprietary_codecs=1 \
- %{!?with_nacl:-Ddisable_nacl=1} \
+ %{!?with_system_ffmpeg:-Dbuild_ffmpegsumo=1 -Dproprietary_codecs=1} \
+ -Dinclude_tests=0 \
+%if %{with nacl}
+ -Dnaclsdk_mode=custom:/usr/x86_64-nacl \
+ -Ddisable_glibc_untar=1 \
+ -Ddisable_newlib_untar=1 \
+ -Ddisable_glibc=1 \
+ -Ddisable_pnacl=1 \
+ -Dbuild_pnacl_newlib=0 \
+%else
+ -Ddisable_pnacl_untar=1 \
+ -Ddisable_nacl=1 \
+%endif
%{!?with_sse2:-Ddisable_sse2=1} \
%{?with_selinux:-Dselinux=1} \
%{gyp_with cups} \
- %{gyp_with flac} \
- %{gyp_with gconf} \
+ %{gyp_with gconf} -Dlinux_link_gsettings=0 \
%{gyp_with kerberos} -Dlinux_link_kerberos=0 \
%{gyp_with keyring gnome_keyring} -Dlinux_link_gnome_keyring=0 \
%{gyp_with pulseaudio} \
+ %{gyp_with system_ffmpeg} \
+ %{gyp_with system_flac} \
+ %{gyp_with system_harfbuzz} \
+ %{gyp_with system_libexif} \
+ %{gyp_with system_libmtp} \
+ %{gyp_with system_libsrtp} \
+ %{gyp_with system_libusb} \
+ %{gyp_with system_libvpx} \
%{gyp_with system_libwebp} \
+ %{gyp_with system_libxnvctrl} \
+ %{gyp_with system_minizip} \
+ %{gyp_with system_opus} \
+ %{gyp_with system_protobuf} \
%{gyp_with system_speex} \
%{gyp_with system_sqlite} \
%{gyp_with system_v8} \
- %{gyp_with system_vpx} \
%{gyp_with system_yasm} \
%{gyp_with system_zlib} \
-Duse_system_bzip2=1 \
+ -Duse_system_expat=1 \
-Duse_system_icu=1 \
-Duse_system_libevent=1 \
-Duse_system_libjpeg=1 \
-Dlinux_use_gold_binary=0 \
-Dlinux_use_gold_flags=0
-%{__make} chrome %{?with_sandboxing:chrome_sandbox} \
+%{__make} -r chrome %{?with_sandboxing:chrome_sandbox} \
BUILDTYPE=%{!?debug:Release}%{?debug:Debug} \
%{?with_verbose:V=1} \
CC="%{__cc}" \
install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/{themes,plugins,extensions} \
$RPM_BUILD_ROOT{%{_bindir},%{_sysconfdir}/%{name},%{_mandir}/man1,%{_desktopdir}}
-cd src/out/%{!?debug:Release}%{?debug:Debug}
+cd out/%{!?debug:Release}%{?debug:Debug}
cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/default
install -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/%{name}
%{__sed} -i -e 's,@libdir@,%{_libdir}/%{name},' $RPM_BUILD_ROOT%{_bindir}/%{name}
cp -p chrome.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
install -p chrome $RPM_BUILD_ROOT%{_libdir}/%{name}/%{name}
install -p chrome_sandbox $RPM_BUILD_ROOT%{_libdir}/%{name}/chromium-sandbox
-%if %{with ffmpegsumo}
+%if %{without system_ffmpeg}
install -p libffmpegsumo.so $RPM_BUILD_ROOT%{_libdir}/%{name}
%endif
cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}
+cp -p %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/master_preferences
+
+%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/%{name}/resources/extension/demo
%if %{with nacl}
# Install Native Client files on platforms that support it.
%update_browser_plugins
fi
-%files -f %{name}.lang
+%files
%defattr(644,root,root,755)
+%doc src/{AUTHORS,LICENSE}
%{_browserpluginsconfdir}/browsers.d/%{name}.*
%config(noreplace) %verify(not md5 mtime size) %{_browserpluginsconfdir}/blacklist.d/%{name}.*.blacklist
%dir %{_sysconfdir}/%{name}
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/default
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/master_preferences
%attr(755,root,root) %{_bindir}/%{name}
%{_mandir}/man1/%{name}.1*
%{_desktopdir}/*.desktop
%{_iconsdir}/hicolor/*/apps/%{name}.png
%dir %{_libdir}/%{name}
-%{_libdir}/%{name}/chrome.pak
+%{_libdir}/%{name}/chrome*.pak
%{_libdir}/%{name}/content_resources.pak
%{_libdir}/%{name}/resources.pak
-%{_libdir}/%{name}/theme_resources_standard.pak
-%{_libdir}/%{name}/ui_resources_standard.pak
%dir %{_libdir}/%{name}/locales
%{_libdir}/%{name}/locales/en-US.pak
%dir %{_libdir}/%{name}/resources
%attr(4555,root,root) %{_libdir}/%{name}/chromium-sandbox
# ffmpeg libs
-%if %{with ffmpegsumo}
+%if %{without system_ffmpeg}
%attr(755,root,root) %{_libdir}/%{name}/libffmpegsumo.so
%endif
projects / packages / chromium-browser.git / blobdiff