updpkg 0.4.2

2 files changed, 40 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 88c2c450541d..92eebedc460c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ros-noetic-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.1
-	pkgrel = 2
+	pkgver = 0.4.2
+	pkgrel = 1
 	url = https://wiki.ros.org/qt_gui_cpp
 	arch = i686
 	arch = x86_64
@@ -24,10 +24,8 @@ pkgbase = ros-noetic-qt-gui-cpp
 	depends = tinyxml
 	depends = sip
 	depends = python-sip
-	source = ros-noetic-qt-gui-cpp-0.4.1.tar.gz::https://github.com/ros-visualization/qt_gui_core/archive/0.4.1.tar.gz
-	source = sip.patch::https://patch-diff.githubusercontent.com/raw/ros-visualization/qt_gui_core/pull/226.patch
-	sha256sums = 6baab3b36409f385aa543d33c6595bfbfc89c24ce52233b6aa33ec2088d23132
-	sha256sums = 059769b768078b6871b6d9caf6124f5c3ff9bdbd2ce0e64cc9f12d1be5a16795
+	source = ros-noetic-qt-gui-cpp-0.4.2.tar.gz::https://github.com/ros-visualization/qt_gui_core/archive/0.4.2.tar.gz
+	sha256sums = fbc5a7b0a4da43f80e9216845aec2e247fac0a63512053c03a9f89024d026aad
 
 pkgname = ros-noetic-qt-gui-cpp
 
diff --git a/PKGBUILD b/PKGBUILD
index aab593e36022..8d849244e68e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,71 +2,64 @@ 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-noetic-qt-gui-cpp'
-pkgver='0.4.1'
+pkgver='0.4.2'
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
-pkgrel=2
+pkgrel=1
 license=('BSD')
 
 ros_makedepends=(
-	ros-noetic-catkin
-	ros-noetic-cmake-modules
-	ros-noetic-pluginlib
-	ros-noetic-python-qt-binding
+    ros-noetic-catkin
+    ros-noetic-cmake-modules
+    ros-noetic-pluginlib
+    ros-noetic-python-qt-binding
 )
 
 makedepends=(
-	cmake
-	ros-build-tools
-	${ros_makedepends[@]}
-	python-setuptools
-	pkg-config
-	qt5-base
-	tinyxml
+    cmake
+    ros-build-tools
+    ${ros_makedepends[@]}
+    python-setuptools
+    pkg-config
+    qt5-base
+    tinyxml
 )
 
 ros_depends=(
-	ros-noetic-pluginlib
-	ros-noetic-qt-gui
+    ros-noetic-pluginlib
+    ros-noetic-qt-gui
 )
 
 depends=(
-	${ros_depends[@]}
-	tinyxml
-	sip
-	python-sip
+    ${ros_depends[@]}
+    tinyxml
+    sip
+    python-sip
 )
 
 _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"
-        "sip.patch::https://patch-diff.githubusercontent.com/raw/ros-visualization/qt_gui_core/pull/226.patch")
-sha256sums=('6baab3b36409f385aa543d33c6595bfbfc89c24ce52233b6aa33ec2088d23132'
-            '059769b768078b6871b6d9caf6124f5c3ff9bdbd2ce0e64cc9f12d1be5a16795')
-
-prepare() {
-    cd "$srcdir/qt_gui_core-${pkgver}"
-    patch --forward --strip=1 --input="${srcdir}/sip.patch"
-}
+source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros-visualization/qt_gui_core/archive/${pkgver}.tar.gz")
+sha256sums=('fbc5a7b0a4da43f80e9216845aec2e247fac0a63512053c03a9f89024d026aad')
 
 build() {
-	# Use ROS environment variables.
-	source /usr/share/ros-build-tools/clear-ros-env.sh
-	[ -f /opt/ros/noetic/setup.bash ] && source /opt/ros/noetic/setup.bash
+    # Use ROS environment variables.
+    source /usr/share/ros-build-tools/clear-ros-env.sh
+    [ -f /opt/ros/noetic/setup.bash ] && source /opt/ros/noetic/setup.bash
 
-	# Create the build directory.
-	[ -d ${srcdir}/build ] || mkdir ${srcdir}/build
-	cd ${srcdir}/build
+    # Create the build directory.
+    [ -d ${srcdir}/build ] || mkdir ${srcdir}/build
+    cd ${srcdir}/build
 
-	# Build the project.
-	cmake ${srcdir}/${_dir} \
-		-DCATKIN_BUILD_BINARY_PACKAGE=ON \
-		-DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
-		-DPYTHON_EXECUTABLE=/usr/bin/python \
-		-DSETUPTOOLS_DEB_LAYOUT=OFF
+    # Build the project.
+    cmake ${srcdir}/${_dir} \
+        -DCATKIN_BUILD_BINARY_PACKAGE=ON \
+        -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
+        -DPYTHON_EXECUTABLE=/usr/bin/python \
+        -DSETUPTOOLS_DEB_LAYOUT=OFF
 
-	make
+    make
 }
 
 package() {
-	cd "${srcdir}/build"
-	make DESTDIR="${pkgdir}/" install
+    cd "${srcdir}/build"
+    make DESTDIR="${pkgdir}/" install
 }