File 0001-windows-mingw-compile-fix.patch of Package mingw64-drkonqi5

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-windows-mingw-compile-fix.patch of Package mingw64-drkonqi5 (Revision 671cbeb5873f394b5a85fc91c547a5b7)

Currently displaying revision 671cbeb5873f394b5a85fc91c547a5b7 , Show latest

From 9b52e5e1b2bcf8fa983e5aa88123cacf64e0ee95 Mon Sep 17 00:00:00 2001
From: Ralf Habacker <ralf.habacker@blendertest.wh.sag.de>
Date: Fri, 27 Jul 2018 09:24:35 +0200
Subject: [PATCH] Mingw compile fix

- fix finding of bfd, intl, iberty and z library
- fix drkonqi compile issue (missing functions setenv/unsetenv)
  by adding kdewin
- fix include filename case issues on cross compiling
- fix missing includes

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 45dfd382..45a72fbd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,6 +27,50 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS I18n CoreAddons Service
 find_package(Qt5X11Extras ${QT_MIN_VERSION} CONFIG)
 set_package_properties(Qt5X11Extras PROPERTIES TYPE RECOMMENDED PURPOSE "Recommended for better integration on X11.")
 
+if (MINGW)
+    find_package(ZLIB REQUIRED)
+    find_library(INTL_LIBRARY NAMES intl)
+    find_library(IBERTY_LIBRARY NAMES iberty)
+    find_library(BFD_LIBRARY NAMES bfd)
+    if (IBERTY_LIBRARY)
+        set(iberty_FOUND 1)
+    else()
+        set(msg "iberty")
+    endif()
+    if (BFD_LIBRARY)
+        set(bfd_FOUND 1)
+    else()
+        set(msg "${msg} bfd")
+    endif()
+    if (INTL_LIBRARY)
+        set(intl_FOUND 1)
+    else()
+        set(msg "${msg} intl")
+    endif()
+    if (msg)
+        message(FATAL_ERROR "could not find ${msg}")
+    endif()
+    add_library(z STATIC IMPORTED)
+    set_target_properties(z PROPERTIES
+        IMPORTED_LOCATION ${ZLIB_LIBRARIES}
+        IMPORTED_INCLUDE_DIRECTORIES ${ZLIB_INCLUDE_DIRS}
+    )
+    add_library(intl SHARED IMPORTED)
+    set_target_properties(intl PROPERTIES
+        IMPORTED_IMPLIB ${INTL_LIBRARY}
+    )
+    add_library(iberty STATIC IMPORTED)
+    set_target_properties(iberty PROPERTIES
+        IMPORTED_LOCATION ${IBERTY_LIBRARY}
+    )
+    add_library(bfd STATIC IMPORTED)
+    set_target_properties(bfd PROPERTIES
+        IMPORTED_LOCATION ${BFD_LIBRARY}
+        # bfd header requires this to be defined
+        INTERFACE_COMPILE_DEFINITIONS "PACKAGE;PACKAGE_VERSION"
+    )
+endif()
+
 include_directories("${CMAKE_CURRENT_BINARY_DIR}")
 configure_file(config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h)
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8a14ee16..fc316a9f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -12,6 +12,9 @@ configure_file (config-drkonqi.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-drkonq
 add_subdirectory( data )
 add_subdirectory( parser )
 if ( WIN32 )
+    find_package(KDEWin REQUIRED)
+    # for finding drkonqi_debug.h
+    include_directories(${CMAKE_CURRENT_BINARY_DIR})
     add_subdirectory( kdbgwin )
 endif ()
 
@@ -109,6 +112,10 @@ if (${Qt5X11Extras_FOUND})
     )
 endif()
 
+if (WIN32)
+    target_link_libraries(drkonqi kdewin)
+endif()
+
 install(TARGETS drkonqi DESTINATION ${KDE_INSTALL_LIBEXECDIR})
 install(PROGRAMS org.kde.drkonqi.desktop DESTINATION ${KDE_INSTALL_APPDIR})
 
diff --git a/src/drkonqibackends.cpp b/src/drkonqibackends.cpp
index 9f06985c..c9746a99 100644
--- a/src/drkonqibackends.cpp
+++ b/src/drkonqibackends.cpp
@@ -161,7 +161,7 @@ DebuggerManager *KCrashBackend::constructDebuggerManager()
 #ifndef Q_OS_WIN
     QString defaultDebuggerName = config.readEntry("Debugger", QStringLiteral("gdb"));
 #else
-    QString defaultDebuggerName = config.readEntry("Debugger", QString("kdbgwin"));
+    QString defaultDebuggerName = config.readEntry("Debugger", QStringLiteral("kdbgwin"));
 #endif
 
     Debugger firstKnownGoodDebugger, preferredDebugger;
diff --git a/src/kdbgwin/CMakeLists.txt b/src/kdbgwin/CMakeLists.txt
index 82196350..f504ef33 100644
--- a/src/kdbgwin/CMakeLists.txt
+++ b/src/kdbgwin/CMakeLists.txt
@@ -1,3 +1,5 @@
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
+
 set(kdbgwin_SRCS
     common.h
     main.cpp
@@ -9,15 +11,14 @@ set(kdbgwin_SRCS
     callbacks.cpp
     outputters.h
     outputters.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/../drkonqi_debug.cpp
 )
 
 set(COMMON_LIBS dbghelp psapi shlwapi)
 
 if ( MINGW )
-    # FIXME this should be handled in a higher level cmake with proper find
-    # scripts and configuration
     add_executable(kdbgwin ${kdbgwin_SRCS} mingw_generator.h mingw_generator.cpp)
-    target_link_libraries(kdbgwin ${COMMON_LIBS} bfd iberty intl z)
+    target_link_libraries(kdbgwin PRIVATE ${COMMON_LIBS} bfd iberty intl z Qt5::Core)
 endif ()
 if ( MSVC OR ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel"))
     add_executable(kdbgwin ${kdbgwin_SRCS} msvc_generator.h msvc_generator.cpp)
diff --git a/src/kdbgwin/abstract_generator.cpp b/src/kdbgwin/abstract_generator.cpp
index 13863d94..dcb1f09f 100644
--- a/src/kdbgwin/abstract_generator.cpp
+++ b/src/kdbgwin/abstract_generator.cpp
@@ -50,7 +50,7 @@ QString AbstractBTGenerator::GetModuleName()
         return QLatin1String(DEFAULT_MODULE);
     }
 
-    QStringList list = QString(module.ImageName).split("\\");
+    QStringList list = QString(QLatin1String(module.ImageName)).split(QStringLiteral("\\"));
     return list[list.size() - 1];
 }
 
@@ -66,7 +66,7 @@ QString AbstractBTGenerator::GetModulePath()
         return QLatin1String(DEFAULT_MODULE);
     }
 
-    return QString(module.ImageName);
+    return QString(QLatin1String(module.ImageName));
 }
 
 void AbstractBTGenerator::Run(HANDLE hThread, bool bFaultingThread)
diff --git a/src/kdbgwin/abstract_generator.h b/src/kdbgwin/abstract_generator.h
index 271b6e0d..cf9b26dd 100644
--- a/src/kdbgwin/abstract_generator.h
+++ b/src/kdbgwin/abstract_generator.h
@@ -28,6 +28,8 @@
 #include "common.h"
 #include "process.h"
 
+#include <QObject>
+
 const static char*      BACKTRACE_FORMAT    = "%1!%2() [%3 @ %4] at 0x%5";
 // module.dll!KClass::function() [c:\file.cpp @ 10] at 0x0001000
 
diff --git a/src/kdbgwin/common.h b/src/kdbgwin/common.h
index 6c5a5cb0..cd79c4c9 100644
--- a/src/kdbgwin/common.h
+++ b/src/kdbgwin/common.h
@@ -26,23 +26,25 @@
 #pragma once
 
 // the compiler only provides UNICODE. tchar.h checks for the _UNICODE macro
-#if defined(UNICODE)
+#if defined(MSC_VER) && defined(UNICODE)
 #define _UNICODE
 #endif
 
 // first: windows & compiler includes
-#include <Tchar.h>
-#include <Windows.h>
-#include <DbgHelp.h>
-#include <Assert.h>
-#include <Shlwapi.h>
-#include <Psapi.h>
-#include <TlHelp32.h>
+#include <tchar.h>
+#include <windows.h>
+#include <dbghelp.h>
+#include <assert.h>
+#include <shlwapi.h>
+#include <psapi.h>
+#include <tlhelp32.h>
 
+#include "drkonqi_debug.h"
 
 // second: Qt includes
+#include <QLoggingCategory>
 #include <QString>
-#include <QString>
+#include <QMap>
 
 
 // third: KDE includes
diff --git a/src/kdbgwin/main.cpp b/src/kdbgwin/main.cpp
index 727718cf..840dbcae 100644
--- a/src/kdbgwin/main.cpp
+++ b/src/kdbgwin/main.cpp
@@ -27,12 +27,14 @@
 #include "mingw_generator.h"
 #include "outputters.h"
 #include "process.h"
+#include "common.h"
+
 #include <QCoreApplication>
 
 int main(int argc, char *argv[])
 {
     QCoreApplication app(argc, argv);
-    QCoreApplication::setApplicationName("kdbgwin");
+    QCoreApplication::setApplicationName(QStringLiteral("kdbgwin"));
 
     if (argc != 3)
     {
diff --git a/src/kdbgwin/mingw_generator.cpp b/src/kdbgwin/mingw_generator.cpp
index 34752268..1133c9e8 100644
--- a/src/kdbgwin/mingw_generator.cpp
+++ b/src/kdbgwin/mingw_generator.cpp
@@ -127,7 +127,7 @@ void MingwGenerator::LoadSymbol(const QString& module, DWORD64 dwBaseAddr)
 {
     QString symbolFile = module;
     symbolFile.truncate(symbolFile.length() - 4);
-    symbolFile.append(".sym");
+    symbolFile.append(QStringLiteral(".sym"));
 
     m_symbolsMap[module] = false; // default
     QString symbolType;
diff --git a/src/kdbgwin/process.h b/src/kdbgwin/process.h
index ff5d1572..77102283 100644
--- a/src/kdbgwin/process.h
+++ b/src/kdbgwin/process.h
@@ -27,6 +27,9 @@
 
 #include "common.h"
 
+#include <QString>
+#include <QMap>
+
 typedef QMap<DWORD, HANDLE>     TThreadsMap;
 typedef QMap<QString, HMODULE>   TModulesMap;
 
-- 
2.13.7

Places

File 0001-windows-mingw-compile-fix.patch of Package mingw64-drkonqi5 (Revision 671cbeb5873f394b5a85fc91c547a5b7)

Places