From 77a5b1824f9d36fc623df045a2a235252d9ad014 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 16 Nov 2022 09:15:45 +0100 Subject: [PATCH] Remove the swig patches (applied upstream) --- debian/changelog | 1 + debian/patches/lldb/lldb-swig-2.diff | 13 ------------- debian/patches/lldb/lldb-swig.diff | 26 -------------------------- debian/patches/series | 2 -- 4 files changed, 1 insertion(+), 41 deletions(-) delete mode 100644 debian/patches/lldb/lldb-swig-2.diff delete mode 100644 debian/patches/lldb/lldb-swig.diff diff --git a/debian/changelog b/debian/changelog index 3cea9331..91e4b77c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ llvm-toolchain-15 (1:15.0.5-1) unstable; urgency=medium * New upstream release + * Remove the swig patches (applied upstream) -- Sylvestre Ledru Wed, 16 Nov 2022 09:11:01 +0100 diff --git a/debian/patches/lldb/lldb-swig-2.diff b/debian/patches/lldb/lldb-swig-2.diff deleted file mode 100644 index 54763838..00000000 --- a/debian/patches/lldb/lldb-swig-2.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lldb/bindings/python/python-typemaps.swig b/lldb/bindings/python/python-typemaps.swig -index 203be803d2ebd..11f68d59ae7be 100644 ---- a/lldb/bindings/python/python-typemaps.swig -+++ b/lldb/bindings/python/python-typemaps.swig -@@ -435,7 +435,7 @@ template <> bool SetNumberFromPyObject(double &number, PyObject *obj) { - - %typemap(out) lldb::FileSP { - $result = nullptr; -- lldb::FileSP &sp = $1; -+ const lldb::FileSP &sp = $1; - if (sp) { - PythonFile pyfile = unwrapOrSetPythonException(PythonFile::FromFile(*sp)); - if (!pyfile.IsValid()) diff --git a/debian/patches/lldb/lldb-swig.diff b/debian/patches/lldb/lldb-swig.diff deleted file mode 100644 index 93b54528..00000000 --- a/debian/patches/lldb/lldb-swig.diff +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/lldb/bindings/CMakeLists.txt b/lldb/bindings/CMakeLists.txt -index c8aa0bcf96817..9eed2f1e62999 100644 ---- a/lldb/bindings/CMakeLists.txt -+++ b/lldb/bindings/CMakeLists.txt -@@ -26,8 +26,6 @@ set(SWIG_COMMON_FLAGS - -features autodoc - -I${LLDB_SOURCE_DIR}/include - -I${CMAKE_CURRENT_SOURCE_DIR} -- -D__STDC_LIMIT_MACROS -- -D__STDC_CONSTANT_MACROS - ${DARWIN_EXTRAS} - ) - -diff --git a/lldb/bindings/interfaces.swig b/lldb/bindings/interfaces.swig -index fb75513a0df1b..d984711bbd8a2 100644 ---- a/lldb/bindings/interfaces.swig -+++ b/lldb/bindings/interfaces.swig -@@ -1,8 +1,5 @@ - /* Various liblldb typedefs that SWIG needs to know about. */ - #define __extension__ /* Undefine GCC keyword to make Swig happy when processing glibc's stdint.h. */ --/* The ISO C99 standard specifies that in C++ implementations limit macros such -- as INT32_MAX should only be defined if __STDC_LIMIT_MACROS is. */ --#define __STDC_LIMIT_MACROS - %include "stdint.i" - - %include "lldb/lldb-defines.h" diff --git a/debian/patches/series b/debian/patches/series index adeb9c2d..40f3ebec 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -152,6 +152,4 @@ bolt.patch bolt-disable-emit-relocs.patch D124841-fix-powerpc-miscompile.patch mips/mips-assert-size.diff -lldb/lldb-swig.diff -lldb/lldb-swig-2.diff protobuf_3.21.patch