[marble/f22] fix app_versions.patch

Rex Dieter rdieter at fedoraproject.org
Wed Mar 11 14:25:09 UTC 2015


commit 58ae626f4f820fd94ea7206b7843122c8527e4b6
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Wed Mar 11 09:24:30 2015 -0500

    fix app_versions.patch

 marble-14.12.3-app_versions.patch | 16 ----------------
 1 file changed, 16 deletions(-)
---
diff --git a/marble-14.12.3-app_versions.patch b/marble-14.12.3-app_versions.patch
index c88c148..535819c 100644
--- a/marble-14.12.3-app_versions.patch
+++ b/marble-14.12.3-app_versions.patch
@@ -11,22 +11,6 @@ diff -up marble-14.12.3/CMakeLists.txt.app_versions marble-14.12.3/CMakeLists.tx
  
  ####################################################
  # Specific options for if building with Qt or kde4 libs
-@@ -55,6 +56,7 @@ if(QT4_FOUND)
-     FIND_PACKAGE(QtDeclarative)
-     include_directories(${QT_QTDECLARATIVE_INCLUDE_DIR})
-   ENDIF()
-+  set(MARBLEWIDGET marblewidget)
- else()
-   set( QT5BUILD TRUE )
-   IF( NOT QTONLY )
-@@ -85,6 +87,7 @@ else()
-   include_directories( ${Qt5Xml_INCLUDE_DIRS} )
-   include_directories( ${Qt5Sql_INCLUDE_DIRS} )
- 
-+  set(MARBLEWIDGET marblewidget-qt5) 
-   SET(CMAKE_AUTOMOC TRUE)
-   SET(CMAKE_AUTOMOC_RELAXED_MODE TRUE)
- endif()
 diff -up marble-14.12.3/data/CMakeLists.txt.app_versions marble-14.12.3/data/CMakeLists.txt
 --- marble-14.12.3/data/CMakeLists.txt.app_versions	2015-02-23 02:27:55.000000000 -0600
 +++ marble-14.12.3/data/CMakeLists.txt	2015-03-11 07:58:05.895148797 -0500


More information about the scm-commits mailing list