Skip to content
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.

Sign up for GitHub

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

Fix uim problems #51

Closed
wants to merge 6 commits into from
Closed

Fix uim problems #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1eec37b
anthy: Added libanthy-dev to PROVIDES_class-terget
mickey-happygolucky Aug 5, 2017
db32cf6
uim: Modified the order of package definition.
mickey-happygolucky Aug 5, 2017
00f0206
uim: Added glibc-utils and glibc-gconv-euc-jp to RDEPENDS_uim-anthy
mickey-happygolucky Aug 5, 2017
568304e
uim: Removed pkg_postinst_uim-common/pkg_prerm_uim-common.
mickey-happygolucky Aug 5, 2017
697d155
uim: Fixed pkg_postinst_*/pkg_prerm_* for uim-anthy and uim-skk.
mickey-happygolucky Aug 5, 2017
0285205
uim: Fixed a problem that an immodule.cache is not updated appropriat…
mickey-happygolucky Aug 6, 2017
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
1 change: 1 addition & 0 deletions meta-oe/recipes-support/anthy/anthy_9100h.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ SRC_URI[sha256sum] = "d256f075f018b4a3cb0d165ed6151fda4ba7db1621727e0eb54569b6e2

DEPENDS_class-target = "anthy-native"
RDEPENDS_${PN}_class-target = "libanthy0"
PROVIDES_class-target = "libanthy-dev"

inherit autotools pkgconfig

Expand Down
59 changes: 22 additions & 37 deletions meta-oe/recipes-support/uim/uim_1.8.6.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,15 @@ SRC_URI[md5sum] = "ecea4c597bab1fd4ba98ea84edcece59"
SRC_URI[sha256sum] = "7b1ea803c73f3478917166f04f67cce6e45ad7ea5ab6df99b948c17eb1cb235f"

DEPENDS = "anthy fontconfig libxft libxt glib-2.0 ncurses intltool"
DEPENDS_class-target += "intltool-native gtk+ gtk+3 uim-native takao-fonts"
DEPENDS_class-target += "intltool-native gtk+ gtk+3 uim-native takao-fonts libanthy-dev"

RDEPENDS_uim = "libuim0 libedit"
RDEPENDS_uim-anthy = "takao-fonts anthy libanthy0"
RDEPENDS_uim-anthy = "takao-fonts anthy libanthy0 glibc-utils glibc-gconv-euc-jp"

LEAD_SONAME = "libuim.so.1"

inherit autotools pkgconfig gettext
inherit autotools pkgconfig gettext qemu gtk-immodules-cache
GTKIMMODULES_PACKAGES = "uim-gtk2.0 uim-gtk3"

EXTRA_OECONF += "--disable-emacs \
--without-scim \
Expand All @@ -43,7 +44,7 @@ do_install_append() {
rm -rf ${D}/${datadir}/applications
}

PACKAGES += "uim-xim uim-utils uim-skk uim-gtk2.0 uim-gtk3 uim-fep uim-common uim-anthy libuim0 libuim-dev"
PACKAGES =+ "uim-xim uim-utils uim-skk uim-gtk2.0 uim-gtk3 uim-fep uim-anthy uim-common libuim0 libuim-dev"

FILES_${PN} = "${bindir}/uim-help \
${libdir}/uim/plugin/libuim-* \
Expand Down Expand Up @@ -103,52 +104,36 @@ FILES_uim-skk = "${libdir}/uim/plugin/libuim-skk.* \
${datadir}/uim/skk*.scm \
"

PACKAGE_WRITE_DEPS += "qemu-native"
pkg_postinst_uim-anthy() {
if [ -f /usr/bin/uim-module-manager ]; then
/usr/bin/uim-module-manager --register anthy --path /etc/uim
fi
}

pkg_postrm_uim-anthy() {
if [ -f /usr/bin/uim-module-manager ]; then
/usr/bin/uim-module-manager --path /etc/uim --unregister anthy
if test -n "$D"; then
${@qemu_run_binary(d, '$D', '${bindir}/uim-module-manager')} --register anthy --path $D${datadir}/uim
else
uim-module-manager --register anthy --path ${datadir}/uim
fi
}

pkg_prerm_uim-anthy() {
if [ -f /usr/bin/uim-module-manager ]; then
/usr/bin/uim-module-manager --register anthy --path /etc/uim
if test -n "$D"; then
${@qemu_run_binary(d, '$D', '${bindir}/uim-module-manager')} --path $D${datadir}/uim --unregister anthy
else
uim-module-manager --path ${datadir}/uim --unregister anthy
fi
}

pkg_postinst_uim-gtk2.0() {
gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
}

pkg_postinst_uim-skk() {
if [ -f /usr/bin/uim-module-manager ]; then
/usr/bin/uim-module-manager --register skk --path /etc/uim
if test -n "$D"; then
${@qemu_run_binary(d, '$D', '${bindir}/uim-module-manager')} --register skk --path $D${datadir}/uim
else
uim-module-manager --register skk --path ${datadir}/uim
fi
}

pkg_postrm_uim-skk() {
if [ -f /usr/bin/uim-module-manager ]; then
/usr/bin/uim-module-manager --path /etc/uim --unregister skk
fi
}

pkg_postinst_uim-common() {
if [ -f /usr/bin/uim-module-manager ]; then
/usr/bin/uim-module-manager --path /etc/uim --register \
tutcode tcode hangul viqr \
ipa-x-sampa latin byeoru
fi
}

pkg_prerm_uim-common() {
if [ -f /usr/bin/uim-module-manager ]; then
/usr/bin/uim-module-manager --path /etc/uim --register \
tutcode tcode hangul viqr ipa-x-sampa latin byeoru
if test -n "$D"; then
${@qemu_run_binary(d, '$D', '${bindir}/uim-module-manager')} --path $D${datadir}/uim --unregister skk
else
uim-module-manager --path ${datadir}/uim --unregister skk
fi
}

Expand Down