commit: ee8c3c49423152a5e4d1ab49369fad319031832a Author: Brahmajit Das <brahmajit.xyz <AT> gmail <DOT> com> AuthorDate: Thu Apr 4 10:14:45 2024 +0000 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> CommitDate: Sat May 18 10:51:20 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee8c3c49
sci-chemistry/molmol: Fix passing incompatible pointer type Closes: https://bugs.gentoo.org/923325 Signed-off-by: Brahmajit Das <brahmajit.xyz <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/36093 Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org> .../molmol/files/molmol-2k_p2-gcc14-fix.patch | 12 +++ sci-chemistry/molmol/molmol-2k_p2-r9.ebuild | 106 +++++++++++++++++++++ 2 files changed, 118 insertions(+) diff --git a/sci-chemistry/molmol/files/molmol-2k_p2-gcc14-fix.patch b/sci-chemistry/molmol/files/molmol-2k_p2-gcc14-fix.patch new file mode 100644 index 000000000000..7041ced28efe --- /dev/null +++ b/sci-chemistry/molmol/files/molmol-2k_p2-gcc14-fix.patch @@ -0,0 +1,12 @@ +Bug: https://bugs.gentoo.org/923325 +--- a/src/motogl/MotOGLDump.c ++++ b/src/motogl/MotOGLDump.c +@@ -245,7 +245,7 @@ jpegErrHand(j_common_ptr jpegInfoP) + + #ifdef PNG_SUPPORT + static void +-pngErrHand(png_structp pngStrucP, char *errMsg) ++pngErrHand(png_structp pngStrucP, const char *errMsg) + { + IORaiseError(errMsg); + longjmp(png_jmpbuf(pngStrucP), 1); diff --git a/sci-chemistry/molmol/molmol-2k_p2-r9.ebuild b/sci-chemistry/molmol/molmol-2k_p2-r9.ebuild new file mode 100644 index 000000000000..818fc5df9fa5 --- /dev/null +++ b/sci-chemistry/molmol/molmol-2k_p2-r9.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit desktop toolchain-funcs + +MY_PV="${PV/_p/.}.0" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="Publication-quality molecular visualization package" + +# Original page dead +#HOMEPAGE="http://hugin.ethz.ch/wuthrich/software/molmol/index.html"; +HOMEPAGE=" + http://www.csb.yale.edu/userguides/graphics/molmol/molmol_descrip.html + http://pjf.net/science/molmol.html +" +SRC_URI=" + ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip/${MY_P}-src.tar.gz + ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip/${MY_P}-doc.tar.gz + https://dev.gentoo.org/~soap/distfiles/${PN}-patches.tbz2 + https://dev.gentoo.org/~pacho/${PN}/${PN}_256.png +" + +LICENSE="molmol" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" +IUSE="" + +RDEPEND=" + || ( + ( + media-libs/mesa[X(+)] + x11-libs/libGLw + ) + media-libs/mesa[motif(-),X(+)] + ) + media-libs/libjpeg-turbo:= + media-libs/libpng:= + media-libs/tiff:= + sys-libs/zlib + virtual/glu + x11-libs/libXpm + x11-libs/motif:0 + x11-apps/xdpyinfo +" +DEPEND="${RDEPEND}" +BDEPEND="" + +S="${WORKDIR}" + +PATCHES=( + "${FILESDIR}"/${P}-gcc14-fix.patch +) + +pkg_setup() { + MMDIR="/usr/$(get_libdir)/molmol" + MAKEOPTS="${MAKEOPTS} -j1" #880621 +} + +src_prepare() { + default + + rm -rf tiff* + # Patch from http://pjf.net/science/molmol.html, where src.rpm is provided + eapply "${WORKDIR}"/patches/pjf_RH9_molmol2k2.diff + + eapply "${WORKDIR}"/patches/ldflags.patch + eapply "${WORKDIR}"/patches/opengl.patch + + ln -s makedef.lnx "${S}"/makedef || die + + sed \ + -e "s|ksh|sh|" \ + -e "s|^MOLMOLHOME.*|MOLMOLHOME=${EPREFIX}/${MMDIR};MOLMOLDEV=\"Motif/OpenGL\"|" \ + -i "${S}"/molmol || die + sed \ + -e "s|^MCFLAGS.*|MCFLAGS = ${CFLAGS}|" \ + -e "s|^CC.*|CC = $(tc-getCC)|" \ + -i "${S}"/makedef || die + + eapply "${WORKDIR}"/patches/cast.patch + eapply -p0 "${WORKDIR}"/patches/libpng15.patch + + # patch from fink + # fixes numerous bad bracings and hopefully the OGL bug 429974 + eapply "${WORKDIR}"/patches/${P}-fink.patch + + eapply "${WORKDIR}"/patches/wild.patch + tc-export AR +} + +src_install() { + dobin molmol + + exeinto ${MMDIR} + doexe src/main/molmol + insinto ${MMDIR} + doins -r auxil help macros man setup tips + + make_desktop_entry "${PN}" MOLMOL + newicon "${DISTDIR}/${PN}_256.png" "${PN}.png" + + einstalldocs + dodoc HISTORY +}
