[arch-commits] Commit in opencc/trunk (PKGBUILD fix-system-pybind11.patch)

[Felix Yan]

    Date: Friday, March 18, 2022 @ 20:02:48
  Author: felixonmars
Revision: 1159026

upgpkg: opencc 1.1.3-1

Modified:
  opencc/trunk/PKGBUILD
Deleted:
  opencc/trunk/fix-system-pybind11.patch

---------------------------+
 PKGBUILD                  |   21 ++++++++++++---------
 fix-system-pybind11.patch |   15 ---------------
 2 files changed, 12 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-03-18 20:02:33 UTC (rev 1159025)
+++ PKGBUILD	2022-03-18 20:02:48 UTC (rev 1159026)
@@ -2,23 +2,20 @@
 
 pkgbase=opencc
 pkgname=(opencc opencc-doc)
-pkgver=1.1.2
-pkgrel=3
+pkgver=1.1.3
+pkgrel=1
 pkgdesc="Library for Open Chinese Convert"
 url="https://github.com/BYVoid/OpenCC"
 arch=('x86_64')
 license=('Apache')
 makedepends=('chrpath' 'cmake' 'darts' 'doxygen' 'marisa' 'pybind11' 'python-setuptools'
-             'python-wheel' 'rapidjson' 'tclap')
-source=("https://github.com/BYVoid/OpenCC/archive/ver.$pkgver/$pkgbase-$pkgver.tar.gz"
-        fix-system-pybind11.patch)
-sha512sums=('56c84bc472b39eb0b23bac6df5aada2c2ed5fd2fbe653c1ae89d392ec0b74741a15de93c748883ec3c0779396e790a1197f6e3b267b524f111459d45daeb5d4b'
-            'e54bdc865505cacc79e05265ad82e05f35b246c62c68261e68aa51a862020848d39f6d6579abf56ed26edc6a0f5f21d39217ff80690047931037c55c4a59f594')
+             'python-wheel' 'rapidjson' 'tclap' 'gtest')
+source=("https://github.com/BYVoid/OpenCC/archive/ver.$pkgver/$pkgbase-$pkgver.tar.gz")
+sha512sums=('90da656fa4790c58932ad2240a076cc4a9e8cf70ac73d83e0d299e84472deb6491a823966a7686ed1487ef8405909981b9a12b661d8de7f086bd4b498594abac')
 
 prepare() {
   cd OpenCC-ver.$pkgver
   rm -r deps
-  patch -p1 -i ../fix-system-pybind11.patch
 }
 
 build() {
@@ -25,7 +22,8 @@
   cd OpenCC-ver.$pkgver
   cmake -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_DOCUMENTATION:BOOL=ON -DBUILD_PYTHON:BOOL=ON \
         -DUSE_SYSTEM_MARISA:BOOL=ON -DUSE_SYSTEM_PYBIND11:BOOL=ON -DUSE_SYSTEM_RAPIDJSON:BOOL=ON \
-        -DUSE_SYSTEM_TCLAP:BOOL=ON -DUSE_SYSTEM_DARTS:BOOL=ON
+        -DUSE_SYSTEM_TCLAP:BOOL=ON -DUSE_SYSTEM_DARTS:BOOL=ON -DENABLE_GTEST:BOOL=ON \
+        -DUSE_SYSTEM_GTEST:BOOL=ON
   make
 
   mkdir python/opencc/clib
@@ -34,6 +32,11 @@
   python setup.py build
 }
 
+check() {
+  cd OpenCC-ver.$pkgver
+  make test
+}
+
 package_opencc() {
   pkgdesc="Library for Open Chinese Convert"
   depends=('marisa')

Deleted: fix-system-pybind11.patch
===================================================================
--- fix-system-pybind11.patch	2022-03-18 20:02:33 UTC (rev 1159025)
+++ fix-system-pybind11.patch	2022-03-18 20:02:48 UTC (rev 1159026)
@@ -1,15 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d4b6530..cfc02c7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -219,9 +219,7 @@ endif()
- 
- if (BUILD_PYTHON)
-   if(USE_SYSTEM_PYBIND11)
--    include(pybind11Config)
--    include(pybind11Common)
--    include(pybind11Tools)
-+    find_package(pybind11 CONFIG)
-   else()
-     add_subdirectory(deps/pybind11-2.5.0)
-   endif()