Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

6 files changed, 53 insertions, 44 deletions

diff --git a/libre/atool-libre/PKGBUILD b/libre/atool-libre/PKGBUILD
index 0745630ad..3af247bcf 100644
--- a/libre/atool-libre/PKGBUILD
+++ b/libre/atool-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: PKGBUILD 78820 2012-10-25 06:47:28Z foutrelis $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: leif_thande <leif.thande@gmail.com>
 # Contributor: tranquility <trankas@gmail.com>
@@ -8,8 +8,8 @@
 _pkgname=atool
 pkgname=atool-libre
 pkgver=0.39.0
-pkgrel=1
-pkgdesc="A script for managing file archives of various types"
+pkgrel=1.1
+pkgdesc="A script for managing file archives of various types, without nonfree unace recommendation"
 arch=('any')
 url="http://www.nongnu.org/atool/"
 license=('GPL3')
@@ -31,7 +31,6 @@ optdepends=('bzip2: for using atool with bzip2 compressed archives'
 source=(http://savannah.nongnu.org/download/$_pkgname/$_pkgname-$pkgver.tar.gz)
 sha256sums=('aaf60095884abb872e25f8e919a8a63d0dabaeca46faeba87d12812d6efc703b')
 
-
 build() {
   cd ${srcdir}/${_pkgname}-${pkgver}
 
diff --git a/libre/bfgminer-libre/PKGBUILD b/libre/bfgminer-libre/PKGBUILD
index b37990c09..88f78e318 100644
--- a/libre/bfgminer-libre/PKGBUILD
+++ b/libre/bfgminer-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 93080 2013-06-24 09:39:28Z tredaelli $
+# $Id: PKGBUILD 94236 2013-07-17 13:44:25Z tredaelli $
 # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
 # Contributor: Andy Weidenbaum <archbaum@gmail.com>
 
 _pkgname=bfgminer
 pkgname=bfgminer-libre
-pkgver=3.1.1
+pkgver=3.1.3
 pkgrel=1
 pkgdesc="Bitcoin miner featuring overclocking, monitoring, fan speed control and remote management. For FPGA/GPU/CPU Bitcoin mining, without nonfree OpenCL recommendation."
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,8 +18,8 @@ license=('GPL3')
 options=(!libtool)
 source=(http://luke.dashjr.org/programs/bitcoin/files/$_pkgname/$pkgver/$_pkgname-$pkgver.tbz2
         remove-dangerous-rpath.patch)
-sha256sums=('3c70b017b6c02e22864d4b597ef19608ca3221c9d2547215c5bd05418561a2a3'
-            'c47eb443b870262e3e1a5d6441a06f72c9ca06c0abae459ab577a3f289a91e7a')
+sha256sums=('07964687daf8c6ba0a11f349b6b139e4d35078cdd013935f9331b28feced0500'
+            'd26d07ca23ae25798c4db37cfda1a6a76f22d06e73efab1ddf62b3e1a7eef04c')
 
 prepare() {
   cd "$srcdir"/$_pkgname-$pkgver
diff --git a/libre/bfgminer-libre/remove-dangerous-rpath.patch b/libre/bfgminer-libre/remove-dangerous-rpath.patch
index b56cb21ba..abd815141 100644
--- a/libre/bfgminer-libre/remove-dangerous-rpath.patch
+++ b/libre/bfgminer-libre/remove-dangerous-rpath.patch
@@ -4,7 +4,7 @@
  	])
  else
  	libblkmaker_CFLAGS='-Ilibblkmaker'
--	libblkmaker_LDFLAGS='-Llibblkmaker/.libs -Wl,-rpath,libblkmaker/.libs'
+-	libblkmaker_LDFLAGS='-Llibblkmaker/.libs -Wl,-rpath,\$$ORIGIN/libblkmaker/.libs'"$origin_LDFLAGS"
 +	libblkmaker_LDFLAGS='-Llibblkmaker/.libs'
  	libblkmaker_LIBS='-lblkmaker_jansson-0.1 -lblkmaker-0.1'
  	AC_CONFIG_SUBDIRS([libblkmaker])
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,