Update to Ipe 7.2.1 and CGAL 4.7 (disable skeleton ipelet)

3 files changed, 32 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 991b063f3faf..bbe88a28ae09 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = cgal-ipelets
 	pkgdesc = Ipelets from CGAL
-	pkgver = 4.6
-	pkgrel = 3
+	pkgver = 4.7
+	pkgrel = 1
 	url = http://www.cgal.org
 	arch = i686
 	arch = x86_64
@@ -13,8 +13,10 @@ pkgbase = cgal-ipelets
 	makedepends = ipe
 	depends = cgal
 	depends = ipe
-	source = http://gforge.inria.fr/frs/download.php/34705/CGAL-4.6.tar.xz
-	md5sums = 65fa7e17cd654ef68da47df608000007
+	source = https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-4.7/CGAL-4.7.tar.xz
+	source = no-skeleton.patch
+	md5sums = 623d91fb2ab0a35049dc6098a0f235cc
+	md5sums = f9e230e8c7f787f9eeccb2ed302dca66
 
 pkgname = cgal-ipelets
 
diff --git a/PKGBUILD b/PKGBUILD
index 70189fbfb49f..79e59579a5ee 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,26 @@
 pkgname=cgal-ipelets
-pkgver=4.6
-pkgrel=3
-ipever=7.1.9           # too bad no way to determine this automatically
-_pkgid=34705
+pkgver=4.7
+pkgrel=1
+ipever=7.2.1
 pkgdesc="Ipelets from CGAL"
 arch=('i686' 'x86_64')
 url="http://www.cgal.org"
-source=(http://gforge.inria.fr/frs/download.php/$_pkgid/CGAL-$pkgver.tar.xz)
+source=(https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-${pkgver}/CGAL-${pkgver}.tar.xz
+        no-skeleton.patch)
 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
+}
+
 build() {
   cd "$srcdir/CGAL-$pkgver/demo/CGAL_ipelets"
-  cmake . -DWITH_IPE_7=ON
+  cmake .
+  cmake . -DCMAKE_CXX_FLAGS="-std=c++11"        # putting it in the first line won't work (system-wide CGAL settings will override this choice)
   make
 }
 
@@ -22,4 +29,5 @@ package() {
   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=('65fa7e17cd654ef68da47df608000007')
+md5sums=('623d91fb2ab0a35049dc6098a0f235cc'
+         'f9e230e8c7f787f9eeccb2ed302dca66')
diff --git a/no-skeleton.patch b/no-skeleton.patch
new file mode 100644
index 000000000000..0966b3d5c78b
--- /dev/null
+++ b/no-skeleton.patch
@@ -0,0 +1,11 @@
+--- 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)