From 7de92696f45aa5735c0a128a4b0cd2e17dbe11d4 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Feb 23 2015 22:22:57 +0000 Subject: respin marblewidget.patch --- diff --git a/marble-14.12.1-marblewidget.patch b/marble-14.12.1-marblewidget.patch index fc033f5..b760454 100644 --- a/marble-14.12.1-marblewidget.patch +++ b/marble-14.12.1-marblewidget.patch @@ -1,6 +1,6 @@ -diff -up marble-14.12.1/CMakeLists.txt.marblewidget_soname marble-14.12.1/CMakeLists.txt ---- marble-14.12.1/CMakeLists.txt.marblewidget_soname 2015-02-21 09:59:19.927640302 -0600 -+++ marble-14.12.1/CMakeLists.txt 2015-02-21 10:47:13.305431997 -0600 +diff -up marble-14.12.1/CMakeLists.txt.marblewidget marble-14.12.1/CMakeLists.txt +--- marble-14.12.1/CMakeLists.txt.marblewidget 2015-02-23 15:43:12.326429493 -0600 ++++ marble-14.12.1/CMakeLists.txt 2015-02-23 15:43:12.328429497 -0600 @@ -56,6 +56,7 @@ if(QT4_FOUND) FIND_PACKAGE(QtDeclarative) include_directories(${QT_QTDECLARATIVE_INCLUDE_DIR}) @@ -17,9 +17,66 @@ diff -up marble-14.12.1/CMakeLists.txt.marblewidget_soname marble-14.12.1/CMakeL SET(CMAKE_AUTOMOC TRUE) SET(CMAKE_AUTOMOC_RELAXED_MODE TRUE) endif() -diff -up marble-14.12.1/src/apps/marble-kde/CMakeLists.txt.marblewidget_soname marble-14.12.1/src/apps/marble-kde/CMakeLists.txt ---- marble-14.12.1/src/apps/marble-kde/CMakeLists.txt.marblewidget_soname 2015-01-01 11:29:24.000000000 -0600 -+++ marble-14.12.1/src/apps/marble-kde/CMakeLists.txt 2015-02-21 10:50:58.024780816 -0600 +diff -up marble-14.12.1/MarbleMacros.cmake.marblewidget marble-14.12.1/MarbleMacros.cmake +--- marble-14.12.1/MarbleMacros.cmake.marblewidget 2015-01-01 11:29:24.000000000 -0600 ++++ marble-14.12.1/MarbleMacros.cmake 2015-02-23 15:48:39.425063659 -0600 +@@ -66,7 +66,7 @@ if( QTONLY ) + ${QT_QTNETWORK_LIBRARY} + ${QT_QTMAIN_LIBRARY} + ${${_target_name}_LIBS} +- marblewidget ) ++ ${MARBLEWIDGET} ) + install( TARGETS ${_target_name} DESTINATION ${MARBLE_PLUGIN_INSTALL_PATH} ) + else( QTONLY ) + kde4_add_plugin( ${_target_name} ${_src} ) +@@ -81,7 +81,7 @@ else( QTONLY ) + ${KDE4_KIO_LIBRARY} + ${QT_QTMAIN_LIBRARY} + ${${_target_name}_LIBS} +- marblewidget ) ++ ${MARBLEWIDGET} ) + install( TARGETS ${_target_name} DESTINATION ${MARBLE_PLUGIN_INSTALL_PATH} ) + endif( QTONLY ) + +@@ -111,7 +111,7 @@ if( QTONLY ) + ${QT_QTNETWORK_LIBRARY} + ${QT_QTMAIN_LIBRARY} + ${${_target_name}_LIBS} +- marblewidget ) ++ ${MARBLEWIDGET} ) + install( TARGETS ${_target_name} DESTINATION ${QT_PLUGINS_DIR}/designer ) + else( QTONLY ) + kde4_add_plugin( ${_target_name} ${_src} ) +@@ -126,7 +126,7 @@ else( QTONLY ) + ${KDE4_KIO_LIBRARY} + ${QT_QTMAIN_LIBRARY} + ${${_target_name}_LIBS} +- marblewidget ) ++ ${MARBLEWIDGET} ) + install( TARGETS ${_target_name} DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer ) + endif( QTONLY ) + +@@ -150,7 +150,7 @@ target_link_libraries( ${_target_name} $ + ${QT_QTNETWORK_LIBRARY} + ${QT_QTMAIN_LIBRARY} + ${${_target_name}_LIBS} +- marblewidget ) ++ ${MARBLEWIDGET} ) + install( TARGETS ${_target_name} DESTINATION ${MARBLE_QT_IMPORTS_DIR}/org/kde/edu/marble/${_install_path} ) + + set_target_properties( ${_target_name} PROPERTIES +@@ -186,7 +186,7 @@ macro( marble_add_test TEST_NAME ) + ${QT_QTGUI_LIBRARY} + ${QT_QTTEST_LIBRARY} + ${Qt5Test_LIBRARIES} +- marblewidget ) ++ ${MARBLEWIDGET} ) + set_target_properties( ${TEST_NAME} PROPERTIES + COMPILE_FLAGS "-DDATA_PATH=\"\\\"${DATA_PATH}\\\"\" -DPLUGIN_PATH=\"\\\"${PLUGIN_PATH}\\\"\"" ) + add_test( ${TEST_NAME} ${TEST_NAME} ) +diff -up marble-14.12.1/src/apps/marble-kde/CMakeLists.txt.marblewidget marble-14.12.1/src/apps/marble-kde/CMakeLists.txt +--- marble-14.12.1/src/apps/marble-kde/CMakeLists.txt.marblewidget 2015-01-01 11:29:24.000000000 -0600 ++++ marble-14.12.1/src/apps/marble-kde/CMakeLists.txt 2015-02-23 15:43:12.328429497 -0600 @@ -8,7 +8,7 @@ set(marblepart_SRCS marble_part.cpp) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../marble-ui ${KDE4_INCLUDES}) kde4_add_kcfg_files(marblepart_SRCS settings.kcfgc) @@ -38,9 +95,9 @@ diff -up marble-14.12.1/src/apps/marble-kde/CMakeLists.txt.marblewidget_soname m astro ) -diff -up marble-14.12.1/src/apps/marble-mobile/CMakeLists.txt.marblewidget_soname marble-14.12.1/src/apps/marble-mobile/CMakeLists.txt ---- marble-14.12.1/src/apps/marble-mobile/CMakeLists.txt.marblewidget_soname 2015-01-01 11:29:24.000000000 -0600 -+++ marble-14.12.1/src/apps/marble-mobile/CMakeLists.txt 2015-02-21 10:50:01.358692857 -0600 +diff -up marble-14.12.1/src/apps/marble-mobile/CMakeLists.txt.marblewidget marble-14.12.1/src/apps/marble-mobile/CMakeLists.txt +--- marble-14.12.1/src/apps/marble-mobile/CMakeLists.txt.marblewidget 2015-01-01 11:29:24.000000000 -0600 ++++ marble-14.12.1/src/apps/marble-mobile/CMakeLists.txt 2015-02-23 15:43:12.328429497 -0600 @@ -25,7 +25,7 @@ add_definitions(-DMARBLE_MOBILE_VERSION_ marble_qt4_automoc( ${marblemobile_SRCS} ) @@ -50,9 +107,9 @@ diff -up marble-14.12.1/src/apps/marble-mobile/CMakeLists.txt.marblewidget_sonam install( TARGETS marble-mobile RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin ) if(APPS_INSTALL_DIR) install(PROGRAMS marble-mobile.desktop DESTINATION ${APPS_INSTALL_DIR}) -diff -up marble-14.12.1/src/apps/marble-qt/CMakeLists.txt.marblewidget_soname marble-14.12.1/src/apps/marble-qt/CMakeLists.txt ---- marble-14.12.1/src/apps/marble-qt/CMakeLists.txt.marblewidget_soname 2015-01-01 11:29:24.000000000 -0600 -+++ marble-14.12.1/src/apps/marble-qt/CMakeLists.txt 2015-02-21 10:51:53.537866986 -0600 +diff -up marble-14.12.1/src/apps/marble-qt/CMakeLists.txt.marblewidget marble-14.12.1/src/apps/marble-qt/CMakeLists.txt +--- marble-14.12.1/src/apps/marble-qt/CMakeLists.txt.marblewidget 2015-01-01 11:29:24.000000000 -0600 ++++ marble-14.12.1/src/apps/marble-qt/CMakeLists.txt 2015-02-23 15:43:12.328429497 -0600 @@ -40,7 +40,7 @@ if (QT4_FOUND) ${QT_QTSCRIPT_LIBRARY} ${QT_QTMAIN_LIBRARY} @@ -71,9 +128,9 @@ diff -up marble-14.12.1/src/apps/marble-qt/CMakeLists.txt.marblewidget_soname ma astro) endif() -diff -up marble-14.12.1/src/apps/marble-touch/CMakeLists.txt.marblewidget_soname marble-14.12.1/src/apps/marble-touch/CMakeLists.txt ---- marble-14.12.1/src/apps/marble-touch/CMakeLists.txt.marblewidget_soname 2015-01-01 11:29:24.000000000 -0600 -+++ marble-14.12.1/src/apps/marble-touch/CMakeLists.txt 2015-02-21 10:50:25.654730570 -0600 +diff -up marble-14.12.1/src/apps/marble-touch/CMakeLists.txt.marblewidget marble-14.12.1/src/apps/marble-touch/CMakeLists.txt +--- marble-14.12.1/src/apps/marble-touch/CMakeLists.txt.marblewidget 2015-01-01 11:29:24.000000000 -0600 ++++ marble-14.12.1/src/apps/marble-touch/CMakeLists.txt 2015-02-23 15:43:12.328429497 -0600 @@ -25,7 +25,7 @@ qt_add_resources(my_SRCS meego.qrc harma marble_qt4_automoc( ${my_SRCS} ) add_executable( marble-touch ${my_SRCS} ) @@ -92,9 +149,9 @@ diff -up marble-14.12.1/src/apps/marble-touch/CMakeLists.txt.marblewidget_soname endif() install( TARGETS marble-touch RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin ) if(APPS_INSTALL_DIR) -diff -up marble-14.12.1/src/apps/marble-ui/CMakeLists.txt.marblewidget_soname marble-14.12.1/src/apps/marble-ui/CMakeLists.txt ---- marble-14.12.1/src/apps/marble-ui/CMakeLists.txt.marblewidget_soname 2015-01-01 11:29:24.000000000 -0600 -+++ marble-14.12.1/src/apps/marble-ui/CMakeLists.txt 2015-02-21 10:49:36.702654585 -0600 +diff -up marble-14.12.1/src/apps/marble-ui/CMakeLists.txt.marblewidget marble-14.12.1/src/apps/marble-ui/CMakeLists.txt +--- marble-14.12.1/src/apps/marble-ui/CMakeLists.txt.marblewidget 2015-01-01 11:29:24.000000000 -0600 ++++ marble-14.12.1/src/apps/marble-ui/CMakeLists.txt 2015-02-23 15:43:12.328429497 -0600 @@ -27,7 +27,7 @@ target_link_libraries ( ${QT_QTNETWORK_LIBRARY} ${QT_QTSCRIPT_LIBRARY} @@ -113,9 +170,9 @@ diff -up marble-14.12.1/src/apps/marble-ui/CMakeLists.txt.marblewidget_soname ma endif() if(WIN32) -diff -up marble-14.12.1/src/bindings/python/CMakeLists.txt.marblewidget_soname marble-14.12.1/src/bindings/python/CMakeLists.txt ---- marble-14.12.1/src/bindings/python/CMakeLists.txt.marblewidget_soname 2015-01-01 11:29:24.000000000 -0600 -+++ marble-14.12.1/src/bindings/python/CMakeLists.txt 2015-02-21 10:53:55.744056680 -0600 +diff -up marble-14.12.1/src/bindings/python/CMakeLists.txt.marblewidget marble-14.12.1/src/bindings/python/CMakeLists.txt +--- marble-14.12.1/src/bindings/python/CMakeLists.txt.marblewidget 2015-01-01 11:29:24.000000000 -0600 ++++ marble-14.12.1/src/bindings/python/CMakeLists.txt 2015-02-23 15:43:12.329429499 -0600 @@ -17,7 +17,7 @@ FILE(GLOB extra_files_sip sip/*.sip) set(SIP_EXTRA_FILES_DEPEND ${extra_files_sip}) @@ -125,9 +182,9 @@ diff -up marble-14.12.1/src/bindings/python/CMakeLists.txt.marblewidget_soname m ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTUITOOLS_LIBRARY} -diff -up marble-14.12.1/src/lib/marble/CMakeLists.txt.marblewidget_soname marble-14.12.1/src/lib/marble/CMakeLists.txt ---- marble-14.12.1/src/lib/marble/CMakeLists.txt.marblewidget_soname 2015-01-01 11:29:24.000000000 -0600 -+++ marble-14.12.1/src/lib/marble/CMakeLists.txt 2015-02-21 10:47:35.872467027 -0600 +diff -up marble-14.12.1/src/lib/marble/CMakeLists.txt.marblewidget marble-14.12.1/src/lib/marble/CMakeLists.txt +--- marble-14.12.1/src/lib/marble/CMakeLists.txt.marblewidget 2015-01-01 11:29:24.000000000 -0600 ++++ marble-14.12.1/src/lib/marble/CMakeLists.txt 2015-02-23 15:43:12.329429499 -0600 @@ -342,14 +342,14 @@ qt_add_resources(marblewidget_SRCS libma qt_wrap_ui(marblewidget_SRCS ${marblewidget_UI}) marble_qt4_automoc(${marblewidget_SRCS}) @@ -212,9 +269,9 @@ diff -up marble-14.12.1/src/lib/marble/CMakeLists.txt.marblewidget_soname marble endif(QTONLY) endif(APPLE AND QTONLY) endif(WIN32 AND QTONLY) -diff -up marble-14.12.1/src/plasmarunner/CMakeLists.txt.marblewidget_soname marble-14.12.1/src/plasmarunner/CMakeLists.txt ---- marble-14.12.1/src/plasmarunner/CMakeLists.txt.marblewidget_soname 2015-01-01 11:29:24.000000000 -0600 -+++ marble-14.12.1/src/plasmarunner/CMakeLists.txt 2015-02-21 10:52:33.529929064 -0600 +diff -up marble-14.12.1/src/plasmarunner/CMakeLists.txt.marblewidget marble-14.12.1/src/plasmarunner/CMakeLists.txt +--- marble-14.12.1/src/plasmarunner/CMakeLists.txt.marblewidget 2015-01-01 11:29:24.000000000 -0600 ++++ marble-14.12.1/src/plasmarunner/CMakeLists.txt 2015-02-23 15:43:12.329429499 -0600 @@ -12,7 +12,7 @@ set(plasmaRunner_SRCS kde4_add_plugin(plasma_runner_marble ${plasmaRunner_SRCS}) target_link_libraries(plasma_runner_marble @@ -224,9 +281,9 @@ diff -up marble-14.12.1/src/plasmarunner/CMakeLists.txt.marblewidget_soname marb ) install(TARGETS plasma_runner_marble DESTINATION ${PLUGIN_INSTALL_DIR}) -diff -up marble-14.12.1/src/plasmoid/CMakeLists.txt.marblewidget_soname marble-14.12.1/src/plasmoid/CMakeLists.txt ---- marble-14.12.1/src/plasmoid/CMakeLists.txt.marblewidget_soname 2015-01-01 11:29:24.000000000 -0600 -+++ marble-14.12.1/src/plasmoid/CMakeLists.txt 2015-02-21 10:52:18.762906142 -0600 +diff -up marble-14.12.1/src/plasmoid/CMakeLists.txt.marblewidget marble-14.12.1/src/plasmoid/CMakeLists.txt +--- marble-14.12.1/src/plasmoid/CMakeLists.txt.marblewidget 2015-01-01 11:29:24.000000000 -0600 ++++ marble-14.12.1/src/plasmoid/CMakeLists.txt 2015-02-23 15:43:12.329429499 -0600 @@ -20,7 +20,7 @@ kde4_add_ui_files( worldclock_SRCS world kde4_add_plugin(plasma_applet_worldclock ${worldclock_SRCS}) target_link_libraries(plasma_applet_worldclock @@ -236,9 +293,9 @@ diff -up marble-14.12.1/src/plasmoid/CMakeLists.txt.marblewidget_soname marble-1 install(TARGETS plasma_applet_worldclock DESTINATION ${PLUGIN_INSTALL_DIR}) -diff -up marble-14.12.1/src/plugins/designer/latloneditwidget/CMakeLists.txt.marblewidget_soname marble-14.12.1/src/plugins/designer/latloneditwidget/CMakeLists.txt ---- marble-14.12.1/src/plugins/designer/latloneditwidget/CMakeLists.txt.marblewidget_soname 2015-01-01 11:29:24.000000000 -0600 -+++ marble-14.12.1/src/plugins/designer/latloneditwidget/CMakeLists.txt 2015-02-21 10:53:28.549014466 -0600 +diff -up marble-14.12.1/src/plugins/designer/latloneditwidget/CMakeLists.txt.marblewidget marble-14.12.1/src/plugins/designer/latloneditwidget/CMakeLists.txt +--- marble-14.12.1/src/plugins/designer/latloneditwidget/CMakeLists.txt.marblewidget 2015-01-01 11:29:24.000000000 -0600 ++++ marble-14.12.1/src/plugins/designer/latloneditwidget/CMakeLists.txt 2015-02-23 15:43:12.329429499 -0600 @@ -12,7 +12,7 @@ ELSE() INCLUDE_DIRECTORIES(${Qt5Designer_INCLUDE_DIRS}) ENDIF() @@ -248,10 +305,9 @@ diff -up marble-14.12.1/src/plugins/designer/latloneditwidget/CMakeLists.txt.mar set( latloneditplugin_SRCS LatLonEditPlugin.cpp ) -diff -up marble-14.12.1/src/plugins/designer/marblewidget/CMakeLists.txt.marblewidget_soname marble-14.12.1/src/plugins/designer/marblewidget/CMakeLists.txt -diff -up marble-14.12.1/src/plugins/runner/gpx/CMakeLists.txt.marblewidget_soname marble-14.12.1/src/plugins/runner/gpx/CMakeLists.txt ---- marble-14.12.1/src/plugins/runner/gpx/CMakeLists.txt.marblewidget_soname 2015-01-01 11:29:24.000000000 -0600 -+++ marble-14.12.1/src/plugins/runner/gpx/CMakeLists.txt 2015-02-21 10:44:50.278209985 -0600 +diff -up marble-14.12.1/src/plugins/runner/gpx/CMakeLists.txt.marblewidget marble-14.12.1/src/plugins/runner/gpx/CMakeLists.txt +--- marble-14.12.1/src/plugins/runner/gpx/CMakeLists.txt.marblewidget 2015-01-01 11:29:24.000000000 -0600 ++++ marble-14.12.1/src/plugins/runner/gpx/CMakeLists.txt 2015-02-23 15:43:12.329429499 -0600 @@ -72,7 +72,7 @@ if( BUILD_MARBLE_TESTS ) ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} @@ -261,9 +317,9 @@ diff -up marble-14.12.1/src/plugins/runner/gpx/CMakeLists.txt.marblewidget_sonam set_target_properties( TestTrack PROPERTIES COMPILE_FLAGS "-DDATA_PATH=\"\\\"${DATA_PATH}\\\"\" -DPLUGIN_PATH=\"\\\"${PLUGIN_PATH}\\\"\"" ) add_test( TestTrack TestTrack ) -diff -up marble-14.12.1/src/thumbnailer/CMakeLists.txt.marblewidget_soname marble-14.12.1/src/thumbnailer/CMakeLists.txt ---- marble-14.12.1/src/thumbnailer/CMakeLists.txt.marblewidget_soname 2015-01-01 11:29:24.000000000 -0600 -+++ marble-14.12.1/src/thumbnailer/CMakeLists.txt 2015-02-21 10:54:17.048089749 -0600 +diff -up marble-14.12.1/src/thumbnailer/CMakeLists.txt.marblewidget marble-14.12.1/src/thumbnailer/CMakeLists.txt +--- marble-14.12.1/src/thumbnailer/CMakeLists.txt.marblewidget 2015-01-01 11:29:24.000000000 -0600 ++++ marble-14.12.1/src/thumbnailer/CMakeLists.txt 2015-02-23 15:43:12.329429499 -0600 @@ -10,7 +10,7 @@ set(marblethumbnail_SRCS ) kde4_add_plugin(marblethumbnail ${marblethumbnail_SRCS}) diff --git a/marble.spec b/marble.spec index 40cb0c0..d8540bd 100644 --- a/marble.spec +++ b/marble.spec @@ -262,8 +262,7 @@ sed -i -e "s|marblewidget |marblewidget-qt5 |g" \ ## unpackaged files rm -fv %{buildroot}%{_datadir}/applications/marble_{gpx,kml,kmz,osm,shp}.desktop -# unpackaged for now, cause runtime crashes (at least when used with subsurface) -# looks like at least missing linkage and undefined symbols -- rex +# unpackaged for now, cause runtime crashes (at least when used with subsurface) -- rex rm -frv %{buildroot}%{_libdir}/marble/plugins/ %endif