From 9982546f0e9acb64dbb6883434d0125dfc8cfd51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Fri, 14 Nov 2014 13:14:50 -0200 Subject: kipi-plugins-4.5.0-1.parabola1{,.nonprism1}: updating version --- libre/kipi-plugins/PKGBUILD | 20 +++++----- libre/kipi-plugins/digikam_libkexiv2.patch | 53 --------------------------- nonprism/kipi-plugins/PKGBUILD | 20 +++++----- nonprism/kipi-plugins/digikam_libkexiv2.patch | 53 --------------------------- 4 files changed, 18 insertions(+), 128 deletions(-) delete mode 100644 libre/kipi-plugins/digikam_libkexiv2.patch delete mode 100644 nonprism/kipi-plugins/digikam_libkexiv2.patch diff --git a/libre/kipi-plugins/PKGBUILD b/libre/kipi-plugins/PKGBUILD index ab0e0f6a3..f8ff85570 100644 --- a/libre/kipi-plugins/PKGBUILD +++ b/libre/kipi-plugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 225564 2014-11-03 12:36:10Z ronald $ +# $Id: PKGBUILD 226241 2014-11-14 13:41:17Z ronald $ # Maintainer (Arch): Ronald van Haren # Contributor (Arch): Andrea Scarpino # Contributor (Arch): Tobias Powalowski @@ -7,7 +7,7 @@ pkgbase=digikam pkgname=kipi-plugins -pkgver=4.4.0 +pkgver=4.5.0 pkgrel=1.parabola1 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') @@ -17,7 +17,8 @@ replaces=("${pkgname}-libre") conflicts=("${pkgname}-libre") makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr' 'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin' 'libgphoto2' - 'cmake' 'automoc4' 'doxygen' 'lensfun' 'qt-gstreamer' 'imagemagick' 'eigen') + 'cmake' 'automoc4' 'doxygen' 'lensfun' 'qt-gstreamer' 'imagemagick' 'eigen' + 'libbaloo4' 'libpgf') depends=('kdebase-runtime' 'kdepimlibs' 'libkdcraw' 'libkipi' 'libksane' 'libkexiv2') optdepends=('libkgeomap: Geolocalize tool' 'libmediawiki: MediaWiki Export plugin' @@ -28,29 +29,26 @@ optdepends=('libkgeomap: Geolocalize tool' 'qt-gstreamer: Video SlideShow plugin') options=('staticlibs') install=kipi-plugins.install -source=("http://download.kde.org/stable/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2" "digikam_libkexiv2.patch") -sha1sums=('1feb43120addda314e09761440ec2058e430171c' - '39a09a8e7de1612eb47f3ef0966c6fa02b7e3284') +source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('ba735f4b7bb0437c1676141ab78ea958e46f135e') prepare() { cd ${srcdir}/${pkgbase}-${pkgver} sed -i '\|flashexport|d \|jalbumexport|d ' extra/kipi-plugins/CMakeLists.txt - cd .. - mkdir build - cd ${pkgbase}-${pkgver}/core - patch -Np1 -i "${srcdir}/digikam_libkexiv2.patch" } build() { + mkdir 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 + -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=OFF \ + -DDIGIKAMSC_USE_PRIVATE_SHAREDLIBS=ON make } diff --git a/libre/kipi-plugins/digikam_libkexiv2.patch b/libre/kipi-plugins/digikam_libkexiv2.patch deleted file mode 100644 index 018ce67a5..000000000 --- a/libre/kipi-plugins/digikam_libkexiv2.patch +++ /dev/null @@ -1,53 +0,0 @@ -commit f6945f23e0ed1e11f26e2c7e62b02baa8cfa640e -Author: Pino Toscano -Date: Tue Oct 14 22:26:19 2014 +0200 - - fix libkexiv2 version for AltLangStrEdit::textEdit() - - it is part of current libkexiv2/master only (i.e. post 4.14.x, which - is 2.3.x) - -diff --git a/libs/imageproperties/captionedit.cpp b/libs/imageproperties/captionedit.cpp -index 88413fc..70bdb6d 100644 ---- a/libs/imageproperties/captionedit.cpp -+++ b/libs/imageproperties/captionedit.cpp -@@ -202,7 +202,7 @@ void CaptionEdit::slotAuthorChanged(const QString& text) - - MsgTextEdit* CaptionEdit::textEdit() const - { --#if KEXIV2_VERSION >= 0x020302 -+#if KEXIV2_VERSION >= 0x020400 - return d->altLangStrEdit->textEdit(); - #else - return 0; -diff --git a/libs/imageproperties/imagedescedittab.cpp b/libs/imageproperties/imagedescedittab.cpp -index ebfbae1..3d12777 100644 ---- a/libs/imageproperties/imagedescedittab.cpp -+++ b/libs/imageproperties/imagedescedittab.cpp -@@ -429,7 +429,7 @@ ImageDescEditTab::ImageDescEditTab(QWidget* const parent) - - // Initialize --------------------------------------------- - --#if KEXIV2_VERSION >= 0x020302 -+#if KEXIV2_VERSION >= 0x020400 - d->titleEdit->textEdit()->installEventFilter(this); - d->captionsEdit->textEdit()->installEventFilter(this); - #endif -@@ -532,7 +532,7 @@ void ImageDescEditTab::setFocusToNewTagEdit() - void ImageDescEditTab::setFocusToTitlesEdit() - { - d->tabWidget->setCurrentIndex(Private::DESCRIPTIONS); --#if KEXIV2_VERSION >= 0x020302 -+#if KEXIV2_VERSION >= 0x020400 - d->titleEdit->textEdit()->setFocus(); - #endif - } -@@ -540,7 +540,7 @@ void ImageDescEditTab::setFocusToTitlesEdit() - void ImageDescEditTab::setFocusToCommentsEdit() - { - d->tabWidget->setCurrentIndex(Private::DESCRIPTIONS); --#if KEXIV2_VERSION >= 0x020302 -+#if KEXIV2_VERSION >= 0x020400 - d->captionsEdit->textEdit()->setFocus(); - #endif - } diff --git a/nonprism/kipi-plugins/PKGBUILD b/nonprism/kipi-plugins/PKGBUILD index 2cb1d1c88..671ff598b 100644 --- a/nonprism/kipi-plugins/PKGBUILD +++ b/nonprism/kipi-plugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 225564 2014-11-03 12:36:10Z ronald $ +# $Id: PKGBUILD 226241 2014-11-14 13:41:17Z ronald $ # Maintainer (Arch): Ronald van Haren # Contributor (Arch): Andrea Scarpino # Contributor (Arch): Tobias Powalowski @@ -7,7 +7,7 @@ pkgbase=digikam pkgname=kipi-plugins -pkgver=4.4.0 +pkgver=4.5.0 pkgrel=1.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" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,8 @@ replaces=("${pkgname}-libre" "${pkgname}-libre-nonprism") conflicts=("${pkgname}-libre" "${pkgname}-libre-nonprism") makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr' 'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin' 'libgphoto2' - 'cmake' 'automoc4' 'doxygen' 'lensfun' 'qt-gstreamer' 'imagemagick' 'eigen') + 'cmake' 'automoc4' 'doxygen' 'lensfun' 'qt-gstreamer' 'imagemagick' 'eigen' + 'libbaloo4' 'libpgf') depends=('kdebase-runtime' 'kdepimlibs' 'libkdcraw' 'libkipi' 'libksane' 'libkexiv2') optdepends=('libkgeomap: Geolocalize tool' 'libmediawiki: MediaWiki Export plugin' @@ -27,9 +28,8 @@ optdepends=('libkgeomap: Geolocalize tool' 'qt-gstreamer: Video SlideShow plugin') options=('staticlibs') install=kipi-plugins.install -source=("http://download.kde.org/stable/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2" "digikam_libkexiv2.patch") -sha1sums=('1feb43120addda314e09761440ec2058e430171c' - '39a09a8e7de1612eb47f3ef0966c6fa02b7e3284') +source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('ba735f4b7bb0437c1676141ab78ea958e46f135e') prepare() { cd ${srcdir}/${pkgbase}-${pkgver} @@ -57,20 +57,18 @@ prepare() { sed -i '\|Remote Flickr Export plugin|,+2 d \|flickrexport|d ' doc/kipi-plugins/index.docbook - cd .. - mkdir build - cd ${pkgbase}-${pkgver}/core - patch -Np1 -i "${srcdir}/digikam_libkexiv2.patch" } build() { + mkdir 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 + -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=OFF \ + -DDIGIKAMSC_USE_PRIVATE_SHAREDLIBS=ON make } diff --git a/nonprism/kipi-plugins/digikam_libkexiv2.patch b/nonprism/kipi-plugins/digikam_libkexiv2.patch deleted file mode 100644 index 018ce67a5..000000000 --- a/nonprism/kipi-plugins/digikam_libkexiv2.patch +++ /dev/null @@ -1,53 +0,0 @@ -commit f6945f23e0ed1e11f26e2c7e62b02baa8cfa640e -Author: Pino Toscano -Date: Tue Oct 14 22:26:19 2014 +0200 - - fix libkexiv2 version for AltLangStrEdit::textEdit() - - it is part of current libkexiv2/master only (i.e. post 4.14.x, which - is 2.3.x) - -diff --git a/libs/imageproperties/captionedit.cpp b/libs/imageproperties/captionedit.cpp -index 88413fc..70bdb6d 100644 ---- a/libs/imageproperties/captionedit.cpp -+++ b/libs/imageproperties/captionedit.cpp -@@ -202,7 +202,7 @@ void CaptionEdit::slotAuthorChanged(const QString& text) - - MsgTextEdit* CaptionEdit::textEdit() const - { --#if KEXIV2_VERSION >= 0x020302 -+#if KEXIV2_VERSION >= 0x020400 - return d->altLangStrEdit->textEdit(); - #else - return 0; -diff --git a/libs/imageproperties/imagedescedittab.cpp b/libs/imageproperties/imagedescedittab.cpp -index ebfbae1..3d12777 100644 ---- a/libs/imageproperties/imagedescedittab.cpp -+++ b/libs/imageproperties/imagedescedittab.cpp -@@ -429,7 +429,7 @@ ImageDescEditTab::ImageDescEditTab(QWidget* const parent) - - // Initialize --------------------------------------------- - --#if KEXIV2_VERSION >= 0x020302 -+#if KEXIV2_VERSION >= 0x020400 - d->titleEdit->textEdit()->installEventFilter(this); - d->captionsEdit->textEdit()->installEventFilter(this); - #endif -@@ -532,7 +532,7 @@ void ImageDescEditTab::setFocusToNewTagEdit() - void ImageDescEditTab::setFocusToTitlesEdit() - { - d->tabWidget->setCurrentIndex(Private::DESCRIPTIONS); --#if KEXIV2_VERSION >= 0x020302 -+#if KEXIV2_VERSION >= 0x020400 - d->titleEdit->textEdit()->setFocus(); - #endif - } -@@ -540,7 +540,7 @@ void ImageDescEditTab::setFocusToTitlesEdit() - void ImageDescEditTab::setFocusToCommentsEdit() - { - d->tabWidget->setCurrentIndex(Private::DESCRIPTIONS); --#if KEXIV2_VERSION >= 0x020302 -+#if KEXIV2_VERSION >= 0x020400 - d->captionsEdit->textEdit()->setFocus(); - #endif - } -- cgit v1.1-4-g5e80