[SCM] kdepim-addons packaging branch, master, updated. debian/16.04.2-2-4-g7d6cdd2
Maximiliano Curia
maxy at moszumanska.debian.org
Mon Aug 1 12:52:28 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kdepim-addons.git;a=commitdiff;h=c0d6af6
The following commit has been merged in the master branch:
commit c0d6af6b582666391b17ebc7e305f4b6eeefeefd
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Mon Aug 1 13:54:48 2016 +0200
Add upstream patches: get-rid-of-not-needed-div.patch and Do-not-allow-html-mail-to-use-css-that-only-should-b.patch
Closes: 814762
---
...w-html-mail-to-use-css-that-only-should-b.patch | 112 +++++++++++++++++++++
debian/patches/get-rid-of-not-needed-div.patch | 40 ++++++++
debian/patches/series | 2 +
3 files changed, 154 insertions(+)
diff --git a/debian/patches/Do-not-allow-html-mail-to-use-css-that-only-should-b.patch b/debian/patches/Do-not-allow-html-mail-to-use-css-that-only-should-b.patch
new file mode 100644
index 0000000..0e8fbe1
--- /dev/null
+++ b/debian/patches/Do-not-allow-html-mail-to-use-css-that-only-should-b.patch
@@ -0,0 +1,112 @@
+From cab925e9d4769762ea0080d49f392022cd8e78dd 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:43:17 +0200
+Subject: [PATCH] Do not allow html mail to use css that only should be used in
+ headers.
+
+---
+ .../theme/5.2/style.css | 40 +++++++++++-----------
+ 1 file changed, 20 insertions(+), 20 deletions(-)
+
+diff --git a/plugins/messageviewerheaderplugins/defaultgrantleeheaderstyleplugin/theme/5.2/style.css b/plugins/messageviewerheaderplugins/defaultgrantleeheaderstyleplugin/theme/5.2/style.css
+index 60e6597..1dbdf6c 100644
+--- a/plugins/messageviewerheaderplugins/defaultgrantleeheaderstyleplugin/theme/5.2/style.css
++++ b/plugins/messageviewerheaderplugins/defaultgrantleeheaderstyleplugin/theme/5.2/style.css
+@@ -2,7 +2,14 @@ body {
+ margin: 0;
+ padding: 0;
+ }
+-table.outer {
++div#headerbox {
++ border-radius: 3px;
++ border-bottom: 1px solid rgb(190, 190, 190);
++ color: rgb(100, 100, 100) !important;
++ overflow: auto;
++ padding: 5px 20px;
++}
++div#headerbox table.outer {
+ display: inline;
+ position: fixed !important;
+ top: -1px;
+@@ -12,14 +19,7 @@ table.outer {
+ border: none !important;
+ table-collapse: collapse;
+ }
+-div#headerbox {
+- border-radius: 3px;
+- border-bottom: 1px solid rgb(190, 190, 190);
+- color: rgb(100, 100, 100) !important;
+- overflow: auto;
+- padding: 5px 20px;
+-}
+-div#subject {
++div#headerbox div#subject {
+ color: rgb(100, 100, 100) !important;
+ font-size: 22px;
+ font-weight: normal;
+@@ -27,51 +27,51 @@ div#subject {
+ padding-bottom: 5px;
+ padding-top: 5px;
+ }
+-div#photo {
++div#headerbox div#photo {
+ float: left;
+ margin: 5px;
+ }
+-div.table {
++div#headerbox div.table {
+ display: table;
+ padding-right: 12px;
+ padding-top: 6px;
+ }
+-div.row {
++div#headerbox div.row {
+ display: table-row;
+ }
+-div.headerleft {
++div#headerbox div.headerleft {
+ display: table-cell;
+ padding: 0.1em 1em;
+ }
+-div.headerright {
++div#headerbox div.headerright {
+ display: table-cell;
+ font-weight: bold;
+ padding: 0.1em;
+ }
+-div.headerrightdate {
++div#headerbox div.headerrightdate {
+ color: rgb(120, 125, 129) !important;
+ display: table-cell;
+ font-weight: bold;
+ padding: 0.1em;
+ }
+-.actiontable {
++div#headerbox .actiontable {
+ display: table;
+ width: 100%;
+ }
+-div.actionrowtable {
++div#headerbox div.actionrowtable {
+ display:table-row;
+ }
+-div.theactioncell {
++div#headerbox div.theactioncell {
+ display: table-cell;
+ padding: 0px 2px; /* just some padding, if needed*/
+ white-space: pre; /* this will avoid line breaks*/
+ }
+-div.theactionbigcell{
++div#headerbox div.theactionbigcell{
+ display: table-cell;
+ width: 100%; /* this will shrink other cells */
+ }
+
+-#kmailContent {
++div#headerbox #kmailContent {
+ clear: both;
+ margin-top: 10px;
+ padding: 20px;
+--
+2.8.1
+
diff --git a/debian/patches/get-rid-of-not-needed-div.patch b/debian/patches/get-rid-of-not-needed-div.patch
new file mode 100644
index 0000000..53ce1bd
--- /dev/null
+++ b/debian/patches/get-rid-of-not-needed-div.patch
@@ -0,0 +1,40 @@
+From a97f99b2769d39ffa03a2cd2454f10ef93222486 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:42:33 +0200
+Subject: [PATCH] get rid of not needed div
+
+---
+ .../defaultgrantleeheaderstyleplugin/theme/5.2/header.html | 2 --
+ .../defaultgrantleeheaderstyleplugin/theme/5.2/style.css | 5 -----
+ 2 files changed, 7 deletions(-)
+
+diff --git a/plugins/messageviewerheaderplugins/defaultgrantleeheaderstyleplugin/theme/5.2/header.html b/plugins/messageviewerheaderplugins/defaultgrantleeheaderstyleplugin/theme/5.2/header.html
+index dfdf1f2..41c3d8e 100644
+--- a/plugins/messageviewerheaderplugins/defaultgrantleeheaderstyleplugin/theme/5.2/header.html
++++ b/plugins/messageviewerheaderplugins/defaultgrantleeheaderstyleplugin/theme/5.2/header.html
+@@ -1,6 +1,4 @@
+ <link href="{{ header.absoluteThemePath }}/style.css" rel="stylesheet" type="text/css" />
+-<div class="fancy header" id="cont">
+-</div>
+ <div id="kmailPage">
+ <div id="headerbox" dir="ltr">
+ {% if header.showMailAction %}
+diff --git a/plugins/messageviewerheaderplugins/defaultgrantleeheaderstyleplugin/theme/5.2/style.css b/plugins/messageviewerheaderplugins/defaultgrantleeheaderstyleplugin/theme/5.2/style.css
+index 9bde003..60e6597 100644
+--- a/plugins/messageviewerheaderplugins/defaultgrantleeheaderstyleplugin/theme/5.2/style.css
++++ b/plugins/messageviewerheaderplugins/defaultgrantleeheaderstyleplugin/theme/5.2/style.css
+@@ -2,11 +2,6 @@ body {
+ margin: 0;
+ padding: 0;
+ }
+-
+-div#cont {
+- padding: -5px;
+- margin: 0px;
+-}
+ table.outer {
+ display: inline;
+ position: fixed !important;
+--
+2.8.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 9ce42ef..1caf493 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,5 @@ upstream_add_copying_files.patch
remove_sh_extensions
spambayes.patch
set_icontheme.diff
+get-rid-of-not-needed-div.patch
+Do-not-allow-html-mail-to-use-css-that-only-should-b.patch
--
kdepim-addons packaging
More information about the pkg-kde-commits
mailing list