diff options
Diffstat (limited to 'libre/liferea-libre')
| -rw-r--r-- | libre/liferea-libre/PKGBUILD | 20 | ||||
| -rw-r--r-- | libre/liferea-libre/liferea.install | 13 | ||||
| -rw-r--r-- | libre/liferea-libre/remove-non-free-suggestions.patch | 47 |
3 files changed, 45 insertions, 35 deletions
diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD index 4126d4d01..6377a9032 100644 --- a/libre/liferea-libre/PKGBUILD +++ b/libre/liferea-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 188905 2013-06-25 03:54:44Z eric $ +# $Id: PKGBUILD 190022 2013-07-13 02:26:08Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Contributor (Parabola): bitlord # Contributor (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=liferea pkgname=liferea-libre -pkgver=1.8.15 +pkgver=1.10.0 pkgrel=1 pkgdesc="A desktop news aggregator for online news feeds and weblogs, without nonfree suggestions" arch=('i686' 'x86_64') @@ -14,28 +14,26 @@ provides=("liferea=$pkgver") replaces=('liferea') conflicts=('liferea') license=('GPL') -depends=('gconf' 'webkitgtk2' 'libnotify' 'libunique' 'json-glib' 'hicolor-icon-theme' - 'desktop-file-utils') +depends=('webkitgtk' 'libnotify' 'json-glib' 'libpeas' 'python2-gobject' + 'gnome-icon-theme' 'desktop-file-utils') makedepends=('intltool') +optdepends=('gnome-keyring: for keyring plugin support' + 'libgnome-keyring: for keyring plugin support') options=('!libtool' '!emptydirs') install=liferea.install source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.bz2 remove-non-free-suggestions.patch) -sha1sums=('9a86773996d61d03c03e9a5137a2c0a3e2539f4f' - '0d68c567c3d37932a49709c58c37c3f138fd19cb') +sha1sums=('aac8e1dac30361758e3565cfddfd317f9f60b64a' + '855de60c91b5fee71c7ec88dd04b7d24a02dc0d1') build() { cd liferea-${pkgver} patch -Np1 -i "$srcdir/remove-non-free-suggestions.patch" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-schemas-install + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-schemas-compile make } package() { cd liferea-${pkgver} make DESTDIR="${pkgdir}" install - - install -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${_pkgname}.schemas" "${pkgdir}"/etc/gconf/schemas/*.schemas - rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas } diff --git a/libre/liferea-libre/liferea.install b/libre/liferea-libre/liferea.install index 327c567d2..7fff91b49 100644 --- a/libre/liferea-libre/liferea.install +++ b/libre/liferea-libre/liferea.install @@ -1,24 +1,21 @@ pkgname=liferea post_install() { - usr/sbin/gconfpkg --install ${pkgname} + glib-compile-schemas usr/share/glib-2.0/schemas gtk-update-icon-cache -q -t -f usr/share/icons/hicolor update-desktop-database -q } pre_upgrade() { - pre_remove $1 + if [ -f usr/share/gconf/schemas/$pkgname.schemas ]; then + gconfpkg --uninstall $pkgname + fi } post_upgrade() { post_install $1 } -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} - post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-desktop-database -q + post_install $1 } diff --git a/libre/liferea-libre/remove-non-free-suggestions.patch b/libre/liferea-libre/remove-non-free-suggestions.patch index 325017567..5024f19ee 100644 --- a/libre/liferea-libre/remove-non-free-suggestions.patch +++ b/libre/liferea-libre/remove-non-free-suggestions.patch @@ -1,28 +1,29 @@ ---- 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 @@ +diff --git a/src/browser.c b/src/browser.c +index f91901f..28b0c2b 100644 +--- a/src/browser.c ++++ b/src/browser.c +@@ -35,23 +35,16 @@ static struct browser browsers[] = { NULL, NULL }, { -- /* tested with SeaMonkey 1.0.6 */ -- "mozilla", "Mozilla", "mozilla %s", -- NULL, "mozilla -remote openURL(%s)", -- NULL, "mozilla -remote 'openURL(%s,new-window)'", -- NULL, "mozilla -remote 'openURL(%s,new-tab)'" +- /* tested with Firefox 1.5 and 2.0 */ +- "firefox", "Firefox", "firefox \"%s\"", +- NULL, "firefox -a firefox -remote \"openURL(%s)\"", +- NULL, "firefox -a firefox -remote 'openURL(%s,new-window)'", +- NULL, "firefox -a firefox -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)\"", -- NULL, "firefox -a firefox -remote 'openURL(%s,new-window)'", -- NULL, "firefox -a firefox -remote 'openURL(%s,new-tab)'" -- }, +- "google-chrome", "Chrome", "google-chrome \"%s\"", +- NULL, NULL, +- NULL, NULL, +- NULL, NULL +- }, - { -- "opera", "Opera","opera \"%s\"", +- "opera", "Opera", "opera \"%s\"", - "opera \"%s\"", "opera -remote \"openURL(%s)\"", - "opera -newwindow \"%s\"", NULL, - "opera -newpage \"%s\"", NULL @@ -32,4 +33,18 @@ + NULL, "icecat -new-tab \"%s\"" }, { - "epiphany", "Epiphany","epiphany \"%s\"", + "epiphany", "Epiphany", "epiphany \"%s\"", +@@ -60,13 +53,6 @@ static struct browser browsers[] = { + "epiphany -n \"%s\"", NULL + }, + { +- /* tested with SeaMonkey 1.0.6 */ +- "mozilla", "Mozilla", "mozilla %s", +- NULL, "mozilla -remote openURL(%s)", +- NULL, "mozilla -remote 'openURL(%s,new-window)'", +- NULL, "mozilla -remote 'openURL(%s,new-tab)'" +- }, +- { + "konqueror", "Konqueror", "kfmclient openURL \"%s\"", + NULL, NULL, + NULL, NULL, |