summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2017-01-11 00:34:30 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2017-01-11 00:37:49 -0300
commit1686b7acfc86b105abb2de4a04138155a7b05a30 (patch)
tree9ff15a8ea3b263dee2c8f0d54b21178d5dfb3f3a /libre
parent224a97af32b58295e8b37df6dce1077e32579028 (diff)
downloadabslibre-1686b7acfc86b105abb2de4a04138155a7b05a30.tar.gz
abslibre-1686b7acfc86b105abb2de4a04138155a7b05a30.tar.bz2
abslibre-1686b7acfc86b105abb2de4a04138155a7b05a30.zip
kipi-plugins-5.4.0-1.parabola1{,.nonprism1}: updating version
Diffstat (limited to 'libre')
-rw-r--r--libre/digikam/0001-optionally-enable-OpenGL.patch (renamed from libre/kipi-plugins/0001-optionally-enable-OpenGL.patch)0
-rw-r--r--libre/digikam/PKGBUILD (renamed from libre/kipi-plugins/PKGBUILD)16
-rw-r--r--libre/digikam/digikam-find-qtav.patch21
-rw-r--r--libre/digikam/libre.patch (renamed from libre/kipi-plugins/libre.patch)0
4 files changed, 31 insertions, 6 deletions
diff --git a/libre/kipi-plugins/0001-optionally-enable-OpenGL.patch b/libre/digikam/0001-optionally-enable-OpenGL.patch
index 909a44434..909a44434 100644
--- a/libre/kipi-plugins/0001-optionally-enable-OpenGL.patch
+++ b/libre/digikam/0001-optionally-enable-OpenGL.patch
diff --git a/libre/kipi-plugins/PKGBUILD b/libre/digikam/PKGBUILD
index dc70a3c9b..87fa37e92 100644
--- a/libre/kipi-plugins/PKGBUILD
+++ b/libre/digikam/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 281957 2016-11-22 21:59:52Z arojas $
+# $Id: PKGBUILD 285609 2017-01-09 23:33:53Z 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.3.0
+_pkgver=5.4.0
pkgver=${_pkgver//-/_} # for beta versions
-pkgrel=6.parabola1
+pkgrel=1.parabola1
pkgdesc="Digital photo management application for KDE"
arch=('i686' 'x86_64' 'armv7h')
license=('GPL')
@@ -18,12 +18,13 @@ replaces=("${pkgname}-libre")
conflicts=("${pkgname}-libre")
makedepends=('extra-cmake-modules' 'libkipi' 'libksane' 'liblqr' 'opencv' 'boost'
'doxygen' 'lensfun' 'eigen' 'kdoctools' 'marble' 'kdesignerplugin'
- 'kfilemetadata' 'akonadi-contacts' 'qt5-multimedia' 'threadweaver' 'kcalcore'
+ 'kfilemetadata' 'akonadi-contacts' 'qtav' 'threadweaver' 'kcalcore'
'knotifyconfig' 'libmediawiki' 'libkvkontakte')
-source=("http://download.kde.org/stable/${pkgbase}/${pkgbase}-${_pkgver}.tar.xz"
+source=("http://download.kde.org/stable/${pkgbase}/${pkgbase}-${_pkgver}.tar.xz" digikam-find-qtav.patch
"libre.patch"
'0001-optionally-enable-OpenGL.patch')
-sha1sums=('3a62f6efdfafc37341626cbf0225cd7adc9d0633'
+sha1sums=('6c58ee30cd84b40acf4427f1bb9dbb8b891eb894'
+ 'b170e5eab5a8c40d1c8c8f2d2cfe5e911ad66939'
'edd5b5eeae7ed4139b4c5f6a8446990f1da2e544'
'95169d438884b1650a4c11e1ca44ae7ad5096a89')
@@ -33,6 +34,9 @@ prepare() {
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
new file mode 100644
index 000000000..e1121897c
--- /dev/null
+++ b/libre/digikam/digikam-find-qtav.patch
@@ -0,0 +1,21 @@
+--- 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/libre/kipi-plugins/libre.patch b/libre/digikam/libre.patch
index 8c677e210..8c677e210 100644
--- a/libre/kipi-plugins/libre.patch
+++ b/libre/digikam/libre.patch