From 5d1cd6192965e4b87af99e3a9c3f693ebb2bae3d Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 26 Feb 2024 11:53:43 -0500 Subject: [PATCH] qhull was removed due to minimization efforts prior to public launch --- .gitignore | 2 - ...Link-executables-against-shared-libs.patch | 45 --- 0002-Install-docs-into-subdirs.patch | 33 -- dead.package | 1 + qhull-install.patch | 12 - qhull-lib64.patch | 21 -- qhull-pic.patch | 12 - qhull-staticr-pic.patch | 13 - qhull.spec | 294 ------------------ sources | 1 - 10 files changed, 1 insertion(+), 433 deletions(-) delete mode 100644 .gitignore delete mode 100644 0001-Link-executables-against-shared-libs.patch delete mode 100644 0002-Install-docs-into-subdirs.patch create mode 100644 dead.package delete mode 100644 qhull-install.patch delete mode 100644 qhull-lib64.patch delete mode 100644 qhull-pic.patch delete mode 100644 qhull-staticr-pic.patch delete mode 100644 qhull.spec delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 6693afc..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/qhull-7.2.1.tar.gz -/qhull-8.0.2.tar.gz diff --git a/0001-Link-executables-against-shared-libs.patch b/0001-Link-executables-against-shared-libs.patch deleted file mode 100644 index 46b4481..0000000 --- a/0001-Link-executables-against-shared-libs.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 3bb42e375672d48f3d8a074396bcd025ab1a6043 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= -Date: Wed, 27 Apr 2016 08:05:53 +0200 -Subject: [PATCH 1/2] Link executables against shared libs. - ---- - CMakeLists.txt | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 59dff41..df26bd0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -477,22 +477,22 @@ set(qvoronoi_SOURCES src/qvoronoi/qvoronoi.c) - set(qhalf_SOURCES src/qhalf/qhalf.c) - - add_executable(qhull ${qhull_SOURCES}) --target_link_libraries(qhull ${qhull_STATICR}) -+target_link_libraries(qhull ${qhull_SHAREDR}) - - add_executable(rbox ${rbox_SOURCES}) --target_link_libraries(rbox ${qhull_STATIC}) -+target_link_libraries(rbox ${qhull_SHARED}) - - add_executable(qconvex ${qconvex_SOURCES}) --target_link_libraries(qconvex ${qhull_STATIC}) -+target_link_libraries(qconvex ${qhull_SHARED}) - - add_executable(qdelaunay ${qdelaunay_SOURCES}) --target_link_libraries(qdelaunay ${qhull_STATIC}) -+target_link_libraries(qdelaunay ${qhull_SHARED}) - - add_executable(qvoronoi ${qvoronoi_SOURCES}) --target_link_libraries(qvoronoi ${qhull_STATIC}) -+target_link_libraries(qvoronoi ${qhull_SHARED}) - - add_executable(qhalf ${qhalf_SOURCES}) --target_link_libraries(qhalf ${qhull_STATIC}) -+target_link_libraries(qhalf ${qhull_SHARED}) - - # --------------------------------------- - # Define options for linking to qhull_SHAREDR or qhull_SHARED --- -2.21.0 - diff --git a/0002-Install-docs-into-subdirs.patch b/0002-Install-docs-into-subdirs.patch deleted file mode 100644 index 04aa395..0000000 --- a/0002-Install-docs-into-subdirs.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 37ac4361d995b0017560a44bd7088bc2bb3c4436 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= -Date: Wed, 27 Apr 2016 08:59:21 +0200 -Subject: [PATCH 2/2] Install docs into subdirs. - ---- - CMakeLists.txt | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index df26bd0..ee647c5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -616,11 +616,12 @@ install(TARGETS ${qhull_TARGETS_INSTALL} - ARCHIVE DESTINATION ${LIB_INSTALL_DIR}) - - install(FILES ${libqhull_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/libqhull) --install(FILES ${libqhull_DOC} DESTINATION ${INCLUDE_INSTALL_DIR}/libqhull) --install(FILES ${libqhullr_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/libqhull_r) --install(FILES ${libqhullr_DOC} DESTINATION ${INCLUDE_INSTALL_DIR}/libqhull_r) -+install(FILES ${libqhull_DOC} DESTINATION ${DOC_INSTALL_DIR}/src/libqhull) -+install(FILES ${libqhullr_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/libqhull_r) -+install(FILES ${libqhullr_DOC} DESTINATION ${DOC_INSTALL_DIR}/src/libqhull_r) - install(FILES ${libqhullcpp_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/libqhullcpp) - install(FILES html/qhull.man DESTINATION ${MAN_INSTALL_DIR} RENAME qhull.1) - install(FILES html/rbox.man DESTINATION ${MAN_INSTALL_DIR} RENAME rbox.1) - install(FILES ${doc_FILES} DESTINATION ${DOC_INSTALL_DIR}) --install(DIRECTORY html/ DESTINATION ${DOC_INSTALL_DIR}) -+install(DIRECTORY html/ DESTINATION ${DOC_INSTALL_DIR}/html) -+install(FILES src/Changes.txt DESTINATION ${DOC_INSTALL_DIR}/src) --- -2.21.0 - diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..1a2140d --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +qhull was removed due to minimization efforts prior to public launch diff --git a/qhull-install.patch b/qhull-install.patch deleted file mode 100644 index f40a106..0000000 --- a/qhull-install.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up qhull-8.0.2/CMakeLists.txt.install qhull-8.0.2/CMakeLists.txt ---- qhull-8.0.2/CMakeLists.txt.install 2022-10-04 22:07:47.273041741 -0600 -+++ qhull-8.0.2/CMakeLists.txt 2022-10-04 22:17:36.977621187 -0600 -@@ -344,7 +344,7 @@ set(qhull_SHAREDP qhull_p) # libqhull a - - set(qhull_TARGETS_APPLICATIONS qhull rbox qconvex qdelaunay qvoronoi qhalf) - set(qhull_TARGETS_STATIC ${qhull_CPP} ${qhull_STATIC} ${qhull_STATICR}) --set(qhull_TARGETS_SHARED ${qhull_SHAREDR}) -+set(qhull_TARGETS_SHARED ${qhull_SHAREDR} ${qhull_SHARED} ${qhull_SHAREDP}) - - set( - qhull_TARGETS_TEST # Unused diff --git a/qhull-lib64.patch b/qhull-lib64.patch deleted file mode 100644 index 2e72162..0000000 --- a/qhull-lib64.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up qhull-8.0.2/CMakeLists.txt.lib64 qhull-8.0.2/CMakeLists.txt ---- qhull-8.0.2/CMakeLists.txt.lib64 2020-09-03 20:33:16.000000000 -0600 -+++ qhull-8.0.2/CMakeLists.txt 2022-10-04 21:49:12.708081647 -0600 -@@ -709,7 +709,7 @@ configure_file(${PROJECT_SOURCE_DIR}/bui - @ONLY - ) - --set(ConfigPackageLocation lib/cmake/Qhull) -+set(ConfigPackageLocation ${LIB_INSTALL_DIR}/cmake/Qhull) - install(EXPORT QhullTargets - FILE - QhullTargets.cmake -@@ -728,7 +728,7 @@ install( - Devel - ) - --set(PkgConfigLocation lib/pkgconfig) -+set(PkgConfigLocation ${LIB_INSTALL_DIR}/pkgconfig) - foreach(pkgconfig IN ITEMS "${qhull_SHAREDR};Qhull reentrant shared library" - "${qhull_STATIC};Qhull static library" - "${qhull_STATICR};Qhull reentrant static library" diff --git a/qhull-pic.patch b/qhull-pic.patch deleted file mode 100644 index 3aac7cc..0000000 --- a/qhull-pic.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up qhull-7.2.1/CMakeLists.txt.pic qhull-7.2.1/CMakeLists.txt ---- qhull-7.2.1/CMakeLists.txt.pic 2022-01-23 13:36:23.307550832 -0700 -+++ qhull-7.2.1/CMakeLists.txt 2022-01-23 13:45:35.447166635 -0700 -@@ -461,7 +461,7 @@ endif(UNIX) - - add_library(${qhull_CPP} STATIC ${libqhullcpp_SOURCES}) - set_target_properties(${qhull_CPP} PROPERTIES -- VERSION ${qhull_VERSION}) -+ VERSION ${qhull_VERSION} POSITION_INDEPENDENT_CODE ON) - - # --------------------------------------- - # Define qhull executables linked to qhullstatic library diff --git a/qhull-staticr-pic.patch b/qhull-staticr-pic.patch deleted file mode 100644 index cf5601a..0000000 --- a/qhull-staticr-pic.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up qhull-8.0.2/CMakeLists.txt.FPIC qhull-8.0.2/CMakeLists.txt ---- qhull-8.0.2/CMakeLists.txt.FPIC 2023-08-10 11:10:20.914574070 -0400 -+++ qhull-8.0.2/CMakeLists.txt 2023-08-10 11:10:56.136136910 -0400 -@@ -447,7 +447,8 @@ set_target_properties(${qhull_STATIC} PR - add_library(${qhull_STATICR} STATIC ${libqhullr_SOURCES}) - set_target_properties(${qhull_STATICR} PROPERTIES - VERSION ${qhull_VERSION} -- OUTPUT_NAME "${qhull_STATICR}$<$:d>") -+ OUTPUT_NAME "${qhull_STATICR}$<$:d>" -+ POSITION_INDEPENDENT_CODE "TRUE") - - if(UNIX) - target_link_libraries(${qhull_STATIC} m) diff --git a/qhull.spec b/qhull.spec deleted file mode 100644 index 2ee9cb4..0000000 --- a/qhull.spec +++ /dev/null @@ -1,294 +0,0 @@ -Summary: General dimension convex hull programs -Name: qhull -Version: 8.0.2 -# Add epoch, because upstream changed their versioning scheme: -# - Older releases used year.month -# - Newer releases use x.y.z -Epoch: 1 -Release: 2%{?dist} -License: Qhull -Source0: https://github.com/qhull/qhull/archive/v%{version}.tar.gz#/qhull-%{version}.tar.gz - -# Install cmake and pkgconfig file into proper libdir -# https://github.com/qhull/qhull/pull/123 -Patch0: qhull-lib64.patch -# Install extra targets - libqhull and qhull_p -Patch1: qhull-install.patch -# The static_r library needs fPIC -Patch2: qhull-staticr-pic.patch - -URL: http://www.qhull.org - -BuildRequires: make -BuildRequires: gcc -BuildRequires: gcc-c++ -BuildRequires: cmake -BuildRequires: chrpath - -%description -Qhull is a general dimension convex hull program that reads a set -of points from stdin, and outputs the smallest convex set that contains -the points to stdout. It also generates Delaunay triangulations, Voronoi -diagrams, furthest-site Voronoi diagrams, and halfspace intersections -about a point. - -%package -n libqhull -Summary: -n libqhull - -%description -n libqhull -%{summary} - -%package -n libqhull_r -Summary: libqhull_r - -%description -n libqhull_r -%{summary} - -%package -n libqhull_p -Summary: libqhull_p - -%description -n libqhull_p -%{summary} - -%package devel -Summary: Development files for qhull -Requires: lib%{name}%{?_isa} = %{epoch}:%{version}-%{release} -Requires: lib%{name}_r%{?_isa} = %{epoch}:%{version}-%{release} -Requires: lib%{name}_p%{?_isa} = %{epoch}:%{version}-%{release} -Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} - -%description devel -Qhull is a general dimension convex hull program that reads a set -of points from stdin, and outputs the smallest convex set that contains -the points to stdout. It also generates Delaunay triangulations, Voronoi -diagrams, furthest-site Voronoi diagrams, and halfspace intersections -about a point. - -%prep -%setup -q -%patch -P0 -p1 -b .lib64 -%patch -P1 -p1 -b .install -%patch -P2 -p1 -b .pic - -%build -mkdir -p build -cd build -%cmake -S .. -B . -DLINK_APPS_SHARED=ON -make VERBOSE=1 %{?_smp_mflags} -# These items are deprecated as of 8.0.2 -make VERBOSE=1 %{?_smp_mflags} libqhull qhull_p -cd .. - -%install -cd build -make VERBOSE=1 DESTDIR=$RPM_BUILD_ROOT install -cd .. - -chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/lib*.so.* - - -%files -%{_pkgdocdir} -%exclude %{_pkgdocdir}/COPYING.txt -%license COPYING.txt -%{_bindir}/* -%{_mandir}/man1/* - -%files -n libqhull -%{_libdir}/libqhull.so.* - -%ldconfig_scriptlets -n libqhull - - -%files -n libqhull_r -%{_libdir}/libqhull_r.so.* - -%ldconfig_scriptlets -n libqhull_r - - -%files -n libqhull_p -%{_libdir}/libqhull_p.so.* - -%ldconfig_scriptlets -n libqhull_p - - -%files devel -%{_libdir}/*.so -%{_includedir}/* -# Easier to include these than to hack them out of the cmake bits -%{_libdir}/libqhullcpp.a -%{_libdir}/libqhullstatic*.a -%dir %{_libdir}/cmake/Qhull -%{_libdir}/cmake/Qhull/QhullConfig*.cmake -%{_libdir}/cmake/Qhull/QhullTargets*.cmake -%{_libdir}/pkgconfig/qhull_r.pc -%{_libdir}/pkgconfig/qhullcpp.pc -%{_libdir}/pkgconfig/qhullstatic*.pc - -%changelog -* Thu Aug 10 2023 Tom Callaway - 1:8.0.2-2 -- make the static_r library pic - -* Thu Aug 3 2023 Tom Callaway - 1:8.0.2-1 -- update to 8.0.2 (thanks to Orion Poplawski) - -* Fri Jul 21 2023 Fedora Release Engineering - 1:7.2.1-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Fri Jan 20 2023 Fedora Release Engineering - 1:7.2.1-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sun Oct 02 2022 Orion Poplawski - 1:7.2.1-11 -- Compile libqhullcpp with -fPIC - -* Fri Jul 22 2022 Fedora Release Engineering - 1:7.2.1-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jan 21 2022 Fedora Release Engineering - 1:7.2.1-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 1:7.2.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 1:7.2.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Aug 03 2020 Ralf Corsépius - 1:7.2.1-6 -- Work around cmake madness (RHBZ#1863716). - -* Sat Aug 01 2020 Fedora Release Engineering - 1:7.2.1-5 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 1:7.2.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Thu Jan 30 2020 Fedora Release Engineering - 1:7.2.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Jul 26 2019 Fedora Release Engineering - 1:7.2.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Wed May 22 2019 Ralf Corsépius - 1:7.2.1-1 -- Update to 7.2.1. -- Rebase patches. -- Add Epoch: due to upstream having changed their version numbering scheme. -- Reflect Source0: having changed. - -* Sat Feb 02 2019 Fedora Release Engineering - 2015.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 2015.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 2015.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 2015.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 2015.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 2015.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Apr 29 2016 Ralf Corsépius - 2015.2-1 -- Update to 2015.2-7.2.0. -- Split out libqhull, libqhull_p, libqhull_r packages. -- drop pkgconfig. - -* Thu Feb 04 2016 Fedora Release Engineering - 2003.1-28 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Jan 26 2016 Ralf Corsépius - 2003.1-27 -- Remove %%defattr. -- Add %%license. -- Move docs into *-devel. -- Cleanup spec. - -* Thu Jun 18 2015 Fedora Release Engineering - 2003.1-26 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sun Aug 17 2014 Fedora Release Engineering - 2003.1-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 2003.1-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Mon Apr 14 2014 Jaromir Capik - 2003.1-23 -- Fixing format-security flaws (#1037293) - -* Tue Aug 06 2013 Ralf Corsépius - 2003.1-22 -- Reflect docdir changes (RHBZ #993921). -- Fix bogus %%changelog date. - -* Sun Aug 04 2013 Fedora Release Engineering - 2003.1-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Sun Mar 24 2013 Ralf Corsépius - 2003.1-20 -- Update config.sub,guess for aarch64 (RHBZ #926411). - -* Thu Feb 14 2013 Fedora Release Engineering - 2003.1-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sat Jul 21 2012 Fedora Release Engineering - 2003.1-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sun Jul 08 2012 Ralf Corsépius - 2003.1-17 -- Modernize spec. -- Add qhull.pc. -- Misc. 64bit fixes. - -* Sat Jan 14 2012 Fedora Release Engineering - 2003.1-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Feb 08 2011 Fedora Release Engineering - 2003.1-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Feb 02 2010 Ralf Corsépius - 2003.1-14 -- Apply upstream's qh_gethash patch -- Silence %%setup. -- Remove rpath. - -* Sun Jul 26 2009 Fedora Release Engineering - 2003.1-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Feb 25 2009 Fedora Release Engineering - 2003.1-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Thu May 22 2008 Tom "spot" Callaway - 2003.1-11 -- fix license tag - -* Tue Mar 04 2008 Ralf Corsépius - 2003.1-10 -- Add qhull-2003.1-alias.patch (BZ 432309) - Thanks to Orion Poplawski (orion@cora.nwra.com). - -* Sun Feb 10 2008 Ralf Corsépius - 2003.1-9 -- Rebuild for gcc43. - -* Wed Aug 22 2007 Ralf Corsépius - 2003.1-8 -- Mass rebuild. - -* Wed Jun 20 2007 Ralf Corsépius - 2003.1-7 -- Remove *.la. - -* Tue Sep 05 2006 Ralf Corsépius - 2003.1-6 -- Mass rebuild. - -* Fri Feb 17 2006 Ralf Corsépius - 2003.1-5 -- Disable static libs. -- Fixup some broken links in doc. -- Add %%{?dist}. - -* Sun May 22 2005 Jeremy Katz - 2003.1-4 -- rebuild on all arches - -* Wed Apr 6 2005 Michael Schwendt -- rebuilt - -* Sun Aug 08 2004 Ralf Corsepius - 2003.1-0.fdr.2 -- Use default documentation installation scheme. - -* Fri Jul 16 2004 Ralf Corsepius - 2003.1-0.fdr.1 -- Initial Fedora RPM. diff --git a/sources b/sources deleted file mode 100644 index fc978e5..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (qhull-8.0.2.tar.gz) = 5ca8fbac7bb9e7213b66c06be86939d29196e5f0ba272b385b3afbb3501a33127f56e900881c5e38d27af8119765b56fa42ff8ede20fe09957d06c9c2e402274