PR#1: Re-add pkgconfig files. - rpms/qhull

rpms / qhull

#1 Re-add pkgconfig files.

Closed 2 years ago by qulogic. Opened 7 years ago by qulogic.

rpms/ qulogic/qhull master into rawhide

Re-add pkgconfig files.

Elliott Sales de Andrade • 7 years ago

322929f

qhull-2015.2-pkgconfig.patch

file added

+72

		`@@ -0,0 +1,72 @@`
		`+ From b3f9da219e3a702a52ca81fc2fea8ce504b83e40 Mon Sep 17 00:00:00 2001`
		`+ From: Brad Barber <bradb@shore.net>`
		`+ Date: Wed, 14 Oct 2015 23:24:17 -0400`
		`+ Subject: [PATCH] Qhull 2015.0.5 2015/10/12 (7.0.5.1995)`
		`+`
		`+ - build/qhull*.pc.in: Add templates for pkg-config (derived from Fedorra) [P. McMunn]`
		`+ https://bitbucket.org/mgorny/pkg-config-spec/src/c1bf12afe0df6d95f2fe3f5e1ffb4c50f018825d/pkg-config-spec.txt?at=master&fileviewer=file-view-default`
		`+ ---`
		`+ build/qhull.pc.in \| 14 +++++++`
		`+ build/qhull_p.pc.in \| 14 +++++++`
		`+ build/qhull_r.pc.in \| 11 ++++++`
		`+ create mode 100644 build/qhull.pc.in`
		`+ create mode 100644 build/qhull_p.pc.in`
		`+ create mode 100644 build/qhull_r.pc.in`
		`+`
		`+ diff --git a/build/qhull.pc.in b/build/qhull.pc.in`
		`+ new file mode 100644`
		`+ index 0000000..0e1122e`
		`+ --- /dev/null`
		`+ +++ b/build/qhull.pc.in`
		`+ @@ -0,0 +1,14 @@`
		`+ +prefix=@prefix@`
		`+ +exec_prefix=@exec_prefix@`
		`+ +includedir=@includedir@`
		`+ +libdir=@libdir@`
		`+ +`
		`+ +Name: qhull`
		`+ +Description: Non-reentrant library (global struct) for convex hull, Delaunay triangulation, Voronoi diagram, and halfspace intersection about a point`
		`+ +# qh_QHpointer==0`
		`+ +Version: @VERSION@`
		`+ +URL: http://www.qhull.org`
		`+ +Requires:`
		`+ +Conflicts:`
		`+ +Libs: -L${libdir} -lqhull -lm`
		`+ +Cflags: -I${includedir}`
		`+ diff --git a/build/qhull_p.pc.in b/build/qhull_p.pc.in`
		`+ new file mode 100644`
		`+ index 0000000..09601bc`
		`+ --- /dev/null`
		`+ +++ b/build/qhull_p.pc.in`
		`+ @@ -0,0 +1,14 @@`
		`+ +prefix=@prefix@`
		`+ +exec_prefix=@exec_prefix@`
		`+ +includedir=@includedir@`
		`+ +libdir=@libdir@`
		`+ +`
		`+ +Name: qhull_p`
		`+ +Description: Non-reentrant library (global pointer) for convex hull, Delaunay triangulation, Voronoi diagram, and halfspace intersection about a point`
		`+ +# qh_QHpointer==1`
		`+ +Version: @VERSION@`
		`+ +URL: http://www.qhull.org`
		`+ +Requires:`
		`+ +Conflicts:`
		`+ +Libs: -L${libdir} -lqhull_p -lm`
		`+ +Cflags: -I${includedir}`
		`+ diff --git a/build/qhull_r.pc.in b/build/qhull_r.pc.in`
		`+ new file mode 100644`
		`+ index 0000000..c3fde9d`
		`+ --- /dev/null`
		`+ +++ b/build/qhull_r.pc.in`
		`+ @@ -0,0 +1,11 @@`
		`+ +prefix=@prefix@`
		`+ +exec_prefix=@exec_prefix@`
		`+ +includedir=@includedir@`
		`+ +libdir=@libdir@`
		`+ +`
		`+ +Name: qhull_r`
		`+ +Description: Reentrant library for convex hull, Delaunay triangulation, Voronoi diagram, and halfspace intersection about a point`
		`+ +Version: @VERSION@`
		`+ +Requires:`
		`+ +Libs: -L${libdir} -lqhull_r -lm`
		`+ +Cflags: -I${includedir}`

qhull.spec

file modified

+25 -5

		`@@ -4,12 +4,13 @@`
		`Summary: General dimension convex hull programs`
		`Name: qhull`
		`Version: 2015.2`
		`- Release: 5%{?dist}`
		`+ Release: 6%{?dist}`
		`License: Qhull`
		`Source0: http://www.qhull.org/download/qhull-%{tarvers}.tgz`

		`Patch1: 0001-Link-executables-against-shared-libs.patch`
		`Patch2: 0002-Install-docs-into-subdirs.patch`
		`+ Patch3: qhull-2015.2-pkgconfig.patch`

		`URL: http://www.qhull.org`

		`@@ -55,9 +56,8 @@`
		`about a point.`

		`%prep`
		`- %setup -q -n %{name}-%{version}`
		`- %patch1 -p1`
		`- %patch2 -p1`
		`+ %autosetup -n %{name}-%{version} -p1`
		`+`

		`%build`
		`mkdir -p build`
		`@@ -66,6 +66,16 @@`
		`make VERBOSE=1 %{?_smp_mflags}`
		`cd ..`

		`+ for pc in qhull qhull_p qhull_r; do`
		`+ sed -e 's\|@prefix@\|%{_prefix}\|' \`
		`+ -e 's\|@exec_prefix@\|%{_exec_prefix}\|' \`
		`+ -e 's\|@includedir@\|%{_includedir}\|' \`
		`+ -e 's\|@libdir@\|%{_libdir}\|' \`
		`+ -e 's\|@VERSION@\|%{version}\|' \`
		`+ build/${pc}.pc.in > ${pc}.pc`
		`+ done`
		`+`
		`+`
		`%install`
		`cd build`
		`make VERBOSE=1 DESTDIR=$RPM_BUILD_ROOT install`
		`@@ -73,6 +83,10 @@`

		`chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/lib.so.`

		`+ for pc in qhull qhull_p qhull_r; do`
		`+ install -m644 -D ${pc}.pc %{buildroot}%{_libdir}/pkgconfig/${pc}.pc`
		`+ done`
		`+`

		`%files`
		`%{_pkgdocdir}`
		`@@ -110,13 +124,19 @@`
		`%files devel`
		`%{_pkgdocdir}/src/libqhull`
		`%{_pkgdocdir}/src/libqhull_r`
		`- %{_libdir}/*.so`
		`%{_includedir}/*`
		`+ %{_libdir}/*.so`
		`+ %{_libdir}/pkgconfig/qhull.pc`
		`+ %{_libdir}/pkgconfig/qhull_p.pc`
		`+ %{_libdir}/pkgconfig/qhull_r.pc`
		`%{_libdir}/libqhullcpp.a`
		`%exclude %{_libdir}/libqhullstatic*.a`


		`%changelog`
		`+ * Tue Mar 13 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2015.2-6`
		`+ - Re-add pkgconfig files`
		`+`
		`* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2015.2-5`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild`

qulogic commented 7 years ago

These exist in GitHub, but not the tarball for unknown reasons.

corsepiu commented 7 years ago

You should ask upstream to add these files.

qulogic commented 7 years ago

These files are from upstream. It's even mentioned in CMakeLists.txt:

# If creating a qhull package, please include a pkg-config file based on build/qhull*.pc.in

though why they didn't put it in the tarball I don't really know.

Edited 7 years ago by qulogic

corsepiu commented 7 years ago

Upstream URL? I can't find them on
http://www.qhull.org/download
nor
https://github.com/qhull/qhull
nor in Debians qhull packages.

qulogic commented 7 years ago

https://github.com/qhull/qhull/blob/master/build/qhull.pc.in etc.

qulogic commented 7 years ago

I mean, I'd like to push a patch upstream to get these built automatically, but there's already an issue there and the current state of their build is entirely broken: no release tags, cmake stopped creating shared libraries, etc.

qulogic commented 2 years ago

This is fixed in Rawhide by upstream finally.

Pull-Request has been closed by qulogic

2 years ago