summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuilhem Saurel2020-04-29 16:18:24 +0200
committerGuilhem Saurel2020-04-29 16:18:24 +0200
commit93e4715f06174276984d1916f8d64fe0785dd7b7 (patch)
tree87de5567224d166eada54f9318168b4e9cc44d94
parent68b9b8771395b25759faba48c2d2dc85eb2e3914 (diff)
downloadaur-93e4715f06174276984d1916f8d64fe0785dd7b7.tar.gz
v4.9.0
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD19
-rw-r--r--patch-124
-rw-r--r--patch-221
4 files changed, 9 insertions, 67 deletions
diff --git a/.SRCINFO b/.SRCINFO
index dacf48fec17..dae62566023 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = gepetto-viewer
pkgdesc = Graphical Interface for Pinocchio and HPP.
- pkgver = 4.8.0
- pkgrel = 2
+ pkgver = 4.9.0
+ pkgrel = 1
url = https://github.com/gepetto/gepetto-viewer
arch = i686
arch = x86_64
@@ -14,15 +14,11 @@ pkgbase = gepetto-viewer
depends = openthreads
depends = osgqt
depends = boost
- source = https://github.com/gepetto/gepetto-viewer/releases/download/v4.8.0/gepetto-viewer-4.8.0.tar.gz
- source = https://github.com/gepetto/gepetto-viewer/releases/download/v4.8.0/gepetto-viewer-4.8.0.tar.gz.sig
- source = patch-1
- source = patch-2
+ source = https://github.com/gepetto/gepetto-viewer/releases/download/v4.9.0/gepetto-viewer-4.9.0.tar.gz
+ source = https://github.com/gepetto/gepetto-viewer/releases/download/v4.9.0/gepetto-viewer-4.9.0.tar.gz.sig
validpgpkeys = 9B1A79065D2F2B806C8A5A1C7D2ACDAF4653CF28
sha256sums = SKIP
sha256sums = SKIP
- sha256sums = de9a7f8979b5df2afabea4a352fba933318984e76829e46f5e7e71f61731f528
- sha256sums = d34a9634568fad01ecc396028a0e4949fc8d0a6f4a0c0dfc07c70940304931c8
pkgname = gepetto-viewer
diff --git a/PKGBUILD b/PKGBUILD
index 2da1af1f684..35061e6e2fb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,18 @@
# Maintainer: Guilhem Saurel <saurel@laas.fr>
pkgname=gepetto-viewer
-pkgver=4.8.0
-pkgrel=2
+pkgver=4.9.0
+pkgrel=1
pkgdesc="Graphical Interface for Pinocchio and HPP."
arch=('i686' 'x86_64')
url="https://github.com/gepetto/$pkgname"
license=('BSD')
depends=('openscenegraph' 'urdfdom' 'openthreads' 'osgqt' 'boost')
makedepends=('cmake' 'boost' 'urdfdom')
-source=($url/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz{,.sig} patch-1 patch-2)
-sha256sums=('SKIP' 'SKIP'
- 'de9a7f8979b5df2afabea4a352fba933318984e76829e46f5e7e71f61731f528'
- 'd34a9634568fad01ecc396028a0e4949fc8d0a6f4a0c0dfc07c70940304931c8')
+source=($url/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz{,.sig})
+sha256sums=('SKIP' 'SKIP')
validpgpkeys=('9B1A79065D2F2B806C8A5A1C7D2ACDAF4653CF28')
-prepare() {
- # ref https://github.com/Gepetto/gepetto-viewer/pull/115
- cd "$pkgname-$pkgver"
- patch -p0 -i $srcdir/patch-1
- patch -p0 -i $srcdir/patch-2
-}
-
build() {
cd "$pkgname-$pkgver"
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib .
@@ -36,5 +27,5 @@ check() {
package() {
cd "$pkgname-$pkgver"
make DESTDIR="$pkgdir/" install
- install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+ install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
}
diff --git a/patch-1 b/patch-1
deleted file mode 100644
index 0fcf1ea6200..00000000000
--- a/patch-1
+++ /dev/null
@@ -1,24 +0,0 @@
-From 7c41b73c349a12bd62355ee8165ab5c2f9728082 Mon Sep 17 00:00:00 2001
-From: Guilhem Saurel <guilhem.saurel@laas.fr>
-Date: Tue, 7 Apr 2020 10:45:01 +0200
-Subject: [PATCH] [Plugins] provide a hint for GEPETTO_GUI_PLUGIN_DIRS
-
----
- src/gui/dialog/pluginmanagerdialog.cc | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/gui/dialog/pluginmanagerdialog.cc b/src/gui/dialog/pluginmanagerdialog.cc
-index f8df74c..027adfe 100644
---- src/gui/dialog/pluginmanagerdialog.cc
-+++ src/gui/dialog/pluginmanagerdialog.cc
-@@ -131,6 +131,7 @@ namespace gepetto {
- QPluginLoader* p = plugins_[name];
- if (!p->isLoaded()) {
- qDebug () << "Plugin" << name << "not loaded:" << p->errorString();
-+ qDebug () << "If it was not found, you can set GEPETTO_GUI_PLUGIN_DIRS.";
- return false;
- }
- PluginInterface* pi = qobject_cast <PluginInterface*> (p->instance());
---
-2.26.0
-
diff --git a/patch-2 b/patch-2
deleted file mode 100644
index afdfdc83534..00000000000
--- a/patch-2
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/CMakeLists.txt.orig 2020-04-07 12:27:03.951973489 +0200
-+++ src/CMakeLists.txt 2020-04-07 12:36:11.199199694 +0200
-@@ -130,7 +130,7 @@
- PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} ${OSGQT_DEPENDENCY})
- PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} openthreads)
-
--ADD_DEFINITIONS(${QT_DEFINITIONS})
-+ADD_DEFINITIONS(${QT_DEFINITIONS} -DCMAKE_INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}")
- TARGET_LINK_LIBRARIES(${LIBRARY_NAME}
- ${Boost_LIBRARIES}
- ${X11_LIBRARIES}
---- src/gui/settings.cc.orig 2019-11-28 12:07:46.000000000 +0100
-+++ src/gui/settings.cc 2020-04-07 12:36:23.462471440 +0200
-@@ -85,6 +85,7 @@
- QSettings::SystemScope, installDirectory + "/etc");
- }
-
-+ PluginManager::addPluginDir (CMAKE_INSTALL_PREFIX "/lib/gepetto-gui-plugins");
- if (env.contains ("GEPETTO_GUI_PLUGIN_DIRS")) {
- foreach (QString p, env.value("GEPETTO_GUI_PLUGIN_DIRS").split(':')) {
- PluginManager::addPluginDir (p + "/gepetto-gui-plugins");