add ibus with anthy, pinyin and table support
v3 cover add ibus with anthy, pinyin and table support
This serie adds IBus with support for alphabetic tables (Chinese, Korean ...), Pinyin (Chinese), Anthy (Japanese) into meta-openembedded layer.
Motivation of the change in dconf is documented in:
https://bugzilla.yoctoproject.org/show_bug.cgi?id=13040
This serie is in conflict with:
https://patchwork.openembedded.org/patch/155947/
The following changes since commit ebc7b9e20ac22f6f2ad373621917f53e8a9af81c:
poppler: Upgrade to 0.71.0 (2018-11-29 18:55:52 -0800)
are available in the git repository at:
git://github.com/psaavedra/meta-openembedded ibus
https://github.com/psaavedra/meta-openembedded/tree/ibus
Pablo Saavedra (7):
pyzy: add pyzy recipe
dconf: remove gsettings inherit schemas
ibus: add ibus recipe
ibus-anthy: add ibus-anthy recipe
ibus-pinyin: add ibus-pinyin recipe
ibus-table: add ibus-table recipe
ibus-table-chinese: add ibus-table-chinese recipe
meta-gnome/recipes-gnome/dconf/dconf_0.30.1.bb | 2 +- .../ibus/ibus-anthy/fix_anthy_include_in_gir.patch | 19 + meta-oe/recipes-support/ibus/ibus-anthy_1.5.10.bb | 37 + meta-oe/recipes-support/ibus/ibus-pinyin_1.5.0.bb | 30 + .../0001-revert-CMakeLists.txt.patch | 204 ++ .../ibus/ibus-table-chinese/0002-add-Modules.patch | 2933 ++++++++++++++++++++ .../0003-add-ChangeLog.prev.patch | 58 + .../0005-fix-cmake-cross-compile.patch | 130 + .../ibus/ibus-table-chinese_1.8.2.bb | 82 + meta-oe/recipes-support/ibus/ibus-table_1.9.21.bb | 29 + meta-oe/recipes-support/ibus/ibus_1.5.19.bb | 97 + meta-oe/recipes-support/pyzy/pyzy_git.bb | 21 + 12 files changed, 3641 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-support/ibus/ibus-anthy/fix_anthy_include_in_gir.patch create mode 100644 meta-oe/recipes-support/ibus/ibus-anthy_1.5.10.bb create mode 100644 meta-oe/recipes-support/ibus/ibus-pinyin_1.5.0.bb create mode 100644 meta-oe/recipes-support/ibus/ibus-table-chinese/0001-revert-CMakeLists.txt.patch create mode 100644 meta-oe/recipes-support/ibus/ibus-table-chinese/0002-add-Modules.patch create mode 100644 meta-oe/recipes-support/ibus/ibus-table-chinese/0003-add-ChangeLog.prev.patch create mode 100644 meta-oe/recipes-support/ibus/ibus-table-chinese/0005-fix-cmake-cross-compile.patch create mode 100644 meta-oe/recipes-support/ibus/ibus-table-chinese_1.8.2.bb create mode 100644 meta-oe/recipes-support/ibus/ibus-table_1.9.21.bb create mode 100644 meta-oe/recipes-support/ibus/ibus_1.5.19.bb create mode 100644 meta-oe/recipes-support/pyzy/pyzy_git.bb
Signature · 1 line
2.11.0
PATCH v3 1/7 pyzy: add pyzy recipe
The chinese pinyin and bopomofo conversion library
--- meta-oe/recipes-support/pyzy/pyzy_git.bb | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 meta-oe/recipes-support/pyzy/pyzy_git.bb
meta-oe/recipes-support/pyzy/pyzy_git.bb new file +21 -0
@@ -0,0 +1,21 @@ +DESCRIPTION = "The Chinese PinYin and Bopomofo conversion library" +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=4b54a1fd55a448865a0b32d41598759d" +SECTION = "inputmethods" + +SRCREV = "6d9c3cdff364e0da75e1c26222240f26370ebf73" +SRC_URI = "git://github.com/pyzy/pyzy.git;protocol=https;branch=master" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +DEPENDS = "glib-2.0 util-linux sqlite3" + +EXTRA_OECONF += " \ + --disable-opencc \ + --disable-db-open-phrase \ + --disable-db-android \ +" + +BBCLASSEXTEND = "native"
Signature · 1 line
2.11.0
PATCH v3 2/7 dconf: remove gsettings inherit schemas
In reply to Pablo Saavedra... because it doesn't install any schemas
Motivation and details here:
https://bugzilla.yoctoproject.org/show_bug.cgi?id=13040
--- meta-gnome/recipes-gnome/dconf/dconf_0.30.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-gnome/recipes-gnome/dconf/dconf_0.30.1.bb +1 -1
@@ -10,7 +10,7 @@ DEPENDS = "dbus glib-2.0 intltool-native" GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gsettings bash-completion vala +inherit gnomebase bash-completion vala SRC_URI += "file://0001-meson.build-do-not-compile-docs.patch \ "
Signature · 1 line
2.11.0
PATCH v3 3/7 ibus: add ibus recipe
In reply to Pablo SaavedraIntelligent Input Bus for Linux/Unix https://github.com/ibus/ibus/wiki
Collision with: https://patchwork.openembedded.org/patch/155947/
--- meta-oe/recipes-support/ibus/ibus_1.5.19.bb | 97 +++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) create mode 100644 meta-oe/recipes-support/ibus/ibus_1.5.19.bb
meta-oe/recipes-support/ibus/ibus_1.5.19.bb new file +97 -0
@@ -0,0 +1,97 @@ +DESCRIPTION = "A multilingual user input method library" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" +SECTION = "inputmethods" + +SRC_URI = "https://github.com/ibus/ibus/releases/download/${PV}/${PN}-${PV}.tar.gz \ + " +SRC_URI[md5sum] = "a2be6f200dd9ada2501474a6877a73ef" +SRC_URI[sha256sum] = "4b66c798dab093f0fa738e5c10688d395a463287d13678c208a81051af5d2429" + +inherit autotools pkgconfig gettext gtk-immodules-cache gobject-introspection gtk-doc gtk-icon-cache gsettings + +REQUIRED_DISTRO_FEATURES = "x11" + +DEPENDS = " intltool dbus-glib python3-dbus iso-codes dconf libnotify python3-pygobject adwaita-icon-theme librsvg" +DEPENDS_append_class-target = " intltool-native python-pygobject-native" +RDEPENDS_${PN} += " iso-codes adwaita-icon-theme librsvg-gtk" + +PACKAGECONFIG[gtk+] = ",--disable-gtk2,gtk+,gtk+" +PACKAGECONFIG[gtk+3] = ",--disable-gtk3,gtk+3,gtk+3" +PACKAGECONFIG[wayland] = "--enable-wayland,,wayland,wayland" + +PACKAGECONFIG ?= "gtk+ gtk+3" +PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}" + +GTKIMMODULES_PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'gtk+', 'ibus-gtk2.0', '', d)}" +GTKIMMODULES_PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'gtk+3', 'ibus-gtk3', '', d)}" + +EXTRA_OECONF += " \ + --disable-emoji-dict \ + --disable-unicode-dict \ +" + +BBCLASSEXTEND = "native pythonnative" + +FILES_${PN} += " \ + ${sysconfdir}/dconf/profile \ + ${sysconfdir}/dconf/db/ibus.d/00-upstream-settings \ + ${sysconfdir}/dconf/profile/ibus \ + ${libdir}/libibus-1.0.so.5.0.518 \ + ${libdir}/libibus-1.0.so.5 \ + ${libdir}/gtk-?.?/*/immodules/im-ibus.so \ + ${bindir}/ibus \ + ${bindir}/ibus-setup \ + ${bindir}/ibus-daemon \ + ${datadir}/ibus/engine \ + ${datadir}/ibus/component \ + ${datadir}/ibus/setup \ + ${datadir}/ibus/component/gtkpanel.xml \ + ${datadir}/ibus/component/simple.xml \ + ${datadir}/ibus/component/dconf.xml \ + ${datadir}/ibus/setup/emojilang.py \ + ${datadir}/ibus/setup/main.py \ + ${datadir}/ibus/setup/enginecombobox.py \ + ${datadir}/ibus/setup/setup.ui \ + ${datadir}/ibus/setup/enginedialog.py \ + ${datadir}/ibus/setup/i18n.py \ + ${datadir}/ibus/setup/engineabout.py \ + ${datadir}/ibus/setup/icon.py \ + ${datadir}/ibus/setup/keyboardshortcut.py \ + ${datadir}/ibus/setup/enginetreeview.py \ + ${datadir}/ibus/keymaps/jp \ + ${datadir}/ibus/keymaps/kr \ + ${datadir}/ibus/keymaps/common \ + ${datadir}/ibus/keymaps/modifiers \ + ${datadir}/ibus/keymaps/us \ + ${datadir}/ibus/keymaps/in \ + ${datadir}/applications/ibus-setup.desktop \ + ${datadir}/dbus-1/services/org.freedesktop.IBus.service \ + ${datadir}/dbus-1/services/org.freedesktop.portal.IBus.service \ + ${datadir}/vala/vapi/ibus-1.0.vapi \ + ${datadir}/vala/vapi/ibus-1.0.deps \ + ${libexecdir}/ibus-engine-simple \ + ${libexecdir}/ibus-portal \ + ${libexecdir}/ibus-dconf \ + ${libexecdir}/ibus-x11 \ + ${libexecdir}/ibus-ui-gtk3 \ + ${datadir}/GConf/gsettings/ibus.convert \ + ${datadir}/glib-2.0/schemas/org.freedesktop.ibus.gschema.xml \ + ${datadir}/bash-completion/* \ + ${datadir}/icons/* \ + ${libdir}/python?.?/????-packages/gi/overrides/IBus.py \ + ${libdir}/python?.?/????-packages/gi/overrides/IBus.py? \ +" + +do_configure_prepend() { + export PYTHON=python3 +} + +do_install_append() { + # Fix the installation path of the GObject Inspection overrides for Python3 + python_version=$(python3 -c 'import sys; print("%s.%s" % (sys.version_info.major, sys.version_info.minor))') + mkdir -p ${D}/usr/lib/python${python_version}/site-packages/gi/overrides + mv ${D}/${RECIPE_SYSROOT_NATIVE}/usr/lib/python${python_version}/site-packages/gi/overrides/IBus.py ${D}/usr/lib/python${python_version}/site-packages/gi/overrides/ + rm -rf ${D}/${RECIPE_SYSROOT_NATIVE}/usr/lib/python${python_version}/site-packages/gi/overrides + find ${D} -type d -empty -delete +}
Signature · 1 line
2.11.0
PATCH v3 4/7 ibus-anthy: add ibus-anthy recipe
In reply to Pablo SaavedraIt is a Japanese input engine for IBus.
--- .../ibus/ibus-anthy/fix_anthy_include_in_gir.patch | 19 +++++++++++ meta-oe/recipes-support/ibus/ibus-anthy_1.5.10.bb | 37 ++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 meta-oe/recipes-support/ibus/ibus-anthy/fix_anthy_include_in_gir.patch create mode 100644 meta-oe/recipes-support/ibus/ibus-anthy_1.5.10.bb
meta-oe/recipes-support/ibus/ibus-anthy/fix_anthy_include_in_gir.patch new file +19 -0
@@ -0,0 +1,19 @@ +Index: ibus-anthy-1.5.10/gir/Makefile.am +=================================================================== +--- ibus-anthy-1.5.10.orig/gir/Makefile.am ++++ ibus-anthy-1.5.10/gir/Makefile.am +@@ -68,12 +68,12 @@ Anthy_9000_gir_SCANNERFLAGS = \ + --warn-all \ + $(NULL) + Anthy_9000_gir_INCLUDES = GObject-2.0 +-Anthy_9000_gir_LIBS = $(libanthygobject) anthy ++Anthy_9000_gir_LIBS = $(libanthygobject) + Anthy_9000_gir_CFLAGS = @ANTHY_CFLAGS@ + Anthy_9000_gir_FILES = \ + $(libanthygobject_1_0_la_SOURCES) \ + $(anthyinclude_HEADERS) \ +- $(ANTHY_INCLUDEDIR)/anthy/anthy.h \ ++ $(STAGING_DIR_HOST)$(ANTHY_INCLUDEDIR)/anthy/anthy.h \ + $(NULL) + INTROSPECTION_GIRS += Anthy-9000.gir +
meta-oe/recipes-support/ibus/ibus-anthy_1.5.10.bb new file +37 -0
@@ -0,0 +1,37 @@ +DESCRIPTION = "It is a Japanese input engine for IBus." +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" +SECTION = "inputmethods" + +SRC_URI = "https://github.com/ibus/${PN}/releases/download/${PV}/${PN}-${PV}.tar.gz \ + file://fix_anthy_include_in_gir.patch \ +" +SRC_URI[md5sum] = "d7c2c410619edacfbaca6a9d02ed8982" +SRC_URI[sha256sum] = "cc33e0d1afe7e4a1f0a092d2a4575269ac21373771e49579c434afb4eef9f84a" + +# Needed to find the Anthy included headers (anthy/anthy.h) +export STAGING_DIR_HOST + +inherit autotools pkgconfig gettext gobject-introspection gtk-immodules-cache gtk-icon-cache gsettings qemu + +REQUIRED_DISTRO_FEATURES = "x11" + +DEPENDS = " anthy ibus gobject-introspection adwaita-icon-theme" +RDEPENDS_${PN} += " ibus takao-fonts anthy libanthy0" + +DEPENDS_append_class-target = " intltool-native qemu-native" + +do_configure_prepend() { + export PYTHON=python2 +} + + +FILES_${PN} += " \ + ${datadir}/icons/* \ + ${datadir}/ibus \ + ${datadir}/appdata \ + ${datadir}/ibus/component/anthy.xml \ + ${datadir}/appdata/ibus-anthy.appdata.xml \ + ${datadir}/gir-1.0/Anthy-9000.gir \ + ${datadir}/glib-2.0/schemas/org.freedesktop.ibus.engine.anthy.gschema.xml \ +"
Signature · 1 line
2.11.0
PATCH v3 5/7 ibus-pinyin: add ibus-pinyin recipe
In reply to Pablo SaavedraPinYin engine for IBus.
Requires: pyzy
--- meta-oe/recipes-support/ibus/ibus-pinyin_1.5.0.bb | 30 +++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 meta-oe/recipes-support/ibus/ibus-pinyin_1.5.0.bb
meta-oe/recipes-support/ibus/ibus-pinyin_1.5.0.bb new file +30 -0
@@ -0,0 +1,30 @@ +DESCRIPTION = "PinYin engine for IBus." +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" +SECTION = "inputmethods" + +SRC_URI = "https://github.com/ibus/${PN}/archive/${PV}.tar.gz \ + " +SRC_URI[md5sum] = "9a794c76f3e8fa888c7a0a097de2ebf0" +SRC_URI[sha256sum] = "79fc51517ab8dec696cbbbca9526459b59f4eb045492ea88e5f9e01160b905db" + +inherit distro_features_check autotools lib_package + +REQUIRED_DISTRO_FEATURES = "x11" + +DEPENDS = "ibus enchant hunspell pyzy pyxdg" +DEPENDS_append_class-target = " intltool-native glib-2.0-native" +RDEPENDS_${PN} += " ibus enchant hunspell pyzy pyxdg" + +BBCLASSEXTEND = "native" + +EXTRA_OECONF += "--disable-static \ + --disable-boost \ +" + +FILES_${PN} += "${datadir}/ibus/component/pinyin.xml \ +" + +do_configure_prepend() { + export PYTHON=python3 +}
Signature · 1 line
2.11.0
PATCH v3 6/7 ibus-table: add ibus-table recipe
In reply to Pablo Saavedra--- meta-oe/recipes-support/ibus/ibus-table_1.9.21.bb | 29 +++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 meta-oe/recipes-support/ibus/ibus-table_1.9.21.bb
meta-oe/recipes-support/ibus/ibus-table_1.9.21.bb new file +29 -0
@@ -0,0 +1,29 @@ +DESCRIPTION = "framework for table based input methods using IBus" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" +SECTION = "inputmethods" + +SRC_URI = "https://github.com/kaio/${PN}/releases/download/${PV}/${PN}-${PV}.tar.gz \ + " +SRC_URI[md5sum] = "1f7b3fab7271e409c9ef4c43f5c3fc78" +SRC_URI[sha256sum] = "017bcd1cb9f5a79df46d1e4ac28f166ce2338938a2037ebe86783da0abca0c24" + +inherit distro_features_check autotools gettext lib_package gsettings + +DEPENDS = " ibus" +RDEPENDS_${PN} += " ibus" + +BBCLASSEXTEND = "native" + +do_configure_prepend() { + export PYTHON=python3 +} + +FILES_${PN} += "${datadir}/ibus/component/pinyin.xml \ + ${datadir}/metainfo \ + ${datadir}/ibus \ + ${datadir}/glib-2.0 \ + ${datadir}/metainfo/ibus-table.appdata.xml \ + ${datadir}/ibus/component/table.xml \ + ${datadir}/glib-2.0/schemas/org.freedesktop.ibus.engine.table.gschema.xml \ +"
Signature · 1 line
2.11.0
PATCH v3 7/7 ibus-table-chinese: add ibus-table-chinese recipe
In reply to Pablo Saavedra--- .../0001-revert-CMakeLists.txt.patch | 204 ++ .../ibus/ibus-table-chinese/0002-add-Modules.patch | 2933 ++++++++++++++++++++ .../0003-add-ChangeLog.prev.patch | 58 + .../0005-fix-cmake-cross-compile.patch | 130 + .../ibus/ibus-table-chinese_1.8.2.bb | 82 + 5 files changed, 3407 insertions(+) create mode 100644 meta-oe/recipes-support/ibus/ibus-table-chinese/0001-revert-CMakeLists.txt.patch create mode 100644 meta-oe/recipes-support/ibus/ibus-table-chinese/0002-add-Modules.patch create mode 100644 meta-oe/recipes-support/ibus/ibus-table-chinese/0003-add-ChangeLog.prev.patch create mode 100644 meta-oe/recipes-support/ibus/ibus-table-chinese/0005-fix-cmake-cross-compile.patch create mode 100644 meta-oe/recipes-support/ibus/ibus-table-chinese_1.8.2.bb
meta-oe/recipes-support/ibus/ibus-table-chinese/0001-revert-CMakeLists.txt.patch new file +204 -0
@@ -0,0 +1,204 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,17 +1,20 @@ + cmake_minimum_required(VERSION 2.6.2) + +-# Included scripts do automatic cmake_policy PUSH and POP. +-# OLD: CMake policy in included script will affect the invoker. +-# CMAKE_POLICY(SET CMP0011 OLD) ++# CMP0011 should be set here, otherwise policy set in module won't affect ++# here. ++CMAKE_POLICY(SET CMP0011 OLD) + + # Default CMAKE_INSTALL_PREFIX should be set before PROJECT() + SET(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "Install dir prefix") + + # Whether to build on fedora +-SET(CMAKE_FEDORA_ENABLE_FEDORA_BUILD "1" CACHE STRING "Enable fedora build") ++SET(CMAKE_FEDORA_ENABLE_FEDORA_BUILD "0" CACHE STRING "Enable fedora build") + +-# Message level INFO1 (5) +-SET(MANAGE_MESSAGE_LEVEL 5 CACHE STRING "Message (Verbose) Level") ++# Message level M_OFF (4) ++SET(MANAGE_MESSAGE_LEVEL 4 CACHE STRING "Message (Verbose) Level") ++ ++# Default support Gnome shell ++SET(GNOME_SHELL 1) + + #################################################################### + # Project specific information +@@ -19,34 +22,20 @@ + PROJECT(ibus-table-chinese NONE) + SET(PRJ_SUMMARY "Chinese input tables for IBus") + +-SET(SUMMARY_TRANSLATIONS +- "zh_CN" "中文码表输入法" +- "zh_TW" "中文碼表輸入法" +- ) +- + SET(PRJ_DESCRIPTION + "ibus-table-chinese is provides the infrastructure for Chinese input methods. + Input tables themselves are in subpackages." + ) + +-SET(DESCRIPTION_TRANSLATIONS +- "zh_TW" "ibus-table-chinese 提供了中文碼表輸入法的基礎架構。 +- 輸入法本身則在子套件裡。" +- ) +- + SET(AUTHORS "Yuwei Yu, Caius 'kaio' Chance, Ding-Yi Chen") + SET(MAINTAINER "Ding-Yi Chen <[email protected]>") + SET(VENDOR "Red Hat, Inc") + SET(LICENSE "GPLv3+") +-SET(PRJ_GROUP "System Environment/Libraries") +-SET(BUILD_ARCH "noarch") +-SET(RPM_SPEC_URL "http://code.google.com/p/ibus/") +-SET(RPM_SPEC_SOURCES "https://fedorahosted.org/releases/c/m/%{name}/%{name}-%{version}-Source.tar.gz") + + #################################################################### + # Includes + # +-LIST(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/Modules) ++SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/Modules ${CMAKE_ROOT}/Modules ) + + # Create a link if Modules/ does not exists + IF(EXISTS ${CMAKE_SOURCE_DIR}/cmake-fedora/Modules) +@@ -63,6 +52,7 @@ + SET(LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Library dir") + ENDIF(CMAKE_SYSTEM_PROCESSOR MATCHES "64") + SET(LIBEXEC_DIR "${LIB_DIR}" CACHE PATH "LIBEXEC dir") ++ MESSAGE("*Hi") + ENDIF(NOT CMAKE_FEDORA_ENABLE_FEDORA_BUILD) + + INCLUDE(ManageEnvironment RESULT_VARIABLE MANAGE_ENVIRONMENT_PATH) +@@ -77,56 +67,82 @@ + + INCLUDE(ManageVersion) + RELEASE_NOTES_READ_FILE() +-INCLUDE(ManageArchive) +-INCLUDE(ManageFile) +-INCLUDE(ManageSourceVersionControl) +-INCLUDE(ManageTarget) +-INCLUDE(ManageTranslation) + INCLUDE(ManageUninstall) +-ENABLE_TESTING() + + #################################################################### +-# Dependencies ++# Required + # + +-INCLUDE(ManageDependency) +-## Requires +-MANAGE_DEPENDENCY(REQUIRES IBUS-TABLE VER "1.2.0" REQUIRED) +- +-## Build Requires +-MANAGE_DEPENDENCY(BUILD_REQUIRES CMAKE VER "2.6.2" REQUIRED) +-MANAGE_DEPENDENCY(BUILD_REQUIRES IBUS-TABLE VER "1.2.0" REQUIRED DEVEL) +-PRJ_INFO_CMAKE_APPEND(${PRJ_INFO_CMAKE} REQUIRES) +-PRJ_INFO_CMAKE_APPEND(${PRJ_INFO_CMAKE} BUILD_REQUIRES) ++FIND_PACKAGE(PkgConfig) ++PKG_CHECK_MODULES(IBUS_TABLE REQUIRED ibus-table>=1.2) + + #################################################################### + # Building + # ++ + ADD_SUBDIRECTORY(tables) + + #################################################################### + # Installing + # + +-MANAGE_SOURCE_VERSION_CONTROL_GIT() ++# Install docs ++# Note: Need to use filename only, otherwise ++# ${CMAKE_SOURCE_DIR}/RELEASE-NOTES.txt will be deleted in spec ++# ++ ++GET_FILENAME_COMPONENT(_releaseFileName "${RELEASE_FILE}" NAME) ++SET(INSTALL_DOCS ${_releaseFileName} AUTHORS README ChangeLog COPYING README) ++STRING_JOIN(PRJ_DOC_LIST " " ${INSTALL_DOCS}) ++ ++INSTALL(FILES ${INSTALL_DOCS} ++ DESTINATION "${PRJ_DOC_DIR}") + +-INSTALL(FILES AUTHORS README ChangeLog COPYING DESTINATION ${PRJ_DOC_DIR}) ++#################################################################### ++# Source Version Control ++# ++INCLUDE(ManageSourceVersionControl) ++MANAGE_SOURCE_VERSION_CONTROL_GIT() + + #################################################################### + # Packing + # ++INCLUDE(ManageArchive) + +-## Pack Source +-SET(SOURCE_ARCHIVE_DIR ${CMAKE_BINARY_DIR}/SOURCES CACHE PATH "Source Archive Dir") +-PACK_SOURCE_ARCHIVE("${SOURCE_ARCHIVE_DIR}" +- GITIGNORE ${CMAKE_SOURCE_DIR}/.gitignore ++IF(CMAKE_FEDORA_ENABLE_FEDORA_BUILD) ++ INCLUDE(ManageRPM) ++ INCLUDE(ManageReleaseFedora) ++ENDIF(CMAKE_FEDORA_ENABLE_FEDORA_BUILD) ++INCLUDE(ManageRelease) ++ ++SET(PRJ_IGNORE_FILES_COMMON ++ "/doc/" "\\\\.spec$" "messages.po$" "\\\\.orig$" "/cmake-fedora/" ++ "/\\\\.cache/" ++ "\\\\.db$" ++ ) ++ ++LIST(APPEND PRJ_IGNORE_FILES_COMMON ++ "\\\\.utf8$" "\\\\.tmp$" "\\\\.freq$" "\\\\.tab$" ++ "tables/array/.*\\\\.head$" ++ "array30.txt" "array30-big.txt" "wubi-haifeng86.txt" + ) + +-## Pack RPM ++LIST(APPEND SOURCE_ARCHIVE_IGNORE_FILES ++ ${PRJ_IGNORE_FILES_COMMON} "/bin/" "\\\\.xml$" "\\\\.schemas") ++ ++IF(RPM_BUILD_SOURCES) ++ SET(SOURCE_ARCHIVE_DIR ${RPM_BUILD_SOURCES}) ++ELSE(RPM_BUILD_SOURCES) ++ SET(SOURCE_ARCHIVE_DIR ${CMAKE_BINARY_DIR}/SOURCES) ++ENDIF(RPM_BUILD_SOURCES) ++ ++PACK_SOURCE_ARCHIVE("${SOURCE_ARCHIVE_DIR}") + IF(CMAKE_FEDORA_ENABLE_FEDORA_BUILD) +- SET(RPM_BUILD_SOURCES ${SOURCE_ARCHIVE_DIR}) +- INCLUDE(ManageRPM) +- PACK_RPM(SPEC_IN "SPECS/project.spec.in") ++ PACK_RPM() ++ RELEASE_FEDORA(fedora el6) ++ # "Off" Warning is displayed if mock is not installed. ++ RPM_MOCK_BUILD() ++ MANAGE_RELEASE(release_fedora) + ENDIF(CMAKE_FEDORA_ENABLE_FEDORA_BUILD) + + #################################################################### +@@ -142,20 +158,10 @@ + #MANAGE_UPLOAD_CMD(scp src UPLOAD_FILES ${SOURCE_ARCHIVE_FILE}) + #ADD_DEPENDENCIES(upload upload_src) + +-INCLUDE(ManageRelease) +-IF(CMAKE_FEDORA_ENABLE_FEDORA_BUILD) +- INCLUDE(ManageReleaseFedora) +- RELEASE_FEDORA(fedora el6) +- # "Off" Warning is displayed if mock is not installed. +- MANAGE_RELEASE(tag_push release_fedora) +-ELSE(CMAKE_FEDORA_ENABLE_FEDORA_BUILD) +- MANAGE_RELEASE(tag_push) +-ENDIF(CMAKE_FEDORA_ENABLE_FEDORA_BUILD) +- +- + #################################################################### + # Test Suites. + # ++#ENABLE_TESTING() + #ADD_TEST("Test" test_cmd1) + +
meta-oe/recipes-support/ibus/ibus-table-chinese/0002-add-Modules.patch new file +2933 -0
2,796 lines not on this page · raw message
meta-oe/recipes-support/ibus/ibus-table-chinese/0003-add-ChangeLog.prev.patch new file +58 -0
58 lines not on this page · raw message
meta-oe/recipes-support/ibus/ibus-table-chinese/0005-fix-cmake-cross-compile.patch new file +130 -0
130 lines not on this page · raw message
meta-oe/recipes-support/ibus/ibus-table-chinese_1.8.2.bb new file +82 -0
82 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.11.0
Part of the diff is not shown here. View the raw message.
Re: [meta-openembedded][PATCH v3 3/7] ibus: add ibus recipe
In reply to Pablo Saavedrahttp://errors.yoctoproject.org/Errors/Details/202859/
Quoted 122 lines · Pablo Saavedra
Intelligent Input Bus for Linux/Unix https://github.com/ibus/ibus/wiki
Collision with: https://patchwork.openembedded.org/patch/155947/
Signed-off-by Pablo Saavedra <[email protected]>--- meta-oe/recipes-support/ibus/ibus_1.5.19.bb | 97 +++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) create mode 100644 meta-oe/recipes-support/ibus/ibus_1.5.19.bbmeta-oe/recipes-support/ibus/ibus_1.5.19.bb new file +97
-1@@ -0,0 +1,97 @@ +DESCRIPTION = "A multilingual user input method library" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" +SECTION = "inputmethods" + +SRC_URI = "https://github.com/ibus/ibus/releases/download/${PV}/${PN}-${PV}.tar.gz \ + " +SRC_URI[md5sum] = "a2be6f200dd9ada2501474a6877a73ef" +SRC_URI[sha256sum] = "4b66c798dab093f0fa738e5c10688d395a463287d13678c208a81051af5d2429" + +inherit autotools pkgconfig gettext gtk-immodules-cache gobject-introspection gtk-doc gtk-icon-cache gsettings + +REQUIRED_DISTRO_FEATURES = "x11" + +DEPENDS = " intltool dbus-glib python3-dbus iso-codes dconf libnotify python3-pygobject adwaita-icon-theme librsvg" +DEPENDS_append_class-target = " intltool-native python-pygobject-native" +RDEPENDS_${PN} += " iso-codes adwaita-icon-theme librsvg-gtk" + +PACKAGECONFIG[gtk+] = ",--disable-gtk2,gtk+,gtk+" +PACKAGECONFIG[gtk+3] = ",--disable-gtk3,gtk+3,gtk+3" +PACKAGECONFIG[wayland] = "--enable-wayland,,wayland,wayland" + +PACKAGECONFIG ?= "gtk+ gtk+3" +PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}" + +GTKIMMODULES_PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'gtk+', 'ibus-gtk2.0', '', d)}" +GTKIMMODULES_PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'gtk+3', 'ibus-gtk3', '', d)}" + +EXTRA_OECONF += " \ + --disable-emoji-dict \ + --disable-unicode-dict \ +" + +BBCLASSEXTEND = "native pythonnative" + +FILES_${PN} += " \ + ${sysconfdir}/dconf/profile \ + ${sysconfdir}/dconf/db/ibus.d/00-upstream-settings \ + ${sysconfdir}/dconf/profile/ibus \ + ${libdir}/libibus-1.0.so.5.0.518 \ + ${libdir}/libibus-1.0.so.5 \ + ${libdir}/gtk-?.?/*/immodules/im-ibus.so \ + ${bindir}/ibus \ + ${bindir}/ibus-setup \ + ${bindir}/ibus-daemon \ + ${datadir}/ibus/engine \ + ${datadir}/ibus/component \ + ${datadir}/ibus/setup \ + ${datadir}/ibus/component/gtkpanel.xml \ + ${datadir}/ibus/component/simple.xml \ + ${datadir}/ibus/component/dconf.xml \ + ${datadir}/ibus/setup/emojilang.py \ + ${datadir}/ibus/setup/main.py \ + ${datadir}/ibus/setup/enginecombobox.py \ + ${datadir}/ibus/setup/setup.ui \ + ${datadir}/ibus/setup/enginedialog.py \ + ${datadir}/ibus/setup/i18n.py \ + ${datadir}/ibus/setup/engineabout.py \ + ${datadir}/ibus/setup/icon.py \ + ${datadir}/ibus/setup/keyboardshortcut.py \ + ${datadir}/ibus/setup/enginetreeview.py \ + ${datadir}/ibus/keymaps/jp \ + ${datadir}/ibus/keymaps/kr \ + ${datadir}/ibus/keymaps/common \ + ${datadir}/ibus/keymaps/modifiers \ + ${datadir}/ibus/keymaps/us \ + ${datadir}/ibus/keymaps/in \ + ${datadir}/applications/ibus-setup.desktop \ + ${datadir}/dbus-1/services/org.freedesktop.IBus.service \ + ${datadir}/dbus-1/services/org.freedesktop.portal.IBus.service \ + ${datadir}/vala/vapi/ibus-1.0.vapi \ + ${datadir}/vala/vapi/ibus-1.0.deps \ + ${libexecdir}/ibus-engine-simple \ + ${libexecdir}/ibus-portal \ + ${libexecdir}/ibus-dconf \ + ${libexecdir}/ibus-x11 \ + ${libexecdir}/ibus-ui-gtk3 \ + ${datadir}/GConf/gsettings/ibus.convert \ + ${datadir}/glib-2.0/schemas/org.freedesktop.ibus.gschema.xml \ + ${datadir}/bash-completion/* \ + ${datadir}/icons/* \ + ${libdir}/python?.?/????-packages/gi/overrides/IBus.py \ + ${libdir}/python?.?/????-packages/gi/overrides/IBus.py? \ +" + +do_configure_prepend() { + export PYTHON=python3 +} + +do_install_append() { + # Fix the installation path of the GObject Inspection overrides for Python3 + python_version=$(python3 -c 'import sys; print("%s.%s" % (sys.version_info.major, sys.version_info.minor))') + mkdir -p ${D}/usr/lib/python${python_version}/site-packages/gi/overrides + mv ${D}/${RECIPE_SYSROOT_NATIVE}/usr/lib/python${python_version}/site-packages/gi/overrides/IBus.py ${D}/usr/lib/python${python_version}/site-packages/gi/overrides/ + rm -rf ${D}/${RECIPE_SYSROOT_NATIVE}/usr/lib/python${python_version}/site-packages/gi/overrides + find ${D} -type d -empty -delete +} --2.11.0
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [meta-openembedded][PATCH v3 3/7] ibus: add ibus recipe
and
http://errors.yoctoproject.org/Errors/Details/202863/
Quoted 125 lines · Khem Raj
http://errors.yoctoproject.org/Errors/Details/202859/
Quoted 122 lines · Pablo Saavedra
Intelligent Input Bus for Linux/Unix https://github.com/ibus/ibus/wiki
Collision with: https://patchwork.openembedded.org/patch/155947/
Signed-off-by Pablo Saavedra <[email protected]>--- meta-oe/recipes-support/ibus/ibus_1.5.19.bb | 97 +++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) create mode 100644 meta-oe/recipes-support/ibus/ibus_1.5.19.bbmeta-oe/recipes-support/ibus/ibus_1.5.19.bb new file +97
-1@@ -0,0 +1,97 @@ +DESCRIPTION = "A multilingual user input method library" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" +SECTION = "inputmethods" + +SRC_URI = "https://github.com/ibus/ibus/releases/download/${PV}/${PN}-${PV}.tar.gz \ + " +SRC_URI[md5sum] = "a2be6f200dd9ada2501474a6877a73ef" +SRC_URI[sha256sum] = "4b66c798dab093f0fa738e5c10688d395a463287d13678c208a81051af5d2429" + +inherit autotools pkgconfig gettext gtk-immodules-cache gobject-introspection gtk-doc gtk-icon-cache gsettings + +REQUIRED_DISTRO_FEATURES = "x11" + +DEPENDS = " intltool dbus-glib python3-dbus iso-codes dconf libnotify python3-pygobject adwaita-icon-theme librsvg" +DEPENDS_append_class-target = " intltool-native python-pygobject-native" +RDEPENDS_${PN} += " iso-codes adwaita-icon-theme librsvg-gtk" + +PACKAGECONFIG[gtk+] = ",--disable-gtk2,gtk+,gtk+" +PACKAGECONFIG[gtk+3] = ",--disable-gtk3,gtk+3,gtk+3" +PACKAGECONFIG[wayland] = "--enable-wayland,,wayland,wayland" + +PACKAGECONFIG ?= "gtk+ gtk+3" +PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}" + +GTKIMMODULES_PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'gtk+', 'ibus-gtk2.0', '', d)}" +GTKIMMODULES_PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'gtk+3', 'ibus-gtk3', '', d)}" + +EXTRA_OECONF += " \ + --disable-emoji-dict \ + --disable-unicode-dict \ +" + +BBCLASSEXTEND = "native pythonnative" + +FILES_${PN} += " \ + ${sysconfdir}/dconf/profile \ + ${sysconfdir}/dconf/db/ibus.d/00-upstream-settings \ + ${sysconfdir}/dconf/profile/ibus \ + ${libdir}/libibus-1.0.so.5.0.518 \ + ${libdir}/libibus-1.0.so.5 \ + ${libdir}/gtk-?.?/*/immodules/im-ibus.so \ + ${bindir}/ibus \ + ${bindir}/ibus-setup \ + ${bindir}/ibus-daemon \ + ${datadir}/ibus/engine \ + ${datadir}/ibus/component \ + ${datadir}/ibus/setup \ + ${datadir}/ibus/component/gtkpanel.xml \ + ${datadir}/ibus/component/simple.xml \ + ${datadir}/ibus/component/dconf.xml \ + ${datadir}/ibus/setup/emojilang.py \ + ${datadir}/ibus/setup/main.py \ + ${datadir}/ibus/setup/enginecombobox.py \ + ${datadir}/ibus/setup/setup.ui \ + ${datadir}/ibus/setup/enginedialog.py \ + ${datadir}/ibus/setup/i18n.py \ + ${datadir}/ibus/setup/engineabout.py \ + ${datadir}/ibus/setup/icon.py \ + ${datadir}/ibus/setup/keyboardshortcut.py \ + ${datadir}/ibus/setup/enginetreeview.py \ + ${datadir}/ibus/keymaps/jp \ + ${datadir}/ibus/keymaps/kr \ + ${datadir}/ibus/keymaps/common \ + ${datadir}/ibus/keymaps/modifiers \ + ${datadir}/ibus/keymaps/us \ + ${datadir}/ibus/keymaps/in \ + ${datadir}/applications/ibus-setup.desktop \ + ${datadir}/dbus-1/services/org.freedesktop.IBus.service \ + ${datadir}/dbus-1/services/org.freedesktop.portal.IBus.service \ + ${datadir}/vala/vapi/ibus-1.0.vapi \ + ${datadir}/vala/vapi/ibus-1.0.deps \ + ${libexecdir}/ibus-engine-simple \ + ${libexecdir}/ibus-portal \ + ${libexecdir}/ibus-dconf \ + ${libexecdir}/ibus-x11 \ + ${libexecdir}/ibus-ui-gtk3 \ + ${datadir}/GConf/gsettings/ibus.convert \ + ${datadir}/glib-2.0/schemas/org.freedesktop.ibus.gschema.xml \ + ${datadir}/bash-completion/* \ + ${datadir}/icons/* \ + ${libdir}/python?.?/????-packages/gi/overrides/IBus.py \ + ${libdir}/python?.?/????-packages/gi/overrides/IBus.py? \ +" + +do_configure_prepend() { + export PYTHON=python3 +} + +do_install_append() { + # Fix the installation path of the GObject Inspection overrides for Python3 + python_version=$(python3 -c 'import sys; print("%s.%s" % (sys.version_info.major, sys.version_info.minor))') + mkdir -p ${D}/usr/lib/python${python_version}/site-packages/gi/overrides + mv ${D}/${RECIPE_SYSROOT_NATIVE}/usr/lib/python${python_version}/site-packages/gi/overrides/IBus.py ${D}/usr/lib/python${python_version}/site-packages/gi/overrides/ + rm -rf ${D}/${RECIPE_SYSROOT_NATIVE}/usr/lib/python${python_version}/site-packages/gi/overrides + find ${D} -type d -empty -delete +} --2.11.0
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [meta-openembedded][PATCH v3 1/7] pyzy: add pyzy recipe
In reply to Pablo Saavedrafails for arm (raspberrypi3)
http://errors.yoctoproject.org/Errors/Details/202895/
Quoted 44 lines · Pablo Saavedra
The chinese pinyin and bopomofo conversion library
Signed-off-by Pablo Saavedra <[email protected]>--- meta-oe/recipes-support/pyzy/pyzy_git.bb | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 meta-oe/recipes-support/pyzy/pyzy_git.bbmeta-oe/recipes-support/pyzy/pyzy_git.bb new file +21
-1@@ -0,0 +1,21 @@ +DESCRIPTION = "The Chinese PinYin and Bopomofo conversion library" +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=4b54a1fd55a448865a0b32d41598759d" +SECTION = "inputmethods" + +SRCREV = "6d9c3cdff364e0da75e1c26222240f26370ebf73" +SRC_URI = "git://github.com/pyzy/pyzy.git;protocol=https;branch=master" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +DEPENDS = "glib-2.0 util-linux sqlite3" + +EXTRA_OECONF += " \ + --disable-opencc \ + --disable-db-open-phrase \ + --disable-db-android \ +" + +BBCLASSEXTEND = "native" --2.11.0
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel