diff options
| -rw-r--r-- | .SRCINFO | 9 | ||||
| -rw-r--r-- | PKGBUILD | 13 | ||||
| -rw-r--r-- | desktop.patch | 27 | ||||
| -rw-r--r-- | meshlab.desktop | 14 |
4 files changed, 7 insertions, 56 deletions
@@ -1,7 +1,7 @@ pkgbase = meshlab-git pkgdesc = System for processing and editing of unstructured 3D models arising in 3D scanning (qt5 version) - pkgver = 2020.03.r36.gd0fa7a31f - pkgrel = 2 + pkgver = 2020.04.r7.g3e89ebb8d + pkgrel = 1 url = https://www.meshlab.net arch = i686 arch = x86_64 @@ -15,7 +15,6 @@ pkgbase = meshlab-git makedepends = lib3ds makedepends = mpir depends = bzip2 - depends = desktop-file-utils depends = glew depends = glu depends = openssl-1.0 @@ -32,12 +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 = desktop.patch - source = meshlab.desktop sha256sums = SKIP sha256sums = SKIP - sha256sums = 1690f70118c985da61595b615635472144c4d0b3ddcefb515b9f230c106961b5 - sha256sums = 030ab1dcafb7d793bed3bc455497208addadf1091a4619576fe7e044aed4231a pkgname = meshlab-git @@ -4,15 +4,15 @@ _name="meshlab" pkgname="$_name-git" -pkgver=2020.03.r36.gd0fa7a31f -pkgrel=2 +pkgver=2020.04.r7.g3e89ebb8d +pkgrel=1 pkgdesc="System for processing and editing of unstructured 3D models arising in 3D scanning (qt5 version)" arch=('i686' 'x86_64') url="https://www.meshlab.net" conflicts=('meshlab') provides=('meshlab') license=('GPL2') -depends=('bzip2' 'desktop-file-utils' 'glew' 'glu' 'openssl-1.0' 'qt5-base' 'qt5-declarative' 'qt5-script' 'qt5-xmlpatterns') +depends=('bzip2' 'glew' 'glu' 'openssl-1.0' 'qt5-base' 'qt5-declarative' 'qt5-script' 'qt5-xmlpatterns') makedepends=('cmake' 'eigen3' 'ninja' 'git' 'muparser' 'levmar' 'lib3ds' 'mpir') optdepends=('u3d: for U3D and IDTF file support' 'lib3ds: for Autodesk`s 3D-Studio r3 and r4 .3DS file support' @@ -22,18 +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" - "desktop.patch" - "meshlab.desktop") + ) sha256sums=('SKIP' 'SKIP' - '1690f70118c985da61595b615635472144c4d0b3ddcefb515b9f230c106961b5' - '030ab1dcafb7d793bed3bc455497208addadf1091a4619576fe7e044aed4231a') + ) 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}/desktop.patch" } pkgver() { diff --git a/desktop.patch b/desktop.patch deleted file mode 100644 index 71051ea606a2..000000000000 --- a/desktop.patch +++ /dev/null @@ -1,27 +0,0 @@ -From fbb8d725c0a47a8e9d22dc8ed27b692eee50af87 Mon Sep 17 00:00:00 2001 -From: bartus <szczepaniak.bartek+github@gmail.com> -Date: Tue, 17 Mar 2020 17:45:36 +0100 -Subject: [PATCH] Fix: make desktop shortcut path absolute. - ---- - src/CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 58be6f175..e1c8ed164 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -354,8 +354,8 @@ if(INSTALL_SAMPLE_RANGEMAPS) - endif() - - if(NOT WIN32 AND NOT APPLE) -- install(FILES ../install/linux/resources/meshlab.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications) -- install(FILES ../install/meshlab.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor) -+ install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../install/linux/resources/default.desktop" DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications RENAME meshlab.desktop) -+ install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../install/meshlab.png" DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor) - endif() - - if(Qt5_windeployqt_EXECUTABLE AND BUILD_WITH_WINDEPLOYQT_POST_BUILD) --- -2.25.1 - diff --git a/meshlab.desktop b/meshlab.desktop deleted file mode 100644 index b232e3eb81f2..000000000000 --- a/meshlab.desktop +++ /dev/null @@ -1,14 +0,0 @@ -[Desktop Entry] -Version=$pkgver -Name=MeshLab -Name[en_GB]=MeshLab -GenericName=Mesh processing -GenericName[en_GB]=Mesh processing -Comment=View and process meshes -Type=Application -Exec=meshlab %U -TryExec=meshlab -Icon=/usr/share/pixmaps/meshlab.png -Terminal=false -MimeType=model/mesh;application/x-3ds;image/x-3ds;application/sla; -Categories=Graphics;3DGraphics;Viewer;Qt; |