[Pkg-telepathy-commits] [empathy] 01/02: Add debian/patches/0004-Template.html-remove-DOCTYPE.patch: Fix scrolling issue when receiving a new message (Cherry-picked from upstream)

Tue Oct 22 11:12:37 UTC 2013

This is an automated email from the git hooks/post-receive script.

bigon pushed a commit to branch debian
in repository empathy.

commit 7f2ed1cf94a51a78d405731963cd4606d9f28c05
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Tue Oct 22 11:58:55 2013 +0200

    Add debian/patches/0004-Template.html-remove-DOCTYPE.patch: Fix scrolling issue when receiving a new message (Cherry-picked from upstream)
---
 debian/changelog                                   |    7 +++++
 .../0004-Template.html-remove-DOCTYPE.patch        |   28 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 36 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9b7538c..f2c92a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+empathy (3.8.4-3) UNRELEASED; urgency=low
+
+  * Add debian/patches/0004-Template.html-remove-DOCTYPE.patch: Fix scrolling
+    issue when receiving a new message (Cherry-picked from upstream)
+
+ -- Laurent Bigonville <bigon at debian.org>  Tue, 22 Oct 2013 11:54:49 +0200
+
 empathy (3.8.4-2) unstable; urgency=low
 
   * Team upload
diff --git a/debian/patches/0004-Template.html-remove-DOCTYPE.patch b/debian/patches/0004-Template.html-remove-DOCTYPE.patch
new file mode 100644
index 0000000..d39637e
--- /dev/null
+++ b/debian/patches/0004-Template.html-remove-DOCTYPE.patch
@@ -0,0 +1,28 @@
+From c2e916b5226ef76ce686119b79d1f49574e5c480 Mon Sep 17 00:00:00 2001
+From: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
+Date: Mon, 16 Sep 2013 17:17:09 +0200
+Subject: [PATCH] Template.html: remove DOCTYPE
+
+This ensures that WebKit considers the document in 'quirks' mode which is now
+needed when using document.body.scrollTop (used to check if we should scroll
+down or not when adding a new message).
+
+See https://bugs.webkit.org/show_bug.cgi?id=121419 for details.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=707781
+---
+ data/Template.html | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/data/Template.html b/data/Template.html
+index 79224b8..295ba8b 100644
+--- a/data/Template.html
++++ b/data/Template.html
+@@ -1,4 +1,3 @@
+-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+ <html>
+ <head>
+ 	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+-- 
+1.8.4.rc3
+
diff --git a/debian/patches/series b/debian/patches/series
index 685b82c..67ac413 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Use-new-api-versioned-name-for-geocode-glib.patch
 0002-Update-to-new-GeocodeLocation-API-in-geocode-glib-0..patch
 0003-Add-missing-include.patch
+0004-Template.html-remove-DOCTYPE.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/empathy.git

