Drop patches.

3 files changed, 0 insertions, 106 deletions

diff --git a/debian/patches/0002-lib-ipc-Introduce-writef_void-void.patch b/debian/patches/0002-lib-ipc-Introduce-writef_void-void.patch
deleted file mode 100644
index ca8db99..0000000
--- a/debian/patches/0002-lib-ipc-Introduce-writef_void-void.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From bd0c671fcc9732c9d1ccf5216f34f4629640b9fb Mon Sep 17 00:00:00 2001
-From: Balint Reczey <balint.reczey@canonical.com>
-Date: Thu, 22 Oct 2020 22:00:18 +0200
-Subject: [PATCH] lib/ipc: Introduce writef_void(void*, ...)
-
-to fix ambiguity with writef(barrier::IStream*, ...)
----
- src/lib/barrier/ProtocolUtil.cpp | 4 ++--
- src/lib/barrier/ProtocolUtil.h   | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/lib/barrier/ProtocolUtil.cpp b/src/lib/barrier/ProtocolUtil.cpp
-index e742687f..21ba38fc 100644
---- a/src/lib/barrier/ProtocolUtil.cpp
-+++ b/src/lib/barrier/ProtocolUtil.cpp
-@@ -80,7 +80,7 @@ ProtocolUtil::vwritef(barrier::IStream* stream,
- 
-     // fill buffer
-     UInt8* buffer = new UInt8[size];
--    writef(buffer, fmt, args);
-+    writef_void(buffer, fmt, args);
- 
-     try {
-         // write buffer
-@@ -339,7 +339,7 @@ ProtocolUtil::getLength(const char* fmt, va_list args)
- }
- 
- void
--ProtocolUtil::writef(void* buffer, const char* fmt, va_list args)
-+ProtocolUtil::writef_void(void* buffer, const char* fmt, va_list args)
- {
-     UInt8* dst = static_cast<UInt8*>(buffer);
- 
-diff --git a/src/lib/barrier/ProtocolUtil.h b/src/lib/barrier/ProtocolUtil.h
-index 9930cfc0..e01a6e60 100644
---- a/src/lib/barrier/ProtocolUtil.h
-+++ b/src/lib/barrier/ProtocolUtil.h
-@@ -79,7 +79,7 @@ private:
-                             const char* fmt, va_list);
- 
-     static UInt32        getLength(const char* fmt, va_list);
--    static void            writef(void*, const char* fmt, va_list);
-+    static void            writef_void(void*, const char* fmt, va_list);
-     static UInt32        eatLength(const char** fmt);
-     static void            read(barrier::IStream*, void*, UInt32);
- };
--- 
-2.25.1
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index fcd4e24..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-use-system-gtest.patch
-0002-lib-ipc-Introduce-writef_void-void.patch
diff --git a/debian/patches/use-system-gtest.patch b/debian/patches/use-system-gtest.patch
deleted file mode 100644
index 23cae0c..0000000
--- a/debian/patches/use-system-gtest.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Description: Update paths to use system gmock and gtest.
-Author: Unit 193 <unit193@debian.org>
-Forwarded: no
-
---- barrier-2.3.3+dfsg.orig/src/test/CMakeLists.txt
-+++ barrier-2.3.3+dfsg/src/test/CMakeLists.txt
-@@ -15,13 +15,14 @@
- # along with this program.  If not, see <http://www.gnu.org/licenses/>.
- 
- include_directories(
--    ../../ext/gtest
--    ../../ext/gtest/include
--    ../../ext/gmock
--    ../../ext/gmock/include)
--    
--add_library(gtest STATIC ../../ext/gtest/src/gtest-all.cc)
--add_library(gmock STATIC ../../ext/gmock/src/gmock-all.cc)
-+    /usr/src/googletest/googletest
-+    /usr/src/googletest/googletest/include
-+    /usr/src/googletest/googlemock
-+    /usr/src/googletest/googlemock/include
-+)
-+
-+add_library(gtest STATIC /usr/src/googletest/googletest/src/gtest-all.cc)
-+add_library(gmock STATIC /usr/src/googletest/googlemock/src/gmock-all.cc)
- 
- if (UNIX)
-     # ignore warnings in gtest and gmock
---- barrier-2.3.3+dfsg.orig/src/test/integtests/CMakeLists.txt
-+++ barrier-2.3.3+dfsg/src/test/integtests/CMakeLists.txt
-@@ -68,8 +68,8 @@ endif()
- 
- include_directories(
-     ../../
--    ../../../ext/gtest/include
--    ../../../ext/gmock/include
-+    /usr/src/googletest/googletest/include
-+    /usr/src/googletest/googlemock/include
- )
- 
- if (UNIX)
---- barrier-2.3.3+dfsg.orig/src/test/unittests/CMakeLists.txt
-+++ barrier-2.3.3+dfsg/src/test/unittests/CMakeLists.txt
-@@ -50,9 +50,8 @@ list(APPEND headers ${platform_sources})
- 
- include_directories(
-     ../../
--    ../../../ext/gtest/include
--    ../../../ext/gmock/include
--    ../../../ext
-+    /usr/src/googletest/googletest/include
-+    /usr/src/googletest/googlemock/include
- )
- 
- if (UNIX)