[packages/opencc] - updated to 1.1.9

qboosh qboosh at pld-linux.org
Sat Sep 28 21:38:47 CEST 2024


commit 26b027e490415b51e363bba4af2c6e4b0d1bdbea
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Sep 28 21:41:55 2024 +0200

    - updated to 1.1.9

 opencc-paths.patch | 28 ----------------------------
 opencc.spec        | 14 ++++++++------
 2 files changed, 8 insertions(+), 34 deletions(-)
---
diff --git a/opencc.spec b/opencc.spec
index d647c5c..04a0c6e 100644
--- a/opencc.spec
+++ b/opencc.spec
@@ -1,3 +1,4 @@
+# TODO: darts (-DENABLE_DARTS, -DUSE_SYSTEM_DARTS)
 #
 # Conditional build:
 %bcond_without	static_libs	# static library
@@ -6,20 +7,20 @@
 Summary:	Open Chinese Convert library
 Summary(pl.UTF-8):	Biblioteka Open Chinese Convert do konwersji między wariantami języka chińskiego
 Name:		opencc
-Version:	1.1.7
+Version:	1.1.9
 Release:	1
 License:	Apache v2.0
 Group:		Libraries
 #Source0Download: https://github.com/BYVoid/OpenCC/releases
 Source0:	https://github.com/BYVoid/OpenCC/archive/ver.%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	f1f1f71722ae9e107a2ec4fc29c69619
-Patch0:		%{name}-paths.patch
+# Source0-md5:	925baef9aac4bcf609f09d09c92f19e6
 URL:		https://github.com/BYVoid/OpenCC
 BuildRequires:	cmake >= 3.5
 BuildRequires:	libstdc++-devel >= 6:5
 BuildRequires:	marisa-devel >= 0.2.6
 BuildRequires:	rapidjson-devel >= 1.1.0
 BuildRequires:	rpmbuild(macros) >= 1.605
+BuildRequires:	tclap
 %if %{with python}
 BuildRequires:	python3-devel >= 1:3.2
 BuildRequires:	python3-pybind11 >= 2.10.0
@@ -66,7 +67,6 @@ Statyczna biblioteka OpenCC.
 
 %prep
 %setup -q -n OpenCC-ver.%{version}
-%patch0 -p1
 
 %build
 %if %{with static_libs}
@@ -75,7 +75,8 @@ cd build-static
 %cmake .. \
 	-DBUILD_SHARED_LIBS=OFF \
 	-DUSE_SYSTEM_MARISA=ON \
-	-DUSE_SYSTEM_RAPIDJSON=ON
+	-DUSE_SYSTEM_RAPIDJSON=ON \
+	-DUSE_SYSTEM_TCLAP=ON
 
 %{__make} -j1
 cd ..
@@ -87,7 +88,8 @@ cd build
 	%{?with_python:-DBUILD_PYTHON=ON} \
 	-DUSE_SYSTEM_MARISA=ON \
 	-DUSE_SYSTEM_PYBIND11=ON \
-	-DUSE_SYSTEM_RAPIDJSON=ON
+	-DUSE_SYSTEM_RAPIDJSON=ON \
+	-DUSE_SYSTEM_TCLAP=ON
 
 %{__make} -j1
 
diff --git a/opencc-paths.patch b/opencc-paths.patch
deleted file mode 100644
index 892177f..0000000
--- a/opencc-paths.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- OpenCC-ver.1.0.6/CMakeLists.txt.orig	2020-04-12 17:22:50.000000000 +0200
-+++ OpenCC-ver.1.0.6/CMakeLists.txt	2020-04-26 16:57:35.484655518 +0200
-@@ -65,10 +65,10 @@
- ######## Directory
- 
- set (DIR_PREFIX ${CMAKE_INSTALL_PREFIX})
--set (DIR_INCLUDE ${DIR_PREFIX}/include/)
--set (DIR_SHARE ${DIR_PREFIX}/share/)
--set (DIR_ETC ${DIR_PREFIX}/etc/)
--set (DIR_LIBRARY ${DIR_PREFIX}/lib${LIB_SUFFIX}/)
-+set (DIR_INCLUDE ${DIR_PREFIX}/include)
-+set (DIR_SHARE ${DIR_PREFIX}/share)
-+set (DIR_ETC ${DIR_PREFIX}/etc)
-+set (DIR_LIBRARY ${DIR_PREFIX}/lib${LIB_SUFFIX})
- 
- if (DEFINED SHARE_INSTALL_PREFIX)
-   set (DIR_SHARE ${SHARE_INSTALL_PREFIX})
-@@ -86,8 +86,8 @@
-   set (DIR_LIBRARY ${LIB_INSTALL_DIR})
- endif (DEFINED LIB_INSTALL_DIR)
- 
--set (DIR_SHARE_OPENCC ${DIR_SHARE}/opencc/)
--set (DIR_SHARE_LOCALE ${DIR_SHARE}/locale/)
-+set (DIR_SHARE_OPENCC ${DIR_SHARE}/opencc)
-+set (DIR_SHARE_LOCALE ${DIR_SHARE}/locale)
- 
- ######## Configuration
- 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/opencc.git/commitdiff/26b027e490415b51e363bba4af2c6e4b0d1bdbea



More information about the pld-cvs-commit mailing list