Hello community, here is the log from the commit of package digikam for openSUSE:Factory checked in at 2012-05-03 10:55:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/digikam (Old) and /work/SRC/openSUSE:Factory/.digikam.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "digikam", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/digikam/digikam.changes 2012-04-02 19:54:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.digikam.new/digikam.changes 2012-05-03 10:55:20.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Apr 24 18:27:43 UTC 2012 - [email protected] + +- Add digikam-gcc47.patch: Fix build with gcc 4.7. + +------------------------------------------------------------------- New: ---- digikam-gcc47.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ digikam.spec ++++++ --- /var/tmp/diff_new_pack.o77n0t/_old 2012-05-03 10:55:22.000000000 +0200 +++ /var/tmp/diff_new_pack.o77n0t/_new 2012-05-03 10:55:22.000000000 +0200 @@ -40,6 +40,8 @@ Patch6: digikam_no_build_vkontakte.diff # PATCH-FIX-UPSTREAM digikam-boost-1.48.patch [email protected] -- Compile with Boost 1.48+, upstream commit d18ea6da2d3e2359f411 Patch7: digikam-boost-1.48.patch +# PATCH-FIX-UPSTREAM digikam-gcc47.patch [email protected] -- Fix build with gcc 4.7 +Patch8: digikam-gcc47.patch BuildRequires: ImageMagick BuildRequires: boost-devel BuildRequires: doxygen @@ -261,6 +263,7 @@ %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') ++++++ digikam-gcc47.patch ++++++ 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 <unistd.h> #include <cstdio> #include <iostream> 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 <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); } }; 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>(t)); + this->append(AlbumPointer<T>(t)); } return *this; } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
