added patch

3 files changed, 35 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 814fbd0cadbf..41ac5f49c456 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.2.1
-	pkgrel = 4
+	pkgrel = 5
 	url = https://launchpad.net/feedreader
 	install = feedreader.install
 	arch = i686
@@ -19,10 +19,14 @@ pkgbase = feedreader
 	depends = libgee
 	depends = json-glib
 	depends = libsecret
+	depends = libxml2
+	depends = rest
 	provides = feedreader
 	conflicts = feedreader
 	source = https://launchpad.net/feedreader/1.2/1.2.1/+download/FeedReader-1.2.1.tar.gz
+	source = feedreader.patch
 	sha256sums = cb24d6dcef46080f2aa61fdc1b0187a8c52aedf913e6f63325ee46c631e5c87a
+	sha256sums = 4f1ad2f9085930c9436b534fd24e3a40ff026cc24133a645ea09428c7e5143ef
 
 pkgname = feedreader
 
diff --git a/PKGBUILD b/PKGBUILD
index 903b93724f8e..ed8a46231a36 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,18 +4,19 @@
 
 pkgname=feedreader
 pkgver=1.2.1
-pkgrel=4
+pkgrel=5
 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')
+depends=('sqlite3' 'gtk3' 'webkit2gtk' 'libnotify' 'html2text-with-utf8' 'libsoup' 'libgee' 'json-glib' 'libsecret' 'libxml2' 'rest')
 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=('cb24d6dcef46080f2aa61fdc1b0187a8c52aedf913e6f63325ee46c631e5c87a')
+source=('https://launchpad.net/feedreader/'${pkgver%.*}'/'${pkgver}'/+download/FeedReader-'${pkgver}'.tar.gz' $pkgname.patch)
+sha256sums=('cb24d6dcef46080f2aa61fdc1b0187a8c52aedf913e6f63325ee46c631e5c87a'
+            '4f1ad2f9085930c9436b534fd24e3a40ff026cc24133a645ea09428c7e5143ef')
 
 pkgver() {
   cd "${srcdir}/FeedReader-${pkgver}"
@@ -27,6 +28,7 @@ build() {
   if [[ -d "${srcdir}/FeedReader-${pkgver}/build" ]]; then
     rm -rf "${srcdir}/FeedReader-${pkgver}/build"
   fi
+  patch -p1 -i $srcdir/$pkgname.patch
   mkdir "${srcdir}/FeedReader-${pkgver}/build" && cd "${srcdir}/FeedReader-${pkgver}/build"
   cmake -DCMAKE_INSTALL_PREFIX=/usr -DUSE_WEBKIT_4=ON -DWITH_LIBUNITY=OFF ..
   make
diff --git a/feedreader.patch b/feedreader.patch
new file mode 100644
index 000000000000..92bded35bd97
--- /dev/null
+++ b/feedreader.patch
@@ -0,0 +1,24 @@
+diff -aur package.pristine/src/Widgets/MainWindow.vala package.new/src/Widgets/MainWindow.vala
+--- package.pristine/src/Widgets/MainWindow.vala	2015-09-04 19:03:37.000000000 +0200
++++ package.new/src/Widgets/MainWindow.vala	2015-10-01 13:48:01.918659394 +0200
+@@ -252,7 +252,7 @@
+ 			settings_state.set_int("articlelist-new-rows", 0);
+ 			settings_state.set_enum("show-articles", m_headerbar.getArticleListState());
+ 			settings_state.set_boolean("no-animations", true);
+-			settings_state.set_string("search-term", m_headerbar.getSearchTerm());
++			//settings_state.set_string("search-term", m_headerbar.getSearchTerm());
+ 			settings_state.set_int("articleview-scrollpos", m_content.getArticleViewScrollPos());
+ 
+ 			settings_readability.set_boolean("is-logged-in", false);
+diff -aur package.pristine/src/Widgets/ReaderHeaderbar.vala package.new/src/Widgets/ReaderHeaderbar.vala
+--- package.pristine/src/Widgets/ReaderHeaderbar.vala	2015-09-04 19:03:37.000000000 +0200
++++ package.new/src/Widgets/ReaderHeaderbar.vala	2015-10-01 13:48:24.288344471 +0200
+@@ -131,7 +131,7 @@
+ 
+ 		m_search = new Gtk.SearchEntry();
+ 		m_search.placeholder_text = _("Search Articles");
+-		m_search.text = settings_state.get_string("search-term");
++		//m_search.text = settings_state.get_string("search-term");
+ 		m_search.search_changed.connect(() => {
+ 			search_term(m_search.text);
+ 		});