up to 36.0.1985.143, NPAPI dropped, so it's related path patch

diff --git a/chromium-browser.spec b/chromium-browser.spec
index f787a4f4746de5767fc56e501fd391fee4ef66a8..e3d5e178daa751c7858a2f7e6b82b750c60ae9c9 100644 (file)
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -61,8 +61,8 @@
 # - http://code.google.com/p/chromium/wiki/LinuxBuildInstructionsPrerequisites
 # - to look for new tarball, use update-source.sh script
 
-%define                branch          35.0.1916
-%define                basever         114
+%define                branch          36.0.1985
+%define                basever         143
 #define                patchver        132
 %define                gyp_rev 1014
 Summary:       A WebKit powered web browser
@@ -89,7 +89,6 @@ Source6:      update-source.sh
 Source7:       clean-source.sh
 Source8:       get-source.sh
 Source9:       master_preferences.json
-Patch1:                plugin-searchdirs.patch
 Patch2:                enable-video-decode-accel.patch
 Patch4:                path-libpdf.patch
 Patch7:                dlopen_sonamed_gl.patch
@@ -296,7 +295,6 @@ sed -e 's/@BUILD_DIST@/PLD %{pld_version}/g' \
 %{__sed} -e 's,@localedir@,%{_datadir}/%{name},' %{SOURCE5} > find-lang.sh
 ln -s %{SOURCE7} .
 
-%patch1 -p1
 #%patch2 -p1 NOT COMPILING
 %patch4 -p3
 %patch7 -p1

diff --git a/dlopen_sonamed_gl.patch b/dlopen_sonamed_gl.patch
index fa3129dcc519777055b859411d3687489c5690f0..116793698c65892d2f05c63d7353c6927d2d0f8a 100644 (file)
--- a/dlopen_sonamed_gl.patch
+++ b/dlopen_sonamed_gl.patch
@@ -3,14 +3,14 @@ as we don't want to Depend on the -devel packages for the .so files:
 - libOSMesa.so.8: Mesa-libOSMesa-9.2.0-2
 - libGLESv2.so.2: Mesa-libGLES-9.2.0-2
 - libEGL.so.1: Mesa-libEGL-9.2.0-2
---- chromium-browser-35.0.1916.114/ui/gl/gl_implementation_osmesa.cc~  2014-05-14 22:23:31.000000000 +0300
-+++ chromium-browser-35.0.1916.114/ui/gl/gl_implementation_osmesa.cc   2014-05-25 22:46:46.730068460 +0300
-@@ -38,7 +38,7 @@
+--- chromium-browser-36.0.1985.143/ui/gl/gl_implementation_osmesa.cc~  2014-08-12 22:02:27.000000000 +0300
++++ chromium-browser-36.0.1985.143/ui/gl/gl_implementation_osmesa.cc   2014-08-18 23:09:25.208179075 +0300
+@@ -37,7 +37,7 @@
      return false;
    }
  
 -  base::FilePath library_path = module_path.Append("libosmesa.so");
 +  base::FilePath library_path = module_path.Append("libOSMesa.so.8");
-   base::NativeLibrary library = LoadLibrary(library_path);
-   if (!library) {
-     LOG(ERROR) << "Failed to load " << library_path.value() << ".";
+   base::NativeLibrary library = LoadLibraryAndPrintError(library_path);
+   if (!library)
+     return false;

diff --git a/plugin-searchdirs.patch b/plugin-searchdirs.patch
deleted file mode 100644 (file)
index b0c3ba5..0000000
--- a/plugin-searchdirs.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-- search plugins from ~/.mozilla plugins and $MOZ_PLUGIN_PATH, so in short, plugins are searched from:
-1. %{_libdir}/%{name}/plugins
-2. $MOZ_PLUGIN_PATH (colon separated)
-3. ~/.mozilla/plugins
-
---- chromium-browser-10.0.632.0~svn20110107r70714/content/common/plugin_list_posix.cc~ 2010-12-22 04:02:37.000000000 +0100
-+++ chromium-browser-10.0.632.0~svn20110107r70714/content/common/plugin_list_posix.cc  2011-01-07 17:41:38.193692743 +0100
-@@ -146,6 +146,8 @@
-   if (!home.empty())
-     plugin_dirs->push_back(home.Append(".mozilla/plugins"));
- 
-+  // in PLD Linux we want to search only Chrome specific dirs.
-+#if 0
-   // 3) NS_SYSTEM_PLUGINS_DIR:
-   // This varies across different browsers and versions, so check 'em all.
-   plugin_dirs->push_back(FilePath("/usr/lib/browser-plugins"));
-@@ -161,6 +163,7 @@
-   plugin_dirs->push_back(FilePath("/usr/lib64/firefox/plugins"));
-   plugin_dirs->push_back(FilePath("/usr/lib64/xulrunner-addons/plugins"));
- #endif  // defined(ARCH_CPU_64_BITS)
-+#endif // PLD Linux
- #endif  // !defined(OS_CHROMEOS)
- }
-