diff options
| -rw-r--r-- | libre/kipi-plugins/PKGBUILD | 18 | ||||
| -rw-r--r-- | libre/kipi-plugins/libkexiv2.patch | 10 | ||||
| -rw-r--r-- | nonprism/kipi-plugins/PKGBUILD | 18 | ||||
| -rw-r--r-- | nonprism/kipi-plugins/libkexiv2.patch | 10 |
4 files changed, 18 insertions, 38 deletions
diff --git a/libre/kipi-plugins/PKGBUILD b/libre/kipi-plugins/PKGBUILD index 1c5203899..f9c316ede 100644 --- a/libre/kipi-plugins/PKGBUILD +++ b/libre/kipi-plugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 229642 2015-01-22 14:42:12Z ronald $ +# $Id: PKGBUILD 230374 2015-02-02 10:16:00Z ronald $ # Maintainer (Arch): Ronald van Haren <ronald@archlinux.org> # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org> # Contributor (Arch): Tobias Powalowski <tpowa@archlinux.org> @@ -7,8 +7,8 @@ pkgbase=digikam pkgname=kipi-plugins -pkgver=4.5.0 -pkgrel=5.parabola1 +pkgver=4.6.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') license=('GPL') @@ -29,14 +29,11 @@ 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" - "libkexiv2.patch") -sha1sums=('ba735f4b7bb0437c1676141ab78ea958e46f135e' - '1bcef459bd400a04526aac9adf39d4d0a1c3549c') +source=("http://download.kde.org/stable/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2") +sha1sums=('ee4241f02e997c7b122166bc845feb885b633f0e') prepare() { cd ${srcdir}/${pkgbase}-${pkgver} - patch -Np0 -i "${srcdir}/libkexiv2.patch" sed -i '\|flashexport|d \|jalbumexport|d ' extra/kipi-plugins/CMakeLists.txt @@ -51,7 +48,10 @@ build() { -DCMAKE_SKIP_RPATH=ON \ -DBUILD_tests=OFF \ -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=OFF \ - -DDIGIKAMSC_USE_PRIVATE_SHAREDLIBS=ON + -DDIGIKAMSC_USE_PRIVATE_SHAREDLIBS=ON \ + -DDIGIKAMSC_COMPILE_LIBKGEOMAP=ON \ + -DDIGIKAMSC_COMPILE_LIBKVKONTAKTE=ON \ + -DDIGIKAMSC_COMPILE_LIBMEDIAWIKI=ON make } diff --git a/libre/kipi-plugins/libkexiv2.patch b/libre/kipi-plugins/libkexiv2.patch deleted file mode 100644 index f75b08bf7..000000000 --- a/libre/kipi-plugins/libkexiv2.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- extra/CMakeLists.txt.bak 2014-11-14 20:46:49.265601687 +0100 -+++ extra/CMakeLists.txt 2014-11-14 20:46:55.555823691 +0100 -@@ -11,7 +11,6 @@ - - # from kdegraphics/libs - add_subdirectory(libkipi) -- add_subdirectory(libkexiv2) - add_subdirectory(libkdcraw) - add_subdirectory(libkface) - MACRO_OPTIONAL_ADD_SUBDIRECTORY(libksane) diff --git a/nonprism/kipi-plugins/PKGBUILD b/nonprism/kipi-plugins/PKGBUILD index 87aed3f52..f3766eef9 100644 --- a/nonprism/kipi-plugins/PKGBUILD +++ b/nonprism/kipi-plugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 229642 2015-01-22 14:42:12Z ronald $ +# $Id: PKGBUILD 230374 2015-02-02 10:16:00Z ronald $ # Maintainer (Arch): Ronald van Haren <ronald@archlinux.org> # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org> # Contributor (Arch): Tobias Powalowski <tpowa@archlinux.org> @@ -7,8 +7,8 @@ pkgbase=digikam pkgname=kipi-plugins -pkgver=4.5.0 -pkgrel=5.parabola1.nonprism1 +pkgver=4.6.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') license=('GPL') @@ -28,14 +28,11 @@ 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" - "libkexiv2.patch") -sha1sums=('ba735f4b7bb0437c1676141ab78ea958e46f135e' - '1bcef459bd400a04526aac9adf39d4d0a1c3549c') +source=("http://download.kde.org/stable/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2") +sha1sums=('ee4241f02e997c7b122166bc845feb885b633f0e') prepare() { cd ${srcdir}/${pkgbase}-${pkgver} - patch -Np0 -i "${srcdir}/libkexiv2.patch" sed -i '\|flashexport|d \|jalbumexport|d \|imageshackexport|d @@ -71,7 +68,10 @@ build() { -DCMAKE_SKIP_RPATH=ON \ -DBUILD_tests=OFF \ -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=OFF \ - -DDIGIKAMSC_USE_PRIVATE_SHAREDLIBS=ON + -DDIGIKAMSC_USE_PRIVATE_SHAREDLIBS=ON \ + -DDIGIKAMSC_COMPILE_LIBKGEOMAP=ON \ + -DDIGIKAMSC_COMPILE_LIBKVKONTAKTE=OFF \ + -DDIGIKAMSC_COMPILE_LIBMEDIAWIKI=ON make } diff --git a/nonprism/kipi-plugins/libkexiv2.patch b/nonprism/kipi-plugins/libkexiv2.patch deleted file mode 100644 index f75b08bf7..000000000 --- a/nonprism/kipi-plugins/libkexiv2.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- extra/CMakeLists.txt.bak 2014-11-14 20:46:49.265601687 +0100 -+++ extra/CMakeLists.txt 2014-11-14 20:46:55.555823691 +0100 -@@ -11,7 +11,6 @@ - - # from kdegraphics/libs - add_subdirectory(libkipi) -- add_subdirectory(libkexiv2) - add_subdirectory(libkdcraw) - add_subdirectory(libkface) - MACRO_OPTIONAL_ADD_SUBDIRECTORY(libksane) |