[Digikam-devel] branches/extragear/graphics/digikam

[Gabriel Voicu]

Yes, digiKam compiled now! Thank you!
The only problem here now is that libkexiv2 doesn't compile anymore. Here is
the console:

"/home/gabi/workspace/gsoc/graphics/libkexiv2/libkexiv2/kexiv2exif.cpp: In
member function ‘QMap<QString, QStringList>
KExiv2Iface::KExiv2::getMakernoteTagsList() const’:
/home/gabi/workspace/gsoc/graphics/libkexiv2/libkexiv2/kexiv2exif.cpp:1014:
error: ‘Exiv2::Nikon1MakerNote’ has not been declared
/home/gabi/workspace/gsoc/graphics/libkexiv2/libkexiv2/kexiv2exif.cpp:1015:
error: ‘Exiv2::Nikon2MakerNote’ has not been declared
/home/gabi/workspace/gsoc/graphics/libkexiv2/libkexiv2/kexiv2exif.cpp:1016:
error: ‘Exiv2::Nikon3MakerNote’ has not been declared"

Gabriel

2010/8/15 Gilles Caulier <caulier.gilles at gmail.com>

> Fixed with rev #1163979. Try again
>
> Gilles
>
> Le 15 août 2010 15:15, Gilles Caulier <caulier.gilles at gmail.com> a écrit :
> > This is my command line used to sync branch with trunk :
> >
> > [gilles at localhost digikam]$ svn merge -r1159811:HEAD
> > svn+ssh://cgilles@svn.kde.org/home/kde/trunk/extragear/graphics/digikam
> > --- Fusion de r1159812 à r1163886 dans '.':
> > U    tests/advancedrenametest.h
> > U    tests/advancedrenametest.cpp
> > Conflit découvert dans 'NEWS'.
> > Sélectionner : (p) report, (df) diff entier, (e) édite,
> >        (mc) mes conflits, (tc) autres conflits,
> >        (s) affiche toutes les options : p
> > C    NEWS
> > U    CMakeLists.txt
> > U    libs/dimg/filters/bw/bwsepiasettings.cpp
> > U    digikam/daboutdata.h
> > U    digikam/digikam.notifyrc
> > U    showfoto/showfoto.desktop
> > U    showfoto/showfoto.cpp
> > U    utilities/queuemanager/queuesettingsview.cpp
> > U    utilities/queuemanager/basetools/color/bwconvert.cpp
> > U    utilities/queuemanager/queuelist.cpp
> > U    utilities/queuemanager/batchtool.h
> > Conflit découvert dans 'utilities/imageeditor/editor/imagewindow.cpp'.
> > Sélectionner : (p) report, (df) diff entier, (e) édite,
> >        (mc) mes conflits, (tc) autres conflits,
> >        (s) affiche toutes les options : p
> > C    utilities/imageeditor/editor/imagewindow.cpp
> > U    utilities/imageeditor/editor/editorwindow.h
> > U    utilities/imageeditor/widgets/previewlist.cpp
> > U    utilities/advancedrename/advancedrenamewidget.cpp
> > U    utilities/advancedrename/advancedrenamewidget.h
> > Conflit découvert dans 'utilities/advancedrename/common/parsesettings.h'.
> > Sélectionner : (p) report, (df) diff entier, (e) édite,
> >        (mc) mes conflits, (tc) autres conflits,
> >        (s) affiche toutes les options : p
> > C    utilities/advancedrename/common/parsesettings.h
> > U    utilities/advancedrename/common/parser.h
> > U    utilities/advancedrename/common/parser.cpp
> > 'utilities/advancedrename/advancedrenamemanager.cpp' omis
> > 'utilities/advancedrename/parser/modifiers/removedoublesmodifier.h' omis
> > 'utilities/advancedrename/parser/modifiers/removedoublesmodifier.cpp'
> omis
> > U    utilities/advancedrename/parser/options/cameranameoption.cpp
> > U    utilities/advancedrename/parser/options/dateoption.cpp
> > U
>  utilities/advancedrename/parser/options/sequencenumberoptiondialogwidget.ui
> > U    utilities/advancedrename/parser/options/sequencenumberoption.cpp
> > U    utilities/advancedrename/advancedrenamedialog.cpp
> > 'utilities/advancedrename/advancedrenamemanager.h' omis
> > U    utilities/cameragui/cameraiconview.cpp
> > U    utilities/cameragui/renamecustomizer.h
> > U    utilities/cameragui/renamecustomizer.cpp
> > Résumé des conflits :
> >  Conflits textuels : 3
> >  Chemins omis : 4
> > [gilles at localhost digikam]$
> >
> > About NEWS files, we don't care.
> >
> > I resolved conflict with imagewindow.cpp and parsesettings.h.
> >
> > I don't know why some files have been omit with sync
> >
> > Gilles
> >
> _______________________________________________
> Digikam-devel mailing list
> Digikam-devel at kde.org
> https://mail.kde.org/mailman/listinfo/digikam-devel
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/digikam-devel/attachments/20100815/0a4cd3f6/attachment.html>