[arch-commits] Commit in digikam/trunk (PKGBUILD)

[Antonio Rojas]

    Date: Saturday, April 11, 2015 @ 13:05:41
  Author: arojas
Revision: 236262

Doc move rebuild, move kipi-plugins docs to kipi-plugins package, libkgeomap is now shipped with KDE Applications

Modified:
  digikam/trunk/PKGBUILD

----------+
 PKGBUILD |   39 ++++++++++-----------------------------
 1 file changed, 10 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-04-11 10:49:06 UTC (rev 236261)
+++ PKGBUILD	2015-04-11 11:05:41 UTC (rev 236262)
@@ -4,9 +4,9 @@
 # Contributor: Tobias Powalowski <tpowa at archlinux.org>
 
 pkgbase=digikam
-pkgname=('digikam' 'kipi-plugins' 'libkgeomap' 'libkvkontakte' 'libmediawiki')
+pkgname=('digikam' 'kipi-plugins' 'libkvkontakte' 'libmediawiki')
 pkgver=4.9.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Digital photo management application for KDE"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -14,7 +14,7 @@
 makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr'
              'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin' 'libgphoto2'
              'cmake' 'automoc4' 'doxygen' 'lensfun' 'qt-gstreamer' 'imagemagick' 'eigen' 
-	     'libbaloo4' 'libpgf' 'libusb-compat' 'libkface')
+	     'libbaloo4' 'libpgf' 'libusb-compat' 'libkface' 'libkgeomap')
 source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
 sha1sums=('d44ab133f152b84599507dd6a02aef4b22033dd4')
 
@@ -26,9 +26,6 @@
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_SKIP_RPATH=ON \
     -DBUILD_tests=OFF \
-    -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=OFF \
-    -DDIGIKAMSC_USE_PRIVATE_SHAREDLIBS=ON \
-    -DDIGIKAMSC_COMPILE_LIBKGEOMAP=ON \
     -DDIGIKAMSC_COMPILE_LIBKVKONTAKTE=ON \
     -DDIGIKAMSC_COMPILE_LIBMEDIAWIKI=ON 
   make
@@ -44,10 +41,12 @@
 
   cd build/core
   make DESTDIR="${pkgdir}" install
-  cd ../../build/doc
+  cd ../../build/doc/digikam/digikam
   make DESTDIR="${pkgdir}" install
-  cd ../../build/po
+  cd ../showfoto
   make DESTDIR="${pkgdir}" install
+  cd ../../../../build/po
+  make DESTDIR="${pkgdir}" install
 
   # Put these in the relevant splitted packages
   rm "${pkgdir}"/usr/share/locale/kde4/*/LC_MESSAGES/kipiplugin*.mo
@@ -56,27 +55,6 @@
   rm "${pkgdir}"/usr/share/locale/kde4/*/LC_MESSAGES/libkipi.mo
 }
 
-package_libkgeomap() {
-  pkgdesc="A wrapper around world map components for browsing and arranging photos on a map"
-  depends=('kdelibs' 'kdeedu-marble')
-
-  cd build/extra/libkgeomap
-  make DESTDIR="${pkgdir}" install
-
-  cd ../../../build/po
-  make DESTDIR="${pkgdir}" install
-
-  # No (localized) documentation for libkgeomap in 4.9.0
-  rm -rf "${pkgdir}"/usr/share/locale
-
-  ## Put these in the relevant splitted packages
-  #rm "${pkgdir}"/usr/share/locale/kde4/*/LC_MESSAGES/kipiplugin*.mo
-  #rm "${pkgdir}"/usr/share/locale/kde4/*/LC_MESSAGES/digikam.mo
-  ## Fix conflicts with kde-l10n-* (FS#33762)
-  #rm "${pkgdir}"/usr/share/locale/kde4/*/LC_MESSAGES/libkipi.mo
-
-}
-
 package_libkvkontakte() {
   pkgdesc="KDE C++ library for asynchronous interaction with vkontakte.rusocial network"
   depends=('kdelibs' 'qjson')
@@ -116,4 +94,7 @@
   rm "${pkgdir}"/usr/share/locale/kde4/*/LC_MESSAGES/digikam.mo
   # Fix conflicts with kde-l10n-* (FS#33762)
   rm "${pkgdir}"/usr/share/locale/kde4/*/LC_MESSAGES/libkipi.mo
+
+  cd ../../build/doc/kipi-plugins
+  make DESTDIR="${pkgdir}" install
 }