summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbartus2018-07-29 14:53:55 +0200
committerbartus2018-07-29 14:53:55 +0200
commit38f342aec70d21cda6c3341b926311d201aa8364 (patch)
tree71cf340471801b24eee4de5d33832abf73df7ab6
parent723c5f75cb6034bcbeb9e77a97825eaee823629d (diff)
downloadaur-38f342aec70d21cda6c3341b926311d201aa8364.tar.gz
remove upstream applied patch
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD7
-rw-r--r--qtintvalidator.patch19
3 files changed, 3 insertions, 27 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 99da0cd1f556..2159fc1e0612 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = cloudcompare-git
pkgdesc = A 3D point cloud (and triangular mesh) processing software
- pkgver = 2.9.1.r360.gab33dab4
+ pkgver = 2.9.1.r361.gb3c581d3
pkgrel = 1
url = http://www.danielgm.net/cc/
arch = i686
@@ -24,9 +24,7 @@ pkgbase = cloudcompare-git
depends = pdal
optdepends = pcl
source = cloudcompare::git+https://github.com/CloudCompare/CloudCompare.git
- source = qtintvalidator.patch
md5sums = SKIP
- md5sums = a1b173da5a6f2bee6e8a25d69f6aa51a
pkgname = cloudcompare-git
diff --git a/PKGBUILD b/PKGBUILD
index 678dc8b2675b..62e33c8c2324 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
name=cloudcompare
pkgname=${name}-git
-pkgver=2.9.1.r360.gab33dab4
+pkgver=2.9.1.r361.gb3c581d3
pkgrel=1
pkgdesc="A 3D point cloud (and triangular mesh) processing software"
arch=('i686' 'x86_64')
@@ -13,15 +13,12 @@ depends=('qt5-base' 'qt5-svg' 'glu' 'glew' 'mesa' 'vxl' 'ffmpeg' 'cgal' 'pdal')
makedepends=('git' 'cmake' 'pcl' 'libharu' 'proj' 'doxygen' 'laz-perf')
optdepends=('pcl')
source=("${name}::git+https://github.com/CloudCompare/CloudCompare.git"
- "qtintvalidator.patch"
)
-md5sums=('SKIP'
- 'a1b173da5a6f2bee6e8a25d69f6aa51a')
+md5sums=('SKIP')
prepare() {
cd ${srcdir}/${name}
git submodule update --init --recursive
- git apply ${srcdir}/qtintvalidator.patch
}
pkgver() {
diff --git a/qtintvalidator.patch b/qtintvalidator.patch
deleted file mode 100644
index 971819f3f3ab..000000000000
--- a/qtintvalidator.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/plugins/core/qCompass/ccCompass.cpp b/plugins/core/qCompass/ccCompass.cpp
-index d9633051..56fe5829 100644
---- a/plugins/core/qCompass/ccCompass.cpp
-+++ b/plugins/core/qCompass/ccCompass.cpp
-@@ -20,6 +20,7 @@
- //Qt
- #include <QFileDialog>
- #include <QFileInfo>
-+#include <QIntValidator>
- #include <qcheckbox.h>
- #include <ccPickingHub.h>
- #include <ccProgressDialog.h>
-@@ -3054,4 +3055,4 @@ int ccCompass::writeObjectXML(ccHObject* object, QXmlStreamWriter* out)
- out->writeEndElement();
-
- return n;
--}
-\ No newline at end of file
-+}