* [gentoo-commits] repo/gentoo:master commit in: sci-libs/cgnslib/, sci-libs/cgnslib/files/
@ 2018-09-15 20:05 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2018-09-15 20:05 UTC (permalink / raw
To: gentoo-commits
commit: 41ce3ce3db944a4cee8d17b9a2e3749d6b068e48
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 26 15:56:07 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 15 20:04:39 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41ce3ce3
sci-libs/cgnslib: Drop old
Package-Manager: Portage-2.3.48, Repoman-2.3.10
sci-libs/cgnslib/Manifest | 1 -
sci-libs/cgnslib/cgnslib-3.2.1.ebuild | 48 --------
sci-libs/cgnslib/files/cgnslib-3.2.1-cmake.patch | 149 -----------------------
3 files changed, 198 deletions(-)
diff --git a/sci-libs/cgnslib/Manifest b/sci-libs/cgnslib/Manifest
index 912d6e50595..26e8c7ce76c 100644
--- a/sci-libs/cgnslib/Manifest
+++ b/sci-libs/cgnslib/Manifest
@@ -1,2 +1 @@
DIST cgnslib-3.3.0.tar.gz 3314889 BLAKE2B 3b8af11e04c211ca60f512c7995e9b23e0dd79180f3443f238562216073740de6b845c5bb78d6fb017bbf41e5249c1f58c27130047fd50afb4b20bbc778a046b SHA512 eb5c79d3830f8ee1fa30a67fbf32133c13a276c4b18a553826e4670bd4aa7262d7751bccb74c5e208cd47703f9076bde2e2e0db70408c88fde3ac11b638e6ff3
-DIST cgnslib_3.2.1.tar.gz 865223 BLAKE2B a4e8f65af1d750f2c2b06191cffdb7598036ce8ee3e1e52790ef68f90f4dfe06cf152bbcfbedcb682059473e942d64108e7b78160fd89166f361ac754cb3baaf SHA512 318fda24e7f5f20407c6026ad4b10a84a0ea02a04d3dab3e0e2277d21cbc1b43f04eb65c4b912a7964e1219cf83afdabb357d25b40e76add9bed8bd2564a674e
diff --git a/sci-libs/cgnslib/cgnslib-3.2.1.ebuild b/sci-libs/cgnslib/cgnslib-3.2.1.ebuild
deleted file mode 100644
index d7b52134e77..00000000000
--- a/sci-libs/cgnslib/cgnslib-3.2.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-FORTRAN_NEEDED="fortran"
-
-inherit cmake-utils fortran-2 versionator
-
-MY_P="${PN}_$(replace_version_separator 3 '-')"
-MY_S="${PN}_$(get_version_component_range 1-2)"
-
-DESCRIPTION="The CFD General Notation System (CGNS) is a standard for CFD data"
-HOMEPAGE="http://www.cgns.org/"
-SRC_URI="mirror://sourceforge/project/cgns/${MY_S}/${MY_P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="fortran hdf5 legacy mpi szip zlib"
-
-DEPEND="
- hdf5? ( >=sci-libs/hdf5-1.8[mpi=] )
- szip? ( virtual/szip )
- zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${PN}_${PV}
-
-PATCHES=(
- "${FILESDIR}"/${P}-cmake.patch
-)
-
-pkg_setup() {
- use fortran && fortran-2_pkg_setup
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCGNS_ENABLE_64BIT=ON
- $(usex x86 -DCGNS_ENABLE_LFS=ON)
- $(cmake-utils_use fortran CGNS_ENABLE_FORTRAN)
- $(cmake-utils_use hdf5 CGNS_ENABLE_HDF5)
- $(cmake-utils_use legacy CGNS_ENABLE_LEGACY)
- $(cmake-utils_use mpi HDF5_NEED_MPI)
- )
- cmake-utils_src_configure
-}
diff --git a/sci-libs/cgnslib/files/cgnslib-3.2.1-cmake.patch b/sci-libs/cgnslib/files/cgnslib-3.2.1-cmake.patch
deleted file mode 100644
index bf8ea5f2bfe..00000000000
--- a/sci-libs/cgnslib/files/cgnslib-3.2.1-cmake.patch
+++ /dev/null
@@ -1,149 +0,0 @@
- CMakeLists.txt | 20 +--------------
- src/CMakeLists.txt | 72 +++++++++++++++++++++++++++---------------------------
- 2 files changed, 37 insertions(+), 55 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d9c1b3c..d4c2bf7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -81,7 +81,7 @@ if (CGNS_ENABLE_LFS)
- if (HAVE_OPEN64)
- add_definitions(-DHAVE_LSEEK64)
- endif (HAVE_OPEN64)
-- if (HAVE_OPEN64)
-+ if (HAVE_LSEEK64)
- add_definitions(-DHAVE_LSEEK64)
- endif (HAVE_LSEEK64)
- endif (WIN32)
-@@ -254,24 +254,6 @@ else (CGNS_ENABLE_HDF5 AND HDF5_NEED_MPI)
- mark_as_advanced(FORCE CGNS_ENABLE_PARALLEL)
- endif (CGNS_ENABLE_HDF5 AND HDF5_NEED_MPI)
-
--####################
--# RPATH Management #
--####################
--
--# use, i.e. don't skip the full RPATH for the build tree
--set(CMAKE_SKIP_BUILD_RPATH FALSE)
--
--# when building, don't use the install RPATH already
--# (but later on when installing)
--set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
--
--# the RPATH to be used when installing
--set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
--
--# add the automatically determined parts of the RPATH
--# which point to directories outside the build tree to the install RPATH
--set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
--
- ########
- # CGNS #
- ########
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 3c12c6d..694da42 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -69,7 +69,7 @@ set(SYSCFLAGS "")
- set(CFGFLAGS "")
- set(LIBS "")
-
--file(TO_NATIVE_PATH ${CMAKE_INSTALL_PREFIX}/lib LIBDIR)
-+file(TO_NATIVE_PATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} LIBDIR)
- file(TO_NATIVE_PATH ${CMAKE_INSTALL_PREFIX}/include INCLUDEDIR)
- file(TO_NATIVE_PATH ${CMAKE_C_COMPILER} CC)
- if (WIN32)
-@@ -102,42 +102,42 @@ set(ZLIBLIB "")
- set(MPIINC "")
- set(MPILIBS "")
-
--macro(native_paths INPUT_PATH_VARIABLE RESULT_VARIABLE)
-- set(${RESULT_VARIABLE} "")
-- foreach(PATH ${${INPUT_PATH_VARIABLE}})
-- file(TO_NATIVE_PATH ${PATH} NATIVE_PATH)
-- list(APPEND ${RESULT_VARIABLE} ${NATIVE_PATH})
-- endforeach(PATH ${${INPUT_PATH_VARIABLE}})
--endmacro(native_paths)
-+macro(native_paths INPUT_PATH_VARIABLE RESULT_VARIABLE)
-+ set(${RESULT_VARIABLE} "")
-+ foreach(PATH ${${INPUT_PATH_VARIABLE}})
-+ file(TO_NATIVE_PATH ${PATH} NATIVE_PATH)
-+ list(APPEND ${RESULT_VARIABLE} ${NATIVE_PATH})
-+ endforeach(PATH ${${INPUT_PATH_VARIABLE}})
-+endmacro(native_paths)
-
- if (CGNS_ENABLE_HDF5)
- set(BUILDHDF5 1)
-- if (HDF5_INCLUDE_PATH)
-- native_paths(HDF5_INCLUDE_PATH HDF5INC)
-- endif (HDF5_INCLUDE_PATH)
-- if (HDF5_LIBRARY)
-- native_paths(HDF5_LIBRARY HDF5LIB)
-- endif (HDF5_LIBRARY)
-- if (HDF5_NEED_SZIP)
-- set(H5NEEDSZIP 1)
-- if (SZIP_LIBRARY)
-- native_paths(SZIP_LIBRARY SZIPLIB)
-- endif (SZIP_LIBRARY)
-- endif (HDF5_NEED_SZIP)
-- if (HDF5_NEED_ZLIB)
-- set(H5NEEDZLIB 1)
-- if (ZLIB_LIBRARY)
-- native_paths(${ZLIB_LIBRARY} ZLIBLIB)
-- endif (ZLIB_LIBRARY)
-- endif (HDF5_NEED_ZLIB)
-- if (HDF5_NEED_MPI)
-- set(H5NEEDMPI 1)
-- if (MPI_INC)
-- native_paths(MPI_INC MPIINC)
-- endif (MPI_INC)
-- if (MPI_LIBS)
-- native_paths(MPI_LIBS MPILIBS)
-- endif (MPI_LIBS)
-+ if (HDF5_INCLUDE_PATH)
-+ native_paths(HDF5_INCLUDE_PATH HDF5INC)
-+ endif (HDF5_INCLUDE_PATH)
-+ if (HDF5_LIBRARY)
-+ native_paths(HDF5_LIBRARY HDF5LIB)
-+ endif (HDF5_LIBRARY)
-+ if (HDF5_NEED_SZIP)
-+ set(H5NEEDSZIP 1)
-+ if (SZIP_LIBRARY)
-+ native_paths(SZIP_LIBRARY SZIPLIB)
-+ endif (SZIP_LIBRARY)
-+ endif (HDF5_NEED_SZIP)
-+ if (HDF5_NEED_ZLIB)
-+ set(H5NEEDZLIB 1)
-+ if (ZLIB_LIBRARY)
-+ native_paths(${ZLIB_LIBRARY} ZLIBLIB)
-+ endif (ZLIB_LIBRARY)
-+ endif (HDF5_NEED_ZLIB)
-+ if (HDF5_NEED_MPI)
-+ set(H5NEEDMPI 1)
-+ if (MPI_INC)
-+ native_paths(MPI_INC MPIINC)
-+ endif (MPI_INC)
-+ if (MPI_LIBS)
-+ native_paths(MPI_LIBS MPILIBS)
-+ endif (MPI_LIBS)
- if (CGNS_ENABLE_PARALLEL)
- set(BUILDPARALLEL 1)
- endif (CGNS_ENABLE_PARALLEL)
-@@ -251,7 +251,7 @@ if(CGNS_BUILD_SHARED)
- endif(CGNS_BUILD_SHARED)
-
- # Set the install path of the static library
--install(TARGETS cgns_static ARCHIVE DESTINATION lib)
-+install(TARGETS cgns_static ARCHIVE DESTINATION lib${LIB_SUFFIX})
- # Set the install path of the shared library
- if(CGNS_BUILD_SHARED)
- # for windows, need to install both cgnsdll.dll and cgnsdll.lib
-@@ -259,7 +259,7 @@ if(CGNS_BUILD_SHARED)
- install(TARGETS cgns_shared ARCHIVE DESTINATION lib)
- install(TARGETS cgns_shared RUNTIME DESTINATION lib)
- else (WIN32 OR CYGWIN)
-- install(TARGETS cgns_shared LIBRARY DESTINATION lib)
-+ install(TARGETS cgns_shared LIBRARY DESTINATION lib${LIB_SUFFIX})
- endif (WIN32 OR CYGWIN)
- endif(CGNS_BUILD_SHARED)
-
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/cgnslib/, sci-libs/cgnslib/files/
@ 2024-10-05 8:15 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2024-10-05 8:15 UTC (permalink / raw
To: gentoo-commits
commit: 9acc8d665d245b46d3c8c7e864337c2ee0f41351
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 5 08:15:01 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 5 08:15:24 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9acc8d66
sci-libs/cgnslib: fix modern C issues
Closes: https://bugs.gentoo.org/934122
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/cgnslib/cgnslib-4.4.0-r2.ebuild | 106 +++++++++++++++++++++++++
sci-libs/cgnslib/files/cgnslib-4.4.0-c99.patch | 55 +++++++++++++
2 files changed, 161 insertions(+)
diff --git a/sci-libs/cgnslib/cgnslib-4.4.0-r2.ebuild b/sci-libs/cgnslib/cgnslib-4.4.0-r2.ebuild
new file mode 100644
index 000000000000..53eb0c7c01ac
--- /dev/null
+++ b/sci-libs/cgnslib/cgnslib-4.4.0-r2.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FORTRAN_NEEDED="fortran"
+FORTRAN_STANDARD="90 2003"
+
+inherit cmake flag-o-matic fortran-2
+
+DESCRIPTION="CFD General Notation System standard library"
+HOMEPAGE="
+ https://cgns.github.io/
+ https://github.com/CGNS/CGNS
+"
+SRC_URI="https://github.com/CGNS/CGNS/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/CGNS-${PV}"
+
+LICENSE="ZLIB"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="base-scope debug examples fortran hdf5 legacy mpi scoping szip test tools"
+
+RDEPEND="
+ hdf5? ( sci-libs/hdf5:=[mpi=,szip=] )
+ tools? (
+ dev-lang/tcl:=
+ dev-lang/tk:=
+ x11-libs/libXmu:=
+ virtual/glu
+ virtual/opengl
+ )
+"
+DEPEND="${RDEPEND}"
+
+RESTRICT="
+ fortran? ( test )
+ !test? ( test )
+"
+REQUIRED_USE="
+ mpi? ( hdf5 )
+ szip? ( hdf5 )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.4.0-c99.patch
+)
+
+pkg_setup() {
+ use fortran && fortran-2_pkg_setup
+}
+
+src_prepare() {
+ # gentoo libdir
+ sed \
+ -e 's|/lib|/'$(get_libdir)'|' \
+ -e '/DESTINATION/s|lib|'$(get_libdir)'|g' \
+ -i src/CMakeLists.txt || die
+ cmake_src_prepare
+}
+
+src_configure() {
+ # -Werror=lto-type-mismatch
+ # https://bugs.gentoo.org/862684
+ # https://github.com/CGNS/CGNS/issues/758
+ filter-lto
+
+ # Needed for 4.4.0-c99.patch as it uses an internal header (bug #934122)
+ local tk_ver=$(best_version dev-lang/tk)
+ tk_ver=${tk_ver#dev-lang/tk-}
+ tk_ver=$(ver_cut 1-2 ${tk_ver})
+ append-cppflags -I"${ESYSROOT}/usr/$(get_libdir)/tk${tk_ver}/include/generic"
+
+ local mycmakeargs=(
+ -DCGNS_BUILD_SHARED=ON
+ -DCGNS_USE_SHARED=ON
+
+ -DCGNS_BUILD_CGNSTOOLS="$(usex tools)"
+ -DCGNS_ENABLE_BASE_SCOPE="$(usex base-scope)"
+ -DCGNS_ENABLE_FORTRAN="$(usex fortran)"
+ -DCGNS_ENABLE_HDF5="$(usex hdf5)"
+ -DCGNS_ENABLE_LEGACY="$(usex legacy)"
+ -DCGNS_ENABLE_SCOPING="$(usex scoping)"
+ -DCGNS_ENABLE_MEM_DEBUG="$(usex debug)"
+ -DCGNS_ENABLE_TESTS="$(usex test)"
+ )
+
+ if use mpi; then
+ mycmakeargs+=(
+ -DHDF5_NEED_MPI="$(usex mpi)"
+ -DHDF5_NEED_SZIP="$(usex szip)"
+ -DHDF5_NEED_ZLIB="$(usex szip)"
+ )
+ fi
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+ dodoc README.md release_docs/{HISTORY,RELEASE,changes_from_2.5}.txt
+ rm "${ED}/usr/$(get_libdir)/libcgns.a" || die
+ dodoc release_docs/*.pdf
+ docompress -x /usr/share/doc/${PF}/examples
+ use examples && dodoc -r src/examples
+}
diff --git a/sci-libs/cgnslib/files/cgnslib-4.4.0-c99.patch b/sci-libs/cgnslib/files/cgnslib-4.4.0-c99.patch
new file mode 100644
index 000000000000..f0caba2045a6
--- /dev/null
+++ b/sci-libs/cgnslib/files/cgnslib-4.4.0-c99.patch
@@ -0,0 +1,55 @@
+https://github.com/CGNS/CGNS/pull/757
+https://github.com/CGNS/CGNS/pull/757
+
+From 4d791bccf1f2341de9091eb22d2ce225ec9139f7 Mon Sep 17 00:00:00 2001
+From: Mickael Philit <mickey.phy@gmail.com>
+Date: Sun, 3 Mar 2024 20:54:39 +0100
+Subject: [PATCH] backport gcc14 fedora patch
+
+---
+ src/cgnstools/tkogl/gencyl.c | 4 ++--
+ src/cgnstools/tkogl/tkogl.c | 8 +++++++-
+ 2 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/src/cgnstools/tkogl/gencyl.c b/src/cgnstools/tkogl/gencyl.c
+index cc36c4ba6..b64d777f4 100644
+--- a/src/cgnstools/tkogl/gencyl.c
++++ b/src/cgnstools/tkogl/gencyl.c
+@@ -682,8 +682,8 @@ RenderModel (Model* model)
+ Vector normal;
+ GLdouble v [3];
+ obj = gluNewTess();
+- gluTessCallback(obj, GLU_BEGIN, glBegin);
+- gluTessCallback(obj, GLU_VERTEX, glVertex3fv);
++ gluTessCallback(obj, GLU_BEGIN, (_GLUfuncptr)glBegin);
++ gluTessCallback(obj, GLU_VERTEX, (_GLUfuncptr)glVertex3fv);
+ gluTessCallback(obj, GLU_END, glEnd);
+ if (flags&CLOSE_FIRST) {
+ CrossSection *a = model->cross [0];
+diff --git a/src/cgnstools/tkogl/tkogl.c b/src/cgnstools/tkogl/tkogl.c
+index e697e735e..506599d54 100644
+--- a/src/cgnstools/tkogl/tkogl.c
++++ b/src/cgnstools/tkogl/tkogl.c
+@@ -22,6 +22,12 @@
+ #include "printstr.h"
+ #include "feedback.h"
+
++#if ! defined(__WIN32__) && ! defined(_WIN32)
++/* For TkWmAddToColormapWindows. */
++#define _TKPORT /* Typical installations cannot find tkPort.h. */
++#include <tkInt.h>
++#endif
++
+ #ifndef CONST
+ # define CONST
+ #endif
+@@ -599,7 +605,7 @@ OGLwinCmd(clientData, interp, argc, argv)
+
+ if ((Tk_Parent(tkwin) != NULL) &&
+ (Tk_Colormap(tkwin) != Tk_Colormap (Tk_Parent(tkwin)))) {
+- TkWmAddToColormapWindows(tkwin);
++ TkWmAddToColormapWindows((TkWindow *)tkwin);
+ }
+
+ /* See if this window will share display lists with another */
+
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-10-05 8:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-09-15 20:05 [gentoo-commits] repo/gentoo:master commit in: sci-libs/cgnslib/, sci-libs/cgnslib/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-10-05 8:15 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox