[arch-commits] Commit in libasl/repos (8 files)
Bartłomiej Piotrowski
bpiotrowski at archlinux.org
Mon Dec 21 19:04:11 UTC 2015
Date: Monday, December 21, 2015 @ 20:04:11
Author: bpiotrowski
Revision: 154041
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
libasl/repos/community-staging-i686/
libasl/repos/community-staging-i686/PKGBUILD
(from rev 154040, libasl/trunk/PKGBUILD)
libasl/repos/community-staging-i686/libasl-0.1.6-Explicitly-define-namespace-of-ifstream-and-ofstream.patch
(from rev 154040, libasl/trunk/libasl-0.1.6-Explicitly-define-namespace-of-ifstream-and-ofstream.patch)
libasl/repos/community-staging-i686/suppress-deprecated-warnings.patch
(from rev 154040, libasl/trunk/suppress-deprecated-warnings.patch)
libasl/repos/community-staging-x86_64/
libasl/repos/community-staging-x86_64/PKGBUILD
(from rev 154040, libasl/trunk/PKGBUILD)
libasl/repos/community-staging-x86_64/libasl-0.1.6-Explicitly-define-namespace-of-ifstream-and-ofstream.patch
(from rev 154040, libasl/trunk/libasl-0.1.6-Explicitly-define-namespace-of-ifstream-and-ofstream.patch)
libasl/repos/community-staging-x86_64/suppress-deprecated-warnings.patch
(from rev 154040, libasl/trunk/suppress-deprecated-warnings.patch)
--------------------------------------------------------------------------------------------------+
community-staging-i686/PKGBUILD | 51 ++++++++
community-staging-i686/libasl-0.1.6-Explicitly-define-namespace-of-ifstream-and-ofstream.patch | 59 ++++++++++
community-staging-i686/suppress-deprecated-warnings.patch | 11 +
community-staging-x86_64/PKGBUILD | 51 ++++++++
community-staging-x86_64/libasl-0.1.6-Explicitly-define-namespace-of-ifstream-and-ofstream.patch | 59 ++++++++++
community-staging-x86_64/suppress-deprecated-warnings.patch | 11 +
6 files changed, 242 insertions(+)
Copied: libasl/repos/community-staging-i686/PKGBUILD (from rev 154040, libasl/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2015-12-21 19:04:11 UTC (rev 154041)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Evgeniy Alekseev <arcanis at archlinux dot ord>
+# Contributor: Andrejs Mivreņiks <gim at fastmail dot fm>
+
+pkgname=libasl
+pkgver=0.1.6
+pkgrel=4
+pkgdesc='Multiphysics simulation software package (Advanced Simulation Library)'
+arch=('i686' 'x86_64')
+url='http://asl.org.il/'
+license=('AGPL3')
+depends=('boost-libs' 'libcl' 'libmatio' 'vtk' 'libjpeg' 'libpng' 'libtiff'
+ '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-0.1.6-Explicitly-define-namespace-of-ifstream-and-ofstream.patch')
+md5sums=('1f283d066d57e11d4602016148181420'
+ '972d7ed8037a35d32125773ae70f6360'
+ '4747d00c048574f5722b4d9cfaa73676')
+
+prepare() {
+ rm -rf "build"
+ mkdir "build"
+
+ # patch to suppress 'deprecated' warning messages
+ # caused by 'opencl-headers' since update to 2.0
+ cd "ASL-${pkgver}"
+ patch -p1 -i "${srcdir}/suppress-deprecated-warnings.patch"
+
+ patch -p1 -i "${srcdir}/libasl-0.1.6-Explicitly-define-namespace-of-ifstream-and-ofstream.patch"
+}
+
+build() {
+ cd "build"
+ cmake -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DBUILD_SHARED_LIBS=ON \
+ -DWITH_EXAMPLES=ON \
+ -DWITH_MATIO=ON \
+ -DWITH_API_DOC=OFF \
+ -DWITH_TESTS=OFF \
+ "../ASL-${pkgver}"
+ make
+}
+
+package() {
+ cd "build"
+ make DESTDIR="${pkgdir}" install
+}
+
Copied: libasl/repos/community-staging-i686/libasl-0.1.6-Explicitly-define-namespace-of-ifstream-and-ofstream.patch (from rev 154040, libasl/trunk/libasl-0.1.6-Explicitly-define-namespace-of-ifstream-and-ofstream.patch)
===================================================================
--- community-staging-i686/libasl-0.1.6-Explicitly-define-namespace-of-ifstream-and-ofstream.patch (rev 0)
+++ community-staging-i686/libasl-0.1.6-Explicitly-define-namespace-of-ifstream-and-ofstream.patch 2015-12-21 19:04:11 UTC (rev 154041)
@@ -0,0 +1,59 @@
+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
+
Copied: libasl/repos/community-staging-i686/suppress-deprecated-warnings.patch (from rev 154040, libasl/trunk/suppress-deprecated-warnings.patch)
===================================================================
--- community-staging-i686/suppress-deprecated-warnings.patch (rev 0)
+++ community-staging-i686/suppress-deprecated-warnings.patch 2015-12-21 19:04:11 UTC (rev 154041)
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt 2015-08-24 19:50:08.000000000 +0300
++++ b/CMakeLists.txt 2015-08-25 23:22:14.174394239 +0300
+@@ -37,7 +37,7 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -std=c++11")
+ else()
+ set(CMAKE_CXX_STANDARD 11)
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -Wno-deprecated -Wno-deprecated-declarations")
+ endif()
+
+ # Enable supplied cmake includes and modules
Copied: libasl/repos/community-staging-x86_64/PKGBUILD (from rev 154040, libasl/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2015-12-21 19:04:11 UTC (rev 154041)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Evgeniy Alekseev <arcanis at archlinux dot ord>
+# Contributor: Andrejs Mivreņiks <gim at fastmail dot fm>
+
+pkgname=libasl
+pkgver=0.1.6
+pkgrel=4
+pkgdesc='Multiphysics simulation software package (Advanced Simulation Library)'
+arch=('i686' 'x86_64')
+url='http://asl.org.il/'
+license=('AGPL3')
+depends=('boost-libs' 'libcl' 'libmatio' 'vtk' 'libjpeg' 'libpng' 'libtiff'
+ '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-0.1.6-Explicitly-define-namespace-of-ifstream-and-ofstream.patch')
+md5sums=('1f283d066d57e11d4602016148181420'
+ '972d7ed8037a35d32125773ae70f6360'
+ '4747d00c048574f5722b4d9cfaa73676')
+
+prepare() {
+ rm -rf "build"
+ mkdir "build"
+
+ # patch to suppress 'deprecated' warning messages
+ # caused by 'opencl-headers' since update to 2.0
+ cd "ASL-${pkgver}"
+ patch -p1 -i "${srcdir}/suppress-deprecated-warnings.patch"
+
+ patch -p1 -i "${srcdir}/libasl-0.1.6-Explicitly-define-namespace-of-ifstream-and-ofstream.patch"
+}
+
+build() {
+ cd "build"
+ cmake -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DBUILD_SHARED_LIBS=ON \
+ -DWITH_EXAMPLES=ON \
+ -DWITH_MATIO=ON \
+ -DWITH_API_DOC=OFF \
+ -DWITH_TESTS=OFF \
+ "../ASL-${pkgver}"
+ make
+}
+
+package() {
+ cd "build"
+ make DESTDIR="${pkgdir}" install
+}
+
Copied: libasl/repos/community-staging-x86_64/libasl-0.1.6-Explicitly-define-namespace-of-ifstream-and-ofstream.patch (from rev 154040, libasl/trunk/libasl-0.1.6-Explicitly-define-namespace-of-ifstream-and-ofstream.patch)
===================================================================
--- community-staging-x86_64/libasl-0.1.6-Explicitly-define-namespace-of-ifstream-and-ofstream.patch (rev 0)
+++ community-staging-x86_64/libasl-0.1.6-Explicitly-define-namespace-of-ifstream-and-ofstream.patch 2015-12-21 19:04:11 UTC (rev 154041)
@@ -0,0 +1,59 @@
+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
+
Copied: libasl/repos/community-staging-x86_64/suppress-deprecated-warnings.patch (from rev 154040, libasl/trunk/suppress-deprecated-warnings.patch)
===================================================================
--- community-staging-x86_64/suppress-deprecated-warnings.patch (rev 0)
+++ community-staging-x86_64/suppress-deprecated-warnings.patch 2015-12-21 19:04:11 UTC (rev 154041)
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt 2015-08-24 19:50:08.000000000 +0300
++++ b/CMakeLists.txt 2015-08-25 23:22:14.174394239 +0300
+@@ -37,7 +37,7 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -std=c++11")
+ else()
+ set(CMAKE_CXX_STANDARD 11)
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -Wno-deprecated -Wno-deprecated-declarations")
+ endif()
+
+ # Enable supplied cmake includes and modules
More information about the arch-commits
mailing list