#2 Update to 1.1.7
Merged 2 months ago by pwu. Opened 2 months ago by pwu.
rpms/ pwu/opencc fix-compile  into  rawhide

file modified
+1
@@ -9,3 +9,4 @@ 

  /OpenCC-ver.1.1.1.tar.gz

  /OpenCC-ver.1.1.2.tar.gz

  /OpenCC-ver.1.1.4.tar.gz

+ /OpenCC-ver.1.1.7.tar.gz

@@ -1,26 +0,0 @@ 

- Index: OpenCC-ver.1.0.5/CMakeLists.txt

- ===================================================================

- --- OpenCC-ver.1.0.5.orig/CMakeLists.txt

- +++ OpenCC-ver.1.0.5/CMakeLists.txt

- @@ -68,7 +68,7 @@ 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_LIBRARY ${LIB_INSTALL_DIR})

-  

-  if (DEFINED SHARE_INSTALL_PREFIX)

-    set (DIR_SHARE ${SHARE_INSTALL_PREFIX})

- Index: OpenCC-ver.1.0.5/data/CMakeLists.txt

- ===================================================================

- --- OpenCC-ver.1.0.5.orig/data/CMakeLists.txt

- +++ OpenCC-ver.1.0.5/data/CMakeLists.txt

- @@ -1,6 +1,6 @@

-  set(OPENCC_DICT_BIN opencc_dict)

- -set(DICT_MERGE_BIN python ${CMAKE_CURRENT_SOURCE_DIR}/scripts/merge.py)

- -set(DICT_REVERSE_BIN python ${CMAKE_CURRENT_SOURCE_DIR}/scripts/reverse.py)

- +set(DICT_MERGE_BIN python3 ${CMAKE_CURRENT_SOURCE_DIR}/scripts/merge.py)

- +set(DICT_REVERSE_BIN python3 ${CMAKE_CURRENT_SOURCE_DIR}/scripts/reverse.py)

-  set(DICT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/dictionary)

-  set(DICT_GENERATED_DIR ${CMAKE_CURRENT_BINARY_DIR})

-  

@@ -0,0 +1,13 @@ 

+ Index: OpenCC-ver.1.1.7/src/Segments.hpp

+ ===================================================================

+ --- OpenCC-ver.1.1.7.orig/src/Segments.hpp

+ +++ OpenCC-ver.1.1.7/src/Segments.hpp

+ @@ -32,7 +32,7 @@ public:

+    Segments() {}

+  

+    Segments(std::initializer_list<const char*> initList) {

+ -    for (const std::string& item : initList) {

+ +    for (const std::string item : initList) {

+        AddSegment(item);

+      }

+    }

file modified
+12 -3
@@ -1,16 +1,19 @@ 

  Name:       opencc

- Version:    1.1.4

- Release:    6%{?dist}

+ Version:    1.1.7

+ Release:    1%{?dist}

  Summary:    Libraries for Simplified-Traditional Chinese Conversion

  License:    Apache-2.0

  URL:        https://github.com/BYVoid/OpenCC

  Source0:    https://github.com/BYVoid/OpenCC/archive/ver.%{version}.tar.gz#/OpenCC-ver.%{version}.tar.gz

+ Patch0:     opencc-fixes-std-initializer-list.patch

  

  BuildRequires:  gcc-c++

  BuildRequires:  gettext

  BuildRequires:  cmake

  BuildRequires:  doxygen

  BuildRequires:  python3

+ BuildRequires:  marisa-devel

+ BuildRequires:  rapidjson-devel

  

  %description

  OpenCC is a library for converting characters and phrases between
@@ -44,9 +47,10 @@ 

  

  %prep

  %setup -q -n OpenCC-ver.%{version}

+ %patch -P0 -p1 -b .compile

  

  %build

- %cmake -DENABLE_GETTEXT:BOOL=ON -DBUILD_DOCUMENTATION:BOOL=ON

+ %cmake -DENABLE_GETTEXT:BOOL=ON -DBUILD_DOCUMENTATION:BOOL=ON -DUSE_SYSTEM_MARISA:BOOL=ON -DUSE_SYSTEM_RAPIDJSON:BOOL=ON

  %cmake_build

  

  %install
@@ -73,8 +77,13 @@ 

  %{_includedir}/*

  %{_libdir}/*.so

  %{_libdir}/pkgconfig/*.pc

+ %{_libdir}/cmake/opencc/OpenCC*.cmake

  

  %changelog

+ * Fri Feb  2 2024 Peng Wu <pwu@redhat.com> - 1.1.7-1

+ - Update to 1.1.7

+ - Resolves: RHBZ#2261417

+ 

  * Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.4-6

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

  

file modified
+1 -1
@@ -1,1 +1,1 @@ 

- SHA512 (OpenCC-ver.1.1.4.tar.gz) = ab8e7e6a0cc71106cf09eb32899fa8620b946a406f042d75a2444096e0b383cb1993d6c2d12cd7862e71854da4cd5893442bce51df84c32ed09fdfb4a2846f46

+ SHA512 (OpenCC-ver.1.1.7.tar.gz) = 26e4b12238f853b0fa91f9f0d9af7985bf04a0763185cc3b50b69ba99a2d80091b8c3160176d0d4cd348fbf1a680bfd80dc740dc60c938a256dc2dac8ef49f15