0.4.2.r4.g9147631-1: update to latest patched version

3 files changed, 80 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5eff07b39d1f..07a2844402b1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ros-melodic-qt-gui-cpp
 	pkgdesc = ROS - qt_gui_cpp provides the foundation for C++-bindings for qt_gui and creates bindings for every generator available.
-	pkgver = 0.4.2
-	pkgrel = 4
+	pkgver = 0.4.2.r4.g9147631
+	pkgrel = 1
 	url = https://wiki.ros.org/qt_gui_cpp
 	arch = i686
 	arch = x86_64
@@ -10,21 +10,20 @@ pkgbase = ros-melodic-qt-gui-cpp
 	arch = armv6h
 	license = BSD
 	makedepends = cmake
+	makedepends = git
 	makedepends = ros-build-tools
 	makedepends = ros-melodic-python-qt-binding
 	makedepends = ros-melodic-cmake-modules
 	makedepends = ros-melodic-catkin
 	makedepends = ros-melodic-pluginlib
-	makedepends = tinyxml
 	makedepends = qt5-base
-	makedepends = pkg-config
+	makedepends = tinyxml
 	depends = ros-melodic-qt-gui
 	depends = ros-melodic-pluginlib
+	depends = python-pyqt5-sip
+	depends = sip
 	depends = tinyxml
-	depends = sip4
-	depends = python-sip4
-	source = ros-melodic-qt-gui-cpp-0.4.2.tar.gz::https://github.com/ros-visualization/qt_gui_core/archive/0.4.2.tar.gz
-	sha256sums = fbc5a7b0a4da43f80e9216845aec2e247fac0a63512053c03a9f89024d026aad
+	source = ros-melodic-qt-gui-cpp::git+https://github.com/ros-visualization/qt_gui_core.git#commit=9147631f5f21f77e1f8e1f3ad884b5e96a8e22e4
+	b2sums = SKIP
 
 pkgname = ros-melodic-qt-gui-cpp
-
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..058ba2318df1
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,18 @@
+# based on https://github.com/github/gitignore/blob/master/ArchLinuxPackages.gitignore
+*.tar
+*.tar.*
+*.rpm
+*.jar
+*.exe
+*.msi
+*.zip
+*.tgz
+*.log
+*.log.*
+
+*/
+*.orig
+*.bak
+*.backup
+*.kate-swp
+.directory
diff --git a/PKGBUILD b/PKGBUILD
index 483f068f4f17..fae7ee5073e0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,68 +2,81 @@ pkgdesc="ROS - qt_gui_cpp provides the foundation for C++-bindings for qt_gui an
 url='https://wiki.ros.org/qt_gui_cpp'
 
 pkgname='ros-melodic-qt-gui-cpp'
-pkgver='0.4.2'
+pkgver=0.4.2.r4.g9147631
+_commit=9147631f5f21f77e1f8e1f3ad884b5e96a8e22e4
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
-pkgrel=4
+pkgrel=1
 license=('BSD')
 
 ros_makedepends=(
-	ros-melodic-python-qt-binding
-	ros-melodic-cmake-modules
-	ros-melodic-catkin
-	ros-melodic-pluginlib
+  ros-melodic-python-qt-binding
+  ros-melodic-cmake-modules
+  ros-melodic-catkin
+  ros-melodic-pluginlib
 )
 
 makedepends=(
-	'cmake'
-	'ros-build-tools'
-	${ros_makedepends[@]}
-	tinyxml
-	qt5-base
-	pkg-config
+  'cmake'
+  'git'
+  'ros-build-tools'
+  ${ros_makedepends[@]}
+  qt5-base
+  tinyxml
 )
 
 ros_depends=(
-	ros-melodic-qt-gui
-	ros-melodic-pluginlib
+  ros-melodic-qt-gui
+  ros-melodic-pluginlib
 )
 
 depends=(
-	${ros_depends[@]}
-	tinyxml
-    sip4
-    python-sip4
+  ${ros_depends[@]}
+  python-pyqt5-sip
+  sip
+  tinyxml
 )
 
-_dir="qt_gui_core-${pkgver}/qt_gui_cpp"
-source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros-visualization/qt_gui_core/archive/${pkgver}.tar.gz")
-sha256sums=('fbc5a7b0a4da43f80e9216845aec2e247fac0a63512053c03a9f89024d026aad')
+_dir="${pkgname}/qt_gui_cpp"
+source=("${pkgname}::git+https://github.com/ros-visualization/qt_gui_core.git#commit=${_commit}")
+b2sums=('SKIP')
 
-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
+pkgver() {
+    cd "${_dir}"
+
+    # Generate git tag based version. Count only proper (v)#.#* [#=number] tags.
+    local _gitversion=$(git describe --long --tags --match '[v0-9][0-9.][0-9.]*' | sed -e 's|^v||' | tr '[:upper:]' '[:lower:]') 
 
-	# Create the build directory.
-	[ -d ${srcdir}/build ] || mkdir ${srcdir}/build
-	cd ${srcdir}/build
+    # Format git-based version for pkgver
+    # Expected format: e.g. 1.5.0rc2.r521.g99982a1c
+    # Or in case of 'post': 1.5.0.post1.r521.g99982a1c
+    echo "${_gitversion}" | sed \
+        -e 's;^\([0-9][0-9.]*\)[-_.]\([a-zA-Z]\+\);\1\2;' \
+        -e 's;\([0-9]\+-g\);r\1;' \
+        -e 's;-;.;g' \
+        -e 's;\(post.*\);\.\1;'
+}
+
+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
 
-	# Fix Python2/Python3 conflicts.
-	/usr/share/ros-build-tools/fix-python-scripts.sh -v 3 ${srcdir}/${_dir}
+  # Create the build directory.
+  [ -d ${srcdir}/build ] || mkdir ${srcdir}/build
+  cd ${srcdir}/build
 
-	# 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 \
-		-DSETUPTOOLS_DEB_LAYOUT=OFF \
-                -DBOOST_ROOT=/opt/boost1.69
+  # 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 \
+    -DSETUPTOOLS_DEB_LAYOUT=OFF
 
-	make
+  make
 }
 
 package() {
-	cd "${srcdir}/build"
-	make DESTDIR="${pkgdir}/" install
+  cd "${srcdir}/build"
+  make DESTDIR="${pkgdir}/" install
 }