From 4591f64be84c04dda93f13ba858020f345a00b4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steven!=20Ragnar=C3=B6k?= Date: Thu, 20 Jan 2022 13:38:52 -0500 Subject: [PATCH] Update wxwidgets key. (#31699) * Update wxwidgets key. Since all supported Debian and Ubuntu distributions now provide this key the distribution version/codename can be elided. * Use the correct elided package name. * Continue using gtk2 backend on older platforms. It was pointed out in review that while all current Debian and Ubuntu platforms provide this package with the gtk3 backend, changing it while these platforms are still active is an unecessary disruption so rather than fully eliding version we'll use the gtk3 backended package for distributions except those that are currently supported or recently unsupported. --- rosdep/base.yaml | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/rosdep/base.yaml b/rosdep/base.yaml index 93fb256eed528..30cda10c96aea 100644 --- a/rosdep/base.yaml +++ b/rosdep/base.yaml @@ -7838,10 +7838,8 @@ wx-common: wxwidgets: arch: [wxgtk] debian: + '*': [libwxgtk3.0-gtk3-dev] buster: [libwxgtk3.0-dev] - jessie: [libwxgtk3.0-dev] - stretch: [libwxgtk3.0-dev] - wheezy: [libwxgtk2.8-dev] fedora: [wxGTK3-devel] freebsd: [wxgtk2] gentoo: [x11-libs/wxGTK] @@ -7853,24 +7851,9 @@ wxwidgets: '*': [wxGTK3-devel] '7': [wxGTK-devel] ubuntu: - artful: [libwxgtk3.0-dev] + '*': [libwxgtk3.0-gtk3-dev] bionic: [libwxgtk3.0-dev] - focal: [libwxgtk3.0-gtk3-dev] - lucid: [libwxgtk2.8-dev] - maverick: [libwxgtk2.8-dev] - natty: [libwxgtk2.8-dev] - oneiric: [libwxgtk2.8-dev] - precise: [libwxgtk2.8-dev] - quantal: [libwxgtk2.8-dev] - raring: [libwxgtk2.8-dev] - saucy: [libwxgtk2.8-dev] - trusty: [libwxgtk2.8-dev] - utopic: [libwxgtk2.8-dev] - vivid: [libwxgtk2.8-dev] - wily: [libwxgtk2.8-dev] xenial: [libwxgtk3.0-dev] - yakkety: [libwxgtk3.0-dev] - zesty: [libwxgtk3.0-dev] x11proto-dri2-dev: arch: [dri2proto] debian: [x11proto-dri2-dev]