Disable osgearth due to lib problems

5 files changed, 12 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 02ddd02120c8..c90860bef356 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -14,7 +14,6 @@ pkgbase = omnetpp-qt
 	makedepends = bison
 	makedepends = flex
 	makedepends = perl
-	makedepends = osgearth-git
 	makedepends = openscenegraph
 	depends = libxml2
 	depends = qt5-base
@@ -27,7 +26,6 @@ pkgbase = omnetpp-qt
 	depends = doxygen
 	depends = graphviz
 	depends = clang
-	depends = osgearth-git
 	depends = openscenegraph
 	provides = omnetpp
 	conflicts = omnetpp
diff --git a/Makefile.inc b/Makefile.inc
index 8cec4de38962..b99b3f60e6fb 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -16,7 +16,7 @@ OMNETPP_MSGC_PATCH_VER = 1
 #
 WITH_QTENV ?= yes
 WITH_OSG ?= yes
-WITH_OSGEARTH ?= yes
+WITH_OSGEARTH ?= no
 WITH_NETBUILDER ?= yes
 WITH_PARSIM ?= yes
 WITH_SYSTEMC ?= no
@@ -160,7 +160,7 @@ QTENV_LDFLAGS = -Wl,-rpath-link=/usr/lib
 OSG_CFLAGS = 
 OSG_LIBS = -losg -losgDB -losgGA -losgViewer -losgUtil -lOpenThreads
 OSGEARTH_CFLAGS = 
-OSGEARTH_LIBS = -losgEarth -losgEarthUtil
+OSGEARTH_LIBS = 
 ZLIB_CFLAGS = 
 ZLIB_LIBS = -lz
 MPI_CFLAGS = -pthread
diff --git a/PKGBUILD b/PKGBUILD
index 7a2947029f21..5efd2555f16e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,8 +7,8 @@ _pkgname='omnetpp'
 pkgdesc='OMNeT++ Discrete Event Simulator. OMNeT++ is an extensible, modular, component-based C++ simulation library and framework, primarily for building network simulators: QT version'
 url='http://www.omnetpp.org'
 license=('custom')
-depends=(libxml2 qt5-base tcl tk blt jdk8-openjdk openmpi libpcap doxygen graphviz clang osgearth-git openscenegraph)
-makedepends=(sh wget qt5-base cmake gcc bison flex perl osgearth-git openscenegraph)
+depends=(libxml2 qt5-base tcl tk blt jdk8-openjdk openmpi libpcap doxygen graphviz clang openscenegraph)
+makedepends=(sh wget qt5-base cmake gcc bison flex perl openscenegraph)
 arch=('i686' 'x86_64')
 provides=('omnetpp')
 conflicts=('omnetpp')
@@ -28,9 +28,9 @@ source=(OMNeT++.desktop
 omnetpp-${pkgver}-src-linux.tgz::https://www.omnetpp.org/component/jdownloads/send/31-release-test-versions/2325-omnetpp-${_pkgver}-linux)
 
 sha512sums=('a5772a605592ed2db839609f8298d1d71fb9141eb1b30dac584b788414dfe49b250ba803351a3a84f90c6b89f8e09e7b129a037af17c9b94c22dff2003a5edd8'
-'807cb6b2afa6180cc814f4a6b15e07ac3f7c68f383c4d35ba7ee42e044e6d871cf34e265f9ad2ccd4d15d0d02401f3da2970a60b10eb3cb0a160723533e37b4b'
-'d874fa6d10e38cd6f982adeef2b35bce3338fe90ca10bc82051f79f2c50b393c07e05a20b7e5846b6723f22903934bcc61ffdbf19ad60268188bdcf83da4784e'
-'799d9aa8ae5d9804706188ff237f9e662e678fd88fb2da45023fe04f71e67e87243f1df4b6a33e9e3c6fd6e6f1309f779b3c3ad7c6d8ff34f9ceb49116ab3558'
+'3c951067d22854e1f355ca8cc8ea7e445abe0f3e9e0d494792046f0c207a50a8dd71e00ca2a2367c3985890f002a701a124cf36665c23ae192c2ecdedf26963b'
+'926dda2dbec7ca608699e4be329a5711acc2655cf98701c5197aba20fad7bd204d3ed66df5a7f142c236a12152f66893f7ea3481d355cd4db9e8fbb0158cbff9'
+'b4d36b1104b0f341cc133111559ad9af7fb76d80a8281f61ae990e5e0e813fb7bd2ae4a1b73941c53ca87f81b14e5cf7396d1009f4a06d2066910677b73f7d21'
 'b1a36b009f6f9d64718cf5bb68c47df38be5993eb4b8b935e9469d5f72ab415e1dea65872ecd313c4847a0afcef2a995edac4ba71a15892cb89f0579ac001cb7'
 'facb711a01c41665c7909f82b4cee65ddee232e0c526f754ce1ab148dbc6c65abb9b24255f985be245fb2c33f91623365eac730ef83cb1a7c595a09726856fa1'
 '17a231b1b28b1ce6cd616250173a2702db9cd52aff6e6da811511b3b7b5f5dc92de9a64c5f002b13c20c072d03dbd515eff59b60868c39527dbc00411970933d'
@@ -43,6 +43,7 @@ build() {
 	cp qtenv.pri ${srcdir}/${_pkgname}-${pkgver}/src/qtenv/
 	cp ver.h ${srcdir}/${_pkgname}-${pkgver}/src/common/
 	cd ${srcdir}/${_pkgname}-${pkgver}
+	echo WITH_OSGEARTH=no >> configure.user
 	PATH=${srcdir}/${_pkgname}-${pkgver}/bin:$PATH
 	LD_LIBRARY_PATH=${srcdir}/${_pkgname}-${pkgver}/lib:$LD_LIBRARY_PATH
 	make
diff --git a/config.status b/config.status
index eff779cb9d0e..2279efd717a7 100755
--- a/config.status
+++ b/config.status
@@ -427,7 +427,7 @@ Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
-ac_pwd='/home/brunofernandes/AUR/omnetpp-qt/teste/omnetpp-5.3p1'
+ac_pwd='/home/brunofernandes/AUR/omnetpp-qt/src/omnetpp-5.3p1'
 srcdir='.'
 test -n "$AWK" || AWK=awk
 # The default lists apply if the user does not specify any file.
@@ -589,7 +589,7 @@ S["JAVA_LIBS"]=""
 S["JAVA_CFLAGS"]=""
 S["PREFER_SQLITE_RESULT_FILES"]="no"
 S["WITH_SYSTEMC"]="no"
-S["WITH_OSGEARTH"]="yes"
+S["WITH_OSGEARTH"]="no"
 S["WITH_OSG"]="yes"
 S["WITH_QTENV"]="yes"
 S["WITH_TKENV"]="yes"
@@ -609,7 +609,7 @@ S["MPI_LIBS"]="-pthread -Wl,-rpath -Wl,/usr/lib/openmpi -Wl,--enable-new-dtags -
 S["MPI_CFLAGS"]="-pthread"
 S["ZLIB_LIBS"]="-lz"
 S["ZLIB_CFLAGS"]=""
-S["OSGEARTH_LIBS"]="-losgEarth -losgEarthUtil"
+S["OSGEARTH_LIBS"]=""
 S["OSGEARTH_CFLAGS"]=""
 S["OSG_LIBS"]="-losg -losgDB -losgGA -losgViewer -losgUtil -lOpenThreads"
 S["OSG_CFLAGS"]=""
diff --git a/qtenv.pri b/qtenv.pri
index 8a0e431c2bc7..bdac45b2e310 100644
--- a/qtenv.pri
+++ b/qtenv.pri
@@ -10,7 +10,7 @@ equals(WITH_OSG, yes) {
   DEFINES += WITH_OSG
 }
 
-WITH_OSGEARTH = yes
+WITH_OSGEARTH = no
 equals(WITH_OSGEARTH, yes) {
   DEFINES += WITH_OSGEARTH
 }