From 45f8425638b1eb44562881c9a931eb3318359da281879271aa539df800e92174 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 3 May 2012 08:55:18 +0000 Subject: [PATCH] Accepting request 115252 from KDE:Distro:Factory Fix build with gcc 4.7 - Please work with upstream to resolve it in upstream code base. There is also a chance that a newer version of the package might have this fixed already. (forwarded request 115248 from dimstar) OBS-URL: https://build.opensuse.org/request/show/115252 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/digikam?expand=0&rev=91 --- digikam-gcc47.patch | 73 +++++++++++++++++++++++++++++++++++++++++++++ digikam.changes | 5 ++++ digikam.spec | 3 ++ 3 files changed, 81 insertions(+) create mode 100644 digikam-gcc47.patch diff --git a/digikam-gcc47.patch b/digikam-gcc47.patch new file mode 100644 index 0000000..4cad1b8 --- /dev/null +++ b/digikam-gcc47.patch @@ -0,0 +1,73 @@ +Index: digikam-2.5.0/core/utilities/cameragui/devices/gpcamera.cpp +=================================================================== +--- digikam-2.5.0.orig/core/utilities/cameragui/devices/gpcamera.cpp ++++ digikam-2.5.0/core/utilities/cameragui/devices/gpcamera.cpp +@@ -34,6 +34,7 @@ extern "C" + + // C++ includes + ++#include + #include + #include + +Index: digikam-2.5.0/extra/kipi-plugins/printimages/wizard/wizard.cpp +=================================================================== +--- digikam-2.5.0.orig/extra/kipi-plugins/printimages/wizard/wizard.cpp ++++ digikam-2.5.0/extra/kipi-plugins/printimages/wizard/wizard.cpp +@@ -88,7 +88,7 @@ public: + WizardPage ( KAssistantDialog* dialog, const QString& title ) + : QWidget ( dialog ) + { +- setupUi ( this ); ++ this->setupUi ( this ); + layout()->setMargin ( 0 ); + mPage = dialog->addPage ( this, title ); + } +Index: digikam-2.5.0/extra/kipi-plugins/htmlexport/wizard.cpp +=================================================================== +--- digikam-2.5.0.orig/extra/kipi-plugins/htmlexport/wizard.cpp ++++ digikam-2.5.0/extra/kipi-plugins/htmlexport/wizard.cpp +@@ -78,7 +78,7 @@ class WizardPage : public QWidget, publi + public: + WizardPage(KAssistantDialog* dialog, const QString& title) + : QWidget(dialog) { +- setupUi(this); ++ this->setupUi(this); + layout()->setMargin(0); + mPage = dialog->addPage(this, title); + } +Index: digikam-2.5.0/core/libs/database/imagehistory/imagehistorygraph_boost.h +=================================================================== +--- digikam-2.5.0.orig/core/libs/database/imagehistory/imagehistorygraph_boost.h ++++ digikam-2.5.0/core/libs/database/imagehistory/imagehistorygraph_boost.h +@@ -1362,7 +1362,7 @@ protected: + template + void discover_vertex(VertexType u, const GraphType&) const + { +- record(u); ++ this->record(u); + } + }; + +@@ -1373,7 +1373,7 @@ protected: + template + void discover_vertex(VertexType u, const GraphType&) const + { +- record(u); ++ this->record(u); + } + }; + +Index: digikam-2.5.0/core/digikam/album/albummanager.h +=================================================================== +--- digikam-2.5.0.orig/core/digikam/album/albummanager.h ++++ digikam-2.5.0/core/digikam/album/albummanager.h +@@ -831,7 +831,7 @@ public: + { + foreach(T* t, list) + { +- append(AlbumPointer(t)); ++ this->append(AlbumPointer(t)); + } + return *this; + } diff --git a/digikam.changes b/digikam.changes index f320480..bc11eee 100644 --- a/digikam.changes +++ b/digikam.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 24 18:27:43 UTC 2012 - dimstar@opensuse.org + +- Add digikam-gcc47.patch: Fix build with gcc 4.7. + ------------------------------------------------------------------- Mon Apr 2 08:48:32 UTC 2012 - idonmez@suse.com diff --git a/digikam.spec b/digikam.spec index b949bd6..745e5ca 100644 --- a/digikam.spec +++ b/digikam.spec @@ -40,6 +40,8 @@ Patch5: fix-broken-icon-reference.diff Patch6: digikam_no_build_vkontakte.diff # PATCH-FIX-UPSTREAM digikam-boost-1.48.patch idoenmez@suse.de -- Compile with Boost 1.48+, upstream commit d18ea6da2d3e2359f411 Patch7: digikam-boost-1.48.patch +# PATCH-FIX-UPSTREAM digikam-gcc47.patch dimstar@opensuse.org -- Fix build with gcc 4.7 +Patch8: digikam-gcc47.patch BuildRequires: ImageMagick BuildRequires: boost-devel BuildRequires: doxygen @@ -261,6 +263,7 @@ popd %patch5 %patch6 -p0 %patch7 -p1 +%patch8 -p1 # Remove build time references so build-compare can do its work FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')