From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C637C1382C5 for ; Fri, 26 Mar 2021 14:38:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A8D5DE0877; Fri, 26 Mar 2021 14:38:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7ECD9E0877 for ; Fri, 26 Mar 2021 14:38:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E679E340E10 for ; Fri, 26 Mar 2021 14:38:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7DAAC63B for ; Fri, 26 Mar 2021 14:38:16 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1616769482.fce43d5dafe5d67d79a3ed4b5f2bf0b87b4018f0.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/opencc/, app-i18n/opencc/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-i18n/opencc/files/opencc-1.1.2-system_libraries.patch app-i18n/opencc/opencc-9999.ebuild X-VCS-Directories: app-i18n/opencc/files/ app-i18n/opencc/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: fce43d5dafe5d67d79a3ed4b5f2bf0b87b4018f0 X-VCS-Branch: master Date: Fri, 26 Mar 2021 14:38:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 81783431-c910-4ba4-8286-12952bf5ea42 X-Archives-Hash: 94b98589d8d3816438249e37969da09d commit: fce43d5dafe5d67d79a3ed4b5f2bf0b87b4018f0 Author: Arfrever Frehtes Taifersar Arahesis Apache Org> AuthorDate: Fri Mar 26 00:00:00 2021 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Fri Mar 26 14:38:02 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fce43d5d app-i18n/opencc: Stop using no longer needed patch. https://github.com/BYVoid/OpenCC/commit/6cdd438556c176d9f13f092796663e8745bc76e7 Signed-off-by: Arfrever Frehtes Taifersar Arahesis Apache.Org> Signed-off-by: Mike Gilbert gentoo.org> .../files/opencc-1.1.2-system_libraries.patch | 111 --------------------- app-i18n/opencc/opencc-9999.ebuild | 3 +- 2 files changed, 1 insertion(+), 113 deletions(-) diff --git a/app-i18n/opencc/files/opencc-1.1.2-system_libraries.patch b/app-i18n/opencc/files/opencc-1.1.2-system_libraries.patch deleted file mode 100644 index e0b624a63e9..00000000000 --- a/app-i18n/opencc/files/opencc-1.1.2-system_libraries.patch +++ /dev/null @@ -1,111 +0,0 @@ -https://github.com/BYVoid/OpenCC/issues/547 - ---- /CMakeLists.txt -+++ /CMakeLists.txt -@@ -28,8 +28,14 @@ - option(ENABLE_GTEST "Build all tests." OFF) - option(ENABLE_BENCHMARK "Build benchmark tests." OFF) - option(ENABLE_DARTS "Build DartsDict (ocd format)." ON) --option(BUILD_BUNDLED_LIBMARISA "" ON) - option(BUILD_PYTHON "Build python library" OFF) -+option(USE_SYSTEM_DARTS "Use system version of Darts" OFF) -+option(USE_SYSTEM_GOOGLE_BENCHMARK "Use system version of Google Benchmark" OFF) -+option(USE_SYSTEM_GTEST "Use system version of GoogleTest" OFF) -+option(USE_SYSTEM_MARISA "Use system version of Marisa" OFF) -+option(USE_SYSTEM_PYBIND11 "Use system version of pybind11" OFF) -+option(USE_SYSTEM_RAPIDJSON "Use system version of RapidJSON" OFF) -+option(USE_SYSTEM_TCLAP "Use system version of TCLAP" OFF) - - ######## Package information - set (PACKAGE_URL https://github.com/BYVoid/Opencc) -@@ -173,7 +179,7 @@ - - ######## Dependencies - --if(BUILD_BUNDLED_LIBMARISA) -+if(NOT USE_SYSTEM_MARISA) - message(STATUS "Use bundled marisa library.") - add_subdirectory(deps/marisa-0.2.5) - else() -@@ -195,20 +201,30 @@ - ######## Testing - - if (ENABLE_GTEST) -- add_subdirectory(deps/gtest-1.11.0) -+ if(NOT USE_SYSTEM_GTEST) -+ add_subdirectory(deps/gtest-1.11.0) -+ endif() - enable_testing() - endif() - - if (ENABLE_BENCHMARK) - set(BENCHMARK_ENABLE_TESTING OFF) -- add_subdirectory(deps/google-benchmark) -+ if(NOT USE_SYSTEM_GOOGLE_BENCHMARK) -+ add_subdirectory(deps/google-benchmark) -+ endif() - enable_testing() - endif() - - ######## Python - - if (BUILD_PYTHON) -- add_subdirectory(deps/pybind11-2.5.0) -+ if(USE_SYSTEM_PYBIND11) -+ include(pybind11Config) -+ include(pybind11Common) -+ include(pybind11Tools) -+ else() -+ add_subdirectory(deps/pybind11-2.5.0) -+ endif() - pybind11_add_module(opencc_clib src/py_opencc.cpp) - target_link_libraries(opencc_clib PRIVATE libopencc) - endif() ---- /src/CMakeLists.txt -+++ /src/CMakeLists.txt -@@ -1,7 +1,13 @@ - include (GenerateExportHeader) --include_directories(../deps/marisa-0.2.5/include) --include_directories(../deps/rapidjson-1.1.0) --include_directories(../deps/tclap-1.2.2) -+if(NOT USE_SYSTEM_MARISA) -+ include_directories(../deps/marisa-0.2.5/include) -+endif() -+if(NOT USE_SYSTEM_RAPIDJSON) -+ include_directories(../deps/rapidjson-1.1.0) -+endif() -+if(NOT USE_SYSTEM_TCLAP) -+ include_directories(../deps/tclap-1.2.2) -+endif() - - # Library - -@@ -72,7 +78,9 @@ - ) - - if (ENABLE_DARTS) -- include_directories(../deps/darts-clone) -+ if(NOT USE_SYSTEM_DARTS) -+ include_directories(../deps/darts-clone) -+ endif() - set( - LIBOPENCC_HEADERS - ${LIBOPENCC_HEADERS} ---- /test/CMakeLists.txt -+++ /test/CMakeLists.txt -@@ -1,4 +1,3 @@ --include_directories(../deps/libdarts/src) - include_directories(../src) - - set(CONFIG_TEST -@@ -27,7 +26,9 @@ - ) - endif() - -- include_directories(../deps/gtest-1.7.0/include) -+ if(NOT USE_SYSTEM_GTEST) -+ include_directories(../deps/gtest-1.7.0/include) -+ endif() - set(UNITTESTS - CommandLineConvertTest - ) diff --git a/app-i18n/opencc/opencc-9999.ebuild b/app-i18n/opencc/opencc-9999.ebuild index 87734540550..9f39de24e29 100644 --- a/app-i18n/opencc/opencc-9999.ebuild +++ b/app-i18n/opencc/opencc-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2010-2020 Gentoo Authors +# Copyright 2010-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -44,7 +44,6 @@ fi PATCHES=( "${FILESDIR}/${PN}-1.1.0-parallel_build.patch" - "${FILESDIR}/${PN}-1.1.2-system_libraries.patch" ) DOCS=(AUTHORS NEWS.md README.md)