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

3 files changed, 75 insertions, 4 deletions

diff --git a/libre/kipi-plugins-libre/PKGBUILD b/libre/kipi-plugins-libre/PKGBUILD
new file mode 100644
index 000000000..dcbbdc492
--- /dev/null
+++ b/libre/kipi-plugins-libre/PKGBUILD
@@ -0,0 +1,59 @@
+# $Id: PKGBUILD 211141 2014-04-17 06:54:31Z andrea $
+# Maintainer: Ronald van Haren <ronald@archlinux.org>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Tobias Powalowski <tpowa@archlinux.org>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Contributor (Parabola): Márcio Silva <coadde@parabola.nu>
+
+pkgbase=digikam
+_pkgname=kipi-plugins
+pkgname=kipi-plugins-libre
+pkgver=3.5.0
+pkgrel=4
+pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam, without nonfree jAlbum and SimpleViewer support"
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL')
+url="http://www.digikam.org/"
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
+makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr'
+             'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin' 'libgphoto2'
+             'cmake' 'automoc4' 'doxygen' 'lensfun' 'qt-gstreamer' 'imagemagick' 'eigen')
+depends=('kdebase-runtime' 'kdepimlibs' 'libkdcraw' 'libkipi' 'libksane' 'libkexiv2')
+optdepends=('libkgeomap: Geolocalize tool'
+            'libmediawiki: MediaWiki Export plugin'
+            'libkvkontakte: VKontakte.ru Exporter plugin'
+            'libgpod: iPodExport plugin'
+            'opencv: Remove Red Eyes plugin'
+            'imagemagick: Video SlideShow plugin'
+            'qt-gstreamer: Video SlideShow plugin')
+options=('staticlibs')
+install=kipi-plugins.install
+source=("http://download.kde.org/stable/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2")
+sha1sums=('9e44fcf219312cbcbbaee0cc9a7f460a01769224')
+
+prepare() {
+  cd ${srcdir}/${pkgbase}-${pkgver}
+  sed -i '\|flashexport|d
+          \|jalbumexport|d
+         ' extra/kipi-plugins/CMakeLists.txt
+  cd ..
+  mkdir build
+}
+
+build() {
+  cd build
+  cmake ../${pkgbase}-${pkgver} \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_SKIP_RPATH=ON \
+    -DBUILD_tests=OFF \
+    -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=OFF
+  make
+}
+
+package() {
+  cd build/extra/kipi-plugins
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/libre/kipi-plugins-libre/kipi-plugins.install b/libre/kipi-plugins-libre/kipi-plugins.install
new file mode 100644
index 000000000..81ce5c4b0
--- /dev/null
+++ b/libre/kipi-plugins-libre/kipi-plugins.install
@@ -0,0 +1,12 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index 436f65ae3..ef8516155 100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 108676 2014-03-31 23:08:08Z seblu $
+# $Id: PKGBUILD 109662 2014-04-17 21:37:35Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
@@ -18,7 +18,7 @@ _basekernel=3.14
 #_sublevel=3
 #_pkgver=$_basekernel.$_sublevel
 pkgver=$_basekernel
-pkgrel=1
+pkgrel=2
 license=('GPL2')
 arch=('i686' 'x86_64' 'mips64el')
 url='http://linux-libre.fsfla.org/'
@@ -27,7 +27,7 @@ options=('!strip')
 # kernel source deps
 makedepends=('asciidoc' 'xmlto')
 # perf-libre deps
-makedepends+=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind' 'numactl')
+makedepends+=('perl' 'python2' 'libnewt' 'elfutils' 'libunwind' 'numactl')
 # cpupower-libre deps
 makedepends+=('pciutils')
 # usbip-libre deps
@@ -152,7 +152,7 @@ package_libtraceevent-libre() {
 
 package_perf-libre() {
   pkgdesc='Linux kernel performance auditing tool'
-  depends=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind' 'binutils'
+  depends=('perl' 'python2' 'libnewt' 'elfutils' 'libunwind' 'binutils'
            'numactl')
   replaces=('perf')  
   conflicts=('perf')