From 73df3c99a1945080462744f9844834ec88a988b6 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 14 Nov 2014 21:38:08 -0200 Subject: kipi-plugins-4.5.0-2.parabola1{,.nonprism1}: fix building against shared libkexiv2 --- libre/kipi-plugins/PKGBUILD | 5 +++-- libre/kipi-plugins/libkexiv2.patch | 10 ++++++++++ nonprism/kipi-plugins/PKGBUILD | 5 +++-- nonprism/kipi-plugins/libkexiv2.patch | 10 ++++++++++ 4 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 libre/kipi-plugins/libkexiv2.patch create mode 100644 nonprism/kipi-plugins/libkexiv2.patch diff --git a/libre/kipi-plugins/PKGBUILD b/libre/kipi-plugins/PKGBUILD index f8ff85570..d5f567a28 100644 --- a/libre/kipi-plugins/PKGBUILD +++ b/libre/kipi-plugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 226241 2014-11-14 13:41:17Z ronald $ +# $Id: PKGBUILD 226258 2014-11-14 20:14:29Z ronald $ # Maintainer (Arch): Ronald van Haren # Contributor (Arch): Andrea Scarpino # Contributor (Arch): Tobias Powalowski @@ -8,7 +8,7 @@ pkgbase=digikam pkgname=kipi-plugins pkgver=4.5.0 -pkgrel=1.parabola1 +pkgrel=2.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') @@ -34,6 +34,7 @@ sha1sums=('ba735f4b7bb0437c1676141ab78ea958e46f135e') prepare() { cd ${srcdir}/${pkgbase}-${pkgver} + patch -Np0 -i "${srcdir}/libkexiv2.patch" sed -i '\|flashexport|d \|jalbumexport|d ' extra/kipi-plugins/CMakeLists.txt diff --git a/libre/kipi-plugins/libkexiv2.patch b/libre/kipi-plugins/libkexiv2.patch new file mode 100644 index 000000000..f75b08bf7 --- /dev/null +++ b/libre/kipi-plugins/libkexiv2.patch @@ -0,0 +1,10 @@ +--- 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 671ff598b..bffd63d9c 100644 --- a/nonprism/kipi-plugins/PKGBUILD +++ b/nonprism/kipi-plugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 226241 2014-11-14 13:41:17Z ronald $ +# $Id: PKGBUILD 226258 2014-11-14 20:14:29Z ronald $ # Maintainer (Arch): Ronald van Haren # Contributor (Arch): Andrea Scarpino # Contributor (Arch): Tobias Powalowski @@ -8,7 +8,7 @@ pkgbase=digikam pkgname=kipi-plugins pkgver=4.5.0 -pkgrel=1.parabola1.nonprism1 +pkgrel=2.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') @@ -33,6 +33,7 @@ sha1sums=('ba735f4b7bb0437c1676141ab78ea958e46f135e') prepare() { cd ${srcdir}/${pkgbase}-${pkgver} + patch -Np0 -i "${srcdir}/libkexiv2.patch" sed -i '\|flashexport|d \|jalbumexport|d \|imageshackexport|d diff --git a/nonprism/kipi-plugins/libkexiv2.patch b/nonprism/kipi-plugins/libkexiv2.patch new file mode 100644 index 000000000..f75b08bf7 --- /dev/null +++ b/nonprism/kipi-plugins/libkexiv2.patch @@ -0,0 +1,10 @@ +--- 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) -- cgit v1.2.3