Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fe302fd2053b17ac52823ec9433cabdbbd361a94
commit fe302fd2053b17ac52823ec9433cabdbbd361a94 Author: crazy <[email protected]> Date: Tue Dec 15 02:02:44 2015 +0100 digikam-4.12.0-2-x86_64 * rebuild ( with whatever newer libs ) * package was broken forever * added patches to fix the build * no way to bump to .14.0 yet diff --git a/source/kde-extra/digikam/FrugalBuild b/source/kde-extra/digikam/FrugalBuild index 8261a2d..938ae56 100644 --- a/source/kde-extra/digikam/FrugalBuild +++ b/source/kde-extra/digikam/FrugalBuild @@ -2,18 +2,16 @@ # Maintainer: Melko <[email protected]> # Contributor: Bence Nagy <[email protected]> -options+=('asneeded') - pkgname=digikam pkgver=4.12.0 -pkgrel=1 +pkgrel=2 pkgdesc="Digital photo management application for kde" _F_archive_grepv="\-[a-z]" _F_kde_dirname="stable/$pkgname" _F_kde_ext=".tar.bz2" Finclude kde depends=("libkdcraw>=$_F_kde_ver" "libkipi>=$_F_kde_ver" "libkde3support>=$_F_kde_ver" "libksane>=$_F_kde_ver" 'sqlite2' \ - 'lensfun>=0.3.0' 'liblqr' 'libgphoto2>=2.5.0' "libknotify>=$_F_kde_ver" 'qjson>=0.7.1' "libkdewebkit>=$_F_kde_ver" \ + 'lensfun>=0.3.0' 'liblqr' 'libgphoto2>=2.5.9' "libknotify>=$_F_kde_ver" 'qjson>=0.7.1' "libkdewebkit>=$_F_kde_ver" \ "baloo>=$_F_kde_ver" 'libpgf') makedepends=("${makedepends[@]}" "kdepimlibs-compiletime>=$_F_kde_ver" 'boost>=1.58.0' 'ksgmltools2' 'mysql' \ 'libqtdesigner' 'soprano-backend-redland>=2.7.0' "kdelibs>=$_F_kde_ver" "kdepimlibs>=$_F_kde_ver" 'eigen') @@ -21,8 +19,11 @@ groups=('kde-extra' 'kde-apps') archs=('i686' 'x86_64') up2date="Flasttar $_F_kde_mirror/$_F_kde_dirname" options+=('scriptlet') -source=($_F_kde_mirror/$_F_kde_dirname/$pkgname-${pkgver}.tar.bz2) -sha1sums=('f7ce2c72946e21b669cfa35c4ce8652337f9c68a') +source=($_F_kde_mirror/$_F_kde_dirname/$pkgname-${pkgver}.tar.bz2 \ + lensfun-nested-extern-C.patch opencv-1.patch) +sha1sums=('f7ce2c72946e21b669cfa35c4ce8652337f9c68a' \ + 'efeb8ed0d3321f0ed2e9060e9d83890efedcb153' \ + '67bbe828c8c697f92f2280bf6a7cd22bca6ee11a') subpkgs=("${subpkgs[@]}" "libkface") subdescs=("${subdescs[@]}" "Library to perform face recognition and detection over pictures.") @@ -49,7 +50,7 @@ rodepends=("${subpkgs[@]}") subpkgs=("${subpkgs[@]}" "kipi-plugins") subdescs=("${subdescs[@]}" "A collection of plugins extending the KDE graphics and image applications.") -subdepends=("${subdepends[@]}" "libkipi>=$_F_kde_ver libkexiv2>=$_F_kde_ver libkdcraw>=$_F_kde_ver qca qjson>=0.7.\\ +subdepends=("${subdepends[@]}" "libkipi>=$_F_kde_ver libkexiv2>=$_F_kde_ver libkdcraw>=$_F_kde_ver qca qjson>=0.7 \ libqtopengl>=$_F_kde_qtver libkcal>=$_F_kde_ver libqtxmlpatterns>=$_F_kde_qtver opencv>=2.4.6.1 phonon>=4.5.0") subrodepends=("${subrodepends[@]}" "libkgeomap>=$pkgver imagemagick") subgroups=("${subgroups[@]}" 'kde-extra') @@ -61,7 +62,7 @@ build() { -DDIGIKAMSC_COMPILE_DOC=off \ -DDIGIKAMSC_COMPILE_LIBKGEOMAP=ON \ -DDIGIKAMSC_COMPILE_LIBMEDIAWIKI=ON \ - -DDIGIKAMSC_COMPILE_LIBKFACE=ON + -DDIGIKAMSC_COMPILE_LIBKFACE=ON -Wno-dev KDE_project_split kipi-plugins extra/kipi-plugins KDE_project_split libkface extra/libkface diff --git a/source/kde-extra/digikam/lensfun-nested-extern-C.patch b/source/kde-extra/digikam/lensfun-nested-extern-C.patch new file mode 100644 index 0000000..23ab383 --- /dev/null +++ b/source/kde-extra/digikam/lensfun-nested-extern-C.patch @@ -0,0 +1,15 @@ +diff -Naur digikam-4.14.0/core/libs/dimg/filters/lens/lensfuniface.h digikam-4.14.0-lensfun/core/libs/dimg/filters/lens/lensfuniface.h +--- digikam-4.14.0/core/libs/dimg/filters/lens/lensfuniface.h 2015-10-13 23:58:21.000000000 +0200 ++++ digikam-4.14.0-lensfun/core/libs/dimg/filters/lens/lensfuniface.h 2015-12-15 01:39:23.846742526 +0100 +@@ -24,10 +24,8 @@ + + // Lib LensFun includes + +-extern "C" +-{ ++ + #include <lensfun.h> +-} + + // local includes + diff --git a/source/kde-extra/digikam/opencv-1.patch b/source/kde-extra/digikam/opencv-1.patch new file mode 100644 index 0000000..ef97d51 --- /dev/null +++ b/source/kde-extra/digikam/opencv-1.patch @@ -0,0 +1,11 @@ +--- digikam-4.10.0_old/extra/libkface/libkface/libopencv.h.cmake.in 2015-05-10 11:09:07.000000000 +0200 ++++ digikam-4.10.0/extra/libkface/libkface/libopencv.h.cmake.in 2015-07-18 14:13:55.276829677 +0200 +@@ -53,5 +53,9 @@ + + #include <opencv2/core/core.hpp> ++#if CV_MAJOR_VERSION == 2 + #include <opencv2/core/internal.hpp> ++#elif CV_MAJOR_VERSION == 3 ++#include <opencv2/core/private.hpp> ++#endif + #include <opencv2/contrib/contrib.hpp> _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
