From 5f3eabd848657c26140fd65f06849c677061e47a Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <andre@pc-01.localdomain>
Date: Wed, 7 Mar 2012 15:06:26 -0200
Subject: libre/liferea-libre

---
 libre/liferea-libre/PKGBUILD                       | 36 ++++++----------------
 .../remove-non-free-suggestions.patch              | 22 +++++++------
 2 files changed, 23 insertions(+), 35 deletions(-)

diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD
index 8ee55b4ba..74eb223e1 100644
--- a/libre/liferea-libre/PKGBUILD
+++ b/libre/liferea-libre/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id$
+# $Id: PKGBUILD 144935 2011-12-11 03:21:39Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
-# Contributor: bitlord
+# Contributor (Parabola): bitlord
+# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
 
 pkgbasename=liferea
 pkgname=liferea-libre
-pkgver=1.6.6b
+pkgver=1.8.0
 pkgrel=1
 pkgdesc="A desktop news aggregator for online news feeds and weblogs"
 arch=('i686' 'x86_64')
@@ -13,35 +14,18 @@ provides=("liferea=$pkgver")
 replaces=('liferea')
 conflicts=('liferea')
 license=('GPL')
-depends=('gconf' 'libwebkit' 'libxslt' 'libglade' 'sqlite3' 'hicolor-icon-theme')
-makedepends=('pkg-config' 'intltool' 'lua' 'libnotify')
-optdepends=('lua: for lua scripting support'
-            'libnotify: for notification support')
+depends=('gconf' 'libwebkit' 'libnotify' 'libunique' 'json-glib' 'hicolor-icon-theme')
+makedepends=('intltool')
 options=('!libtool' '!emptydirs')
 install=liferea.install
-source=(http://repo.parabolagnulinux.org/other/$pkgname-$pkgver.tar.gz
-        libnotify-0.7.patch
+source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.gz
         remove-non-free-suggestions.patch)
-md5sums=('3e6a113a30f8d813c3a7ece4691d5afe'
-         'fca97e3316c1c51e0179c4c7dcce47a2'
-         'e138b67a6bc62d4ba0eb64b781105bf0')
-
-# source PKGBUILD ; mksource
-mksource() {
-    wget http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.gz \
-         -O - | tar xzf -
-
-    pushd liferea-$pkgver >/dev/null
-    patch -Np1 -i "../remove-non-free-suggestions.patch" || return 1
-    popd >/dev/null
-
-    tar cvzf $pkgname-$pkgver.tar.gz liferea-$pkgver/
-    rm -rvf liferea-$pkgver/
-}
+md5sums=('6313e3049b586be110c9402900609fe0'
+         'e2fdcbc485ce6ff7956c8527be152ca6')
 
 build() {
   cd "${srcdir}/liferea-${pkgver}"
-  patch -Np1 -i "$srcdir/libnotify-0.7.patch"
+  patch -Np1 -i "$srcdir/remove-non-free-suggestions.patch"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-schemas-install
   make
 }
diff --git a/libre/liferea-libre/remove-non-free-suggestions.patch b/libre/liferea-libre/remove-non-free-suggestions.patch
index 8d1809122..325017567 100644
--- a/libre/liferea-libre/remove-non-free-suggestions.patch
+++ b/libre/liferea-libre/remove-non-free-suggestions.patch
@@ -1,6 +1,6 @@
---- liferea-1.6.6b/src/ui/ui_prefs.c_orig	2011-06-23 01:33:39.761555322 +0200
-+++ liferea-1.6.6b/src/ui/ui_prefs.c	2011-06-23 01:38:02.121556890 +0200
-@@ -76,24 +76,10 @@
+--- liferea-1.8.0/src/browser.c_orig	2011-11-28 19:50:57.000000000 -0200
++++ liferea-1.8.0/src/browser.c	2012-03-07 14:49:31.862987204 -0200
+@@ -35,24 +35,16 @@
  		NULL, NULL
  	},
  	{
@@ -9,8 +9,12 @@
 -		NULL, "mozilla -remote openURL(%s)",
 -		NULL, "mozilla -remote 'openURL(%s,new-window)'",
 -		NULL, "mozilla -remote 'openURL(%s,new-tab)'"
--	},
--	{
++		"iceweasel", "Iceweasel", "iceweasel %s",
++		NULL, "iceweasel \"%s\"",
++		NULL, "iceweasel -new-window \"%s\"",
++		NULL, "iceweasel -new-tab \"%s\""
+ 	},
+ 	{
 -		/* tested with Firefox 1.5 and 2.0 */
 -		"firefox", "Firefox","firefox \"%s\"",
 -		NULL, "firefox -a firefox -remote \"openURL(%s)\"",
@@ -22,10 +26,10 @@
 -		"opera \"%s\"", "opera -remote \"openURL(%s)\"",
 -		"opera -newwindow \"%s\"", NULL,
 -		"opera -newpage \"%s\"", NULL
-+		"icecat", "IceCat","icecat \"%s\"",
-+		NULL, "icecat -a icecat -remote \"openURL(%s)\"",
-+		NULL, "icecat -a icecat -remote 'openURL(%s,new-window)'",
-+		NULL, "icecat -a icecat -remote 'openURL(%s,new-tab)'"
++		"icecat", "Icecat", "icecat %s",
++		NULL, "icecat \"%s\"",
++		NULL, "icecat -new-window \"%s\"",
++		NULL, "icecat -new-tab \"%s\""
  	},
  	{
  		"epiphany", "Epiphany","epiphany \"%s\"",
-- 
cgit v1.2.3-54-g00ecf