From 3ffd4f1eefb3cfc38a3d66964c67a2c66c238c8f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Wed, 20 Apr 2011 04:59:46 +0000 Subject: [PATCH] - up to 12.0.741.0 (r82076) Changed files: chromium-browser.spec -> 1.112 dlopen_sonamed_gl.patch -> 1.6 --- chromium-browser.spec | 8 ++++---- dlopen_sonamed_gl.patch | 43 ++++++++++++++--------------------------- 2 files changed, 18 insertions(+), 33 deletions(-) diff --git a/chromium-browser.spec b/chromium-browser.spec index dbc94a9..49dd084 100644 --- a/chromium-browser.spec +++ b/chromium-browser.spec @@ -29,18 +29,18 @@ # or: # http://carme.pld-linux.org/~glen/chromium-browser/th/x86_64/chromium-nightly.conf -%define svndate 20110402 -%define svnver 80248 +%define svndate 20110419 +%define svnver 82076 %define rel 1 Summary: A WebKit powered web browser Name: chromium-browser -Version: 12.0.722.0 +Version: 12.0.741.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: fbface339ecf0022f691f0f9268709b3 +# Source0-md5: 8941e233f7da3919dfa2bf8f62b39eba Source2: %{name}.sh Source3: %{name}.desktop Source4: find-lang.sh diff --git a/dlopen_sonamed_gl.patch b/dlopen_sonamed_gl.patch index 1e11f97..b26de46 100644 --- a/dlopen_sonamed_gl.patch +++ b/dlopen_sonamed_gl.patch @@ -4,42 +4,27 @@ as we don't want to Depend on the -dev packages for the .so files: - libGLESv2.so.2: Mesa-libGLES-7.11-0.20110227.1 - libEGL.so.1: Mesa-libEGL-7.10-1 ---- - app/gfx/gl/gl_implementation_linux.cc | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - ---- 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 @@ +--- chromium-browser-12.0.741.0~svn20110419r82050/src/ui/gfx/gl/gl_implementation_linux.cc~ 2011-04-19 05:00:54.000000000 +0300 ++++ chromium-browser-12.0.741.0~svn20110419r82050/src/ui/gfx/gl/gl_implementation_linux.cc 2011-04-19 20:35:27.149741018 +0300 +@@ -61,7 +61,7 @@ } - base::NativeLibrary library = base::LoadNativeLibrary( + base::NativeLibrary library = LoadLibrary( - module_path.Append("libosmesa.so")); + module_path.Append("libosmesa.so.7")); - if (!library) { -- VLOG(1) << "libosmesa.so not found"; -+ VLOG(1) << "libosmesa.so.7 not found"; + if (!library) return false; - } -@@ -97,16 +97,16 @@ +@@ -107,10 +107,10 @@ + break; } case kGLImplementationEGLGLES2: { - base::NativeLibrary gles_library = base::LoadNativeLibrary( -- FilePath("libGLESv2.so")); -+ FilePath("libGLESv2.so.2")); - if (!gles_library) { -- VLOG(1) << "libGLESv2.so not found"; -+ VLOG(1) << "libGLESv2.so.2 not found"; +- base::NativeLibrary gles_library = LoadLibrary("libGLESv2.so"); ++ base::NativeLibrary gles_library = LoadLibrary("libGLESv2.so.2"); + if (!gles_library) return false; - } - - base::NativeLibrary egl_library = base::LoadNativeLibrary( -- FilePath("libEGL.so")); -+ FilePath("libEGL.so.1")); - if (!egl_library) { -- VLOG(1) << "libEGL.so not found"; -+ VLOG(1) << "libEGL.so.1 not found"; - base::UnloadNativeLibrary(gles_library); +- base::NativeLibrary egl_library = LoadLibrary("libEGL.so"); ++ base::NativeLibrary egl_library = LoadLibrary("libEGL.so.1"); + if (!egl_library) return false; - } + -- 2.44.0