diff --git a/patch/ros-noetic-rtabmap-rviz-plugins,patch b/patch/ros-noetic-rtabmap-rviz-plugins.patch similarity index 100% rename from patch/ros-noetic-rtabmap-rviz-plugins,patch rename to patch/ros-noetic-rtabmap-rviz-plugins.patch diff --git a/patch/ros-noetic-rviz.patch b/patch/ros-noetic-rviz.patch index 03e60eb36..df953a5ae 100644 --- a/patch/ros-noetic-rviz.patch +++ b/patch/ros-noetic-rviz.patch @@ -140,3 +140,16 @@ index 7ffe26e1..c122ba98 100644 if (extension[0] == '.') { +diff --git a/src/rviz/properties/enum_property.h b/src/rviz/properties/enum_property.h +index c3e5e873..5e29c425 100644 +--- a/src/rviz/properties/enum_property.h ++++ b/src/rviz/properties/enum_property.h +@@ -43,7 +43,7 @@ namespace rviz + * option. The integer returned will be that passed to addOption() + * for with the string that is currently selected. + */ +-class EnumProperty : public StringProperty ++class RVIZ_EXPORT EnumProperty : public StringProperty + { + Q_OBJECT + public: diff --git a/pixi.lock b/pixi.lock index ec5e4ddcb..e7f40266e 100644 --- a/pixi.lock +++ b/pixi.lock @@ -88,7 +88,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/1c/e2/772f8cff8172a612823755035073b00753613c24af0ed6d3bae215021608/rospkg-1.5.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/35/79/5e2cffa1c77432f11cd93a5351f30732c997a239d3a3090856a72d6d8ba7/ruamel.yaml-0.17.40-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/68/6e/264c50ce2a31473a9fdbf4fa66ca9b2b17c7455b31ef585462343818bd6c/ruamel.yaml.clib-0.2.12-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - - pypi: git+https://github.com/RoboStack/vinca.git@ed00d8107489a820642f6cda578b09df5870a465 + - pypi: git+https://github.com/RoboStack/vinca.git@4f0e3abbe16e52304eb6cde6b5ab72882fc80486 linux-aarch64: - conda: https://repo.prefix.dev/conda-forge/linux-aarch64/_openmp_mutex-4.5-2_gnu.tar.bz2 - conda: https://repo.prefix.dev/conda-forge/noarch/anaconda-client-1.12.3-pyhd8ed1ab_1.conda @@ -170,7 +170,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/1c/e2/772f8cff8172a612823755035073b00753613c24af0ed6d3bae215021608/rospkg-1.5.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/35/79/5e2cffa1c77432f11cd93a5351f30732c997a239d3a3090856a72d6d8ba7/ruamel.yaml-0.17.40-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/3c/d2/b79b7d695e2f21da020bd44c782490578f300dd44f0a4c57a92575758a76/ruamel.yaml.clib-0.2.12-cp311-cp311-manylinux2014_aarch64.whl - - pypi: git+https://github.com/RoboStack/vinca.git@ed00d8107489a820642f6cda578b09df5870a465 + - pypi: git+https://github.com/RoboStack/vinca.git@4f0e3abbe16e52304eb6cde6b5ab72882fc80486 osx-64: - conda: https://repo.prefix.dev/conda-forge/noarch/anaconda-client-1.12.3-pyhd8ed1ab_1.conda - conda: https://repo.prefix.dev/conda-forge/noarch/attrs-24.3.0-pyh71513ae_0.conda @@ -242,7 +242,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/1c/e2/772f8cff8172a612823755035073b00753613c24af0ed6d3bae215021608/rospkg-1.5.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/35/79/5e2cffa1c77432f11cd93a5351f30732c997a239d3a3090856a72d6d8ba7/ruamel.yaml-0.17.40-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/20/84/80203abff8ea4993a87d823a5f632e4d92831ef75d404c9fc78d0176d2b5/ruamel.yaml.clib-0.2.12.tar.gz - - pypi: git+https://github.com/RoboStack/vinca.git@ed00d8107489a820642f6cda578b09df5870a465 + - pypi: git+https://github.com/RoboStack/vinca.git@4f0e3abbe16e52304eb6cde6b5ab72882fc80486 osx-arm64: - conda: https://repo.prefix.dev/conda-forge/noarch/anaconda-client-1.12.3-pyhd8ed1ab_1.conda - conda: https://repo.prefix.dev/conda-forge/noarch/attrs-24.3.0-pyh71513ae_0.conda @@ -314,7 +314,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/1c/e2/772f8cff8172a612823755035073b00753613c24af0ed6d3bae215021608/rospkg-1.5.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/35/79/5e2cffa1c77432f11cd93a5351f30732c997a239d3a3090856a72d6d8ba7/ruamel.yaml-0.17.40-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/fb/8f/683c6ad562f558cbc4f7c029abcd9599148c51c54b5ef0f24f2638da9fbb/ruamel.yaml.clib-0.2.12-cp311-cp311-macosx_13_0_arm64.whl - - pypi: git+https://github.com/RoboStack/vinca.git@ed00d8107489a820642f6cda578b09df5870a465 + - pypi: git+https://github.com/RoboStack/vinca.git@4f0e3abbe16e52304eb6cde6b5ab72882fc80486 win-64: - conda: https://repo.prefix.dev/conda-forge/noarch/anaconda-client-1.12.3-pyhd8ed1ab_1.conda - conda: https://repo.prefix.dev/conda-forge/noarch/attrs-24.3.0-pyh71513ae_0.conda @@ -394,7 +394,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/1c/e2/772f8cff8172a612823755035073b00753613c24af0ed6d3bae215021608/rospkg-1.5.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/35/79/5e2cffa1c77432f11cd93a5351f30732c997a239d3a3090856a72d6d8ba7/ruamel.yaml-0.17.40-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/b4/4f/b52f634c9548a9291a70dfce26ca7ebce388235c93588a1068028ea23fcc/ruamel.yaml.clib-0.2.12-cp311-cp311-win_amd64.whl - - pypi: git+https://github.com/RoboStack/vinca.git@ed00d8107489a820642f6cda578b09df5870a465 + - pypi: git+https://github.com/RoboStack/vinca.git@4f0e3abbe16e52304eb6cde6b5ab72882fc80486 default: channels: - url: https://repo.prefix.dev/conda-forge/ @@ -2803,7 +2803,7 @@ packages: purls: [] size: 754247 timestamp: 1731710681163 -- pypi: git+https://github.com/RoboStack/vinca.git@ed00d8107489a820642f6cda578b09df5870a465 +- pypi: git+https://github.com/RoboStack/vinca.git@4f0e3abbe16e52304eb6cde6b5ab72882fc80486 name: vinca version: 0.0.2 requires_dist: diff --git a/pixi.toml b/pixi.toml index 22fa50658..cec472f74 100644 --- a/pixi.toml +++ b/pixi.toml @@ -27,7 +27,7 @@ git = "*" [feature.beta.pypi-dependencies] # This is tipically the latest commit on rattler-build-humble branch -vinca = { git ="https://github.com/RoboStack/vinca.git", rev = "ed00d8107489a820642f6cda578b09df5870a465" } +vinca = { git ="https://github.com/RoboStack/vinca.git", rev = "4f0e3abbe16e52304eb6cde6b5ab72882fc80486" } # Uncomment this line to work with a local vinca for faster iteration, but remember to comment it back # (and regenerate the pixi.lock) once you push the modified commit to the repo #vinca = { path = "../vinca", editable = true }