* [gentoo-commits] repo/gentoo:master commit in: app-i18n/opencc/, app-i18n/opencc/files/
@ 2017-02-03 21:49 Johannes Huber
0 siblings, 0 replies; 7+ messages in thread
From: Johannes Huber @ 2017-02-03 21:49 UTC (permalink / raw
To: gentoo-commits
commit: 998b1baee2f85bb4d376d8e43272e6dca6c2fd21
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 3 21:47:35 2017 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Feb 3 21:49:04 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=998b1bae
app-i18n/opencc: Remove 0.3.0_pre20120819-r1
Package-Manager: Portage-2.3.3, Repoman-2.3.1
app-i18n/opencc/Manifest | 1 -
.../opencc-0.3.0_pre20120819-cmake-libdir.patch | 17 ---------
app-i18n/opencc/opencc-0.3.0_pre20120819-r1.ebuild | 42 ----------------------
3 files changed, 60 deletions(-)
diff --git a/app-i18n/opencc/Manifest b/app-i18n/opencc/Manifest
index 5c0efa6..4179083 100644
--- a/app-i18n/opencc/Manifest
+++ b/app-i18n/opencc/Manifest
@@ -1,3 +1,2 @@
-DIST opencc-0.3.0_pre20120819.tar.xz 363528 SHA256 3ed46594547b86f1326b07c3ea910148b1c58b74c9d21c8d4e11ec30e2254fae SHA512 0ca231b5fd7b314111a76bfaa8e288fc2d43e02dbbb2a7c7e9312c1f1f0aed1a0d3b67b04b0cc3634d1b48b8fe6983e6219db053f3a2114abadec1af00b9f8d5 WHIRLPOOL 268d331479bffefdc6e1f58600422a36a32abb7d4dd873eeb216977daca05f4a4775ca547bb301bc16ea8fc702ef04cfd5d8f88c90d10e224a585575129e67c6
DIST opencc-0.4.3.tar.gz 535151 SHA256 7bdcf9e38ac05a16750d5276494d810db107c8a8b5f8b87e2357ee167a13a587 SHA512 ac31c3c018467cf047e077d399903560feb0f8c214accd1ef45d0b1477d011af8e9bf2dbde4497c133daef61b6508460e9b2b04c0b5f336c2d67fc840a1d07e6 WHIRLPOOL 316857e7720e962c9fde27c04327c0c6b5137ca7290b170cc1ead86dcd0c6f14202ac2386f6e565ad12ebca99c939a511447902054792203edeabed88e149a2e
DIST opencc-1.0.4.tar.gz 1597309 SHA256 0553b7461ebd379d118d45d7f40f8a6e272750115bdbc49267595a05ee3481ac SHA512 682cc621fddb6495f26675863faefe7c9f584d2c60676cee0a3ff2120828a09a5e71671f5537030c2cc874f55b7f22af70d9d376f17b83e30cb04dcd5f6bba8a WHIRLPOOL 964180d27db85df6ffb4310ea6cae7b6c294c163bce68d05a5a21e8e736be6c11b44f8a2a856481b47e14c8c1104d244fc294259cbfa2f3160912743ac933cd6
diff --git a/app-i18n/opencc/files/opencc-0.3.0_pre20120819-cmake-libdir.patch b/app-i18n/opencc/files/opencc-0.3.0_pre20120819-cmake-libdir.patch
deleted file mode 100644
index 76dc433..00000000
--- a/app-i18n/opencc/files/opencc-0.3.0_pre20120819-cmake-libdir.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -70,11 +70,11 @@ set (DIR_SHARE ${DIR_PREFIX}/share)
- set (DIR_BIN ${DIR_PREFIX}/bin)
- set (DIR_ETC ${DIR_PREFIX}/etc)
-
- if (DEFINED CMAKE_INSTALL_LIBDIR)
-- set (DIR_LIBRARY ${CMAKE_INSTALL_LIBDIR})
-- set (DIR_LIBRARY_STATIC ${CMAKE_INSTALL_LIBDIR})
-+ set (DIR_LIBRARY ${DIR_PREFIX}/${CMAKE_INSTALL_LIBDIR})
-+ set (DIR_LIBRARY_STATIC ${DIR_PREFIX}/${CMAKE_INSTALL_LIBDIR})
- endif (DEFINED CMAKE_INSTALL_LIBDIR)
-
- if (DEFINED SHARE_INSTALL_PREFIX)
- set (DIR_SHARE ${SHARE_INSTALL_PREFIX})
- endif (DEFINED SHARE_INSTALL_PREFIX)
diff --git a/app-i18n/opencc/opencc-0.3.0_pre20120819-r1.ebuild b/app-i18n/opencc/opencc-0.3.0_pre20120819-r1.ebuild
deleted file mode 100644
index 1d81dd2..00000000
--- a/app-i18n/opencc/opencc-0.3.0_pre20120819-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit cmake-utils multilib eutils
-
-DESCRIPTION="Libraries for Simplified-Traditional Chinese Conversion"
-HOMEPAGE="https://github.com/BYVoid/OpenCC"
-SRC_URI="http://dev.gentooexperimental.org/~scarabeus/${P}.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 x86"
-IUSE="+nls static-libs"
-
-DEPEND="nls? ( sys-devel/gettext )"
-RDEPEND="nls? ( virtual/libintl )"
-
-DOCS="AUTHORS README"
-
-src_prepare() {
- sed -i \
- -e "s:\${CMAKE_\(SHARED\|STATIC\)_LIBRARY_PREFIX}:\"$(get_libdir)\":" \
- CMakeLists.txt || die
- epatch "${FILESDIR}"/${P}-cmake-libdir.patch
-}
-
-src_configure() {
- local mycmakeargs=(
- "$(cmake-utils_use_enable nls GETTEXT)"
- )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- use static-libs || find "${ED}" -name '*.la' -o -name '*.a' -exec rm {} +
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/opencc/, app-i18n/opencc/files/
@ 2017-08-23 14:25 Akinori Hattori
0 siblings, 0 replies; 7+ messages in thread
From: Akinori Hattori @ 2017-08-23 14:25 UTC (permalink / raw
To: gentoo-commits
commit: c9b20734472173803e155d644ff03d042bc7f52d
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 23 14:16:16 2017 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Wed Aug 23 14:25:33 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9b20734
app-i18n/opencc: tidy
Package-Manager: Portage-2.3.6, Repoman-2.3.1
.../opencc/files/opencc-1.0.4-cmake-libdir.patch | 4 +--
app-i18n/opencc/metadata.xml | 21 +++++++-------
app-i18n/opencc/opencc-1.0.4.ebuild | 16 ++++-------
app-i18n/opencc/opencc-1.0.5.ebuild | 32 ++++++++--------------
app-i18n/opencc/opencc-9999.ebuild | 32 ++++++++--------------
5 files changed, 39 insertions(+), 66 deletions(-)
diff --git a/app-i18n/opencc/files/opencc-1.0.4-cmake-libdir.patch b/app-i18n/opencc/files/opencc-1.0.4-cmake-libdir.patch
index c09f32757ed..dc8859d8e28 100644
--- a/app-i18n/opencc/files/opencc-1.0.4-cmake-libdir.patch
+++ b/app-i18n/opencc/files/opencc-1.0.4-cmake-libdir.patch
@@ -1,8 +1,6 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e3eb3a1..5370866 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -83,6 +83,10 @@ if (DEFINED SYSCONF_INSTALL_DIR)
+@@ -83,6 +83,10 @@
set (DIR_ETC ${SYSCONF_INSTALL_DIR})
endif (DEFINED SYSCONF_INSTALL_DIR)
diff --git a/app-i18n/opencc/metadata.xml b/app-i18n/opencc/metadata.xml
index 69091bd9d69..377bdc587a2 100644
--- a/app-i18n/opencc/metadata.xml
+++ b/app-i18n/opencc/metadata.xml
@@ -1,14 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>cjk@gentoo.org</email>
- <name>Cjk</name>
- </maintainer>
- <longdescription lang="en">OpenCC is a library for converting characters and phrases between
-Traditional Chinese and Simplified Chinese.</longdescription>
- <upstream>
- <remote-id type="google-code">open-chinese-convert</remote-id>
- <remote-id type="github">BYVoid/OpenCC</remote-id>
- </upstream>
+ <maintainer type="project">
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
+ <longdescription lang="en">
+ OpenCC is a library for converting characters and phrases between
+ Traditional Chinese and Simplified Chinese.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">BYVoid/OpenCC</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-i18n/opencc/opencc-1.0.4.ebuild b/app-i18n/opencc/opencc-1.0.4.ebuild
index 799136e052e..6a9d4d598c0 100644
--- a/app-i18n/opencc/opencc-1.0.4.ebuild
+++ b/app-i18n/opencc/opencc-1.0.4.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI="6"
-inherit cmake-utils multilib eutils vcs-snapshot
+inherit cmake-utils vcs-snapshot
DESCRIPTION="Libraries for conversion between Traditional and Simplified Chinese"
HOMEPAGE="https://github.com/BYVoid/OpenCC"
-SRC_URI="https://github.com/BYVoid/OpenCC/archive/ver.${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/BYVoid/${PN^^[oc]}/archive/ver.${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0/2"
@@ -15,22 +15,16 @@ KEYWORDS="amd64 hppa ppc ppc64 x86"
IUSE="doc static-libs"
DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
-DOCS="AUTHORS NEWS.md README.md"
-
-PATCHES=(
- "${FILESDIR}"/${P}-cmake-libdir.patch
-)
+DOCS="AUTHORS *.md"
+PATCHES=( "${FILESDIR}"/${P}-cmake-libdir.patch )
src_configure() {
local mycmakeargs=(
-DBUILD_DOCUMENTATION=$(usex doc)
-DBUILD_SHARED_LIBS=ON
-DENABLE_GTEST=OFF
- -DCMAKE_INSTALL_LIBDIR="${EPREFIX}"/usr/$(get_libdir)
)
-
cmake-utils_src_configure
}
diff --git a/app-i18n/opencc/opencc-1.0.5.ebuild b/app-i18n/opencc/opencc-1.0.5.ebuild
index 50bab76e2c0..93e6c7c9ffe 100644
--- a/app-i18n/opencc/opencc-1.0.5.ebuild
+++ b/app-i18n/opencc/opencc-1.0.5.ebuild
@@ -9,15 +9,14 @@ if [[ "${PV}" == "9999" ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/BYVoid/OpenCC"
+else
+ inherit vcs-snapshot
+
+ SRC_URI="https://github.com/BYVoid/${PN^^[oc]}/archive/ver.${PV}.tar.gz -> ${P}.tar.gz"
fi
-DESCRIPTION="Project for conversion between Traditional and Simplified Chinese"
+DESCRIPTION="Libraries for conversion between Traditional and Simplified Chinese"
HOMEPAGE="https://github.com/BYVoid/OpenCC"
-if [[ "${PV}" == "9999" ]]; then
- SRC_URI=""
-else
- SRC_URI="https://github.com/BYVoid/OpenCC/archive/ver.${PV}.tar.gz -> ${P}.tar.gz"
-fi
LICENSE="Apache-2.0"
SLOT="0/2"
@@ -25,13 +24,14 @@ KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
IUSE="doc"
DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
-if [[ "${PV}" != "9999" ]]; then
- S="${WORKDIR}/OpenCC-ver.${PV}"
-fi
+DOCS="AUTHORS *.md"
-DOCS=(AUTHORS NEWS.md README.md)
+src_prepare() {
+ sed -i "s|\${DIR_SHARE_OPENCC}/doc|share/doc/${PF}|" doc/CMakeLists.txt
+
+ cmake-utils_src_prepare
+}
src_configure() {
local mycmakeargs=(
@@ -39,15 +39,5 @@ src_configure() {
-DBUILD_SHARED_LIBS=ON
-DENABLE_GTEST=OFF
)
-
cmake-utils_src_configure
}
-
-src_install() {
- cmake-utils_src_install
-
- if use doc; then
- mv "${ED}usr/share/opencc/doc/html" "${ED}usr/share/doc/${P}/html" || die
- rmdir "${ED}usr/share/opencc/doc" || die
- fi
-}
diff --git a/app-i18n/opencc/opencc-9999.ebuild b/app-i18n/opencc/opencc-9999.ebuild
index 8664a59261c..f98b8945135 100644
--- a/app-i18n/opencc/opencc-9999.ebuild
+++ b/app-i18n/opencc/opencc-9999.ebuild
@@ -9,15 +9,14 @@ if [[ "${PV}" == "9999" ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/BYVoid/OpenCC"
+else
+ inherit vcs-snapshot
+
+ SRC_URI="https://github.com/BYVoid/${PN^^[oc]}/archive/ver.${PV}.tar.gz -> ${P}.tar.gz"
fi
-DESCRIPTION="Project for conversion between Traditional and Simplified Chinese"
+DESCRIPTION="Libraries for conversion between Traditional and Simplified Chinese"
HOMEPAGE="https://github.com/BYVoid/OpenCC"
-if [[ "${PV}" == "9999" ]]; then
- SRC_URI=""
-else
- SRC_URI="https://github.com/BYVoid/OpenCC/archive/ver.${PV}.tar.gz -> ${P}.tar.gz"
-fi
LICENSE="Apache-2.0"
SLOT="0/2"
@@ -25,13 +24,14 @@ KEYWORDS=""
IUSE="doc"
DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
-if [[ "${PV}" != "9999" ]]; then
- S="${WORKDIR}/OpenCC-ver.${PV}"
-fi
+DOCS="AUTHORS *.md"
-DOCS=(AUTHORS NEWS.md README.md)
+src_prepare() {
+ sed -i "s|\${DIR_SHARE_OPENCC}/doc|share/doc/${PF}|" doc/CMakeLists.txt
+
+ cmake-utils_src_prepare
+}
src_configure() {
local mycmakeargs=(
@@ -39,15 +39,5 @@ src_configure() {
-DBUILD_SHARED_LIBS=ON
-DENABLE_GTEST=OFF
)
-
cmake-utils_src_configure
}
-
-src_install() {
- cmake-utils_src_install
-
- if use doc; then
- mv "${ED}usr/share/opencc/doc/html" "${ED}usr/share/doc/${P}/html" || die
- rmdir "${ED}usr/share/opencc/doc" || die
- fi
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/opencc/, app-i18n/opencc/files/
@ 2018-10-09 17:58 Naohiro Aota
0 siblings, 0 replies; 7+ messages in thread
From: Naohiro Aota @ 2018-10-09 17:58 UTC (permalink / raw
To: gentoo-commits
commit: 50be00f6ee1ce7eaa585389586a5d838e65e647b
Author: Naohiro Aota <naota <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 9 17:56:23 2018 +0000
Commit: Naohiro Aota <naota <AT> gentoo <DOT> org>
CommitDate: Tue Oct 9 17:57:31 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50be00f6
app-i18n/opencc: add patch to avoid conflicting copy
copy command is only necessary in VS build, and it's causing conflict on
parallel build. Dropping the command is safe on Linux.
Closes: https://bugs.gentoo.org/666904
Signed-off-by: Naohiro Aota <naota <AT> gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
app-i18n/opencc/files/opencc-stop-copy.patch | 18 ++++++++++++++++++
app-i18n/opencc/opencc-1.0.5.ebuild | 7 +++++--
app-i18n/opencc/opencc-9999.ebuild | 7 +++++--
3 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/app-i18n/opencc/files/opencc-stop-copy.patch b/app-i18n/opencc/files/opencc-stop-copy.patch
new file mode 100644
index 00000000000..4793951dd25
--- /dev/null
+++ b/app-i18n/opencc/files/opencc-stop-copy.patch
@@ -0,0 +1,18 @@
+We don't need this copy command on Linux (or other than Visual Studio
+build). Since it is colliding each other on parallel build, drop the
+command for now.
+
+See https://bugs.gentoo.org/666904
+diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
+index 1516775..2deb764 100644
+--- a/data/CMakeLists.txt
++++ b/data/CMakeLists.txt
+@@ -109,8 +109,6 @@ foreach(DICT ${DICTS})
+ ${DICT}.ocd
+ COMMENT
+ "Building ${DICT}.ocd"
+- COMMAND
+- ${CMAKE_COMMAND} -E copy "$<TARGET_FILE:libopencc>" "$<TARGET_FILE_DIR:${OPENCC_DICT_BIN}>"
+ COMMAND
+ ${OPENCC_DICT_BIN}
+ --input ${DICT_${DICT}_INPUT}
diff --git a/app-i18n/opencc/opencc-1.0.5.ebuild b/app-i18n/opencc/opencc-1.0.5.ebuild
index ba948e2bf80..2ddcaab943f 100644
--- a/app-i18n/opencc/opencc-1.0.5.ebuild
+++ b/app-i18n/opencc/opencc-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -26,7 +26,10 @@ IUSE="doc test"
DEPEND="doc? ( app-doc/doxygen )"
DOCS="AUTHORS *.md"
-PATCHES=( "${FILESDIR}"/${PN}-test.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-test.patch
+ "${FILESDIR}"/${PN}-stop-copy.patch
+)
src_prepare() {
sed -i "s|\${DIR_SHARE_OPENCC}/doc|share/doc/${PF}|" doc/CMakeLists.txt
diff --git a/app-i18n/opencc/opencc-9999.ebuild b/app-i18n/opencc/opencc-9999.ebuild
index 9ec1cbd5d8b..857d6dd70b8 100644
--- a/app-i18n/opencc/opencc-9999.ebuild
+++ b/app-i18n/opencc/opencc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -26,7 +26,10 @@ IUSE="doc test"
DEPEND="doc? ( app-doc/doxygen )"
DOCS="AUTHORS *.md"
-PATCHES=( "${FILESDIR}"/${PN}-test.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-test.patch
+ "${FILESDIR}"/${PN}-stop-copy.patch
+)
src_prepare() {
sed -i "s|\${DIR_SHARE_OPENCC}/doc|share/doc/${PF}|" doc/CMakeLists.txt
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/opencc/, app-i18n/opencc/files/
@ 2020-12-27 18:39 Mike Gilbert
0 siblings, 0 replies; 7+ messages in thread
From: Mike Gilbert @ 2020-12-27 18:39 UTC (permalink / raw
To: gentoo-commits
commit: 62491256deeecf5202c907f826293a2cd8ad949b
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Sat Dec 26 00:00:00 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Dec 27 18:39:10 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62491256
app-i18n/opencc: Update patch for parallel build failure.
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
.../opencc/files/opencc-1.1.0-parallel_build.patch | 40 ++++++++++++++++++++++
app-i18n/opencc/opencc-9999.ebuild | 2 +-
2 files changed, 41 insertions(+), 1 deletion(-)
diff --git a/app-i18n/opencc/files/opencc-1.1.0-parallel_build.patch b/app-i18n/opencc/files/opencc-1.1.0-parallel_build.patch
new file mode 100644
index 00000000000..3163aa0a16e
--- /dev/null
+++ b/app-i18n/opencc/files/opencc-1.1.0-parallel_build.patch
@@ -0,0 +1,40 @@
+https://github.com/BYVoid/OpenCC/issues/322
+
+--- /data/CMakeLists.txt
++++ /data/CMakeLists.txt
+@@ -116,6 +116,19 @@
+ )
+ endforeach(DICT)
+
++add_custom_target(
++ copy_libopencc_to_dir_of_opencc_dict
++ COMMENT
++ "Copying libopencc to directory of opencc_dict"
++ COMMAND
++ ${CMAKE_COMMAND} -E copy "$<TARGET_FILE:libopencc>" "$<TARGET_FILE_DIR:${OPENCC_DICT_BIN}>"
++)
++if (WIN32)
++ set(DICT_WIN32_DEPENDS copy_libopencc_to_dir_of_opencc_dict)
++else()
++ set(DICT_WIN32_DEPENDS)
++endif()
++
+ foreach(DICT ${DICTS})
+ add_custom_command(
+ OUTPUT
+@@ -123,14 +136,13 @@
+ COMMENT
+ "Building ${DICT}.ocd2"
+ COMMAND
+- ${CMAKE_COMMAND} -E copy "$<TARGET_FILE:libopencc>" "$<TARGET_FILE_DIR:${OPENCC_DICT_BIN}>"
+- COMMAND
+ ${OPENCC_DICT_BIN}
+ --input ${DICT_${DICT}_INPUT}
+ --output ${DICT}.ocd2
+ --from text
+ --to ocd2
+ DEPENDS
++ ${DICT_WIN32_DEPENDS}
+ ${OPENCC_DICT_BIN}
+ ${DICT_${DICT}_INPUT}
+ )
diff --git a/app-i18n/opencc/opencc-9999.ebuild b/app-i18n/opencc/opencc-9999.ebuild
index 8a1dbc501c8..6c9c8315e90 100644
--- a/app-i18n/opencc/opencc-9999.ebuild
+++ b/app-i18n/opencc/opencc-9999.ebuild
@@ -42,7 +42,7 @@ if [[ "${PV}" != "9999" ]]; then
fi
PATCHES=(
- "${FILESDIR}/${PN}-stop-copy.patch"
+ "${FILESDIR}/${PN}-1.1.0-parallel_build.patch"
)
DOCS=(AUTHORS NEWS.md README.md)
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/opencc/, app-i18n/opencc/files/
@ 2021-03-26 14:38 Mike Gilbert
0 siblings, 0 replies; 7+ messages in thread
From: Mike Gilbert @ 2021-03-26 14:38 UTC (permalink / raw
To: gentoo-commits
commit: fce43d5dafe5d67d79a3ed4b5f2bf0b87b4018f0
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Fri Mar 26 00:00:00 2021 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> 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 <Arfrever <AT> Apache.Org>
Signed-off-by: Mike Gilbert <floppym <AT> 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)
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/opencc/, app-i18n/opencc/files/
@ 2022-06-24 21:16 David Seifert
0 siblings, 0 replies; 7+ messages in thread
From: David Seifert @ 2022-06-24 21:16 UTC (permalink / raw
To: gentoo-commits
commit: dc461e274347ef3e374d69615ba358b12824357f
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 24 21:16:10 2022 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Jun 24 21:16:10 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc461e27
app-i18n/opencc: drop 1.0.5, 1.1.2
Signed-off-by: David Seifert <soap <AT> gentoo.org>
app-i18n/opencc/Manifest | 2 -
app-i18n/opencc/files/opencc-stop-copy.patch | 18 -------
app-i18n/opencc/files/opencc-test.patch | 11 -----
app-i18n/opencc/opencc-1.0.5.ebuild | 64 ------------------------
app-i18n/opencc/opencc-1.1.2.ebuild | 73 ----------------------------
5 files changed, 168 deletions(-)
diff --git a/app-i18n/opencc/Manifest b/app-i18n/opencc/Manifest
index e09b7b78d93b..1dec4c5fa042 100644
--- a/app-i18n/opencc/Manifest
+++ b/app-i18n/opencc/Manifest
@@ -1,3 +1 @@
-DIST opencc-1.0.5.tar.gz 1598354 BLAKE2B a66b32b96dab543d8401960ff0548a4e3f9414606513941426eacf105bca0755a7b364c68b7eb996ef82444e52f849d2f8151353a14fb97a358ad1463fbea2d3 SHA512 3fbefbafe5c3c2491032158577ab97b5a3edf6ea98a03a7250deba082b72c3112ad4a3396d1a469936ec32e1d141f0a2236001c2891ac9c793add2b082596cc1
-DIST opencc-1.1.2.tar.gz 2804665 BLAKE2B 9b8be92cfdc2f565c9dc27745724c739e674239f2e3925a1ccdfcbf83e0d1857430d72e91a064c09456e69c00d79e47179801b21a4c7c6fd5dc6d0d16f1bcb98 SHA512 56c84bc472b39eb0b23bac6df5aada2c2ed5fd2fbe653c1ae89d392ec0b74741a15de93c748883ec3c0779396e790a1197f6e3b267b524f111459d45daeb5d4b
DIST opencc-1.1.3.tar.gz 2805430 BLAKE2B 060ca820676a92ddfddc362488031e1ada538626a1fbeb8d178a0ef059b99f606cb0f1151857579221942183820bf34c6f96517d13d4ae8dc3f81846537b668d SHA512 90da656fa4790c58932ad2240a076cc4a9e8cf70ac73d83e0d299e84472deb6491a823966a7686ed1487ef8405909981b9a12b661d8de7f086bd4b498594abac
diff --git a/app-i18n/opencc/files/opencc-stop-copy.patch b/app-i18n/opencc/files/opencc-stop-copy.patch
deleted file mode 100644
index 4793951dd251..000000000000
--- a/app-i18n/opencc/files/opencc-stop-copy.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-We don't need this copy command on Linux (or other than Visual Studio
-build). Since it is colliding each other on parallel build, drop the
-command for now.
-
-See https://bugs.gentoo.org/666904
-diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
-index 1516775..2deb764 100644
---- a/data/CMakeLists.txt
-+++ b/data/CMakeLists.txt
-@@ -109,8 +109,6 @@ foreach(DICT ${DICTS})
- ${DICT}.ocd
- COMMENT
- "Building ${DICT}.ocd"
-- COMMAND
-- ${CMAKE_COMMAND} -E copy "$<TARGET_FILE:libopencc>" "$<TARGET_FILE_DIR:${OPENCC_DICT_BIN}>"
- COMMAND
- ${OPENCC_DICT_BIN}
- --input ${DICT_${DICT}_INPUT}
diff --git a/app-i18n/opencc/files/opencc-test.patch b/app-i18n/opencc/files/opencc-test.patch
deleted file mode 100644
index dd6e91b984d2..000000000000
--- a/app-i18n/opencc/files/opencc-test.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/PhraseExtractTest.cpp
-+++ b/src/PhraseExtractTest.cpp
-@@ -16,6 +16,8 @@
- * limitations under the License.
- */
-
-+#include <cmath>
-+
- #include "PhraseExtract.hpp"
- #include "TestUtils.hpp"
-
diff --git a/app-i18n/opencc/opencc-1.0.5.ebuild b/app-i18n/opencc/opencc-1.0.5.ebuild
deleted file mode 100644
index 3fcb5271474d..000000000000
--- a/app-i18n/opencc/opencc-1.0.5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 2010-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit cmake python-any-r1
-
-if [[ "${PV}" == "9999" ]]; then
- inherit git-r3
-
- EGIT_REPO_URI="https://github.com/BYVoid/OpenCC"
-fi
-
-DESCRIPTION="Library for conversion between Traditional and Simplified Chinese characters"
-HOMEPAGE="https://github.com/BYVoid/OpenCC"
-if [[ "${PV}" == "9999" ]]; then
- SRC_URI=""
-else
- SRC_URI="https://github.com/BYVoid/OpenCC/archive/ver.${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-# OpenCC: Apache-2.0
-# deps/darts-clone: BSD-2
-# deps/gtest-1.7.0: BSD
-# deps/rapidjson-0.11: MIT
-# deps/tclap-1.2.1: MIT
-LICENSE="Apache-2.0 BSD-2 MIT test? ( BSD )"
-SLOT="0/2"
-KEYWORDS="amd64 arm64 ~hppa ppc ppc64 sparc x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="${PYTHON_DEPS}
- doc? ( app-doc/doxygen )"
-DEPEND=""
-RDEPEND=""
-
-if [[ "${PV}" != "9999" ]]; then
- S="${WORKDIR}/OpenCC-ver.${PV}"
-fi
-
-PATCHES=(
- "${FILESDIR}/${PN}-test.patch"
- "${FILESDIR}/${PN}-stop-copy.patch"
-)
-
-DOCS=(AUTHORS NEWS.md README.md)
-
-src_prepare() {
- cmake_src_prepare
-
- sed -e "s:\${DIR_SHARE_OPENCC}/doc:share/doc/${PF}:" -i doc/CMakeLists.txt || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_DOCUMENTATION=$(usex doc ON OFF)
- -DBUILD_SHARED_LIBS=ON
- -DENABLE_GTEST=$(usex test ON OFF)
- )
-
- cmake_src_configure
-}
diff --git a/app-i18n/opencc/opencc-1.1.2.ebuild b/app-i18n/opencc/opencc-1.1.2.ebuild
deleted file mode 100644
index 2b180e682ba7..000000000000
--- a/app-i18n/opencc/opencc-1.1.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 2010-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit cmake python-any-r1
-
-if [[ "${PV}" == "9999" ]]; then
- inherit git-r3
-
- EGIT_REPO_URI="https://github.com/BYVoid/OpenCC"
-fi
-
-DESCRIPTION="Library for conversion between Traditional and Simplified Chinese characters"
-HOMEPAGE="https://github.com/BYVoid/OpenCC"
-if [[ "${PV}" == "9999" ]]; then
- SRC_URI=""
-else
- SRC_URI="https://github.com/BYVoid/OpenCC/archive/ver.${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0/1.1"
-KEYWORDS="amd64 arm64 ~hppa ppc ppc64 ~riscv sparc x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="${PYTHON_DEPS}
- doc? ( app-doc/doxygen )"
-DEPEND="dev-cpp/tclap
- dev-libs/darts
- dev-libs/marisa:0=
- dev-libs/rapidjson
- test? (
- dev-cpp/gtest
- !hppa? ( !sparc? ( dev-cpp/benchmark ) )
- )"
-RDEPEND="dev-libs/marisa:0="
-
-if [[ "${PV}" != "9999" ]]; then
- S="${WORKDIR}/OpenCC-ver.${PV}"
-fi
-
-DOCS=(AUTHORS NEWS.md README.md)
-
-src_prepare() {
- rm -r deps || die
-
- cmake_src_prepare
-
- sed -e "s:\${DIR_SHARE_OPENCC}/doc:share/doc/${PF}:" -i doc/CMakeLists.txt || die
-
- # https://github.com/BYVoid/OpenCC/issues/550
- # https://github.com/BYVoid/OpenCC/commit/736b93d3d16fdf0548bdaae2922569199615e919
- sed -e "s:#ifdef ENABLE_DARTS:#if 1:" -i src/Common.hpp || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_DOCUMENTATION=$(usex doc ON OFF)
- -DENABLE_BENCHMARK=$(if use test && has_version -d dev-cpp/benchmark; then echo ON; else echo OFF; fi)
- -DENABLE_GTEST=$(usex test ON OFF)
- -DUSE_SYSTEM_DARTS=ON
- -DUSE_SYSTEM_GOOGLE_BENCHMARK=ON
- -DUSE_SYSTEM_GTEST=ON
- -DUSE_SYSTEM_MARISA=ON
- -DUSE_SYSTEM_RAPIDJSON=ON
- -DUSE_SYSTEM_TCLAP=ON
- )
-
- cmake_src_configure
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/opencc/, app-i18n/opencc/files/
@ 2024-09-07 22:09 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2024-09-07 22:09 UTC (permalink / raw
To: gentoo-commits
commit: 233b77e82c1c86e05f494d0314b99acaa127623a
Author: Yongxiang Liang <tanekliang <AT> gmail <DOT> com>
AuthorDate: Sat Sep 7 13:20:36 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 7 22:07:58 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=233b77e8
app-i18n/opencc: fix for gcc-15
Closes: https://bugs.gentoo.org/937629
Signed-off-by: Yongxiang Liang <tanekliang <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/38499
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/opencc-1.1.7-fix-missing-cstdint-for-gcc-15.patch | 13 +++++++++++++
app-i18n/opencc/opencc-1.1.7-r1.ebuild | 4 ++++
app-i18n/opencc/opencc-1.1.7.ebuild | 4 ++++
3 files changed, 21 insertions(+)
diff --git a/app-i18n/opencc/files/opencc-1.1.7-fix-missing-cstdint-for-gcc-15.patch b/app-i18n/opencc/files/opencc-1.1.7-fix-missing-cstdint-for-gcc-15.patch
new file mode 100644
index 000000000000..8e80ff29014c
--- /dev/null
+++ b/app-i18n/opencc/files/opencc-1.1.7-fix-missing-cstdint-for-gcc-15.patch
@@ -0,0 +1,13 @@
+https://github.com/BYVoid/OpenCC/pull/894
+Fix missing cstdint for GCC 15
+
+--- a/src/SerializedValues.cpp
++++ b/src/SerializedValues.cpp
+@@ -17,6 +17,7 @@
+ */
+
+ #include <cassert>
++#include <cstdint>
+ #include <cstring>
+
+ #include "Lexicon.hpp"
diff --git a/app-i18n/opencc/opencc-1.1.7-r1.ebuild b/app-i18n/opencc/opencc-1.1.7-r1.ebuild
index 89372cdb262c..afce6038391d 100644
--- a/app-i18n/opencc/opencc-1.1.7-r1.ebuild
+++ b/app-i18n/opencc/opencc-1.1.7-r1.ebuild
@@ -47,6 +47,10 @@ BDEPEND="${PYTHON_DEPS}
DOCS=( AUTHORS NEWS.md README.md )
+PATCHES=(
+ "${FILESDIR}/${P}-fix-missing-cstdint-for-gcc-15.patch"
+)
+
pkg_setup() {
use python && python-single-r1_pkg_setup
}
diff --git a/app-i18n/opencc/opencc-1.1.7.ebuild b/app-i18n/opencc/opencc-1.1.7.ebuild
index bb06c29d91af..300ca308f554 100644
--- a/app-i18n/opencc/opencc-1.1.7.ebuild
+++ b/app-i18n/opencc/opencc-1.1.7.ebuild
@@ -34,6 +34,10 @@ BDEPEND="${PYTHON_DEPS}
DOCS=( AUTHORS NEWS.md README.md )
+PATCHES=(
+ "${FILESDIR}/${P}-fix-missing-cstdint-for-gcc-15.patch"
+)
+
src_prepare() {
rm -r deps || die
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-09-07 22:09 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-10-09 17:58 [gentoo-commits] repo/gentoo:master commit in: app-i18n/opencc/, app-i18n/opencc/files/ Naohiro Aota
-- strict thread matches above, loose matches on Subject: below --
2024-09-07 22:09 Sam James
2022-06-24 21:16 David Seifert
2021-03-26 14:38 Mike Gilbert
2020-12-27 18:39 Mike Gilbert
2017-08-23 14:25 Akinori Hattori
2017-02-03 21:49 Johannes Huber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox