Initial OSGeath with QT4 for QGIS Globe Plugin

3 files changed, 112 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a1ec96d72a60..7b70ff4f601c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,7 @@
-pkgbase = osgearth
-	pkgdesc = A terrain rendering toolkit for OpenSceneGraph
+# Generated by mksrcinfo v8
+# Mon May  9 20:56:37 UTC 2016
+pkgbase = osgearth-qt4
+	pkgdesc = A terrain rendering toolkit for OpenSceneGraph. Dependency for QGIS Globe Plugin
 	pkgver = 2.7
 	pkgrel = 1
 	url = http://www.osgearth.org
@@ -7,14 +9,16 @@ pkgbase = osgearth
 	arch = x86_64
 	license = LGPL
 	makedepends = cmake
-	depends = openscenegraph
+	depends = openscenegraph-qt4
 	depends = gdal
 	depends = minizip
-	depends = qt5-base
+	depends = qt4
 	provides = osgearth
-	conflicts = osgearth-qt5
+	conflicts = osgearth
 	source = https://github.com/gwaldron/osgearth/archive/osgearth-2.7.tar.gz
+	source = qt4.patch
 	md5sums = aad15a3ee27a34dcabc9b8f4922a1e96
+	md5sums = ea9fc5a769b428767b5b79e325641f50
 
-pkgname = osgearth
+pkgname = osgearth-qt4
 
diff --git a/PKGBUILD b/PKGBUILD
index ddf4643d1732..962d9d1e9972 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,22 +2,30 @@
 # Contributor: James Duley <jagduley gmail>
 # Contributor: A. Weiss <adam [at] archlinux.us>
 
-pkgname=osgearth
+pkgname=osgearth-qt4
+_pkgname=osgearth
 pkgver=2.7
 pkgrel=1
-pkgdesc="A terrain rendering toolkit for OpenSceneGraph"
+pkgdesc="A terrain rendering toolkit for OpenSceneGraph. Dependency for QGIS Globe Plugin"
 arch=('i686' 'x86_64')
-url=('http://www.osgearth.org')
+url='http://www.osgearth.org'
 license=('LGPL')
-depends=('openscenegraph' 'gdal' 'minizip' 'qt5-base')
+depends=('openscenegraph-qt4' 'gdal' 'minizip' 'qt4')
 makedepends=('cmake')
 provides=('osgearth')
-conflicts=('osgearth-qt5')
-source=("https://github.com/gwaldron/osgearth/archive/${pkgname}-${pkgver}.tar.gz")
-md5sums=('aad15a3ee27a34dcabc9b8f4922a1e96')
+conflicts=('osgearth')
+source=("https://github.com/gwaldron/osgearth/archive/${_pkgname}-${pkgver}.tar.gz" "qt4.patch")
+md5sums=('aad15a3ee27a34dcabc9b8f4922a1e96'
+         'ea9fc5a769b428767b5b79e325641f50')
+
+prepare() {
+  cd ${srcdir}/${_pkgname}-${_pkgname}-${pkgver}
+  # Fix build with QT4 (Debian)
+  patch -p0  -i ${srcdir}/qt4.patch
+}
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgname}-${pkgver}
+  cd ${srcdir}/${_pkgname}-${_pkgname}-${pkgver}
 
   #Build
   if [[ -d "build" ]]; then
@@ -32,16 +40,16 @@ build() {
   -DCMAKE_INSTALL_PREFIX=/usr \
   ..
 
-  make -j5
+  make -j4
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgname}-${pkgver}/build
+  cd ${srcdir}/${_pkgname}-${_pkgname}-${pkgver}/build
   make DESTDIR=$pkgdir install
   
   install -d ${pkgdir}/usr/share/osgearth
   install -d ${pkgdir}/usr/share/osgearth/test
   install -d ${pkgdir}/usr/share/osgearth/data
-  install -Dm644 ${srcdir}/${pkgname}-${pkgname}-${pkgver}/tests/* ${pkgdir}/usr/share/osgearth/test
-  cp -rfv ${srcdir}/${pkgname}-${pkgname}-${pkgver}/data/* ${pkgdir}/usr/share/osgearth/data
+  install -Dm644 ${srcdir}/${_pkgname}-${_pkgname}-${pkgver}/tests/* ${pkgdir}/usr/share/osgearth/test
+  cp -rfv ${srcdir}/${_pkgname}-${_pkgname}-${pkgver}/data/* ${pkgdir}/usr/share/osgearth/data
 }
diff --git a/qt4.patch b/qt4.patch
new file mode 100644
index 000000000000..f076a1cd6b87
--- /dev/null
+++ b/qt4.patch
@@ -0,0 +1,82 @@
+--- CMakeLists.txt	2015-07-30 11:53:25.000000000 -0500
++++ CMakeLists.edit	2016-05-07 16:33:31.686800346 -0500
+@@ -140,20 +140,12 @@
+ 
+ OPTION(USE_V8 "Use V8 instead of Duktape if V8 is found" OFF)
+ 
+-FIND_PACKAGE(Qt5Core QUIET)
+-FIND_PACKAGE(Qt5Widgets QUIET)
+-FIND_PACKAGE(Qt5Gui QUIET)
+-FIND_PACKAGE(Qt5OpenGL QUIET)
+-IF ( Qt5Core_FOUND AND Qt5Widgets_FOUND AND Qt5Gui_FOUND AND Qt5OpenGL_FOUND )
+-    SET(QT_INCLUDES ${Qt5Widgets_INCLUDE_DIRS} ${Qt5OpenGL_INCLUDE_DIRS})
+-ELSE()
+-    FIND_PACKAGE(Qt4)
+-    IF (QT4_FOUND)
+-        INCLUDE(${QT_USE_FILE})
+-		SET(QT_INCLUDES ${QT_INCLUDES} ${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR}${QT_QTOPENGL_INCLUDE_DIR} )
+-        SET(QT_ALL_LIBRARIES ${QT_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTWEBKIT_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTOPENGL_LIBRARY})
+-    ENDIF (QT4_FOUND)
+-ENDIF ()
++FIND_PACKAGE(Qt4 QUIET)
++IF (QT4_FOUND)
++    INCLUDE(${QT_USE_FILE})
++    SET(QT_INCLUDES ${QT_INCLUDES} ${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR}${QT_QTOPENGL_INCLUDE_DIR} )
++    SET(QT_ALL_LIBRARIES ${QT_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTWEBKIT_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTOPENGL_LIBRARY})
++ENDIF (QT4_FOUND)
+ 
+ OPTION(OSGEARTH_USE_QT "Enable to use Qt (build Qt-dependent libraries, plugins and examples)" ON)
+
+--- src/applications/osgearth_demo/CMakeLists.txt	2015-07-30 11:53:25.000000000 -0500
++++ src/applications/osgearth_demo/CMakeLists.txt.new	2016-05-09 13:45:47.059451159 -0500
+@@ -16,6 +16,7 @@
+         ${QT_QTCORE_LIBRARY}
+         ${QT_QTGUI_LIBRARY}
+         ${QT_QTOPENGL_LIBRARY}
++        X11
+     )
+ ENDIF()
+ 
+--- src/applications/osgearth_package_qt/CMakeLists.txt	2016-05-09 13:46:42.436470156 -0500
++++ src/applications/osgearth_package_qt/CMakeLists.txt.new	2016-05-09 13:46:49.986518236 -0500
+@@ -59,6 +59,7 @@
+     ${QT_QTCORE_LIBRARY}
+     ${QT_QTGUI_LIBRARY}
+     ${QT_QTOPENGL_LIBRARY}
++    X11
+ )
+ 
+ #### end var setup  ###
+
+--- src/applications/osgearth_qt/CMakeLists.txt	2015-07-30 11:53:25.000000000 -0500
++++ src/applications/osgearth_qt/CMakeLists.txt.new	2016-05-09 14:18:52.975674161 -0500
+@@ -38,6 +38,7 @@
+     ${QT_QTCORE_LIBRARY}
+     ${QT_QTGUI_LIBRARY}
+     ${QT_QTOPENGL_LIBRARY}
++    X11
+ )
+ 
+ #### end var setup  ###
+
+--- src/applications/osgearth_qt_simple/CMakeLists.txt	2015-07-30 11:53:25.000000000 -0500
++++ src/applications/osgearth_qt_simple/CMakeLists.txt.new	2016-05-09 13:53:10.705621515 -0500
+@@ -34,6 +34,7 @@
+     ${QT_QTCORE_LIBRARY}
+     ${QT_QTGUI_LIBRARY}
+     ${QT_QTOPENGL_LIBRARY}
++    X11
+ )
+ 
+ #### end var setup  ###
+
+--- src/applications/osgearth_qt_windows/CMakeLists.txt	2015-07-30 11:53:25.000000000 -0500
++++ src/applications/osgearth_qt_windows/CMakeLists.txt.new	2016-05-09 13:48:04.726994717 -0500
+@@ -29,6 +29,7 @@
+     ${QT_QTCORE_LIBRARY}
+     ${QT_QTGUI_LIBRARY}
+     ${QT_QTOPENGL_LIBRARY}
++    X11
+ )
+ 
+ #### end var setup  ###