File fix-windows-compile-issue.patch of Package mingw32-kmymoney

Overview Repositories Revisions Requests Users Attributes Meta

File fix-windows-compile-issue.patch of Package mingw32-kmymoney (Revision 41ee5db5317c3a4fb7b8dd0458b9ae7e)

Currently displaying revision 41ee5db5317c3a4fb7b8dd0458b9ae7e , Show latest

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6662521..bbac0cb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -90,6 +90,9 @@ find_package(SharedMimeInfo REQUIRED)
 # set the configuration switch signaling that KDE PIM libraries were found
 if (KdepimLibs_FOUND)
   set(HAVE_KDEPIMLIBS 1)
+  if(WIN32)
+    set(KDEPIMLIBS_AKONADI_CONTACT_LIBS)
+  endif()
 endif (KdepimLibs_FOUND)
 
 add_definitions( ${QT_DEFINITIONS} ${KDE4_DEFINITIONS} ${KDEPIM_DEFINITIONS})
@@ -104,6 +107,9 @@ endif()
 include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
 
 set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" )
+if(WIN32)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DKDEWIN_NO_LOCALTIME_R=1 -DKDEWIN_NO_GMTIME_R=1")
+endif()
 
 # check for Doxygen
 find_package(Doxygen)
diff --git a/kmymoney/mymoney/CMakeLists.txt b/kmymoney/mymoney/CMakeLists.txt
index ffce12e..461908f 100644
--- a/kmymoney/mymoney/CMakeLists.txt
+++ b/kmymoney/mymoney/CMakeLists.txt
@@ -66,7 +66,7 @@ target_link_libraries(kmm_mymoney LINK_PUBLIC
                       kmm_storage
 #                     onlinetask_interfaces
-                      kmm_payeeidentifier_loader
+                      LINK_PRIVATE kmm_payeeidentifier_loader
                       kmm_payeeidentifier
                       payeeidentifier_iban_bic
                       payeeidentifier_nationalAccount
                       kmm_config
diff --git a/kmymoney/mymoney/mymoneycontact.cpp b/kmymoney/mymoney/mymoneycontact.cpp
index cc2caf3..e90f59c 100644
--- a/kmymoney/mymoney/mymoneycontact.cpp
+++ b/kmymoney/mymoney/mymoneycontact.cpp
@@ -26,9 +26,11 @@
 #ifdef HAVE_KDEPIMLIBS
 #include <KPIMIdentities/IdentityManager>
 #include <KPIMIdentities/Identity>
+#ifdef HAVE_AKONADI
 #include <akonadi/recursiveitemfetchjob.h>
 #include <Akonadi/ItemFetchScope>
 #include <Akonadi/Collection>
+#endif
 #include <KABC/Addressee>
 #endif
 
@@ -71,7 +73,7 @@ QString MyMoneyContact::ownerFullName() const
 
 void MyMoneyContact::fetchContact(const QString &email)
 {
-#ifdef HAVE_KDEPIMLIBS
+#if defined(HAVE_KDEPIMLIBS) && defined(HAVE_AKONADI)
   // fetch the contact data
   Akonadi::RecursiveItemFetchJob *job = new Akonadi::RecursiveItemFetchJob(Akonadi::Collection::root(), QStringList() << KABC::Addressee::mimeType());
   job->fetchScope().fetchFullPayload();
@@ -88,7 +90,7 @@ void MyMoneyContact::fetchContact(const QString &email)
 
 void MyMoneyContact::searchContactResult(KJob *job)
 {
-#ifdef HAVE_KDEPIMLIBS
+#if defined(HAVE_KDEPIMLIBS) && defined(HAVE_AKONADI)
   const Akonadi::RecursiveItemFetchJob *contactJob = qobject_cast<Akonadi::RecursiveItemFetchJob*>(job);
   Akonadi::Item::List items;
   if (contactJob)
diff --git a/kmymoney/mymoney/storage/CMakeLists.txt b/kmymoney/mymoney/storage/CMakeLists.txt
index 450d145..2bc2941 100644
--- a/kmymoney/mymoney/storage/CMakeLists.txt
+++ b/kmymoney/mymoney/storage/CMakeLists.txt
@@ -18,7 +18,9 @@ set(storage_a_SOURCES
 # This library is actually not needed. It is built just for
 # convenience, and then linked into kmm_mymoney.
 kde4_add_library( kmm_storage STATIC ${storage_a_SOURCES} )
-
+if( WIN32 )
+  target_compile_definitions(kmm_storage PUBLIC KMM_MYMONEY_EXPORT=)
+endif()
 ########### install files ###############
 
 install(FILES ${storage_HEADERS}
diff --git a/kmymoney/plugins/kbanking/mymoneybanking.cpp b/kmymoney/plugins/kbanking/mymoneybanking.cpp
index d8c4a57..27c874c 100644
--- a/kmymoney/plugins/kbanking/mymoneybanking.cpp
+++ b/kmymoney/plugins/kbanking/mymoneybanking.cpp
@@ -136,7 +136,7 @@ public:
    * KMyMoney asks for accounts over and over again which causes a lot of "Job not supported with this account" error messages.
    * This function filters messages with that string.
    */
-  static int gwenLogHook(GWEN_GUI* gui, const char* domain, GWEN_LOGGER_LEVEL level, const char* message) {
+  static int GWENHYWFAR_CB gwenLogHook(GWEN_GUI* gui, const char* domain, GWEN_LOGGER_LEVEL level, const char* message) {
     Q_UNUSED(gui);
     Q_UNUSED(domain);
     Q_UNUSED(level);
diff --git a/kmymoney/reports/CMakeLists.txt b/kmymoney/reports/CMakeLists.txt
index 24e1c62..2e4895e 100644
--- a/kmymoney/reports/CMakeLists.txt
+++ b/kmymoney/reports/CMakeLists.txt
@@ -13,7 +13,9 @@ set (libreports_a_SOURCES
 )
 
 kde4_add_library(reports STATIC ${libreports_a_SOURCES})
-
+if( WIN32 )
+  target_compile_definitions(reports PUBLIC KMM_MYMONEY_EXPORT=)
+endif()
 add_dependencies(reports kmm_config)
 
 ############## tests ####################
diff --git a/kmymoney/widgets/CMakeLists.txt b/kmymoney/widgets/CMakeLists.txt
index 8f0c147..8d727c0 100644
--- a/kmymoney/widgets/CMakeLists.txt
+++ b/kmymoney/widgets/CMakeLists.txt
@@ -173,6 +173,9 @@ kde4_add_library(widgets STATIC
   ${widgets_ui_srcs}
   )
 target_link_libraries(widgets kmymoney_base)
+if( WIN32 )
+  target_compile_definitions(widgets PUBLIC KMM_MYMONEY_EXPORT=)
+endif()
 
 add_dependencies(widgets kmm_config)

Places

File fix-windows-compile-issue.patch of Package mingw32-kmymoney (Revision 41ee5db5317c3a4fb7b8dd0458b9ae7e)

Places