[neon/backports-jammy/fcitx5-mcbopomofo/Neon/release] debian/patches: drop no longer required patch

Carlos De Maine null at kde.org
Sat Feb 24 07:17:14 GMT 2024


Git commit 1dd908d09ace14df40a04e1b49a5ab51e0fdc679 by Carlos De Maine.
Committed on 24/02/2024 at 07:17.
Pushed by carlosdem into branch 'Neon/release'.

drop no longer required patch

D  +0    -46   debian/patches/0001-Use-local-googletest.patch
D  +0    -1    debian/patches/series

https://invent.kde.org/neon/backports-jammy/fcitx5-mcbopomofo/-/commit/1dd908d09ace14df40a04e1b49a5ab51e0fdc679

diff --git a/debian/patches/0001-Use-local-googletest.patch b/debian/patches/0001-Use-local-googletest.patch
deleted file mode 100644
index 5fba4cd..0000000
--- a/debian/patches/0001-Use-local-googletest.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From: =?utf-8?b?IkNoYW5nWmh1byBDaGVuICjpmbPmmIzlgKwpIg==?=
- <czchen at debian.org>
-Date: Tue, 29 Mar 2022 00:02:40 +0800
-Subject: Use local googletest
-Forwarded: no-needed
-
----
- src/CMakeLists.txt | 19 ++++++-------------
- 1 file changed, 6 insertions(+), 13 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index daac3ec..3df0df7 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -46,25 +46,18 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/mcbopomofo-addon.conf" RENAME mcbopom
- configure_file(mcbopomofo.conf.in mcbopomofo.conf)
- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/mcbopomofo.conf" DESTINATION "${FCITX_INSTALL_PKGDATADIR}/inputmethod")
- 
--# Let CMake fetch Google Test for us.
--# https://github.com/google/googletest/tree/main/googletest#incorporating-into-an-existing-cmake-project
--include(FetchContent)
--
--FetchContent_Declare(
--        googletest
--        # Specify the commit you depend on and update it regularly.
--        URL https://github.com/google/googletest/archive/609281088cfefc76f9d0ce82e1ff6c30cc3591e5.zip
-+include(ExternalProject)
-+ExternalProject_Add(googletest
-+    SOURCE_DIR /usr/src/googletest
-+    INSTALL_COMMAND ""
- )
--# For Windows: Prevent overriding the parent project's compiler/linker settings
--set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
--FetchContent_MakeAvailable(googletest)
--
-+find_package(Threads REQUIRED)
- include(GoogleTest)
- 
- # Test target declarations.
- add_executable(McBopomofoTest
-         KeyHandlerTest.cpp)
--target_link_libraries(McBopomofoTest PRIVATE Fcitx5::Core gtest_main McBopomofoLib)
-+target_link_libraries(McBopomofoTest PRIVATE Fcitx5::Core gtest gtest_main McBopomofoLib ${CMAKE_THREAD_LIBS_INIT})
- target_include_directories(McBopomofoTest PRIVATE Fcitx5::Core GoogleTest)
- 
- gtest_discover_tests(McBopomofoTest)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index efd5f0b..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Use-local-googletest.patch


More information about the Neon-commits mailing list