From af21b330575fd55d3e8092fd286141e55cdcb090 Mon Sep 17 00:00:00 2001 From: Andreas Grapentin Date: Sat, 20 Jan 2018 06:01:09 +0100 Subject: nonprism/digikam: updated to 5.8.0 --- nonprism/digikam/PKGBUILD | 62 +++++++++++++++++------------------------ nonprism/digikam/nonprism.patch | 25 +++++++++-------- 2 files changed, 38 insertions(+), 49 deletions(-) (limited to 'nonprism') diff --git a/nonprism/digikam/PKGBUILD b/nonprism/digikam/PKGBUILD index 47cdd1aa1..06d55ef0a 100644 --- a/nonprism/digikam/PKGBUILD +++ b/nonprism/digikam/PKGBUILD @@ -1,58 +1,46 @@ -# $Id: PKGBUILD 290817 2017-03-14 08:05:30Z arojas $ +# $Id$ # Maintainer (Arch): Ronald van Haren +# Maintainer (Arch): Antonio Rojas # Contributor (Arch): Andrea Scarpino # Contributor (Arch): Tobias Powalowski -# Maintainer: André Silva +# Contributor: Andreas Grapentin +# Contributor: André Silva # Contributor: Márcio Silva +# Contributor: jc_gargma + +# parabola changes and rationale: +# - remove libkvkontakte support for kipi-plugins pkgbase=digikam -pkgname=kipi-plugins -_pkgver=5.5.0 +pkgname=(kipi-plugins) +_pkgver=5.8.0 pkgver=${_pkgver//-/_} # for beta versions -pkgrel=1.parabola1.nonprism1 -pkgdesc="Digital photo management application for KDE" -arch=('i686' 'x86_64' 'armv7h') +pkgrel=1.nonprism1 +pkgdesc="An advanced digital photo management application" +arch=('x86_64' 'i686' 'armv7h') license=('GPL') url="http://www.digikam.org/" -replaces=("${pkgname}-libre" "${pkgname}-libre-nonprism") -conflicts=("${pkgname}-libre" "${pkgname}-libre-nonprism") -makedepends=('extra-cmake-modules' 'libkipi' 'libksane' 'liblqr' 'opencv' 'boost' - 'doxygen' 'lensfun' 'eigen' 'kdoctools' 'marble-common' 'kdesignerplugin' - 'kfilemetadata' 'akonadi-contacts' 'qtav' 'threadweaver' 'kcalcore' - 'knotifyconfig' 'libmediawiki' 'libkvkontakte') +makedepends=(extra-cmake-modules libkipi libksane liblqr opencv doxygen lensfun eigen boost kdoctools marble-common + kfilemetadata akonadi-contacts qtav threadweaver kcalcore knotifyconfig libmediawiki libkvkontakte) source=("http://download.kde.org/stable/${pkgbase}/${pkgbase}-${_pkgver}.tar.xz" "libre.patch" - "nonprism.patch" - '0001-optionally-enable-OpenGL.patch') -sha256sums=('df9cbf1b8dbfb9235cebc97e77c02fcb1498c5a905c7fd3b9fb42fd7accc6252' + "nonprism.patch") +sha256sums=('194a44cc3ca229d501acfba67a38d483d1d64069a85e0491dd28dc2b57091c6e' '80fbe434d326551f3dc029c5db3ad1b50e87870b03185467aa25a5c03764cc89' - '738eb494eefda0ddbc7c4fa2029f7c53db07bad370652dfefd0f126d09d0217f' - 'f6f234f430f02e058e12e48577f9d8441959e84b42f4e50d733706be8b214bf5') + 'e3d8ec4fd041a5545b7efef167d3b2ae6efc1f510832dabc7430ddfeb6b3c4ac') prepare() { mkdir -p build - # sv docs fail to build - sed -e '/sv/d' -i $pkgbase-$pkgver/doc-translated/CMakeLists.txt - - cd ${pkgbase}-${_pkgver} - patch -p1 -i ../libre.patch - patch -p1 -i ../nonprism.patch - - # OpenGL switch - if [[ "$CARCH" = arm* ]]; then - cd core - patch -p1 -i ${srcdir}/0001-optionally-enable-OpenGL.patch - fi +# fix freedom issues + cd $pkgbase-$_pkgver + patch -Np1 -i "$srcdir"/libre.patch + patch -Np1 -i "$srcdir"/nonprism.patch } build() { cd build - if [[ "$CARCH" = arm* ]]; then - local cmake_extra="-DENABLE_OPENGL=OFF" - fi - cmake ../${pkgbase}-${_pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ @@ -64,14 +52,14 @@ build() { -DENABLE_MYSQLSUPPORT=ON \ -DENABLE_OPENCV3=ON \ -DENABLE_APPSTYLES=ON \ - -DDIGIKAMSC_COMPILE_LIBKVKONTAKTE=OFF \ - $cmake_extra + -DENABLE_LEGACY=ON \ + -DDIGIKAMSC_COMPILE_LIBKVKONTAKTE=OFF make } package_kipi-plugins() { pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam, without nonfree suggestions and support for unsafe and dangerous for privacy protocols" - depends=('kio' 'libkipi') + depends=(kio libkipi) optdepends=('libmediawiki: MediaWiki Export plugin') cd build/extra diff --git a/nonprism/digikam/nonprism.patch b/nonprism/digikam/nonprism.patch index 1a6608a1a..779196f09 100644 --- a/nonprism/digikam/nonprism.patch +++ b/nonprism/digikam/nonprism.patch @@ -19,7 +19,7 @@ index a0ac4f4c6..23bf7450f 100644 tool-kmlexport.docbook Need to be created tool-maintenance.docbook Need to be created tool-mediawiki.docbook Need to be created -@@ -96,12 +90,8 @@ tool-panorama.docbook +@@ -97,12 +91,8 @@ tool-panorama.docbook tool-piwigoexport.docbook Need to be created tool-presentation.docbook tool-printwizard.docbook @@ -36,7 +36,7 @@ diff --git a/doc/digikam/index.docbook b/doc/digikam/index.docbook index 080275044..0fe7027c9 100644 --- a/doc/digikam/index.docbook +++ b/doc/digikam/index.docbook -@@ -169,21 +169,11 @@ +@@ -172,21 +172,11 @@ @@ -58,7 +58,7 @@ index 080275044..0fe7027c9 100644 -@@ -303,21 +293,11 @@ +@@ -311,21 +301,11 @@ &doc-tool-printwizard; &doc-tool-sendimages; @@ -187,18 +187,18 @@ index 63579cae7..9b8171ca3 100644 # Optional plugins results ---------------------------------------------------------------------------- -@@ -182,7 +180,6 @@ if(KF5Kipi_FOUND) - set(KIPIPLUGINS_CAN_BE_COMPILED false) +@@ -183,7 +181,6 @@ if(KF5Kipi_FOUND) endif() + PRINT_COMPONENT_COMPILE_STATUS("Legacy plugins" ENABLE_LEGACY) - PRINT_COMPONENT_COMPILE_STATUS("VKontakte" KF5Vkontakte_FOUND) PRINT_COMPONENT_COMPILE_STATUS("Mediawiki" KF5MediaWiki_FOUND) PRINT_COMPONENT_COMPILE_STATUS("FlashExport" KF5Archive_FOUND) -@@ -235,26 +232,13 @@ if(KF5Kipi_FOUND) - add_subdirectory(printimages) - add_subdirectory(kmlexport) - add_subdirectory(sendimages) +@@ -243,16 +240,7 @@ if(KF5Kipi_FOUND) + add_definitions(-DQT_NO_URL_CAST_FROM_STRING) + + add_subdirectory(common) - add_subdirectory(flickr) - add_subdirectory(dropbox) - add_subdirectory(facebook) @@ -209,10 +209,11 @@ index 63579cae7..9b8171ca3 100644 - add_subdirectory(imageshack) - add_subdirectory(yandexfotki) - add_subdirectory(googleservices) - add_subdirectory(jalbum) - if(KF5Archive_FOUND) - add_subdirectory(flashexport) + if(ENABLE_LEGACY) + add_subdirectory(printimages) +@@ -266,10 +254,6 @@ if(KF5Kipi_FOUND) + endif() - if(KF5Vkontakte_FOUND) -- cgit v1.2.3