From patchwork Sun Jul 26 02:29:49 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 93497 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0F03FC53209 for ; Sun, 26 Jul 2026 02:30:06 +0000 (UTC) Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.4254.1785032995153286740 for ; Sat, 25 Jul 2026 19:29:55 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20251104 header.b=SlyJuDlQ; spf=pass (domain: gmail.com, ip: 209.85.216.48, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-38e42560ebcso1161456a91.1 for ; Sat, 25 Jul 2026 19:29:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785032994; x=1785637794; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=la7yVla2UNtJYXc1Nem5/HHwQ8cyvLbgF3SbupHGhUs=; b=SlyJuDlQ4JBZ8OU3mUJ2zXgMMdMQtxSH9V9RKeptpiANrs34dycktDJdeKZJ4vINun ZYzFU1swfbQvxOEPyO5r+ZnMWYSgdjhKVMzVVgu7bU0h5YsWTjuklDcrS/SeC6Un8Mxi eOtO1Iew0vBmQ2vDVtsr9b8V5joey2WYJfJdGw9TLLMeh9bivowmDfWuOakW6+ttqeHf xUtoCrJ0F0yAMtnYeW+Is1iUtFQUKRX66lNNM+lXQT5GxwmZCicP7iaLaMy9DqTFILMW OpAnVZZ66xbweHbWGwtdO/+HjzIQ8oJxxMBc0enbOl2dWTKwVh3x74pSZx6OHdcT8eMN xtWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785032994; x=1785637794; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=la7yVla2UNtJYXc1Nem5/HHwQ8cyvLbgF3SbupHGhUs=; b=ACcLcOsVI+HlufMQ5dnbwZ7J0EQFh8+2Pul2cTF/mvtrvMbhBmhQc4PIpGoCflAvD4 WXY/oDRofs/Bvf/CCBZEZW6nUNdnDv7KATsP5uB2Qi3qEls2zbDObwckzbfNc9j0B8Zg XkXNADzmssbfixpv6azp3LNDOBXQk/7p7v4AbViYwC8jK1IOaJNICWvFtKJu1HxAFZMD 2IBX6a5vek3kc4bW+xF4w3aX+URpExhm1G9Xyab6jfKnUUOjUkpUxIm8PWata3YzceZG dpg7aU57TFV+UpmF1yRGAT0ztBS7AoECE+UWvmwbBpzsXjcDOJ36tmJcWKLJVl0WS1GD Y7VQ== X-Gm-Message-State: AOJu0YyL6PyAfAC+0+tZzSrIu+az4OzJq69+wb0mLKAULh3+NycGL25N zRGW21GKr3W6gZAzKuF5d1k/2McGqpPBxXyC034PvHVVtI4BpsWukWah9BSadg== X-Gm-Gg: AR+sD11Z25vM7J37uTWkF4252J7OsiWH2FF+lEgOlC14r8thkQr/tT1ruhkZhE/LR7m 2At27R6VgxPw9X4KFdE/uMqdEj/qgP80xUNjXtA2SewOmZyqHzJeumx3svsc71nxrQiriWp7v/o Z8+VegcvILTq07/PtJzPMdJoCStiZLbYtHyyIwM3/nh+zf6ecSukDm5opXDidfB95+cEphsS07J +DXGJtAF8GMTmIuSOU3vHypkMRuxsLk5AftsIRPqJ1v5c4SelHlu2nqKjVfccQfQEUVvhG3+96g wnPSgeUa+Y5UNQMkA2PUGJoLjLTxXiXjwYAVci2EZVMcn8S3XCChPxh/v9bjc+VOYLaDdd3FOCq 7CRA9eOHTiqWfJV0yM8aRcsGbYq/cx5i/0j4GOLGkc+THPnNCgxgNgDXWtiAWgm1CNVyflF3Hzu nTjzHTbBQLL3YnK4E0FqT3Wb6CTSgbvqSHDE7taKUpo6Qbwo8+sRVWj/oNvPZGe/SYnNdxB32rv a20UVRyCYN1FY9OKWW/R4M9hIuMSKqZwWws7AUh4f+5yoSAeoK69F7GcRZHcjfDWU4+qeTH93R0 eigpPBDdJUuOvgIJiZk= X-Received: by 2002:a17:90b:57e3:b0:38e:9279:468c with SMTP id 98e67ed59e1d1-38f296091e5mr3787450a91.25.1785032994466; Sat, 25 Jul 2026 19:29:54 -0700 (PDT) Received: from apollo.localdomain ([208.95.233.74]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-314bc3e127asm26526993eec.2.2026.07.25.19.29.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Jul 2026 19:29:53 -0700 (PDT) From: Khem Raj X-Google-Original-From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj , Khem Raj , "Claude Opus 4.8 (1M context)" Subject: [meta-gnome][PATCH 1/2] gnome-terminal: replace deprecated GFDL-1.3 with GFDL-1.3-no-invariants-only Date: Sat, 25 Jul 2026 19:29:49 -0700 Message-ID: <20260726022951.1696787-1-khem.raj@oss.qualcomm.com> X-Mailer: git-send-email 2.55.0 MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 26 Jul 2026 02:30:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/128448 The recent oe-core change validating LICENSE as an SPDX expression (classes/conf/lib: Parse LICENSE as SPDX Expression) flags GFDL-1.3 as a deprecated license identifier. The COPYING.GFDL checksum (a22d0be1ce2284b67950a4d1673dd1b0) matches the GFDL-1.3-no-invariants-only text, so use that non-deprecated identifier. Signed-off-by: Khem Raj Co-Authored-By: Claude Opus 4.8 (1M context) --- .../recipes-gnome/gnome-terminal/gnome-terminal_3.54.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.54.0.bb b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.54.0.bb index 489e1af7ce..449ce6d1ed 100644 --- a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.54.0.bb +++ b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.54.0.bb @@ -1,5 +1,5 @@ SUMMARY = "GNOME terminal" -LICENSE = "GFDL-1.3 AND GPL-3.0-only" +LICENSE = "GFDL-1.3-no-invariants-only AND GPL-3.0-only" LIC_FILES_CHKSUM = " \ file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \ file://COPYING.GFDL;md5=a22d0be1ce2284b67950a4d1673dd1b0 \ From patchwork Sun Jul 26 02:29:50 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 93498 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id F30E5C531D0 for ; Sun, 26 Jul 2026 02:30:05 +0000 (UTC) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.4419.1785032999729224441 for ; Sat, 25 Jul 2026 19:29:59 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20251104 header.b=dseo287Z; spf=pass (domain: gmail.com, ip: 209.85.214.179, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-2caced6038eso18959535ad.0 for ; Sat, 25 Jul 2026 19:29:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785032999; x=1785637799; darn=lists.openembedded.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=QmW4i5gn/tzoKeLWVo6qHQZrVw0QUrU73xST5f2rZd8=; b=dseo287ZRKfH7vPe8vVQ4VPP8gSwO8Ec6z24IauwUQobUolmtkYM62HEpvZk8rVDFR viHRCefwM2RrDmThbzU3hkXE47wkAecpwVViTrx3yBrClBWvdSv3K9hkmkdgBpcG89Dy U2XYTyXnFOSkmx9E2rFyFaPIsdgKao5gL441BORpf0TtyIP2Q/iLHQnNAXbOsNhAe2bH PoKsfb/8WfWhP+zj7tgxEy6KzyRy8WIFfK9XxR0k+iXJk82wuz9dXg3fsRxQFpb6cA2m wyUOV/AbLvsTP9b6uafnDCiQ03bn7eIahd5AH4kqZiKlZBT3RYkdYTyuhrmORvAI/g/k zWsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785032999; x=1785637799; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=QmW4i5gn/tzoKeLWVo6qHQZrVw0QUrU73xST5f2rZd8=; b=quSbh56busXsKYjrWh8JpCmyWmerUAQCZbIR9bmVMO+y5AoSo1pHRO2Lryeo2gVDuE L8QCSeNIDTrqMaNBAkm4ulxNz2k1UA2iwVUIuyVzfbfz2BFC5c2tzqGjJiEJs/AeCh93 47jXLm9u+1KXasGbHxF4AV6IhKKKOPRRd03BfiZD96OKAyOe6/KjOYXb4WHBdQSRAP+K sEZ4HatqXz/YfmwbGJ9fBSqCFWb3yoNKTXQ3CYELp789CUUXOClORLUFXjr/FrAzawAD 5mOsEgQETyfiRzaSBMYCw7VArZblkDaHIp4fLLD7D3GwplCzOLr5gqZIuXFcRQl0AI88 ONnQ== X-Gm-Message-State: AOJu0Yw6Kui3chWgvWcFYQg1g2dYJPkvGWEPt2WKVJtTnoEoTpZwpnyW jr6OBm1dDY72odcazGKz0RMQoRYK8vnxeJu2u3TNRn1IJzw6Narp2SY+mPiPSQ== X-Gm-Gg: AR+sD13uYQ7/tkBFOSavb87JcS3TiXHayL0LOUGPzcLPDDmY2tOGXUlRQQgDhEkAEOH xSzFkfcbBP75n1fhCJ064Po48BebJW6apN8Rv+Tqa69g8Yr9+13FZ0JBkDBG8FdwAoNIFnp/Mi1 sXaTtHsMAjzZxJzO5ZXblNDdHtOh+ls5BArpf78m/pdvbY1BCGy3vj9/zhuadVEkBnHP3CRe10S lWGLV/e4loIqPkTyb8zkq3+IXiQm9el18GlvCw4mtdMVdFVSehu1BoRoRF26C3BY2pwkzh2R4mc MTl8LLur0ZsSaq1TDD/A45B1+CNEf5NIMCgDcu11+UI5EdXL42qcy67Ey8ExwcVHLx0UPih9Lv8 5pTvYU7RWH9rHRqPqi+MpiHD22EzP6FzkgnoubpqJlewp8xGxo5HsxvnveFz+3/a0qzSuKi5FXO 8UlyvF5ZBpG7kumKAG906PntqWqASRND7PYrP9ukp4ffJP/uhcZSEdwzlwZCYbuVQXWPC1BEL1I Da+py6K8L7TNgsq9tAJwl9WKeZKkLWyEEamPjjz4bziDESxa2qRwvoO3GkvOFdvKmbotNrjaD6Q 4gWtv/E9inWoMUNRFytP5ROTpmn2Og== X-Received: by 2002:a17:902:eccf:b0:2cc:ac15:ff4c with SMTP id d9443c01a7336-2cfd70e066cmr58250885ad.8.1785032996387; Sat, 25 Jul 2026 19:29:56 -0700 (PDT) Received: from apollo.localdomain ([208.95.233.74]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-314bc3e127asm26526993eec.2.2026.07.25.19.29.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Jul 2026 19:29:55 -0700 (PDT) From: Khem Raj X-Google-Original-From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 2/2] anthy: port to anthy-unicode 1.0.0.20260213 Date: Sat, 25 Jul 2026 19:29:50 -0700 Message-ID: <20260726022951.1696787-2-khem.raj@oss.qualcomm.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260726022951.1696787-1-khem.raj@oss.qualcomm.com> References: <20260726022951.1696787-1-khem.raj@oss.qualcomm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 26 Jul 2026 02:30:05 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/128449 Replace the long-dead anthy 9100h (last released 2009, fetched from an old Ubuntu source tarball) with the maintained fork anthy-unicode, which is UTF-8 native and actively released on GitHub. anthy-unicode renames its libraries (libanthy-unicode, libanthydic-unicode, libanthyinput-unicode), pkg-config module file (anthy-unicode.pc), headers (includedir/anthy-unicode-1.0/anthy), config file (anthy-unicode.conf) and binaries (anthy-*-unicode). The recipe and packaging are updated accordingly: libanthy-unicode0 for the runtime libraries and the standard PN-dev for the development files. The cross-compilation strategy is carried over from the old recipe: dictionary generation runs helper programs (mkfiledic, mkworddic, mkdepgraph, calctrans, proccorpus) that cannot execute when cross compiling. native-helpers.patch promotes them to bin_PROGRAMS so anthy-unicode-native stages them into the native sysroot; target-helpers.patch makes the target dictionary rules call them from PATH instead of ./. not_build_elc.patch avoids byte-compiling the Emacs lisp (no target Emacs under cross compilation). The patches are regenerated against anthy-unicode's -unicode-suffixed libtool archives. The legacy 2ch_t.patch is dropped; anthy-unicode has no mkanthydic/2ch.t. uim is switched from the legacy EUC-JP anthy backend to the UTF-8 anthy-unicode backend it already supports: configure with --without-anthy --with-anthy-utf8, DEPENDS on anthy-unicode, and the uim-anthy package is renamed uim-anthy-utf8 (plugin libuim-anthy-utf8, anthy-utf8*.scm, module registered as anthy-utf8) with RDEPENDS on libanthy-unicode0. packagegroup-meta-oe: anthy -> anthy-unicode. Verified by building anthy-unicode-native and anthy-unicode for x86-64 (do_package_qa clean): the native helpers stage into the native sysroot, the target build generates anthy.wdic/anthy.dep/anthy.dic via those native helpers, and packaging splits into anthy-unicode, libanthy-unicode0 and anthy-unicode-dev. uim variables verified by parse (it requires the x11 DISTRO_FEATURE, which the qemux86-64 yoe distro strips, so it is not buildable in this configuration). Signed-off-by: Khem Raj --- .../packagegroups/packagegroup-meta-oe.bb | 2 +- .../anthy-unicode/native-helpers.patch | 61 + .../anthy-unicode/not_build_elc.patch | 23 + .../anthy-unicode}/target-helpers.patch | 50 +- .../anthy-unicode_1.0.0.20260213.bb | 41 + .../recipes-support/anthy/anthy/2ch_t.patch | 5064 ----------------- .../anthy/anthy/native-helpers.patch | 60 - .../anthy/anthy/not_build_elc.patch | 19 - meta-oe/recipes-support/anthy/anthy_9100h.bb | 48 - meta-oe/recipes-support/uim/uim_1.9.6.bb | 26 +- 10 files changed, 171 insertions(+), 5223 deletions(-) create mode 100644 meta-oe/recipes-support/anthy-unicode/anthy-unicode/native-helpers.patch create mode 100644 meta-oe/recipes-support/anthy-unicode/anthy-unicode/not_build_elc.patch rename meta-oe/recipes-support/{anthy/anthy => anthy-unicode/anthy-unicode}/target-helpers.patch (67%) create mode 100644 meta-oe/recipes-support/anthy-unicode/anthy-unicode_1.0.0.20260213.bb delete mode 100644 meta-oe/recipes-support/anthy/anthy/2ch_t.patch delete mode 100644 meta-oe/recipes-support/anthy/anthy/native-helpers.patch delete mode 100644 meta-oe/recipes-support/anthy/anthy/not_build_elc.patch delete mode 100644 meta-oe/recipes-support/anthy/anthy_9100h.bb diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index bdda72195b..824ef445f1 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -705,7 +705,7 @@ RDEPENDS:packagegroup-meta-oe-shells = "\ RDEPENDS:packagegroup-meta-oe-support = "\ ace-cloud-editor \ - anthy \ + anthy-unicode \ asio \ atop \ augeas \ diff --git a/meta-oe/recipes-support/anthy-unicode/anthy-unicode/native-helpers.patch b/meta-oe/recipes-support/anthy-unicode/anthy-unicode/native-helpers.patch new file mode 100644 index 0000000000..88676bbd42 --- /dev/null +++ b/meta-oe/recipes-support/anthy-unicode/anthy-unicode/native-helpers.patch @@ -0,0 +1,61 @@ +Upstream-Status: Inappropriate [cross-compile specific] + +Stage the native anthy-unicode helpers (mkfiledic, mkdepgraph, mkworddic, +calctrans, proccorpus) as bin_PROGRAMS so anthy-unicode-native installs them +into the native sysroot, where the target build's dictionary rules pick them +up from PATH (see target-helpers.patch). + +Signed-off-by: Khem Raj + +diff --git a/calctrans/Makefile.am b/calctrans/Makefile.am +index a48867a..dc6af11 100644 +--- a/calctrans/Makefile.am ++++ b/calctrans/Makefile.am +@@ -3,7 +3,7 @@ EXTRA_DIST =\ + corpus.3.txt corpus.4.txt corpus.5.txt\ + corpus_info weak_words + +-noinst_PROGRAMS = calctrans proccorpus ++bin_PROGRAMS = calctrans proccorpus + INCLUDES = -I$(top_srcdir)/ + + calctrans_SOURCES = calctrans.c input_set.c input_set.h corpus.c +diff --git a/depgraph/Makefile.am b/depgraph/Makefile.am +index 468f90c..75b285c 100644 +--- a/depgraph/Makefile.am ++++ b/depgraph/Makefile.am +@@ -9,7 +9,7 @@ CLEANFILES = anthy.dep + EXTRA_DIST = indepword.txt $(DEPWORDS) + + # Generate the dictionary +-noinst_PROGRAMS = mkdepgraph ++bin_PROGRAMS = mkdepgraph + mkdepgraph_SOURCES = mkdepgraph.c + mkdepgraph_LDADD = ../src-main/libanthy-unicode.la ../src-worddic/libanthydic-unicode.la + +diff --git a/mkanthydic/Makefile.am b/mkanthydic/Makefile.am +index dfabff6..1c665eb 100644 +--- a/mkanthydic/Makefile.am ++++ b/mkanthydic/Makefile.am +@@ -3,7 +3,7 @@ noinst_SCRIPTS = + CLEANFILES = anthy.dic + INCLUDES = -I$(top_srcdir)/ -DSRCDIR=\"$(srcdir)\" + +-noinst_PROGRAMS = mkfiledic ++bin_PROGRAMS = mkfiledic + mkfiledic_SOURCES = mkfiledic.c + mkfiledic_LDADD = ../src-diclib/libdiclib.la + +diff --git a/mkworddic/Makefile.am b/mkworddic/Makefile.am +index d9b262e..b0a9e01 100644 +--- a/mkworddic/Makefile.am ++++ b/mkworddic/Makefile.am +@@ -26,7 +26,7 @@ DIC_FILES = @top_srcdir@/alt-cannadic/gcanna.ctd \ + @top_srcdir@/mkworddic/udict + + # Generate the dictionary +-noinst_PROGRAMS = mkworddic ++bin_PROGRAMS = mkworddic + mkworddic_SOURCES = mkdic.c writewords.c mkudic.c calcfreq.c mkdic.h + mkworddic_LDADD = ../src-worddic/libanthydic-unicode.la + diff --git a/meta-oe/recipes-support/anthy-unicode/anthy-unicode/not_build_elc.patch b/meta-oe/recipes-support/anthy-unicode/anthy-unicode/not_build_elc.patch new file mode 100644 index 0000000000..a3aa82407d --- /dev/null +++ b/meta-oe/recipes-support/anthy-unicode/anthy-unicode/not_build_elc.patch @@ -0,0 +1,23 @@ +Upstream-Status: Inappropriate [cross-compile specific] + +Do not byte-compile the Emacs lisp files at build time; there is no target +Emacs available under cross compilation. The .el sources are still shipped. + +Signed-off-by: Khem Raj + +diff --git a/src-util/Makefile.am b/src-util/Makefile.am +index c51c076..7ccad01 100644 +--- a/src-util/Makefile.am ++++ b/src-util/Makefile.am +@@ -16,10 +16,7 @@ bin_PROGRAMS = \ + anthy-agent-unicode \ + anthy-morphological-analyzer-unicode \ + $(NULL) +-ELCFILES = anthy-unicode.elc anthy-unicode-azik.elc anthy-unicode-conf.elc \ +- anthy-unicode-dic.elc anthy-unicode-isearch.elc anthy-unicode-kyuri.elc \ +- leim-list.elc \ +- $(NULL) ++ELCFILES = + if ELISP + lisp_LISP = $(ELISP_FILES) + endif diff --git a/meta-oe/recipes-support/anthy/anthy/target-helpers.patch b/meta-oe/recipes-support/anthy-unicode/anthy-unicode/target-helpers.patch similarity index 67% rename from meta-oe/recipes-support/anthy/anthy/target-helpers.patch rename to meta-oe/recipes-support/anthy-unicode/anthy-unicode/target-helpers.patch index fc5c72c051..ce0a51ee58 100644 --- a/meta-oe/recipes-support/anthy/anthy/target-helpers.patch +++ b/meta-oe/recipes-support/anthy-unicode/anthy-unicode/target-helpers.patch @@ -1,9 +1,18 @@ -Upstream-Status: Pending +Upstream-Status: Inappropriate [cross-compile specific] -diff -Nurp anthy-9100h.org/calctrans/Makefile.am anthy-9100h/calctrans/Makefile.am ---- anthy-9100h.org/calctrans/Makefile.am 2007-10-27 23:02:59.000000000 +0900 -+++ anthy-9100h/calctrans/Makefile.am 2014-11-11 17:14:42.152999991 +0900 -@@ -15,31 +15,31 @@ dict_source_files = anthy.cand_info anth +For the target build, do not compile or run the dictionary-generation helpers +(mkfiledic, mkdepgraph, mkworddic, calctrans, proccorpus) locally -- they are +built by anthy-unicode-native and installed into the native sysroot. Drop the +"./" prefix from the dictionary rules so the helpers are taken from PATH, and +disable the local build of the helpers that also provide libraries. + +Signed-off-by: Khem Raj + +diff --git a/calctrans/Makefile.am b/calctrans/Makefile.am +index a48867a..b47b6af 100644 +--- a/calctrans/Makefile.am ++++ b/calctrans/Makefile.am +@@ -15,31 +15,31 @@ dict_source_files = anthy.cand_info anthy.trans_info anthy.corpus_array anthy.co update_params: rm -f parsed_data2 @@ -47,19 +56,20 @@ diff -Nurp anthy-9100h.org/calctrans/Makefile.am anthy-9100h/calctrans/Makefile. noinst_DATA = $(dict_source_files) CLEANFILES = $(dict_source_files) parsed_data parsed_data2 anthy.feature_info -diff -Nurp anthy-9100h.org/depgraph/Makefile.am anthy-9100h/depgraph/Makefile.am ---- anthy-9100h.org/depgraph/Makefile.am 2008-11-29 21:46:14.000000000 +0900 -+++ anthy-9100h/depgraph/Makefile.am 2014-11-11 17:12:03.813999991 +0900 +diff --git a/depgraph/Makefile.am b/depgraph/Makefile.am +index 468f90c..1f3de05 100644 +--- a/depgraph/Makefile.am ++++ b/depgraph/Makefile.am @@ -9,11 +9,11 @@ CLEANFILES = anthy.dep EXTRA_DIST = indepword.txt $(DEPWORDS) # Generate the dictionary -noinst_PROGRAMS = mkdepgraph -mkdepgraph_SOURCES = mkdepgraph.c --mkdepgraph_LDADD = ../src-main/libanthy.la ../src-worddic/libanthydic.la +-mkdepgraph_LDADD = ../src-main/libanthy-unicode.la ../src-worddic/libanthydic-unicode.la +#noinst_PROGRAMS = mkdepgraph +#mkdepgraph_SOURCES = mkdepgraph.c -+#mkdepgraph_LDADD = ../src-main/libanthy.la ../src-worddic/libanthydic.la ++#mkdepgraph_LDADD = ../src-main/libanthy-unicode.la ../src-worddic/libanthydic-unicode.la -anthy.dep : mkdepgraph $(DEPWORDS) - ./mkdepgraph @@ -67,9 +77,10 @@ diff -Nurp anthy-9100h.org/depgraph/Makefile.am anthy-9100h/depgraph/Makefile.am + mkdepgraph noinst_DATA = anthy.dep -diff -Nurp anthy-9100h.org/mkanthydic/Makefile.am anthy-9100h/mkanthydic/Makefile.am ---- anthy-9100h.org/mkanthydic/Makefile.am 2007-04-14 18:01:10.000000000 +0900 -+++ anthy-9100h/mkanthydic/Makefile.am 2014-11-11 17:10:34.792999991 +0900 +diff --git a/mkanthydic/Makefile.am b/mkanthydic/Makefile.am +index dfabff6..d1109cc 100644 +--- a/mkanthydic/Makefile.am ++++ b/mkanthydic/Makefile.am @@ -3,12 +3,12 @@ noinst_SCRIPTS = CLEANFILES = anthy.dic INCLUDES = -I$(top_srcdir)/ -DSRCDIR=\"$(srcdir)\" @@ -88,19 +99,20 @@ diff -Nurp anthy-9100h.org/mkanthydic/Makefile.am anthy-9100h/mkanthydic/Makefil # To install -diff -Nurp anthy-9100h.org/mkworddic/Makefile.am anthy-9100h/mkworddic/Makefile.am ---- anthy-9100h.org/mkworddic/Makefile.am 2009-01-23 12:31:31.000000000 +0900 -+++ anthy-9100h/mkworddic/Makefile.am 2014-11-11 17:13:31.946999992 +0900 -@@ -26,14 +26,14 @@ DIC_FILES = @top_srcdir@/alt-cannadic/gc +diff --git a/mkworddic/Makefile.am b/mkworddic/Makefile.am +index d9b262e..6a8a54c 100644 +--- a/mkworddic/Makefile.am ++++ b/mkworddic/Makefile.am +@@ -26,14 +26,14 @@ DIC_FILES = @top_srcdir@/alt-cannadic/gcanna.ctd \ @top_srcdir@/mkworddic/udict # Generate the dictionary -noinst_PROGRAMS = mkworddic -mkworddic_SOURCES = mkdic.c writewords.c mkudic.c calcfreq.c mkdic.h --mkworddic_LDADD = ../src-worddic/libanthydic.la +-mkworddic_LDADD = ../src-worddic/libanthydic-unicode.la +#noinst_PROGRAMS = mkworddic +#mkworddic_SOURCES = mkdic.c writewords.c mkudic.c calcfreq.c mkdic.h -+#mkworddic_LDADD = ../src-worddic/libanthydic.la ++#mkworddic_LDADD = ../src-worddic/libanthydic-unicode.la noinst_DATA = anthy.wdic diff --git a/meta-oe/recipes-support/anthy-unicode/anthy-unicode_1.0.0.20260213.bb b/meta-oe/recipes-support/anthy-unicode/anthy-unicode_1.0.0.20260213.bb new file mode 100644 index 0000000000..e8c4d9b97c --- /dev/null +++ b/meta-oe/recipes-support/anthy-unicode/anthy-unicode_1.0.0.20260213.bb @@ -0,0 +1,41 @@ +DESCRIPTION = "Anthy Unicode is a maintained fork of the Anthy Japanese input \ +method. It converts Hiragana text to Kana Kanji mixed text and works in UTF-8." +HOMEPAGE = "https://github.com/fujiwarat/anthy-unicode" + +LICENSE = "GPL-2.0-only AND LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=5f37c94ff7ea73f8ed6ce61216611051 \ + file://alt-cannadic/COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b \ +" + +SRC_URI = "https://github.com/fujiwarat/anthy-unicode/releases/download/${PV}/anthy-unicode-${PV}.tar.gz \ + file://not_build_elc.patch \ +" + +SRC_URI:append:class-target = " file://target-helpers.patch" +SRC_URI:append:class-native = " file://native-helpers.patch" + +SRC_URI[sha256sum] = "666e91b92c76eb5bee7ee88dca1478eb55122c2af2641f055d4e51cf9d904860" + +UPSTREAM_CHECK_URI = "https://github.com/fujiwarat/anthy-unicode/releases" +UPSTREAM_CHECK_REGEX = "anthy-unicode-(?P\d+(\.\d+)+)" + +DEPENDS:class-target = "anthy-unicode-native" +RDEPENDS:${PN}:class-target = "libanthy-unicode0" + +inherit autotools pkgconfig + +PACKAGES += "${PN}-el libanthy-unicode0" + +FILES:${PN}-dbg += "${libdir}/.debug" +FILES:libanthy-unicode0 = "${libdir}/libanthy-unicode.so.* \ + ${libdir}/libanthydic-unicode.so.* \ + ${libdir}/libanthyinput-unicode.so.* \ +" + +FILES:${PN}-el = "${datadir}/emacs/*" +FILES:${PN} = "${datadir}/* \ + ${bindir}/* \ + ${sysconfdir}/anthy-unicode.conf \ +" + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/anthy/anthy/2ch_t.patch b/meta-oe/recipes-support/anthy/anthy/2ch_t.patch deleted file mode 100644 index a0d3f9c25e..0000000000 --- a/meta-oe/recipes-support/anthy/anthy/2ch_t.patch +++ /dev/null @@ -1,5064 +0,0 @@ -Upstream-Status: Pending - -source: shamelessly stolen from debian ;-) -purpose: add some entries particularly useful in Japanese 2channel anonymous website - (at least that is my understanding ;-)) - ---- anthy-5414.orig/mkanthydic/2ch.t -+++ anthy-5414/mkanthydic/2ch.t -@@ -0,0 +1,5055 @@ -+# 2ch�Ѹ��Canna�������� -+# HARUYAMA Seigo haruyama@unixuser.org -+# ������ʻ�Ϥ������٤� �ʤ� ���äѤ�����Ϥ��ʤΤ� -+# ����Ŧ������� -+# ����: http://freezone.kakiko.com/jiten/index.html -+# http://members.tripod.co.jp/maruheso/aadic/index.html -+# http://isweb33.infoseek.co.jp/computer/gikosite/ (403 Forbidden) -+# http://cannadic.oucrc.org/ -+# http://www.kyoto.trans-nt.com/anthy/ -+# http://www.media-k.co.jp/jiten/ -+# ���ͤˤ��Ƥ��뼭������ե饤���