[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.2.0-1-1-gbf70feb

zero79 (none) zero79 at ruby.
Sat May 8 03:58:59 UTC 2010 

The following commit has been merged in the debian/unstable branch:
commit bf70feb1d34bb8cd284a80fda7742055979506ed
Author: zero79 <zero79 at ruby.(none)>
Date:   Fri May 7 23:58:38 2010 -0400

    convert to source format 3.0

diff --git a/debian/changelog b/debian/changelog
index 764ecb7..6209e1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+webkit (1.2.0-2) UNRELEASED; urgency=low
+
+  [Michael Gilbert]
+  * Convert to source format version 3.0 (quilt) to make it easier to support
+    security backports in the future.
+    - Create patches for existing debian modifications (sparc-support.patch
+      and pool-fixup.patch)
+  * Use ${misc:Depends}.
+  * Bump standards to 3.8.4 (no changes required).
+
+ -- Michael Gilbert <michael.s.gilbert at gmail.com>  Fri, 07 May 2010 22:59:10 -0400
+
 webkit (1.2.0-1) unstable; urgency=low
 
   * New upstream release - this is the first release in the 1.2 stable
diff --git a/debian/control b/debian/control
index 5aad39a..e134781 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,7 @@ Build-Depends: debhelper (>= 5.0),
                libgirepository1.0-dev (>= 0.6.2),
                gir-repository-dev (>= 0.6.2),
                gobject-introspection (>= 0.6.2)
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Homepage: http://webkit.org/
 Vcs-Browser: http://git.debian.org/?p=pkg-webkit/webkit.git
 Vcs-Git: git://git.debian.org/git/pkg-webkit/webkit.git
@@ -33,7 +33,7 @@ Vcs-Git: git://git.debian.org/git/pkg-webkit/webkit.git
 Package: libwebkit-1.0-2
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, libwebkit-1.0-common (>= ${source:Upstream-Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, libwebkit-1.0-common (>= ${source:Upstream-Version})
 Description: Web content engine library for Gtk+
  WebKit is a web content engine, derived from KHTML and KJS from KDE, and
  used primarily in Apple's Safari browser.  It is made to be embedded in
@@ -48,7 +48,7 @@ Package: libwebkit-dev
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libwebkit-1.0-2 (= ${binary:Version}), libgtk2.0-dev, libsoup2.4-dev (>= 2.27.91)
+Depends: ${misc:Depends}, libwebkit-1.0-2 (= ${binary:Version}), libgtk2.0-dev, libsoup2.4-dev (>= 2.27.91)
 Replaces: gir-repository-dev, gobject-introspection-repository
 Description: Web content engine library for Gtk+ - Development files
  WebKit is a web content engine, derived from KHTML and KJS from KDE, and
@@ -63,6 +63,7 @@ Description: Web content engine library for Gtk+ - Development files
 
 Package: libwebkit-1.0-common
 Section: libs
+Depends: ${misc:Depends}
 Priority: optional
 Architecture: all
 Description: Web content engine library for Gtk+ - data files
@@ -79,7 +80,7 @@ Package: libwebkit-1.0-2-dbg
 Section: debug
 Priority: extra
 Architecture: any
-Depends: libwebkit-1.0-2 (= ${binary:Version})
+Depends: ${misc:Depends}, libwebkit-1.0-2 (= ${binary:Version})
 Description: Web content engine library for Gtk+ - Debugging symbols
  WebKit is a web content engine, derived from KHTML and KJS from KDE, and
  used primarily in Apple's Safari browser.  It is made to be embedded in
@@ -93,9 +94,7 @@ Description: Web content engine library for Gtk+ - Debugging symbols
 Package: gir1.0-webkit-1.0
 Section: libs
 Architecture: any
-Depends: ${gir:Depends},
-         ${shlibs:Depends},
-         ${misc:Depends}
+Depends: ${misc:Depends}
 Conflicts: gobject-introspection-repository
 Description: GObject introspection data for the WebKit library
  This package contains introspection data for WebKit, a web content
diff --git a/debian/patches/pool-fixup.patch b/debian/patches/pool-fixup.patch
new file mode 100644
index 0000000..63f55e2
--- /dev/null
+++ b/debian/patches/pool-fixup.patch
@@ -0,0 +1,33 @@
+description: fix up pool
+--- webkit-1.2.0.orig/JavaScriptCore/wtf/ListHashSet.h
++++ webkit-1.2.0/JavaScriptCore/wtf/ListHashSet.h
+@@ -127,7 +127,7 @@
+             : m_freeList(pool())
+             , m_isDoneWithInitialFreeList(false)
+         { 
+-            memset(m_pool.pool, 0, sizeof(m_pool.pool));
++            memset(m_pool, 0, sizeof(m_pool));
+         }
+ 
+         Node* allocate()
+@@ -171,7 +171,7 @@
+         }
+ 
+     private:
+-        Node* pool() { return reinterpret_cast<Node*>(m_pool.pool); }
++        Node* pool() { return reinterpret_cast<Node*>(m_pool); }
+         Node* pastPool() { return pool() + m_poolSize; }
+ 
+         bool inPool(Node* node)
+@@ -182,10 +182,7 @@
+         Node* m_freeList;
+         bool m_isDoneWithInitialFreeList;
+         static const size_t m_poolSize = 256;
+-        union {
+-            char pool[sizeof(Node) * m_poolSize];
+-            double forAlignment;
+-        } m_pool;
++        uint32_t m_pool[(sizeof(Node) * m_poolSize + sizeof(uint32_t) - 1) / sizeof(uint32_t)];
+     };
+ 
+     template<typename ValueArg> struct ListHashSetNode {
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..373fdd5
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+sparc-support.patch
+pool-fixup.patch
diff --git a/debian/patches/sparc-support.patch b/debian/patches/sparc-support.patch
new file mode 100644
index 0000000..cf1afe8
--- /dev/null
+++ b/debian/patches/sparc-support.patch
@@ -0,0 +1,33 @@
+description: add support for sparc architecture
+--- webkit-1.2.0.orig/WebCore/platform/text/AtomicString.cpp
++++ webkit-1.2.0/WebCore/platform/text/AtomicString.cpp
+@@ -103,9 +103,9 @@
+     if (string->length() != length)
+         return false;
+ 
++#if CPU(ARM) || CPU(SPARC) || CPU(SH4)
+     // FIXME: perhaps we should have a more abstract macro that indicates when
+     // going 4 bytes at a time is unsafe
+-#if CPU(ARM) || CPU(SH4)
+     const UChar* stringCharacters = string->characters();
+     for (unsigned i = 0; i != length; ++i) {
+         if (*stringCharacters++ != *characters++)
+--- webkit-1.2.0.orig/WebCore/platform/text/StringHash.h
++++ webkit-1.2.0/WebCore/platform/text/StringHash.h
+@@ -54,13 +54,13 @@
+ 
+             // FIXME: perhaps we should have a more abstract macro that indicates when
+             // going 4 bytes at a time is unsafe
+-#if CPU(ARM) || CPU(SH4)
++#if CPU(ARM) || CPU(SPARC) || CPU(SH4)
+             const UChar* aChars = a->characters();
+             const UChar* bChars = b->characters();
+-            for (unsigned i = 0; i != aLength; ++i) {
++            for (unsigned i = 0; i != aLength; ++i)
+                 if (*aChars++ != *bChars++)
+                     return false;
+-            }
++
+             return true;
+ #else
+             /* Do it 4-bytes-at-a-time on architectures where it's safe */
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

-- 
WebKit Debian packaging

More information about the Pkg-webkit-commits mailing list