diff options
Diffstat (limited to 'science/py-pymol/files')
-rw-r--r-- | science/py-pymol/files/patch-layer0_MemoryUsage.cpp | 20 | ||||
-rw-r--r-- | science/py-pymol/files/patch-modules_pymol_Qt_____init____.py | 20 | ||||
-rw-r--r-- | science/py-pymol/files/patch-setup.py | 15 |
3 files changed, 32 insertions, 23 deletions
diff --git a/science/py-pymol/files/patch-layer0_MemoryUsage.cpp b/science/py-pymol/files/patch-layer0_MemoryUsage.cpp new file mode 100644 index 000000000000..682a34626126 --- /dev/null +++ b/science/py-pymol/files/patch-layer0_MemoryUsage.cpp @@ -0,0 +1,20 @@ +--- layer0/MemoryUsage.cpp.orig 2022-11-27 20:14:03 UTC ++++ layer0/MemoryUsage.cpp +@@ -51,6 +51,8 @@ size_t memory_usage() + GetProcessMemoryInfo(hProcess.get(), &pmc, sizeof(pmc)); + } + return pmc.WorkingSetSize; ++#elif defined(__FreeBSD__) ++ return 0; // TODO implement memory_usage() + #else + #error "platform not handled" + #endif +@@ -92,6 +94,8 @@ size_t memory_available() + statex.dwLength = sizeof(statex); + GlobalMemoryStatusEx(&statex); + return statex.ullAvailPhys; ++#elif defined(__FreeBSD__) ++ return 0; // TODO: implement memory_available() + #else + #error "platform not handled" + #endif diff --git a/science/py-pymol/files/patch-modules_pymol_Qt_____init____.py b/science/py-pymol/files/patch-modules_pymol_Qt_____init____.py deleted file mode 100644 index 2075f7ce00ae..000000000000 --- a/science/py-pymol/files/patch-modules_pymol_Qt_____init____.py +++ /dev/null @@ -1,20 +0,0 @@ ---- modules/pymol/Qt/__init__.py.orig 2019-02-11 14:08:10 UTC -+++ modules/pymol/Qt/__init__.py -@@ -29,7 +29,7 @@ if not PYQT_NAME: - if DEBUG: - print('import PyQt5 failed') - --if not PYQT_NAME: -+if False: - try: - from PySide2 import QtGui, QtCore, QtOpenGL, QtWidgets - PYQT_NAME = 'PySide2' -@@ -46,7 +46,7 @@ if not PYQT_NAME: - if DEBUG: - print('import PyQt4 failed') - --if not PYQT_NAME: -+if False: - try: - from PySide import QtGui, QtCore, QtOpenGL - PYQT_NAME = 'PySide' diff --git a/science/py-pymol/files/patch-setup.py b/science/py-pymol/files/patch-setup.py index 062ebccceca4..fe1059c10949 100644 --- a/science/py-pymol/files/patch-setup.py +++ b/science/py-pymol/files/patch-setup.py @@ -1,6 +1,6 @@ ---- setup.py.orig 2019-02-12 06:00:47 UTC +--- setup.py.orig 2021-05-10 18:38:37 UTC +++ setup.py -@@ -52,6 +52,8 @@ try: +@@ -53,6 +53,8 @@ try: "shared library; no: disable fast MMTF load support") parser.add_argument('--help-distutils', action="store_true", help="show help for distutils options and exit") @@ -8,4 +8,13 @@ + help="single-version-externally-managed") parser.add_argument('--testing', action="store_true", help="Build C-level tests") - options, sys.argv[1:] = parser.parse_known_args(namespace=options) + parser.add_argument('--openvr', dest='openvr', action='store_true') +@@ -282,7 +284,7 @@ if DEBUG and not WIN: + libs = ["png", "freetype"] + lib_dirs = [] + ext_comp_args = [ +- "-Werror=return-type", ++ #"-Werror=return-type", + "-Wunused-variable", + "-Wno-switch", + "-Wno-narrowing", |