packages: chromium-browser/chromium-browser.spec, chromium-browser/gyp-syst...

arekm arekm at pld-linux.org
Thu Feb 16 18:47:32 CET 2012


Author: arekm                        Date: Thu Feb 16 17:47:32 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- stable was meant to be on HEAD; revert

---- Files affected:
packages/chromium-browser:
   chromium-browser.spec (1.178 -> 1.179) , gyp-system-minizip.patch (1.4 -> 1.5) , system-libs.patch (1.11 -> 1.12) , chromium-revert-jpeg-swizzle-r0.patch (1.2 -> 1.3) , dlopen-sonames.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/chromium-browser/chromium-browser.spec
diff -u packages/chromium-browser/chromium-browser.spec:1.178 packages/chromium-browser/chromium-browser.spec:1.179
--- packages/chromium-browser/chromium-browser.spec:1.178	Sun Feb 12 17:20:20 2012
+++ packages/chromium-browser/chromium-browser.spec	Thu Feb 16 18:47:27 2012
@@ -50,12 +50,12 @@
 %define		gyp_rev	1014
 Summary:	A WebKit powered web browser
 Name:		chromium-browser
-Version:	18.0.1025.11
-Release:	1
+Version:	17.0.963.46
+Release:	2
 License:	BSD, LGPL v2+ (ffmpeg)
 Group:		X11/Applications/Networking
 Source0:	http://carme.pld-linux.org/~glen/chromium-browser/src/beta/%{name}-%{version}.tar.xz
-# Source0-md5:	0bde819c093c1de4b76955608dcccc00
+# Source0-md5:	2799babdc6837530775219ff8a1b322b
 #SourceX:	http://ppa.launchpad.net/chromium-daily/ppa/ubuntu/pool/main/c/chromium-browser/%{name}_%{version}~svn%{svndate}r%{svnver}.orig.tar.gz
 Source2:	%{name}.sh
 Source3:	%{name}.desktop
@@ -72,11 +72,11 @@
 Patch7:		dlopen_sonamed_gl.patch
 Patch8:		chromium_useragent.patch.in
 Patch9:		system-expat.patch
-Patch10:	%{name}-pulse.patch
+Patch10:	dlopen-sonames.patch
 # https://bugs.gentoo.org/show_bug.cgi?id=393471
 # libjpeg-turbo >= 1.1.90 supports that feature
 # but there is no autodetection currently, so revert for now
-Patch11:	chromium-revert-jpeg-swizzle-r2.patch
+Patch11:	chromium-revert-jpeg-swizzle-r0.patch
 URL:		http://www.chromium.org/Home
 %{?with_gconf:BuildRequires:	GConf2-devel}
 BuildRequires:	OpenGL-GLU-devel
@@ -214,7 +214,9 @@
 %patch7 -p1
 cd src
 %patch9 -p1
+cd ..
 %patch10 -p1
+cd src
 %patch11 -p0
 cd ..
 
@@ -391,6 +393,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.179  2012/02/16 17:47:27  arekm
+- stable was meant to be on HEAD; revert
+
 Revision 1.178  2012/02/12 16:20:20  arekm
 - beta channel; up to 18.0.1025.11
 

================================================================
Index: packages/chromium-browser/gyp-system-minizip.patch
diff -u packages/chromium-browser/gyp-system-minizip.patch:1.4 packages/chromium-browser/gyp-system-minizip.patch:1.5
--- packages/chromium-browser/gyp-system-minizip.patch:1.4	Sun Feb 12 17:20:20 2012
+++ packages/chromium-browser/gyp-system-minizip.patch	Thu Feb 16 18:47:27 2012
@@ -83,14 +83,3 @@
  #if defined(OS_WIN)
  #include "third_party/zlib/contrib/minizip/iowin32.h"
  #endif
---- chromium-browser-18.0.1025.11/src/chrome/common/zip_internal.cc~	2012-02-12 16:37:27.000000000 +0100
-+++ chromium-browser-18.0.1025.11/src/chrome/common/zip_internal.cc	2012-02-12 16:53:51.341474034 +0100
-@@ -10,7 +10,7 @@
- #if defined(OS_WIN)
- #include "third_party/zlib/contrib/minizip/iowin32.h"
- #elif defined(OS_POSIX)
--#include "third_party/zlib/contrib/minizip/ioapi.h"
-+#include <minizip/ioapi.h>
- #endif
- 
- namespace {

================================================================
Index: packages/chromium-browser/system-libs.patch
diff -u packages/chromium-browser/system-libs.patch:1.11 packages/chromium-browser/system-libs.patch:1.12
--- packages/chromium-browser/system-libs.patch:1.11	Sun Feb 12 17:20:20 2012
+++ packages/chromium-browser/system-libs.patch	Thu Feb 16 18:47:27 2012
@@ -42,15 +42,14 @@
  #include "base/time.h"
  #include "base/utf_string_conversions.h"
  #include "chrome/browser/autocomplete/autocomplete.h"
---- a/src/chrome/common/metrics/metrics_log_base.cc~	2012-02-09 03:36:29.000000000 +0100
-+++ b/src/chrome/common/metrics/metrics_log_base.cc	2012-02-12 16:17:46.992725484 +0100
-@@ -10,7 +10,7 @@
+--- chromium-browser-14.0.830.0~svn20110722r93513/src/chrome/common/metrics_helpers.cc.orig	2011-07-19 04:00:59.000000000 +0200
++++ chromium-browser-14.0.830.0~svn20110722r93513/src/chrome/common/metrics_helpers.cc	2011-07-22 20:43:47.608727449 +0200
+@@ -17,7 +17,7 @@
  #include "base/perftimer.h"
  #include "base/string_number_conversions.h"
  #include "base/sys_info.h"
 -#include "base/third_party/nspr/prtime.h"
 +#include <nspr/prtime.h>
+ #include "base/time.h"
  #include "base/utf_string_conversions.h"
  #include "chrome/common/logging_chrome.h"
- #include "libxml/xmlwriter.h"
-

================================================================
Index: packages/chromium-browser/chromium-revert-jpeg-swizzle-r0.patch
diff -u /dev/null packages/chromium-browser/chromium-revert-jpeg-swizzle-r0.patch:1.3
--- /dev/null	Thu Feb 16 18:47:32 2012
+++ packages/chromium-browser/chromium-revert-jpeg-swizzle-r0.patch	Thu Feb 16 18:47:27 2012
@@ -0,0 +1,62 @@
+This reverts http://trac.webkit.org/changeset/101286
+to fix Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=393471
+
+Index: third_party/WebKit/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
+===================================================================
+--- third_party/WebKit/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp	(revision 96970)
++++ third_party/WebKit/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp	(revision 101286)
+@@ -63,20 +63,6 @@
+ 
+ #include <setjmp.h>
+ 
+-#if CPU(BIG_ENDIAN) || CPU(MIDDLE_ENDIAN)
+-#define ASSUME_LITTLE_ENDIAN 0
+-#else
+-#define ASSUME_LITTLE_ENDIAN 1
+-#endif
+-
+-#if defined(JCS_EXTENSIONS) && ASSUME_LITTLE_ENDIAN
+-#define TURBO_JPEG_RGB_SWIZZLE
+-inline J_COLOR_SPACE rgbOutputColorSpace() { return JCS_EXT_BGRX; }
+-inline bool turboSwizzled(J_COLOR_SPACE colorSpace) { return colorSpace == rgbOutputColorSpace(); }
+-#else
+-inline J_COLOR_SPACE rgbOutputColorSpace() { return JCS_RGB; }
+-#endif
+-
+ namespace WebCore {
+ 
+ struct decoder_error_mgr {
+@@ -235,11 +221,10 @@
+                 // their color profile, CoreGraphics will "upsample" them
+                 // again, resulting in horizontal distortions.
+                 m_decoder->setIgnoreGammaAndColorProfile(true);
+-                m_info.out_color_space = JCS_RGB;
+-                break;
++                // Note fall-through!
+             case JCS_RGB:
+             case JCS_YCbCr:
+-                m_info.out_color_space = rgbOutputColorSpace();
++                m_info.out_color_space = JCS_RGB;
+                 break;
+             case JCS_CMYK:
+             case JCS_YCCK:
+@@ -496,19 +481,6 @@
+     }
+ 
+     jpeg_decompress_struct* info = m_reader->info();
+-
+-#if !ENABLE(IMAGE_DECODER_DOWN_SAMPLING) && defined(TURBO_JPEG_RGB_SWIZZLE)
+-    if (turboSwizzled(info->out_color_space)) {
+-         ASSERT(!m_scaled);
+-         while (info->output_scanline < info->output_height) {
+-             unsigned char* row = reinterpret_cast<unsigned char*>(buffer.getAddr(0, info->output_scanline));
+-             if (jpeg_read_scanlines(info, &row, 1) != 1)
+-                  return false;
+-         }
+-         return true;
+-     }
+-#endif
+-
+     JSAMPARRAY samples = m_reader->samples();
+ 
+     while (info->output_scanline < info->output_height) {

================================================================
Index: packages/chromium-browser/dlopen-sonames.patch
diff -u /dev/null packages/chromium-browser/dlopen-sonames.patch:1.3
--- /dev/null	Thu Feb 16 18:47:32 2012
+++ packages/chromium-browser/dlopen-sonames.patch	Thu Feb 16 18:47:27 2012
@@ -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;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/chromium-browser.spec?r1=1.178&r2=1.179&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/gyp-system-minizip.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/system-libs.patch?r1=1.11&r2=1.12&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/chromium-revert-jpeg-swizzle-r0.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/dlopen-sonames.patch?r1=1.2&r2=1.3&f=u



More information about the pld-cvs-commit mailing list