diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-09 17:15:33 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-09 17:15:33 +0100 |
| commit | 81c145bbc94619d18db270991d31912a3d50c43b (patch) | |
| tree | d4019392a513b226493ade11b1486d73dbb1e68e /libre/liferea-libre | |
| parent | 4290dec175736d43c7df289c599f553c469f3678 (diff) | |
| parent | 0a7c64736c0b026c3105928d89500a8af1ad5eac (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/recoll/PKGBUILD
core/dnsutils/PKGBUILD
core/tzdata/PKGBUILD
extra/cabal-install/PKGBUILD
extra/feh/PKGBUILD
extra/icedtea-web/PKGBUILD
extra/indent/PKGBUILD
extra/kdebase-konsole/PKGBUILD
extra/kdebase-runtime/PKGBUILD
extra/kdebase-workspace/PKGBUILD
extra/kdepim/PKGBUILD
extra/kdesdk/PKGBUILD
extra/ktorrent/PKGBUILD
extra/libktorrent/PKGBUILD
libre/mplayer-libre/PKGBUILD
multilib/lib32-libxau/PKGBUILD
multilib/lib32-mpg123/PKGBUILD
multilib/wine/PKGBUILD
staging/kdenetwork/PKGBUILD
staging/kdepim/PKGBUILD
testing/bluez/PKGBUILD
testing/xf86-input-evdev/PKGBUILD
Diffstat (limited to 'libre/liferea-libre')
| -rw-r--r-- | libre/liferea-libre/PKGBUILD | 36 | ||||
| -rw-r--r-- | libre/liferea-libre/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 76c631b72..8ff32c4c2 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.1b pkgrel=1 pkgdesc="A desktop news aggregator for online news feeds and weblogs" arch=('i686' 'x86_64' 'mips64el') @@ -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=('70f27bfda41ff5b3b4e49c49c9dc88af' + '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\"", |