Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Coot 1.1.11 rev. 1 #1962

Merged
merged 5 commits into from
Dec 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 6 additions & 10 deletions Formula/coot.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ class Coot < Formula
url "https://www2.mrc-lmb.cam.ac.uk/personal/pemsley/coot/source/releases/coot-1.1.11.tar.gz"
sha256 "6fd2b5a2d1bad5bdeebdb030b552b800df28c0c03608334fe69725379da8eec0"
license any_of: ["GPL-3.0-only", "LGPL-3.0-only", "GPL-2.0-or-later"]
revision 1

bottle do
root_url "https://ghcr.io/v2/brewsci/bio"
Expand All @@ -28,7 +29,6 @@ class Coot < Formula
depends_on "boost-python3"
depends_on "brewsci/bio/clipper4coot"
depends_on "brewsci/bio/gemmi"
depends_on "brewsci/bio/[email protected]"
depends_on "brewsci/bio/libccp4"
depends_on "brewsci/bio/mmdb2"
depends_on "brewsci/bio/raster3d"
Expand All @@ -43,6 +43,7 @@ class Coot < Formula
depends_on "gmp"
depends_on "graphene"
depends_on "gsl"
depends_on "gtk4"
depends_on "harfbuzz"
depends_on "libepoxy"
depends_on "libpng"
Expand All @@ -51,7 +52,7 @@ class Coot < Formula
depends_on "pango"
depends_on "py3cairo"
depends_on "pygobject3"
depends_on "python@3.13"
depends_on "python@3.12"
depends_on "rdkit"
depends_on "sqlite"

Expand All @@ -74,7 +75,7 @@ class Coot < Formula
end

def python3
"python3.13"
"python3.12"
end

def install
Expand All @@ -98,7 +99,7 @@ def install

# Set Boost, RDKit, and FFTW2 root
boost_prefix = Formula["boost"].opt_prefix
boost_python_lib = "boost_python312-mt"
boost_python_lib = "boost_python312"
rdkit_prefix = Formula["rdkit"].opt_prefix
fftw2_prefix = Formula["clipper4coot"].opt_prefix/"fftw2"

Expand All @@ -114,15 +115,10 @@ def install
--with-backward
--with-libdw
BOOST_PYTHON_LIB=#{boost_python_lib}
PYTHON=#{python3}
]

ENV.append_to_cflags "-fPIC" if OS.linux?
# Use libcoordgen instead of RDKitcoordgen
inreplace "configure", "RDKitcoordgen", "coordgen"
# patch
inreplace "src/key-bindings.cc",
"PyObject *result_py = PyEval_CallObject(function_py, arg_list);",
"PyObject *result_py = PyObject_Call(function_py, arg_list, nullptr);"
system "./configure", *args
system "make"
ENV.deparallelize { system "make", "install" }
Expand Down
119 changes: 0 additions & 119 deletions Formula/[email protected]

This file was deleted.

Loading