home:rwooninck:chromium/chromium -> openSUSE:Factory:Contrib/chromium

   https://build.opensuse.org/request/diff/79101

   Description: Update to 15.0.854 and resolving bug 711438

changes files:
--------------
--- chromium.changes
+++ chromium.changes
@@ -1,0 +2,5 @@
+Tue Aug 16 09:14:32 UTC 2011 - [email protected]
+
+- Update to 15.0.854
+
+-------------------------------------------------------------------

old:
----
  chromium.15.0.846.0.svn95732.tar.lzma

new:
----
  chromium.15.0.854.0.svn96902.tar.lzma

spec files:
-----------
--- chromium.spec
+++ chromium.spec
@@ -3,11 +3,11 @@
 # Thanks to jhaygood for most of the icu patch
 
 
-%define svn_rev 95732
-%define v8_ver 3.5.2.0
+%define svn_rev 96902
+%define v8_ver 3.5.5.0
 
 Name:           chromium
-Version:        15.0.846.0
+Version:        15.0.854.0
 Release:        1
 License:        BSD
 Summary:        Google's opens source browser project
@@ -36,7 +36,7 @@
 # PATCH-FIX-OPENSUSE Fix build with GCC 4.6
 Patch1:         chromium-gcc46.patch
 # PATCH-FIX-OPENSUSE disable debug for sqlite
-Patch4:         chromium-no-sqlite-debug.patch
+#Patch4:         chromium-no-sqlite-debug.patch
 # PATCH-FIX-OPENSUSE patches in system zlib library
 Patch8:         chromium-codechanges-zlib.patch
 # PATCH-FIX-OPENSUSE disables the build of the test suite
@@ -185,7 +185,6 @@
 %patch1 -p1
 %patch62 -p1
 %patch63 -p1
-%patch4 -p1
 %patch8 -p1
 %patch12 -p1
 %patch13 -p1
@@ -309,6 +308,11 @@
 %clean
 rm -rf %{buildroot}
 
+%pre 
+if [ -f /usr/bin/chromium ] ; then
+ rm -v /usr/bin/chromium ; 
+fi
+
 # Add snipplets to update the GTK cache on package install.
 %if 0%{?suse_version} >= 1140
 %post

other changes:
--------------

++++++ chromium-6.0.406.0-system-gyp-v8.patch
--- chromium-6.0.406.0-system-gyp-v8.patch
+++ chromium-6.0.406.0-system-gyp-v8.patch
@@ -1,6 +1,6 @@
 --- chromium/src/build/all.gyp 2010-11-25 19:17:16.000000000 +0100
 +++ new/src/build/all.gyp      2010-11-25 21:05:09.413000018 +0100
-@@ -57,7 +57,7 @@
+@@ -59,7 +59,7 @@
        'conditions': [
          ['javascript_engine=="v8"', {
            'dependencies': [
@@ -9,7 +9,7 @@
            ],
          }],
          ['OS=="mac" or OS=="linux"', {
-@@ -142,156 +142,6 @@
+@@ -149,167 +149,6 @@
          }],
        ],
      }, # target_name: All
@@ -27,6 +27,7 @@
 -        '../chrome/chrome.gyp:sync_unit_tests',
 -        '../chrome/chrome.gyp:ui_tests',
 -        '../chrome/chrome.gyp:unit_tests',
+-        '../content/content.gyp:content_unittests',
 -        '../crypto/crypto.gyp:crypto_unittests',
 -        '../ui/ui.gyp:gfx_unittests',
 -        '../gpu/gpu.gyp:gpu_unittests',
@@ -87,6 +88,7 @@
 -        '../chrome/chrome.gyp:sync_unit_tests',
 -        '../chrome/chrome.gyp:ui_tests',
 -        '../chrome/chrome.gyp:unit_tests',
+-        '../content/content.gyp:content_unittests',
 -        '../crypto/crypto.gyp:crypto_unittests',
 -        '../ui/ui.gyp:gfx_unittests',
 -        '../gpu/gpu.gyp:gpu_unittests',
@@ -132,6 +134,14 @@
 -      ],
 -    }, # target_name: chromium_2010_builder_tests
 -    {
+-      'target_name': 'chromium_builder_nacl_win_integration',
+-      'type': 'none',
+-      'dependencies': [
+-        'chromium_builder_qa', # needed for pyauto
+-        'chromium_builder_tests',
+-      ],
+-    }, # target_name: chromium_builder_nacl_win_integration
+-    {
 -      'target_name': 'chromium_builder_perf',
 -      'type': 'none',
 -      'dependencies': [
@@ -139,6 +149,7 @@
 -        '../chrome/chrome.gyp:performance_ui_tests',
 -        '../chrome/chrome.gyp:plugin_tests',
 -        '../chrome/chrome.gyp:sync_performance_tests',
+-        '../chrome/chrome.gyp:ui_tests',
 -      ],
 -    }, # target_name: chromium_builder_perf
 -    {

++++++ chromium-7.0.542.0-codechanges-system-minizip-v8.patch
--- chromium-7.0.542.0-codechanges-system-minizip-v8.patch
+++ chromium-7.0.542.0-codechanges-system-minizip-v8.patch
@@ -1,8 +1,8 @@
 diff -up 
chromium-7.0.542.0/chrome/browser/browser_about_handler.cc.system-code 
chromium-7.0.542.0/chrome/browser/browser_about_handler.cc
 --- chromium-7.0.542.0/src/chrome/browser/browser_about_handler.cc.system-code 
2010-10-04 05:42:38.000000000 -0400
 +++ chromium-7.0.542.0/src/chrome/browser/browser_about_handler.cc     
2010-10-04 13:50:45.322377060 -0400
-@@ -58,7 +58,7 @@
- #include "webkit/plugins/npapi/webplugininfo.h"
+@@ -63,7 +63,7 @@
+ #include "webkit/plugins/webplugininfo.h"
 
  #ifdef CHROME_V8
 -#include "v8/include/v8.h"

++++++ chromium-7.0.542.0-system-libvpx.patch
--- chromium-7.0.542.0-system-libvpx.patch
+++ chromium-7.0.542.0-system-libvpx.patch
@@ -31,14 +31,24 @@
 diff -up chromium-7.0.542.0/remoting/remoting.gyp.system-libvpx 
chromium-7.0.542.0/remoting/remoting.gyp
 --- chromium-7.0.542.0/src/remoting/remoting.gyp.system-libvpx 2010-10-06 
14:01:19.641507000 -0400
 +++ chromium-7.0.542.0/src/remoting/remoting.gyp       2010-10-06 
14:01:19.654507000 -0400
-@@ -235,6 +235,6 @@
-         '../net/net.gyp:net',
-         '../third_party/protobuf/protobuf.gyp:protobuf_lite',
--        '../third_party/libvpx/libvpx.gyp:libvpx_include',
-+        '../build/linux/system.gyp:libvpx',
-         '../third_party/zlib/zlib.gyp:zlib',
-         '../media/media.gyp:yuv_convert',
+@@ -165,7 +165,7 @@
+         'remoting_base',
+         'remoting_host',
          'remoting_jingle_glue',
+-        '../third_party/libvpx/libvpx.gyp:libvpx',
++        '../build/linux/system.gyp:libvpx',
+         '../third_party/npapi/npapi.gyp:npapi',
+       ],
+       'sources': [
+@@ -303,7 +303,7 @@
+       # TODO(hclam): Remove this and depend on libvpx directly once we remove
+       # libvpx from FFmpeg.
+       'include_dirs': [
+-        '../third_party/libvpx/source/libvpx',
++        '/usr/include/vpx',
+       ],
+       # This target needs a hard dependency because dependent targets
+       # depend on chromotocol_proto_lib for headers.
 diff -up chromium-7.0.542.0/third_party/ffmpeg/ffmpeg.gyp.system-libvpx 
chromium-7.0.542.0/third_party/ffmpeg/ffmpeg.gyp
 --- chromium-7.0.542.0/src/third_party/ffmpeg/ffmpeg.gyp.system-libvpx 
2010-10-06 14:04:09.730507291 -0400
 +++ chromium-7.0.542.0/src/third_party/ffmpeg/ffmpeg.gyp       2010-10-06 
14:05:14.341510863 -0400

++++++ chromium-no-courgette.patch
--- chromium-no-courgette.patch
+++ chromium-no-courgette.patch
@@ -1,12 +1,12 @@
 diff -up chromium-20100218svn39394/src/build/all.gyp.no-courgette 
chromium-20100218svn39394/src/build/all.gyp
 --- chromium-20100218svn39394/src/build/all.gyp.no-courgette   2010-02-19 
16:03:23.305138076 -0500
 +++ chromium-20100218svn39394/src/build/all.gyp        2010-02-19 
16:03:42.426124248 -0500
-@@ -78,7 +78,6 @@
+@@ -81,7 +81,6 @@
          ['OS=="linux"', {
            'dependencies': [
              '../breakpad/breakpad.gyp:*',
 -            '../courgette/courgette.gyp:*',
              '../dbus/dbus.gyp:*',
              '../sandbox/sandbox.gyp:*',
-             '../cloud_print/virtual_driver/virtual_driver_linux.gyp:*',
+           ],
 diff -up chromium-20100218svn39394/src/chrome/chrome.gyp.no-courgette 
chromium-20100218svn39394/src/chrome/chrome.gyp

++++++ chromium.15.0.854.0.svn96902.tar.lzma (new)
Binary files chromium.15.0.854.0.svn96902.tar.lzma added

++++++ deleted files:
--- chromium.15.0.846.0.svn95732.tar.lzma


To REVIEW against the previous version:
   osc request show --diff 79101

To ACCEPT the request:
   osc request accept 79101 --message="reviewed ok."
   
To DECLINE the request:
   osc request decline 79101 --message="declined for reason xyz (see ... for 
background / policy / ...)."

To REVOKE the request:
   osc request revoke 79101 --message="retracted because ..., sorry / thx / see 
better version ..."

-- 
Hermes messaging (http://hermes.opensuse.org)
openSUSE Build Service (https://build.opensuse.org/)
Collaboration: http://en.opensuse.org/Build_Service/Collaboration

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to