From be3ed55e094b76d0271d4647eb34c6522d2d6e64 Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Sat, 23 Jan 2016 20:50:00 +0100 Subject: [PATCH] qhull: update to 2015.2. --- common/shlibs | 5 +++-- srcpkgs/qhull/patches/format-string-security.patch | 13 ------------- srcpkgs/qhull/template | 10 ++++++---- 3 files changed, 9 insertions(+), 19 deletions(-) delete mode 100644 srcpkgs/qhull/patches/format-string-security.patch diff --git a/common/shlibs b/common/shlibs index 57e2785888b..eb4542f2f65 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1937,8 +1937,9 @@ libwvutils.so.4.6 wvstreams-4.6.1_1 libwvstreams.so.4.6 wvstreams-4.6.1_1 libespeak.so.1 libespeak-1.48.04_1 libpgf.so.6 libpgf-6.14.12_1 -libqhull_p.so.6 libqhull-2012.1_1 -libqhull.so.6 libqhull-2012.1_1 +libqhull_p.so.7 libqhull-2015.2_1 +libqhull_r.so.7 libqhull-2015.2_1 +libqhull.so.7 libqhull-2015.2_1 libfcitx-core.so.0 libfcitx-4.2.8_1 libfcitx-gclient.so.0 libfcitx-4.2.8_1 libfcitx-utils.so.0 libfcitx-4.2.8_1 diff --git a/srcpkgs/qhull/patches/format-string-security.patch b/srcpkgs/qhull/patches/format-string-security.patch deleted file mode 100644 index 65e2881ac4e..00000000000 --- a/srcpkgs/qhull/patches/format-string-security.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git src/libqhull/io.c src/libqhull/io.c -index 6601ffd..fb1a7fd 100644 ---- src/libqhull/io.c -+++ src/libqhull/io.c -@@ -2238,7 +2238,7 @@ void qh_printfacet3math(FILE *fp, facetT *facet, qh_PRINT format, int notfirst) - qh_memfree(point, qh normal_size); - qh_settempfree(&points); - qh_settempfree(&vertices); -- qh_fprintf(fp, 9110, endfmt); -+ qh_fprintf(fp, 9110, "%s", endfmt); - } /* printfacet3math */ - - diff --git a/srcpkgs/qhull/template b/srcpkgs/qhull/template index 8de1042eb35..a6367c32f93 100644 --- a/srcpkgs/qhull/template +++ b/srcpkgs/qhull/template @@ -1,15 +1,16 @@ # Template file for 'qhull' pkgname=qhull -version=2012.1 -revision=2 +version=2015.2 +revision=1 +_soname=7.2.0 build_style=cmake hostmakedepends="cmake" short_desc="Computes volumes, surface areas and approximations to the convex hull" maintainer="Martin Riese " license="BSD" homepage="http://www.qhull.org" -distfiles="http://www.qhull.org/download/${pkgname}-${version}-src.tgz" -checksum=a35ecaa610550b7f05c3ce373d89c30cf74b059a69880f03080c556daebcff88 +distfiles="http://www.qhull.org/download/${pkgname}-${version%.*}-src-${_soname}.tgz" +checksum=78b010925c3b577adc3d58278787d7df08f7c8fb02c3490e375eab91bb58a436 post_install() { install -Dm644 ${FILESDIR}/qhull.pc ${DESTDIR}/usr/lib/pkgconfig/qhull.pc @@ -23,6 +24,7 @@ libqhull_package() { short_desc+=" - runtime libraries" pkg_install() { vmove usr/lib/*.so.* + vlicense COPYING.txt } }