summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuilhem Saurel2020-04-07 14:56:41 +0200
committerGuilhem Saurel2020-04-07 15:10:35 +0200
commit68b9b8771395b25759faba48c2d2dc85eb2e3914 (patch)
treed419b8abf7a5771b32a3fab238ae58b0a8cb54c7
parent022c6d35cb76a9ed8cf7d358146b8f1f6607ce29 (diff)
downloadaur-68b9b8771395b25759faba48c2d2dc85eb2e3914.tar.gz
patches for #132
ref https://github.com/Gepetto/gepetto-viewer/pull/132
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD11
-rw-r--r--patch-124
-rw-r--r--patch-221
4 files changed, 57 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 294575a6bdf..dacf48fec17 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = gepetto-viewer
pkgdesc = Graphical Interface for Pinocchio and HPP.
pkgver = 4.8.0
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/gepetto/gepetto-viewer
arch = i686
arch = x86_64
@@ -16,9 +16,13 @@ pkgbase = gepetto-viewer
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
validpgpkeys = 9B1A79065D2F2B806C8A5A1C7D2ACDAF4653CF28
sha256sums = SKIP
sha256sums = SKIP
+ sha256sums = de9a7f8979b5df2afabea4a352fba933318984e76829e46f5e7e71f61731f528
+ sha256sums = d34a9634568fad01ecc396028a0e4949fc8d0a6f4a0c0dfc07c70940304931c8
pkgname = gepetto-viewer
diff --git a/PKGBUILD b/PKGBUILD
index 84b166b7e0d..2da1af1f684 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,21 +2,24 @@
pkgname=gepetto-viewer
pkgver=4.8.0
-pkgrel=1
+pkgrel=2
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})
-sha256sums=('SKIP' 'SKIP')
+source=($url/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz{,.sig} patch-1 patch-2)
+sha256sums=('SKIP' 'SKIP'
+ 'de9a7f8979b5df2afabea4a352fba933318984e76829e46f5e7e71f61731f528'
+ 'd34a9634568fad01ecc396028a0e4949fc8d0a6f4a0c0dfc07c70940304931c8')
validpgpkeys=('9B1A79065D2F2B806C8A5A1C7D2ACDAF4653CF28')
prepare() {
# ref https://github.com/Gepetto/gepetto-viewer/pull/115
cd "$pkgname-$pkgver"
- sed -i 70d src/CMakeLists.txt
+ patch -p0 -i $srcdir/patch-1
+ patch -p0 -i $srcdir/patch-2
}
build() {
diff --git a/patch-1 b/patch-1
new file mode 100644
index 00000000000..0fcf1ea6200
--- /dev/null
+++ b/patch-1
@@ -0,0 +1,24 @@
+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
new file mode 100644
index 00000000000..afdfdc83534
--- /dev/null
+++ b/patch-2
@@ -0,0 +1,21 @@
+--- 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");