diff options
Diffstat (limited to 'libre/kipi-plugins')
| -rw-r--r-- | libre/kipi-plugins/PKGBUILD | 85 | ||||
| -rw-r--r-- | libre/kipi-plugins/libre.patch | 58 |
2 files changed, 100 insertions, 43 deletions
diff --git a/libre/kipi-plugins/PKGBUILD b/libre/kipi-plugins/PKGBUILD index e2c8e34cb..c78e37762 100644 --- a/libre/kipi-plugins/PKGBUILD +++ b/libre/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 <ronald@archlinux.org> # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org> # Contributor (Arch): Tobias Powalowski <tpowa@archlinux.org> @@ -7,68 +7,67 @@ pkgbase=digikam pkgname=kipi-plugins -pkgver=4.14.0 -pkgrel=7.parabola1 -pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam, without nonfree jAlbum and SimpleViewer support" +_pkgver=5.0.0 +pkgver=${_pkgver//-/_} +pkgrel=1.parabola1 +pkgdesc="Digital photo management application for KDE" arch=('i686' 'x86_64' 'armv7h') license=('GPL') url="http://www.digikam.org/" replaces=("${pkgname}-libre") conflicts=("${pkgname}-libre") -makedepends=('kdepimlibs4' 'libkexiv2_4' 'libkdcraw4' 'libkipi4' 'libksane4' 'liblqr' - 'opencv' 'boost' 'libgpod' 'libkvkontakte' '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' - 'libkvkontakte: VKontakte.ru Exporter 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' 'libkvkontakte' 'kqoauth') +source=("http://download.kde.org/stable/${pkgbase}/${pkgbase}-${_pkgver}.tar.xz" + "libre.patch") +sha1sums=('e0dec2eba9ab3a51d632b69b3dd6daf8dca64a45' + 'ed2a01c4a837b50d3c1ad0d4758f2fa3bb44402f') prepare() { - cd ${srcdir}/${pkgbase}-${pkgver} + mkdir -p build - sed -i '\|flashexport|d - \|jalbumexport|d - ' extra/kipi-plugins/CMakeLists.txt +# 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 } 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 \ -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" + depends=('kio' 'libkipi') + optdepends=('libmediawiki: MediaWiki Export plugin' + 'libkvkontakte: VKontakte.ru Exporter plugin' + 'kqoauth: OAuth authentication for imgur') - 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/libre/kipi-plugins/libre.patch b/libre/kipi-plugins/libre.patch new file mode 100644 index 000000000..6255727bb --- /dev/null +++ b/libre/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. " + "<b>Default</b> is the current email program set in KDE " |