From bc552b6863301fc4c1f2d672b6d35e1c0d2cdce0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Fri, 8 Jul 2016 18:27:47 -0300 Subject: kipi-plugins-5.0.0-1.parabola1{,.nonprism1}: updating version --- nonprism/kipi-plugins/PKGBUILD | 107 ++++++++++++++--------------------- nonprism/kipi-plugins/libre.patch | 58 +++++++++++++++++++ nonprism/kipi-plugins/nonprism.patch | 94 ++++++++++++++++++++++++++++++ 3 files changed, 195 insertions(+), 64 deletions(-) create mode 100644 nonprism/kipi-plugins/libre.patch create mode 100644 nonprism/kipi-plugins/nonprism.patch (limited to 'nonprism') diff --git a/nonprism/kipi-plugins/PKGBUILD b/nonprism/kipi-plugins/PKGBUILD index 0902ade31..6b45e6372 100644 --- a/nonprism/kipi-plugins/PKGBUILD +++ b/nonprism/kipi-plugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 266879 2016-05-04 19:52:28Z arojas $ +# $Id: PKGBUILD 271080 2016-07-06 10:08:49Z arojas $ # Maintainer (Arch): Ronald van Haren # Contributor (Arch): Andrea Scarpino # Contributor (Arch): Tobias Powalowski @@ -7,90 +7,69 @@ pkgbase=digikam pkgname=kipi-plugins -pkgver=4.14.0 -pkgrel=7.parabola1.nonprism1 -pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam, without nonfree jAlbum and SimpleViewer support and support for unsafe and dangerous for privacy protocols" +_pkgver=5.0.0 +pkgver=${_pkgver//-/_} +pkgrel=1.parabola1.nonprism1 +pkgdesc="Digital photo management application for KDE" arch=('i686' 'x86_64' 'armv7h') license=('GPL') url="http://www.digikam.org/" replaces=("${pkgname}-libre" "${pkgname}-libre-nonprism") conflicts=("${pkgname}-libre" "${pkgname}-libre-nonprism") -makedepends=('kdepimlibs4' 'libkexiv2_4' 'libkdcraw4' 'libkipi4' 'libksane4' 'liblqr' - 'opencv' 'boost' 'libgpod' 'hugin' 'libgphoto2' - 'cmake' 'automoc4' 'doxygen' 'lensfun' 'imagemagick' 'eigen' - 'libbaloo4' 'libpgf' 'libusb-compat' 'libkface4' 'libkgeomap4' 'libmediawiki') -depends=('kdebase-runtime' 'kdepimlibs4' 'libkdcraw4' 'libkipi4' 'libksane4' 'libkexiv2_4') -optdepends=('libkgeomap4: Geolocalize tool' - 'libmediawiki: MediaWiki Export plugin' - 'libgpod: iPodExport plugin' - 'opencv: Remove Red Eyes plugin' - 'imagemagick: Video SlideShow plugin' - 'hugin: panorama tools') -options=('staticlibs') -source=("http://download.kde.org/stable/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2" - lensfun-0.3.2.patch::"https://quickgit.kde.org/?p=digikam.git&a=commitdiff&h=0f15998&o=plain") -sha1sums=('08bbded5433e442dce8ac00eb301606ef0924e8c' - 'b2e262ea5060ad5ffd7d92d41a9badcea6e6c299') +makedepends=('extra-cmake-modules' 'libkipi' 'libksane' 'liblqr' 'opencv' 'boost' + 'opencv' 'doxygen' 'lensfun' 'eigen' 'kdoctools' 'marble' 'kdesignerplugin' + 'kfilemetadata' 'akonadi-contact' 'qt5-multimedia' 'threadweaver' 'kcalcore' + 'knotifyconfig' 'libmediawiki' 'kqoauth') +source=("http://download.kde.org/stable/${pkgbase}/${pkgbase}-${_pkgver}.tar.xz" + "libre.patch" + "nonprism.patch") +sha1sums=('e0dec2eba9ab3a51d632b69b3dd6daf8dca64a45' + 'ed2a01c4a837b50d3c1ad0d4758f2fa3bb44402f' + 'b6dfd32aa127a858d7df84ed5c821f9f0bb3bc72') prepare() { - cd ${srcdir}/${pkgbase}-${pkgver} + mkdir -p build - sed -i '\|flashexport|d - \|jalbumexport|d - \|imageshackexport|d - s| Facebook, and Imgur|| - \|QtKOAuth|d - \|Imgur|d - \|imgurexport|d - \|check the libkvkontakte version|,+18 d - \|vkontakte|,+1 d - \|LIBKVKONTAKTE|d - s| and YandexFotki|| - \|YandexFotki|d - \|yandexfotki|d - \|DlnaExport|d - \|dlnaexport|d - \|Facebook|d - \|facebook|d - \|flickrexport|d - \|picasawebexport|d - ' extra/kipi-plugins/CMakeLists.txt - sed -i '\|m_actionExport| s|true|false| - ' extra/kipi-plugins/smug/plugin_smug.cpp - sed -i '\|Remote Flickr Export plugin|,+2 d - \|flickrexport|d - ' doc/kipi-plugins/index.docbook +# Build fails + sed -e '/add_subdirectory(showfoto)/d' -i ${pkgbase}-${_pkgver}/doc-translated/digikam/CMakeLists.txt -# Fix build with lensfun 0.3.2 - cd core - patch -p1 -i "$srcdir"/lensfun-0.3.2.patch + cd ${pkgbase}-${_pkgver} + patch -p1 -i ../libre.patch + patch -p1 -i ../nonprism.patch } build() { - mkdir build cd build - cmake ../${pkgbase}-${pkgver} \ + + cmake ../${pkgbase}-${_pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON \ - -DBUILD_tests=OFF \ + -DBUILD_TESTING=OFF \ + -DENABLE_KFILEMETADATASUPPORT=ON \ + -DENABLE_MEDIAPLAYER=ON \ + -DENABLE_AKONADICONTACTSUPPORT=ON \ + -DENABLE_MYSQLSUPPORT=ON \ -DDIGIKAMSC_COMPILE_LIBKVKONTAKTE=OFF \ -DENABLE_OPENCV3=ON make } -package() { - cd build/extra/kipi-plugins - make DESTDIR="${pkgdir}" install +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') + optdepends=('libmediawiki: MediaWiki Export plugin') - cd ../../../build/po - make DESTDIR="${pkgdir}" install - # Put these in the relevant splitted packages - #rm "${pkgdir}"/usr/share/locale/kde4/*/LC_MESSAGES/libkgeomap.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 + cd build/extra + make DESTDIR="$pkgdir" install + cd $srcdir/build/doc/kipi-plugins + make DESTDIR="$pkgdir" install + cd $srcdir/build/doc-translated/kipi-plugins + make DESTDIR="pkgdir" install + cd $srcdir/build/po + make DESTDIR="$pkgdir" install - cd ../../build/doc/kipi-plugins - make DESTDIR="${pkgdir}" install +# Provided by digikam + rm "$pkgdir"/usr/share/locale/*/LC_MESSAGES/digikam.mo } diff --git a/nonprism/kipi-plugins/libre.patch b/nonprism/kipi-plugins/libre.patch new file mode 100644 index 000000000..6255727bb --- /dev/null +++ b/nonprism/kipi-plugins/libre.patch @@ -0,0 +1,58 @@ +diff --git a/extra/kipi-plugins/sendimages/emailsettings.h b/extra/kipi-plugins/sendimages/emailsettings.h +index 8f98ec5..4b55443 100644 +--- a/extra/kipi-plugins/sendimages/emailsettings.h ++++ b/extra/kipi-plugins/sendimages/emailsettings.h +@@ -64,10 +64,9 @@ public: + CLAWSMAIL, + EVOLUTION, + KMAIL, +- NETSCAPE, + SYLPHEED, + SYLPHEEDCLAWS, +- THUNDERBIRD ++ ICEDOVE + }; + + enum ImageSize +diff --git a/extra/kipi-plugins/sendimages/sendimages.cpp b/extra/kipi-plugins/sendimages/sendimages.cpp +index 498cf92..67b03f9 100644 +--- a/extra/kipi-plugins/sendimages/sendimages.cpp ++++ b/extra/kipi-plugins/sendimages/sendimages.cpp +@@ -593,18 +593,13 @@ bool SendImages::invokeMailAgent() + // More info about command lines options with Mozilla & co: + // http://www.mozilla.org/docs/command-line-args.html#Syntax_Rules + +- case EmailSettings::NETSCAPE: +- case EmailSettings::THUNDERBIRD: ++ case EmailSettings::ICEDOVE: + { + QString prog; + +- if (d->settings.emailProgram == EmailSettings::NETSCAPE) ++ if (d->settings.emailProgram == EmailSettings::ICEDOVE) + { +- prog = QLatin1String("netscape"); +- } +- else +- { +- prog = QLatin1String("thunderbird"); ++ prog = QLatin1String("icedove"); + } + + QStringList args; +diff --git a/extra/kipi-plugins/sendimages/settingswidget.cpp b/extra/kipi-plugins/sendimages/settingswidget.cpp +index 7e55726..fd8eec5 100644 +--- a/extra/kipi-plugins/sendimages/settingswidget.cpp ++++ b/extra/kipi-plugins/sendimages/settingswidget.cpp +@@ -96,10 +96,9 @@ SettingsWidget::SettingsWidget(QWidget* const parent) + d->mailAgentName->insertItem(EmailSettings::CLAWSMAIL, QLatin1String("Claws Mail")); + d->mailAgentName->insertItem(EmailSettings::EVOLUTION, QLatin1String("Evolution")); + d->mailAgentName->insertItem(EmailSettings::KMAIL, QLatin1String("KMail")); +- d->mailAgentName->insertItem(EmailSettings::NETSCAPE, QLatin1String("Netscape")); + d->mailAgentName->insertItem(EmailSettings::SYLPHEED, QLatin1String("Sylpheed")); + d->mailAgentName->insertItem(EmailSettings::SYLPHEEDCLAWS, QLatin1String("Sylpheed-Claws")); +- d->mailAgentName->insertItem(EmailSettings::THUNDERBIRD, QLatin1String("Thunderbird")); ++ d->mailAgentName->insertItem(EmailSettings::ICEDOVE, QLatin1String("Icedove")); + d->mailAgentName->setCurrentIndex(EmailSettings::DEFAULT); + d->mailAgentName->setWhatsThis(i18n("Select your preferred external email program here. " + "Default is the current email program set in KDE " diff --git a/nonprism/kipi-plugins/nonprism.patch b/nonprism/kipi-plugins/nonprism.patch new file mode 100644 index 000000000..72d6ced28 --- /dev/null +++ b/nonprism/kipi-plugins/nonprism.patch @@ -0,0 +1,94 @@ +diff --git a/doc/kipi-plugins/index.docbook b/doc/kipi-plugins/index.docbook +index 45f6406..ebafd76 100644 +--- a/doc/kipi-plugins/index.docbook ++++ b/doc/kipi-plugins/index.docbook +@@ -9,7 +9,6 @@ + + + +- + + + +@@ -121,9 +120,6 @@ The plugins available in this handbook are: + photograph on your image collections + + +-Remote Flickr Export plugin +- +- + The Gallery Export plugin is a tool for export image collections to a remote Gallery server + + +@@ -180,7 +176,6 @@ please contact the Kipi team mailing list at kde-imaging@kde.org. + &doc-convertimages; + &doc-effectimages; + &doc-filterimages; +-&doc-flickrexport; + &doc-geolocation; + &doc-imagesgallery; + &doc-imageviewer; +diff --git a/extra/kipi-plugins/CMakeLists.txt b/extra/kipi-plugins/CMakeLists.txt +index bdd3c18..e28ef8d 100644 +--- a/extra/kipi-plugins/CMakeLists.txt ++++ b/extra/kipi-plugins/CMakeLists.txt +@@ -109,7 +109,6 @@ find_package(KF5 ${KF5_MIN_VERSION} + + find_package(KF5 ${KF5_MIN_VERSION} + OPTIONAL_COMPONENTS +- IconThemes # for GoogleServices (KIO/PixmapLoader) + Archive # for FlashExport + KIO # Some kipi-plugins depends of KIO indeep.. + ) +@@ -136,8 +135,6 @@ if(KF5Kipi_FOUND) + # -- Optional dependencies detection required by some plugins ------------------------------------- + + DETECT_LIBMEDIAWIKI(5.0.0) # For Mediawiki. +- DETECT_LIBKVKONTAKTE(4.70.0) # For VKontakte. +- find_package(QtKOAuth) # For Imgur Auhtenticated API. + + # ================================================================================================== + # Log messages +@@ -158,8 +155,6 @@ if(KF5Kipi_FOUND) + PRINT_OPTIONAL_LIBRARY_STATUS("libkio" "https://projects.kde.org/projects/frameworks/kio" "(version >= ${KF5_MIN_VERSION})" "Kipi-plugins will be compiled without libkio support." KF5KIO_FOUND) + PRINT_OPTIONAL_LIBRARY_STATUS("libkarchive" "https://projects.kde.org/projects/frameworks/karchive" "(version >= ${KF5_MIN_VERSION})" "Kipi-plugins will be compiled without libkarchive support." KF5Archive_FOUND) + PRINT_OPTIONAL_LIBRARY_STATUS("libmediawiki" "https://projects.kde.org/projects/extragear/libs/libmediawiki" "(version >= ${KF5_MIN_VERSION})" "Kipi-plugins will be compiled without libmediawiki support." KF5MediaWiki_FOUND) +- PRINT_OPTIONAL_LIBRARY_STATUS("libkvkontakte" "https://projects.kde.org/projects/extragear/libs/libkvkontakte" "(version >= 4.70.0)" "Kipi-plugins will be compiled without libkvkontakte support." KF5Vkontakte_FOUND) +- PRINT_OPTIONAL_LIBRARY_STATUS("libqtkoauth" "https://github.com/kypeli/kQOAuth" "(version >= 0.97)" "Kipi-plugins will be compiled without libqtkoauth support." QTKOAUTH_FOUND) + + # Optional plugins results ---------------------------------------------------------------------------- + +@@ -175,7 +170,6 @@ if(KF5Kipi_FOUND) + set(KIPIPLUGINS_CAN_BE_COMPILED false) + endif() + +- PRINT_COMPONENT_COMPILE_STATUS("VKontakte" KF5Vkontakte_FOUND) + PRINT_COMPONENT_COMPILE_STATUS("Mediawiki" KF5MediaWiki_FOUND) + PRINT_COMPONENT_COMPILE_STATUS("FlashExport" KF5Archive_FOUND) + +@@ -230,25 +224,12 @@ if(KF5Kipi_FOUND) + add_subdirectory(printimages) + add_subdirectory(kmlexport) + add_subdirectory(sendimages) +- add_subdirectory(flickr) +- add_subdirectory(dropbox) +- add_subdirectory(facebook) +- add_subdirectory(imgur) + add_subdirectory(piwigo) +- add_subdirectory(rajce) +- add_subdirectory(smug) +- add_subdirectory(imageshack) +- add_subdirectory(yandexfotki) +- add_subdirectory(googleservices) + + if(KF5Archive_FOUND) + add_subdirectory(flashexport) + endif() + +- if(KF5Vkontakte_FOUND) +- add_subdirectory(vkontakte) +- endif() +- + if(KF5MediaWiki_FOUND) + add_subdirectory(mediawiki) + endif() -- cgit v1.2.3-2-g168b