diff options
author | root <root@rshg054.dnsready.net> | 2012-05-04 00:01:57 +0000 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2012-05-04 00:01:57 +0000 |
commit | 0a24fb835cac4007388213ad0afb15257b035b14 (patch) | |
tree | 799a160f6daeb40ccbb6f1d06e7ef3ea0caaf660 /extra/digikam/digikam-2.5.0-gcc-4.7.0.patch | |
parent | 5520a8b04cecf4af812cbf2285e9ab6efabe147f (diff) |
Fri May 4 00:01:56 UTC 2012
Diffstat (limited to 'extra/digikam/digikam-2.5.0-gcc-4.7.0.patch')
-rw-r--r-- | extra/digikam/digikam-2.5.0-gcc-4.7.0.patch | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/extra/digikam/digikam-2.5.0-gcc-4.7.0.patch b/extra/digikam/digikam-2.5.0-gcc-4.7.0.patch new file mode 100644 index 000000000..535387b92 --- /dev/null +++ b/extra/digikam/digikam-2.5.0-gcc-4.7.0.patch @@ -0,0 +1,63 @@ +--- digikam-2.5.0/core/digikam/album/albummanager.h 2012-01-03 02:32:41.000000000 +0200 ++++ digikam-2.5.0/core/digikam/album/albummanager.h 2012-01-05 03:18:16.291639995 +0200 +@@ -831,7 +831,7 @@ + { + foreach(T* t, list) + { +- append(AlbumPointer<T>(t)); ++ this->append(AlbumPointer<T>(t)); + } + return *this; + } +--- digikam-2.5.0/core/libs/database/imagehistory/imagehistorygraph_boost.h 2012-01-03 02:32:26.000000000 +0200 ++++ digikam-2.5.0/core/libs/database/imagehistory/imagehistorygraph_boost.h 2012-01-05 03:01:56.965609602 +0200 +@@ -1362,7 +1362,7 @@ + template <typename VertexType, typename GraphType> + void discover_vertex(VertexType u, const GraphType&) const + { +- record(u); ++ this->record(u); + } + }; + +@@ -1373,7 +1373,7 @@ + template <typename VertexType, typename GraphType> + void discover_vertex(VertexType u, const GraphType&) const + { +- record(u); ++ this->record(u); + } + }; + +--- digikam-2.5.0/core/utilities/cameragui/devices/gpcamera.cpp 2012-01-03 02:32:04.000000000 +0200 ++++ digikam-2.5.0/core/utilities/cameragui/devices/gpcamera.cpp 2012-01-05 01:22:34.009352997 +0200 +@@ -30,6 +30,7 @@ + extern "C" + { + #include <utime.h> ++#include <unistd.h> + } + + // C++ includes +--- digikam-2.5.0/extra/kipi-plugins/htmlexport/wizard.cpp 2012-01-03 02:31:42.000000000 +0200 ++++ digikam-2.5.0/extra/kipi-plugins/htmlexport/wizard.cpp 2012-01-05 02:35:01.061054821 +0200 +@@ -78,7 +78,7 @@ + public: + WizardPage(KAssistantDialog* dialog, const QString& title) + : QWidget(dialog) { +- setupUi(this); ++ this->setupUi(this); + layout()->setMargin(0); + mPage = dialog->addPage(this, title); + } +--- digikam-2.5.0/extra/kipi-plugins/printimages/wizard/wizard.cpp 2012-01-03 02:31:34.000000000 +0200 ++++ digikam-2.5.0/extra/kipi-plugins/printimages/wizard/wizard.cpp 2012-01-05 02:17:15.249914790 +0200 +@@ -88,7 +88,7 @@ + WizardPage ( KAssistantDialog* dialog, const QString& title ) + : QWidget ( dialog ) + { +- setupUi ( this ); ++ this->setupUi ( this ); + layout()->setMargin ( 0 ); + mPage = dialog->addPage ( this, title ); + } |