V2018

1 files changed, 22 insertions, 21 deletions

diff --git a/PKGBUILD b/PKGBUILD
index a72fd541b179..b4c8c09fa4de 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,17 +1,17 @@
 # Maintainer of this PKBGUILD file: Martino Pilia <martino.pilia@gmail.com>
 pkgname=salome-meca-bin
-pkgver=2017.0.2
-pkgrel=6
+pkgver=2018
+pkgrel=1
 pkgdesc='Integration of the Code_Aster solver in the Salome platform'
 arch=('x86_64')
 url='https://www.code-aster.org/spip.php?article303'
 license=('LGPL')
-depends=('openblas')
+depends=('coreutils' 'openblas')
 makedepends=()
 optdepends=()
 provides=('salome-meca')
-source=("https://www.code-aster.org/FICHIERS/Salome-Meca-${pkgver}-LGPL-1.tgz")
-md5sums=('e65b4da01a8200492b94a278db621029')
+source=("https://www.code-aster.org/FICHIERS/salome_meca-2018-LGPL-2.tgz")
+md5sums=('9f1b0c7b30fab902e75199a37eac5c34')
 
 build() {
 	cd "${srcdir}"
@@ -22,42 +22,43 @@ build() {
 	rm -rf ${srcdir}/salome_meca || :
 
 	# self-extract
-	./Salome-Meca-2017.0.2-LGPL-1.run &> /dev/null <<-EOF
+	./salome_meca-2018-LGPL-2.run &> /dev/null <<-EOF
 	${srcdir}/salome_meca
 	EOF
 
-	cd "${srcdir}/salome_meca/V2017.0.2/" 
+	cd "${srcdir}/salome_meca/V${pkgver}/" 
 
 	# impose the right path for the setup script
 	sed -i \
-		"107iSALOMEDIR=${srcdir}/salome_meca/V2017.0.2/" \
+		"107iSALOMEDIR=${srcdir}/salome_meca/V${pkgver}/" \
 		create_appli.sh
 
 	# use the bundled version of python
-	export PATH="${srcdir}/salome_meca/V2017.0.2/prerequisites/Python-2710/bin/":$PATH
+	export PATH="${srcdir}/salome_meca/V${pkgver}/prerequisites/Python-2710/bin/":$PATH
 
-	# try using the system freetype2 library
-	# update to freetype2 2.9 breaks the bundled version
-	rm "${srcdir}/salome_meca/V2017.0.2/prerequisites/Freetype-2411"/lib/libfreetype.so*
+	# Try to use the system libstdc++.so.6
+	# (hoping this does not break anything else, for the moment it seems not...)
+	mv "${srcdir}/salome_meca/V${pkgver}/prerequisites/debianForSalome/lib/libstdc++.so.6" \
+		"${srcdir}/salome_meca/V${pkgver}/prerequisites/debianForSalome/lib/libstdc++.so.6.bak"
 
 	echo "Building virtual application..."
 
 	# create virtual application
 	# -D to not automatically create a (wrong) desktop and menu entry
 	./create_appli.sh -D &> /dev/null <<-EOF
-	${srcdir}/salome_meca/appli_V2017.0.2
+	${srcdir}/salome_meca/appli_V${pkgver}
 	EOF
 
 	# ensure that the extraction did not fail
-	if [ ! -e "${srcdir}/salome_meca/appli_V2017.0.2/salome" ]; then
-		error "Extraction of the application failed, please check '${srcdir}/salome_meca/appli_V2017.0.2/appli_V2017.0.2.log' for relevant error messages."
+	if [ ! -e "${srcdir}/salome_meca/appli_V${pkgver}/salome" ]; then
+		error "Extraction of the application failed, please check '${srcdir}/salome_meca/appli_V${pkgver}/appli_V${pkgver}.log' for relevant error messages."
 		exit 1
 	fi
 
 	# create .desktop file from template
 	sed -e "s,APPLIDIR/salome,/usr/bin/salome_meca," \
-		-e "s,SALOMEDIR,/opt/salome_meca/V2017.0.2," \
-		${srcdir}/salome_meca/V2017.0.2/.salome_meca_V2017.0.2.desktop \
+		-e "s,SALOMEDIR,/opt/salome_meca/V${pkgver}," \
+		${srcdir}/salome_meca/V${pkgver}/.salome_meca_V${pkgver}.desktop \
 		> ${srcdir}/salome_meca.desktop
 
 	echo "Fixing references..."
@@ -81,19 +82,19 @@ package() {
 
 	# create launcher script
 	# use the bundled libraries and Python version 
-	_path='PATH=/opt/salome_meca/V2017.0.2/prerequisites/Python-2710/bin/:$PATH'
-	_ld_path="LD_LIBRARY_PATH=\$(find /opt/salome_meca/V2017.0.2/ -type d -name lib  | tr '\\n' ':' | sed 's/:$//'):\$LD_LIBRARY_PATH"
+	_path='PATH=/opt/salome_meca/V2018/prerequisites/Python-2710/bin/:$PATH'
+	_ld_path="LD_LIBRARY_PATH=\$(find /opt/salome_meca/V2018/ -type d -name lib  | tr '\\n' ':' | sed 's/:$//'):\$LD_LIBRARY_PATH"
 	mkdir -p ${pkgdir}/usr/bin
 	cat > ${pkgdir}/usr/bin/salome_meca <<-EOF
 	#!/usr/bin/env bash
-	$_path $_ld_path /opt/salome_meca/appli_V2017.0.2/salome "\$@"
+	$_path $_ld_path /opt/salome_meca/appli_V${pkgver}/salome "\$@"
 	EOF
 	chmod +x ${pkgdir}/usr/bin/salome_meca
 
 	# install bash completions
 	mkdir -p $pkgdir/usr/share/bash-completion/completions
 	install -D -m644 \
-		"${srcdir}/salome_meca/appli_V2017.0.2/.salome-completion.sh" \
+		"${srcdir}/salome_meca/appli_V${pkgver}/.salome-completion.sh" \
 		"${pkgdir}/usr/share/bash-completion/completions/salome"
 
 	# install application