Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f7c34d3f2fad24fbe055d321b1f8bc589621faa9
commit f7c34d3f2fad24fbe055d321b1f8bc589621faa9 Author: Melko <[email protected]> Date: Mon Apr 30 00:17:53 2012 +0200 digikam-2.5.0-4-x86_64 * add patch to built against gcc47 diff --git a/source/kde-extra/digikam/0001-apply-patch-67471-to-compile-fine-with-GCC-4.7.0.patch b/source/kde-extra/digikam/0001-apply-patch-67471-to-compile-fine-with-GCC-4.7.0.patch new file mode 100644 index 0000000..ed553ff --- /dev/null +++ b/source/kde-extra/digikam/0001-apply-patch-67471-to-compile-fine-with-GCC-4.7.0.patch @@ -0,0 +1,62 @@ +From 4b7be9b72c11503104ba1d3a4843a9b69c76c0e4 Mon Sep 17 00:00:00 2001 +From: Gilles Caulier <[email protected]> +Date: Thu, 5 Jan 2012 09:16:27 +0100 +Subject: [PATCH] apply patch #67471 to compile fine with GCC 4.7.0 CCBUGS: + 290642 + +--- + digikam/album/albummanager.h | 2 +- + .../imagehistory/imagehistorygraph_boost.h | 4 ++-- + utilities/cameragui/devices/gpcamera.cpp | 1 + + 3 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/digikam/album/albummanager.h b/digikam/album/albummanager.h +index 1c97263..ce0c554 100644 +--- a/core/digikam/album/albummanager.h ++++ b/core/digikam/album/albummanager.h +@@ -831,7 +831,7 @@ public: + { + foreach(T* t, list) + { +- append(AlbumPointer<T>(t)); ++ this->append(AlbumPointer<T>(t)); + } + return *this; + } +diff --git a/libs/database/imagehistory/imagehistorygraph_boost.h b/libs/database/imagehistory/imagehistorygraph_boost.h +index 6ffccce..4017c4f 100644 +--- a/core/libs/database/imagehistory/imagehistorygraph_boost.h ++++ b/core/libs/database/imagehistory/imagehistorygraph_boost.h +@@ -1362,7 +1362,7 @@ protected: + template <typename VertexType, typename GraphType> + void discover_vertex(VertexType u, const GraphType&) const + { +- record(u); ++ this->record(u); + } + }; + +@@ -1373,7 +1373,7 @@ protected: + template <typename VertexType, typename GraphType> + void discover_vertex(VertexType u, const GraphType&) const + { +- record(u); ++ this->record(u); + } + }; + +diff --git a/utilities/cameragui/devices/gpcamera.cpp b/utilities/cameragui/devices/gpcamera.cpp +index 0b56203..d55dcfa 100644 +--- a/core/utilities/cameragui/devices/gpcamera.cpp ++++ b/core/utilities/cameragui/devices/gpcamera.cpp +@@ -30,6 +30,7 @@ + extern "C" + { + #include <utime.h> ++#include <unistd.h> + } + + // C++ includes +-- +1.7.8.2 + diff --git a/source/kde-extra/digikam/FrugalBuild b/source/kde-extra/digikam/FrugalBuild index 88a4a1a..d0a2496 100644 --- a/source/kde-extra/digikam/FrugalBuild +++ b/source/kde-extra/digikam/FrugalBuild @@ -12,13 +12,14 @@ Finclude sourceforge kde depends=("libkdcraw>=$_F_kde_ver" "libkipi>=$_F_kde_ver" "libkde3support>=$_F_kde_ver" \ 'lensfun' 'liblqr' 'libgphoto2' "libknotify>=$_F_kde_ver" 'qjson>=0.7.1' "libkdewebkit>=$_F_kde_ver") makedepends=("${makedepends[@]}" "kdepimlibs-compiletime>=$_F_kde_ver" 'boost' 'ksgmltools2' 'mysql' \ - 'libqtdesigner' 'soprano-backend-redland>=2.7.0') + 'libqtdesigner' 'soprano-backend-redland>=2.7.0' "kdelibs>=$_F_kde_ver" "kdepimlibs>=$_F_kde_ver") groups=('kde-extra' 'kde-apps') archs=('i686' 'x86_64') options=('scriptlet') -source=(${source[@]} enable-checkall-and-cleanall.patch) +source=(${source[@]} enable-checkall-and-cleanall.patch 0001-apply-patch-67471-to-compile-fine-with-GCC-4.7.0.patch) sha1sums=('6cadb838669d1bdcbd6abb677889f7d68d696383' \ - '61791662c27ab1de31b6914e30f9495214236f54') + '61791662c27ab1de31b6914e30f9495214236f54' \ + 'd934202eabb3ce978fa94c220a2963991e0a1f94') subpkgs=("${subpkgs[@]}" "libkface") subdescs=("${subdescs[@]}" "Library to perform face recognition and detection over pictures.") @@ -52,6 +53,7 @@ subgroups=("${subgroups[@]}" 'kde-extra') subarchs=("${subarchs[@]}" 'i686 x86_64') build() { + export CXXFLAGS="$CXXFLAGS -fpermissive" KDE_make KDE_project_split kipi-plugins extra/kipi-plugins _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
