From: Ryan Pavlik <ryan.pavlik@collabora.com>
Date: Tue, 19 Jan 2021 19:56:52 +0000 (-0600)
Subject: Drop patch 20_use_system_flatbuffers: Upstream dep removed.
X-Git-Tag: archive/raspbian/3.1+ds1-4+rpi1^2~102
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9399fc2fbfb07441a5bca60167bc37f664d4ece4;p=solvespace.git

Drop patch 20_use_system_flatbuffers: Upstream dep removed.
---

diff --git a/debian/patches/20_use_system_flatbuffers.patch b/debian/patches/20_use_system_flatbuffers.patch
deleted file mode 100644
index b0b4329..0000000
--- a/debian/patches/20_use_system_flatbuffers.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Description: Use system flatbuffers
-Author: Anton Gladky <gladk@debian.org>
-Last-Update: 2021-01-12
-
-Index: solvespace/CMakeLists.txt
-===================================================================
---- solvespace.orig/CMakeLists.txt
-+++ solvespace/CMakeLists.txt
-@@ -181,13 +181,6 @@ endif()
- message(STATUS "Using in-tree libdxfrw")
- add_subdirectory(extlib/libdxfrw)
- 
--message(STATUS "Using in-tree flatbuffers")
--set(FLATBUFFERS_BUILD_FLATLIB ON CACHE BOOL "")
--set(FLATBUFFERS_BUILD_FLATC ON CACHE BOOL "")
--set(FLATBUFFERS_BUILD_FLATHASH OFF CACHE BOOL "")
--set(FLATBUFFERS_BUILD_TESTS OFF CACHE BOOL "")
--add_subdirectory(extlib/flatbuffers EXCLUDE_FROM_ALL)
--
- message(STATUS "Using in-tree q3d")
- add_subdirectory(extlib/q3d)
- set(Q3D_INCLUDE_DIR ${CMAKE_BINARY_DIR}/extlib/q3d)
-Index: solvespace/extlib/q3d/CMakeLists.txt
-===================================================================
---- solvespace.orig/extlib/q3d/CMakeLists.txt
-+++ solvespace/extlib/q3d/CMakeLists.txt
-@@ -6,18 +6,8 @@ set(Q3D_HEADER_DIR ${CMAKE_CURRENT_BINAR
- set(Q3D_SCHEMA ${CMAKE_CURRENT_SOURCE_DIR}/q3d_object.fbs)
- set(Q3D_HEADER ${Q3D_HEADER_DIR}/q3d_object_generated.h)
- 
--if(NOT FLATC)
--    # If not specified explicitly, use flatc from an adjacent flatbuffers
--    # CMake project.
-     add_custom_command(
-         OUTPUT ${Q3D_HEADER}
--        COMMAND $<TARGET_FILE:flatc> --cpp --no-includes -o ${Q3D_HEADER_DIR}
--                ${Q3D_SCHEMA}
--        DEPENDS flatc)
--else()
--    add_custom_command(
--        OUTPUT ${Q3D_HEADER}
--        COMMAND ${FLATC} --cpp --no-includes -o ${Q3D_HEADER_DIR} ${Q3D_SCHEMA})
--endif()
-+        COMMAND flatc --cpp --no-includes -o ${Q3D_HEADER_DIR} ${Q3D_SCHEMA})
- 
- add_custom_target(q3d_header DEPENDS ${Q3D_HEADER})
diff --git a/debian/patches/series b/debian/patches/series
index f2c1edd..1f20572 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 01_RemoveGitHash.patch
-20_use_system_flatbuffers.patch