|
|
@@ -8,14 +8,14 @@
|
|
|
#% define with_system_icu 1
|
|
|
%endif
|
|
|
|
|
|
-%define svn_rev 44472
|
|
|
+%define svn_rev 47263
|
|
|
|
|
|
Name: chromium
|
|
|
Summary: Google's opens source browser project
|
|
|
Summary(ja): Googleのオープンソースウェブブラウザ
|
|
|
#'
|
|
|
-Version: 5.0.378.0
|
|
|
-Release: 2%{?_dist_release}
|
|
|
+Version: 6.0.405.0
|
|
|
+Release: 1%{?_dist_release}
|
|
|
License: BSD
|
|
|
Group: Applications/Internet
|
|
|
Source0: %{name}.%{version}.svn%{svn_rev}.tar.lzma
|
|
|
@@ -36,6 +36,8 @@ Source10: chromium-vine.desktop
|
|
|
Source20: chromium-vendor-vine.patch.in
|
|
|
##!!Source30: master_preferences
|
|
|
Source30: master_preferences.vine
|
|
|
+#Source31: default_bookmarks.html
|
|
|
+#Source31: default_bookmarks.html.vine
|
|
|
# icu-4.2.1 contained in chromium.5.0.353.0.svn41449 (for Vine Linux 5.X)
|
|
|
Source100: icu-4.2.1-chromium.5.0.353.0.svn41449.tar.bz2
|
|
|
Provides: chromium-browser = %{version}
|
|
|
@@ -49,21 +51,21 @@ Patch4: chromium-no-sqlite-debug.patch
|
|
|
Patch5: chromium-gyp-system-04-nss-nspr.patch
|
|
|
Patch7: chromium-codechanges-nss-nspr.patch
|
|
|
Patch8: chromium-codechanges-zlib.patch
|
|
|
-Patch9: chromium-drop-sse.patch
|
|
|
+#Patch9: chromium-drop-sse.patch
|
|
|
Patch10: chromium-fix-wrapper.patch
|
|
|
-#Patch11: chromium-fix-home-kde4-path.patch
|
|
|
Patch12: chromium-no-test-sources.patch
|
|
|
Patch13: chromium-no-courgette.patch
|
|
|
Patch14: chromium-master-prefs-path.patch
|
|
|
-Patch15: chromium-media-probe.patch
|
|
|
+#Patch15: chromium-media-probe.patch
|
|
|
Patch16: chromium-icu-code-changes.patch
|
|
|
Patch17: chromium-system-glew.patch
|
|
|
Patch18: chromium-system-expat.patch
|
|
|
Patch19: chromium-system-zlib.patch
|
|
|
Patch20: chromium-noffmpeg.patch
|
|
|
Patch21: chromium-system-old-ffmpeg-way.patch
|
|
|
-Patch22: chromium-libpng14.patch
|
|
|
Patch23: chromium-disable-mmx.patch
|
|
|
+Patch24: chromium-fix-yuv_row_posix-shared.patch
|
|
|
+Patch25: tcmalloc-factory.patch
|
|
|
|
|
|
# Vine
|
|
|
#Patch40: chromium-5.0.353-no-ffmpeg-vine.patch
|
|
|
@@ -176,23 +178,26 @@ cd - || exit 1
|
|
|
%patch5 -p1
|
|
|
%patch7 -p1
|
|
|
%patch8 -p1
|
|
|
-%patch9 -p1
|
|
|
+#%patch9 -p1
|
|
|
%patch10 -p1
|
|
|
#%patch11 -p1
|
|
|
%patch12 -p1
|
|
|
%patch13 -p1
|
|
|
%patch14 -p1
|
|
|
-%patch15 -p0
|
|
|
+#%patch15 -p0
|
|
|
%{?with_system_icu:%patch16 -p1}
|
|
|
%patch17 -p1
|
|
|
%patch18 -p1
|
|
|
%patch19 -p1
|
|
|
%patch20 -p1
|
|
|
%patch21 -p1
|
|
|
-%patch22 -p1
|
|
|
+#%patch22 -p1
|
|
|
+%patch25 -p1
|
|
|
%ifarch %ix86
|
|
|
%patch23 -p1
|
|
|
%endif
|
|
|
+%patch24 -p1
|
|
|
+
|
|
|
|
|
|
# apply vendor patch after substitution
|
|
|
%__sed "s:RPM_VERSION:%{version}-%{release}:" %{SOURCE20} | patch -p0
|
|
|
@@ -223,10 +228,13 @@ pushd src
|
|
|
-Duse_system_libxml=1 \
|
|
|
-Duse_system_libxslt=1 \
|
|
|
-Duse_system_libevent=1 \
|
|
|
+ -Dproprietary_codes=1 \
|
|
|
+ -Dlinux_fpic=1 \
|
|
|
%{?with_system_icu:-Duse_system_icu=1} \
|
|
|
%{!?with_system_icu:-Duse_system_icu=0} \
|
|
|
%ifarch %{ix86}
|
|
|
-Dtarget_arch=ia32 \
|
|
|
+ -Ddisable_sse2=1 \
|
|
|
%endif
|
|
|
%ifarch x86_64
|
|
|
-Dtarget_arch=x64 \
|
|
|
@@ -336,6 +344,9 @@ desktop-file-install --vendor Vine \
|
|
|
#%exclude %{_libdir}/libavformat.so.52
|
|
|
|
|
|
%changelog
|
|
|
+* Sun May 16 2010 Munehiro Yamamoto <munepi@vinelinux.org> 6.0.405.0-1
|
|
|
+- updated to snapshot 6.0.405.0 r47263
|
|
|
+
|
|
|
* Fri Apr 16 2010 Munehiro Yamamoto <munepi@vinelinux.org> 5.0.378.0-2
|
|
|
- unused with_system_icu (for vl6)
|
|
|
- used icu-4.2.1-chromium.5.0.353.0.svn41449 (for vl6)
|
munepi