Bump to 5.2pre3

6 files changed, 72 insertions, 74 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ea4e069c6147..3beeb82d3305 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 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.1
-	pkgrel = 2
+	pkgver = 5.2pre3
+	pkgrel = 1
 	url = http://www.omnetpp.org
 	arch = i686
 	arch = x86_64
@@ -32,21 +32,21 @@ pkgbase = omnetpp-qt
 	provides = omnetpp
 	conflicts = omnetpp
 	source = OMNeT++.desktop
-	source = ver.h
 	source = config.status
 	source = Makefile.inc
 	source = qtenv.pri
+	source = ver.h
 	source = omnetpp.sh
 	source = download.sh
-	source = omnetpp-5.1-src-linux.tgz::https://omnetpp.org/omnetpp/send/30-omnet-releases/2309-omnetpp-5-1-linux
+	source = omnetpp-5.2pre3-src-linux.tgz::https://omnetpp.org/component/jdownloads/send/31-release-test-versions/2317-omnetpp-5-2-pre3-linux
 	sha512sums = a5772a605592ed2db839609f8298d1d71fb9141eb1b30dac584b788414dfe49b250ba803351a3a84f90c6b89f8e09e7b129a037af17c9b94c22dff2003a5edd8
-	sha512sums = a1d41e71e2ec1a35ac6e3879eb21b2c7891a762f782fbaa425c8a423815672226c116fae8a934c3bf8a665c96fdfc61083ab5a390b277fcb6ed115da3c314a76
-	sha512sums = 021d93c3dd606f3d8ed7df0fa77142108cc5a6e43929d6db729ad74948decaccda4f33f271f6714e23c566ed377f8cf0f18c244c549e20a9617eb852fc41c510
-	sha512sums = d52d6cfa2f156f8262a88364932a4b3429e51962e6707ea6330b179fd21e70a6a2afa4805bc2f40c34192ac6e47237f07f1db1ca46b3f5243b4c99a51107b256
+	sha512sums = a5b26871248a4a4c5002b3a121f00b519a1898e4743affe386fd938fa06442ef128442e797097bb8355f80fc3e9ebb3438494d4be9dd27c6efbd42afb1731b8b
+	sha512sums = 5322a1d22f1918f261eb1c312019413698266d82323f45ee37474dac49c525f60bdc9212b91dbea232dc6f31f5c08ef7ed6f8e7f3bd356db704185de89487fc5
 	sha512sums = 799d9aa8ae5d9804706188ff237f9e662e678fd88fb2da45023fe04f71e67e87243f1df4b6a33e9e3c6fd6e6f1309f779b3c3ad7c6d8ff34f9ceb49116ab3558
+	sha512sums = 4c54ffa1e9f645e8af8b5e4cc1da697ab2ab0da5794da67df840c995f0e3378388b498f47e8d9672c1ba08287bcd89dcf2da67330c5e38546c740b041b19227b
 	sha512sums = facb711a01c41665c7909f82b4cee65ddee232e0c526f754ce1ab148dbc6c65abb9b24255f985be245fb2c33f91623365eac730ef83cb1a7c595a09726856fa1
-	sha512sums = 559f43976959b0456bb21601b84df3ab690c734b6b0dcb2b5f564b9e061a3e3a824b8bd5844b1922e6302f4918146620160617feec442f956449fc7c07fb244a
-	sha512sums = c569f4abb829ffd603ddafe588487893295f16f27ff52de143aca24080dafe282a2e24fa047745cc7f6963c3be5db761ca9f288c41887331e62f21ebc4416eb3
+	sha512sums = 39c1f51e9a4487b765d575b364e05e4be5e9d002d10d3d3fab4930e0fb659ec4702fcac7922ac124e64a4362154e66e32b5d30e0d69900f1acd904d46bdbd011
+	sha512sums = 0cd282520bf2def1c6d7d75e14777203c64073ef2583cc5c0f353d2834460ffad5d7d6c257727149c5406b3faa17f6edc136b276f6826d921e042fcd1776c9a2
 
 pkgname = omnetpp-qt
 
diff --git a/Makefile.inc b/Makefile.inc
index 895feb5f2f0f..d7d0ee84091d 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -3,9 +3,9 @@
 # Your changes will be lost the next time ./configure is run.
 #
 OMNETPP_PRODUCT = OMNeT++
-OMNETPP_RELEASE = omnetpp-5.1
-OMNETPP_VERSION = 5.1
-OMNETPP_BUILDID = 170331-7c4e366
+OMNETPP_RELEASE = omnetpp-5.2
+OMNETPP_VERSION = 5.2
+OMNETPP_BUILDID = 170818-f9241c2
 OMNETPP_EDITION = Academic Public License -- NOT FOR COMMERCIAL USE
 
 #
@@ -60,14 +60,14 @@ endif
 #
 # Configure MODE specific flags/suffixes
 #
-ifeq ($(MODE),release)
+ifeq ($(MODE),debug)
+  CFLAGS=$(CFLAGS_DEBUG)
+  D=_dbg
+else
+  # by default assume release mode
+  MODE=release
   CFLAGS=$(CFLAGS_RELEASE)
   D=
-else
-  # by default assume debug mode
-  MODE=debug
-  CFLAGS=$(CFLAGS_DEBUG)
-  D=d
 endif
 
 # use statically built omnetpp if we are building the IDE native helper library
@@ -113,7 +113,7 @@ CXX = clang++
 TOOLCHAIN_NAME = clang
 DEFINES = -DHAVE_SWAPCONTEXT -DWITH_MPI
 CFLAGS_DEBUG = -g -Wall
-CFLAGS_RELEASE = -O2 -DNDEBUG=1
+CFLAGS_RELEASE = -O3 -march=native -mtune=native -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
@@ -138,7 +138,7 @@ DLLTOOL = dlltool
 STRIP = strip
 WISH = wish
 MAKEDEPEND = opp_makedep -Y --objdirtree
-LN = ln -sf
+LN = ln -f
 MKPATH = mkdir -p
 SHLIB_POSTPROCESS = opp_shlib_postprocess
 SWIG = swig
@@ -164,9 +164,9 @@ 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 = libxml
-XML_CFLAGS = -I/usr/include/libxml2
-XML_LIBS = -lxml2
+XMLPARSER = expat
+XML_CFLAGS = 
+XML_LIBS = -lexpat
 DEFINES += -DXMLPARSER=$(XMLPARSER)
 AKAROA_CFLAGS = -I/usr/local/akaroa/include
 AKAROA_LIBS = -L/usr/local/akaroa/lib -lakaroa -lfl
@@ -199,7 +199,6 @@ OPPMAIN_LIB = $(LDFLAG_LIB)oppmain$D
 # flags and libraries required for Qtenv
 #
 ifeq ($(WITH_QTENV),yes)
-  QTENV_TARGET = qtenv
   DEFINES += -DPREFER_QTENV -DWITH_QTENV
   # libraries required for static linking
   ifneq ($(SHARED_LIBS),yes)
@@ -217,15 +216,12 @@ ifeq ($(WITH_QTENV),yes)
     endif
   endif
   ALL_ENV_LIBS += $(QTENV_LIBS)
-else
-  QTENV_TARGET = skip
 endif
 
 #
 # flags and libraries required for Ttenv
 #
 ifeq ($(WITH_TKENV),yes)
-  TKENV_TARGET = tkenv
   DEFINES += -DWITH_TKENV
   # libraries required for static linking
   ifneq ($(SHARED_LIBS),yes)
@@ -235,8 +231,6 @@ ifeq ($(WITH_TKENV),yes)
     endif
   endif
   ALL_ENV_LIBS += $(TKENV_LIBS)
-else
-  TKENV_TARGET = skip
 endif
 
 #
diff --git a/PKGBUILD b/PKGBUILD
index 154653a555ca..5995bff0e21f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,10 @@
 # Maintainer: Bruno Silva <brunofernandes at ua dot pt>
-
 pkgname='omnetpp-qt'
-pkgver=5.1
-_pkgver=5-1
-pkgrel=2
+pkgver=5.2pre3
+_pkgver=5-2-pre3
+__pkgver=5.2
+___pkgver=5-2
+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'
@@ -14,38 +15,38 @@ arch=('i686' 'x86_64')
 provides=('omnetpp')
 conflicts=('omnetpp')
 
-if [ $(echo "c569f4abb829ffd603ddafe588487893295f16f27ff52de143aca24080dafe282a2e24fa047745cc7f6963c3be5db761ca9f288c41887331e62f21ebc4416eb3 omnetpp-5.1-src-linux.tgz" | sha512sum -c --status; echo $?) -ne 0 ];
+if [ $(echo "0cd282520bf2def1c6d7d75e14777203c64073ef2583cc5c0f353d2834460ffad5d7d6c257727149c5406b3faa17f6edc136b276f6826d921e042fcd1776c9a2  omnetpp-5.2pre3-src-linux.tgz" | sha512sum -c --status; echo $?) -ne 0 ];
 then
 	sh download.sh
 fi
 
 source=(OMNeT++.desktop
-	ver.h
 	config.status
 	Makefile.inc
 	qtenv.pri
+  ver.h
 	omnetpp.sh
 	download.sh
-	omnetpp-5.1-src-linux.tgz::https://omnetpp.org/omnetpp/send/30-omnet-releases/2309-omnetpp-5-1-linux)
+	omnetpp-5.2pre3-src-linux.tgz::https://omnetpp.org/component/jdownloads/send/31-release-test-versions/2317-omnetpp-5-2-pre3-linux)
 
 sha512sums=('a5772a605592ed2db839609f8298d1d71fb9141eb1b30dac584b788414dfe49b250ba803351a3a84f90c6b89f8e09e7b129a037af17c9b94c22dff2003a5edd8'
-	'a1d41e71e2ec1a35ac6e3879eb21b2c7891a762f782fbaa425c8a423815672226c116fae8a934c3bf8a665c96fdfc61083ab5a390b277fcb6ed115da3c314a76'
-	'021d93c3dd606f3d8ed7df0fa77142108cc5a6e43929d6db729ad74948decaccda4f33f271f6714e23c566ed377f8cf0f18c244c549e20a9617eb852fc41c510'
-	'd52d6cfa2f156f8262a88364932a4b3429e51962e6707ea6330b179fd21e70a6a2afa4805bc2f40c34192ac6e47237f07f1db1ca46b3f5243b4c99a51107b256'
-	'799d9aa8ae5d9804706188ff237f9e662e678fd88fb2da45023fe04f71e67e87243f1df4b6a33e9e3c6fd6e6f1309f779b3c3ad7c6d8ff34f9ceb49116ab3558'
+  'a5b26871248a4a4c5002b3a121f00b519a1898e4743affe386fd938fa06442ef128442e797097bb8355f80fc3e9ebb3438494d4be9dd27c6efbd42afb1731b8b'
+  '5322a1d22f1918f261eb1c312019413698266d82323f45ee37474dac49c525f60bdc9212b91dbea232dc6f31f5c08ef7ed6f8e7f3bd356db704185de89487fc5'
+  '799d9aa8ae5d9804706188ff237f9e662e678fd88fb2da45023fe04f71e67e87243f1df4b6a33e9e3c6fd6e6f1309f779b3c3ad7c6d8ff34f9ceb49116ab3558'
+  '4c54ffa1e9f645e8af8b5e4cc1da697ab2ab0da5794da67df840c995f0e3378388b498f47e8d9672c1ba08287bcd89dcf2da67330c5e38546c740b041b19227b'
 	'facb711a01c41665c7909f82b4cee65ddee232e0c526f754ce1ab148dbc6c65abb9b24255f985be245fb2c33f91623365eac730ef83cb1a7c595a09726856fa1'
-	'559f43976959b0456bb21601b84df3ab690c734b6b0dcb2b5f564b9e061a3e3a824b8bd5844b1922e6302f4918146620160617feec442f956449fc7c07fb244a'
-	'c569f4abb829ffd603ddafe588487893295f16f27ff52de143aca24080dafe282a2e24fa047745cc7f6963c3be5db761ca9f288c41887331e62f21ebc4416eb3')
+	'39c1f51e9a4487b765d575b364e05e4be5e9d002d10d3d3fab4930e0fb659ec4702fcac7922ac124e64a4362154e66e32b5d30e0d69900f1acd904d46bdbd011'
+	'0cd282520bf2def1c6d7d75e14777203c64073ef2583cc5c0f353d2834460ffad5d7d6c257727149c5406b3faa17f6edc136b276f6826d921e042fcd1776c9a2')
 
 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
 }
 
@@ -53,7 +54,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
@@ -71,3 +72,4 @@ package() {
 	cd ${pkgdir}/opt/${_pkgname}/doc
 	install -D -m644 License "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
+
diff --git a/config.status b/config.status
index 9062fc3598ea..93a3dba18ba0 100755
--- a/config.status
+++ b/config.status
@@ -417,7 +417,7 @@ $config_files
 
 Report bugs to the package provider."
 
-ac_cs_config="'--prefix=/opt'"
+ac_cs_config="'--prefix=/opt' '--libdir=/opt/lib' '--libexecdir=/opt/lib'"
 ac_cs_version="\
 config.status
 configured by ./configure, generated by GNU Autoconf 2.69,
@@ -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='.'
+ac_pwd='/home/brunofernandes/AUR/omnetpp-qt/src/omnetpp-5.2'
 srcdir='.'
 test -n "$AWK" || AWK=awk
 # The default lists apply if the user does not specify any file.
@@ -495,7 +495,7 @@ if $ac_cs_silent; then
 fi
 
 if $ac_cs_recheck; then
-  set X /bin/sh './configure'  '--prefix=/opt' $ac_configure_extra_args --no-create --no-recursion
+  set X /bin/sh './configure'  '--prefix=/opt' '--libdir=/opt/lib' '--libexecdir=/opt/lib' $ac_configure_extra_args --no-create --no-recursion
   shift
   $as_echo "running CONFIG_SHELL=/bin/sh $*" >&6
   CONFIG_SHELL='/bin/sh'
@@ -599,9 +599,9 @@ S["EMBED_TCL_CODE"]="yes"
 S["JNILIBS_IF_POSSIBLE"]="jnilibs"
 S["AKAROA_LIBS"]="-L/usr/local/akaroa/lib -lakaroa -lfl"
 S["AKAROA_CFLAGS"]="-I/usr/local/akaroa/include"
-S["XML_LIBS"]="-lxml2"
-S["XML_CFLAGS"]="-I/usr/include/libxml2"
-S["XMLPARSER"]="libxml"
+S["XML_LIBS"]="-lexpat"
+S["XML_CFLAGS"]=""
+S["XMLPARSER"]="expat"
 S["PTHREAD_LIBS"]="-lpthread"
 S["PTHREAD_CFLAGS"]=""
 S["SYS_LIBS"]="-ldl -lstdc++ "
@@ -630,7 +630,7 @@ S["A_LIB_SUFFIX"]=".a"
 S["SHARED_LIBS"]="yes"
 S["SHLIB_POSTPROCESS"]="opp_shlib_postprocess"
 S["MKPATH"]="mkdir -p"
-S["LN"]="ln -sf"
+S["LN"]="ln -f"
 S["MAKEDEPEND"]="opp_makedep -Y --objdirtree"
 S["STRIP"]="strip"
 S["DLLTOOL"]="dlltool"
@@ -652,12 +652,12 @@ S["LDFLAG_LIB"]="-l"
 S["LDFLAG_INCLUDE"]="-Wl,-u,"
 S["LDFLAG_LIBPATH"]="-L"
 S["DEFINES"]=" -DHAVE_SWAPCONTEXT -DWITH_MPI"
-S["CFLAGS_RELEASE"]=" -O2 -DNDEBUG=1"
+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"]="170331-7c4e366"
-S["OMNETPP_VERSION"]="5.1"
-S["OMNETPP_RELEASE"]="omnetpp-5.1"
+S["OMNETPP_BUILDID"]="170818-f9241c2"
+S["OMNETPP_VERSION"]="5.2"
+S["OMNETPP_RELEASE"]="omnetpp-5.2"
 S["OMNETPP_PRODUCT"]="OMNeT++"
 S["MPICXX"]=""
 S["MPICPP"]="mpic++"
@@ -709,7 +709,7 @@ S["DEFS"]="-DPACKAGE_NAME=\\\"\\\" -DPACKAGE_TARNAME=\\\"\\\" -DPACKAGE_VERSION=
 "XT=1"
 S["mandir"]="${datarootdir}/man"
 S["localedir"]="${datarootdir}/locale"
-S["libdir"]="${exec_prefix}/lib"
+S["libdir"]="/opt/lib"
 S["psdir"]="${docdir}"
 S["pdfdir"]="${docdir}"
 S["dvidir"]="${docdir}"
@@ -724,7 +724,7 @@ S["sharedstatedir"]="${prefix}/com"
 S["sysconfdir"]="${prefix}/etc"
 S["datadir"]="${datarootdir}"
 S["datarootdir"]="${prefix}/share"
-S["libexecdir"]="${exec_prefix}/libexec"
+S["libexecdir"]="/opt/lib"
 S["sbindir"]="${exec_prefix}/sbin"
 S["bindir"]="${exec_prefix}/bin"
 S["program_transform_name"]="s,x,x,"
diff --git a/download.sh b/download.sh
index f6fd8ee617ac..e95fbcbcd2a5 100644
--- a/download.sh
+++ b/download.sh
@@ -1,13 +1,15 @@
 wget --header='authority:omnetpp.org' \
 	  --header='method:GET' \
-	  --header='path:/omnetpp/send/30-omnet-releases/2309-omnetpp-5-1-linux' \
+	  --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,*/*;q=0.8' \
-	  --header='accept-encoding:gzip, deflate, sdch, br' \
+		--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='cookie:__cfduid=d50836abc713caa68412f2569f4306ef41490692140; fcb7e5dfc3182a73cb86f768253d1ad1=eqim9j7u991od77bhhdhou9v30' \
-	  --header='referer:https://omnetpp.org/omnetpp' \
+		--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/59.0.3071.15 Safari/537.36' \
-	  https://omnetpp.org/omnetpp/send/30-omnet-releases/2309-omnetpp-5-1-linux \
-	  -O omnetpp-5.1-src-linux.tgz
+	  --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
diff --git a/ver.h b/ver.h
index 548683275063..9ba9f66b6f0e 100644
--- a/ver.h
+++ b/ver.h
@@ -13,7 +13,7 @@
 *--------------------------------------------------------------*/
 
 #define OMNETPP_PRODUCT "OMNeT++"
-#define OMNETPP_RELEASE "omnetpp-5.1"
-#define OMNETPP_VERSION_STR "5.1"
-#define OMNETPP_BUILDID "170331-7c4e366"
+#define OMNETPP_RELEASE "omnetpp-5.2"
+#define OMNETPP_VERSION_STR "5.2"
+#define OMNETPP_BUILDID "170818-f9241c2"
 #define OMNETPP_EDITION "Academic Public License -- NOT FOR COMMERCIAL USE"