Bump to 4.3

7 files changed, 61 insertions, 62 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c90860bef356..e9ce616baec8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = omnetpp-qt
 	pkgdesc = OMNeT++ Discrete Event Simulator. OMNeT++ is an extensible, modular, component-based C++ simulation library and framework, primarily for building network simulators: QT version
-	pkgver = 5.3p1
+	pkgver = 5.4
 	pkgrel = 1
 	url = http://www.omnetpp.org
 	arch = i686
@@ -15,6 +15,7 @@ pkgbase = omnetpp-qt
 	makedepends = flex
 	makedepends = perl
 	makedepends = openscenegraph
+	makedepends = osgearth-git
 	depends = libxml2
 	depends = qt5-base
 	depends = tcl
@@ -27,6 +28,7 @@ pkgbase = omnetpp-qt
 	depends = graphviz
 	depends = clang
 	depends = openscenegraph
+	depends = osgearth-git
 	provides = omnetpp
 	conflicts = omnetpp
 	source = OMNeT++.desktop
@@ -36,15 +38,15 @@ pkgbase = omnetpp-qt
 	source = ver.h
 	source = omnetpp.sh
 	source = download.sh
-	source = omnetpp-5.3p1-src-linux.tgz::https://www.omnetpp.org/component/jdownloads/send/31-release-test-versions/2325-omnetpp-5-3p1-linux
+	source = omnetpp-5.4-src-linux.tgz::https://www.omnetpp.org/component/jdownloads/send/31-release-test-versions/2331-omnetpp-5-4-linux
 	sha512sums = a5772a605592ed2db839609f8298d1d71fb9141eb1b30dac584b788414dfe49b250ba803351a3a84f90c6b89f8e09e7b129a037af17c9b94c22dff2003a5edd8
-	sha512sums = 807cb6b2afa6180cc814f4a6b15e07ac3f7c68f383c4d35ba7ee42e044e6d871cf34e265f9ad2ccd4d15d0d02401f3da2970a60b10eb3cb0a160723533e37b4b
-	sha512sums = d874fa6d10e38cd6f982adeef2b35bce3338fe90ca10bc82051f79f2c50b393c07e05a20b7e5846b6723f22903934bcc61ffdbf19ad60268188bdcf83da4784e
+	sha512sums = 21520f76019cde594f27e4adbc15ebb0ec890f8e265863656f3e261c1864d843a229c30d6309f465fbbae7cb27a2b6e603378bab6b87149bdf629f55a9abf8df
+	sha512sums = a23a6ebb71c4fa0aa86263a6306378783b9b3cb249e3d7ec1cd7d184b48cd6a57c9974c21d3161aef1806177e379e895838c52e335fae2e8769f6c3befeb13cc
 	sha512sums = 799d9aa8ae5d9804706188ff237f9e662e678fd88fb2da45023fe04f71e67e87243f1df4b6a33e9e3c6fd6e6f1309f779b3c3ad7c6d8ff34f9ceb49116ab3558
-	sha512sums = b1a36b009f6f9d64718cf5bb68c47df38be5993eb4b8b935e9469d5f72ab415e1dea65872ecd313c4847a0afcef2a995edac4ba71a15892cb89f0579ac001cb7
+	sha512sums = c33f06978b91b57b16244ceef7296609f93195ec4a99be98d42fdfb68f223fff26de66aacd0165e94f212bae7b9f5b622c512e92265c660a356195ca876a717d
 	sha512sums = facb711a01c41665c7909f82b4cee65ddee232e0c526f754ce1ab148dbc6c65abb9b24255f985be245fb2c33f91623365eac730ef83cb1a7c595a09726856fa1
-	sha512sums = 17a231b1b28b1ce6cd616250173a2702db9cd52aff6e6da811511b3b7b5f5dc92de9a64c5f002b13c20c072d03dbd515eff59b60868c39527dbc00411970933d
-	sha512sums = e67df3e123c370426705a15a0092c7ffe566d36ae5f53b560a8d3a4c31cacf3b727e990639b62a9712063c62bdb48614ae9e6a5ccb40ae948460bba3097d3817
+	sha512sums = 6104720105bc1bc3903e3530281cbced5ad7a973c9d3e65150ae87418316b1f9b54e02462988d040eb28709cd44adeb3ee5ca74f29e353dd55a9daa0199f52a2
+	sha512sums = 72529f945019d011aa7255f22db9e99b5eef7047943fa42e1d657ad67dabccf3b4dd557046636b8e15a29948b230984a365f282bfbf86eff6bc2297722e94231
 
 pkgname = omnetpp-qt
 
diff --git a/Makefile.inc b/Makefile.inc
index b99b3f60e6fb..d50ed8bc3050 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -3,24 +3,21 @@
 # Your changes will be lost the next time ./configure is run.
 #
 OMNETPP_PRODUCT = OMNeT++
-OMNETPP_RELEASE = omnetpp-5.3p1
-OMNETPP_VERSION = 5.3p1
-OMNETPP_BUILDID = 171221-c6b3c50
+OMNETPP_RELEASE = omnetpp-5.4
+OMNETPP_VERSION = 5.4
+OMNETPP_BUILDID = 180611-572210e
 OMNETPP_EDITION = Academic Public License -- NOT FOR COMMERCIAL USE
 
-# variable to show that the message compiler has a temporary patch applied
-OMNETPP_MSGC_PATCH_VER = 1
-
 #
 # Optional features (set to "yes" to enable the feature)
 #
 WITH_QTENV ?= yes
 WITH_OSG ?= yes
-WITH_OSGEARTH ?= no
+WITH_OSGEARTH ?= yes
 WITH_NETBUILDER ?= yes
 WITH_PARSIM ?= yes
 WITH_SYSTEMC ?= no
-WITH_TKENV ?= yes
+WITH_TKENV ?= no
 EMBED_TCL_CODE ?= yes
 PREFER_SQLITE_RESULT_FILES ?= no
 
@@ -116,7 +113,7 @@ CXX = clang++
 TOOLCHAIN_NAME = clang
 DEFINES = -DHAVE_SWAPCONTEXT -DWITH_MPI
 CFLAGS_DEBUG = -g -Wall
-CFLAGS_RELEASE = -O3 -march=native -mtune=native -DNDEBUG=1
+CFLAGS_RELEASE = -O3 -DNDEBUG=1
 CFLAGS += -MMD -MP -MF $(basename $@).d  -fPIC  -Wno-deprecated-register -Wno-unused-function -fno-stack-protector $(DEFINES)
 CXXFLAGS =  -std=c++11
 LDFLAG_LIBPATH = -L
@@ -139,12 +136,12 @@ RANLIB = ranlib
 SHLIB_LD = clang++ -shared -fPIC
 DLLTOOL = dlltool
 STRIP = strip
-WISH = wish
+WISH = 
 MAKEDEPEND = opp_makedep -Y --objdirtree
 LN = ln -f
 MKPATH = mkdir -p
 SHLIB_POSTPROCESS = opp_shlib_postprocess
-SWIG = swig
+SWIG = not found
 QMAKE = /usr/bin/qmake
 MOC=/usr/bin/moc
 UIC=/usr/bin/uic
@@ -153,27 +150,27 @@ RCC=/usr/bin/rcc
 HAVE_DLOPEN = 1
 SYS_LIBS = -ldl -lstdc++ 
 TK_CFLAGS = 
-TK_LIBS = -ltk8.6 -ltcl8.6
+TK_LIBS = 
 QT_CFLAGS = -isystem /usr/include/qt -isystem /usr/include/qt/QtCore -isystem /usr/include/qt/QtGui -isystem /usr/include/qt/QtWidgets -isystem /usr/include/qt/QtOpenGL -isystem /usr/include/qt/QtPrintSupport
 QT_LIBS = -lQt5Gui -lQt5Core -lQt5Widgets -lQt5PrintSupport -lQt5OpenGL -L/usr/lib -Wl,-rpath=/usr/lib
 QTENV_LDFLAGS = -Wl,-rpath-link=/usr/lib
 OSG_CFLAGS = 
 OSG_LIBS = -losg -losgDB -losgGA -losgViewer -losgUtil -lOpenThreads
 OSGEARTH_CFLAGS = 
-OSGEARTH_LIBS = 
+OSGEARTH_LIBS = -losgEarth -losgEarthUtil
 ZLIB_CFLAGS = 
 ZLIB_LIBS = -lz
 MPI_CFLAGS = -pthread
 MPI_LIBS = -pthread -Wl,-rpath -Wl,/usr/lib/openmpi -Wl,--enable-new-dtags -L/usr/lib/openmpi -lmpi_cxx -lmpi
 PTHREAD_CFLAGS = 
 PTHREAD_LIBS = -lpthread
-XMLPARSER = expat
-XML_CFLAGS = 
-XML_LIBS = -lexpat
+XMLPARSER = libxml
+XML_CFLAGS = -I/usr/include/libxml2
+XML_LIBS = -lxml2
 DEFINES += -DXMLPARSER=$(XMLPARSER)
 AKAROA_CFLAGS = -I/usr/local/akaroa/include
 AKAROA_LIBS = -L/usr/local/akaroa/lib -lakaroa -lfl
-JNILIBS_IF_POSSIBLE = jnilibs
+JNILIBS_IF_POSSIBLE = missing-dependency
 JAVA_CFLAGS = 
 JAVA_LIBS = 
 
diff --git a/PKGBUILD b/PKGBUILD
index 5efd2555f16e..17ad405bed76 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,19 @@
 # Maintainer: Bruno Silva <brunofernandes at ua dot pt>
 pkgname='omnetpp-qt'
-pkgver=5.3p1
-_pkgver=5-3p1
+pkgver=5.4
+_pkgver=5-4
 pkgrel=1
 _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 openscenegraph)
-makedepends=(sh wget qt5-base cmake gcc bison flex perl openscenegraph)
+depends=(libxml2 qt5-base tcl tk blt jdk8-openjdk openmpi libpcap doxygen graphviz clang openscenegraph osgearth-git)
+makedepends=(sh wget qt5-base cmake gcc bison flex perl openscenegraph osgearth-git)
 arch=('i686' 'x86_64')
 provides=('omnetpp')
 conflicts=('omnetpp')
 
-if [ $(echo "e67df3e123c370426705a15a0092c7ffe566d36ae5f53b560a8d3a4c31cacf3b727e990639b62a9712063c62bdb48614ae9e6a5ccb40ae948460bba3097d3817 omnetpp-5.3p1-src-linux.tgz" | sha512sum -c --status; echo $?) -ne 0 ];
+if [ $(echo "72529f945019d011aa7255f22db9e99b5eef7047943fa42e1d657ad67dabccf3b4dd557046636b8e15a29948b230984a365f282bfbf86eff6bc2297722e94231 omnetpp-5.4-src-linux.tgz" | sha512sum -c --status; echo $?) -ne 0 ];
 then
 	sh download.sh
 fi
@@ -25,16 +25,16 @@ source=(OMNeT++.desktop
   ver.h
 	omnetpp.sh
 	download.sh
-omnetpp-${pkgver}-src-linux.tgz::https://www.omnetpp.org/component/jdownloads/send/31-release-test-versions/2325-omnetpp-${_pkgver}-linux)
+omnetpp-${pkgver}-src-linux.tgz::https://www.omnetpp.org/component/jdownloads/send/31-release-test-versions/2331-omnetpp-${_pkgver}-linux)
 
 sha512sums=('a5772a605592ed2db839609f8298d1d71fb9141eb1b30dac584b788414dfe49b250ba803351a3a84f90c6b89f8e09e7b129a037af17c9b94c22dff2003a5edd8'
-'3c951067d22854e1f355ca8cc8ea7e445abe0f3e9e0d494792046f0c207a50a8dd71e00ca2a2367c3985890f002a701a124cf36665c23ae192c2ecdedf26963b'
-'926dda2dbec7ca608699e4be329a5711acc2655cf98701c5197aba20fad7bd204d3ed66df5a7f142c236a12152f66893f7ea3481d355cd4db9e8fbb0158cbff9'
-'b4d36b1104b0f341cc133111559ad9af7fb76d80a8281f61ae990e5e0e813fb7bd2ae4a1b73941c53ca87f81b14e5cf7396d1009f4a06d2066910677b73f7d21'
-'b1a36b009f6f9d64718cf5bb68c47df38be5993eb4b8b935e9469d5f72ab415e1dea65872ecd313c4847a0afcef2a995edac4ba71a15892cb89f0579ac001cb7'
+'21520f76019cde594f27e4adbc15ebb0ec890f8e265863656f3e261c1864d843a229c30d6309f465fbbae7cb27a2b6e603378bab6b87149bdf629f55a9abf8df'
+'a23a6ebb71c4fa0aa86263a6306378783b9b3cb249e3d7ec1cd7d184b48cd6a57c9974c21d3161aef1806177e379e895838c52e335fae2e8769f6c3befeb13cc'
+'799d9aa8ae5d9804706188ff237f9e662e678fd88fb2da45023fe04f71e67e87243f1df4b6a33e9e3c6fd6e6f1309f779b3c3ad7c6d8ff34f9ceb49116ab3558'
+'c33f06978b91b57b16244ceef7296609f93195ec4a99be98d42fdfb68f223fff26de66aacd0165e94f212bae7b9f5b622c512e92265c660a356195ca876a717d'
 'facb711a01c41665c7909f82b4cee65ddee232e0c526f754ce1ab148dbc6c65abb9b24255f985be245fb2c33f91623365eac730ef83cb1a7c595a09726856fa1'
-'17a231b1b28b1ce6cd616250173a2702db9cd52aff6e6da811511b3b7b5f5dc92de9a64c5f002b13c20c072d03dbd515eff59b60868c39527dbc00411970933d'
-'e67df3e123c370426705a15a0092c7ffe566d36ae5f53b560a8d3a4c31cacf3b727e990639b62a9712063c62bdb48614ae9e6a5ccb40ae948460bba3097d3817')
+'6104720105bc1bc3903e3530281cbced5ad7a973c9d3e65150ae87418316b1f9b54e02462988d040eb28709cd44adeb3ee5ca74f29e353dd55a9daa0199f52a2'
+'72529f945019d011aa7255f22db9e99b5eef7047943fa42e1d657ad67dabccf3b4dd557046636b8e15a29948b230984a365f282bfbf86eff6bc2297722e94231')
 
 build() {
 	# fix configure bug by providing pre-generated configuration file with --prefix=/opt --libdir=/opt/lib --libexecdir=/opt/lib
@@ -43,7 +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
+	#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 2279efd717a7..f75ed73ead2b 100755..100644
--- 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/src/omnetpp-5.3p1'
+ac_pwd='/mnt/aur_appcache/AUR/omnetpp-qt/omnetpp-5.4'
 srcdir='.'
 test -n "$AWK" || AWK=awk
 # The default lists apply if the user does not specify any file.
@@ -589,19 +589,19 @@ S["JAVA_LIBS"]=""
 S["JAVA_CFLAGS"]=""
 S["PREFER_SQLITE_RESULT_FILES"]="no"
 S["WITH_SYSTEMC"]="no"
-S["WITH_OSGEARTH"]="no"
+S["WITH_OSGEARTH"]="yes"
 S["WITH_OSG"]="yes"
 S["WITH_QTENV"]="yes"
-S["WITH_TKENV"]="yes"
+S["WITH_TKENV"]="no"
 S["WITH_PARSIM"]="yes"
 S["WITH_NETBUILDER"]="yes"
 S["EMBED_TCL_CODE"]="yes"
-S["JNILIBS_IF_POSSIBLE"]="jnilibs"
+S["JNILIBS_IF_POSSIBLE"]="missing-dependency"
 S["AKAROA_LIBS"]="-L/usr/local/akaroa/lib -lakaroa -lfl"
 S["AKAROA_CFLAGS"]="-I/usr/local/akaroa/include"
-S["XML_LIBS"]="-lexpat"
-S["XML_CFLAGS"]=""
-S["XMLPARSER"]="expat"
+S["XML_LIBS"]="-lxml2"
+S["XML_CFLAGS"]="-I/usr/include/libxml2"
+S["XMLPARSER"]="libxml"
 S["PTHREAD_LIBS"]="-lpthread"
 S["PTHREAD_CFLAGS"]=""
 S["SYS_LIBS"]="-ldl -lstdc++ "
@@ -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"]=""
+S["OSGEARTH_LIBS"]="-losgEarth -losgEarthUtil"
 S["OSGEARTH_CFLAGS"]=""
 S["OSG_LIBS"]="-losg -losgDB -losgGA -losgViewer -losgUtil -lOpenThreads"
 S["OSG_CFLAGS"]=""
@@ -617,7 +617,7 @@ S["QTENV_LDFLAGS"]="-Wl,-rpath-link=/usr/lib"
 S["QT_LIBS"]="-lQt5Gui -lQt5Core -lQt5Widgets -lQt5PrintSupport -lQt5OpenGL -L/usr/lib -Wl,-rpath=/usr/lib"
 S["QT_CFLAGS"]="-isystem /usr/include/qt -isystem /usr/include/qt/QtCore -isystem /usr/include/qt/QtGui -isystem /usr/include/qt/QtWidgets -isystem /usr/include/qt/"\
 "QtOpenGL -isystem /usr/include/qt/QtPrintSupport"
-S["TK_LIBS"]="-ltk8.6 -ltcl8.6"
+S["TK_LIBS"]=""
 S["TK_CFLAGS"]=""
 S["HAVE_DLOPEN"]="1"
 S["LIB_PREFIX"]="lib"
@@ -652,25 +652,25 @@ S["LDFLAG_LIB"]="-l"
 S["LDFLAG_INCLUDE"]="-Wl,-u,"
 S["LDFLAG_LIBPATH"]="-L"
 S["DEFINES"]=" -DHAVE_SWAPCONTEXT -DWITH_MPI"
-S["CFLAGS_RELEASE"]=" -O3 -march=native -mtune=native -DNDEBUG=1"
+S["CFLAGS_RELEASE"]=" -O3 -DNDEBUG=1"
 S["CFLAGS_DEBUG"]=" -g -Wall"
 S["OMNETPP_EDITION"]="Academic Public License -- NOT FOR COMMERCIAL USE"
-S["OMNETPP_BUILDID"]="171221-c6b3c50"
-S["OMNETPP_VERSION"]="5.3p1"
-S["OMNETPP_RELEASE"]="omnetpp-5.3p1"
+S["OMNETPP_BUILDID"]="180611-572210e"
+S["OMNETPP_VERSION"]="5.4"
+S["OMNETPP_RELEASE"]="omnetpp-5.4"
 S["OMNETPP_PRODUCT"]="OMNeT++"
 S["MPICXX"]=""
 S["MPICPP"]="mpic++"
 S["PRIVATE_JRE"]=""
 S["JRE"]="java"
-S["WISH"]="wish"
+S["WISH"]=""
 S["CXXCPP"]=""
 S["XMKMF"]=""
 S["RCC"]="/usr/bin/rcc"
 S["UIC"]="/usr/bin/uic"
 S["MOC"]="/usr/bin/moc"
 S["QMAKE"]="/usr/bin/qmake"
-S["SWIG"]="swig"
+S["SWIG"]="not found"
 S["PERL"]="perl"
 S["MAKE"]="make"
 S["LEXLIB"]=""
diff --git a/download.sh b/download.sh
index 9055b20e0019..0885441bf79b 100644
--- a/download.sh
+++ b/download.sh
@@ -1,11 +1,11 @@
 wget	--header='Host: omnetpp.org' \
-			--header='User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Firefox/52.0' \
-			--header='Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8' \
-			--header='Accept-Language: en-US,en;q=0.5' \
+			--header='User-Agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3452.0 Safari/537.36' \
+			--header='Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8' \
+			--header='Accept-Language: en-US,en;q=0.9,pt-PT;q=0.8,pt;q=0.7,en-GB;q=0.6' \
 			--header='Accept-Encoding: gzip, deflate, br' \
 			--header='Referer: https://omnetpp.org/component/jdownloads/category/31-release-test-versions?Itemid=-1' \
-			--header='Cookie: __cfduid=dbf18f0b4ef7d74030db369718b8d63f71514490794; fcb7e5dfc3182a73cb86f768253d1ad1=e2eeb09dd5f0404f46ca7a63b55bdd6e; _ga=GA1.2.1607899217.1514490860; _gid=GA1.2.1428920453.1514490860; _gat=1' \
+			--header='Cookie: __cfduid=d55cea1ad7a9d8f6bae647956e03063241528992404; fcb7e5dfc3182a73cb86f768253d1ad1=a5f3a1998a82cb02924c280d5bc775a1' \
 			--header='Connection: keep-alive' \
 			--header='Upgrade-Insecure-Requests: 1' \
-			https://www.omnetpp.org/component/jdownloads/send/31-release-test-versions/2325-omnetpp-5-3p1-linux \
-	  	-O omnetpp-5.3p1-src-linux.tgz
+			https://www.omnetpp.org/omnetpp/send/30-omnet-releases/2331-omnetpp-5-4-linux \
+	  	-O omnetpp-5.4-src-linux.tgz
diff --git a/qtenv.pri b/qtenv.pri
index bdac45b2e310..8a0e431c2bc7 100644
--- a/qtenv.pri
+++ b/qtenv.pri
@@ -10,7 +10,7 @@ equals(WITH_OSG, yes) {
   DEFINES += WITH_OSG
 }
 
-WITH_OSGEARTH = no
+WITH_OSGEARTH = yes
 equals(WITH_OSGEARTH, yes) {
   DEFINES += WITH_OSGEARTH
 }
diff --git a/ver.h b/ver.h
index e9fd05d0646f..611d25abf628 100644
--- a/ver.h
+++ b/ver.h
@@ -13,7 +13,7 @@
 *--------------------------------------------------------------*/
 
 #define OMNETPP_PRODUCT "OMNeT++"
-#define OMNETPP_RELEASE "omnetpp-5.3p1"
-#define OMNETPP_VERSION_STR "5.3p1"
-#define OMNETPP_BUILDID "171221-c6b3c50"
+#define OMNETPP_RELEASE "omnetpp-5.4"
+#define OMNETPP_VERSION_STR "5.4"
+#define OMNETPP_BUILDID "180611-572210e"
 #define OMNETPP_EDITION "Academic Public License -- NOT FOR COMMERCIAL USE"