Hi, I applied the patch. Please check.<br><br><div class="gmail_quote">On Wed, Jul 14, 2010 at 5:42 PM, Gilles Caulier <span dir="ltr"><<a href="mailto:caulier.gilles@gmail.com">caulier.gilles@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">All patch are applyied to trunk, excepted libface. I don't have right<br>
to libface repository to patch it.<br>
<br>
Aditya, can you apply this patch please.<br>
<br>
Thanks in advance<br>
<br>
Gilles<br>
<br>
2010/7/14 Gilles Caulier <<a href="mailto:caulier.gilles@gmail.com">caulier.gilles@gmail.com</a>>:<br>
<div><div></div><div class="h5">> Thanks a lots David, i will apply your patch to svn.<br>
><br>
> Usually, i patch myself code under windows, but currently, my windows<br>
> install is broken, after to try to install mingw4.<br>
><br>
> How do you install mingw4 on your computer to work with you KDE4<br>
> install ? Here, i always use mingw3 based on gcc 3.x. I used standard<br>
> install setup program from mingw SF download page, as i explain to my<br>
> tutuorial :<br>
><br>
> <a href="http://www.digikam.org/drupal/node/525" target="_blank">http://www.digikam.org/drupal/node/525</a><br>
><br>
> Do you tried to use TDM-GCC install ?<br>
><br>
> <a href="http://tdm-gcc.tdragon.net/" target="_blank">http://tdm-gcc.tdragon.net/</a><br>
><br>
> Best<br>
><br>
> Gilles Caulier<br>
><br>
> 2010/7/14 David Eriksson <<a href="mailto:meldavid@acc.umu.se">meldavid@acc.umu.se</a>>:<br>
>> Hi,<br>
>><br>
>> The GSoC branch does not compile with mingw4 on Windows XP as it is now.<br>
>> There are only small problems and I have created patches against the<br>
>> different components.<br>
>><br>
>> libface:<br>
>> Under Windows the DLL-files need to be installed in bin. This is done by<br>
>> setting both RUNTIME DESTINATION and LIBRARY DESTINATION.<br>
>> Under Windows the default location of the haarcascades-directory is<br>
>> OPENCVDIR/data/haarcascades.<br>
>><br>
>> libkexiv2:<br>
>> To get libkexiv2 to compile under Windows the definition -DEXV_HAVE_DLL is<br>
>> needed. This applies to both the GSoC-branch and the trunk.<br>
>><br>
>> libkmap:<br>
>> The export-macro looks for MAKE_LIBKMAP_LIB but MAKE_KMAP_LIB is needed.<br>
>><br>
>> gpssync:<br>
>> Here there are problems with the export-macors.<br>
>><br>
>> digikam:<br>
>> Here there are also problems with the export-macros.<br>
>><br>
>> With these patches it compiles for me.<br>
>><br>
>> Best Regards,<br>
>><br>
>> David Eriksson<br>
>><br>
>> Index: libs/database/imagetagpair.h<br>
>> ===================================================================<br>
>> --- libs/database/imagetagpair.h (revision 1149793)<br>
>> +++ libs/database/imagetagpair.h (working copy)<br>
>> @@ -41,7 +41,7 @@<br>
>> class ImageInfo;<br>
>> class ImageTagPairPriv;<br>
>><br>
>> -class DIGIKAM_EXPORT ImageTagPair<br>
>> +class DIGIKAM_DATABASE_EXPORT ImageTagPair<br>
>> {<br>
>> public:<br>
>><br>
>> Index: libs/database/tagproperties.h<br>
>> ===================================================================<br>
>> --- libs/database/tagproperties.h (revision 1149793)<br>
>> +++ libs/database/tagproperties.h (working copy)<br>
>> @@ -40,7 +40,7 @@<br>
>><br>
>> class TagPropertiesPriv;<br>
>><br>
>> -class DIGIKAM_EXPORT TagProperties<br>
>> +class DIGIKAM_DATABASE_EXPORT TagProperties<br>
>> {<br>
>> public:<br>
>><br>
>> Index:<br>
>> utilities/advancedrename/parser/options/database/keys/positionkeys.cpp<br>
>> ===================================================================<br>
>> --- utilities/advancedrename/parser/options/database/keys/positionkeys.cpp<br>
>> (revision 1149793)<br>
>> +++ utilities/advancedrename/parser/options/database/keys/positionkeys.cpp<br>
>> (working copy)<br>
>> @@ -31,7 +31,7 @@<br>
>><br>
>> #include "databaseinfocontainers.h"<br>
>> #include "imageinfo.h"<br>
>> -#include "imageposition.cpp"<br>
>> +#include "imageposition.h"<br>
>><br>
>> static const QString KEY_LATITUDE("Latitude");<br>
>> static const QString KEY_LONGITUDE("Longitude");<br>
>> Index: utilities/scriptiface/scriptiface.h<br>
>> ===================================================================<br>
>> --- utilities/scriptiface/scriptiface.h (revision 1149793)<br>
>> +++ utilities/scriptiface/scriptiface.h (working copy)<br>
>> @@ -31,14 +31,12 @@<br>
>><br>
>> // Local includes<br>
>><br>
>> -#include "digikam_export.h"<br>
>> -<br>
>> namespace Digikam<br>
>> {<br>
>><br>
>> class ScriptIfacePriv;<br>
>><br>
>> -class DIGIKAM_EXPORT ScriptIface : public KDialog<br>
>> +class ScriptIface : public KDialog<br>
>> {<br>
>> Q_OBJECT<br>
>><br>
>><br>
>> Index: gpssync/borrowed-future/klinkitemselectionmodel.h<br>
>> ===================================================================<br>
>> --- gpssync/borrowed-future/klinkitemselectionmodel.h (revision 1149793)<br>
>> +++ gpssync/borrowed-future/klinkitemselectionmodel.h (working copy)<br>
>> @@ -25,8 +25,6 @@<br>
>> #include <QtGui/QItemSelectionModel><br>
>> #include <QtGui/QAbstractProxyModel><br>
>><br>
>> -#include "kdeui_export.h"<br>
>> -<br>
>> class KLinkItemSelectionModelPrivate;<br>
>><br>
>> /**<br>
>> @@ -92,7 +90,7 @@<br>
>> @author Stephen Kelly <<a href="mailto:steveire@gmail.com">steveire@gmail.com</a>><br>
>><br>
>> */<br>
>> -class KDEUI_EXPORT KLinkItemSelectionModel : public QItemSelectionModel<br>
>> +class KLinkItemSelectionModel : public QItemSelectionModel<br>
>> {<br>
>> Q_OBJECT<br>
>> public:<br>
>> Index: gpssync/borrowed-future/kmodelindexproxymapper.h<br>
>> ===================================================================<br>
>> --- gpssync/borrowed-future/kmodelindexproxymapper.h (revision 1149793)<br>
>> +++ gpssync/borrowed-future/kmodelindexproxymapper.h (working copy)<br>
>> @@ -24,8 +24,6 @@<br>
>><br>
>> #include <QObject><br>
>><br>
>> -#include "kdeui_export.h"<br>
>> -<br>
>> class QAbstractItemModel;<br>
>> class QModelIndex;<br>
>> class QItemSelection;<br>
>> @@ -76,7 +74,7 @@<br>
>> * @author Stephen Kelly <<a href="mailto:steveire@gmail.com">steveire@gmail.com</a>><br>
>> *<br>
>> */<br>
>> -class KDEUI_EXPORT KModelIndexProxyMapper : public QObject<br>
>> +class KModelIndexProxyMapper : public QObject<br>
>> {<br>
>> Q_OBJECT<br>
>> public:<br>
>><br>
>> Index: CMakeLists.txt<br>
>> ===================================================================<br>
>> --- CMakeLists.txt (revision 128)<br>
>> +++ CMakeLists.txt (working copy)<br>
>> @@ -16,6 +16,7 @@<br>
>> INCLUDE_DIRECTORIES("${PROJECT_BINARY_DIR}")<br>
>> INCLUDE_DIRECTORIES("${PROJECT_SOURCE_DIR}/src")<br>
>><br>
>> +SET(BINDIR bin)<br>
>><br>
>> #Check if system is 32 or 64 bit. Thanks to ulrichard for pointing to link.<br>
>> IF(CMAKE_SIZEOF_VOID_P EQUAL 8)<br>
>> Index: src/CMakeLists.txt<br>
>> ===================================================================<br>
>> --- src/CMakeLists.txt (revision 128)<br>
>> +++ src/CMakeLists.txt (working copy)<br>
>> @@ -14,7 +14,7 @@<br>
>> SET_TARGET_PROPERTIES(face PROPERTIES VERSION<br>
>> ${${PROJECT_NAME}_MAJOR_VERSION}.${${PROJECT_NAME}_MINOR_VERSION})<br>
>> SET_TARGET_PROPERTIES(face PROPERTIES SOVERSION<br>
>> ${${PROJECT_NAME}_MAJOR_VERSION})<br>
>><br>
>> -INSTALL(TARGETS face DESTINATION ${LIBDIR})<br>
>> +INSTALL(TARGETS face RUNTIME DESTINATION ${BINDIR} LIBRARY DESTINATION<br>
>> ${LIBDIR})<br>
>> INSTALL(FILES LibFace.h<br>
>> Face.h<br>
>> LibFaceCore.h<br>
>> Index: src/LibFace.h<br>
>> ===================================================================<br>
>> --- src/LibFace.h (revision 128)<br>
>> +++ src/LibFace.h (working copy)<br>
>> @@ -56,7 +56,11 @@<br>
>><br>
>><br>
>> public:<br>
>> +#ifdef WIN32<br>
>> + LibFace(Mode type=ALL, const std::string & configDir=".", const<br>
>> std::string & cascadeDir = std::string(OPENCVDIR)+"/data/haarcascades");<br>
>> +#else<br>
>> LibFace(Mode type=ALL, const std::string & configDir=".", const<br>
>> std::string & cascadeDir = std::string(OPENCVDIR)+"/haarcascades");<br>
>> +#endif<br>
>> ~LibFace();<br>
>><br>
>> // OpenCV compatibility methods<br>
>><br>
>> Index: libkexiv2/CMakeLists.txt<br>
>> ===================================================================<br>
>> --- libkexiv2/CMakeLists.txt (revision 1149793)<br>
>> +++ libkexiv2/CMakeLists.txt (working copy)<br>
>> @@ -26,6 +26,9 @@<br>
>><br>
>> ADD_DEFINITIONS(${EXIV2_DEFINITIONS})<br>
>> ADD_DEFINITIONS(${KDE4_ENABLE_EXCEPTIONS})<br>
>> +IF( WIN32 )<br>
>> +ADD_DEFINITIONS( -DEXV_HAVE_DLL )<br>
>> +ENDIF( WIN32 )<br>
>><br>
>> CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/version.h.cmake<br>
>> ${CMAKE_CURRENT_BINARY_DIR}/version.h)<br>
>><br>
>><br>
>> Index: libkmap/libkmap_export.h<br>
>> ===================================================================<br>
>> --- libkmap/libkmap_export.h (revision 1149793)<br>
>> +++ libkmap/libkmap_export.h (working copy)<br>
>> @@ -24,7 +24,7 @@<br>
>> #include <kdemacros.h><br>
>><br>
>> #ifndef KMAP_EXPORT<br>
>> -# if defined(MAKE_LIBKMAP_LIB)<br>
>> +# if defined(MAKE_KMAP_LIB)<br>
>> // We are building this library<br>
>> # define KMAP_EXPORT KDE_EXPORT<br>
>> # else<br>
>><br>
>> _______________________________________________<br>
>> Digikam-devel mailing list<br>
>> <a href="mailto:Digikam-devel@kde.org">Digikam-devel@kde.org</a><br>
>> <a href="https://mail.kde.org/mailman/listinfo/digikam-devel" target="_blank">https://mail.kde.org/mailman/listinfo/digikam-devel</a><br>
>><br>
>><br>
><br>
_______________________________________________<br>
Digikam-devel mailing list<br>
<a href="mailto:Digikam-devel@kde.org">Digikam-devel@kde.org</a><br>
<a href="https://mail.kde.org/mailman/listinfo/digikam-devel" target="_blank">https://mail.kde.org/mailman/listinfo/digikam-devel</a><br>
</div></div></blockquote></div><br><br clear="all"><br>-- <br>Aditya Bhatt<br>Blog : <a href="http://adityabhatt.wordpress.com">http://adityabhatt.wordpress.com</a><br>Bitbucket: <a href="http://bitbucket.org/aditya_bhatt">http://bitbucket.org/aditya_bhatt</a><br>
Face Recognition Library : <a href="http://libface.sourceforge.net">http://libface.sourceforge.net</a><br>