remove constexpr.patch

3 files changed, 1 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 742f04f4e2f2..86422b23994e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -26,9 +26,7 @@ pkgbase = cloudcompare
 	depends = pdal
 	optdepends = pcl
 	source = cloudcompare::git+https://github.com/CloudCompare/CloudCompare.git#tag=v2.10.2
-	source = constexpr.patch
 	md5sums = SKIP
-	md5sums = c1ea23f8a38cf1326196bb42de07e020
 
 pkgname = cloudcompare
 
diff --git a/PKGBUILD b/PKGBUILD
index 4e67dd33e6ae..dfc978965fd2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,10 +14,9 @@ depends=('qt5-base' 'qt5-tools' 'qt5-svg' 'glu' 'glew' 'mesa' 'vxl' 'ffmpeg' 'cg
 makedepends=('git' 'cmake' 'pcl' 'libharu' 'proj' 'python' 'doxygen' 'laz-perf')
 optdepends=('pcl')
 source=("${name}::git+https://github.com/CloudCompare/CloudCompare.git${_fragment}"
-        "constexpr.patch"
         )
 md5sums=('SKIP'
-         'c1ea23f8a38cf1326196bb42de07e020')
+         )
 
 prepare() {
   cd ${srcdir}/${name}
diff --git a/constexpr.patch b/constexpr.patch
deleted file mode 100644
index 05fcb63c4bc2..000000000000
--- a/constexpr.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/CC/include/CCConst.h b/CC/include/CCConst.h
-index 8ab70a93..33808059 100644
---- a/CC/include/CCConst.h
-+++ b/CC/include/CCConst.h
-@@ -40,10 +40,10 @@ constexpr double M_PI_2 = (M_PI/2.0);
- constexpr double SQRT_3 = 1.7320508075688772935274463415059;
- 
- //! Conversion factor from radians to degrees
--constexpr double CC_RAD_TO_DEG = (180.0/M_PI);
-+const double CC_RAD_TO_DEG = (180.0/M_PI);
- 
- //! Conversion factor from degrees to radians
--constexpr double CC_DEG_TO_RAD = (M_PI/180.0);
-+const double CC_DEG_TO_RAD = (M_PI/180.0);
- 
- //! Numerical threshold for considering a value as "zero"
- constexpr double ZERO_TOLERANCE = static_cast<double>(FLT_EPSILON);
-diff --git a/libs/qCC_db/ccCameraSensor.cpp b/libs/qCC_db/ccCameraSensor.cpp
-index 4bc29936..1713eceb 100644
---- a/libs/qCC_db/ccCameraSensor.cpp
-+++ b/libs/qCC_db/ccCameraSensor.cpp
-@@ -53,8 +53,8 @@ void ccCameraSensor::IntrinsicParameters::GetKinectDefaults(IntrinsicParameters&
- 	//default Kinect parameters from:
- 	// "Accuracy and Resolution of Kinect Depth Data for Indoor Mapping Applications"
- 	// Kourosh Khoshelham and Sander Oude Elberink
--	constexpr float focal_mm		= static_cast<float>(5.45 * 1.0e-3);	// focal length (real distance in meter)
--	constexpr float pixelSize_mm	= static_cast<float>(9.3 * 1.0e-6);		// pixel size (real distance in meter)
-+	const float focal_mm		= static_cast<float>(5.45 * 1.0e-3);	// focal length (real distance in meter)
-+	const float pixelSize_mm	= static_cast<float>(9.3 * 1.0e-6);		// pixel size (real distance in meter)
- 	
- 	params.vertFocal_pix      = ConvertFocalMMToPix(focal_mm, pixelSize_mm);
- 	params.pixelSize_mm[0]    = pixelSize_mm;
-diff --git a/libs/qCC_db/ccColorTypes.h b/libs/qCC_db/ccColorTypes.h
-index f70025cb..3e3a3b79 100644
---- a/libs/qCC_db/ccColorTypes.h
-+++ b/libs/qCC_db/ccColorTypes.h
-@@ -119,7 +119,7 @@ namespace ccColor
- 
- 	// Predefined colors (default type)
- 	constexpr Rgb white						(MAX, MAX, MAX);
--	constexpr Rgb lightGrey					(static_cast<ColorCompType>(MAX*0.8), static_cast<ColorCompType>(MAX*0.8), static_cast<ColorCompType>(MAX*0.8));
-+	const Rgb lightGrey					(static_cast<ColorCompType>(MAX*0.8), static_cast<ColorCompType>(MAX*0.8), static_cast<ColorCompType>(MAX*0.8));
- 	constexpr Rgb darkGrey					(MAX / 2, MAX / 2, MAX / 2);
- 	constexpr Rgb red						(MAX, 0, 0);
- 	constexpr Rgb green						(0, MAX, 0);