Bump to 5.3p1

6 files changed, 57 insertions, 60 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3beeb82d3305..02ddd02120c8 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.2pre3
+	pkgver = 5.3p1
 	pkgrel = 1
 	url = http://www.omnetpp.org
 	arch = i686
@@ -14,7 +14,7 @@ pkgbase = omnetpp-qt
 	makedepends = bison
 	makedepends = flex
 	makedepends = perl
-	makedepends = osgearth
+	makedepends = osgearth-git
 	makedepends = openscenegraph
 	depends = libxml2
 	depends = qt5-base
@@ -26,9 +26,9 @@ pkgbase = omnetpp-qt
 	depends = libpcap
 	depends = doxygen
 	depends = graphviz
-	depends = osgearth
-	depends = openscenegraph
 	depends = clang
+	depends = osgearth-git
+	depends = openscenegraph
 	provides = omnetpp
 	conflicts = omnetpp
 	source = OMNeT++.desktop
@@ -38,15 +38,15 @@ pkgbase = omnetpp-qt
 	source = ver.h
 	source = omnetpp.sh
 	source = download.sh
-	source = omnetpp-5.2pre3-src-linux.tgz::https://omnetpp.org/component/jdownloads/send/31-release-test-versions/2317-omnetpp-5-2-pre3-linux
+	source = omnetpp-5.3p1-src-linux.tgz::https://www.omnetpp.org/component/jdownloads/send/31-release-test-versions/2325-omnetpp-5-3p1-linux
 	sha512sums = a5772a605592ed2db839609f8298d1d71fb9141eb1b30dac584b788414dfe49b250ba803351a3a84f90c6b89f8e09e7b129a037af17c9b94c22dff2003a5edd8
-	sha512sums = a5b26871248a4a4c5002b3a121f00b519a1898e4743affe386fd938fa06442ef128442e797097bb8355f80fc3e9ebb3438494d4be9dd27c6efbd42afb1731b8b
-	sha512sums = 5322a1d22f1918f261eb1c312019413698266d82323f45ee37474dac49c525f60bdc9212b91dbea232dc6f31f5c08ef7ed6f8e7f3bd356db704185de89487fc5
+	sha512sums = 807cb6b2afa6180cc814f4a6b15e07ac3f7c68f383c4d35ba7ee42e044e6d871cf34e265f9ad2ccd4d15d0d02401f3da2970a60b10eb3cb0a160723533e37b4b
+	sha512sums = d874fa6d10e38cd6f982adeef2b35bce3338fe90ca10bc82051f79f2c50b393c07e05a20b7e5846b6723f22903934bcc61ffdbf19ad60268188bdcf83da4784e
 	sha512sums = 799d9aa8ae5d9804706188ff237f9e662e678fd88fb2da45023fe04f71e67e87243f1df4b6a33e9e3c6fd6e6f1309f779b3c3ad7c6d8ff34f9ceb49116ab3558
-	sha512sums = 4c54ffa1e9f645e8af8b5e4cc1da697ab2ab0da5794da67df840c995f0e3378388b498f47e8d9672c1ba08287bcd89dcf2da67330c5e38546c740b041b19227b
+	sha512sums = b1a36b009f6f9d64718cf5bb68c47df38be5993eb4b8b935e9469d5f72ab415e1dea65872ecd313c4847a0afcef2a995edac4ba71a15892cb89f0579ac001cb7
 	sha512sums = facb711a01c41665c7909f82b4cee65ddee232e0c526f754ce1ab148dbc6c65abb9b24255f985be245fb2c33f91623365eac730ef83cb1a7c595a09726856fa1
-	sha512sums = 39c1f51e9a4487b765d575b364e05e4be5e9d002d10d3d3fab4930e0fb659ec4702fcac7922ac124e64a4362154e66e32b5d30e0d69900f1acd904d46bdbd011
-	sha512sums = 0cd282520bf2def1c6d7d75e14777203c64073ef2583cc5c0f353d2834460ffad5d7d6c257727149c5406b3faa17f6edc136b276f6826d921e042fcd1776c9a2
+	sha512sums = 17a231b1b28b1ce6cd616250173a2702db9cd52aff6e6da811511b3b7b5f5dc92de9a64c5f002b13c20c072d03dbd515eff59b60868c39527dbc00411970933d
+	sha512sums = e67df3e123c370426705a15a0092c7ffe566d36ae5f53b560a8d3a4c31cacf3b727e990639b62a9712063c62bdb48614ae9e6a5ccb40ae948460bba3097d3817
 
 pkgname = omnetpp-qt
 
diff --git a/Makefile.inc b/Makefile.inc
index d7d0ee84091d..8cec4de38962 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -3,11 +3,14 @@
 # Your changes will be lost the next time ./configure is run.
 #
 OMNETPP_PRODUCT = OMNeT++
-OMNETPP_RELEASE = omnetpp-5.2
-OMNETPP_VERSION = 5.2
-OMNETPP_BUILDID = 170818-f9241c2
+OMNETPP_RELEASE = omnetpp-5.3p1
+OMNETPP_VERSION = 5.3p1
+OMNETPP_BUILDID = 171221-c6b3c50
 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)
 #
@@ -128,7 +131,7 @@ AS_NEEDED_OFF = -Wl,--no-as-needed
 PIC_FLAGS = -fPIC
 MSGC = opp_msgc
 SMC = opp_smc
-NEDTOOL = nedtool
+NEDTOOL = opp_nedtool
 AS = as
 AR = ar cr
 ARFLAG_OUT = 
diff --git a/PKGBUILD b/PKGBUILD
index 5995bff0e21f..7a2947029f21 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,19 @@
 # Maintainer: Bruno Silva <brunofernandes at ua dot pt>
 pkgname='omnetpp-qt'
-pkgver=5.2pre3
-_pkgver=5-2-pre3
-__pkgver=5.2
-___pkgver=5-2
+pkgver=5.3p1
+_pkgver=5-3p1
 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 osgearth openscenegraph clang)
-makedepends=(sh wget qt5-base cmake gcc bison flex perl osgearth openscenegraph)
+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)
 arch=('i686' 'x86_64')
 provides=('omnetpp')
 conflicts=('omnetpp')
 
-if [ $(echo "0cd282520bf2def1c6d7d75e14777203c64073ef2583cc5c0f353d2834460ffad5d7d6c257727149c5406b3faa17f6edc136b276f6826d921e042fcd1776c9a2  omnetpp-5.2pre3-src-linux.tgz" | sha512sum -c --status; echo $?) -ne 0 ];
+if [ $(echo "e67df3e123c370426705a15a0092c7ffe566d36ae5f53b560a8d3a4c31cacf3b727e990639b62a9712063c62bdb48614ae9e6a5ccb40ae948460bba3097d3817 omnetpp-5.3p1-src-linux.tgz" | sha512sum -c --status; echo $?) -ne 0 ];
 then
 	sh download.sh
 fi
@@ -27,26 +25,26 @@ source=(OMNeT++.desktop
   ver.h
 	omnetpp.sh
 	download.sh
-	omnetpp-5.2pre3-src-linux.tgz::https://omnetpp.org/component/jdownloads/send/31-release-test-versions/2317-omnetpp-5-2-pre3-linux)
+omnetpp-${pkgver}-src-linux.tgz::https://www.omnetpp.org/component/jdownloads/send/31-release-test-versions/2325-omnetpp-${_pkgver}-linux)
 
 sha512sums=('a5772a605592ed2db839609f8298d1d71fb9141eb1b30dac584b788414dfe49b250ba803351a3a84f90c6b89f8e09e7b129a037af17c9b94c22dff2003a5edd8'
-  'a5b26871248a4a4c5002b3a121f00b519a1898e4743affe386fd938fa06442ef128442e797097bb8355f80fc3e9ebb3438494d4be9dd27c6efbd42afb1731b8b'
-  '5322a1d22f1918f261eb1c312019413698266d82323f45ee37474dac49c525f60bdc9212b91dbea232dc6f31f5c08ef7ed6f8e7f3bd356db704185de89487fc5'
-  '799d9aa8ae5d9804706188ff237f9e662e678fd88fb2da45023fe04f71e67e87243f1df4b6a33e9e3c6fd6e6f1309f779b3c3ad7c6d8ff34f9ceb49116ab3558'
-  '4c54ffa1e9f645e8af8b5e4cc1da697ab2ab0da5794da67df840c995f0e3378388b498f47e8d9672c1ba08287bcd89dcf2da67330c5e38546c740b041b19227b'
-	'facb711a01c41665c7909f82b4cee65ddee232e0c526f754ce1ab148dbc6c65abb9b24255f985be245fb2c33f91623365eac730ef83cb1a7c595a09726856fa1'
-	'39c1f51e9a4487b765d575b364e05e4be5e9d002d10d3d3fab4930e0fb659ec4702fcac7922ac124e64a4362154e66e32b5d30e0d69900f1acd904d46bdbd011'
-	'0cd282520bf2def1c6d7d75e14777203c64073ef2583cc5c0f353d2834460ffad5d7d6c257727149c5406b3faa17f6edc136b276f6826d921e042fcd1776c9a2')
+'807cb6b2afa6180cc814f4a6b15e07ac3f7c68f383c4d35ba7ee42e044e6d871cf34e265f9ad2ccd4d15d0d02401f3da2970a60b10eb3cb0a160723533e37b4b'
+'d874fa6d10e38cd6f982adeef2b35bce3338fe90ca10bc82051f79f2c50b393c07e05a20b7e5846b6723f22903934bcc61ffdbf19ad60268188bdcf83da4784e'
+'799d9aa8ae5d9804706188ff237f9e662e678fd88fb2da45023fe04f71e67e87243f1df4b6a33e9e3c6fd6e6f1309f779b3c3ad7c6d8ff34f9ceb49116ab3558'
+'b1a36b009f6f9d64718cf5bb68c47df38be5993eb4b8b935e9469d5f72ab415e1dea65872ecd313c4847a0afcef2a995edac4ba71a15892cb89f0579ac001cb7'
+'facb711a01c41665c7909f82b4cee65ddee232e0c526f754ce1ab148dbc6c65abb9b24255f985be245fb2c33f91623365eac730ef83cb1a7c595a09726856fa1'
+'17a231b1b28b1ce6cd616250173a2702db9cd52aff6e6da811511b3b7b5f5dc92de9a64c5f002b13c20c072d03dbd515eff59b60868c39527dbc00411970933d'
+'e67df3e123c370426705a15a0092c7ffe566d36ae5f53b560a8d3a4c31cacf3b727e990639b62a9712063c62bdb48614ae9e6a5ccb40ae948460bba3097d3817')
 
 build() {
 	# fix configure bug by providing pre-generated configuration file with --prefix=/opt --libdir=/opt/lib --libexecdir=/opt/lib
-	cp config.status ${srcdir}/${_pkgname}-${__pkgver}/
-	cp Makefile.inc  ${srcdir}/${_pkgname}-${__pkgver}/
-	cp qtenv.pri ${srcdir}/${_pkgname}-${__pkgver}/src/qtenv/
-	cp ver.h ${srcdir}/${_pkgname}-${__pkgver}/src/common/
-	cd ${srcdir}/${_pkgname}-${__pkgver}
-	PATH=${srcdir}/${_pkgname}-${__pkgver}/bin:$PATH
-	LD_LIBRARY_PATH=${srcdir}/${_pkgname}-${__pkgver}/lib:$LD_LIBRARY_PATH
+	cp config.status ${srcdir}/${_pkgname}-${pkgver}/
+	cp Makefile.inc  ${srcdir}/${_pkgname}-${pkgver}/
+	cp qtenv.pri ${srcdir}/${_pkgname}-${pkgver}/src/qtenv/
+	cp ver.h ${srcdir}/${_pkgname}-${pkgver}/src/common/
+	cd ${srcdir}/${_pkgname}-${pkgver}
+	PATH=${srcdir}/${_pkgname}-${pkgver}/bin:$PATH
+	LD_LIBRARY_PATH=${srcdir}/${_pkgname}-${pkgver}/lib:$LD_LIBRARY_PATH
 	make
 }
 
@@ -54,7 +52,7 @@ package() {
 	# Install build to /opt
 	cd ${srcdir}
 	mkdir -p "${pkgdir}"/opt 
-	mv  "${_pkgname}-${__pkgver}" ${pkgdir}/opt/${_pkgname} || return 1
+	mv  "${_pkgname}-${pkgver}" ${pkgdir}/opt/${_pkgname} || return 1
 
 	# run OMNeT++ as a normal user
 	touch ${pkgdir}/opt/${_pkgname}/ide/error.log
diff --git a/config.status b/config.status
index 93a3dba18ba0..eff779cb9d0e 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/src/omnetpp-5.2'
+ac_pwd='/home/brunofernandes/AUR/omnetpp-qt/teste/omnetpp-5.3p1'
 srcdir='.'
 test -n "$AWK" || AWK=awk
 # The default lists apply if the user does not specify any file.
@@ -638,7 +638,7 @@ S["SHLIB_LD"]="clang++ -shared -fPIC"
 S["ARFLAG_OUT"]=""
 S["AR"]="ar cr"
 S["AS"]="as"
-S["NEDTOOL"]="nedtool"
+S["NEDTOOL"]="opp_nedtool"
 S["SMC"]="opp_smc"
 S["MSGC"]="opp_msgc"
 S["TOOLCHAIN_NAME"]="clang"
@@ -655,9 +655,9 @@ S["DEFINES"]=" -DHAVE_SWAPCONTEXT -DWITH_MPI"
 S["CFLAGS_RELEASE"]=" -O3 -march=native -mtune=native -DNDEBUG=1"
 S["CFLAGS_DEBUG"]=" -g -Wall"
 S["OMNETPP_EDITION"]="Academic Public License -- NOT FOR COMMERCIAL USE"
-S["OMNETPP_BUILDID"]="170818-f9241c2"
-S["OMNETPP_VERSION"]="5.2"
-S["OMNETPP_RELEASE"]="omnetpp-5.2"
+S["OMNETPP_BUILDID"]="171221-c6b3c50"
+S["OMNETPP_VERSION"]="5.3p1"
+S["OMNETPP_RELEASE"]="omnetpp-5.3p1"
 S["OMNETPP_PRODUCT"]="OMNeT++"
 S["MPICXX"]=""
 S["MPICPP"]="mpic++"
diff --git a/download.sh b/download.sh
index e95fbcbcd2a5..9055b20e0019 100644
--- a/download.sh
+++ b/download.sh
@@ -1,15 +1,11 @@
-wget --header='authority:omnetpp.org' \
-	  --header='method:GET' \
-	  --header='path:/component/jdownloads/send/31-release-test-versions/2317-omnetpp-5-2-pre3-linux' \
-	  --header='scheme:https' \
-		--header='accept:text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8' \
-	  --header='accept-encoding:gzip, deflate, br' \
-	  --header='accept-language:en-US,en;q=0.8,pt-PT;q=0.6,pt;q=0.4,en-GB;q=0.2' \
-		--header='cache-control:no-cache' \
-		--header='cookie:__cfduid=d045f375fa3a89555b30f19e89e39dd371498311455; fcb7e5dfc3182a73cb86f768253d1ad1=c696v8gdb38846dhf1v71spq11; cf_use_ob=0' \
-		--header='pragma:no-cache' \
-		--header='referer:https://omnetpp.org/component/jdownloads/download/31-release-test-versions/2317-omnetpp-5-2-pre3-linux' \
-	  --header='upgrade-insecure-requests:1' \
-	  --header='user-agent:Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/62.0.3188.2 Safari/537.36' \
-		https://omnetpp.org/component/jdownloads/send/31-release-test-versions/2317-omnetpp-5-2-pre3-linux \
-	  -O omnetpp-5.2pre3-src-linux.tgz
+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='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='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
diff --git a/ver.h b/ver.h
index 9ba9f66b6f0e..e9fd05d0646f 100644
--- a/ver.h
+++ b/ver.h
@@ -13,7 +13,7 @@
 *--------------------------------------------------------------*/
 
 #define OMNETPP_PRODUCT "OMNeT++"
-#define OMNETPP_RELEASE "omnetpp-5.2"
-#define OMNETPP_VERSION_STR "5.2"
-#define OMNETPP_BUILDID "170818-f9241c2"
+#define OMNETPP_RELEASE "omnetpp-5.3p1"
+#define OMNETPP_VERSION_STR "5.3p1"
+#define OMNETPP_BUILDID "171221-c6b3c50"
 #define OMNETPP_EDITION "Academic Public License -- NOT FOR COMMERCIAL USE"