From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Jan 2020 15:51:32 +0000 Subject: gentoo resync : 15.01.2020 --- app-i18n/librime/Manifest | 5 +- .../files/librime-1.5.3-log_files_mode.patch | 14 ++++ app-i18n/librime/librime-1.5.3-r1.ebuild | 74 ++++++++++++++++++++++ app-i18n/librime/librime-1.5.3.ebuild | 64 ------------------- app-i18n/librime/metadata.xml | 3 + 5 files changed, 94 insertions(+), 66 deletions(-) create mode 100644 app-i18n/librime/files/librime-1.5.3-log_files_mode.patch create mode 100644 app-i18n/librime/librime-1.5.3-r1.ebuild delete mode 100644 app-i18n/librime/librime-1.5.3.ebuild (limited to 'app-i18n/librime') diff --git a/app-i18n/librime/Manifest b/app-i18n/librime/Manifest index 26ac70e3f6cd..702b85237f8f 100644 --- a/app-i18n/librime/Manifest +++ b/app-i18n/librime/Manifest @@ -1,5 +1,6 @@ +AUX librime-1.5.3-log_files_mode.patch 458 BLAKE2B acd2f59f409b3643807ea845fd08bfcfe730cfedaacb7d70a4b1ba017a299cb95b8d815bbbf53b2c0e3c86c4482a2d71a97fef362a6f0404dd45e96b57f78be7 SHA512 d8b12367916ed1ad5deb2e982437d3e5e04592baa6c1e12f6b78ff99b8cc407f2c9fc6f47c0715054572f6f8a5edafcb6f6da033902175cc4357a07faad04420 DIST librime-1.4.0.tar.gz 8609316 BLAKE2B cce58c398057ac82f076e3b9e9a25cd6410e738460bd58277a9e3ed6cd11e80922bbb30e8b42828cdd5dd83f6058794b4b32fedb359315186b018ca88161794d SHA512 da68983638c6f25d994060a607f2ccab8917a71dbf10b9c6f1140c87c9ef4124e29a1d0ef16bbd0edc9a3a22bd5845aa894888d678607db372750f300638f562 DIST librime-1.5.3.tar.gz 2847083 BLAKE2B 4ffb2c5ddaf52f9c9227fa4ea019ef2965e61139f678798c08ef37dc52b863763651b63ed820caad0de1b06f48ab5c1a7a2682653340d2ae7f5f9eec3cec80b2 SHA512 4d7f6ec43bd5728f59f0b3581bcd8a46128651430b6873017d80659942b8f6aa1a2f25f439ba8fba461fe22acbf701c2da7a786104a2e4852a70a89cdc0452d3 EBUILD librime-1.4.0.ebuild 843 BLAKE2B cf3ddd814e996bc0e8633ffb4b918281d232729773d23fc72449ebb9ddeb126ad2eba9c5e0d31dd96ecb3ebd2ac40b023144f713191e25330e3d841c90267a3a SHA512 fa8c3031447238f9015fdb43dded2c874fb711e2c24282bb8fd4dda0967513aede1170a05c82dccabb19b5d088f87b35256ede0f7cf5778e4cc91b8201a89410 -EBUILD librime-1.5.3.ebuild 1453 BLAKE2B 1a743ba7061b07020c8e4ac114c12fbfff81809df5c7549c150f09a463ef26366eff774634807f938f0f7fb93f4196e808c1d8703c429bed8dd749f21daea569 SHA512 6f2e81396c26ceb7d79a74d05bdd7557cd59bbe62a8e475be3dcb5eb5b0050f7e40e4af7839689ca839d4522ce96dede31c6d67f075916d5cea5a01496c2f6c7 -MISC metadata.xml 532 BLAKE2B 200096c7c818b877dd156ab1456309ae4e42a8bf78075d8aeee30a79f09bbf57c6053a41369102becf87aaf3ea4481a0bf6edf1dee258f650661b61c65a9aaee SHA512 83904c4885a57569f4e74483bd5efed886ca1fd6708c1e7146ce4893bcbdd66efa82dfd4e563c7b888603e23566de21e928772a597dd2e6fc75d00793c788800 +EBUILD librime-1.5.3-r1.ebuild 1605 BLAKE2B a1e91aa0248c50d3561e47e4e81982137978fc77d797040768136997d8cdd1d2250e45b2b6d73e7a68b4a787426acf75507efb619713eaa893c2ab07a2a19fbf SHA512 2fe3d9cdef8176f38e3c4346542bf09181863fbd62e6968fb452da64c63ba5645ef73588f01eb3fbd1307dbde96a3867754e77c869587b33cf74ec89e02aa4f8 +MISC metadata.xml 647 BLAKE2B 2837d0505f1721cbb6a60414b846ad95ddbaca6d682e9f93acc82998430cdbc73038b124c1a0a73d7aedf132535276e6bd88015a47e4f4ebb86619aad38e9061 SHA512 a388004662d39511749e6fcf618fc28411f81ebbf2078ea2b3e4123d63544790fb017ced2df16556fdf763c854d34a7fcf5a59931153f6c94841d9cdcff4d3ec diff --git a/app-i18n/librime/files/librime-1.5.3-log_files_mode.patch b/app-i18n/librime/files/librime-1.5.3-log_files_mode.patch new file mode 100644 index 000000000000..7a36dea64d24 --- /dev/null +++ b/app-i18n/librime/files/librime-1.5.3-log_files_mode.patch @@ -0,0 +1,14 @@ +https://github.com/rime/librime/issues/316 +https://github.com/rime/librime/commit/90839b0b3d47cbfef715ea5f061c7505666ff75d + +--- /src/rime/setup.cc ++++ /src/rime/setup.cc +@@ -35,6 +35,8 @@ + + RIME_API void SetupLogging(const char* app_name) { + #ifdef RIME_ENABLE_LOGGING ++ // Do not allow other users to read/write log files created by current process. ++ FLAGS_logfile_mode = 0600; + google::InitGoogleLogging(app_name); + #endif // RIME_ENABLE_LOGGING + } diff --git a/app-i18n/librime/librime-1.5.3-r1.ebuild b/app-i18n/librime/librime-1.5.3-r1.ebuild new file mode 100644 index 000000000000..91569d76fae8 --- /dev/null +++ b/app-i18n/librime/librime-1.5.3-r1.ebuild @@ -0,0 +1,74 @@ +# Copyright 2012-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit cmake-utils + +if [[ "${PV}" == "9999" ]]; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/rime/librime" + EGIT_SUBMODULES=() +fi + +DESCRIPTION="RIME (Rime Input Method Engine) core library" +HOMEPAGE="https://rime.im/ https://github.com/rime/librime" +if [[ "${PV}" == "9999" ]]; then + SRC_URI="" +else + SRC_URI="https://github.com/rime/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +fi + +LICENSE="BSD" +SLOT="0/1" +KEYWORDS="amd64 arm64 ppc ppc64 ~sparc x86" +IUSE="debug test" +RESTRICT="!test? ( test )" + +BDEPEND="" +RDEPEND="app-i18n/opencc:0= + >=dev-cpp/glog-0.3.5:0= + dev-cpp/yaml-cpp:0= + dev-libs/boost:0=[nls,threads] + dev-libs/leveldb:0= + dev-libs/marisa:0=" +DEPEND="${RDEPEND} + dev-libs/darts + dev-libs/utfcpp + x11-base/xorg-proto + test? ( dev-cpp/gtest )" + +PATCHES=( + "${FILESDIR}/${P}-log_files_mode.patch" +) + +DOCS=(CHANGELOG.md README.md) + +src_prepare() { + # Use headers of dev-libs/darts, dev-libs/utfcpp and x11-base/xorg-proto. + sed -e "/\${PROJECT_SOURCE_DIR}\/thirdparty/d" -i CMakeLists.txt || die + rm -r thirdparty || die + + cmake-utils_src_prepare +} + +src_configure() { + local -x CXXFLAGS="${CXXFLAGS} -I${ESYSROOT}/usr/include/utf8cpp" + + if use debug; then + CXXFLAGS+=" -DDCHECK_ALWAYS_ON" + else + CXXFLAGS+=" -DNDEBUG" + fi + + local mycmakeargs=( + -DBOOST_USE_CXX11=ON + -DBUILD_TEST=$(usex test ON OFF) + -DCMAKE_DISABLE_FIND_PACKAGE_Gflags=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Iconv=ON + -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)" + ) + + cmake-utils_src_configure +} diff --git a/app-i18n/librime/librime-1.5.3.ebuild b/app-i18n/librime/librime-1.5.3.ebuild deleted file mode 100644 index 074f50244aa8..000000000000 --- a/app-i18n/librime/librime-1.5.3.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 2012-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit cmake-utils - -if [[ "${PV}" == "9999" ]]; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/rime/librime" - EGIT_SUBMODULES=() -fi - -DESCRIPTION="RIME (Rime Input Method Engine) core library" -HOMEPAGE="https://rime.im/ https://github.com/rime/librime" -if [[ "${PV}" == "9999" ]]; then - SRC_URI="" -else - SRC_URI="https://github.com/rime/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -fi - -LICENSE="BSD" -SLOT="0/1" -KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -BDEPEND="" -RDEPEND="app-i18n/opencc:0= - dev-cpp/glog:0= - dev-cpp/yaml-cpp:0= - dev-libs/boost:0=[nls,threads] - dev-libs/leveldb:0= - dev-libs/marisa:0=" -DEPEND="${RDEPEND} - dev-libs/darts - dev-libs/utfcpp - x11-base/xorg-proto - test? ( dev-cpp/gtest )" - -DOCS=(CHANGELOG.md README.md) - -src_prepare() { - # Use headers of dev-libs/darts, dev-libs/utfcpp and x11-base/xorg-proto. - sed -e "/\${PROJECT_SOURCE_DIR}\/thirdparty/d" -i CMakeLists.txt || die - rm -r thirdparty || die - - cmake-utils_src_prepare -} - -src_configure() { - local -x CXXFLAGS="${CXXFLAGS} -I${ESYSROOT}/usr/include/utf8cpp" - - local mycmakeargs=( - -DBOOST_USE_CXX11=ON - -DBUILD_TEST=$(usex test ON OFF) - -DCMAKE_DISABLE_FIND_PACKAGE_Gflags=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Iconv=ON - -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)" - ) - - cmake-utils_src_configure -} diff --git a/app-i18n/librime/metadata.xml b/app-i18n/librime/metadata.xml index 1ef87e42d3d5..777c41df84a4 100644 --- a/app-i18n/librime/metadata.xml +++ b/app-i18n/librime/metadata.xml @@ -9,6 +9,9 @@ cjk@gentoo.org Cjk + + Enable debugging (including logging of input of RIME input methods) + chen.sst@gmail.com -- cgit v1.2.3