Update mail-client/roundcube-1.0.0 with fix for draft autosaving bug

3 files changed, 46 insertions, 2 deletions

diff --git a/mail-client/roundcube/Manifest b/mail-client/roundcube/Manifest
index 0d612a24..4e3412d6 100644
--- a/mail-client/roundcube/Manifest
+++ b/mail-client/roundcube/Manifest
@@ -1,5 +1,6 @@
 AUX postinstall-en-0.6.txt 2218 SHA256 f40b5134e13206e0abc325ec28bc0d42d8f233efc0a86304d985845e06377067 SHA512 d13c7abf8eb4b35b882bb873768ae6b307f23b8bada9bbeb2efe511edb5999c7f44bfb69248132d84aff15bc1994078bd43f9319524be5fac926336be3ab257c WHIRLPOOL d824191a8a5fe4852768eb10e5c8b2d06d3664ba93698c9836a4b338b20c0adac69f0f960fb3ac27b8b5dd1a468cb9da2815ad3f1fa684f6c6cddeb7a9137837
 AUX postupgrade-en-0.6.txt 1271 SHA256 110724101fb7f712fec3e44023d1562de235dee4578acd5be5846bdf2e510c18 SHA512 424b4df770080cc2e245804f59320c1df1802d1daf6e21c778d8f78e16a19233a01e8ea81f69accf97b56134dc0ada3d128daa931fb83e11886b081794908223 WHIRLPOOL e2f31106ce49daa4bb2f90c7a4d7867447ec279160d99177de58a3e2f7362821a049c1ee8202188f231544654e7c28fd5bdb7a5bf9d7597700e9fc4a78248a9a
+AUX roundcube-1.0.0-draft-autosave.patch 1352 SHA256 a53951a62dce9e1ad61290a2b63be5dde4b42d45bc35880edf700d8b1f84a6c0 SHA512 441f616d620d7ebbc5abf20766509e05a40a38ae7bf4a60feecc7be47fc19448019f894fc2d6c776762f12424766cc9b3d3c2acc90d98ef8426d2225898589a4 WHIRLPOOL 37ec61efc6e76508a6d6421c57353fa5ee41f56d41de411cca10b86149e8b39200ff6ebf5a1d0447867b45d9a3af94af8e6385b15bef18211f4bddc2b8090b2c
 DIST composer.phar 960311 SHA256 1c73973d7cfb73f3e6b425b943a3e1459f5199984f37f008c48cf2b671dd3f2b SHA512 98cef9f7bd1b5c3f8dd1bc1fd7e1778701cb7ad2fb720bc9f47fff3d70a58b4a94de75c97702f7f0680fbdb6fc20bb86a07362220056680f91a5a34ca5ba0fd8 WHIRLPOOL 6c54c69c27e01f4f003bb3e63372babe64d00ec0cfb3d9ab8185869e22d6fd5e0a88fa05da1baccc93c41f584a6decdda8505449540eb9b4024e632889887dcf
 DIST roundcubemail-1.0.0.tar.gz 3975691 SHA256 cfe4b1b66f32149d7727a6ae2ec2aa0c6c1388c9d22fd5b6da2e78bdbaac8dc8 SHA512 32ad828aba192ae1773d3e28070d9824a1676ffdeb96ba60d8b00ba4f208ec41cad20289e1cf5934fb59e5fb40932b8560a80a09d15cfa94097139395110f0a2 WHIRLPOOL d6c4bb19ba76a5a7e8d0f1a08c23ce400c42149adc298a80ce6cf2aeba9a93db475fa2eb5211c3ebc0c417a8622a00d73852b9c7d8440b415e4e3787642c0d64
-EBUILD roundcube-1.0.0.ebuild 2494 SHA256 523a0678cf163032fe9013f15636e6c28d12bbd2211a587f24d32104b95f0b9a SHA512 6d2ad9a7683f263ae6872a4eaae03fc14fbfbc00f52d844195d80a4e63ae7a15f67681802fbe4f2a2eb86bc709190b276267a56c13cd07df0d842688ff1e1608 WHIRLPOOL a122fa45742c491ce31dff868f7ac0aabf8e7c4245866967beb4b67bdc876235701c9d3d25070c08f0a9f4119cfa8645f7b98c07893bdeca9795136d9016848c
+EBUILD roundcube-1.0.0.ebuild 2914 SHA256 ee8cc5fcb27b1e2be42493f4e632ea790dcb430f8b43e176252a7c8dde6e616a SHA512 2adcac91cea5ec736e2767d85b42b111e7c15448ecd8ea27c9745005f5e029758fcbc0ab8df04a71a0a94545828382135c3e988ba67561f6610a99c2f04a2144 WHIRLPOOL 919e06a5308a86f6b89ae7b421bc68d96e2b4370e88d0bbe18156a9e83bf840c5f7c50c09ce3af4ce43477b39fa664e6fe5c8b285df35a18197b47b895a47933
diff --git a/mail-client/roundcube/files/roundcube-1.0.0-draft-autosave.patch b/mail-client/roundcube/files/roundcube-1.0.0-draft-autosave.patch
new file mode 100644
index 00000000..325c179b
--- /dev/null
+++ b/mail-client/roundcube/files/roundcube-1.0.0-draft-autosave.patch
@@ -0,0 +1,31 @@
+diff --git a/program/js/app.js b/program/js/app.js
+index eb86aa9..be937c0 100644
+--- a/program/js/app.js
++++ b/program/js/app.js
+@@ -3638,9 +3638,12 @@ function rcube_webmail()
+       $("input[name='_draft_saveid']").val(id);
+ 
+       // reset history of hidden iframe used for saving draft (#1489643)
+-      if (window.frames['savetarget'] && window.frames['savetarget'].history) {
++      // but don't do this on timer-triggered draft-autosaving (#1489789)
++      if (window.frames['savetarget'] && window.frames['savetarget'].history && !this.draft_autosave_submit) {
+         window.frames['savetarget'].history.back();
+       }
++
++      this.draft_autosave_submit = false;
+     }
+ 
+     // always remove local copy upon saving as draft
+@@ -3650,7 +3653,11 @@ function rcube_webmail()
+   this.auto_save_start = function()
+   {
+     if (this.env.draft_autosave)
+-      this.save_timer = setTimeout(function(){ ref.command("savedraft"); }, this.env.draft_autosave * 1000);
++      this.draft_autosave_submit = false;
++      this.save_timer = setTimeout(function(){
++          ref.draft_autosave_submit = true;  // set auto-saved flag (#1489789)
++          ref.command("savedraft");
++      }, this.env.draft_autosave * 1000);
+ 
+     // save compose form content to local storage every 5 seconds
+     if (!this.local_save_timer && window.localStorage) {
diff --git a/mail-client/roundcube/roundcube-1.0.0.ebuild b/mail-client/roundcube/roundcube-1.0.0.ebuild
index 4a7b7bb5..0a3d129c 100644
--- a/mail-client/roundcube/roundcube-1.0.0.ebuild
+++ b/mail-client/roundcube/roundcube-1.0.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit webapp
+inherit eutils webapp
 
 MY_PN=${PN}mail
 MY_P=${MY_PN}-${PV/_/-}
@@ -22,6 +22,9 @@ LICENSE="GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain"
 KEYWORDS="amd64 arm ~hppa ppc ~ppc64 ~sparc x86"
 IUSE="ldap +mysql plugins postgres sqlite ssl spell"
 
+DEPEND="|| ( net-misc/wget net-misc/curl )
+	app-arch/unzip"
+
 RDEPEND="virtual/httpd-php
 	>=dev-lang/php-5.3[crypt,gd,iconv,json,ldap?,pdo,postgres?,session,sockets,ssl?,xml,unicode]
 	>=dev-php/PEAR-Crypt_GPG-1.4.0_beta1
@@ -35,6 +38,15 @@ need_httpd_cgi
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
+	epatch "${FILESDIR}"/roundcube-1.0.0-draft-autosave.patch || die "epatch failed"
+	if [[ -x bin/jsshrink.sh ]]; then
+		einfo "Patching bin/jsshrink.sh ..."
+		sed -ie "/^JAR_DIR=/s|'/tmp'|'${T}'|" bin/jsshrink.sh || die "Updating jsshrink.sh failed"
+		ebegin "Rebuilding patched JavaScript source"
+		bin/jsshrink.sh
+		eend $? "jsshrink failed: $?"
+	fi
+
 	cp config/config.inc.php{.sample,} || die
 	cp composer.json{-dist,} || die