From a375237f3e66f91ee849b6e11a525864bb94d441 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 31 May 2022 08:34:12 +0200 Subject: [PATCH] Revert "Add patch for Ubuntu kinetic" already upstream This reverts commit 68ef3745a7775d35d99e51131d3ae825182339a3. --- debian/patches/series | 1 - debian/patches/ubuntu-kinetic.patch | 38 ----------------------------- 2 files changed, 39 deletions(-) delete mode 100644 debian/patches/ubuntu-kinetic.patch diff --git a/debian/patches/series b/debian/patches/series index 30ff3a74..588aa424 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -150,4 +150,3 @@ python3-scan-build.py issue-54242.diff revert-update-doc.diff unwind-force-pthread-dl.diff -ubuntu-kinetic.patch diff --git a/debian/patches/ubuntu-kinetic.patch b/debian/patches/ubuntu-kinetic.patch deleted file mode 100644 index ca71aab1..00000000 --- a/debian/patches/ubuntu-kinetic.patch +++ /dev/null @@ -1,38 +0,0 @@ -Description: Update the list of Ubuntu release names -Author: Steve Langasek -Last-Update: 2022-05-03 -Forwarded: no - -Index: llvm-toolchain-14-14.0.0/clang/include/clang/Driver/Distro.h -=================================================================== ---- llvm-toolchain-14-14.0.0.orig/clang/include/clang/Driver/Distro.h -+++ llvm-toolchain-14-14.0.0/clang/include/clang/Driver/Distro.h -@@ -74,6 +74,7 @@ - UbuntuHirsute, - UbuntuImpish, - UbuntuJammy, -+ UbuntuKinetic, - UnknownDistro - }; - -@@ -125,7 +126,7 @@ - } - - bool IsUbuntu() const { -- return DistroVal >= UbuntuHardy && DistroVal <= UbuntuJammy; -+ return DistroVal >= UbuntuHardy && DistroVal <= UbuntuKinetic; - } - - bool IsAlpineLinux() const { return DistroVal == AlpineLinux; } -Index: llvm-toolchain-14-14.0.0/clang/lib/Driver/Distro.cpp -=================================================================== ---- llvm-toolchain-14-14.0.0.orig/clang/lib/Driver/Distro.cpp -+++ llvm-toolchain-14-14.0.0/clang/lib/Driver/Distro.cpp -@@ -91,6 +91,7 @@ - .Case("hirsute", Distro::UbuntuHirsute) - .Case("impish", Distro::UbuntuImpish) - .Case("jammy", Distro::UbuntuJammy) -+ .Case("kinetic", Distro::UbuntuKinetic) - .Default(Distro::UnknownDistro); - return Version; - }