|
|
@@ -1,14 +1,10 @@
|
|
|
-# Thanks to malcolmlewis for help with this script
|
|
|
-# Thanks to Tom "spot" Callaway for much of the patchwork
|
|
|
-# Thanks to jhaygood for most of the icu patch
|
|
|
+#% global with_system_zlib 1
|
|
|
+#% global with_system_jpeg 1
|
|
|
+#% global with_system_png 1
|
|
|
|
|
|
-%define pkgname chromium
|
|
|
-
|
|
|
-#% define with_system_jpeg 1
|
|
|
-
|
|
|
-#% define with_system_icu 1
|
|
|
-#% define with_system_v8 1
|
|
|
-%define with_system_vpx 1
|
|
|
+#% global with_system_icu 1
|
|
|
+#% global with_system_v8 1
|
|
|
+#% global with_system_vpx 1
|
|
|
|
|
|
#NOTE: src/third_party/ffmpeg/ffmpeg.gyp:
|
|
|
# There's a couple key GYP variables that control how FFmpeg is built:
|
|
|
@@ -16,15 +12,12 @@
|
|
|
# Controls whether we build the Chromium or Google Chrome version of
|
|
|
# FFmpeg. The Google Chrome version contains additional codecs.
|
|
|
# Typical values are Chromium, Chrome, ChromiumOS, and ChromeOS.
|
|
|
-# use_system_ffmpeg
|
|
|
-# When set to non-zero will build Chromium against the system FFmpeg
|
|
|
-# headers via pkg-config. When Chromium is launched it will assume that
|
|
|
-# FFmpeg is present in the system library path. Default value is 0.
|
|
|
# build_ffmpegsumo
|
|
|
-# When set to zero will build Chromium against the patched ffmpegsumo
|
|
|
-# headers, but not build ffmpegsumo itself. Users are expected to build
|
|
|
-# and provide their own version of ffmpegsumo. Default value is 1.
|
|
|
-%define with_system_ffmpeg 1
|
|
|
+# When set to zero will build Chromium against Chrome's FFmpeg headers, but
|
|
|
+# not build ffmpegsumo itself. Users are expected to build and provide
|
|
|
+# their own version of ffmpegsumo. Default value is 1.
|
|
|
+#% global with_system_ffmpeg 1
|
|
|
+#% global with_build_ffmpegsumo 1
|
|
|
|
|
|
%global chrome_sandbox %{_prefix}/lib/chrome_sandbox
|
|
|
|
|
|
@@ -32,15 +25,15 @@ Name: chromium
|
|
|
Summary: Google's opens source browser project
|
|
|
Summary(ja): Googleのオープンソースウェブブラウザ
|
|
|
#'
|
|
|
-Version: 22.0.1229.94
|
|
|
+Version: 32.0.1700.77
|
|
|
Release: 1%{?_dist_release}
|
|
|
License: BSD-3-Clause, LGPL-2.1+
|
|
|
Group: Applications/Internet
|
|
|
-Source0: %{pkgname}-%{version}.tar.xz
|
|
|
-# Script used to create the %{pkgname}-%{version}.tar.xz archive from
|
|
|
+Source0: %{name}-%{version}-vine.tar.xz
|
|
|
+# Script used to create the %{name}-%{version}-vine.tar.xz archive from
|
|
|
# a official tarball:
|
|
|
-# http://gsdview.appspot.com/chromium-browser-official/chromium-21.0.1180.XXX.tar.bz2
|
|
|
-Source3: pack_chromium21_source-vine.sh
|
|
|
+# http://gsdview.appspot.com/chromium-browser-official/chromium-30.0.1599.XXX.tar.xz
|
|
|
+Source3: pack_chromium_source-vine.sh
|
|
|
# Patch template which adds vendor to user agent
|
|
|
##!!Source20: chromium-vendor.patch.in
|
|
|
Source20: chromium-vendor-vine.patch.in
|
|
|
@@ -55,45 +48,39 @@ Source100: chromium-browser-vine.sh
|
|
|
##!!Source101: chromium-browser.desktop
|
|
|
Source101: chromium-browser-vine.desktop
|
|
|
Source102: chromium-browser.xml
|
|
|
-#Source103: chromium-browser-rpmlintrc
|
|
|
-##!!Source104: chromium-icons.tar.bz2
|
|
|
-
|
|
|
-%{?nosrc:NoSource: 0}
|
|
|
+Source103: chromium.default
|
|
|
|
|
|
-# Provides: chromium-unstable = %{version}-%{release}
|
|
|
-# Obsoletes: chromium13 chromium14 chromium15
|
|
|
-# Conflicts: chromium-stable
|
|
|
-Provides: chromium-stable = %{version}-%{release}
|
|
|
-Conflicts: chromium-unstable
|
|
|
|
|
|
## Start Patches
|
|
|
-# OpenSuse and Fedora
|
|
|
+# Fedora and OpenSUSE
|
|
|
# Many changes to the gyp systems so we can use system libraries
|
|
|
-Patch1: chromium-gcc46.patch
|
|
|
-Patch8: chromium-codechanges-zlib.patch
|
|
|
-Patch13: chromium-no-courgette.patch
|
|
|
-Patch14: chromium-master-prefs-path.patch
|
|
|
-Patch17: chromium-system-glew.patch
|
|
|
-Patch18: chromium-system-expat.patch
|
|
|
-Patch20: chromium-6.0.425.0-ffmpeg-no-pkgconfig.patch
|
|
|
-Patch25: tcmalloc-factory.patch
|
|
|
-Patch26: chromium-remoting-build-fix.diff
|
|
|
-Patch28: chromium-22.0.1229.94-system-speex.patch
|
|
|
-Patch32: chromium-7.0.542.0-system-libvpx.patch
|
|
|
-Patch62: chromium-norpath.patch
|
|
|
-Patch63: chromium-6.0.406.0-system-gyp-v8.patch
|
|
|
+Patch1: chromium-32.0.1700.72-no-test-sources.patch
|
|
|
+# removes build part for courgette
|
|
|
+Patch13: chromium-32.0.1700.72-no-courgette.patch
|
|
|
+# enables reading of the master preference
|
|
|
+Patch14: chromium-30.0.1599.84-master-prefs-path.patch
|
|
|
+# Fix some includes specifically for the GCC version used
|
|
|
+#Patch21: chromium-gcc-fixes.patch
|
|
|
+Patch21: chromium-gcc47.patch
|
|
|
+# Add more charset aliases
|
|
|
Patch64: chromium-more-codec-aliases.patch
|
|
|
+# Compile the sandbox with -fPIE settings
|
|
|
Patch66: chromium-sandbox-pie.patch
|
|
|
-Patch67: chromium_use_gold.patch
|
|
|
-Patch68: chromium-gcc47.patch
|
|
|
-# Upstream Patches
|
|
|
-#Patch500: sqlite-3.7.6.3-fix-out-of-scope-memory-reference.patch
|
|
|
+# Adjust ldflags for better building
|
|
|
+Patch67: adjust-ldflags-no-keep-memory.patch
|
|
|
+# Fix the chromedriver build due to a non-svn tarball
|
|
|
+Patch68: chromium-31.0.1650.57-fix-chromedriver-build.patch
|
|
|
|
|
|
|
|
|
+# http://code.google.com/p/gperftools/issues/detail?id=444
|
|
|
+Patch90: chromium-21.0.1180.81-glibc216.patch
|
|
|
+
|
|
|
# Vine
|
|
|
-#Patch100: chromium-15.0.874.116-no-tests.patch
|
|
|
+Patch100: chromium-30.0.1599.84-no-ffmpegsumo.patch
|
|
|
+Patch101: chromium-disable-GoogleApiKeysInfoBar-vine.patch
|
|
|
|
|
|
|
|
|
+BuildRequires: pciutils-devel
|
|
|
##!!BuildRequires: Mesa-devel
|
|
|
BuildRequires: mesa-libGLU-devel
|
|
|
##!!BuildRequires: alsa-devel
|
|
|
@@ -102,28 +89,25 @@ BuildRequires: pulseaudio-libs-devel
|
|
|
BuildRequires: bison
|
|
|
BuildRequires: cups-devel
|
|
|
BuildRequires: desktop-file-utils
|
|
|
-BuildRequires: fdupes
|
|
|
BuildRequires: flex
|
|
|
BuildRequires: freetype2-devel
|
|
|
-BuildRequires: gcc
|
|
|
-BuildRequires: gcc-c++
|
|
|
BuildRequires: gperf
|
|
|
BuildRequires: hunspell-devel
|
|
|
##!!BuildRequires: libbz2-devel
|
|
|
-BuildRequires: bzip2-devel
|
|
|
-BuildRequires: libevent
|
|
|
+%{?with_system_bzip2:BuildRequires: bzip2-devel}
|
|
|
+%{?with_system_libevent:BuildRequires: libevent-devel}
|
|
|
##!!BuildRequires: libexpat-devel
|
|
|
BuildRequires: expat-devel
|
|
|
##!!BuildRequires: libgnutls-devel
|
|
|
BuildRequires: gnutls-devel
|
|
|
%{?with_system_jpeg:BuildRequires: libjpeg-devel}
|
|
|
-BuildRequires: libpng-devel
|
|
|
+%{?with_system_png:BuildRequires: libpng-devel}
|
|
|
BuildRequires: libstdc++-devel >= 4.4
|
|
|
%{?with_system_vpx:BuildRequires: libvpx-devel >= 0.9.5}
|
|
|
-BuildRequires: libxslt-devel
|
|
|
+%{?with_system_libxslt:BuildRequires: libxslt-devel}
|
|
|
BuildRequires: libzip-devel
|
|
|
##!!BuildRequires: lzma
|
|
|
-BuildRequires: xz
|
|
|
+#BuildRequires: xz
|
|
|
##!!BuildRequires: mozilla-nspr-devel
|
|
|
BuildRequires: nspr-devel
|
|
|
##!!BuildRequires: mozilla-nss-devel
|
|
|
@@ -132,7 +116,7 @@ BuildRequires: krb5-devel
|
|
|
BuildRequires: openssl-devel
|
|
|
BuildRequires: pam-devel
|
|
|
##!!BuildRequires: pkg-config
|
|
|
-BuildRequires: subversion
|
|
|
+#BuildRequires: subversion
|
|
|
##!!BuildRequires: perl(Switch)
|
|
|
BuildRequires: perl
|
|
|
BuildRequires: cairo-devel >= 1.6
|
|
|
@@ -142,15 +126,15 @@ BuildRequires: dbus-glib-devel
|
|
|
BuildRequires: GConf2-devel
|
|
|
BuildRequires: glib2-devel
|
|
|
BuildRequires: gtk2-devel
|
|
|
-BuildRequires: libxml2-devel
|
|
|
+%{?with_system_libxml:BuildRequires: libxml2-devel}
|
|
|
BuildRequires: python
|
|
|
##!!BuildRequires: python-xml
|
|
|
BuildRequires: python-pyxml
|
|
|
-BuildRequires: sqlite3-devel
|
|
|
+%{?with_system_sqlite:BuildRequires: sqlite3-devel}
|
|
|
##!!BuildRequires: update-desktop-files
|
|
|
-%{?with_system_v8:BuildRequires: v8-devel = %{v8_ver}}
|
|
|
+%{?with_system_v8:BuildRequires: v8-devel}
|
|
|
##!!BuildRequires: wdiff
|
|
|
-BuildRequires: zlib-devel
|
|
|
+%{?with_system_zlib:BuildRequires: zlib-devel}
|
|
|
##!!BuildRequires: libpulse-devel
|
|
|
BuildRequires: pulseaudio-libs-devel
|
|
|
##!!BuildRequires: libelf-devel
|
|
|
@@ -158,12 +142,9 @@ BuildRequires: elfutils-libelf-devel
|
|
|
BuildRequires: libgnome-keyring-devel
|
|
|
BuildRequires: python-devel
|
|
|
#BuildRequires: glew-devel
|
|
|
-BuildRequires: libevent-devel
|
|
|
%{?with_system_icu:BuildRequires: libicu-devel >= 4.0}
|
|
|
-#BuildRequires: libjingle-devel >= 0.4.0-7
|
|
|
-#BuildRequires: srtp-devel
|
|
|
-BuildRequires: speex-devel
|
|
|
BuildRequires: libudev-devel
|
|
|
+BuildRequires: libcap-devel
|
|
|
|
|
|
##Vine Linux
|
|
|
#BuildRequires: libpaper-devel
|
|
|
@@ -179,10 +160,13 @@ BuildRequires: libXt-devel
|
|
|
Requires: alsa-lib
|
|
|
Requires: pulseaudio-libs
|
|
|
Requires: xdg-utils
|
|
|
-%{?with_system_v8:Requires: v8 = %{v8_ver}}
|
|
|
+%{?with_system_v8:Requires: v8}
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
|
|
|
+Obsoletes: chromium < %{version}-%{release}
|
|
|
+
|
|
|
+
|
|
|
%description
|
|
|
Chromium is the open-source project behind Google Chrome.
|
|
|
We invite you to join us in our effort to help build a safer, faster,
|
|
|
@@ -200,109 +184,152 @@ Chromium は Google Chrome の後方にあるオープンソースプロジェ
|
|
|
|
|
|
|
|
|
%prep
|
|
|
+# if 0%{?with_build_ffmpegsumo}
|
|
|
+# # with_build_ffmpegsumo=1
|
|
|
+# else
|
|
|
+# # with_build_ffmpegsumo=0
|
|
|
+# endif
|
|
|
+
|
|
|
#%setup -q
|
|
|
-[ -d %{pkgname}-%{version} ] && %__rm -rf %{pkgname}-%{version}
|
|
|
+[ -d %{name}-%{version} ] && %__rm -rf %{name}-%{version}
|
|
|
xz -dc %{SOURCE0} | %__tar -xf - || exit 1
|
|
|
-%setup -D -T -n %{pkgname}-%{version}
|
|
|
+%setup -D -T -n %{name}-%{version}
|
|
|
|
|
|
-%if %{?_dist_release} == "vl7"
|
|
|
%patch1 -p1
|
|
|
-%endif
|
|
|
-%patch62 -p1
|
|
|
-%{?with_system_v8:%patch63 -p1}
|
|
|
%patch64
|
|
|
-#%patch65 -p1
|
|
|
-#%patch100 -p1 -b .vine
|
|
|
-%patch8 -p1
|
|
|
%patch13 -p1
|
|
|
%patch14 -p1
|
|
|
-%patch17 -p1
|
|
|
-%patch18 -p1
|
|
|
-%{?with_system_ffmpeg:%patch20 -p1}
|
|
|
-#%patch25 -p1
|
|
|
-%patch26 -p1
|
|
|
-%patch28 -p1
|
|
|
-%{?with_system_vpx:%patch32 -p1}
|
|
|
+%patch21 -p1
|
|
|
%patch66 -p1
|
|
|
-#%patch67 -p1
|
|
|
+%patch67 -p1
|
|
|
#%patch68 -p1
|
|
|
-#%patch500 -p1
|
|
|
|
|
|
+%patch90 -p1
|
|
|
+
|
|
|
+%patch100 -p1
|
|
|
+%patch101 -p1
|
|
|
+
|
|
|
+## built header file: avconfig.h
|
|
|
+[ -f src/third_party/ffmpeg/libavutil/avconfig.h ] && exit 1
|
|
|
+cat > src/third_party/ffmpeg/libavutil/avconfig.h <<EOF
|
|
|
+/* Generated by ffconf */
|
|
|
+#ifndef AVUTIL_AVCONFIG_H
|
|
|
+#define AVUTIL_AVCONFIG_H
|
|
|
+#define AV_HAVE_BIGENDIAN 0
|
|
|
+#define AV_HAVE_FAST_UNALIGNED 1
|
|
|
+#define AV_HAVE_INCOMPATIBLE_FORK_ABI 0
|
|
|
+#endif /* AVUTIL_AVCONFIG_H */
|
|
|
+EOF
|
|
|
|
|
|
# apply vendor patch after substitution
|
|
|
-%__sed "s:RPM_VERSION:%{version}-%{release}:" %{SOURCE20} | patch -p0
|
|
|
+%__sed "s:RPM_VERSION:%{version}-%{release}:" %{SOURCE20} | patch -p0 || exit 1
|
|
|
|
|
|
# Make sure that the requires legal files can be found
|
|
|
%__cp -a src/AUTHORS src/LICENSE . || exit 1
|
|
|
|
|
|
%build
|
|
|
+export CC="gcc"
|
|
|
+export CXX="g++"
|
|
|
+export AR="ar"
|
|
|
+export RANLIB="ranlib"
|
|
|
|
|
|
## create make files
|
|
|
|
|
|
-PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS -DUSE_SYSTEM_LIBEVENT -fPIC -fno-ipa-cp -fno-strict-aliasing \' | %__sed "s/ /',/g" | %__sed "s/',/', '/g"`
|
|
|
+PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS -fPIC -fno-ipa-cp -fno-strict-aliasing \' | %__sed "s/ /',/g" | %__sed "s/',/', '/g" `
|
|
|
+# '
|
|
|
for i in src/build/common.gypi; do
|
|
|
%__sed -i "s|'-march=pentium4',||g" $i
|
|
|
- %__sed -i "s|'-mfpmath=sse',||g" $i
|
|
|
+ %__sed -i "s|'-mfpmath=sse',||g" $i
|
|
|
%__sed -i "s|'-O<(debug_optimize)',||g" $i
|
|
|
- %__sed -i "s|'-m32',||g" $i
|
|
|
%__sed -i "s|'-fno-exceptions',|$PARSED_OPT_FLAGS|g" $i
|
|
|
%__sed -i "s|'-Werror'|'-Wno-error'|g" $i
|
|
|
+ %__sed -i "s|'-O2'|'-O3'|g" $i
|
|
|
done
|
|
|
-# '
|
|
|
|
|
|
pushd src
|
|
|
|
|
|
-./build/gyp_chromium -f make build/all.gyp \
|
|
|
+./build/gyp_chromium -f make build/all.gyp --depth . \
|
|
|
+ -Dwerror= \
|
|
|
+ -Dlinux_dump_symbols=0 \
|
|
|
-Dlinux_sandbox_path=%{chrome_sandbox} \
|
|
|
-Dlinux_sandbox_chrome_path=%{_libdir}/chromium/chromium \
|
|
|
- -Duse_openssl=0 \
|
|
|
- %{?with_system_ffmpeg:-Duse_system_ffmpeg=1} \
|
|
|
- %{!?with_system_ffmpeg:-Duse_system_ffmpeg=0} \
|
|
|
- -Dbuild_ffmpegsumo=1 \
|
|
|
- -Duse_system_zlib=1 \
|
|
|
- -Duse_system_libpng=1 \
|
|
|
- -Duse_system_bzip2=1 \
|
|
|
- -Duse_system_libbz2=1 \
|
|
|
- %{?with_system_jpeg:-Duse_system_libjpeg=1} \
|
|
|
- %{!?with_system_jpeg:-Duse_system_libjpeg=0} \
|
|
|
- -Duse_system_libxml=1 \
|
|
|
- -Duse_system_libxslt=1 \
|
|
|
- -Duse_system_libevent=1 \
|
|
|
- %{?with_system_vpx:-Duse_system_vpx=1} \
|
|
|
- %{!?with_system_vpx:-Duse_system_vpx=0} \
|
|
|
- -Dremove_webcore_debug_symbols=1 \
|
|
|
- %{?with_system_v8:-Duse_system_v8=1} \
|
|
|
- %{!?with_system_v8:-Duse_system_v8=0} \
|
|
|
- %{?with_system_icu:-Duse_system_icu=1} \
|
|
|
- %{!?with_system_icu:-Duse_system_icu=0} \
|
|
|
- %{?_with_shared_library:-Dlibrary=shared_library} \
|
|
|
- -Dproprietary_codecs=1 \
|
|
|
- -Ddisable_nacl=1 \
|
|
|
- -Dlinux_use_gold_flags=0 \
|
|
|
- -Dlinux_use_gold_binary=0 \
|
|
|
- -Djavascript_engine=v8 \
|
|
|
- -Dlinux_fpic=1 \
|
|
|
- -Ddisable_sse2=1 \
|
|
|
%ifarch %{ix86}
|
|
|
-Dtarget_arch=ia32 \
|
|
|
%endif
|
|
|
%ifarch x86_64
|
|
|
-Dtarget_arch=x64 \
|
|
|
%endif
|
|
|
- -Dno_strict_aliasing=1 \
|
|
|
- -Drelease_extra_cflags=-fPIC \
|
|
|
+ -Dlinux_use_gold_flags=0 \
|
|
|
+ -Dlinux_use_gold_binary=0 \
|
|
|
+ \
|
|
|
+ -Dlinux_use_tcmalloc=0 \
|
|
|
+ -Duse_system_bzip2=0 \
|
|
|
+ -Duse_system_flac=0 \
|
|
|
+ -Duse_system_harfbuzz=0 \
|
|
|
+ -Duse_system_icu=0 \
|
|
|
+ -Duse_system_libevent=0 \
|
|
|
+ -Duse_system_libexif=0 \
|
|
|
+ -Duse_system_libjpeg=0 \
|
|
|
+ -Duse_system_libmtp=0 \
|
|
|
+ -Duse_system_libpng=0 \
|
|
|
+ -Duse_system_libusb=0 \
|
|
|
+ -Duse_system_libvpx=0 \
|
|
|
+ -Duse_system_libwebp=0 \
|
|
|
+ -Duse_system_libxml=0 \
|
|
|
+ -Duse_system_libxslt=0 \
|
|
|
+ -Duse_system_libyuv=0 \
|
|
|
+ -Duse_system_minizip=0 \
|
|
|
+ -Duse_system_nss=0 \
|
|
|
+ -Duse_system_nspr=0 \
|
|
|
+ -Duse_openssl=0 \
|
|
|
+ -Duse_system_opus=0 \
|
|
|
+ -Duse_system_protobuf=0 \
|
|
|
+ -Duse_system_re2=0 \
|
|
|
+ -Duse_system_speex=0 \
|
|
|
+ -Duse_system_v8=0 \
|
|
|
+ -Duse_system_xdg_utils=0 \
|
|
|
+ -Duse_system_yasm=0 \
|
|
|
+ -Duse_system_zlib=0 \
|
|
|
+ %{?with_system_ffmpeg:-Duse_system_ffmpeg=1} \
|
|
|
+ %{!?with_system_ffmpeg:-Duse_system_ffmpeg=0} \
|
|
|
+ %{?with_build_ffmpegsumo:-Duse_build_ffmpegsumo=1} \
|
|
|
+ %{!?with_build_ffmpegsumo:-Duse_build_ffmpegsumo=0} \
|
|
|
+ -Duse_system_vpx=0 \
|
|
|
+ -Duse_system_sqlite=0 \
|
|
|
+ -Dlinux_fpic=1 \
|
|
|
+ -Ddisable_sse2=1 \
|
|
|
+ -Ddisable_glibc=1 \
|
|
|
+ -Ddisable_newlib_untar=1 \
|
|
|
+ -Ddisable_pnacl=1 \
|
|
|
+ -Djavascript_engine=v8 \
|
|
|
+ -Ddisable_nacl=1 \
|
|
|
+ -Dproprietary_codecs=1 \
|
|
|
+ \
|
|
|
+ -Duse_pulseaudio=1 \
|
|
|
+ -Dlinux_link_libpci=1 \
|
|
|
+ -Dlinux_link_gnome_keyring=1 \
|
|
|
+ -Dlinux_link_gsettings=1 \
|
|
|
+ -Dlinux_link_libgps=1 \
|
|
|
+ %ifnarch %{ix86}
|
|
|
+ -Dlinux_link_kerberos=1 \
|
|
|
+ %endif
|
|
|
%if %{?_dist_release} == "vl6"
|
|
|
-Dgcc_version=44 \
|
|
|
%endif
|
|
|
;
|
|
|
|
|
|
-%__make -r %{?_smp_mflags} chrome V=1 BUILDTYPE=Release disable_nacl=1
|
|
|
+# -Dlibrary=shared_library -Drelease_extra_cflags=-fPIC \
|
|
|
+
|
|
|
+%__make -r %{?_smp_mflags} chrome BUILDTYPE=Release \
|
|
|
+ CC.host="gcc" CXX.host="g++" LINK.host="g++" AR.host="ar" V=1
|
|
|
|
|
|
# Build the required SUID_SANDBOX helper
|
|
|
-%__make -r %{?_smp_mflags} chrome_sandbox V=1 BUILDTYPE=Release disable_nacl=1
|
|
|
+%__make -r %{?_smp_mflags} chrome_sandbox BUILDTYPE=Release \
|
|
|
+ CC.host="gcc" CXX.host="g++" LINK.host="g++" AR.host="ar" V=1
|
|
|
|
|
|
# Build the ChromeDriver test suite
|
|
|
-%__make -r %{?_smp_mflags} chromedriver V=1 BUILDTYPE=Release disable_nacl=1
|
|
|
+%__make -r %{?_smp_mflags} chromedriver BUILDTYPE=Release \
|
|
|
+ CC.host="gcc" CXX.host="g++" LINK.host="g++" AR.host="ar" V=1
|
|
|
popd
|
|
|
|
|
|
%install
|
|
|
@@ -316,19 +343,29 @@ popd
|
|
|
# x86_64 capable systems need this
|
|
|
%__sed -i "s|/usr/lib/chromium|%{_libdir}/chromium|g" %{buildroot}%{_bindir}/chromium
|
|
|
%__mkdir_p %{buildroot}%{_libdir}/chromium/
|
|
|
+#%__mkdir_p %{buildroot}%{_libdir}/chromium/plugins/
|
|
|
%__mkdir_p %{buildroot}%{_mandir}/man1/
|
|
|
pushd src/out/Release
|
|
|
+
|
|
|
+# Install the file /etc/default/chromium which defines the chromium flags
|
|
|
+mkdir -p %{buildroot}%{_sysconfdir}/default
|
|
|
+install -m 644 %{SOURCE103} %{buildroot}%{_sysconfdir}/default/chromium
|
|
|
+
|
|
|
+
|
|
|
%__cp -a chrome_sandbox %{buildroot}%{_prefix}/lib/ || exit 1
|
|
|
-%__cp -a chrome.pak locales resources xdg-mime xdg-settings %{buildroot}%{_libdir}/chromium/ || exit 1
|
|
|
+%__ln_s %{_prefix}/lib/chrome_sandbox %{buildroot}/%{_libdir}/chromium/chrome-sandbox || exit 1
|
|
|
+%__cp -a *.pak locales resources xdg-mime %{buildroot}%{_libdir}/chromium/ || exit 1
|
|
|
%__cp -a chromedriver %{buildroot}%{_libdir}/chromium/ || exit 1
|
|
|
-%__cp -a content_resources.pak theme_resources_100_percent.pak ui_resources_100_percent.pak %{buildroot}%{_libdir}/chromium/ || exit 1
|
|
|
-%__cp -a resources.pak %{buildroot}%{_libdir}/chromium/ || exit 1
|
|
|
+
|
|
|
+%{?with_build_ffmpegsumo:%__cp -a libffmpegsumo.so %{buildroot}%{_libdir}/chromium/ || exit 1}
|
|
|
+
|
|
|
+%__sed "s|xdg-mime|%{_libdir}/chromium/xdg-mime|g" xdg-settings > %{buildroot}%{_libdir}/chromium/xdg-settings || exit 1
|
|
|
+
|
|
|
%__cp -a chrome %{buildroot}%{_libdir}/chromium/chromium || exit 1
|
|
|
-%{?_with_shared_library:%__cp -a lib.target/lib*.so %{buildroot}%{_libdir}/chromium/ || exit 1}
|
|
|
-%{?_with_shared_library:%__cp -a lib.host/lib*.so %{buildroot}%{_libdir}/chromium/ || exit 1}
|
|
|
+# %__cp -a lib.target/lib*.so %{buildroot}%{_libdir}/chromium/ || exit 1
|
|
|
+# %__cp -a lib.host/lib*.so %{buildroot}%{_libdir}/chromium/ || exit 1
|
|
|
%__cp -a chrome.1 %{buildroot}%{_mandir}/man1/chrome.1 || exit 1
|
|
|
%__cp -a chrome.1 %{buildroot}%{_mandir}/man1/chromium.1 || exit 1
|
|
|
-fdupes %{buildroot}%{_mandir}/man1/
|
|
|
popd
|
|
|
|
|
|
%__mkdir_p %{buildroot}%{_datadir}/pixmaps/
|
|
|
@@ -344,24 +381,34 @@ desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE101}
|
|
|
%__mkdir_p %{buildroot}%{_datadir}/gnome-control-center/default-apps/
|
|
|
%__cp -a %{SOURCE102} %{buildroot}%{_datadir}/gnome-control-center/default-apps/
|
|
|
|
|
|
-# # link to browser plugin path. Plugin patch doesn't work. Why?
|
|
|
-# %{__mkdir_p} %{buildroot}%{_libdir}/browser-plugins
|
|
|
-# pushd %{buildroot}%{_libdir}/%{pkgname}
|
|
|
-# %{__ln_s} %{_libdir}/browser-plugins plugins
|
|
|
+# # # link to browser plugin path. Plugin patch doesn't work. Why?
|
|
|
+# # %{__mkdir_p} %{buildroot}%{_libdir}/browser-plugins
|
|
|
+# # pushd %{buildroot}%{_libdir}/%{name}
|
|
|
+# # %{__ln_s} %{_libdir}/browser-plugins plugins
|
|
|
+# # popd
|
|
|
+# pushd %{buildroot}%{_libdir}/%{name}
|
|
|
+# #%ifarch x86_64
|
|
|
+# #%{__ln_s} %{_libdir}/mozilla/plugins-wrapped plugins || exit 1
|
|
|
+# #%else
|
|
|
+# %{__ln_s} %{_libdir}/mozilla/plugins plugins || exit 1
|
|
|
+# #%endif
|
|
|
# popd
|
|
|
-pushd %{buildroot}%{_libdir}/%{pkgname}
|
|
|
-#%ifarch x86_64
|
|
|
-#%{__ln_s} %{_libdir}/mozilla/plugins-wrapped plugins || exit 1
|
|
|
-#%else
|
|
|
-%{__ln_s} %{_libdir}/mozilla/plugins plugins || exit 1
|
|
|
-#%endif
|
|
|
-popd
|
|
|
|
|
|
# Install the master_preferences file
|
|
|
-%__mkdir_p %{buildroot}%{_sysconfdir}/%{pkgname}
|
|
|
-#%__install -m 0644 %{SOURCE30} %{buildroot}%{_sysconfdir}/%{pkgname}
|
|
|
-%__install -m 0644 %{SOURCE30} %{buildroot}%{_sysconfdir}/%{pkgname}/$(basename %{SOURCE30} .vine)
|
|
|
-#%__install -m 0644 %{SOURCE31} %{buildroot}%{_sysconfdir}/%{pkgname}
|
|
|
+%__mkdir_p %{buildroot}%{_sysconfdir}/%{name}
|
|
|
+%__install -m 0644 %{SOURCE30} %{buildroot}%{_sysconfdir}/%{name}/$(basename %{SOURCE30} .vine)
|
|
|
+#%__install -m 0644 %{SOURCE31} %{buildroot}%{_sysconfdir}/%{name}
|
|
|
+
|
|
|
+# This enables HTML5 video if you have ffmpeg installed,
|
|
|
+# you naughty naughty user.
|
|
|
+pushd %{buildroot}%{_libdir}/chromium
|
|
|
+touch %{buildroot}%{_libdir}/libavcodec.so.52
|
|
|
+%__ln_s %{_libdir}/libavcodec.so.52 libavcodec.so.52
|
|
|
+touch %{buildroot}%{_libdir}/libavformat.so.52
|
|
|
+%__ln_s %{_libdir}/libavformat.so.52 libavformat.so.52
|
|
|
+touch %{buildroot}%{_libdir}/libavutil.so.50
|
|
|
+%__ln_s %{_libdir}/libavutil.so.50 libavutil.so.50
|
|
|
+popd
|
|
|
|
|
|
%clean
|
|
|
%{__rm} -rf %{buildroot}
|
|
|
@@ -383,13 +430,14 @@ fi || :
|
|
|
|
|
|
%files
|
|
|
%defattr(-,root,root,-)
|
|
|
-%config %{_sysconfdir}/%{pkgname}
|
|
|
+%config %{_sysconfdir}/%{name}
|
|
|
+%config %{_sysconfdir}/default/chromium
|
|
|
%dir %{_datadir}/gnome-control-center
|
|
|
%dir %{_datadir}/gnome-control-center/default-apps
|
|
|
%dir %{_libdir}/chromium/
|
|
|
%{_bindir}/chromium
|
|
|
%{_libdir}/chromium/chromium
|
|
|
-%{_libdir}/chromium/plugins/
|
|
|
+#%{_libdir}/chromium/plugins/
|
|
|
%{_libdir}/chromium/locales/
|
|
|
%{_libdir}/chromium/resources/
|
|
|
#%{_libdir}/chromium/nacl_*
|
|
|
@@ -402,12 +450,30 @@ fi || :
|
|
|
%{_datadir}/gnome-control-center/default-apps/chromium-browser.xml
|
|
|
%{_datadir}/pixmaps/chromium-browser.png
|
|
|
%{_datadir}/icons/hicolor/*/apps/chromium-browser.png
|
|
|
-%{?_with_shared_library:%{_libdir}/chromium/lib*.so}
|
|
|
+#%{_libdir}/chromium/lib*.so
|
|
|
+%{_libdir}/chromium/libavcodec.so.52
|
|
|
+%{_libdir}/chromium/libavutil.so.50
|
|
|
+%{_libdir}/chromium/libavformat.so.52
|
|
|
+%exclude %{_libdir}/libavcodec.so.52
|
|
|
+%exclude %{_libdir}/libavutil.so.50
|
|
|
+%exclude %{_libdir}/libavformat.so.52
|
|
|
%attr(4755,root,root) %{chrome_sandbox}
|
|
|
+%{_libdir}/chromium/chrome-sandbox
|
|
|
%{_libdir}/chromium/chromedriver
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Sun Jan 26 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 32.0.1700.77-1
|
|
|
+- update to 32.0.1700.77
|
|
|
+- add Patch68 (chromium-31.0.1650.57-fix-chromedriver-build.patch) based on OpenSUSE
|
|
|
+- add Patch101 (chromium-disable-GoogleApiKeysInfoBar-vine.patch)
|
|
|
+
|
|
|
+* Sat Feb 16 2013 Munehiro Yamamoto <munepi@vinelinux.org> 24.0.1312.71-1
|
|
|
+- update to 24.0.1312.71
|
|
|
+
|
|
|
+* Sat Dec 29 2012 Munehiro Yamamoto <munepi@vinelinux.org> 23.0.1271.101-1
|
|
|
+- update to 23.0.1271.101
|
|
|
+
|
|
|
* Mon Oct 15 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 22.0.1229.94-1
|
|
|
- update to 22.0.1229.94
|
|
|
|
|
|
@@ -547,10 +613,10 @@ fi || :
|
|
|
* Sat May 21 2011 Munehiro Yamamoto <munepi@vinelinux.org> 12.0.742.63-1
|
|
|
- updated to 12.0.742.63
|
|
|
|
|
|
-* Sun May 07 2011 Munehiro Yamamoto <munepi@vinelinux.org> 12.0.742.42-1
|
|
|
+* Sat May 07 2011 Munehiro Yamamoto <munepi@vinelinux.org> 12.0.742.42-1
|
|
|
- updated to 12.0.742.42
|
|
|
|
|
|
-* Sun Apr 23 2011 Munehiro Yamamoto <munepi@vinelinux.org> 12.0.742.6-1
|
|
|
+* Sat Apr 23 2011 Munehiro Yamamoto <munepi@vinelinux.org> 12.0.742.6-1
|
|
|
- updated to 12.0.742.6
|
|
|
- dropped/upstreamed patches
|
|
|
- updated our no-tests patch (chromium-12.0.742.6-no-tests.patch)
|
|
|
@@ -562,7 +628,7 @@ fi || :
|
|
|
* Tue Apr 05 2011 Munehiro Yamamoto <munepi@vinelinux.org> 11.0.696.35-1
|
|
|
- updated to 11.0.696.35
|
|
|
|
|
|
-* Wed Mar 27 2011 Munehiro Yamamoto <munepi@vinelinux.org> 11.0.696.29-1
|
|
|
+* Sun Mar 27 2011 Munehiro Yamamoto <munepi@vinelinux.org> 11.0.696.29-1
|
|
|
- updated to 11.0.696.29
|
|
|
- dropped "--no-first-run" in command line options of chromium-browser-vine.sh
|
|
|
|
Takemikaduchi