fixed cleaner tmp patch

3 files changed, 37 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5e051420d209..484695db0607 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = feedreader
 	pkgdesc = A simple feedreader client for web services like Tiny Tiny RSS and in the future others.
 	pkgver = 1.4.1
-	pkgrel = 2
+	pkgrel = 3
 	url = https://launchpad.net/feedreader
 	install = feedreader.install
 	arch = i686
@@ -24,7 +24,7 @@ pkgbase = feedreader
 	source = https://launchpad.net/feedreader/1.4/1.4.1/+download/FeedReader-1.4.1.tar.gz
 	source = patched_tmp_folder.patch
 	sha256sums = 1a0fcaf3d6bbd6bc75e3ef85e2d00e63ad85b150c566212de3b8f58decd0cfeb
-	sha256sums = 0050efaec8b31125b7e69a1e9490929982a891d032d3256705a28968eb835ccd
+	sha256sums = f00d16f3e0ed85171972c8c87fe8aec9058eb85273fd1523a50e40ead2f9cf17
 
 pkgname = feedreader
 
diff --git a/PKGBUILD b/PKGBUILD
index 47d8627eb57b..37857c4f98e5 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=feedreader
 pkgver=1.4.1
-pkgrel=2
+pkgrel=3
 pkgdesc='A simple feedreader client for web services like Tiny Tiny RSS and in the future others.'
 arch=('i686' 'x86_64')
 url='https://launchpad.net/feedreader'
@@ -16,7 +16,7 @@ conflicts=("${pkgname%-*}")
 install="${pkgname%-*}.install"
 source=('https://launchpad.net/feedreader/'${pkgver%.*}'/'${pkgver}'/+download/FeedReader-'${pkgver}'.tar.gz' patched_tmp_folder.patch)
 sha256sums=('1a0fcaf3d6bbd6bc75e3ef85e2d00e63ad85b150c566212de3b8f58decd0cfeb'
-            '0050efaec8b31125b7e69a1e9490929982a891d032d3256705a28968eb835ccd')
+            'f00d16f3e0ed85171972c8c87fe8aec9058eb85273fd1523a50e40ead2f9cf17')
 
 pkgver() {
   cd "${srcdir}"
diff --git a/patched_tmp_folder.patch b/patched_tmp_folder.patch
index df02d7e8cc81..df7202b3abb1 100644
--- a/patched_tmp_folder.patch
+++ b/patched_tmp_folder.patch
@@ -1,6 +1,6 @@
 diff -aur package.pristine/Changelog package.new/Changelog
 --- package.pristine/Changelog	2015-11-13 02:42:18.000000000 +0100
-+++ package.new/Changelog	2015-11-20 11:40:22.000000000 +0100
++++ package.new/Changelog	2015-11-20 11:56:00.412514000 +0100
 @@ -10,7 +10,7 @@
  - proper fullscreen mode for videos
  - support multiple share accounts of the same kind (e.g. two different pocket accounts)
@@ -12,22 +12,49 @@ diff -aur package.pristine/Changelog package.new/Changelog
  1.2:
 diff -aur package.pristine/src/Utils.vala package.new/src/Utils.vala
 --- package.pristine/src/Utils.vala	2015-11-16 23:16:13.000000000 +0100
-+++ package.new/src/Utils.vala	2015-11-20 11:40:22.000000000 +0100
-@@ -33,7 +33,7 @@
++++ package.new/src/Utils.vala	2015-11-20 11:56:00.412514000 +0100
+@@ -33,7 +33,16 @@
  				}
  				else if(Article.getHTML() != "" && Article.getHTML() != null)
  				{
 -					string filename = GLib.Environment.get_tmp_dir() + "/" + "articleHtml.XXXXXX";
-+					string filename = GLib.Environment.get_tmp_dir() + "/FeedReader/articleHtml.XXXXXX";
++					string tmp_path = GLib.Environment.get_tmp_dir() + "/FeedReader/";
++					var path = GLib.File.new_for_path(tmp_path);
++					try{
++						path.make_directory_with_parents();
++					}
++					catch(GLib.Error e){
++						//logger.print(LogMessage.DEBUG, e.message);
++					}
++
++					string filename = tmp_path + "articleHtml.XXXXXX";
  					int outputfd = GLib.FileUtils.mkstemp(filename);
  					try{
  						GLib.FileUtils.set_contents(filename, Article.getHTML());
-@@ -120,7 +120,7 @@
+@@ -120,7 +129,16 @@
          string title = "";
          doc->dump_memory_enc(out title);
  
 -        string filename = GLib.Environment.get_tmp_dir() + "/" + "articleHtml.XXXXXX";
-+        string filename = GLib.Environment.get_tmp_dir() + "/FeedReader/articleHtml.XXXXXX";
++		string tmp_path = GLib.Environment.get_tmp_dir() + "/FeedReader/";
++		var path = GLib.File.new_for_path(tmp_path);
++		try{
++			path.make_directory_with_parents();
++		}
++		catch(GLib.Error e){
++			//logger.print(LogMessage.DEBUG, e.message);
++		}
++
++		string filename = tmp_path + "articleHtml.XXXXXX";
          int outputfd = GLib.FileUtils.mkstemp(filename);
          try{
              GLib.FileUtils.set_contents(filename, title);
+@@ -154,7 +172,7 @@
+         }
+ #endif
+ 
+-        return output.strip().replace("\n", "");
++        return output.strip().replace("\n", " ");
+ #else
+ 		return old_title;
+ #endif