summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbionade242020-03-08 10:56:11 +0100
committerbionade242020-03-08 10:56:11 +0100
commit56326b3b552f59c680da6afffc56c58d33a2a8fd (patch)
treeb9a575c62846ec05af74714ceb730825c5af8715
parentaf7df7e566892db7945bc8e0c105411e412f3f61 (diff)
parent044f75183693fdfd5a0b12c4bcecec0ffbf39539 (diff)
downloadaur-56326b3b552f59c680da6afffc56c58d33a2a8fd.tar.gz
Merge divergent HEADs
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD2
2 files changed, 4 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1637288a1efc..19209eb1225c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -42,6 +42,8 @@ pkgbase = ros-melodic-rviz
makedepends = tinyxml2
makedepends = urdfdom-headers
makedepends = qt5-base
+ makedepends = python2-pyqt5
+ makedepends = python2-sip-pyqt5
depends = ros-melodic-std-srvs
depends = ros-melodic-rosbag
depends = ros-melodic-tf
diff --git a/PKGBUILD b/PKGBUILD
index 8b2047cb74e5..620de7b6d9f0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -47,6 +47,8 @@ makedepends=(
tinyxml2
urdfdom-headers
qt5-base
+ python2-pyqt5
+ python2-sip-pyqt5
)
ros_depends=(