- fix dlopened libgnutls.so soname

Changed files:
    chromium-browser.spec -> 1.170
    dlopen-sonames.patch -> 1.1

diff --git a/chromium-browser.spec b/chromium-browser.spec
index c77d57322d79b184f66f22c9ad92327177a65eb7..c1783c34a6c50e885de5eed8bc906ddcc905f668 100644 (file)
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -71,6 +71,7 @@ Patch6:               get-webkit_revision.patch
 Patch7:                dlopen_sonamed_gl.patch
 Patch8:                chromium_useragent.patch.in
 Patch9:                system-expat.patch
+Patch10:       dlopen-sonames.patch
 URL:           http://www.chromium.org/Home
 %{?with_gconf:BuildRequires:   GConf2-devel}
 BuildRequires: OpenGL-GLU-devel
@@ -207,6 +208,7 @@ ln -s %{SOURCE7} src
 cd src
 %patch9 -p1
 cd ..
+%patch10 -p1
 
 cd src
 sh -x clean-source.sh %{!?with_system_v8:v8=0} %{!?with_nacl:nacl=0}

diff --git a/dlopen-sonames.patch b/dlopen-sonames.patch
new file mode 100644 (file)
index 0000000..8823b0c
--- /dev/null
+++ b/dlopen-sonames.patch
@@ -0,0 +1,11 @@
+--- chromium-browser-17.0.963.33/src/printing/backend/print_backend_cups.cc~   2012-01-11 10:01:11.000000000 +0200
++++ chromium-browser-17.0.963.33/src/printing/backend/print_backend_cups.cc    2012-01-15 22:39:36.059522637 +0200
+@@ -60,7 +60,7 @@
+  private:
+   void Init() {
+     gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
+-    const char* kGnuTlsFile = "libgnutls.so";
++    const char* kGnuTlsFile = "libgnutls.so.28";
+     void* gnutls_lib = dlopen(kGnuTlsFile, RTLD_NOW);
+     if (!gnutls_lib) {
+       LOG(ERROR) << "Cannot load " << kGnuTlsFile;