diff options
| author | bartus | 2020-06-08 15:54:47 +0200 |
|---|---|---|
| committer | bartus | 2020-06-08 15:57:25 +0200 |
| commit | b23b3d8e805051f596d1ded8ab9135f764f3ffca (patch) | |
| tree | f52616483da9f03aee21c4e5d4c698544c48f4b4 | |
| parent | fee37a9bf68f64d4a4fc5582a235358bff81969a (diff) | |
| download | aur-b23b3d8e805051f596d1ded8ab9135f764f3ffca.tar.gz | |
Revert "Fix gcc10 build."
This reverts commit fee37a9bf68f64d4a4fc5582a235358bff81969a.
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 6 | ||||
| -rw-r--r-- | gcc10.patch | 24 |
3 files changed, 3 insertions, 31 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 = 2020.04.r29.gf9b56b498 + pkgver = 2020.04.r33.gef9c327cb pkgrel = 1 url = https://www.meshlab.net arch = i686 @@ -31,10 +31,8 @@ pkgbase = meshlab-git conflicts = meshlab source = meshlab::git+https://github.com/cnr-isti-vclab/meshlab.git source = vcglib::git+https://github.com/cnr-isti-vclab/vcglib.git - source = gcc10.patch sha256sums = SKIP sha256sums = SKIP - sha256sums = b6ed63f6ebea471a518420ae261a7ede6fb49a6c3c4e298a92c4d8af5dd520c6 pkgname = meshlab-git @@ -4,7 +4,7 @@ _name="meshlab" pkgname="$_name-git" -pkgver=2020.04.r29.gf9b56b498 +pkgver=2020.04.r33.gef9c327cb pkgrel=1 pkgdesc="System for processing and editing of unstructured 3D models arising in 3D scanning (qt5 version)" arch=('i686' 'x86_64') @@ -22,17 +22,15 @@ optdepends=('u3d: for U3D and IDTF file support' #also create openctm(aur) jhead-lib structuresynth-lib to handle last dep source=("$_name::git+https://github.com/cnr-isti-vclab/meshlab.git" "vcglib::git+https://github.com/cnr-isti-vclab/vcglib.git" - "gcc10.patch" ) sha256sums=('SKIP' 'SKIP' - 'b6ed63f6ebea471a518420ae261a7ede6fb49a6c3c4e298a92c4d8af5dd520c6') + ) prepare() { git -C "${srcdir}/${_name}" submodule init git -C "${srcdir}/${_name}" config submodule.vcglib.url "$srcdir"/vcglib git -C "${srcdir}/${_name}" submodule update - git -C "${srcdir}/${_name}" apply -v "$srcdir"/*patch } pkgver() { diff --git a/gcc10.patch b/gcc10.patch deleted file mode 100644 index 80a9c36dbcc8..000000000000 --- a/gcc10.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 510d932c755654a21b15868a59bb6cb0b3c0b8e2 Mon Sep 17 00:00:00 2001 -From: bartus <szczepaniak.bartek+github@gmail.com> -Date: Sun, 7 Jun 2020 23:59:06 +0200 -Subject: [PATCH] Fix gcc10 build. - ---- - .../ssynth/SyntopiaCore/GLEngine/Raytracer/AtomicCounter.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/external/structuresynth-1.5/ssynth/SyntopiaCore/GLEngine/Raytracer/AtomicCounter.h b/src/external/structuresynth-1.5/ssynth/SyntopiaCore/GLEngine/Raytracer/AtomicCounter.h -index 129c80d8b..4487efee5 100644 ---- a/src/external/structuresynth-1.5/ssynth/SyntopiaCore/GLEngine/Raytracer/AtomicCounter.h -+++ b/src/external/structuresynth-1.5/ssynth/SyntopiaCore/GLEngine/Raytracer/AtomicCounter.h -@@ -1,6 +1,7 @@ - #pragma once - - #include <QMutex> -+#include <climits> - #include <QWaitCondition> - - namespace SyntopiaCore { --- -2.27.0 - |