diff options
| author | bartus | 2017-04-03 16:23:50 +0200 |
|---|---|---|
| committer | bartus | 2017-04-03 16:25:09 +0200 |
| commit | 2440356a2a90289c5eaeed56145706a88cb41f37 (patch) | |
| tree | 174f9bc857bdd8f6602746e71a640631e394e2b2 | |
| parent | 78ad1907e7aa067783c979206d9a0cbb292339ed (diff) | |
| download | aur-2440356a2a90289c5eaeed56145706a88cb41f37.tar.gz | |
histogram.h fix upstream
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 6 | ||||
| -rw-r--r-- | histogram.patch | 12 |
3 files changed, 2 insertions, 20 deletions
@@ -1,6 +1,6 @@ pkgbase = meshlab-git pkgdesc = System for processing and editing of unstructured 3D models arising in 3D scanning (qt5 version) - pkgver = 2016.12.r102.g01d15eab + pkgver = 2016.12.r145.gd26b0446 pkgrel = 1 url = http://www.meshlab.net install = meshlab-git.install @@ -23,7 +23,6 @@ pkgbase = meshlab-git conflicts = meshlab source = git+https://github.com/cnr-isti-vclab/meshlab.git source = git+https://github.com/cnr-isti-vclab/vcglib.git#branch=devel - source = histogram.patch source = plugin_dir.patch source = shaders_dir.patch source = external.patch @@ -36,7 +35,6 @@ pkgbase = meshlab-git source = meshlab.desktop md5sums = SKIP md5sums = SKIP - md5sums = 324df865843b7ceb6abb0e0833d72968 md5sums = f13d58ca07fa74b3d7c8f7f9d4ee6a93 md5sums = 753dd4753081ddb428f4db8eaefe9009 md5sums = 038494125d7bd422074fc5635c5579ca @@ -1,6 +1,6 @@ # Maintainer: bartus <aur@bartus.33mail.com> pkgname=meshlab-git -pkgver=2016.12.r102.g01d15eab +pkgver=2016.12.r145.gd26b0446 pkgrel=1 pkgdesc="System for processing and editing of unstructured 3D models arising in 3D scanning (qt5 version)" arch=('i686' 'x86_64') @@ -13,7 +13,6 @@ makedepends=('git') install="${pkgname}.install" source=("git+https://github.com/cnr-isti-vclab/meshlab.git" "git+https://github.com/cnr-isti-vclab/vcglib.git#branch=devel" - "histogram.patch" "plugin_dir.patch" "shaders_dir.patch" "external.patch" @@ -26,7 +25,6 @@ source=("git+https://github.com/cnr-isti-vclab/meshlab.git" "meshlab.desktop") md5sums=('SKIP' 'SKIP' - '324df865843b7ceb6abb0e0833d72968' 'f13d58ca07fa74b3d7c8f7f9d4ee6a93' '753dd4753081ddb428f4db8eaefe9009' '038494125d7bd422074fc5635c5579ca' @@ -67,8 +65,6 @@ prepare() { patch -Np0 -i plugin_dir.patch msg "put shaders in /usr/shade/meshlab" patch -Np0 -i shaders_dir.patch - msg "patch histogram.h missing header" - patch -Np0 -i histogram.patch } build() { diff --git a/histogram.patch b/histogram.patch deleted file mode 100644 index eebc84f83f72..000000000000 --- a/histogram.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/vcg/math/histogram.h b/vcg/math/histogram.h -index 829106ab..d0320d5a 100644 ---- vcglib/vcg/math/histogram.h -+++ b/vcg/math/histogram.h -@@ -24,6 +24,7 @@ - #define __VCG_HISTOGRAM - - #include <assert.h> -+#include <vector> - #include <string> - #include <limits> - #include <vcg/math/base.h> |