Merge branch 'master' of gparabola:abslibre/abslibre-pre-mips64el

Conflicts:
	libre/audacious-plugins-libre/PKGBUILD
	libre/linux-libre/PKGBUILD

8 files changed, 55 insertions, 32 deletions

diff --git a/community/goaccess/PKGBUILD b/community/goaccess/PKGBUILD
index 0d3a76514..578f85e1a 100644
--- a/community/goaccess/PKGBUILD
+++ b/community/goaccess/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 102738 2013-12-18 10:42:12Z fyan $
+# $Id: PKGBUILD 105872 2014-02-17 01:59:42Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Josh VanderLinden <arch@cloudlery.com>
 # Contributor: Nicolas Storme <nicolas@atelier-web.com>
 
 pkgname=goaccess
-pkgver=0.7
+pkgver=0.7.1
 pkgrel=1
 pkgdesc="An open source real-time web log analyzer and interactive viewer"
 arch=('i686' 'x86_64' 'mips64el')
@@ -24,4 +24,4 @@ package() {
   make prefix="$pkgdir/usr" install
 }
 
-sha512sums=('0817f6b7429d464fdd2070941b4bf6abaa5398a4b720e31af5af8fd8cd41169e5b71f90157101121cc904d06fb5bd6c7a109c4260fe8f829a19a75ff4b489146')
+sha512sums=('219e15693d45bc6d98a38b7c4387e29cd01a113580b127f4035bff32f3bce1b0f02ffb3dd5748893a8aa808f8a30085f19bd2c0667093bb7ba498eb60631183e')
diff --git a/community/libfm/PKGBUILD b/community/libfm/PKGBUILD
index 35699fa8f..e0bdadfc0 100644
--- a/community/libfm/PKGBUILD
+++ b/community/libfm/PKGBUILD
@@ -1,29 +1,29 @@
-# $Id: PKGBUILD 99838 2013-10-31 02:00:46Z allan $
-# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# $Id: PKGBUILD 105876 2014-02-17 13:45:08Z bpiotrowski $
+# Maintainer:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: Unknown47 <unknown47r@gmail.com>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 
 pkgname=libfm
-pkgver=1.1.2.2
-pkgrel=2
+pkgver=1.1.4
+pkgrel=1
 pkgdesc='Library for file management'
 url='http://pcmanfm.sourceforge.net/'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 groups=('lxde')
-install=libfm.install
-depends=('gtk2' 'menu-cache' 'shared-mime-info' 'udisks' 'desktop-file-utils')
+depends=('gtk2' 'menu-cache' 'udisks' 'desktop-file-utils' 'libexif')
 makedepends=('intltool')
-source=(http://downloads.sourceforge.net/pcmanfm/$pkgname-$pkgver.tar.gz)
-md5sums=('ea3d09b23ef4c37cb84ae57ea16b8f08')
+install=libfm.install
+source=(http://downloads.sourceforge.net/pcmanfm/libfm-$pkgver.tar.xz)
+md5sums=('fd3ff9174e097ab3fd619e4a10fd822a')
 
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr \
     --sysconfdir=/etc \
     --enable-udisks \
-    --with-gnu-ld 
+    --with-gnu-ld
   make LDFLAGS+=' -lgobject-2.0 -lglib-2.0'
 }
 
@@ -33,5 +33,5 @@ package() {
 
   # Temporary fix to FS#32361
   rm -rf "$pkgdir"/usr/include/libfm
-  mv "$pkgdir"/usr/include/libfm-1.0/ "$pkgdir"/usr/include/libfm 
+  mv "$pkgdir"/usr/include/libfm-1.0/ "$pkgdir"/usr/include/libfm
 }
diff --git a/community/linux-tools/02-archlinux-paths.patch b/community/linux-tools/02-archlinux-paths.patch
new file mode 100644
index 000000000..223e7d783
--- /dev/null
+++ b/community/linux-tools/02-archlinux-paths.patch
@@ -0,0 +1,21 @@
+# Seblu was here
+--- a/tools/perf/config/Makefile	2014-02-13 23:00:14.000000000 +0100
++++ b/tools/perf/config/Makefile	2014-02-17 20:01:33.370539725 +0100
+@@ -561,7 +561,7 @@
+ bindir = $(prefix)/$(bindir_relative)
+ mandir = share/man
+ infodir = share/info
+-perfexecdir = libexec/perf-core
++perfexecdir = lib/perf
+ sharedir = $(prefix)/share
+ template_dir = share/perf-core/templates
+ htmldir = share/doc/perf-doc
+@@ -573,7 +573,7 @@
+ ETC_PERFCONFIG = etc/perfconfig
+ endif
+ ifeq ($(IS_X86_64),1)
+-lib = lib64
++lib = lib
+ else
+ lib = lib
+ endif
diff --git a/community/linux-tools/PKGBUILD b/community/linux-tools/PKGBUILD
index bce68a7bd..ab6c183fc 100644
--- a/community/linux-tools/PKGBUILD
+++ b/community/linux-tools/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 104448 2014-01-21 01:11:29Z seblu $
+# $Id: PKGBUILD 105884 2014-02-17 19:22:22Z seblu $
 # Maintainer: Sébastien Luttringer
 
 pkgbase=linux-tools
@@ -14,7 +14,7 @@ pkgname=(
   'x86_energy_perf_policy'
 )
 pkgver=3.13
-pkgrel=1
+pkgrel=2
 license=('GPL2')
 arch=('i686' 'x86_64')
 url='http://www.kernel.org'
@@ -32,24 +32,28 @@ makedepends+=('glib2' 'sysfsutils')
 makedepends+=('ncurses')
 groups=("$pkgbase")
 source=("http://ftp.kernel.org/pub/linux/kernel/v3.x/linux-$pkgver.tar.xz"
-        #"http://ftp.kernel.org/pub/linux/kernel/v3.x/patch-$pkgver.3.xz"
+        "http://ftp.kernel.org/pub/linux/kernel/v3.x/patch-$pkgver.3.xz"
         'cpupower.default'
         'cpupower.systemd'
         'cpupower.service'
         'usbipd.service'
-        '01-fix-perf-python.patch')
+        '01-fix-perf-python.patch'
+        '02-archlinux-paths.patch')
 # http://www.kernel.org/pub/linux/kernel/v3.x/sha256sums.asc
 sha256sums=('4d5e5eee5f276424c32e9591f1b6c971baedc7b49f28ce03d1f48b1e5d6226a2'
+            '6d54f1dcd4d9441644a7ef4445f6633158e666fddaa6f06bb6656ab2ff4509d4'
             '4fa509949d6863d001075fa3e8671eff2599c046d20c98bb4a70778595cd1c3f'
             'fbf6e0ce6eb0ef15703fe212958de6ca46e62188900b5e9f9272ed3cc9cfd54e'
             'a89284d0ecb556ca53a66d1c2087b5fd6d0a901ab2769cd3aebb93f4478905dc'
             '2e187734d8aec58a3046d79883510d779aa93fb3ab20bd3132c1a607ebe5498f'
-            'fce128f5e0abfa6916d5cb881456d892d1b163b9639166a4c6c1d53e4dc5086a')
+            'fce128f5e0abfa6916d5cb881456d892d1b163b9639166a4c6c1d53e4dc5086a'
+            'eb866a589a26b1979ffb2fe08be09417e277a4befac34bdb279a6bb3a27b0570')
 
 prepare() {
   cd linux-$pkgver
-  #patch -N -p1 -i "$srcdir/patch-$pkgver.5"
+  patch -N -p1 -i "$srcdir/patch-$pkgver.3"
   patch -N -p1 -i "$srcdir/01-fix-perf-python.patch"
+  patch -N -p1 -i "$srcdir/02-archlinux-paths.patch"
 }
 
 build() {
diff --git a/community/roxterm/PKGBUILD b/community/roxterm/PKGBUILD
index 11614da4a..dd13a0d2d 100644
--- a/community/roxterm/PKGBUILD
+++ b/community/roxterm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 104490 2014-01-21 20:41:40Z ttoepper $
+# $Id: PKGBUILD 105882 2014-02-17 19:03:35Z ttoepper $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 
 pkgname=roxterm
-pkgver=2.8.1
+pkgver=2.8.2
 pkgrel=1
 pkgdesc='Tabbed, VTE-based terminal emulator'
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,9 +14,9 @@ makedepends=('docbook-xsl' 'xmlto' 'po4a' 'python2' 'python2-lockfile' 'imagemag
 install=roxterm.install
 source=("http://downloads.sourceforge.net/roxterm/roxterm-$pkgver.tar.bz2"
         "http://downloads.sourceforge.net/roxterm/roxterm-$pkgver.tar.bz2.sign")
-md5sums=('cf5aa488cc382ec0df8b3a856707d245'
+md5sums=('62376327fe92071ad1f306dbe6ac82fa'
          'SKIP')
-sha1sums=('45535957cec6936d259dc8ae693f2ab4b148bde6'
+sha1sums=('fcde0b09f6ff02c5ec93a528e870e139d814b529'
           'SKIP')
 
 
diff --git a/community/zathura-pdf-mupdf/PKGBUILD b/community/zathura-pdf-mupdf/PKGBUILD
index cfa6445a6..c9d75602e 100644
--- a/community/zathura-pdf-mupdf/PKGBUILD
+++ b/community/zathura-pdf-mupdf/PKGBUILD
@@ -4,8 +4,8 @@
 # Contributor: Moritz Lipp <mlq@pwmt.org>
 
 pkgname=zathura-pdf-mupdf
-pkgver=0.2.5
-pkgrel=3
+pkgver=0.2.6
+pkgrel=1
 pkgdesc="Adds pdf support to zathura by using the mupdf library"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://pwmt.org/projects/zathura/plugins/zathura-pdf-mupdf/"
@@ -14,7 +14,7 @@ depends=('mupdf>=1.3' 'zathura'
 	 'jbig2dec' 'openjpeg2')
 conflicts=('zathura-pdf-poppler')
 source=("https://pwmt.org/projects/zathura/plugins/download/$pkgname-$pkgver.tar.gz")
-md5sums=('42dcdf2511ffc8f87ca6baba6c566f91')
+md5sums=('5102e416aecc2a14d78cc9c83d529b39')
 
 build() {
   make -C "${srcdir}/$pkgname-$pkgver"
diff --git a/community/zathura/PKGBUILD b/community/zathura/PKGBUILD
index 428687660..f646f0fd7 100644
--- a/community/zathura/PKGBUILD
+++ b/community/zathura/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 101400 2013-11-24 20:34:57Z spupykin $
+# $Id: PKGBUILD 105878 2014-02-17 17:01:28Z spupykin $
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: ML <neldoreth>
 
 pkgname=zathura
-pkgver=0.2.6
+pkgver=0.2.7
 pkgrel=1
 pkgdesc="a document viewer"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ optdepends=('zathura-djvu' 'zathura-pdf-poppler' 'zathura-pdf-mupdf' 'zathura-ps
 install=zathura.install
 source=(http://pwmt.org/projects/zathura/download/zathura-$pkgver.tar.gz
 	bash-completion)
-md5sums=('d155a66ec1862550dfde5a50e3dd6d01'
+md5sums=('53124af80e974283a6678319a62e6666'
          'cac20c37f0e77ba62a8138788f4ccabb')
 
 build() {
diff --git a/community/zathura/zathura.install b/community/zathura/zathura.install
index 1ff3c64cd..bce670aff 100644
--- a/community/zathura/zathura.install
+++ b/community/zathura/zathura.install
@@ -1,7 +1,5 @@
 post_install() {
-  which gtk-update-icon-cache >/dev/null && \
-	[ -d usr/share/icons/hicolor ] && \
-	gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
   update-desktop-database -q
 }