Hi,
since flashplugin version 10.1.53.64 qtwebkit crashes, since gtk_init() was
not called before loading flash.
According to Lionel this will be fixed in qtwebkit2.
So the attached patch calls gtk_init(); from rekonq's main in order to
workaround this crash. Unfortunately my cmake skills are not sufficient to
only include gtk for the affected qtwebkit versions.
So the patch is just the rare fix, sorry about that.
Thanks,
Johannes
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6f29bb2..6cdc060 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -73,6 +73,10 @@ ELSE(KDE4_FOUND)
MESSAGE(STATUS "")
ENDIF(KDE4_FOUND)
+# ---------------------------------- GTK -------------------------------------
+SET( GTK2_FIND_REQUIRED TRUE)
+INCLUDE( FindGTK2)
+
##### FINAL RESULTS #####
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d0e5721..6eace20 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -90,6 +90,7 @@ INCLUDE_DIRECTORIES ( ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${KDE4_INCLUDES}
${QT4_INCLUDES}
+ ${GTK2_INCLUDE_DIRS}
)
@@ -113,6 +114,7 @@ TARGET_LINK_LIBRARIES ( kdeinit_rekonq
${KDE4_KIO_LIBS}
${KDE4_KPARTS_LIBS}
${KDE4_THREADWEAVER_LIBRARIES}
+ ${GTK2_LIBRARIES}
)
diff --git a/src/main.cpp b/src/main.cpp
index 6b1f123..37c054b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -23,6 +23,8 @@
*
* ============================================================ */
+// workaround for recent flashplugins
+#include <gtk/gtk.h>
// version include
#include "../version.h"
@@ -43,6 +45,9 @@ static const char description[] =
extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
{
+ // just a hackisch workaround for recent flashplugins
+ gtk_init(&argc, &argv);
+
KAboutData about("rekonq",
0,
ki18n("rekonq"),
_______________________________________________
rekonq mailing list
[email protected]
https://mail.kde.org/mailman/listinfo/rekonq
