From bb3c0079df0ab7db7750ced85fcd3ebdc376b429 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 16 Mar 2017 21:11:17 -0300 Subject: kipi-plugins-5.5.0-1.parabola1{,.nonprism1}: updating version --- libre/digikam/PKGBUILD | 23 +++++++++++------------ libre/digikam/digikam-find-qtav.patch | 21 --------------------- nonprism/digikam/PKGBUILD | 25 ++++++++++++------------- nonprism/digikam/digikam-find-qtav.patch | 21 --------------------- nonprism/digikam/nonprism.patch | 27 ++++++++++++++------------- 5 files changed, 37 insertions(+), 80 deletions(-) delete mode 100644 libre/digikam/digikam-find-qtav.patch delete mode 100644 nonprism/digikam/digikam-find-qtav.patch diff --git a/libre/digikam/PKGBUILD b/libre/digikam/PKGBUILD index 696527ce0..f067221d2 100644 --- a/libre/digikam/PKGBUILD +++ b/libre/digikam/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 287742 2017-01-29 22:08:12Z arojas $ +# $Id: PKGBUILD 290817 2017-03-14 08:05:30Z arojas $ # Maintainer (Arch): Ronald van Haren # Contributor (Arch): Andrea Scarpino # Contributor (Arch): Tobias Powalowski @@ -7,9 +7,9 @@ pkgbase=digikam pkgname=kipi-plugins -_pkgver=5.4.0 +_pkgver=5.5.0 pkgver=${_pkgver//-/_} # for beta versions -pkgrel=2.parabola1 +pkgrel=1.parabola1 pkgdesc="Digital photo management application for KDE" arch=('i686' 'x86_64' 'armv7h') license=('GPL') @@ -17,26 +17,25 @@ url="http://www.digikam.org/" replaces=("${pkgname}-libre") conflicts=("${pkgname}-libre") makedepends=('extra-cmake-modules' 'libkipi' 'libksane' 'liblqr' 'opencv' 'boost' - 'doxygen' 'lensfun' 'eigen' 'kdoctools' 'marble' 'kdesignerplugin' + 'doxygen' 'lensfun' 'eigen' 'kdoctools' 'marble-common' 'kdesignerplugin' 'kfilemetadata' 'akonadi-contacts' 'qtav' 'threadweaver' 'kcalcore' 'knotifyconfig' 'libmediawiki' 'libkvkontakte') -source=("http://download.kde.org/stable/${pkgbase}/${pkgbase}-${_pkgver}.tar.xz" digikam-find-qtav.patch +source=("http://download.kde.org/stable/${pkgbase}/${pkgbase}-${_pkgver}.tar.xz" "libre.patch" '0001-optionally-enable-OpenGL.patch') -sha1sums=('6c58ee30cd84b40acf4427f1bb9dbb8b891eb894' - 'b170e5eab5a8c40d1c8c8f2d2cfe5e911ad66939' - 'edd5b5eeae7ed4139b4c5f6a8446990f1da2e544' - '95169d438884b1650a4c11e1ca44ae7ad5096a89') +sha256sums=('df9cbf1b8dbfb9235cebc97e77c02fcb1498c5a905c7fd3b9fb42fd7accc6252' + '80fbe434d326551f3dc029c5db3ad1b50e87870b03185467aa25a5c03764cc89' + '236ab9f10b672706c15f0231ed565434b68cf176328cedbe9740680031c0827f') prepare() { mkdir -p build + # sv docs fail to build + sed -e '/sv/d' -i $pkgbase-$pkgver/doc-translated/CMakeLists.txt + cd ${pkgbase}-${_pkgver} patch -p1 -i ../libre.patch - # Fix QtAV location - patch -p1 -i ../digikam-find-qtav.patch - # OpenGL switch if [[ "$CARCH" = arm* ]]; then cd core diff --git a/libre/digikam/digikam-find-qtav.patch b/libre/digikam/digikam-find-qtav.patch deleted file mode 100644 index e1121897c..000000000 --- a/libre/digikam/digikam-find-qtav.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- digikam-5.4.0/core/cmake/modules/FindQtAV.cmake.0 2017-01-09 22:56:43.303991660 +0000 -+++ digikam-5.4.0/core/cmake/modules/FindQtAV.cmake 2017-01-09 22:57:24.843934106 +0000 -@@ -24,15 +24,17 @@ - HINTS ${_qt5_install_prefix} # For MXE - ${_qt5_install_prefix}/../qt5/include # For Mageia - ${_qt5_install_prefix}/../../include/qt5 # For Suse -+ ${_qt5_install_prefix}/../../include/qt - ${_qt5_install_prefix}/../../../include/x86_64-linux-gnu/qt5 # For Debian - PATH_SUFFIXES QtAV - ) - - find_path(QTAV_WIDGETS_INCLUDE_DIR - NAMES QtAVWidgets.h - HINTS ${_qt5_install_prefix} # For MXE - ${_qt5_install_prefix}/../qt5/include # For Mageia - ${_qt5_install_prefix}/../../include/qt5 # For Suse -+ ${_qt5_install_prefix}/../../include/qt - ${_qt5_install_prefix}/../../../include/x86_64-linux-gnu/qt5 # For Debian - PATH_SUFFIXES QtAVWidgets - ) - diff --git a/nonprism/digikam/PKGBUILD b/nonprism/digikam/PKGBUILD index 56b1d081b..a7cd12c0f 100644 --- a/nonprism/digikam/PKGBUILD +++ b/nonprism/digikam/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 287742 2017-01-29 22:08:12Z arojas $ +# $Id: PKGBUILD 290817 2017-03-14 08:05:30Z arojas $ # Maintainer (Arch): Ronald van Haren # Contributor (Arch): Andrea Scarpino # Contributor (Arch): Tobias Powalowski @@ -7,9 +7,9 @@ pkgbase=digikam pkgname=kipi-plugins -_pkgver=5.4.0 +_pkgver=5.5.0 pkgver=${_pkgver//-/_} # for beta versions -pkgrel=2.parabola1.nonprism1 +pkgrel=1.parabola1.nonprism1 pkgdesc="Digital photo management application for KDE" arch=('i686' 'x86_64' 'armv7h') license=('GPL') @@ -17,29 +17,28 @@ url="http://www.digikam.org/" replaces=("${pkgname}-libre" "${pkgname}-libre-nonprism") conflicts=("${pkgname}-libre" "${pkgname}-libre-nonprism") makedepends=('extra-cmake-modules' 'libkipi' 'libksane' 'liblqr' 'opencv' 'boost' - 'doxygen' 'lensfun' 'eigen' 'kdoctools' 'marble' 'kdesignerplugin' + 'doxygen' 'lensfun' 'eigen' 'kdoctools' 'marble-common' 'kdesignerplugin' 'kfilemetadata' 'akonadi-contacts' 'qtav' 'threadweaver' 'kcalcore' 'knotifyconfig' 'libmediawiki' 'libkvkontakte') -source=("http://download.kde.org/stable/${pkgbase}/${pkgbase}-${_pkgver}.tar.xz" digikam-find-qtav.patch +source=("http://download.kde.org/stable/${pkgbase}/${pkgbase}-${_pkgver}.tar.xz" "libre.patch" "nonprism.patch" '0001-optionally-enable-OpenGL.patch') -sha1sums=('6c58ee30cd84b40acf4427f1bb9dbb8b891eb894' - 'b170e5eab5a8c40d1c8c8f2d2cfe5e911ad66939' - 'edd5b5eeae7ed4139b4c5f6a8446990f1da2e544' - '246366b6b4b315957387938d842112e1146b9495' - '95169d438884b1650a4c11e1ca44ae7ad5096a89') +sha256sums=('df9cbf1b8dbfb9235cebc97e77c02fcb1498c5a905c7fd3b9fb42fd7accc6252' + '80fbe434d326551f3dc029c5db3ad1b50e87870b03185467aa25a5c03764cc89' + '738eb494eefda0ddbc7c4fa2029f7c53db07bad370652dfefd0f126d09d0217f' + '236ab9f10b672706c15f0231ed565434b68cf176328cedbe9740680031c0827f') prepare() { mkdir -p build + # sv docs fail to build + sed -e '/sv/d' -i $pkgbase-$pkgver/doc-translated/CMakeLists.txt + cd ${pkgbase}-${_pkgver} patch -p1 -i ../libre.patch patch -p1 -i ../nonprism.patch - # Fix QtAV location - patch -p1 -i ../digikam-find-qtav.patch - # OpenGL switch if [[ "$CARCH" = arm* ]]; then cd core diff --git a/nonprism/digikam/digikam-find-qtav.patch b/nonprism/digikam/digikam-find-qtav.patch deleted file mode 100644 index e1121897c..000000000 --- a/nonprism/digikam/digikam-find-qtav.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- digikam-5.4.0/core/cmake/modules/FindQtAV.cmake.0 2017-01-09 22:56:43.303991660 +0000 -+++ digikam-5.4.0/core/cmake/modules/FindQtAV.cmake 2017-01-09 22:57:24.843934106 +0000 -@@ -24,15 +24,17 @@ - HINTS ${_qt5_install_prefix} # For MXE - ${_qt5_install_prefix}/../qt5/include # For Mageia - ${_qt5_install_prefix}/../../include/qt5 # For Suse -+ ${_qt5_install_prefix}/../../include/qt - ${_qt5_install_prefix}/../../../include/x86_64-linux-gnu/qt5 # For Debian - PATH_SUFFIXES QtAV - ) - - find_path(QTAV_WIDGETS_INCLUDE_DIR - NAMES QtAVWidgets.h - HINTS ${_qt5_install_prefix} # For MXE - ${_qt5_install_prefix}/../qt5/include # For Mageia - ${_qt5_install_prefix}/../../include/qt5 # For Suse -+ ${_qt5_install_prefix}/../../include/qt - ${_qt5_install_prefix}/../../../include/x86_64-linux-gnu/qt5 # For Debian - PATH_SUFFIXES QtAVWidgets - ) - diff --git a/nonprism/digikam/nonprism.patch b/nonprism/digikam/nonprism.patch index 3a4846bec..1a6608a1a 100644 --- a/nonprism/digikam/nonprism.patch +++ b/nonprism/digikam/nonprism.patch @@ -1,5 +1,5 @@ diff --git a/doc/TODO b/doc/TODO -index a0ac4f4..23bf745 100644 +index a0ac4f4c6..23bf7450f 100644 --- a/doc/TODO +++ b/doc/TODO @@ -78,16 +78,10 @@ menu-mainwindow.docbook * * Gi @@ -33,10 +33,10 @@ index a0ac4f4..23bf745 100644 using-camera.docbook DONE DONE Gilles using-camera-intro.docbook diff --git a/doc/digikam/index.docbook b/doc/digikam/index.docbook -index 4ca6846..e52406e 100644 +index 080275044..0fe7027c9 100644 --- a/doc/digikam/index.docbook +++ b/doc/digikam/index.docbook -@@ -168,21 +168,11 @@ +@@ -169,21 +169,11 @@ @@ -58,7 +58,7 @@ index 4ca6846..e52406e 100644 -@@ -304,21 +294,11 @@ +@@ -303,21 +293,11 @@ &doc-tool-printwizard; &doc-tool-sendimages; @@ -81,10 +81,10 @@ index 4ca6846..e52406e 100644 diff --git a/doc/digikam/menu-mainwindow.docbook b/doc/digikam/menu-mainwindow.docbook -index cb0c5da..dcca755 100644 +index 5c8e8e2b2..acdef13a2 100644 --- a/doc/digikam/menu-mainwindow.docbook +++ b/doc/digikam/menu-mainwindow.docbook -@@ -660,22 +660,6 @@ +@@ -943,22 +943,6 @@ @@ -107,7 +107,7 @@ index cb0c5da..dcca755 100644 ToolsExport to Piwigo -@@ -690,21 +674,6 @@ +@@ -973,21 +957,6 @@ @@ -129,7 +129,7 @@ index cb0c5da..dcca755 100644 @@ -168,10 +168,10 @@ index cb0c5da..dcca755 100644 diff --git a/extra/kipi-plugins/CMakeLists.txt b/extra/kipi-plugins/CMakeLists.txt -index 68e61a3..4d1195d 100644 +index 63579cae7..9b8171ca3 100644 --- a/extra/kipi-plugins/CMakeLists.txt +++ b/extra/kipi-plugins/CMakeLists.txt -@@ -148,7 +148,6 @@ if(KF5Kipi_FOUND) +@@ -145,7 +145,6 @@ if(KF5Kipi_FOUND) # -- Optional dependencies detection required by some plugins ------------------------------------- DETECT_LIBMEDIAWIKI(5.0.0) # For Mediawiki. @@ -179,7 +179,7 @@ index 68e61a3..4d1195d 100644 # ================================================================================================== # Log messages -@@ -169,7 +168,6 @@ if(KF5Kipi_FOUND) +@@ -166,7 +165,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) @@ -187,7 +187,7 @@ index 68e61a3..4d1195d 100644 # Optional plugins results ---------------------------------------------------------------------------- -@@ -185,7 +183,6 @@ if(KF5Kipi_FOUND) +@@ -182,7 +180,6 @@ if(KF5Kipi_FOUND) set(KIPIPLUGINS_CAN_BE_COMPILED false) endif() @@ -195,7 +195,7 @@ index 68e61a3..4d1195d 100644 PRINT_COMPONENT_COMPILE_STATUS("Mediawiki" KF5MediaWiki_FOUND) PRINT_COMPONENT_COMPILE_STATUS("FlashExport" KF5Archive_FOUND) -@@ -242,25 +239,12 @@ if(KF5Kipi_FOUND) +@@ -235,26 +232,13 @@ if(KF5Kipi_FOUND) add_subdirectory(printimages) add_subdirectory(kmlexport) add_subdirectory(sendimages) @@ -209,6 +209,7 @@ index 68e61a3..4d1195d 100644 - add_subdirectory(imageshack) - add_subdirectory(yandexfotki) - add_subdirectory(googleservices) + add_subdirectory(jalbum) if(KF5Archive_FOUND) add_subdirectory(flashexport) -- cgit v1.2.3