Re: branches/extragear/graphics/di
Locked
Re: branches/extragear/graphics/di
 
|
Gilles,
you don't seem to have merged correctly with trunk. Some files are missing and the GSOC branch will not compile. For example in adavancedrename the AdvancedRenameManager is not synced. Andi On Sunday 15 August 2010 12:06:56 Gilles Caulier wrote: > SVN commit 1163894 by cgilles: > > sync with trunk rev. #1163886 > > > M +5 -3 CMakeLists.txt > M +2 -2 digikam/daboutdata.h > M +17 -0 digikam/digikam.notifyrc > M +37 -33 libs/dimg/filters/bw/bwsepiasettings.cpp > M +9 -0 showfoto/showfoto.cpp > M +1 -0 showfoto/showfoto.desktop > M +120 -222 tests/advancedrenametest.cpp > M +2 -8 tests/advancedrenametest.h > M +22 -11 utilities/advancedrename/advancedrenamedialog.cpp > M +0 -13 utilities/advancedrename/advancedrenamewidget.cpp > M +0 -5 utilities/advancedrename/advancedrenamewidget.h > M +11 -16 utilities/advancedrename/common/parser.cpp > M +1 -1 utilities/advancedrename/common/parser.h > M +3 -8 utilities/advancedrename/common/parsesettings.h > M +37 -1 utilities/advancedrename/parser/options/cameranameoption.cpp > M +2 -4 utilities/advancedrename/parser/options/dateoption.cpp > M +39 -9 > utilities/advancedrename/parser/options/sequencenumberoption.cpp M +7 -0 > > utilities/advancedrename/parser/options/sequencenumberoptiondialogwidget.u > i M +33 -12 utilities/cameragui/cameraiconview.cpp > M +38 -19 utilities/cameragui/renamecustomizer.cpp > M +3 -0 utilities/cameragui/renamecustomizer.h > U utilities/imageeditor/editor/editorwindow.h > M +10 -1 utilities/imageeditor/editor/imagewindow.cpp > M +1 -1 utilities/imageeditor/editor/imagewindow.h > M +2 -1 utilities/imageeditor/widgets/previewlist.cpp > M +2 -0 utilities/queuemanager/basetools/color/bwconvert.cpp > M +13 -1 utilities/queuemanager/batchtool.h > M +44 -12 utilities/queuemanager/queuelist.cpp > M +7 -0 utilities/queuemanager/queuesettingsview.cpp > > > http://websvn.kde.org/?view=rev&revision=1163894 Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: branches/extragear/graphics/di
|
|
strange. it compile there. sound like files are missing (not added) ?
Gilles 2010/8/15 Andi Clemens <[hidden email]>: > Gilles, > > you don't seem to have merged correctly with trunk. Some files are missing and > the GSOC branch will not compile. > > For example in adavancedrename the AdvancedRenameManager is not synced. > > Andi > > > On Sunday 15 August 2010 12:06:56 Gilles Caulier wrote: >> SVN commit 1163894 by cgilles: >> >> sync with trunk rev. #1163886 >> >> >> M +5 -3 CMakeLists.txt >> M +2 -2 digikam/daboutdata.h >> M +17 -0 digikam/digikam.notifyrc >> M +37 -33 libs/dimg/filters/bw/bwsepiasettings.cpp >> M +9 -0 showfoto/showfoto.cpp >> M +1 -0 showfoto/showfoto.desktop >> M +120 -222 tests/advancedrenametest.cpp >> M +2 -8 tests/advancedrenametest.h >> M +22 -11 utilities/advancedrename/advancedrenamedialog.cpp >> M +0 -13 utilities/advancedrename/advancedrenamewidget.cpp >> M +0 -5 utilities/advancedrename/advancedrenamewidget.h >> M +11 -16 utilities/advancedrename/common/parser.cpp >> M +1 -1 utilities/advancedrename/common/parser.h >> M +3 -8 utilities/advancedrename/common/parsesettings.h >> M +37 -1 utilities/advancedrename/parser/options/cameranameoption.cpp >> M +2 -4 utilities/advancedrename/parser/options/dateoption.cpp >> M +39 -9 >> utilities/advancedrename/parser/options/sequencenumberoption.cpp M +7 -0 >> >> utilities/advancedrename/parser/options/sequencenumberoptiondialogwidget.u >> i M +33 -12 utilities/cameragui/cameraiconview.cpp >> M +38 -19 utilities/cameragui/renamecustomizer.cpp >> M +3 -0 utilities/cameragui/renamecustomizer.h >> U utilities/imageeditor/editor/editorwindow.h >> M +10 -1 utilities/imageeditor/editor/imagewindow.cpp >> M +1 -1 utilities/imageeditor/editor/imagewindow.h >> M +2 -1 utilities/imageeditor/widgets/previewlist.cpp >> M +2 -0 utilities/queuemanager/basetools/color/bwconvert.cpp >> M +13 -1 utilities/queuemanager/batchtool.h >> M +44 -12 utilities/queuemanager/queuelist.cpp >> M +7 -0 utilities/queuemanager/queuesettingsview.cpp >> >> >> http://websvn.kde.org/?view=rev&revision=1163894 > _______________________________________________ > Digikam-devel mailing list > [hidden email] > https://mail.kde.org/mailman/listinfo/digikam-devel > Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: branches/extragear/graphics/di
|
|
On Sun, Aug 15, 2010 at 2:58 PM, Gilles Caulier <[hidden email]> wrote: strange. it compile there. sound like files are missing (not added) ? Hi, I can confirm this. I have the same problem: "CMake Error in digikam/CMakeLists.txt: Cannot find source file "advancedrenamemanager.cpp". Tried extensions .c .C .c++ .cc .cpp .cxx .m .M .mm .h .hh .h++ .hm .hpp .hxx .in .txx" Gabriel _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: branches/extragear/graphics/di
|
|
In reply to this post by Gilles Caulier-4
No everything is committed, trunk builds fine.
Andi Clemens ----------------- www.digikam.org On Sunday 15 August 2010 13:58:02 Gilles Caulier wrote: > strange. it compile there. sound like files are missing (not added) ? > > Gilles > > 2010/8/15 Andi Clemens <[hidden email]>: > > Gilles, > > > > you don't seem to have merged correctly with trunk. Some files are > > missing and the GSOC branch will not compile. > > > > For example in adavancedrename the AdvancedRenameManager is not synced. > > > > Andi > > > > On Sunday 15 August 2010 12:06:56 Gilles Caulier wrote: > >> SVN commit 1163894 by cgilles: > >> > >> sync with trunk rev. #1163886 > >> > >> > >> M +5 -3 CMakeLists.txt > >> M +2 -2 digikam/daboutdata.h > >> M +17 -0 digikam/digikam.notifyrc > >> M +37 -33 libs/dimg/filters/bw/bwsepiasettings.cpp > >> M +9 -0 showfoto/showfoto.cpp > >> M +1 -0 showfoto/showfoto.desktop > >> M +120 -222 tests/advancedrenametest.cpp > >> M +2 -8 tests/advancedrenametest.h > >> M +22 -11 utilities/advancedrename/advancedrenamedialog.cpp > >> M +0 -13 utilities/advancedrename/advancedrenamewidget.cpp > >> M +0 -5 utilities/advancedrename/advancedrenamewidget.h > >> M +11 -16 utilities/advancedrename/common/parser.cpp > >> M +1 -1 utilities/advancedrename/common/parser.h > >> M +3 -8 utilities/advancedrename/common/parsesettings.h > >> M +37 -1 > >> utilities/advancedrename/parser/options/cameranameoption.cpp M +2 -4 > >> utilities/advancedrename/parser/options/dateoption.cpp M +39 -9 > >> utilities/advancedrename/parser/options/sequencenumberoption.cpp M +7 > >> -0 > >> > >> utilities/advancedrename/parser/options/sequencenumberoptiondialogwidget > >> .u i M +33 -12 utilities/cameragui/cameraiconview.cpp > >> M +38 -19 utilities/cameragui/renamecustomizer.cpp > >> M +3 -0 utilities/cameragui/renamecustomizer.h > >> U utilities/imageeditor/editor/editorwindow.h > >> M +10 -1 utilities/imageeditor/editor/imagewindow.cpp > >> M +1 -1 utilities/imageeditor/editor/imagewindow.h > >> M +2 -1 utilities/imageeditor/widgets/previewlist.cpp > >> M +2 -0 utilities/queuemanager/basetools/color/bwconvert.cpp > >> M +13 -1 utilities/queuemanager/batchtool.h > >> M +44 -12 utilities/queuemanager/queuelist.cpp > >> M +7 -0 utilities/queuemanager/queuesettingsview.cpp > >> > >> > >> http://websvn.kde.org/?view=rev&revision=1163894 > > > > _______________________________________________ > > Digikam-devel mailing list > > [hidden email] > > https://mail.kde.org/mailman/listinfo/digikam-devel > > _______________________________________________ > Digikam-devel mailing list > [hidden email] > https://mail.kde.org/mailman/listinfo/digikam-devel Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: branches/extragear/graphics/di
|
|
On Sun, Aug 15, 2010 at 3:35 PM, Andi Clemens <[hidden email]> wrote: No everything is committed, trunk builds fine. Have you changed something before updating? Before updating the GSoC branch, digikam compiled fine. After I updated all the GSoC branch, cmake stops and shows me the error listed in my previous mail. If is it from me, what could I do to make digikam compile? Gabriel Andi Clemens _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: branches/extragear/graphics/di
|
|
In reply to this post by Bugzilla from andi.clemens@gmx.net
I don't speak about trunk, i speak about GosC branch, which compile fine there.
Sound like files missing on svn Gilles 2010/8/15 Andi Clemens <[hidden email]>: > No everything is committed, trunk builds fine. > > Andi Clemens > ----------------- > www.digikam.org > > On Sunday 15 August 2010 13:58:02 Gilles Caulier wrote: >> strange. it compile there. sound like files are missing (not added) ? >> >> Gilles >> >> 2010/8/15 Andi Clemens <[hidden email]>: >> > Gilles, >> > >> > you don't seem to have merged correctly with trunk. Some files are >> > missing and the GSOC branch will not compile. >> > >> > For example in adavancedrename the AdvancedRenameManager is not synced. >> > >> > Andi >> > >> > On Sunday 15 August 2010 12:06:56 Gilles Caulier wrote: >> >> SVN commit 1163894 by cgilles: >> >> >> >> sync with trunk rev. #1163886 >> >> >> >> >> >> M +5 -3 CMakeLists.txt >> >> M +2 -2 digikam/daboutdata.h >> >> M +17 -0 digikam/digikam.notifyrc >> >> M +37 -33 libs/dimg/filters/bw/bwsepiasettings.cpp >> >> M +9 -0 showfoto/showfoto.cpp >> >> M +1 -0 showfoto/showfoto.desktop >> >> M +120 -222 tests/advancedrenametest.cpp >> >> M +2 -8 tests/advancedrenametest.h >> >> M +22 -11 utilities/advancedrename/advancedrenamedialog.cpp >> >> M +0 -13 utilities/advancedrename/advancedrenamewidget.cpp >> >> M +0 -5 utilities/advancedrename/advancedrenamewidget.h >> >> M +11 -16 utilities/advancedrename/common/parser.cpp >> >> M +1 -1 utilities/advancedrename/common/parser.h >> >> M +3 -8 utilities/advancedrename/common/parsesettings.h >> >> M +37 -1 >> >> utilities/advancedrename/parser/options/cameranameoption.cpp M +2 -4 >> >> utilities/advancedrename/parser/options/dateoption.cpp M +39 -9 >> >> utilities/advancedrename/parser/options/sequencenumberoption.cpp M +7 >> >> -0 >> >> >> >> utilities/advancedrename/parser/options/sequencenumberoptiondialogwidget >> >> .u i M +33 -12 utilities/cameragui/cameraiconview.cpp >> >> M +38 -19 utilities/cameragui/renamecustomizer.cpp >> >> M +3 -0 utilities/cameragui/renamecustomizer.h >> >> U utilities/imageeditor/editor/editorwindow.h >> >> M +10 -1 utilities/imageeditor/editor/imagewindow.cpp >> >> M +1 -1 utilities/imageeditor/editor/imagewindow.h >> >> M +2 -1 utilities/imageeditor/widgets/previewlist.cpp >> >> M +2 -0 utilities/queuemanager/basetools/color/bwconvert.cpp >> >> M +13 -1 utilities/queuemanager/batchtool.h >> >> M +44 -12 utilities/queuemanager/queuelist.cpp >> >> M +7 -0 utilities/queuemanager/queuesettingsview.cpp >> >> >> >> >> >> http://websvn.kde.org/?view=rev&revision=1163894 >> > >> > _______________________________________________ >> > Digikam-devel mailing list >> > [hidden email] >> > https://mail.kde.org/mailman/listinfo/digikam-devel >> >> _______________________________________________ >> Digikam-devel mailing list >> [hidden email] >> https://mail.kde.org/mailman/listinfo/digikam-devel > _______________________________________________ > Digikam-devel mailing list > [hidden email] > https://mail.kde.org/mailman/listinfo/digikam-devel > Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: branches/extragear/graphics/di
|
|
This is my command line used to sync branch with trunk :
[gilles@localhost digikam]$ svn merge -r1159811:HEAD svn+ssh://[hidden email]/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@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 [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: branches/extragear/graphics/di
|
|
Fixed with rev #1163979. Try again
Gilles Le 15 août 2010 15:15, Gilles Caulier <[hidden email]> a écrit : > This is my command line used to sync branch with trunk : > > [gilles@localhost digikam]$ svn merge -r1159811:HEAD > svn+ssh://[hidden email]/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@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 [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: branches/extragear/graphics/di
|
|
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 <[hidden email]> Fixed with rev #1163979. Try again _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: branches/extragear/graphics/di
|
|
Yes, i know about libkexiv2. It's due to major changes in Exiv2 API.
Patch is under progress on my computer. I will test and commit this evening. Gilles 2010/8/15 Gabriel Voicu <[hidden email]>: > > 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 <[hidden email]> >> >> Fixed with rev #1163979. Try again >> >> Gilles >> >> Le 15 août 2010 15:15, Gilles Caulier <[hidden email]> a écrit : >> > This is my command line used to sync branch with trunk : >> > >> > [gilles@localhost digikam]$ svn merge -r1159811:HEAD >> > svn+ssh://[hidden email]/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@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 >> [hidden email] >> https://mail.kde.org/mailman/listinfo/digikam-devel > > > _______________________________________________ > Digikam-devel mailing list > [hidden email] > https://mail.kde.org/mailman/listinfo/digikam-devel > > Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: branches/extragear/graphics/di
|
|
libkexiv2 fixed to compile with current code from svn trunk of Exiv2.
Only GOSC2010 branch is fixed. Please report if all is fine for you Gilles Caulier 2010/8/15 Gilles Caulier <[hidden email]>: > Yes, i know about libkexiv2. It's due to major changes in Exiv2 API. > Patch is under progress on my computer. I will test and commit this > evening. > > Gilles > > 2010/8/15 Gabriel Voicu <[hidden email]>: >> >> 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 <[hidden email]> >>> >>> Fixed with rev #1163979. Try again >>> >>> Gilles >>> >>> Le 15 août 2010 15:15, Gilles Caulier <[hidden email]> a écrit : >>> > This is my command line used to sync branch with trunk : >>> > >>> > [gilles@localhost digikam]$ svn merge -r1159811:HEAD >>> > svn+ssh://[hidden email]/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@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 >>> [hidden email] >>> https://mail.kde.org/mailman/listinfo/digikam-devel >> >> >> _______________________________________________ >> Digikam-devel mailing list >> [hidden email] >> https://mail.kde.org/mailman/listinfo/digikam-devel >> >> > Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: branches/extragear/graphics/di
|
|
Done with commit 1164210, 1164212, and 1164213
Gilles 2010/8/15 Gilles Caulier <[hidden email]>: > libkexiv2 fixed to compile with current code from svn trunk of Exiv2. > Only GOSC2010 branch is fixed. Please report if all is fine for you > > Gilles Caulier > > 2010/8/15 Gilles Caulier <[hidden email]>: >> Yes, i know about libkexiv2. It's due to major changes in Exiv2 API. >> Patch is under progress on my computer. I will test and commit this >> evening. >> >> Gilles >> >> 2010/8/15 Gabriel Voicu <[hidden email]>: >>> >>> 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 <[hidden email]> >>>> >>>> Fixed with rev #1163979. Try again >>>> >>>> Gilles >>>> >>>> Le 15 août 2010 15:15, Gilles Caulier <[hidden email]> a écrit : >>>> > This is my command line used to sync branch with trunk : >>>> > >>>> > [gilles@localhost digikam]$ svn merge -r1159811:HEAD >>>> > svn+ssh://[hidden email]/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@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 >>>> [hidden email] >>>> https://mail.kde.org/mailman/listinfo/digikam-devel >>> >>> >>> _______________________________________________ >>> Digikam-devel mailing list >>> [hidden email] >>> https://mail.kde.org/mailman/listinfo/digikam-devel >>> >>> >> > Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
«
Return to digikam-devel
|
1 view|%1 views
| Free forum by Nabble | Edit this page |