[arch-commits] Commit in libasl/trunk (3 files)

[Evgeniy Alekseev]

    Date: Thursday, November 10, 2016 @ 16:40:40
  Author: arcanis
Revision: 195299

upgpkg: libasl 0.1.7-1

Modified:
  libasl/trunk/PKGBUILD
Deleted:
  libasl/trunk/libasl-0.1.6-Explicitly-define-namespace-of-ifstream-and-ofstream.patch
  libasl/trunk/libasl-vtk7.patch

-------------------------------------------------------------------------+
 PKGBUILD                                                                |   23 +--
 libasl-0.1.6-Explicitly-define-namespace-of-ifstream-and-ofstream.patch |   59 ----------
 libasl-vtk7.patch                                                       |   13 --
 3 files changed, 7 insertions(+), 88 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-11-10 16:25:08 UTC (rev 195298)
+++ PKGBUILD	2016-11-10 16:40:40 UTC (rev 195299)
@@ -1,11 +1,11 @@
 # $Id$
-# Maintainer: Evgeniy Alekseev <arcanis at archlinux dot ord>
+# Maintainer: Evgeniy Alekseev <arcanis at archlinux dot org>
 # Contributor: Andrejs Mivreņiks <gim at fastmail dot fm>
 
 pkgname=libasl
-pkgver=0.1.6
-pkgrel=7
-pkgdesc='Multiphysics simulation software package (Advanced Simulation Library)'
+pkgver=0.1.7
+pkgrel=1
+pkgdesc='Free and open source hardware accelerated multiphysics simulation platform (Advanced Simulation Library)'
 arch=('i686' 'x86_64')
 url='http://asl.org.il/'
 license=('AGPL3')
@@ -13,13 +13,9 @@
          'freetype2' 'libgl')
 makedepends=('cmake' 'opencl-headers' 'boost' 'mesa-libgl')
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/AvtechScientific/ASL/archive/v${pkgver}.tar.gz"
-        'suppress-deprecated-warnings.patch'
-        'libasl-vtk7.patch'
-        'libasl-0.1.6-Explicitly-define-namespace-of-ifstream-and-ofstream.patch')
-md5sums=('1f283d066d57e11d4602016148181420'
-         '972d7ed8037a35d32125773ae70f6360'
-         '583fff4d0e81579720e094ecb8729c2d'
-         '4747d00c048574f5722b4d9cfaa73676')
+        'suppress-deprecated-warnings.patch')
+md5sums=('a339c515690f929c2a870666dc6d2233'
+         '972d7ed8037a35d32125773ae70f6360')
 
 prepare() {
   rm -rf "build"
@@ -29,11 +25,6 @@
   # caused by 'opencl-headers' since update to 2.0
   cd "ASL-${pkgver}"
   patch -p1 -i "${srcdir}/suppress-deprecated-warnings.patch"
-
-  # patch cmakelists for newest vtk
-  patch -p1 -i "${srcdir}/libasl-vtk7.patch"
-
-  patch -p1 -i "${srcdir}/libasl-0.1.6-Explicitly-define-namespace-of-ifstream-and-ofstream.patch"
 }
 
 build() {

Deleted: libasl-0.1.6-Explicitly-define-namespace-of-ifstream-and-ofstream.patch
===================================================================
--- libasl-0.1.6-Explicitly-define-namespace-of-ifstream-and-ofstream.patch	2016-11-10 16:25:08 UTC (rev 195298)
+++ libasl-0.1.6-Explicitly-define-namespace-of-ifstream-and-ofstream.patch	2016-11-10 16:40:40 UTC (rev 195299)
@@ -1,59 +0,0 @@
-From 179516b0b7b3b4a0920444288cf8acca872e8846 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= <b at bpiotrowski.pl>
-Date: Mon, 21 Dec 2015 19:49:51 +0100
-Subject: [PATCH] Explicitly define namespace of ifstream and ofstream
-
-With GCC 5.3.0 and Boost 1.60.0, the build fails with following error:
-/build/libasl/src/ASL-0.1.6/src/utilities/aslParametersManager.cxx:466:6:
-error: reference to 'ifstream' is ambiguous
-      ifstream ifs(p.string());
-      ^
-/usr/include/boost/filesystem/fstream.hpp:169:32: note: candidates are:
-typedef class boost::filesystem::basic_ifstream<char> boost::filesystem::ifstream
-   typedef basic_ifstream<char> ifstream;
-                                ^
----
- src/utilities/aslParametersManager.cxx | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/utilities/aslParametersManager.cxx b/src/utilities/aslParametersManager.cxx
-index 98a0192..d6ef3c7 100644
---- a/src/utilities/aslParametersManager.cxx
-+++ b/src/utilities/aslParametersManager.cxx
-@@ -332,7 +332,7 @@ namespace asl
- 
- 		try
- 		{
--			ifstream ifs(paramFile);
-+			std::ifstream ifs(paramFile);
- 			if (!ifs.good())
- 				errorMessage("Can not open parameters file: " + paramFile);
- 
-@@ -357,7 +357,7 @@ namespace asl
- 
- 	void ParametersManager::writeParametersFile(const std::string fileName)
- 	{
--		ofstream fo(fileName);
-+		std::ofstream fo(fileName);
- 		if (!fo.good())
- 			errorMessage("ParametersManager::writeParametersFile() - can not open file: " + fileName);
- 
-@@ -463,7 +463,7 @@ namespace asl
- 				}
- 				else
- 				{
--					ifstream ifs(p.string());
-+					std::ifstream ifs(p.string());
- 					if (ifs.good())
- 					{
- 						parsed_options parsed = parse_config_file(ifs, allOptions, true);
-@@ -514,4 +514,4 @@ namespace asl
- 		}
- 	}
- 		 
--} //namespace asl
-\ No newline at end of file
-+} //namespace asl
--- 
-2.6.4
-

Deleted: libasl-vtk7.patch
===================================================================
--- libasl-vtk7.patch	2016-11-10 16:25:08 UTC (rev 195298)
+++ libasl-vtk7.patch	2016-11-10 16:40:40 UTC (rev 195299)
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 203e0b8..cd7789e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -52,7 +52,7 @@ include(ASLBuildFunctions)
- find_package(OpenCL 1.1 REQUIRED)
- # ToDo: check - system component might be not needed any longer on new versions of Boost
- find_package(Boost 1.55 REQUIRED COMPONENTS program_options filesystem system)
--find_package(VTK 6.1 COMPONENTS vtkRenderingCore vtkImagingCore vtkFiltersCore vtkIOCore vtkIOLegacy vtkIOXML vtkIOMINC vtkCommonCore vtkViewsCore vtkftgl vtksys vtkDICOMParser vtkexpat vtkzlib NO_MODULE)
-+find_package(VTK 7.0 COMPONENTS vtkRenderingCore vtkImagingCore vtkFiltersCore vtkIOCore vtkIOLegacy vtkIOXML vtkIOMINC vtkCommonCore vtkViewsCore vtksys vtkDICOMParser vtkexpat vtkzlib NO_MODULE)
- include(${VTK_USE_FILE})
- 
- include_directories(SYSTEM ${OpenCL_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})