[packages/chromium-browser] fix path to internal libpdf.so

glen glen at pld-linux.org
Fri Jul 13 20:52:53 CEST 2012


commit 72cb20c18ca854ff7fa3942735fe19b5b1f6d8d5
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Fri Jul 13 21:51:06 2012 +0300

    fix path to internal libpdf.so
    
    this way don't have to create symlink in google-chrome.spec and it loads
    pdf from plugins dir.

 chromium-browser.spec |  2 ++
 path-libpdf.patch     | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+)
---
diff --git a/chromium-browser.spec b/chromium-browser.spec
index bdfbc34..83ffbdc 100644
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -68,6 +68,7 @@ Patch0:		system-libs.patch
 Patch1:		plugin-searchdirs.patch
 Patch2:		gyp-system-minizip.patch
 Patch3:		disable_dlog_and_dcheck_in_release_builds.patch
+Patch4:		path-libpdf.patch
 Patch5:		options-support.patch
 Patch6:		get-webkit_revision.patch
 Patch7:		dlopen_sonamed_gl.patch
@@ -221,6 +222,7 @@ ln -s %{SOURCE7} src
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
diff --git a/path-libpdf.patch b/path-libpdf.patch
new file mode 100644
index 0000000..e11e5bc
--- /dev/null
+++ b/path-libpdf.patch
@@ -0,0 +1,19 @@
+In PLD Linux, browser-plugins framework symlinks enabled plugins to plugins/ dir
+access directly from there, instead of symlinking in google-chrome.spec
+
+--- chromium-browser-20.0.1132.57/./src/chrome/common/chrome_paths.cc~	2012-07-13 21:13:51.000000000 +0300
++++ chromium-browser-20.0.1132.57/./src/chrome/common/chrome_paths.cc	2012-07-13 21:14:41.799431216 +0300
+@@ -255,9 +255,11 @@
+       cur = cur.Append(chrome::kPepperFlashPluginFilename);
+       break;
+     case chrome::FILE_PDF_PLUGIN:
+-      if (!GetInternalPluginsDirectory(&cur))
++      if (!PathService::Get(base::DIR_MODULE, &cur))
+         return false;
+-      cur = cur.Append(kInternalPDFPluginFileName);
++
++      cur = cur.Append(FILE_PATH_LITERAL("plugins"))
++               .Append(kInternalPDFPluginFileName);
+       break;
+     case chrome::FILE_NACL_PLUGIN:
+       if (!GetInternalPluginsDirectory(&cur))


More information about the pld-cvs-commit mailing list