summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2017-03-16 21:11:17 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2017-03-16 21:11:47 -0300
commitbb3c0079df0ab7db7750ced85fcd3ebdc376b429 (patch)
tree8fa402b7dab97331a26d88c41db9291a64bb2aca /libre
parent5752bd44a11cb6bc78d98a3ff8e23cf9c924647c (diff)
downloadabslibre-bb3c0079df0ab7db7750ced85fcd3ebdc376b429.tar.gz
abslibre-bb3c0079df0ab7db7750ced85fcd3ebdc376b429.tar.bz2
abslibre-bb3c0079df0ab7db7750ced85fcd3ebdc376b429.zip
kipi-plugins-5.5.0-1.parabola1{,.nonprism1}: updating version
Diffstat (limited to 'libre')
-rw-r--r--libre/digikam/PKGBUILD23
-rw-r--r--libre/digikam/digikam-find-qtav.patch21
2 files changed, 11 insertions, 33 deletions
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 <ronald@archlinux.org>
# Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
# Contributor (Arch): Tobias Powalowski <tpowa@archlinux.org>
@@ -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
- )
-