[SCM] messagelib packaging branch, master, updated. debian/16.04.2-2-7-g20e6f11

Maximiliano Curia maxy at moszumanska.debian.org
Mon Aug 1 09:31:58 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/messagelib.git;a=commitdiff;h=20e6f11

The following commit has been merged in the master branch:
commit 20e6f113bd08f4293f566dd311d98994834927a5
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Aug 1 10:24:42 2016 +0200

    Add upstream patch: make-it-impossible-to-override-css-settings-from-a-h.patch
---
 ...ossible-to-override-css-settings-from-a-h.patch | 36 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 37 insertions(+)

diff --git a/debian/patches/make-it-impossible-to-override-css-settings-from-a-h.patch b/debian/patches/make-it-impossible-to-override-css-settings-from-a-h.patch
new file mode 100644
index 0000000..f1bff64
--- /dev/null
+++ b/debian/patches/make-it-impossible-to-override-css-settings-from-a-h.patch
@@ -0,0 +1,36 @@
+From 3f9d16c7dadd2c98b00c5e7216cd69cfb518cab9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sandro=20Knau=C3=9F?= <sknauss at kde.org>
+Date: Mon, 25 Jul 2016 12:39:15 +0200
+Subject: [PATCH] make it impossible to override css settings from a html mail.
+
+---
+ messageviewer/src/viewer/csshelperbase.cpp | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/messageviewer/src/viewer/csshelperbase.cpp b/messageviewer/src/viewer/csshelperbase.cpp
+index 8287e59..8825851 100644
+--- a/messageviewer/src/viewer/csshelperbase.cpp
++++ b/messageviewer/src/viewer/csshelperbase.cpp
+@@ -276,6 +276,9 @@ QString CSSHelperBase::printCssDefinitions(bool fixed) const
+                        "div.fancy.header > div a[href] { color: %3 ! important; }

"
+ 
+                        "div.fancy.header > table.outer{
"
++                       "  all: inherit;
"
++                       "  width: auto ! important;
"
++                       "  border-spacing: 0;
"
+                        "  background-color: %2 ! important;
"
+                        "  color: %3 ! important;
"
+                        "  border-bottom: solid %3 1px ! important;
"
+@@ -564,6 +567,9 @@ QString CSSHelperBase::screenCssDefinitions(const CSSHelperBase *helper, bool fi
+                        "}

"
+ 
+                        "div.fancy.header > table.outer {
"
++                       "  all: inherit;
"
++                       "  width: auto ! important;
"
++                       "  border-spacing: 0;
"
+                        "  background-color: %5 ! important;
"
+                        "  color: %4 ! important;
"
+                        "  border-bottom: solid %4 1px ! important;
"
+-- 
+2.8.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 9d428c7..6e14fca 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 upstream_add_copying_files.patch
+make-it-impossible-to-override-css-settings-from-a-h.patch

-- 
messagelib packaging



More information about the pkg-kde-commits mailing list