From 6e694f9996ccbb7c96c614eb461d8a2e25a362ea3e4892fa6c77c03c358f02a1 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sun, 13 Sep 2015 19:53:15 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=54 --- marble_fix_ppc64_build.patch | 63 ------------------------------------ 1 file changed, 63 deletions(-) delete mode 100644 marble_fix_ppc64_build.patch diff --git a/marble_fix_ppc64_build.patch b/marble_fix_ppc64_build.patch deleted file mode 100644 index 0e973c2..0000000 --- a/marble_fix_ppc64_build.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6278e93..7aec313 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -7,6 +7,10 @@ SET(CMAKE_COLOR_MAKEFILE ON) - - set(CMAKE_POSITION_INDEPENDENT_CODE ON) - -+# Let CMake find the correct library dir instead of -+# relying on the obsolete LIB_SUFFIX parameter -+include(GNUInstallDirs) -+ - # Taken from KDECompilerSettings.cmake: - # Pick sensible versions of the C and C++ standards. - # Note that MSVC does not have equivalent flags; the features are either -@@ -193,11 +197,9 @@ set (ENABLE_TESTS FALSE CACHE BOOL "Build unit tests?") - set (WITH_DESIGNER_PLUGIN TRUE CACHE BOOL "Build plugins for Qt Designer") - add_feature_info("Qt Designer plugins" WITH_DESIGNER_PLUGIN "Marble widget support in Qt Designer. Toggle with WITH_DESIGNER_PLUGIN=YES/NO") - --# TODO: this could use GNUInstallDirs or ECM, so e.g. LIB_SUFFIX is automatically set --set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" ) - set(EXEC_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Base directory for executables and libraries" FORCE) - if (QT5BUILD) -- set(QT_PLUGINS_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/plugins) -+ set(QT_PLUGINS_DIR ${CMAKE_INSTALL_LIBDIR}/plugins) - endif() - - #################################################### -@@ -223,7 +225,7 @@ elseif(APPLE) - SET (plugin_dir ${CMAKE_INSTALL_PREFIX}/Marble.app/Contents/MacOS/resources/plugins) - else() # Linux / bsd etc... - set(data_dir ${CMAKE_INSTALL_PREFIX}/share/marble/data) -- set(plugin_dir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/marble/plugins) -+ set(plugin_dir ${CMAKE_INSTALL_LIBDIR}/marble/plugins) - set(CMAKE_MODULES_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/share/marble/cmake) - endif() - -diff --git a/src/lib/astro/CMakeLists.txt b/src/lib/astro/CMakeLists.txt -index 677eb7d..dda65a7 100644 ---- a/src/lib/astro/CMakeLists.txt -+++ b/src/lib/astro/CMakeLists.txt -@@ -48,7 +48,7 @@ if(WIN32) - elseif(APPLE) - INSTALL(TARGETS astro LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/Marble.app/Contents/MacOS/lib) - else() -- INSTALL(TARGETS astro LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}) -+ INSTALL(TARGETS astro LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif() - - ########### install files ############### -diff --git a/src/lib/marble/CMakeLists.txt b/src/lib/marble/CMakeLists.txt -index 26eda3e..42857ed 100644 ---- a/src/lib/marble/CMakeLists.txt -+++ b/src/lib/marble/CMakeLists.txt -@@ -438,7 +438,7 @@ if(WIN32) - elseif(APPLE) - install(TARGETS ${MARBLEWIDGET} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/Marble.app/Contents/MacOS/lib) - else() -- install(TARGETS ${MARBLEWIDGET} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}) -+ install(TARGETS ${MARBLEWIDGET} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif() - -