Skip to content

Upgrade: opencc version to 1.1.7 #13625

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: 3.0-dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions SPECS-EXTENDED/opencc/opencc-fixes-std-initializer-list.patch
Original file line number Diff line number Diff line change
@@ -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);
}
}
3 changes: 2 additions & 1 deletion SPECS-EXTENDED/opencc/opencc.signatures.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"Signatures": {
"OpenCC-ver.1.1.1.tar.gz": "2d4987dc84275f252d47bc6d8c81b452f6a6e82caa26f284c854a8153ccf5933"
"OpenCC-ver.1.1.7.tar.gz": "80a12675094a0cac90e70ee530e936dc76ca0953cb0443f7283c2b558635e4fe"
}
}

60 changes: 50 additions & 10 deletions SPECS-EXTENDED/opencc/opencc.spec
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
Vendor: Microsoft Corporation
Distribution: Azure Linux

Name: opencc
Version: 1.1.1
Version: 1.1.7
Release: 3%{?dist}
Summary: Libraries for Simplified-Traditional Chinese Conversion
License: ASL 2.0
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: parallel-build-fix.patch
Patch0: opencc-fixes-std-initializer-list.patch
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

forgot adding 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
Expand Down Expand Up @@ -46,10 +49,11 @@ developing applications that use %{name}.


%prep
%autosetup -p1 -n OpenCC-ver.%{version}
%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
Expand All @@ -60,8 +64,6 @@ developing applications that use %{name}.

#%find_lang %{name}

%ldconfig_scriptlets

%files
%doc AUTHORS LICENSE README.md
%{_libdir}/lib*.so.*
Expand All @@ -78,11 +80,49 @@ developing applications that use %{name}.
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc
%{_libdir}/cmake/opencc/OpenCC*.cmake

%changelog
* Fri Jul 23 2021 Thomas Crain <thcrain@microsoft.com> - 1.1.1-3
- Initial CBL-Mariner import from Fedora 34 (license: MIT).
- Add patch to fix parallel build issue
* Tue Apr 29 2025 Durga Jagadeesh Palli <v-dpalli@microsoft.com> - 1.1.7-3
- Initial Azure Linux import from Fedora 41 (license: MIT)
- License verified

* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

* 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

* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.4-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

* Thu May 18 2023 Peng Wu <pwu@redhat.com> - 1.1.4-3
- Migrate to SPDX license

* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

* Fri Oct 21 2022 Peng Wu <pwu@redhat.com> - 1.1.4-1
- Update to 1.1.4

* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

* Mon Aug 2 2021 Peng Wu <pwu@redhat.com> - 1.1.2-1
- Update to 1.1.2

* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Expand Down
4 changes: 2 additions & 2 deletions cgmanifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -15323,8 +15323,8 @@
"type": "other",
"other": {
"name": "opencc",
"version": "1.1.1",
"downloadUrl": "https://github.com/BYVoid/OpenCC/archive/ver.1.1.1.tar.gz"
"version": "1.1.7",
"downloadUrl": "https://github.com/BYVoid/OpenCC/archive/ver.1.1.7.tar.gz"
}
}
},
Expand Down
Loading