summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@lavabit.com>2013-07-17 21:01:21 -0300
committerAndré Fabian Silva Delgado <emulatorman@lavabit.com>2013-07-17 21:01:21 -0300
commitfd376937c1bb4ad0d82620ce04ef072552c59b73 (patch)
tree2ee38add9f6e06fe28064984caec85173ff78467
parent8b4ec8acf58895cc5635819467fd900e1ad07cd6 (diff)
downloadabslibre-fd376937c1bb4ad0d82620ce04ef072552c59b73.tar.gz
abslibre-fd376937c1bb4ad0d82620ce04ef072552c59b73.tar.bz2
abslibre-fd376937c1bb4ad0d82620ce04ef072552c59b73.zip
liferea-libre: adapting remove-non-free-suggestions.patch for 1.10.1 version
-rw-r--r--libre/liferea-libre/PKGBUILD2
-rw-r--r--libre/liferea-libre/remove-non-free-suggestions.patch47
2 files changed, 32 insertions, 17 deletions
diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD
index aa28de647..6377a9032 100644
--- a/libre/liferea-libre/PKGBUILD
+++ b/libre/liferea-libre/PKGBUILD
@@ -24,7 +24,7 @@ install=liferea.install
source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.bz2
remove-non-free-suggestions.patch)
sha1sums=('aac8e1dac30361758e3565cfddfd317f9f60b64a'
- '0d68c567c3d37932a49709c58c37c3f138fd19cb')
+ '855de60c91b5fee71c7ec88dd04b7d24a02dc0d1')
build() {
cd liferea-${pkgver}
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,