summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbartus2017-07-29 00:00:18 +0200
committerbartus2017-07-29 00:00:18 +0200
commit8e4a3225abd5acdb11cf508afd6b75e70af00987 (patch)
treebdd0989e4a9b49b216d5ef9189033a3a3494dfca
parent157a98a4e2d3a6c4d08a21c7a3b8896c898a8103 (diff)
downloadaur-8e4a3225abd5acdb11cf508afd6b75e70af00987.tar.gz
remove cgal.patch as it was fixed upstream
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD8
-rw-r--r--cgal.patch14
3 files changed, 3 insertions, 20 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5404a914d95..6532ad82106 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -20,7 +20,6 @@ pkgbase = cloudcompare-git
optdepends = pcl
optdepends = liblas
source = cloudcompare::git+https://github.com/CloudCompare/CloudCompare.git
- source = cgal.patch
md5sums = SKIP
md5sums = c731a6b09c7a54ecc8ba67f4557e2b0c
diff --git a/PKGBUILD b/PKGBUILD
index f10e757c2b8..aebcd0de387 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
name=cloudcompare
pkgname=${name}-git
-pkgver=2.8.0.r158.gab5f340a
+pkgver=2.8.0.r245.g0c6c33de
pkgrel=1
pkgdesc="A 3D point cloud (and triangular mesh) processing software"
arch=('i686' 'x86_64')
@@ -13,14 +13,12 @@ depends=('qt5-base' 'glu' 'mesa' 'vxl' 'ffmpeg' 'cgal')
makedepends=('git' 'cmake' 'pcl' 'doxygen' 'liblas')
optdepends=('pcl' 'liblas')
source=("${name}::git+https://github.com/CloudCompare/CloudCompare.git"
- "cgal.patch")
-md5sums=('SKIP'
- 'c731a6b09c7a54ecc8ba67f4557e2b0c')
+ )
+md5sums=('SKIP')
prepare() {
cd ${srcdir}/${name}
git submodule update --init --recursive
- patch -Np1 -i ../cgal.patch
}
pkgver() {
diff --git a/cgal.patch b/cgal.patch
deleted file mode 100644
index 6815361d0e8..00000000000
--- a/cgal.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/CC/CGALSupport.cmake b/CC/CGALSupport.cmake
-index 2e7c5e64..826dbdfb 100644
---- a/CC/CGALSupport.cmake
-+++ b/CC/CGALSupport.cmake
-@@ -5,9 +5,6 @@
- FIND_PACKAGE( CGAL QUIET COMPONENTS Core ) # implies findGMP
-
- if (CGAL_FOUND)
-- if(${CGAL_MAJOR_VERSION}.${CGAL_MINOR_VERSION} LESS 4.3)
-- message(SEND_ERROR "CC Lib requires at least CGAL 4.3")
-- endif()
-
- # We need to get rid of CGAL CXX flags
- set(CGAL_DONT_OVERRIDE_CMAKE_FLAGS ON CACHE INTERNAL "override CGAL flags" FORCE)