diff options
| author | Kino | 2024-05-16 02:24:48 +0800 |
|---|---|---|
| committer | Kino | 2024-05-16 02:24:48 +0800 |
| commit | c0014f58aec12c3c60f171d0c0d41b3f27f5e399 (patch) | |
| tree | 00a54cb57fe6511f8ead463a6b4cd75c721274d7 | |
| parent | 8df014f31fe459d3b81db3ba7c7722c2e3ed6a2c (diff) | |
| download | aur-ros2-humble-xacro.tar.gz | |
upgpkg: 2.0.11-1; fix check()
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | PKGBUILD | 17 | ||||
| -rw-r--r-- | support-python3.12.patch | 14 |
3 files changed, 9 insertions, 32 deletions
@@ -1,16 +1,14 @@ pkgbase = ros2-humble-xacro pkgdesc = A tool to construct shorter and more readable XML files by using macros that expand to larger XML expressions - pkgver = 2.0.9 - pkgrel = 5 + pkgver = 2.0.11 + pkgrel = 1 url = https://index.ros.org/p/xacro/ arch = any license = BSD-3-Clause makedepends = cmake depends = ros2-humble depends = python-yaml - source = ros2-humble-xacro-2.0.9.tar.gz::https://github.com/ros/xacro/archive/2.0.9.tar.gz - source = support-python3.12.patch - sha256sums = a8802a5b48f7479bae1238e822ac4ebb47660221eb9bc40a608e899d60f3f7e4 - sha256sums = 96a0669a1c2190e49d2dd93f7f2fea534d699bb32b96c0d02760041f89cb2836 + source = ros2-humble-xacro-2.0.11.tar.gz::https://github.com/ros/xacro/archive/2.0.11.tar.gz + sha256sums = 0c9b1619f1cdcf863e5a29fe8c034ae5c310e39722ff089d5d1e440c4e41967f pkgname = ros2-humble-xacro @@ -3,8 +3,8 @@ _pkgname=xacro pkgname=ros2-humble-xacro -pkgver=2.0.9 -pkgrel=5 +pkgver=2.0.11 +pkgrel=1 pkgdesc="A tool to construct shorter and more readable XML files by using macros that expand to larger XML expressions" url="https://index.ros.org/p/xacro/" license=('BSD-3-Clause') @@ -14,15 +14,8 @@ depends=( 'ros2-humble' 'python-yaml' ) -source=("$pkgname-$pkgver.tar.gz::https://github.com/ros/xacro/archive/${pkgver}.tar.gz" - "support-python3.12.patch") -sha256sums=('a8802a5b48f7479bae1238e822ac4ebb47660221eb9bc40a608e899d60f3f7e4' - '96a0669a1c2190e49d2dd93f7f2fea534d699bb32b96c0d02760041f89cb2836') - -prepare() { - cd $srcdir/xacro-$pkgver - patch -p1 < ../support-python3.12.patch -} +source=("$pkgname-$pkgver.tar.gz::https://github.com/ros/xacro/archive/${pkgver}.tar.gz") +sha256sums=('0c9b1619f1cdcf863e5a29fe8c034ae5c310e39722ff089d5d1e440c4e41967f') build() { source /opt/ros/humble/setup.bash @@ -37,7 +30,7 @@ build() { check() { cd build - ctest --output-on-failure + PYTHONPATH="$PWD/ament_cmake_python/xacro:$PYTHONPATH" ctest --output-on-failure } package() { diff --git a/support-python3.12.patch b/support-python3.12.patch deleted file mode 100644 index 39bf278d8bf1..000000000000 --- a/support-python3.12.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur xacro-2.0.9/xacro/__init__.py xacro-2.0.9_/xacro/__init__.py ---- xacro-2.0.9/xacro/__init__.py 2023-02-28 05:01:59.000000000 +0800 -+++ xacro-2.0.9_/xacro/__init__.py 2024-05-15 22:22:55.093092222 +0800 -@@ -555,8 +555,8 @@ - return False - - --default_value = '''\$\{.*?\}|\$\(.*?\)|(?:'.*?'|\".*?\"|[^\s'\"]+)+|''' --re_macro_arg = re.compile(r'^\s*([^\s:=]+?)\s*:?=\s*(\^\|?)?(' + default_value + ')(?:\s+|$)(.*)') -+default_value = r'''\$\{.*?\}|\$\(.*?\)|(?:'.*?'|\".*?\"|[^\s'\"]+)+|''' -+re_macro_arg = re.compile(r'^\s*([^\s:=]+?)\s*:?=\s*(\^\|?)?(' + default_value + r')(?:\s+|$)(.*)') - # space( param )( := )( ^| )( default )( space )(rest) - - |