packages: chromium-browser/chromium-browser.spec, chromium-browser/memory_d...

glen glen at pld-linux.org
Tue Apr 6 19:12:39 CEST 2010 

Author: glen                         Date: Tue Apr  6 17:12:39 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 5.0.370.0, r43687
- 32bit version should have --enable-internal-flash according to http://googlechromereleases.blogspot.com/2010/03/dev-channel-update_30.html
- system_ffmpeg changed to ffmpegsumo as former has changed meaning

---- Files affected:
packages/chromium-browser:
   chromium-browser.spec (1.39 -> 1.40) , memory_details-iceweasel.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/chromium-browser/chromium-browser.spec
diff -u packages/chromium-browser/chromium-browser.spec:1.39 packages/chromium-browser/chromium-browser.spec:1.40
--- packages/chromium-browser/chromium-browser.spec:1.39	Fri Mar 26 10:52:22 2010
+++ packages/chromium-browser/chromium-browser.spec	Tue Apr  6 19:12:33 2010
@@ -6,7 +6,7 @@
 %bcond_with	system_v8	# with system v8
 %bcond_without	system_zlib	# with system zlib
 %bcond_with	system_sqlite	# with system sqlite
-%bcond_with	system_ffmpeg	# with system ffmpeg_mt
+%bcond_without	ffmpegsumo	# build with ffmpegsumo
 %bcond_without	sandboxing	# with sandboxing
 %bcond_with	shared_libs	# with shared libs
 %bcond_without	debuginfo	# disable debuginfo creation (it is huge)
@@ -24,18 +24,18 @@
 # - http://code.google.com/p/chromium/wiki/LinuxBuildInstructionsPrerequisites
 # - to look for new tarball, use update-source.sh script
 
-%define		svndate 20100323
-%define		svnver  42303
+%define		svndate 20100406
+%define		svnver  43687
 %define		rel		1
 
 Summary:	A WebKit powered web browser
 Name:		chromium-browser
-Version:	5.0.360.0
+Version:	5.0.370.0
 Release:	%{svnver}.%{rel}
 License:	BSD, LGPL v2+ (ffmpeg)
 Group:		X11/Applications/Networking
 Source0:	http://ppa.launchpad.net/chromium-daily/ppa/ubuntu/pool/main/c/chromium-browser/%{name}_%{version}~svn%{svndate}r%{svnver}.orig.tar.gz
-# Source0-md5:	d23ef524587c78be4948f15b86afbeb3
+# Source0-md5:	d96c4e113b6762cf9db7949b01eef2ec
 Source2:	%{name}.sh
 Source3:	%{name}.desktop
 Source4:	find-lang.sh
@@ -77,7 +77,7 @@
 BuildRequires:	pkgconfig
 BuildRequires:	python
 # grep gyp.googlecode.com src/DEPS | cut -d'"' -f2 | cut -d@ -f2
-BuildRequires:	python-gyp >= 0.1-790
+BuildRequires:	python-gyp >= 0.1-795
 BuildRequires:	python-modules
 BuildRequires:	rpmbuild(macros) >= 1.453
 BuildRequires:	sqlite3-devel >= 3.6.1
@@ -186,8 +186,8 @@
 	%{!?debug:-Dwerror=} \
 	%{?with_shared_libs:-Dlibrary=shared_library} \
 	-Djavascript_engine=%{?with_system_v8:system-v8}%{!?with_system_v8:v8} \
+	-Dbuild_ffmpegsumo=%{?with_ffmpegsumo:1}%{!?with_ffmpegsumo:0} \
 	-Duse_system_bzip2=1 \
-	-Duse_system_ffmpeg=%{?with_system_ffmpeg:1}%{!?with_system_ffmpeg:0} \
 	-Duse_system_libevent=1 \
 	-Duse_system_libjpeg=1 \
 	-Duse_system_libpng=1 \
@@ -196,7 +196,7 @@
 	-Duse_system_sqlite=%{?with_system_sqlite:1}%{!?with_system_sqlite:0} \
 	-Duse_system_zlib=%{?with_system_zlib:1}%{!?with_system_zlib:0} \
 %if %{with arch}
--Duse_system_yasm=1 \
+	-Duse_system_yasm=1 \
 	-Dffmpeg_branding=Chrome \
 %endif
 %if %{with selinux}
@@ -224,7 +224,6 @@
 cp -a chrome.pak $RPM_BUILD_ROOT%{_libdir}/%{name}
 cp -a locales/*.pak $RPM_BUILD_ROOT%{_libdir}/%{name}/locales
 cp -a resources/* $RPM_BUILD_ROOT%{_libdir}/%{name}/resources
-find $RPM_BUILD_ROOT%{_libdir}/%{name}/resources -name '*.d' | xargs rm
 cp -a chrome.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
 cp -a product_logo_48.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
 install -p chrome $RPM_BUILD_ROOT%{_libdir}/%{name}/%{name}
@@ -280,6 +279,8 @@
 # bundle this copy until xdg-utils will have this itself
 %attr(755,root,root) %{_libdir}/%{name}/xdg-settings
 
+%{_libdir}/%{name}/resources/net_internals
+
 %files inspector
 %defattr(644,root,root,755)
 %{_libdir}/%{name}/resources/inspector
@@ -297,6 +298,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.40  2010/04/06 17:12:33  glen
+- up to 5.0.370.0, r43687
+- 32bit version should have --enable-internal-flash according to http://googlechromereleases.blogspot.com/2010/03/dev-channel-update_30.html
+- system_ffmpeg changed to ffmpegsumo as former has changed meaning
+
 Revision 1.39  2010/03/26 09:52:22  glen
 - include update-source.sh in src.rpm
 

================================================================
Index: packages/chromium-browser/memory_details-iceweasel.patch
diff -u packages/chromium-browser/memory_details-iceweasel.patch:1.1 packages/chromium-browser/memory_details-iceweasel.patch:1.2
--- packages/chromium-browser/memory_details-iceweasel.patch:1.1	Tue Sep 22 13:54:43 2009
+++ packages/chromium-browser/memory_details-iceweasel.patch	Tue Apr  6 19:12:33 2010
@@ -1,10 +1,10 @@
---- chromium-20090916svn26424/src/chrome/browser/memory_details_linux.cc~	2009-09-17 03:41:20.000000000 +0300
-+++ chromium-20090916svn26424/src/chrome/browser/memory_details_linux.cc	2009-09-22 14:52:06.395596285 +0300
-@@ -50,6 +50,7 @@
-   { "firefox", FIREFOX },
+--- chromium-browser-5.0.370.0~svn20100406r43687/src/chrome/browser/memory_details_linux.cc~	2010-04-06 05:02:30.000000000 +0300
++++ chromium-browser-5.0.370.0~svn20100406r43687/src/chrome/browser/memory_details_linux.cc	2010-04-06 14:12:40.832330395 +0300
+@@ -52,6 +52,7 @@
    { "firefox-3.5", FIREFOX },
    { "firefox-3.0", FIREFOX },
+   { "firefox-bin", FIREFOX },
 +  { "iceweasel", FIREFOX },
    { "opera", OPERA },
    { "konqueror", KONQUEROR },
-   { "epiphany-browser", EPIPHANY },
+   { "epiphany-browse", EPIPHANY },
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/chromium-browser.spec?r1=1.39&r2=1.40&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/memory_details-iceweasel.patch?r1=1.1&r2=1.2&f=u

More information about the pld-cvs-commit mailing list