Author: glen Date: Tue Mar 29 16:58:11 2011 GMT Module: packages Tag: HEAD ---- Log message: - up to 12.0.718.0, r79651
---- Files affected: packages/chromium-browser: chromium-browser.spec (1.108 -> 1.109) , dlopen_sonamed_gl.patch (1.4 -> 1.5) ---- Diffs: ================================================================ Index: packages/chromium-browser/chromium-browser.spec diff -u packages/chromium-browser/chromium-browser.spec:1.108 packages/chromium-browser/chromium-browser.spec:1.109 --- packages/chromium-browser/chromium-browser.spec:1.108 Fri Mar 11 18:22:08 2011 +++ packages/chromium-browser/chromium-browser.spec Tue Mar 29 18:58:05 2011 @@ -30,18 +30,18 @@ # or: # http://carme.pld-linux.org/~glen/chromium-browser/th/x86_64/chromium-nightly.conf -%define svndate 20110311 -%define svnver 77774 +%define svndate 20110329 +%define svnver 79651 %define rel 1 Summary: A WebKit powered web browser Name: chromium-browser -Version: 12.0.700.0 +Version: 12.0.718.0 Release: 0.%{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: dc38e6d5e52919f4e8cfbeb4e204d710 +# Source0-md5: 7fa35216c893958a081608ebf42b9707 Source2: %{name}.sh Source3: %{name}.desktop Source4: find-lang.sh @@ -343,6 +343,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.109 2011/03/29 16:58:05 glen +- up to 12.0.718.0, r79651 + Revision 1.108 2011/03/11 17:22:08 glen - up to 12.0.700.0, 77774 - keyrings as bcond, dlopen gnome keyring, not link with ================================================================ Index: packages/chromium-browser/dlopen_sonamed_gl.patch diff -u packages/chromium-browser/dlopen_sonamed_gl.patch:1.4 packages/chromium-browser/dlopen_sonamed_gl.patch:1.5 --- packages/chromium-browser/dlopen_sonamed_gl.patch:1.4 Fri Mar 4 17:20:54 2011 +++ packages/chromium-browser/dlopen_sonamed_gl.patch Tue Mar 29 18:58:05 2011 @@ -8,16 +8,9 @@ app/gfx/gl/gl_implementation_linux.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -Index: src/app/gfx/gl/gl_implementation_linux.cc -=================================================================== ---- ./src.orig/app/gfx/gl/gl_implementation_linux.cc -+++ ./src/app/gfx/gl/gl_implementation_linux.cc -@@ -40,19 +40,19 @@ - case kGLImplementationOSMesaGL: { - FilePath module_path; - if (!PathService::Get(base::DIR_MODULE, &module_path)) { - LOG(ERROR) << "PathService::Get failed."; - return false; +--- chromium-browser-12.0.718.0~svn20110329r79651/src/ui/gfx/gl/gl_implementation_linux.cc~ 2011-03-29 05:01:42.000000000 +0300 ++++ chromium-browser-12.0.718.0~svn20110329r79651/src/ui/gfx/gl/gl_implementation_linux.cc 2011-03-29 18:47:17.048111826 +0300 +@@ -45,9 +45,9 @@ } base::NativeLibrary library = base::LoadNativeLibrary( @@ -29,17 +22,7 @@ return false; } - GLGetProcAddressProc get_proc_address = - reinterpret_cast<GLGetProcAddressProc>( - base::GetFunctionPointerFromNativeLibrary( - library, "OSMesaGetProcAddress")); - if (!get_proc_address) { -@@ -92,26 +92,26 @@ - SetGLImplementation(kGLImplementationDesktopGL); - - InitializeGLBindingsGL(); - InitializeGLBindingsGLX(); - break; +@@ -97,16 +97,16 @@ } case kGLImplementationEGLGLES2: { base::NativeLibrary gles_library = base::LoadNativeLibrary( @@ -60,8 +43,3 @@ base::UnloadNativeLibrary(gles_library); return false; } - - GLGetProcAddressProc get_proc_address = - reinterpret_cast<GLGetProcAddressProc>( - base::GetFunctionPointerFromNativeLibrary( - egl_library, "eglGetProcAddress")); ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/chromium-browser.spec?r1=1.108&r2=1.109&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/dlopen_sonamed_gl.patch?r1=1.4&r2=1.5&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
