Date: Friday, February 26, 2016 @ 20:36:44 Author: arcanis Revision: 163522
archrelease: copy trunk to community-i686, community-x86_64 Added: libasl/repos/community-i686/PKGBUILD (from rev 163521, libasl/trunk/PKGBUILD) libasl/repos/community-i686/libasl-0.1.6-Explicitly-define-namespace-of-ifstream-and-ofstream.patch (from rev 163521, libasl/trunk/libasl-0.1.6-Explicitly-define-namespace-of-ifstream-and-ofstream.patch) libasl/repos/community-i686/libasl-vtk7.patch (from rev 163521, libasl/trunk/libasl-vtk7.patch) libasl/repos/community-i686/suppress-deprecated-warnings.patch (from rev 163521, libasl/trunk/suppress-deprecated-warnings.patch) libasl/repos/community-x86_64/PKGBUILD (from rev 163521, libasl/trunk/PKGBUILD) libasl/repos/community-x86_64/libasl-0.1.6-Explicitly-define-namespace-of-ifstream-and-ofstream.patch (from rev 163521, libasl/trunk/libasl-0.1.6-Explicitly-define-namespace-of-ifstream-and-ofstream.patch) libasl/repos/community-x86_64/libasl-vtk7.patch (from rev 163521, libasl/trunk/libasl-vtk7.patch) libasl/repos/community-x86_64/suppress-deprecated-warnings.patch (from rev 163521, libasl/trunk/suppress-deprecated-warnings.patch) Deleted: libasl/repos/community-i686/PKGBUILD libasl/repos/community-i686/libasl-0.1.6-Explicitly-define-namespace-of-ifstream-and-ofstream.patch libasl/repos/community-i686/suppress-deprecated-warnings.patch libasl/repos/community-x86_64/PKGBUILD libasl/repos/community-x86_64/libasl-0.1.6-Explicitly-define-namespace-of-ifstream-and-ofstream.patch libasl/repos/community-x86_64/suppress-deprecated-warnings.patch ------------------------------------------------------------------------------------------+ /PKGBUILD | 112 +++++++++ /libasl-0.1.6-Explicitly-define-namespace-of-ifstream-and-ofstream.patch | 118 ++++++++++ /suppress-deprecated-warnings.patch | 22 + community-i686/PKGBUILD | 51 ---- community-i686/libasl-0.1.6-Explicitly-define-namespace-of-ifstream-and-ofstream.patch | 59 ----- community-i686/libasl-vtk7.patch | 13 + community-i686/suppress-deprecated-warnings.patch | 11 community-x86_64/PKGBUILD | 51 ---- community-x86_64/libasl-0.1.6-Explicitly-define-namespace-of-ifstream-and-ofstream.patch | 59 ----- community-x86_64/libasl-vtk7.patch | 13 + community-x86_64/suppress-deprecated-warnings.patch | 11 11 files changed, 278 insertions(+), 242 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2016-02-26 19:36:21 UTC (rev 163521) +++ community-i686/PKGBUILD 2016-02-26 19:36:44 UTC (rev 163522) @@ -1,51 +0,0 @@ -# $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-i686/PKGBUILD (from rev 163521, libasl/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2016-02-26 19:36:44 UTC (rev 163522) @@ -0,0 +1,56 @@ +# $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=5 +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-vtk7.patch' + 'libasl-0.1.6-Explicitly-define-namespace-of-ifstream-and-ofstream.patch') +md5sums=('1f283d066d57e11d4602016148181420' + '972d7ed8037a35d32125773ae70f6360' + '583fff4d0e81579720e094ecb8729c2d' + '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 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() { + 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 +} + Deleted: community-i686/libasl-0.1.6-Explicitly-define-namespace-of-ifstream-and-ofstream.patch =================================================================== --- community-i686/libasl-0.1.6-Explicitly-define-namespace-of-ifstream-and-ofstream.patch 2016-02-26 19:36:21 UTC (rev 163521) +++ community-i686/libasl-0.1.6-Explicitly-define-namespace-of-ifstream-and-ofstream.patch 2016-02-26 19:36:44 UTC (rev 163522) @@ -1,59 +0,0 @@ -From 179516b0b7b3b4a0920444288cf8acca872e8846 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= <b...@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-i686/libasl-0.1.6-Explicitly-define-namespace-of-ifstream-and-ofstream.patch (from rev 163521, libasl/trunk/libasl-0.1.6-Explicitly-define-namespace-of-ifstream-and-ofstream.patch) =================================================================== --- community-i686/libasl-0.1.6-Explicitly-define-namespace-of-ifstream-and-ofstream.patch (rev 0) +++ community-i686/libasl-0.1.6-Explicitly-define-namespace-of-ifstream-and-ofstream.patch 2016-02-26 19:36:44 UTC (rev 163522) @@ -0,0 +1,59 @@ +From 179516b0b7b3b4a0920444288cf8acca872e8846 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= <b...@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-i686/libasl-vtk7.patch (from rev 163521, libasl/trunk/libasl-vtk7.patch) =================================================================== --- community-i686/libasl-vtk7.patch (rev 0) +++ community-i686/libasl-vtk7.patch 2016-02-26 19:36:44 UTC (rev 163522) @@ -0,0 +1,13 @@ +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}) Deleted: community-i686/suppress-deprecated-warnings.patch =================================================================== --- community-i686/suppress-deprecated-warnings.patch 2016-02-26 19:36:21 UTC (rev 163521) +++ community-i686/suppress-deprecated-warnings.patch 2016-02-26 19:36:44 UTC (rev 163522) @@ -1,11 +0,0 @@ ---- 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-i686/suppress-deprecated-warnings.patch (from rev 163521, libasl/trunk/suppress-deprecated-warnings.patch) =================================================================== --- community-i686/suppress-deprecated-warnings.patch (rev 0) +++ community-i686/suppress-deprecated-warnings.patch 2016-02-26 19:36:44 UTC (rev 163522) @@ -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 Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2016-02-26 19:36:21 UTC (rev 163521) +++ community-x86_64/PKGBUILD 2016-02-26 19:36:44 UTC (rev 163522) @@ -1,51 +0,0 @@ -# $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-x86_64/PKGBUILD (from rev 163521, libasl/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2016-02-26 19:36:44 UTC (rev 163522) @@ -0,0 +1,56 @@ +# $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=5 +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-vtk7.patch' + 'libasl-0.1.6-Explicitly-define-namespace-of-ifstream-and-ofstream.patch') +md5sums=('1f283d066d57e11d4602016148181420' + '972d7ed8037a35d32125773ae70f6360' + '583fff4d0e81579720e094ecb8729c2d' + '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 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() { + 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 +} + Deleted: community-x86_64/libasl-0.1.6-Explicitly-define-namespace-of-ifstream-and-ofstream.patch =================================================================== --- community-x86_64/libasl-0.1.6-Explicitly-define-namespace-of-ifstream-and-ofstream.patch 2016-02-26 19:36:21 UTC (rev 163521) +++ community-x86_64/libasl-0.1.6-Explicitly-define-namespace-of-ifstream-and-ofstream.patch 2016-02-26 19:36:44 UTC (rev 163522) @@ -1,59 +0,0 @@ -From 179516b0b7b3b4a0920444288cf8acca872e8846 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= <b...@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-x86_64/libasl-0.1.6-Explicitly-define-namespace-of-ifstream-and-ofstream.patch (from rev 163521, libasl/trunk/libasl-0.1.6-Explicitly-define-namespace-of-ifstream-and-ofstream.patch) =================================================================== --- community-x86_64/libasl-0.1.6-Explicitly-define-namespace-of-ifstream-and-ofstream.patch (rev 0) +++ community-x86_64/libasl-0.1.6-Explicitly-define-namespace-of-ifstream-and-ofstream.patch 2016-02-26 19:36:44 UTC (rev 163522) @@ -0,0 +1,59 @@ +From 179516b0b7b3b4a0920444288cf8acca872e8846 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= <b...@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-x86_64/libasl-vtk7.patch (from rev 163521, libasl/trunk/libasl-vtk7.patch) =================================================================== --- community-x86_64/libasl-vtk7.patch (rev 0) +++ community-x86_64/libasl-vtk7.patch 2016-02-26 19:36:44 UTC (rev 163522) @@ -0,0 +1,13 @@ +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}) Deleted: community-x86_64/suppress-deprecated-warnings.patch =================================================================== --- community-x86_64/suppress-deprecated-warnings.patch 2016-02-26 19:36:21 UTC (rev 163521) +++ community-x86_64/suppress-deprecated-warnings.patch 2016-02-26 19:36:44 UTC (rev 163522) @@ -1,11 +0,0 @@ ---- 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-x86_64/suppress-deprecated-warnings.patch (from rev 163521, libasl/trunk/suppress-deprecated-warnings.patch) =================================================================== --- community-x86_64/suppress-deprecated-warnings.patch (rev 0) +++ community-x86_64/suppress-deprecated-warnings.patch 2016-02-26 19:36:44 UTC (rev 163522) @@ -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