summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitriy Morozov2017-07-15 10:38:45 -0700
committerDmitriy Morozov2017-07-15 10:38:45 -0700
commit7f289b471320dd72cc772423c9dd8b198c3e27ce (patch)
tree2fabc6138d0fa922d24b7355de151a4661c075ae
parent59b7652e5a7c01effff332ab0d029fa1955652e1 (diff)
downloadaur-7f289b471320dd72cc772423c9dd8b198c3e27ce.tar.gz
Update to CGAL 4.10
-rw-r--r--.SRCINFO11
-rw-r--r--PKGBUILD28
-rw-r--r--no-skeleton.patch11
3 files changed, 15 insertions, 35 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c5730f9a0b16..ad4d47110dfc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,19 @@
pkgbase = cgal-ipelets
pkgdesc = Ipelets from CGAL
- pkgver = 4.9
- pkgrel = 2
+ pkgver = 4.10
+ pkgrel = 1
url = http://www.cgal.org
arch = i686
arch = x86_64
license = GPL
- license = QPL
makedepends = cmake
makedepends = boost
makedepends = cgal
makedepends = ipe
depends = cgal
depends = ipe
- source = https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-4.9/CGAL-4.9.tar.xz
- source = no-skeleton.patch
- md5sums = ee31343dbc4bf7b5b7501ec1650e9233
- md5sums = f9e230e8c7f787f9eeccb2ed302dca66
+ source = https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-4.10/CGAL-4.10.tar.xz
+ md5sums = 0a60a756b6885580945122ee178dd8db
pkgname = cgal-ipelets
diff --git a/PKGBUILD b/PKGBUILD
index 0bea477094ea..8d0ff87faf8f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,17 @@
+# Maintainer: foxcub <archlinux "at" foxcub {dot} org>
+# Contributor: calegria <calegria "at" gmail {dot} com>
pkgname=cgal-ipelets
-pkgver=4.9
-pkgrel=2
-ipever=7.2.7
+pkgver=4.10
+pkgrel=1
+_ipever=7.2.7
pkgdesc="Ipelets from CGAL"
arch=('i686' 'x86_64')
url="http://www.cgal.org"
-source=(https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-${pkgver}/CGAL-${pkgver}.tar.xz
- no-skeleton.patch)
+source=(https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-${pkgver}/CGAL-${pkgver}.tar.xz)
depends=('cgal' 'ipe')
makedepends=('cmake' 'boost' 'cgal' 'ipe')
-license=('GPL' 'QPL')
-
-prepare() {
- # Remove this once we switch to CGAL 4.8 (it's a problem with Boost)
- cd "$srcdir/CGAL-$pkgver/demo/CGAL_ipelets"
- patch < $srcdir/no-skeleton.patch
-}
+license=('GPL')
+md5sums=('0a60a756b6885580945122ee178dd8db')
build() {
cd "$srcdir/CGAL-$pkgver/demo/CGAL_ipelets"
@@ -25,9 +21,7 @@ build() {
}
package() {
- mkdir -p "$pkgdir/usr/lib/ipe/$ipever/ipelets/"
- cp "$srcdir/CGAL-$pkgver/demo/CGAL_ipelets/"*.so "$pkgdir/usr/lib/ipe/$ipever/ipelets/"
- cp "$srcdir/CGAL-$pkgver/demo/CGAL_ipelets/lua/"* "$pkgdir/usr/lib/ipe/$ipever/ipelets/"
+ mkdir -p "$pkgdir/usr/lib/ipe/$_ipever/ipelets/"
+ cp "$srcdir/CGAL-$pkgver/demo/CGAL_ipelets/"*.so "$pkgdir/usr/lib/ipe/$_ipever/ipelets/"
+ cp "$srcdir/CGAL-$pkgver/demo/CGAL_ipelets/lua/"* "$pkgdir/usr/lib/ipe/$_ipever/ipelets/"
}
-md5sums=('ee31343dbc4bf7b5b7501ec1650e9233'
- 'f9e230e8c7f787f9eeccb2ed302dca66')
diff --git a/no-skeleton.patch b/no-skeleton.patch
deleted file mode 100644
index 0966b3d5c78b..000000000000
--- a/no-skeleton.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- CMakeLists.txt 2015-09-21 07:25:52.000000000 -0700
-+++ CMakeLists-patched.txt 2016-02-29 00:19:18.000245558 -0800
-@@ -105,7 +105,7 @@
- set(CGAL_IPELETS ${CGAL_IPELETS} multi_regular)
- set(CGAL_IPELETS ${CGAL_IPELETS} partition)
- set(CGAL_IPELETS ${CGAL_IPELETS} pca)
-- set(CGAL_IPELETS ${CGAL_IPELETS} skeleton)
-+ #set(CGAL_IPELETS ${CGAL_IPELETS} skeleton)
- set(CGAL_IPELETS ${CGAL_IPELETS} svdlinf)
- set(CGAL_IPELETS ${CGAL_IPELETS} triangulation)
- set(CGAL_IPELETS ${CGAL_IPELETS} circle_pencils)