diff options
Diffstat (limited to 'science/openstructure/files')
11 files changed, 0 insertions, 166 deletions
diff --git a/science/openstructure/files/patch-cmake__support_CopyDependencies.cmake b/science/openstructure/files/patch-cmake__support_CopyDependencies.cmake deleted file mode 100644 index fe47164623db..000000000000 --- a/science/openstructure/files/patch-cmake__support_CopyDependencies.cmake +++ /dev/null @@ -1,15 +0,0 @@ ---- cmake_support/CopyDependencies.cmake.orig 2018-07-09 02:47:08 UTC -+++ cmake_support/CopyDependencies.cmake -@@ -996,10 +996,10 @@ function(copy_python include_path versio - endforeach() - else() - file(COPY ${python_root_dir}/${LIB_DIR}/python${version}/ DESTINATION ${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/python${version} PATTERN "*.pyc" EXCLUDE) -- if("${LIB_DIR}" MATCHES "lib64") -+ if("${LIB_DIR}" MATCHES "lib") - # for 64 bit systems we have to copy the python dir within lib in addition as norarch site packages might get installed there - file(COPY ${python_root_dir}/lib/python${version}/ DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/python${version} PATTERN "*.pyc" EXCLUDE) -- endif("${LIB_DIR}" MATCHES "lib64") -+ endif("${LIB_DIR}" MATCHES "lib") - endif() - file(GLOB py_config_files "${include_path}/pyconfig*.h") - file(COPY ${py_config_files} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/python${version}) diff --git a/science/openstructure/files/patch-cmake__support_FindOPENSTRUCTURE.cmake b/science/openstructure/files/patch-cmake__support_FindOPENSTRUCTURE.cmake deleted file mode 100644 index c18db5597504..000000000000 --- a/science/openstructure/files/patch-cmake__support_FindOPENSTRUCTURE.cmake +++ /dev/null @@ -1,18 +0,0 @@ ---- cmake_support/FindOPENSTRUCTURE.cmake.orig 2018-07-09 03:09:01 UTC -+++ cmake_support/FindOPENSTRUCTURE.cmake -@@ -27,7 +27,7 @@ macro(find_OPENSTRUCTURE OPENSTRUCTURE_R - NAMES ost_${LIB} - HINTS "${PYTHON_ROOT}" - PATH ${OPENSTRUCTURE_ROOT} -- PATH_SUFFIXES lib lib64 -+ PATH_SUFFIXES lib - NO_SYSTEM_ENVIRONMENT_PATH NO_DEFAULT_PATH - ) - if (NOT FOUND_LIB) -@@ -84,4 +84,4 @@ else (OPENSTRUCTURE_FOUND) - if (OPENSTRUCTURE_FIND_REQUIRED) - message(FATAL_ERROR "Could not find OpenStructure") - endif () --endif () -\ No newline at end of file -+endif () diff --git a/science/openstructure/files/patch-cmake__support_FindPython.cmake b/science/openstructure/files/patch-cmake__support_FindPython.cmake deleted file mode 100644 index c9f792a29fa5..000000000000 --- a/science/openstructure/files/patch-cmake__support_FindPython.cmake +++ /dev/null @@ -1,10 +0,0 @@ ---- cmake_support/FindPython.cmake.orig 2018-07-08 23:04:29 UTC -+++ cmake_support/FindPython.cmake -@@ -75,7 +75,6 @@ macro(_find_python_bin PYTHON_ROOT VERSI - NAMES "python${_VERSION_NO_DOTS}" "python${VERSION}" python.exe - HINTS "${PYTHON_ROOT}" - PATH_SUFFIXES bin -- NO_SYSTEM_ENVIRONMENT_PATH NO_DEFAULT_PATH - ) - else() - find_program(PYTHON_BINARY diff --git a/science/openstructure/files/patch-cmake__support_OST.cmake b/science/openstructure/files/patch-cmake__support_OST.cmake deleted file mode 100644 index e88bd1c466d6..000000000000 --- a/science/openstructure/files/patch-cmake__support_OST.cmake +++ /dev/null @@ -1,20 +0,0 @@ ---- cmake_support/OST.cmake.orig 2018-02-27 14:29:54 UTC -+++ cmake_support/OST.cmake -@@ -834,7 +834,7 @@ macro(setup_stage) - check_architecture() - endif() - set (ARCH ${CMAKE_NATIVE_ARCH}) -- if ("${ARCH}" MATCHES "64" AND NOT _UBUNTU_LAYOUT) -+ if ("${ARCH}" MATCHES "64" AND NOT _UBUNTU_LAYOUT AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") - set(LIB_DIR lib64 ) - set(LIB_STAGE_PATH "${STAGE_DIR}/lib64" ) - else() -@@ -902,7 +902,7 @@ set(_BOOST_MIN_VERSION 1.31) - - macro(setup_boost) - set (Boost_NO_BOOST_CMAKE TRUE) -- find_package(Boost ${_BOOST_MIN_VERSION} COMPONENTS python REQUIRED) -+ find_package(Boost ${_BOOST_MIN_VERSION} COMPONENTS ${FREEBSD_BOOST_PYTHON_COMPONENT} REQUIRED) - set(BOOST_PYTHON_LIBRARIES ${Boost_LIBRARIES}) - set(Boost_LIBRARIES) - find_package(Boost ${_BOOST_MIN_VERSION} diff --git a/science/openstructure/files/patch-modules_base_src_test__utils_compare__files.cc b/science/openstructure/files/patch-modules_base_src_test__utils_compare__files.cc deleted file mode 100644 index ac497f782233..000000000000 --- a/science/openstructure/files/patch-modules_base_src_test__utils_compare__files.cc +++ /dev/null @@ -1,17 +0,0 @@ -Patch for the obvious bug. Reported to the upstream. - ---- modules/base/src/test_utils/compare_files.cc.orig 2018-07-10 05:54:54 UTC -+++ modules/base/src/test_utils/compare_files.cc -@@ -37,8 +37,10 @@ bool compare_files(const String& test, c - } - String test_line, gold_line; - while (true) { -- bool test_end=std::getline(test_stream, test_line) != 0; -- bool gold_end=std::getline(gold_stream, gold_line) != 0; -+ std::getline(test_stream, test_line); -+ std::getline(gold_stream, gold_line); -+ bool test_end=test_stream.eof(); -+ bool gold_end=gold_stream.eof(); - if (!(test_end || gold_end)) { - return true; - } diff --git a/science/openstructure/files/patch-modules_config_base.hh b/science/openstructure/files/patch-modules_config_base.hh deleted file mode 100644 index 5d29060e4768..000000000000 --- a/science/openstructure/files/patch-modules_config_base.hh +++ /dev/null @@ -1,29 +0,0 @@ ---- modules/config/base.hh.orig 2018-07-09 01:41:40 UTC -+++ modules/config/base.hh -@@ -56,22 +56,26 @@ typedef unsigned short Word; - #ifndef round_function - #define round_function - #ifndef round -+#if !defined(__FreeBSD__) - inline Real round( Real d ) - { - return floor(d+Real(0.5)); - } - #endif - #endif -+#endif - - #ifndef rint_function - #define rint_function - #ifndef rint -+#if !defined(__FreeBSD__) - inline Real rint(Real d) - { - return floor(d+Real(0.5)); - } - #endif - #endif -+#endif - - #if _MSC_VER - #pragma warning(disable:4251) diff --git a/science/openstructure/files/patch-modules_db_src_sqlite3.c b/science/openstructure/files/patch-modules_db_src_sqlite3.c deleted file mode 100644 index fe5e4584cc47..000000000000 --- a/science/openstructure/files/patch-modules_db_src_sqlite3.c +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/db/src/sqlite3.c.orig 2018-07-09 00:05:56 UTC -+++ modules/db/src/sqlite3.c -@@ -15341,7 +15341,7 @@ SQLITE_PRIVATE void sqlite3MemSetDefault - ** SQLITE_WITHOUT_ZONEMALLOC symbol is defined. - */ - #include <sys/sysctl.h> --#include <malloc/malloc.h> -+#include <stdlib.h> - #include <libkern/OSAtomic.h> - static malloc_zone_t* _sqliteZone_; - #define SQLITE_MALLOC(x) malloc_zone_malloc(_sqliteZone_, (x)) diff --git a/science/openstructure/files/patch-modules_gfx_src_offscreen__buffer.hh b/science/openstructure/files/patch-modules_gfx_src_offscreen__buffer.hh deleted file mode 100644 index a9594f64ea1f..000000000000 --- a/science/openstructure/files/patch-modules_gfx_src_offscreen__buffer.hh +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/gfx/src/offscreen_buffer.hh.orig 2018-07-09 00:19:53 UTC -+++ modules/gfx/src/offscreen_buffer.hh -@@ -58,7 +58,7 @@ public: - bool IsValid(); - */ - --#if defined(__linux__) -+#if defined(__linux__) || defined(__FreeBSD__) - #if OST_MESA_SUPPORT_ENABLED - #include "impl/mesa_offscreen_buffer.hh" - #else diff --git a/science/openstructure/files/patch-modules_gui_src_CMakeLists.txt b/science/openstructure/files/patch-modules_gui_src_CMakeLists.txt deleted file mode 100644 index 880c10bb0449..000000000000 --- a/science/openstructure/files/patch-modules_gui_src_CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ ---- modules/gui/src/CMakeLists.txt.orig 2018-02-27 14:29:54 UTC -+++ modules/gui/src/CMakeLists.txt -@@ -472,8 +472,9 @@ qt4_wrap_cpp(OST_GOSTY_MOC "gosty.hh" - OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED - -DBOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) - --set(LINK LINK ${BOOST_PROGRAM_OPTIONS_LIBRARIES}) -+set(LINK LINK ${BOOST_PROGRAM_OPTIONS_LIBRARIES} ${FREEBSD_PYTHON_LIBRARY}) - -+link_directories(${CMAKE_INSTALL_PREFIX}/lib) - executable_libexec(NAME gosty SOURCES gosty.cc ${OST_GOSTY_MOC} ${OST_QT_RESOURCE} - DEPENDS_ON ost_gui ${LINK}) - diff --git a/science/openstructure/files/patch-modules_gui_src_gosty.cc b/science/openstructure/files/patch-modules_gui_src_gosty.cc deleted file mode 100644 index de8716c2c00d..000000000000 --- a/science/openstructure/files/patch-modules_gui_src_gosty.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/gui/src/gosty.cc.orig 2018-07-09 03:10:04 UTC -+++ modules/gui/src/gosty.cc -@@ -111,7 +111,7 @@ String setup_python_search_path(const St - #ifdef _MSC_VER - String loc=root+"\\lib\\"+site_pkgs.str()+"\\site-packages"; - #else --# if (defined(__ppc64__) || defined(__x86_64__)) && !defined(__APPLE__) && !OST_UBUNTU_LAYOUT -+# if (defined(__ppc64__) || defined(__x86_64__)) && !defined(__APPLE__) && !OST_UBUNTU_LAYOUT && !defined(__FreeBSD__) - String loc=root+"/lib64/"+site_pkgs.str()+"/site-packages"; - # else - String loc=root+"/lib/"+site_pkgs.str()+"/site-packages"; diff --git a/science/openstructure/files/patch-modules_img_base_src_raster__image_raster__image.cc b/science/openstructure/files/patch-modules_img_base_src_raster__image_raster__image.cc deleted file mode 100644 index 33fc51e38bdb..000000000000 --- a/science/openstructure/files/patch-modules_img_base_src_raster__image_raster__image.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/img/base/src/raster_image/raster_image.cc.orig 2018-07-09 00:06:35 UTC -+++ modules/img/base/src/raster_image/raster_image.cc -@@ -25,7 +25,7 @@ - */ - - #ifndef __APPLE__ --#include <malloc.h> -+#include <stdlib.h> - #endif - #include <cmath> - #include <iostream> |