summaryrefslogtreecommitdiff
path: root/app-i18n/ibus-rime
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-01-01 21:06:00 +0000
committerV3n3RiX <venerix@redcorelinux.org>2021-01-01 21:06:00 +0000
commit129160ec854dca4c3fedb5bcfbcb56930371da0f (patch)
tree53bf797418ac5e9b99c41ca0382c87b82421e5de /app-i18n/ibus-rime
parent441d1370330332b7d78f238d2f5e13f7aed5e4e0 (diff)
gentoo new year resync : 01.01.2021
Diffstat (limited to 'app-i18n/ibus-rime')
-rw-r--r--app-i18n/ibus-rime/Manifest7
-rw-r--r--app-i18n/ibus-rime/files/ibus-rime-1.4.0-fno-common.patch11
-rw-r--r--app-i18n/ibus-rime/ibus-rime-1.2.ebuild34
-rw-r--r--app-i18n/ibus-rime/ibus-rime-1.3.0.ebuild33
-rw-r--r--app-i18n/ibus-rime/ibus-rime-1.4.0.ebuild19
5 files changed, 23 insertions, 81 deletions
diff --git a/app-i18n/ibus-rime/Manifest b/app-i18n/ibus-rime/Manifest
index 7effea8dc8c2..ab3da3600179 100644
--- a/app-i18n/ibus-rime/Manifest
+++ b/app-i18n/ibus-rime/Manifest
@@ -1,7 +1,4 @@
-DIST ibus-rime-1.2.tar.gz 33396 BLAKE2B 39930ea31d40e622cd69d6f5a218729f460161dd9681e49bc35a1eb9b3875b6f5acbdaf36f7cf8200440bc27ed84a2f23ec1578b19a1fe6abbbc54c7078be11c SHA512 e1851781a6d069a79d04890b5b0aa2a706e611c08df3fcb99f883eeedd4dc4eefcac207f35b5cf1d856a41f0153ec3fbb040b4e6f610727384baa19b52a64155
-DIST ibus-rime-1.3.0.tar.gz 33930 BLAKE2B 14e086382d89c990ca9f07401b68dbe26d58da061a3e8154232809ff29d766b630dcd06723bb0a8e18ebd089a640b7ab6787f8c70a6405dfa82472c1abfe5d4e SHA512 f0991184805bfe19931e297779179661f98bdfea952e310b2d8618550002cfa5bb08df05d1c5e31b535ad9959a919fdc98fa771a90d4d82b9c50e2f592cb7dfd
+AUX ibus-rime-1.4.0-fno-common.patch 278 BLAKE2B b4ec86e71074309ccacec7299b5c6f5e9eda55af3b1a8e5a8db105833c5482fd10aacf22e03fd61bea75646930b3285c8a2a6b907f54223556cffd3884beebcc SHA512 45fd643cea9695b92eecc76e93a7908967b3eb66a108541ec6733c1a6e145ef43aa81592666db1d811b2460593ac3a0b1432990d387f58c897bfd1360f2a9b80
DIST ibus-rime-1.4.0.tar.gz 34176 BLAKE2B 69d0392adc78b2b8935f2239c4567d001d3636d0e8ff59aca0b04b3189751a3edd0350eea9e2262b3ae3e639dbd9715c157e44727cc48ba9521801161a1508f4 SHA512 3fc24f4ce390e27d37e41775e4c075c7465cd3e90a9ab61d13ec47c2ca1c2afaafb322f327e18be573aa254a43b8cf6426415500a5d817b835bf4e0615ab9145
-EBUILD ibus-rime-1.2.ebuild 759 BLAKE2B 270180498169d6f2a503dcebc3cf01b78bbdfae03a45dc8fa8cbdecbb999fb40b1d8c675c002a51e625fbeb277e9abcaffcb23ba6a8a5d0c05af46c54a21d37d SHA512 2a28941562893dd9827bd9621abc7d89ae51e50132671f8fd3fa5533df340b523a1964eeb1d71df6492c074f286a4337a2ab93863d9d303b82af62768ebcefb4
-EBUILD ibus-rime-1.3.0.ebuild 759 BLAKE2B 44bd36ab9b90c93c4a7338f3921ca100c06506acd2ee65c434d26802882b41b66168910cf7ae4cdf8045bbf54222b7200314e488251156c4e8fbdd2b07e3a9fd SHA512 ee0fbc41180122bcb9aa0cb793cb248d0100f813b3bf63b4737e24fc760029299e9d701e08ed2d68cc27ecfb0286a4c76c93cbb42c9d84d21be7b7c9a3d6fffb
-EBUILD ibus-rime-1.4.0.ebuild 761 BLAKE2B 346a2abea3aa85ea4c2f877f8321a61137106d2d2d4409d8fec47195d992afe838bb0e97a02d5ecac2ca173e880388f01c76ef0b4af4279552a4e25d6854cce2 SHA512 9bc441c6ef302907057cf44dd3f6ff1028a52e1804ab4be6258c30c54d382e6f904dd31193d2e7a6ee995047865ee9414e84a8286e76d7fad569db33965fb544
+EBUILD ibus-rime-1.4.0.ebuild 807 BLAKE2B d4c5bb3ff31b04e07c072a1ff44b934d74d56b5dc39726d44dfec7390ae4213c0fc401c0223d4d3b139874d8e0436e01459db877024700871c2a66c817731cc8 SHA512 e1102beae2168d556f306e05b4960a4fd94eefc3978996ba6fdd06d0752268f67d0d006d53adc9e993914e70b97cac9e8c20e7c12ef339ab10155ffca77e657d
MISC metadata.xml 534 BLAKE2B 0d1888080b3fcf1b2bd5ef07456c8ed3f91dad7e11bb1c34882a43ad2396bc6b5bb62f49bf8af4936d3d5df84b6af30dd4dfcf48ef343865ac36e50da26d061b SHA512 78e2d7631f65652305b451e5b4ab95886dd8a1c2436fb95c0f344daae87feab1eb57486a0815348363858faf91f9b931f32166a9b22b7613bd3b1407ac19e317
diff --git a/app-i18n/ibus-rime/files/ibus-rime-1.4.0-fno-common.patch b/app-i18n/ibus-rime/files/ibus-rime-1.4.0-fno-common.patch
new file mode 100644
index 000000000000..f935a18ef8c3
--- /dev/null
+++ b/app-i18n/ibus-rime/files/ibus-rime-1.4.0-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/rime_settings.h
++++ b/rime_settings.h
+@@ -20,7 +20,7 @@ struct IBusRimeSettings {
+ struct ColorSchemeDefinition* color_scheme;
+ };
+
+-struct IBusRimeSettings g_ibus_rime_settings;
++extern struct IBusRimeSettings g_ibus_rime_settings;
+
+ void
+ ibus_rime_load_settings();
diff --git a/app-i18n/ibus-rime/ibus-rime-1.2.ebuild b/app-i18n/ibus-rime/ibus-rime-1.2.ebuild
deleted file mode 100644
index c8c71e6b73ad..000000000000
--- a/app-i18n/ibus-rime/ibus-rime-1.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Chinese Rime Input Method Engine for IBus"
-HOMEPAGE="https://rime.im/ https://github.com/rime/ibus-rime"
-SRC_URI="http://dl.bintray.com/lotem/rime/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND="app-i18n/ibus
- app-i18n/librime
- x11-libs/libnotify"
-RDEPEND="${CDEPEND}
- app-i18n/rime-data"
-DEPEND="${CDEPEND}
- dev-util/cmake
- virtual/pkgconfig"
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
- sed -i \
- -e "/^libexecdir/s:/lib:/libexec:" \
- -e "/^[[:space:]]*PREFIX/s:/usr:${EPREFIX}/usr:" \
- -e "s/ make/ \$(MAKE)/" \
- Makefile
- sed -i "/exec>/s:/usr/lib:${EPREFIX}/usr/libexec:" rime.xml
-
- default
-}
diff --git a/app-i18n/ibus-rime/ibus-rime-1.3.0.ebuild b/app-i18n/ibus-rime/ibus-rime-1.3.0.ebuild
deleted file mode 100644
index 5facdd653741..000000000000
--- a/app-i18n/ibus-rime/ibus-rime-1.3.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Chinese Rime Input Method Engine for IBus"
-HOMEPAGE="https://rime.im/ https://github.com/rime/ibus-rime"
-SRC_URI="https://github.com/rime/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND="app-i18n/ibus
- app-i18n/librime
- x11-libs/libnotify"
-RDEPEND="${CDEPEND}
- app-i18n/rime-data"
-DEPEND="${CDEPEND}
- dev-util/cmake
- virtual/pkgconfig"
-
-src_prepare() {
- sed -i \
- -e "/^libexecdir/s:/lib:/libexec:" \
- -e "/^[[:space:]]*PREFIX/s:/usr:${EPREFIX}/usr:" \
- -e "s/ make/ \$(MAKE)/" \
- Makefile
- sed -i "/exec>/s:/usr/lib:${EPREFIX}/usr/libexec:" rime.xml
-
- default
-}
diff --git a/app-i18n/ibus-rime/ibus-rime-1.4.0.ebuild b/app-i18n/ibus-rime/ibus-rime-1.4.0.ebuild
index c5d297d74fec..1a7bb058a4c0 100644
--- a/app-i18n/ibus-rime/ibus-rime-1.4.0.ebuild
+++ b/app-i18n/ibus-rime/ibus-rime-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,24 +10,25 @@ SRC_URI="https://github.com/rime/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-CDEPEND="app-i18n/ibus
+RDEPEND="
+ app-i18n/ibus
app-i18n/librime
+ app-i18n/rime-data
x11-libs/libnotify"
-RDEPEND="${CDEPEND}
- app-i18n/rime-data"
-DEPEND="${CDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
dev-util/cmake
virtual/pkgconfig"
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+
src_prepare() {
sed -i \
-e "/^libexecdir/s:/lib:/libexec:" \
-e "/^[[:space:]]*PREFIX/s:/usr:${EPREFIX}/usr:" \
- -e "s/ make/ \$(MAKE)/" \
- Makefile
- sed -i "/exec>/s:/usr/lib:${EPREFIX}/usr/libexec:" rime.xml
+ -e "s/ make/ \$(MAKE)/" Makefile || die
+ sed -i -e "/exec>/s:/usr/lib:${EPREFIX}/usr/libexec:" rime.xml || die
default
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 02:25:30 +0000