Update to 1.4.0-final

3 files changed, 15 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a1e0aa919af9..ffef66e0c3a7 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 = 5
+	pkgver = 1.4
+	pkgrel = 1
 	url = https://launchpad.net/feedreader
 	install = feedreader.install
 	arch = i686
@@ -21,13 +21,10 @@ pkgbase = feedreader
 	depends = libsecret
 	depends = libxml2
 	depends = rest
-	optdepends = gnome-keyring: needed for authentification in Cinnamon, Gnome
 	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
+	source = https://launchpad.net/feedreader/1.4/1.4-final/+download/FeedReader-1.4.tar.gz
+	sha256sums = 707efe7a309704bc3cd361533e3699a81f591619a5295f5fc4902fe556aede4f
 
 pkgname = feedreader
 
diff --git a/PKGBUILD b/PKGBUILD
index 6b85e9dc2384..331c4427a60a 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,40 +3,38 @@
 # Contributor: Jan Lukas Gernert (JeanLuc) <https://launchpad.net/~eviltwin1>
 
 pkgname=feedreader
-pkgver=1.2.1
-pkgrel=5
+pkgver=1.4
+pkgrel=1
 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')
-optdepends=('gnome-keyring: needed for authentification in Cinnamon, Gnome')
 makedepends=('vala' 'gobject-introspection' 'cmake')
 provides=("${pkgname%-*}")
 conflicts=("${pkgname%-*}")
 install="${pkgname%-*}.install"
-source=('https://launchpad.net/feedreader/'${pkgver%.*}'/'${pkgver}'/+download/FeedReader-'${pkgver}'.tar.gz' $pkgname.patch)
-sha256sums=('cb24d6dcef46080f2aa61fdc1b0187a8c52aedf913e6f63325ee46c631e5c87a'
-            '4f1ad2f9085930c9436b534fd24e3a40ff026cc24133a645ea09428c7e5143ef')
+source=('https://launchpad.net/feedreader/'${pkgver}'/'${pkgver}'-final/+download/FeedReader-'${pkgver}'.tar.gz')
+sha256sums=('707efe7a309704bc3cd361533e3699a81f591619a5295f5fc4902fe556aede4f')
 
 pkgver() {
-  cd "${srcdir}/FeedReader-${pkgver}"
+  cd "${srcdir}"
 }
 
 ##Build without Libunity (-DWITH_LIBUNITY=OFF)
 build() {
-  cd "${srcdir}/FeedReader-${pkgver}"
-  if [[ -d "${srcdir}/FeedReader-${pkgver}/build" ]]; then
-    rm -rf "${srcdir}/FeedReader-${pkgver}/build"
+  cd "${srcdir}"
+  if [[ -d "${srcdir}/build" ]]; then
+    rm -rf "${srcdir}/build"
   fi
-  patch -p1 -i $srcdir/$pkgname.patch
-  mkdir "${srcdir}/FeedReader-${pkgver}/build" && cd "${srcdir}/FeedReader-${pkgver}/build"
+
+  mkdir "${srcdir}/build" && cd "${srcdir}/build"
   cmake -DCMAKE_INSTALL_PREFIX=/usr -DUSE_WEBKIT_4=ON -DWITH_LIBUNITY=OFF ..
   make
 }
 
 package() {
-  cd "${srcdir}/FeedReader-${pkgver}/build"
+  cd "${srcdir}/build"
   make DESTDIR="${pkgdir}" install
 }
 
diff --git a/feedreader.patch b/feedreader.patch
deleted file mode 100644
index 92bded35bd97..000000000000
--- a/feedreader.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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);
- 		});