start with 42.0.2311.82

libpdf is now internal

diff --git a/angle.patch b/angle.patch
index ab9b45f815ce828565783e4dfec3c1d8736fc47f..db5f4318f9b5d26092243ba5e74c035df4490059 100644 (file)
--- a/angle.patch
+++ b/angle.patch
@@ -1,9 +1,10 @@
---- a/third_party/angle/src/angle.gypi
-+++ b/third_party/angle/src/angle.gypi
-@@ -52,7 +52,7 @@
+--- chromium-browser-42.0.2311.82/third_party/angle/src/angle.gyp~     2015-04-09 00:14:43.000000000 +0300
++++ chromium-browser-42.0.2311.82/third_party/angle/src/angle.gyp      2015-04-21 22:02:35.668680845 +0300
+@@ -104,8 +104,7 @@
+                         {
                              'action_name': 'Generate ANGLE Commit ID Header',
                              'message': 'Generating ANGLE Commit ID',
-                             # reference the git index as an input, so we rebuild on changes to the index
+-                            # reference the git index as an input, so we rebuild on changes to the index
 -                            'inputs': [ '<(angle_id_script)', '<(angle_path)/.git/index' ],
 +                            'inputs': [ '<(angle_id_script)' ],
                              'outputs': [ '<(angle_id_header)' ],

diff --git a/chromium-browser.spec b/chromium-browser.spec
index 8ea7b211577a421284e741c24e02a92065fc72cc..513d755ad9935ba7d74251831011720f3a37c0c7 100644 (file)
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -73,9 +73,9 @@
 # - http://code.google.com/p/chromium/wiki/LinuxBuildInstructionsPrerequisites
 # - to look for new tarball, use update-source.sh script
 
-%define                branch          41.0.2272
-%define                basever         101
-%define                patchver        118
+%define                branch          42.0.2311
+%define                basever         82
+#define                patchver        118
 %define                gyp_rev 1014
 Summary:       A WebKit powered web browser
 Name:          chromium-browser
@@ -84,11 +84,11 @@ Version:    %{branch}.%{patchver}
 %else
 Version:       %{branch}.%{basever}
 %endif
-Release:       1
+Release:       0.1
 License:       BSD%{!?with_system_ffmpeg:, LGPL v2+ (ffmpeg)}
 Group:         X11/Applications/Networking
-Source0:       http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{branch}.%{basever}.tar.xz
-# Source0-md5: a493cd513f2724eb63d6721707e11c4a
+Source0:       http://carme.pld-linux.org/~glen/chromium-browser/src/beta/%{name}-%{branch}.%{basever}.tar.gz
+# Source0-md5: 7bdbf015d663e082f5bbe4cf24907049
 %if "%{?patchver}" != ""
 Patch0:                http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{version}.patch.xz
 # Patch0-md5:  fc9cd6fd3392142db2ada6b98b89fa80
@@ -103,7 +103,6 @@ Source8:    get-source.sh
 Source9:       master_preferences.json
 # https://github.com/Kelvin-Ng/Kelvin-Gentoo-Overlay/tree/master/www-client/chromium/files
 Patch2:                enable-video-decode-accel.patch
-Patch4:                path-libpdf.patch
 Patch7:                dlopen_sonamed_gl.patch
 Patch8:                chromium_useragent.patch.in
 # https://bugs.gentoo.org/show_bug.cgi?id=393471
@@ -313,7 +312,6 @@ sed -e 's/@BUILD_DIST@/PLD %{pld_version}/g' \
 ln -s %{SOURCE7} .
 
 #%patch2 -p1 CHECK
-%patch4 -p3
 %patch7 -p1
 %patch15 -p2
 %{!?with_libjpegturbo:%patch11 -p0}

diff --git a/path-libpdf.patch b/path-libpdf.patch
deleted file mode 100644 (file)
index e11e5bc..0000000
--- a/path-libpdf.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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))

diff --git a/system-mesa.patch b/system-mesa.patch
index a2f84845350b933374b281b4832d2b654732cae4..077fd8108ea25988ac68485cc5f93c6aeb3d11b2 100644 (file)
--- a/system-mesa.patch
+++ b/system-mesa.patch
@@ -1,14 +1,14 @@
 in PLD Linux, windows includes are not packaged
 http://lists.pld-linux.org/mailman/pipermail/pld-devel-en/2013-February/023459.html
 
---- chromium-browser-35.0.1916.114/ui/gl/generate_bindings.py~ 2014-05-14 22:23:31.000000000 +0300
-+++ chromium-browser-35.0.1916.114/ui/gl/generate_bindings.py  2014-05-25 23:32:33.414353814 +0300
-@@ -1284,7 +1284,7 @@
+--- chromium-browser-42.0.2311.82/ui/gl/generate_bindings.py~  2015-04-09 00:14:31.000000000 +0300
++++ chromium-browser-42.0.2311.82/ui/gl/generate_bindings.py   2015-04-19 23:32:27.601618454 +0300
+@@ -1616,7 +1616,7 @@
        'EGL_ANGLE_surface_d3d_texture_2d_share_handle',
      ],
    ],
--  [WGL_FUNCTIONS, 'wgl', ['GL/wglext.h'], []],
-+#  [WGL_FUNCTIONS, 'wgl', ['GL/wglext.h'], []],
-   [GLX_FUNCTIONS, 'glx', ['GL/glx.h', 'GL/glxext.h'], []],
+-  [WGL_FUNCTIONS, 'wgl', ['noninclude/GL/wglext.h'], []],
++#  [WGL_FUNCTIONS, 'wgl', ['noninclude/GL/wglext.h'], []],
+   [GLX_FUNCTIONS, 'glx', ['GL/glx.h', 'noninclude/GL/glxext.h'], []],
  ]