From 8a08ad9b9cadc797617d6fc0806d4b8773a7a9e4 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 5 Sep 2014 00:31:11 -0300 Subject: liferea: remove libre suffix and add complex pkgrel --- libre/liferea-libre/PKGBUILD | 43 ------------------- libre/liferea-libre/libnotify-0.7.patch | 21 --------- libre/liferea-libre/liferea.install | 21 --------- .../remove-non-free-suggestions.patch | 50 ---------------------- libre/liferea/PKGBUILD | 41 ++++++++++++++++++ libre/liferea/libnotify-0.7.patch | 21 +++++++++ libre/liferea/liferea.install | 21 +++++++++ libre/liferea/remove-non-free-suggestions.patch | 50 ++++++++++++++++++++++ 8 files changed, 133 insertions(+), 135 deletions(-) delete mode 100644 libre/liferea-libre/PKGBUILD delete mode 100644 libre/liferea-libre/libnotify-0.7.patch delete mode 100644 libre/liferea-libre/liferea.install delete mode 100644 libre/liferea-libre/remove-non-free-suggestions.patch create mode 100644 libre/liferea/PKGBUILD create mode 100644 libre/liferea/libnotify-0.7.patch create mode 100644 libre/liferea/liferea.install create mode 100644 libre/liferea/remove-non-free-suggestions.patch (limited to 'libre') diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD deleted file mode 100644 index 0bd411f13..000000000 --- a/libre/liferea-libre/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 220652 2014-08-26 01:15:15Z eric $ -# Maintainer (Arch): Eric Bélanger -# Contributor: bitlord -# Contributor: André Silva - -_pkgname=liferea -pkgname=liferea-libre -pkgver=1.10.11 -pkgrel=1 -pkgdesc="A desktop news aggregator for online news feeds and weblogs, without nonfree suggestions" -arch=('i686' 'x86_64' 'mips64el') -url="http://liferea.sourceforge.net/" -provides=("liferea=$pkgver") -replaces=('liferea') -conflicts=('liferea') -license=('GPL') -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' - 'gst-plugins-base: for media player plugin support' - 'gst-plugins-good: for media player plugin support' - 'gst-plugins-bad: for media player plugin support') -options=('!emptydirs') -install=liferea.install -source=(https://github.com/lwindolf/liferea/releases/download/v${pkgver}/liferea-${pkgver}.tar.bz2 - remove-non-free-suggestions.patch) -sha1sums=('7ff8197989f4caad5f50c6b4c18ee19699ecf70c' - '855de60c91b5fee71c7ec88dd04b7d24a02dc0d1') - -build() { - cd liferea-${pkgver} - # remove nonfree suggestions - patch -Np1 -i "$srcdir/remove-non-free-suggestions.patch" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-schemas-compile - make -} - -package() { - cd liferea-${pkgver} - make DESTDIR="${pkgdir}" install -} diff --git a/libre/liferea-libre/libnotify-0.7.patch b/libre/liferea-libre/libnotify-0.7.patch deleted file mode 100644 index 6dbbffb87..000000000 --- a/libre/liferea-libre/libnotify-0.7.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -u -Nr liferea-1.6.5/src/notification/libnotify.c liferea-1.6.5-libnotify/src/notification/libnotify.c ---- liferea-1.6.5/src/notification/libnotify.c 2009-06-20 20:33:19.000000000 +0200 -+++ liferea-1.6.5-libnotify/src/notification/libnotify.c 2011-03-06 23:53:45.783336455 +0100 -@@ -150,7 +150,7 @@ - // notify_notification_update ( n, node_get_title(node_p), labelText_now_p, NULL); - // notify_notification_clear_actions(n); - -- n = notify_notification_new (node_get_title(node_p), labelText_now_p, NULL, NULL); -+ n = notify_notification_new (node_get_title(node_p), labelText_now_p, NULL); - - notify_notification_set_icon_from_pixbuf (n,node_get_icon(node_p)); - -@@ -244,7 +244,7 @@ - - labelSummary_p = g_strdup_printf (ngettext ("%s has %d new / updated headline\n", "%s has %d new / updated headlines\n", item_count), - node_get_title (node), item_count); -- n = notify_notification_new ( _("Feed Update"), labelSummary_p, NULL, NULL); -+ n = notify_notification_new ( _("Feed Update"), labelSummary_p, NULL); - g_free(labelSummary_p); - - notify_notification_set_icon_from_pixbuf (n, node_get_icon (node)); diff --git a/libre/liferea-libre/liferea.install b/libre/liferea-libre/liferea.install deleted file mode 100644 index 7fff91b49..000000000 --- a/libre/liferea-libre/liferea.install +++ /dev/null @@ -1,21 +0,0 @@ -pkgname=liferea - -post_install() { - 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() { - if [ -f usr/share/gconf/schemas/$pkgname.schemas ]; then - gconfpkg --uninstall $pkgname - fi -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/libre/liferea-libre/remove-non-free-suggestions.patch b/libre/liferea-libre/remove-non-free-suggestions.patch deleted file mode 100644 index 5024f19ee..000000000 --- a/libre/liferea-libre/remove-non-free-suggestions.patch +++ /dev/null @@ -1,50 +0,0 @@ -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 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\"" - }, - { -- "google-chrome", "Chrome", "google-chrome \"%s\"", -- NULL, NULL, -- NULL, NULL, -- NULL, NULL -- }, -- { -- "opera", "Opera", "opera \"%s\"", -- "opera \"%s\"", "opera -remote \"openURL(%s)\"", -- "opera -newwindow \"%s\"", NULL, -- "opera -newpage \"%s\"", NULL -+ "icecat", "Icecat", "icecat %s", -+ NULL, "icecat \"%s\"", -+ NULL, "icecat -new-window \"%s\"", -+ NULL, "icecat -new-tab \"%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, diff --git a/libre/liferea/PKGBUILD b/libre/liferea/PKGBUILD new file mode 100644 index 000000000..ecbd765f3 --- /dev/null +++ b/libre/liferea/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 220652 2014-08-26 01:15:15Z eric $ +# Maintainer (Arch): Eric Bélanger +# Contributor: bitlord +# Contributor: André Silva + +pkgname=liferea +pkgver=1.10.11 +pkgrel=1.parabola1 +pkgdesc="A desktop news aggregator for online news feeds and weblogs, without nonfree suggestions" +arch=('i686' 'x86_64' 'mips64el') +url="http://liferea.sourceforge.net/" +replaces=('liferea-libre') +conflicts=('liferea-libre') +license=('GPL') +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' + 'gst-plugins-base: for media player plugin support' + 'gst-plugins-good: for media player plugin support' + 'gst-plugins-bad: for media player plugin support') +options=('!emptydirs') +install=liferea.install +source=(https://github.com/lwindolf/liferea/releases/download/v${pkgver}/liferea-${pkgver}.tar.bz2 + remove-non-free-suggestions.patch) +sha1sums=('7ff8197989f4caad5f50c6b4c18ee19699ecf70c' + '855de60c91b5fee71c7ec88dd04b7d24a02dc0d1') + +build() { + cd liferea-${pkgver} + # remove nonfree suggestions + patch -Np1 -i "$srcdir/remove-non-free-suggestions.patch" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-schemas-compile + make +} + +package() { + cd liferea-${pkgver} + make DESTDIR="${pkgdir}" install +} diff --git a/libre/liferea/libnotify-0.7.patch b/libre/liferea/libnotify-0.7.patch new file mode 100644 index 000000000..6dbbffb87 --- /dev/null +++ b/libre/liferea/libnotify-0.7.patch @@ -0,0 +1,21 @@ +diff -u -Nr liferea-1.6.5/src/notification/libnotify.c liferea-1.6.5-libnotify/src/notification/libnotify.c +--- liferea-1.6.5/src/notification/libnotify.c 2009-06-20 20:33:19.000000000 +0200 ++++ liferea-1.6.5-libnotify/src/notification/libnotify.c 2011-03-06 23:53:45.783336455 +0100 +@@ -150,7 +150,7 @@ + // notify_notification_update ( n, node_get_title(node_p), labelText_now_p, NULL); + // notify_notification_clear_actions(n); + +- n = notify_notification_new (node_get_title(node_p), labelText_now_p, NULL, NULL); ++ n = notify_notification_new (node_get_title(node_p), labelText_now_p, NULL); + + notify_notification_set_icon_from_pixbuf (n,node_get_icon(node_p)); + +@@ -244,7 +244,7 @@ + + labelSummary_p = g_strdup_printf (ngettext ("%s has %d new / updated headline\n", "%s has %d new / updated headlines\n", item_count), + node_get_title (node), item_count); +- n = notify_notification_new ( _("Feed Update"), labelSummary_p, NULL, NULL); ++ n = notify_notification_new ( _("Feed Update"), labelSummary_p, NULL); + g_free(labelSummary_p); + + notify_notification_set_icon_from_pixbuf (n, node_get_icon (node)); diff --git a/libre/liferea/liferea.install b/libre/liferea/liferea.install new file mode 100644 index 000000000..7fff91b49 --- /dev/null +++ b/libre/liferea/liferea.install @@ -0,0 +1,21 @@ +pkgname=liferea + +post_install() { + 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() { + if [ -f usr/share/gconf/schemas/$pkgname.schemas ]; then + gconfpkg --uninstall $pkgname + fi +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/libre/liferea/remove-non-free-suggestions.patch b/libre/liferea/remove-non-free-suggestions.patch new file mode 100644 index 000000000..5024f19ee --- /dev/null +++ b/libre/liferea/remove-non-free-suggestions.patch @@ -0,0 +1,50 @@ +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 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\"" + }, + { +- "google-chrome", "Chrome", "google-chrome \"%s\"", +- NULL, NULL, +- NULL, NULL, +- NULL, NULL +- }, +- { +- "opera", "Opera", "opera \"%s\"", +- "opera \"%s\"", "opera -remote \"openURL(%s)\"", +- "opera -newwindow \"%s\"", NULL, +- "opera -newpage \"%s\"", NULL ++ "icecat", "Icecat", "icecat %s", ++ NULL, "icecat \"%s\"", ++ NULL, "icecat -new-window \"%s\"", ++ NULL, "icecat -new-tab \"%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, -- cgit v1.2.3