summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO10
-rw-r--r--CloudCompare.desktop8
-rw-r--r--PKGBUILD22
-rw-r--r--ccViewer.desktop8
4 files changed, 42 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f731f816f206..2a06d68e0391 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = cloudcompare-git
pkgdesc = A 3D point cloud (and triangular mesh) processing software
- pkgver = 2.10.2.r115.g75157a8d
+ pkgver = 2.10.2.r181.gea89ff3e
pkgrel = 1
url = http://www.danielgm.net/cc/
arch = i686
@@ -25,10 +25,14 @@ pkgbase = cloudcompare-git
depends = cgal
depends = pdal
optdepends = pcl
+ provides = cloudcompare
+ conflicts = cloudcompare
source = cloudcompare::git+https://github.com/CloudCompare/CloudCompare.git
- source = constexpr.patch
+ source = CloudCompare.desktop
+ source = ccViewer.desktop
md5sums = SKIP
- md5sums = c1ea23f8a38cf1326196bb42de07e020
+ md5sums = 379e09f6996b2b397429c0661c409bd0
+ md5sums = b6dcb0dee15cc67011166a2fc774c5ef
pkgname = cloudcompare-git
diff --git a/CloudCompare.desktop b/CloudCompare.desktop
new file mode 100644
index 000000000000..9c96fc8894b7
--- /dev/null
+++ b/CloudCompare.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=CloudCompare
+Comment=A 3D point cloud (and triangular mesh) processing software
+Icon=cc_icon
+Exec=CloudCompare
+Terminal=false
+Type=Application
+Categories=Graphics;
diff --git a/PKGBUILD b/PKGBUILD
index d872b0a61291..ac076904bdf3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
name=cloudcompare
pkgname=${name}-git
-pkgver=2.10.2.r115.g75157a8d
+pkgver=2.10.2.r181.gea89ff3e
pkgrel=1
pkgdesc="A 3D point cloud (and triangular mesh) processing software"
arch=('i686' 'x86_64')
@@ -12,11 +12,15 @@ license=('GPL2')
depends=('qt5-base' 'qt5-tools' 'qt5-svg' 'glu' 'glew' 'mesa' 'vxl' 'ffmpeg' 'cgal' 'pdal')
makedepends=('git' 'cmake' 'pcl' 'libharu' 'proj' 'python' 'doxygen' 'laz-perf')
optdepends=('pcl')
+conflicts=('cloudcompare')
+provides=('cloudcompare')
source=("${name}::git+https://github.com/CloudCompare/CloudCompare.git"
- "constexpr.patch"
+ CloudCompare.desktop
+ ccViewer.desktop
)
md5sums=('SKIP'
- 'c1ea23f8a38cf1326196bb42de07e020')
+ '379e09f6996b2b397429c0661c409bd0'
+ 'b6dcb0dee15cc67011166a2fc774c5ef')
prepare() {
cd ${srcdir}/${name}
@@ -73,5 +77,17 @@ build() {
package() {
cd ${srcdir}/${name}/build
make DESTDIR="$pkgdir/" install
+
+ # install *.desktop files
+ install -D -m 644 ${srcdir}/*.desktop -t ${pkgdir}/usr/share/applications/
+
+ # copy icons for *.desktop files
+ cd ${srcdir}/${name}
+ for size in 16 32 64 256; do
+ install -D -m 644 qCC/images/icon/cc_icon_${size}.png ${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/cc_icon.png
+ install -D -m 644 qCC/images/icon/cc_viewer_icon_${size}.png ${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/cc_viewer_icon.png
+ done
+ install -D -m 644 qCC/images/icon/cc_icon.svg ${pkgdir}/usr/share/icons/hicolor/scalable/apps/cc_icon.svg
+ install -D -m 644 qCC/images/icon/cc_viewer_icon.svg ${pkgdir}/usr/share/icons/hicolor/scalable/apps/cc_viewer_icon.svg
}
# vim:set sw=2 ts=2 et:
diff --git a/ccViewer.desktop b/ccViewer.desktop
new file mode 100644
index 000000000000..71870faa5a15
--- /dev/null
+++ b/ccViewer.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=CloudCompareView
+Comment=A viewer for Cloud Comare, a 3D point cloud (and triangular mesh) processing software
+Icon=cc_viewer_icon
+Exec=ccViewer
+Terminal=false
+Type=Application
+Categories=Graphics;