Update!

2 files changed, 89 insertions, 74 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f986b842642f..a08565cec46a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -8,29 +8,29 @@ pkgbase = ros-melodic-rqt-common-plugins
 	makedepends = cmake
 	makedepends = ros-build-tools
 	makedepends = ros-melodic-catkin
+	depends = ros-melodic-rqt-msg
+	depends = ros-melodic-rqt-web
 	depends = ros-melodic-rqt-launch
+	depends = ros-melodic-rqt-action
+	depends = ros-melodic-rqt-topic
 	depends = ros-melodic-rqt-srv
+	depends = ros-melodic-rqt-py-console
+	depends = ros-melodic-rqt-logger-level
+	depends = ros-melodic-rqt-top
+	depends = ros-melodic-rqt-shell
+	depends = ros-melodic-rqt-plot
 	depends = ros-melodic-rqt-bag-plugins
-	depends = ros-melodic-rqt-bag
-	depends = ros-melodic-rqt-topic
-	depends = ros-melodic-rqt-service-caller
-	depends = ros-melodic-rqt-publisher
+	depends = ros-melodic-rqt-dep
 	depends = ros-melodic-rqt-graph
 	depends = ros-melodic-rqt-console
-	depends = ros-melodic-rqt-shell
-	depends = ros-melodic-rqt-py-common
-	depends = ros-melodic-rqt-logger-level
-	depends = ros-melodic-rqt-reconfigure
-	depends = ros-melodic-rqt-dep
 	depends = ros-melodic-rqt-image-view
-	depends = ros-melodic-rqt-py-console
-	depends = ros-melodic-rqt-msg
-	depends = ros-melodic-rqt-top
-	depends = ros-melodic-rqt-web
-	depends = ros-melodic-rqt-plot
-	depends = ros-melodic-rqt-action
-	source = ros-melodic-rqt-common-plugins-0.4.8-0.tar.gz::https://github.com/ros-gbp/rqt_common_plugins-release/archive/release/melodic/rqt_common_plugins/0.4.8-0.tar.gz
-	sha256sums = f0c64a0ec07274960b5e4eb9c032c6c439e67a82b0ae25c4cc9d27be2ecacc83
+	depends = ros-melodic-rqt-reconfigure
+	depends = ros-melodic-rqt-bag
+	depends = ros-melodic-rqt-service-caller
+	depends = ros-melodic-rqt-py-common
+	depends = ros-melodic-rqt-publisher
+	source = ros-melodic-rqt-common-plugins::git+https://github.com/ros-gbp/rqt_common_plugins-release.git
+	sha256sums = SKIP
 
 pkgname = ros-melodic-rqt-common-plugins
 
diff --git a/PKGBUILD b/PKGBUILD
index 0ad4d4fca0d6..43d86c40dc93 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
-# Script generated with import_catkin_packages.py
-# For more information: https://github.com/bchretien/arch-ros-stacks
+# Script generated with import_catkin_packages.py.
+# For more information: https://github.com/bchretien/arch-ros-stacks.
 pkgdesc="ROS - rqt_common_plugins metapackage provides ROS backend graphical tools suite that can be used on/off of robot runtime."
 url='http://ros.org/wiki/rqt_common_plugins'
 
@@ -10,70 +10,85 @@ arch=('any')
 pkgrel=1
 license=('BSD')
 
-ros_makedepends=(ros-melodic-catkin)
-makedepends=('cmake' 'ros-build-tools'
-  ${ros_makedepends[@]})
+ros_makedepends=(
+	ros-melodic-catkin
+)
 
-ros_depends=(ros-melodic-rqt-launch
-  ros-melodic-rqt-srv
-  ros-melodic-rqt-bag-plugins
-  ros-melodic-rqt-bag
-  ros-melodic-rqt-topic
-  ros-melodic-rqt-service-caller
-  ros-melodic-rqt-publisher
-  ros-melodic-rqt-graph
-  ros-melodic-rqt-console
-  ros-melodic-rqt-shell
-  ros-melodic-rqt-py-common
-  ros-melodic-rqt-logger-level
-  ros-melodic-rqt-reconfigure
-  ros-melodic-rqt-dep
-  ros-melodic-rqt-image-view
-  ros-melodic-rqt-py-console
-  ros-melodic-rqt-msg
-  ros-melodic-rqt-top
-  ros-melodic-rqt-web
-  ros-melodic-rqt-plot
-  ros-melodic-rqt-action)
-depends=(${ros_depends[@]})
+makedepends=(
+	'cmake'
+	'ros-build-tools'
+	${ros_makedepends[@]}
+)
 
-# Git version (e.g. for debugging)
-# _tag=release/melodic/rqt_common_plugins/${pkgver}-${_pkgver_patch}
-# _dir=${pkgname}
-# source=("${_dir}"::"git+https://github.com/ros-gbp/rqt_common_plugins-release.git"#tag=${_tag})
-# sha256sums=('SKIP')
+ros_depends=(
+	ros-melodic-rqt-msg
+	ros-melodic-rqt-web
+	ros-melodic-rqt-launch
+	ros-melodic-rqt-action
+	ros-melodic-rqt-topic
+	ros-melodic-rqt-srv
+	ros-melodic-rqt-py-console
+	ros-melodic-rqt-logger-level
+	ros-melodic-rqt-top
+	ros-melodic-rqt-shell
+	ros-melodic-rqt-plot
+	ros-melodic-rqt-bag-plugins
+	ros-melodic-rqt-dep
+	ros-melodic-rqt-graph
+	ros-melodic-rqt-console
+	ros-melodic-rqt-image-view
+	ros-melodic-rqt-reconfigure
+	ros-melodic-rqt-bag
+	ros-melodic-rqt-service-caller
+	ros-melodic-rqt-py-common
+	ros-melodic-rqt-publisher
+)
 
-# Tarball version (faster download)
-_dir="rqt_common_plugins-release-release-melodic-rqt_common_plugins-${pkgver}-${_pkgver_patch}"
-source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/rqt_common_plugins-release/archive/release/melodic/rqt_common_plugins/${pkgver}-${_pkgver_patch}.tar.gz")
-sha256sums=('f0c64a0ec07274960b5e4eb9c032c6c439e67a82b0ae25c4cc9d27be2ecacc83')
+depends=(
+	${ros_depends[@]}
+)
+
+_dir=${pkgname}
+source=("${_dir}"::"git+https://github.com/ros-gbp/rqt_common_plugins-release.git")
+sha256sums=('SKIP')
+
+prepare() {
+	cd ${srcdir}/${_dir}
+	git checkout upstream
+	_pkgname=$(echo ${pkgname} | sed 's/ros-lunar-//' | sed 's/-/_/g')
+
+	if [ -d ${_pkgname} ]; then
+		git subtree split -P ${_pkgname} --branch ${_pkgname}
+		git checkout ${_pkgname}
+	fi
+}
 
 build() {
-  # Use ROS environment variables
-  source /usr/share/ros-build-tools/clear-ros-env.sh
-  [ -f /opt/ros/melodic/setup.bash ] && source /opt/ros/melodic/setup.bash
+	# Use ROS environment variables.
+	source /usr/share/ros-build-tools/clear-ros-env.sh
+	[ -f /opt/ros/melodic/setup.bash ] && source /opt/ros/melodic/setup.bash
 
-  # Create build directory
-  [ -d ${srcdir}/build ] || mkdir ${srcdir}/build
-  cd ${srcdir}/build
+	# Create the build directory.
+	[ -d ${srcdir}/build ] || mkdir ${srcdir}/build
+	cd ${srcdir}/build
 
-  # Fix Python2/Python3 conflicts
-  /usr/share/ros-build-tools/fix-python-scripts.sh -v 2 ${srcdir}/${_dir}
+	# Fix Python2/Python3 conflicts.
+	/usr/share/ros-build-tools/fix-python-scripts.sh -v 3 ${srcdir}/${_dir}
 
-  # Build project
-  cmake ${srcdir}/${_dir} \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DCATKIN_BUILD_BINARY_PACKAGE=ON \
-        -DCMAKE_INSTALL_PREFIX=/opt/ros/melodic \
-        -DPYTHON_EXECUTABLE=/usr/bin/python2 \
-        -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \
-        -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \
-        -DPYTHON_BASENAME=-python2.7 \
-        -DSETUPTOOLS_DEB_LAYOUT=OFF
-  make
+	# Build the project.
+	cmake ${srcdir}/${_dir} \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCATKIN_BUILD_BINARY_PACKAGE=ON \
+		-DCMAKE_INSTALL_PREFIX=/opt/ros/melodic \
+		-DPYTHON_EXECUTABLE=/usr/bin/python3 \
+		-DPYTHON_INCLUDE_DIR=/usr/include/python3.7m \
+		-DPYTHON_LIBRARY=/usr/lib/libpython3.7m.so \
+		-DPYTHON_BASENAME=.cpython-37m \
+		-DSETUPTOOLS_DEB_LAYOUT=OFF
+	make
 }
 
 package() {
-  cd "${srcdir}/build"
-  make DESTDIR="${pkgdir}/" install
+	cd "${srcdir}/build"
+	make DESTDIR="${pkgdir}/" install
 }