Skip to contentSkip to conversation

pyzy: add pyzy recipe

PATCH In review Pablo Saavedra 2 participants 12 messages Aug 2, 2019 – Aug 3, 2019

lore
Share & tools
lore
#0 lore raw

PATCH v6 1/10 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
new file mode 100644
index 000000000..2a1df6187
@@ -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
#1 lore raw

PATCH v6 2/10 ibus: add ibus recipe

Intelligent 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
new file mode 100644
index 000000000..57afe0ade
@@ -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}/${BPN}-${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
+  cp ${S}/bindings/pygobject/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
#2 lore raw

Re: [meta-openembedded][PATCH v6 02/10] ibus: add ibus recipe

Quoted 40 lines · Pablo Saavedra

Intelligent 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 +24 -0
new file mode 100644
index 000000000..57afe0ade
@@ -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}/${BPN}-${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)}"

meta-oe/recipes-support/ibus/ibus_1.5.19.bb line 34

Quoted 10 lines
meta-oe/recipes-support/ibus/ibus_1.5.19.bb new file +10 -0
+
+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"

this ends up in bunch of non existing dependencies on libnotify-native iso-codes-native, secondly pythonnative is to be inherited

and not bbextended

Quoted 43 lines
meta-oe/recipes-support/ibus/ibus_1.5.19.bb new file +43 -0
+
+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 \

meta-oe/recipes-support/ibus/ibus_1.5.19.bb line 87

Quoted 10 lines
meta-oe/recipes-support/ibus/ibus_1.5.19.bb new file +10 -0
+    ${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

if you inherit python3native you dont need to export it like this

meta-oe/recipes-support/ibus/ibus_1.5.19.bb line 93

Quoted 6 lines
meta-oe/recipes-support/ibus/ibus_1.5.19.bb new file +6 -0
+}
+
+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

this will depend on version of native python and not target one even though they maybe same if python3-native is used but could be wrong

you might want to inherit python3-dir

and use PYTHON_SITEPACKAGES_DIR variable

Quoted 4 lines
meta-oe/recipes-support/ibus/ibus_1.5.19.bb new file +4 -0
+  cp ${S}/bindings/pygobject/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
+}
#3 lore raw

PATCH v6 3/10 ibus-anthy: add ibus-anthy recipe

In reply to Pablo Saavedra

It 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
new file mode 100644
index 000000000..9812be08f
@@ -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
new file mode 100644
index 000000000..d42f87ae5
@@ -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
#4 lore raw

Re: [meta-openembedded][PATCH v6 03/10] ibus-anthy: add ibus-anthy recipe

Quoted 56 lines · Pablo Saavedra

It 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
new file mode 100644
index 000000000..9812be08f
@@ -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 +15 -0
new file mode 100644
index 000000000..d42f87ae5
@@ -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

meta-oe/recipes-support/ibus/ibus-anthy_1.5.10.bb line 25

Quoted 10 lines
meta-oe/recipes-support/ibus/ibus-anthy_1.5.10.bb new file +10 -0
+
+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

maybe just inherit pythonnative

Quoted 12 lines
meta-oe/recipes-support/ibus/ibus-anthy_1.5.10.bb new file +12 -0
+}
+
+
+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 \
+"
#5 lore raw

PATCH v6 4/10 ibus-pinyin: add ibus-pinyin recipe

In reply to Pablo Saavedra

PinYin 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
new file mode 100644
index 000000000..a91ed33cb
@@ -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
#6 lore raw

PATCH v6 5/10 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
new file mode 100644
index 000000000..faa331031
@@ -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
#7 lore raw

PATCH v6 6/10 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
new file mode 100644
index 000000000..d677dc49a
@@ -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.

#8 lore raw

PATCH v6 7/10 ibus: Bumping up to 1.5.20

In reply to Pablo Saavedra
---
 .../ibus/ibus-anthy/fix_anthy_include_in_gir.patch |  4 ++--
 .../{ibus-anthy_1.5.10.bb => ibus-anthy_1.5.11.bb} |  8 ++++++--
 .../0004-skip-ibus-table-createdb.patch            | 22 ++++++++++++++++++++++
 .../ibus/{ibus_1.5.19.bb => ibus_1.5.20.bb}        |  4 ++--
 4 files changed, 32 insertions(+), 6 deletions(-)
 rename meta-oe/recipes-support/ibus/{ibus-anthy_1.5.10.bb => ibus-anthy_1.5.11.bb} (78%)
 create mode 100644 meta-oe/recipes-support/ibus/ibus-table-chinese/0004-skip-ibus-table-createdb.patch
 rename meta-oe/recipes-support/ibus/{ibus_1.5.19.bb => ibus_1.5.20.bb} (96%)
meta-oe/recipes-support/ibus/ibus-anthy/fix_anthy_include_in_gir.patch +2 -2
index 9812be08f..0066d285c 100644
@@ -2,11 +2,11 @@ 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 = \
+@@ -68,12 +68,12 @@
  	--warn-all \
  	$(NULL)
  Anthy_9000_gir_INCLUDES = GObject-2.0
--Anthy_9000_gir_LIBS = $(libanthygobject) anthy
+-Anthy_9000_gir_LIBS = $(libanthygobject) $(ANTHY_PC)
 +Anthy_9000_gir_LIBS = $(libanthygobject)
  Anthy_9000_gir_CFLAGS = @ANTHY_CFLAGS@
  Anthy_9000_gir_FILES = \
meta-oe/recipes-support/ibus/ibus-anthy_1.5.11.bb renamed from meta-oe/recipes-support/ibus/ibus-anthy_1.5.10.bb +6 -2
similarity index 78%
rename from meta-oe/recipes-support/ibus/ibus-anthy_1.5.10.bb
rename to meta-oe/recipes-support/ibus/ibus-anthy_1.5.11.bb
index d42f87ae5..de03d1cc3 100644
@@ -6,14 +6,16 @@ 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"
+SRC_URI[md5sum] = "70d90438a88cd3baf7712b697ac43852"
+SRC_URI[sha256sum] = "809596b0d4630c5861a96fc28800ebaa1ab007787b22f5d7d3c7c0152fd78fff"
 
 # 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
 
+EXTRA_OECONF_remove = "--enable-introspection"
+
 REQUIRED_DISTRO_FEATURES = "x11"
 
 DEPENDS = " anthy ibus gobject-introspection adwaita-icon-theme"
@@ -34,4 +36,6 @@ FILES_${PN} += " \
     ${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 \
+    ${datadir}/metainfo \
+    ${datadir}/metainfo/org.freedesktop.ibus.engine.anthy.metainfo.xml \
 "
meta-oe/recipes-support/ibus/ibus-table-chinese/0004-skip-ibus-table-createdb.patch new file +22 -0
new file mode 100644
index 000000000..3c8c5c19d
@@ -0,0 +1,22 @@
+Index: ibus-table-chinese-1.8.2/tables/CMakeLists.txt
+===================================================================
+--- ibus-table-chinese-1.8.2.orig/tables/CMakeLists.txt
++++ ibus-table-chinese-1.8.2/tables/CMakeLists.txt
+@@ -1,8 +1,3 @@
+-FIND_PROGRAM(CREATE_DB ibus-table-createdb)
+-IF (CREATE_DB STREQUAL "CREATE_DB-NOTFOUND")
+-    MESSAGE(FATAL_ERROR "ibus-table-createdb is not installed")
+-ENDIF(CREATE_DB STREQUAL "CREATE_DB-NOTFOUND")
+-
+ IF(NOT DEFINED DB_INSTALL_DIRECTORY)
+     SET(DB_INSTALL_DIRECTORY "${DATA_DIR}/ibus-table/tables")
+ ENDIF(NOT DEFINED DB_INSTALL_DIRECTORY)
+@@ -83,7 +78,7 @@ MACRO(CONVERT_DB targetName)
+ 	GET_FILENAME_COMPONENT(_tabName "${_tabFile}" NAME_WE)
+ 	SET(_dbF "${_tabName}.db")
+ 	ADD_CUSTOM_COMMAND(OUTPUT ${_dbF}
+-	    COMMAND ${CREATE_DB} -n ${_dbF} -s ${_tabFile}
++	    COMMAND touch ${_dbF}.db
+ 	    DEPENDS ${_tabFile}
+ 	    COMMENT "Building ${_tabName} table"
+ 	    )
meta-oe/recipes-support/ibus/ibus_1.5.20.bb renamed from meta-oe/recipes-support/ibus/ibus_1.5.19.bb +2 -2
similarity index 96%
rename from meta-oe/recipes-support/ibus/ibus_1.5.19.bb
rename to meta-oe/recipes-support/ibus/ibus_1.5.20.bb
index 57afe0ade..42b9b6c61 100644
@@ -5,8 +5,8 @@ SECTION = "inputmethods"
 
 SRC_URI = "https://github.com/ibus/ibus/releases/download/${PV}/${BPN}-${PV}.tar.gz \
           "
-SRC_URI[md5sum] = "a2be6f200dd9ada2501474a6877a73ef"
-SRC_URI[sha256sum] = "4b66c798dab093f0fa738e5c10688d395a463287d13678c208a81051af5d2429"
+SRC_URI[md5sum] = "f4966898b6a87b3a5e1f723317e91811"
+SRC_URI[sha256sum] = "4cf1e5ca4b067a3bed3cdfa658d49ac597d817b2de627a1095214565f862d034"
 
 inherit autotools pkgconfig gettext gtk-immodules-cache gobject-introspection gtk-doc gtk-icon-cache gsettings
 
Signature · 1 line
2.11.0
#9 lore raw

PATCH v6 8/10 ibus: Set native depends

In reply to Pablo Saavedra
---
 meta-oe/recipes-support/ibus/ibus_1.5.20.bb | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
meta-oe/recipes-support/ibus/ibus_1.5.20.bb +7 -4
index 42b9b6c61..f4e5e0cff 100644
@@ -12,16 +12,19 @@ inherit autotools pkgconfig gettext gtk-immodules-cache gobject-introspection gt
 
 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"
+DEPENDS = " intltool dbus-glib python3-dbus iso-codes libnotify python3-pygobject adwaita-icon-theme"
+DEPENDS_append_class-target = " librsvg-native dconf "
+RDEPENDS_${PN} += " iso-codes adwaita-icon-theme"
+RDEPENDS_${PN}_class-target += " librsvg-gtk"
 
+PACKAGECONFIG[dconf] = ",--disable-dconf,dconf,dconf"
 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 ?= "dconf gtk+ gtk+3"
 PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}"
+PACKAGECONFIG_class-native = "gtk+3"
 
 GTKIMMODULES_PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'gtk+', 'ibus-gtk2.0', '', d)}"
 GTKIMMODULES_PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'gtk+3', 'ibus-gtk3', '', d)}"
Signature · 1 line
2.11.0
#10 lore raw

PATCH v6 9/10 ibus-table: Fix SRC_URI format

In reply to Pablo Saavedra
---
 meta-oe/recipes-support/ibus/ibus-table_1.9.21.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-support/ibus/ibus-table_1.9.21.bb +1 -1
index faa331031..30a4c5eaf 100644
@@ -3,7 +3,7 @@ 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 = "https://github.com/kaio/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.gz \
           "
 SRC_URI[md5sum] = "1f7b3fab7271e409c9ef4c43f5c3fc78"
 SRC_URI[sha256sum] = "017bcd1cb9f5a79df46d1e4ac28f166ce2338938a2037ebe86783da0abca0c24"
Signature · 1 line
2.11.0
#11 lore raw

PATCH v6 10/10 ibus-table-chinese: Fix build using native ibus-table

In reply to Pablo Saavedra
---
 .../0005-fix-cmake-cross-compile.patch                | 19 ++++++-------------
 .../recipes-support/ibus/ibus-table-chinese_1.8.2.bb  |  8 ++++----
 2 files changed, 10 insertions(+), 17 deletions(-)
meta-oe/recipes-support/ibus/ibus-table-chinese/0005-fix-cmake-cross-compile.patch +6 -13
index 0f814b765..1ab33e892 100644
@@ -23,7 +23,6 @@ diff -u -r ibus-table-chinese-1.8.2/tables/array/CMakeLists.txt new/tables/array
  
  ADD_CUSTOM_COMMAND(OUTPUT ${ARRAY30_BIG_UTF8}
      COMMAND cat ${ARRAY30_BASE_UTF8}
-Only in new/tables/array: .CMakeLists.txt.swp
 diff -u -r ibus-table-chinese-1.8.2/tables/cangjie/CMakeLists.txt new/tables/cangjie/CMakeLists.txt
 --- ibus-table-chinese-1.8.2/tables/cangjie/CMakeLists.txt	2018-10-30 01:56:50.506773198 +0100
 +++ new/tables/cangjie/CMakeLists.txt	2018-10-30 00:15:41.319903050 +0100
@@ -31,7 +30,6 @@ diff -u -r ibus-table-chinese-1.8.2/tables/cangjie/CMakeLists.txt new/tables/can
 -CONVERT_DB(cangjie "cangjie3.txt" "cangjie5.txt" "cangjie-big.txt")
 +CONVERT_DB(cangjie "${CMAKE_CURRENT_SOURCE_DIR}/cangjie3.txt" "${CMAKE_CURRENT_SOURCE_DIR}/cangjie5.txt" "${CMAKE_CURRENT_SOURCE_DIR}/cangjie-big.txt")
  
-Only in new/tables/cangjie: .CMakeLists.txt.swp
 diff -u -r ibus-table-chinese-1.8.2/tables/cantonese/CMakeLists.txt new/tables/cantonese/CMakeLists.txt
 --- ibus-table-chinese-1.8.2/tables/cantonese/CMakeLists.txt	2018-10-30 01:56:29.464408649 +0100
 +++ new/tables/cantonese/CMakeLists.txt	2018-10-30 00:05:51.026038238 +0100
@@ -39,11 +37,15 @@ diff -u -r ibus-table-chinese-1.8.2/tables/cantonese/CMakeLists.txt new/tables/c
 -CONVERT_DB(cantonese "cantonese.txt" "cantonhk.txt" "jyutping.txt")
 +CONVERT_DB(cantonese "${CMAKE_CURRENT_SOURCE_DIR}/cantonese.txt" "${CMAKE_CURRENT_SOURCE_DIR}/cantonhk.txt" "${CMAKE_CURRENT_SOURCE_DIR}/jyutping.txt")
  
-Only in new/tables/cantonese: .CMakeLists.txt.swp
 diff -u -r ibus-table-chinese-1.8.2/tables/CMakeLists.txt new/tables/CMakeLists.txt
 --- ibus-table-chinese-1.8.2/tables/CMakeLists.txt	2018-10-30 01:56:08.781947707 +0100
 +++ new/tables/CMakeLists.txt	2018-10-30 01:53:51.086824367 +0100
-@@ -87,7 +87,7 @@
+@@ -83,11 +83,11 @@ MACRO(CONVERT_DB targetName)
+ 	GET_FILENAME_COMPONENT(_tabName "${_tabFile}" NAME_WE)
+ 	SET(_dbF "${_tabName}.db")
+ 	ADD_CUSTOM_COMMAND(OUTPUT ${_dbF}
+-	    COMMAND ${CREATE_DB} -n ${_dbF} -s ${_tabFile}
++	    COMMAND ${CREATE_DB} -p ${CMAKE_BINARY_DIR}/../recipe-sysroot-native/usr/share/ibus-table/data/pinyin_table.txt.bz2 -n ${_dbF} -s ${_tabFile}
  	    DEPENDS ${_tabFile}
  	    COMMENT "Building ${_tabName} table"
  	    )
@@ -52,7 +54,6 @@ diff -u -r ibus-table-chinese-1.8.2/tables/CMakeLists.txt new/tables/CMakeLists.
  	IF(EXISTS "${CMAKE_SOURCE_DIR}/icons/${_tabName}.png")
  	    LIST(APPEND _dependIcon "${CMAKE_SOURCE_DIR}/icons/${_tabName}.png")
  	ELSEIF(EXISTS "${CMAKE_SOURCE_DIR}/icons/${_tabName}.svg")
-Only in new/tables: .CMakeLists.txt.swp
 diff -u -r ibus-table-chinese-1.8.2/tables/easy/CMakeLists.txt new/tables/easy/CMakeLists.txt
 --- ibus-table-chinese-1.8.2/tables/easy/CMakeLists.txt	2018-10-30 01:56:35.966667250 +0100
 +++ new/tables/easy/CMakeLists.txt	2018-10-30 00:07:49.806217968 +0100
@@ -60,7 +61,6 @@ diff -u -r ibus-table-chinese-1.8.2/tables/easy/CMakeLists.txt new/tables/easy/C
 -CONVERT_DB(easy "easy-big.txt")
 +CONVERT_DB(easy "${CMAKE_CURRENT_SOURCE_DIR}/easy-big.txt")
  
-Only in new/tables/easy: .CMakeLists.txt.swp
 diff -u -r ibus-table-chinese-1.8.2/tables/erbi/CMakeLists.txt new/tables/erbi/CMakeLists.txt
 --- ibus-table-chinese-1.8.2/tables/erbi/CMakeLists.txt	2018-10-30 01:56:39.921608060 +0100
 +++ new/tables/erbi/CMakeLists.txt	2018-10-30 00:08:14.355641341 +0100
@@ -68,7 +68,6 @@ diff -u -r ibus-table-chinese-1.8.2/tables/erbi/CMakeLists.txt new/tables/erbi/C
 -CONVERT_DB(erbi "erbi.txt" "erbi-qs.txt")
 +CONVERT_DB(erbi "${CMAKE_CURRENT_SOURCE_DIR}/erbi.txt" "${CMAKE_CURRENT_SOURCE_DIR}/erbi-qs.txt")
  
-Only in new/tables/erbi: .CMakeLists.txt.swp
 diff -u -r ibus-table-chinese-1.8.2/tables/quick/CMakeLists.txt new/tables/quick/CMakeLists.txt
 --- ibus-table-chinese-1.8.2/tables/quick/CMakeLists.txt	2018-10-30 01:56:43.592624907 +0100
 +++ new/tables/quick/CMakeLists.txt	2018-10-30 00:14:13.643389364 +0100
@@ -76,7 +75,6 @@ diff -u -r ibus-table-chinese-1.8.2/tables/quick/CMakeLists.txt new/tables/quick
 -CONVERT_DB(quick "quick3.txt" "quick5.txt" "quick-classic.txt")
 +CONVERT_DB(quick "${CMAKE_CURRENT_SOURCE_DIR}/quick3.txt" "${CMAKE_CURRENT_SOURCE_DIR}/quick5.txt" "${CMAKE_CURRENT_SOURCE_DIR}/quick-classic.txt")
  
-Only in new/tables/quick: .CMakeLists.txt.swp
 diff -u -r ibus-table-chinese-1.8.2/tables/scj/CMakeLists.txt new/tables/scj/CMakeLists.txt
 --- ibus-table-chinese-1.8.2/tables/scj/CMakeLists.txt	2018-10-30 01:56:47.079691021 +0100
 +++ new/tables/scj/CMakeLists.txt	2018-10-30 00:00:14.404215150 +0100
@@ -84,7 +82,6 @@ diff -u -r ibus-table-chinese-1.8.2/tables/scj/CMakeLists.txt new/tables/scj/CMa
 -CONVERT_DB(scj "scj6.txt")
 +CONVERT_DB(scj "${CMAKE_CURRENT_SOURCE_DIR}/scj6.txt")
  
-Only in new/tables/scj: .CMakeLists.txt.swp
 diff -u -r ibus-table-chinese-1.8.2/tables/stroke5/CMakeLists.txt new/tables/stroke5/CMakeLists.txt
 --- ibus-table-chinese-1.8.2/tables/stroke5/CMakeLists.txt	2018-10-30 01:56:32.727534736 +0100
 +++ new/tables/stroke5/CMakeLists.txt	2018-10-30 00:07:28.132024331 +0100
@@ -92,7 +89,6 @@ diff -u -r ibus-table-chinese-1.8.2/tables/stroke5/CMakeLists.txt new/tables/str
 -CONVERT_DB(stroke5 "stroke5.txt")
 +CONVERT_DB(stroke5 "${CMAKE_CURRENT_SOURCE_DIR}/stroke5.txt")
  
-Only in new/tables/stroke5: .CMakeLists.txt.swp
 diff -u -r ibus-table-chinese-1.8.2/tables/wu/CMakeLists.txt new/tables/wu/CMakeLists.txt
 --- ibus-table-chinese-1.8.2/tables/wu/CMakeLists.txt	2018-10-30 01:56:53.921858589 +0100
 +++ new/tables/wu/CMakeLists.txt	2018-10-30 00:16:38.080698934 +0100
@@ -100,7 +96,6 @@ diff -u -r ibus-table-chinese-1.8.2/tables/wu/CMakeLists.txt new/tables/wu/CMake
 -CONVERT_DB(wu "wu.txt")
 +CONVERT_DB(wu "${CMAKE_CURRENT_SOURCE_DIR}/wu.txt")
  
-Only in new/tables/wu: .CMakeLists.txt.swp
 diff -u -r ibus-table-chinese-1.8.2/tables/wubi-haifeng/CMakeLists.txt new/tables/wubi-haifeng/CMakeLists.txt
 --- ibus-table-chinese-1.8.2/tables/wubi-haifeng/CMakeLists.txt	2018-10-30 01:56:15.560132413 +0100
 +++ new/tables/wubi-haifeng/CMakeLists.txt	2018-10-29 23:30:12.746818405 +0100
@@ -112,7 +107,6 @@ diff -u -r ibus-table-chinese-1.8.2/tables/wubi-haifeng/CMakeLists.txt new/table
 +MAKE_TABLE_SOURCE_TXT(wubi-haifeng86.txt ${CMAKE_CURRENT_SOURCE_DIR}/wubi-haifeng86.head ${CMAKE_CURRENT_SOURCE_DIR}/wubi-haifeng86.UTF-8 ${CMAKE_CURRENT_SOURCE_DIR}/wubi-haifeng86.tail)
  CONVERT_DB(wubi-haifeng "wubi-haifeng86.txt")
  
-Only in new/tables/wubi-haifeng: .CMakeLists.txt.swp
 diff -u -r ibus-table-chinese-1.8.2/tables/wubi-jidian/CMakeLists.txt new/tables/wubi-jidian/CMakeLists.txt
 --- ibus-table-chinese-1.8.2/tables/wubi-jidian/CMakeLists.txt	2018-10-30 01:56:25.921357528 +0100
 +++ new/tables/wubi-jidian/CMakeLists.txt	2018-10-30 00:01:13.876283460 +0100
@@ -120,7 +114,6 @@ diff -u -r ibus-table-chinese-1.8.2/tables/wubi-jidian/CMakeLists.txt new/tables
 -CONVERT_DB(wubi-jidian "wubi-jidian86.txt")
 +CONVERT_DB(wubi-jidian "${CMAKE_CURRENT_SOURCE_DIR}/wubi-jidian86.txt")
  
-Only in new/tables/wubi-jidian: .CMakeLists.txt.swp
 diff -u -r ibus-table-chinese-1.8.2/tables/yong/CMakeLists.txt new/tables/yong/CMakeLists.txt
 --- ibus-table-chinese-1.8.2/tables/yong/CMakeLists.txt	2018-10-30 01:56:57.568881862 +0100
 +++ new/tables/yong/CMakeLists.txt	2018-10-30 00:17:30.326704114 +0100
meta-oe/recipes-support/ibus/ibus-table-chinese_1.8.2.bb +4 -4
index 0c33e4f44..ff2173fbd 100644
@@ -3,19 +3,19 @@ LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=86bfc594f9971fb2797f5aea1a49d316"
 SECTION = "inputmethods"
 
-SRC_URI = "https://github.com/definite/${PN}/archive/${PV}.tar.gz \
+SRC_URI = "git://github.com/definite/${PN}.git;protocol=https;branch=master \
            file://0001-revert-CMakeLists.txt.patch \
            file://0002-add-Modules.patch \
            file://0003-add-ChangeLog.prev.patch \
            file://0005-fix-cmake-cross-compile.patch \
 "
-
-SRC_URI[md5sum] = "6360649580363bb3627a11e32057f6b1"
-SRC_URI[sha256sum] = "ef62c22ef4e8f9085fc40fcbc14c30f6dac458817df98e9f90f883a3e2080089"
+SRCREV = "2ada25684e3df1f003cb66dde406465cd6b5190c"
+S = "${WORKDIR}/git"
 
 inherit cmake
 
 DEPENDS = " ibus-table "
+DEPENDS_append_class-target = " ibus-table-native"
 
 BBCLASSEXTEND = "native"
 
Signature · 1 line
2.11.0