|
|
@@ -5,17 +5,17 @@
|
|
|
# norootforbuild
|
|
|
|
|
|
%if %{?_dist_release} == "vl6"
|
|
|
-#% define with_system_icu 1
|
|
|
+%define with_system_icu 1
|
|
|
%endif
|
|
|
|
|
|
-%define svn_rev 51404
|
|
|
+%define svn_rev 56023
|
|
|
|
|
|
Name: chromium
|
|
|
Summary: Google's opens source browser project
|
|
|
Summary(ja): Googleのオープンソースウェブブラウザ
|
|
|
#'
|
|
|
-Version: 6.0.454.0
|
|
|
-Release: 2%{?_dist_release}
|
|
|
+Version: 6.0.493.0
|
|
|
+Release: 1%{?_dist_release}
|
|
|
License: BSD
|
|
|
Group: Applications/Internet
|
|
|
Source0: %{name}.%{version}.svn%{svn_rev}.tar.lzma
|
|
|
@@ -64,15 +64,11 @@ Patch19: chromium-system-zlib.patch
|
|
|
Patch20: chromium-noffmpeg.patch
|
|
|
Patch21: chromium-system-old-ffmpeg-way.patch
|
|
|
Patch23: chromium-disable-mmx.patch
|
|
|
-Patch24: chromium-fix-yuv_row_posix-shared.patch
|
|
|
+#Patch24: chromium-fix-yuv_row_posix-shared.patch
|
|
|
Patch25: tcmalloc-factory.patch
|
|
|
|
|
|
# Vine
|
|
|
-#Patch40: chromium-5.0.353-no-ffmpeg-vine.patch
|
|
|
|
|
|
-## Gentoo patches
|
|
|
-# Allow use of MP3/MPEG-4 audio/video tags with our system ffmpeg
|
|
|
-#Patch50: http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/www-client/chromium/files/chromium-20100122-ubuntu-html5-video-mimetypes.patch
|
|
|
|
|
|
BuildRequires: gcc gcc-c++
|
|
|
%if %{?_dist_release} == "vl5"
|
|
|
@@ -171,13 +167,13 @@ lzma -cd %{SOURCE0} | tar xf -
|
|
|
%setup -D -T -n %{name}
|
|
|
|
|
|
# use static libicu
|
|
|
-#%if %{?_dist_release} == "vl5"
|
|
|
+%if %{?_dist_release} == "vl5"
|
|
|
cd src/third_party || exit 1
|
|
|
%__rm -rf icu || exit 1
|
|
|
tar jxvf %{SOURCE100} || exit 1
|
|
|
%__mv icu-4.2.1-chromium.5.0.353.0.svn41449 icu || exit 1
|
|
|
cd - || exit 1
|
|
|
-#%endif
|
|
|
+%endif
|
|
|
|
|
|
# use system libicu only if >= 4.0
|
|
|
%{?with_system_icu:%patch3 -p1}
|
|
|
@@ -188,7 +184,6 @@ cd - || exit 1
|
|
|
%patch8 -p1
|
|
|
#%patch9 -p1
|
|
|
%patch10 -p1
|
|
|
-#%patch11 -p1
|
|
|
%patch12 -p1
|
|
|
%patch13 -p1
|
|
|
%patch14 -p1
|
|
|
@@ -199,12 +194,11 @@ cd - || exit 1
|
|
|
%patch19 -p1
|
|
|
%patch20 -p1
|
|
|
%patch21 -p1
|
|
|
-#%patch22 -p1
|
|
|
%patch25 -p1
|
|
|
%ifarch %ix86
|
|
|
%patch23 -p1
|
|
|
%endif
|
|
|
-%patch24 -p1
|
|
|
+#%patch24 -p1
|
|
|
|
|
|
|
|
|
# apply vendor patch after substitution
|
|
|
@@ -213,7 +207,7 @@ cd - || exit 1
|
|
|
%build
|
|
|
## create make files
|
|
|
|
|
|
-PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS -DUSE_SYSTEM_LIBEVENT -fPIC -fno-strict-aliasing \' | %__sed "s/ /',/g" | %__sed "s/',/', '/g"`
|
|
|
+PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS -DUSE_SYSTEM_LIBEVENT -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|'-msse2',||g" $i
|
|
|
@@ -353,6 +347,11 @@ desktop-file-install --vendor Vine \
|
|
|
#%exclude %{_libdir}/libavformat.so.52
|
|
|
|
|
|
%changelog
|
|
|
+* Sat Aug 14 2010 Munehiro Yamamoto <munepi@vinelinux.org> 6.0.493.0-1
|
|
|
+- updated to snapshot 6.0.493
|
|
|
+- used with_system_icu (for vl6)
|
|
|
+ - added BuildRequires: libicu-devel
|
|
|
+
|
|
|
* Thu Jul 22 2010 IWAI, Masaharu <iwai@alib.jp> 6.0.454.0-2vl5
|
|
|
- build for Vine Linux 5.x
|
|
|
- add BuildRequires: gnome-keyring-devel
|
munepi