applied cleaner tmp patch

3 files changed, 42 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4985739987e1..5e051420d209 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 = 1
+	pkgrel = 2
 	url = https://launchpad.net/feedreader
 	install = feedreader.install
 	arch = i686
@@ -19,12 +19,12 @@ pkgbase = feedreader
 	depends = libgee
 	depends = json-glib
 	depends = libsecret
-	depends = libxml2
-	depends = rest
 	provides = feedreader
 	conflicts = 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
 
 pkgname = feedreader
 
diff --git a/PKGBUILD b/PKGBUILD
index ae6e1ce95608..47d8627eb57b 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,18 +4,19 @@
 
 pkgname=feedreader
 pkgver=1.4.1
-pkgrel=1
+pkgrel=2
 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'
 license=('GPL3')
-depends=('sqlite3' 'gtk3' 'webkit2gtk' 'libnotify' 'html2text-with-utf8' 'libsoup' 'libgee' 'json-glib' 'libsecret' 'libxml2' 'rest')
+depends=('sqlite3' 'gtk3' 'webkit2gtk' 'libnotify' 'html2text-with-utf8' 'libsoup' 'libgee' 'json-glib' 'libsecret')
 makedepends=('vala' 'gobject-introspection' 'cmake')
 provides=("${pkgname%-*}")
 conflicts=("${pkgname%-*}")
 install="${pkgname%-*}.install"
-source=('https://launchpad.net/feedreader/'${pkgver%.*}'/'${pkgver}'/+download/FeedReader-'${pkgver}'.tar.gz')
-sha256sums=('1a0fcaf3d6bbd6bc75e3ef85e2d00e63ad85b150c566212de3b8f58decd0cfeb')
+source=('https://launchpad.net/feedreader/'${pkgver%.*}'/'${pkgver}'/+download/FeedReader-'${pkgver}'.tar.gz' patched_tmp_folder.patch)
+sha256sums=('1a0fcaf3d6bbd6bc75e3ef85e2d00e63ad85b150c566212de3b8f58decd0cfeb'
+            '0050efaec8b31125b7e69a1e9490929982a891d032d3256705a28968eb835ccd')
 
 pkgver() {
   cd "${srcdir}"
@@ -27,7 +28,7 @@ build() {
   if [[ -d "${srcdir}/build" ]]; then
     rm -rf "${srcdir}/build"
   fi
-
+  patch -p1 -i $srcdir/patched_tmp_folder.patch
   mkdir "${srcdir}/build" && cd "${srcdir}/build"
   cmake -DCMAKE_INSTALL_PREFIX=/usr -DUSE_WEBKIT_4=ON -DWITH_LIBUNITY=OFF -DWITH_VILISTEXTUM=OFF ..
   make
diff --git a/patched_tmp_folder.patch b/patched_tmp_folder.patch
new file mode 100644
index 000000000000..df02d7e8cc81
--- /dev/null
+++ b/patched_tmp_folder.patch
@@ -0,0 +1,33 @@
+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
+@@ -10,7 +10,7 @@
+ - proper fullscreen mode for videos
+ - support multiple share accounts of the same kind (e.g. two different pocket accounts)
+ - fixed memory leaks
+-- option to ignore unknown CA's
++- option to ignore unknowns CA
+ - updated GrabberConfig files to upstream from fivefilters
+ 
+ 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 @@
+ 				}
+ 				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";
+ 					int outputfd = GLib.FileUtils.mkstemp(filename);
+ 					try{
+ 						GLib.FileUtils.set_contents(filename, Article.getHTML());
+@@ -120,7 +120,7 @@
+         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";
+         int outputfd = GLib.FileUtils.mkstemp(filename);
+         try{
+             GLib.FileUtils.set_contents(filename, title);