From 358ca2b519ef87f565dbe6ebb9ca8860063ede96 Mon Sep 17 00:00:00 2001 From: Michael Leibowitz Date: Wed, 1 Aug 2012 21:54:47 -0700 Subject: [PATCH] Fix TZIVI-261 Signed-off-by: Michael Leibowitz --- packaging/navit.changes | 3 +++ packaging/qt5.patch | 57 ++++++++++++++++++++++++++++++------------------- 2 files changed, 38 insertions(+), 22 deletions(-) diff --git a/packaging/navit.changes b/packaging/navit.changes index 3333af4..71bc9de 100644 --- a/packaging/navit.changes +++ b/packaging/navit.changes @@ -1,3 +1,6 @@ +* Thu Aug 2 04:50:11 UTC 2012 - michael.leibowitz@intel.com +- TZIVI-261: switch to explicit use of qpainter + * Tue Jul 24 19:30:24 UTC 2012 - tracy.graydon@intel.com - TZIVI-214: update navit to fix dependencies on old version of QT. diff --git a/packaging/qt5.patch b/packaging/qt5.patch index 0fda665..51a9fc3 100644 --- a/packaging/qt5.patch +++ b/packaging/qt5.patch @@ -1,13 +1,13 @@ -Index: navit-0.5.0/CMakeLists.txt +Index: navit/CMakeLists.txt =================================================================== ---- navit-0.5.0.orig/CMakeLists.txt 2012-06-05 20:40:03.000000000 -0700 -+++ navit-0.5.0/CMakeLists.txt 2012-07-05 16:32:03.496894439 -0700 +--- navit.orig/CMakeLists.txt 2012-07-24 12:32:26.000000000 -0700 ++++ navit/CMakeLists.txt 2012-08-01 21:40:55.931606561 -0700 @@ -1,3 +1,4 @@ +cmake_minimum_required(VERSION 2.8.8) set(MACOSX_BUNDLE_GUI_IDENTIFIER "org.navitproject.navit") set(MACOSX_BUNDLE_BUNDLE_NAME "Navit") project(navit C) -@@ -81,7 +82,7 @@ +@@ -82,7 +83,7 @@ add_module(graphics/opengl "FreeType library not found" FALSE) add_module(graphics/sdl "FreeType library not found" FALSE) add_module(graphics/qt_qpainter "Qt libraries not found" FALSE) @@ -16,7 +16,7 @@ Index: navit-0.5.0/CMakeLists.txt add_module(gui/gtk "GTK libs not found" FALSE) add_module(vehicle/gpsd "gpsd lib not found" FALSE) add_module(vehicle/gypsy "gypsy lib not found" FALSE) -@@ -122,7 +123,16 @@ +@@ -123,7 +124,16 @@ SET(QT_USE_QTSVG TRUE) SET(QT_USE_QTXML TRUE) SET(QT_USE_QTDECLARATIVE TRUE) @@ -34,7 +34,7 @@ Index: navit-0.5.0/CMakeLists.txt endif (NOT DISABLE_QT) #pkg-config based detection find_package(PkgConfig) -@@ -235,12 +245,12 @@ +@@ -236,12 +246,12 @@ set(HAVE_FONTCONFIG 1) endif(FONTCONFIG_FOUND) @@ -51,7 +51,7 @@ Index: navit-0.5.0/CMakeLists.txt set_with_reason(gui/qml "Qt Declarative found" TRUE ${QT_LIBRARIES}) endif() -@@ -250,7 +260,7 @@ +@@ -251,7 +261,7 @@ message( WARNING "QT compiled without SVG support") endif() endif() @@ -60,10 +60,10 @@ Index: navit-0.5.0/CMakeLists.txt if(GTK2_FOUND) include_directories(${GTK2_INCLUDE_DIRS}) -Index: navit-0.5.0/cmake/FindQt4.cmake +Index: navit/cmake/FindQt4.cmake =================================================================== ---- navit-0.5.0.orig/cmake/FindQt4.cmake 2012-06-05 20:40:03.000000000 -0700 -+++ navit-0.5.0/cmake/FindQt4.cmake 2012-07-03 06:27:32.293150988 -0700 +--- navit.orig/cmake/FindQt4.cmake 2012-07-24 12:32:26.000000000 -0700 ++++ navit/cmake/FindQt4.cmake 2012-08-01 21:40:55.931606561 -0700 @@ -790,7 +790,7 @@ # ######################################## @@ -73,10 +73,10 @@ Index: navit-0.5.0/cmake/FindQt4.cmake QtHelp QtWebKit QtXmlPatterns phonon QtNetwork QtMultimedia QtNsPlugin QtOpenGL QtSql QtXml QtDesigner QtDBus QtScriptTools QtDeclarative) -Index: navit-0.5.0/navit/graphics/qt_qpainter/CMakeLists.txt +Index: navit/navit/graphics/qt_qpainter/CMakeLists.txt =================================================================== ---- navit-0.5.0.orig/navit/graphics/qt_qpainter/CMakeLists.txt 2012-06-05 20:40:04.000000000 -0700 -+++ navit-0.5.0/navit/graphics/qt_qpainter/CMakeLists.txt 2012-07-03 14:52:36.829742380 -0700 +--- navit.orig/navit/graphics/qt_qpainter/CMakeLists.txt 2012-07-24 12:32:26.000000000 -0700 ++++ navit/navit/graphics/qt_qpainter/CMakeLists.txt 2012-08-01 21:40:55.931606561 -0700 @@ -1,4 +1,5 @@ module_add_library(graphics_qt_qpainter ${CMAKE_CURRENT_BINARY_DIR}/RenderArea.moc RenderArea.cpp graphics_qt_qpainter.cpp) -QT4_GENERATE_MOC(RenderArea.h ${CMAKE_CURRENT_BINARY_DIR}/RenderArea.moc) @@ -84,10 +84,10 @@ Index: navit-0.5.0/navit/graphics/qt_qpainter/CMakeLists.txt +QT5_GENERATE_MOC(RenderArea.h ${CMAKE_CURRENT_BINARY_DIR}/RenderArea.moc) include_directories(${CMAKE_CURRENT_BINARY_DIR}) -Index: navit-0.5.0/navit/gui/qml/CMakeLists.txt +Index: navit/navit/gui/qml/CMakeLists.txt =================================================================== ---- navit-0.5.0.orig/navit/gui/qml/CMakeLists.txt 2012-06-05 20:40:04.000000000 -0700 -+++ navit-0.5.0/navit/gui/qml/CMakeLists.txt 2012-07-05 12:35:01.317943273 -0700 +--- navit.orig/navit/gui/qml/CMakeLists.txt 2012-07-24 12:32:26.000000000 -0700 ++++ navit/navit/gui/qml/CMakeLists.txt 2012-08-01 21:40:55.931606561 -0700 @@ -3,14 +3,15 @@ add_definitions( -DMODULE=gui_qml ) @@ -113,10 +113,10 @@ Index: navit-0.5.0/navit/gui/qml/CMakeLists.txt module_add_library(gui_qml gui_qml.cpp ${CMAKE_CURRENT_BINARY_DIR}/proxy.moc ${CMAKE_CURRENT_BINARY_DIR}/ngqpoint.moc ${CMAKE_CURRENT_BINARY_DIR}/searchProxy.moc ${CMAKE_CURRENT_BINARY_DIR}/bookmarksProxy.moc ${CMAKE_CURRENT_BINARY_DIR}/vehicleProxy.moc ${CMAKE_CURRENT_BINARY_DIR}/navitProxy.moc ${CMAKE_CURRENT_BINARY_DIR}/guiProxy.moc ${CMAKE_CURRENT_BINARY_DIR}/routeProxy.moc ${CMAKE_CURRENT_BINARY_DIR}/gui_qml.moc) +qt5_use_modules(gui_qml Qml Gui Quick Xml Widgets) -Index: navit-0.5.0/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp +Index: navit/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp =================================================================== ---- navit-0.5.0.orig/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp 2012-06-05 20:40:04.000000000 -0700 -+++ navit-0.5.0/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp 2012-07-03 15:22:49.078045337 -0700 +--- navit.orig/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp 2012-07-24 12:32:26.000000000 -0700 ++++ navit/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp 2012-08-01 21:40:55.931606561 -0700 @@ -595,7 +595,12 @@ #endif } @@ -131,10 +131,10 @@ Index: navit-0.5.0/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp if (!gr->parent) QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents|QEventLoop::ExcludeSocketNotifiers|QEventLoop::DeferredDeletion|QEventLoop::X11ExcludeTimers); #endif -Index: navit-0.5.0/navit/gui/qml/gui_qml.cpp +Index: navit/navit/gui/qml/gui_qml.cpp =================================================================== ---- navit-0.5.0.orig/navit/gui/qml/gui_qml.cpp 2012-06-05 20:40:04.000000000 -0700 -+++ navit-0.5.0/navit/gui/qml/gui_qml.cpp 2012-07-05 12:37:51.753477510 -0700 +--- navit.orig/navit/gui/qml/gui_qml.cpp 2012-07-24 12:32:26.000000000 -0700 ++++ navit/navit/gui/qml/gui_qml.cpp 2012-08-01 21:40:55.931606561 -0700 @@ -1,7 +1,8 @@ #include #include @@ -167,3 +167,16 @@ Index: navit-0.5.0/navit/gui/qml/gui_qml.cpp this_->guiWidget->rootContext()->setContextProperty("gui",this_->guiProxy); this_->guiWidget->rootContext()->setContextProperty("navit",this_->navitProxy); +Index: navit/navit/navit_shipped.xml +=================================================================== +--- navit.orig/navit/navit_shipped.xml 2012-08-01 21:40:41.823320019 -0700 ++++ navit/navit/navit_shipped.xml 2012-08-01 21:41:45.963484698 -0700 +@@ -34,7 +34,7 @@ + + +- ++ + -- 2.7.4