From nobody Wed Mar 22 20:17:22 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PhfsH0tVcz41FwY; Wed, 22 Mar 2023 20:17:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PhfsH042xz4NnB; Wed, 22 Mar 2023 20:17:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679516243; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7aiClUkOaqQ5pU6vRWaLUuf6VmH62wenpb9diHC0Lkc=; b=OgYduQizZKkt5OkuVNIUqG+QRvFeQ0WmmgPH7YOc4eE4kDVrDXouuIjqYLahXBqae6vO8c CBbnjmUGouDAHrean9Wl1ExQZDrxiN1lYB1Zi0mIMi/Kf2q7emZaCf2EAStANI6AxJQrmF v9PrMb5mIsKehFWM7aR6QFGa5DHVn93YVupL8GnYWxw+VG3VeI7oHJDmRzsKN+dCgyqccA UUJsaHNARmCm9+Tj4YLdNKkgGf33D3/CX1ohXjR7YK0GtVUtIyKA7VA7H2hMZkUqzur/er 4xSbNTF+2lkGCrjT3kUYeb2PICXfc4gs/7sVxC9BV+gp4txThyRFvOkmyjBVdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679516243; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7aiClUkOaqQ5pU6vRWaLUuf6VmH62wenpb9diHC0Lkc=; b=AU8t2uFPLoARGBrB1yCQEeCAXeRRwaQMBAbtk7mG6M1JBb8eHHaXnALrMxY+k7UtsOLIs0 QoO3qXRxR/Agps0GnY9EChuqzo2qVhPL6Ak0mAJsiYWCcltrwK24HQbSTwVpD5Dz/wR5bH v1QwjBgWvGeqJzoS2agkHn2WlXO3LB6jWHovgHPINCszX9SdCtwJkXEjTKoznJmXLoDOid 7I41rUQsN41tOzp4Xd0DX7sbmwSSIjBfYZJe8UurpxLWLdCCu8HJ2RxjsfN7ZtldAHcmKl k1JaRsfLzQnPnHmwFWMuhNDY2owrEp0o3V+QOl5Crg3cSffLALQHx/RyQslPEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679516243; a=rsa-sha256; cv=none; b=Dj04QDxz/R4N5K2/FB0iPM0rDoAWdF+0JCQncx413KDcJXNgzer3/3n0+aQDM6kxahOYUU yeUtkHS/7LKCTOpd2tPH/1oDKB5ceC1yXmdu8kFSnvRVcO6DopuXHAebJfyeO77CZeKbsQ AzRXuF/dUivc4Oj05z+Su+QzC1bvSiYTEFHipo2Jk10kpwDzlkkBJVSsp8LlBvMriRXRKu TDRwaOo6YQpHpX16lKGUuQbgd8u5GPOFJT2T7c/SyYeghO4VKnbUf0+6qyXGohkq0rilNd I7BV5ALR5VaOj5MxmaLr0IhGVd5I1pEEpIfzx21/x4oBEvjRNwD+IEPvtqK8ug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PhfsG69n6z17DW; Wed, 22 Mar 2023 20:17:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32MKHM9V087246; Wed, 22 Mar 2023 20:17:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32MKHMTT087245; Wed, 22 Mar 2023 20:17:22 GMT (envelope-from git) Date: Wed, 22 Mar 2023 20:17:22 GMT Message-Id: <202303222017.32MKHMTT087245@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: f38d0fdbea88 - main - chinese/ibus-pinyin: fix build with sqlite3 DQS option off List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f38d0fdbea8833b50db2f8830894390c958972e8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=f38d0fdbea8833b50db2f8830894390c958972e8 commit f38d0fdbea8833b50db2f8830894390c958972e8 Author: Henry Hu AuthorDate: 2023-03-21 18:13:22 +0000 Commit: Robert Clausecker CommitDate: 2023-03-22 20:15:30 +0000 chinese/ibus-pinyin: fix build with sqlite3 DQS option off Also mention that ibus-libpinyin should be preferred. See also: PR 270064 PR: 270376 --- chinese/ibus-pinyin/Makefile | 2 +- .../ibus-pinyin/files/patch-data_db_english_english.awk | 16 ++++++++++++++++ .../files/{patch-init-config => patch-src_PYConfig.cc} | 4 +--- chinese/ibus-pinyin/pkg-descr | 4 ++++ 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/chinese/ibus-pinyin/Makefile b/chinese/ibus-pinyin/Makefile index f701bb83d537..724d8093c612 100644 --- a/chinese/ibus-pinyin/Makefile +++ b/chinese/ibus-pinyin/Makefile @@ -1,6 +1,6 @@ PORTNAME= ibus-pinyin PORTVERSION= 1.5.0 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= chinese MAINTAINER= henry.hu.sh@gmail.com diff --git a/chinese/ibus-pinyin/files/patch-data_db_english_english.awk b/chinese/ibus-pinyin/files/patch-data_db_english_english.awk new file mode 100644 index 000000000000..baca5af059e3 --- /dev/null +++ b/chinese/ibus-pinyin/files/patch-data_db_english_english.awk @@ -0,0 +1,16 @@ +--- data/db/english/english.awk.orig 2023-03-20 04:01:48 UTC ++++ data/db/english/english.awk +@@ -16,10 +16,10 @@ BEGIN { + } + + # Insert data into english table +- { printf "INSERT INTO english (word, freq) VALUES (\"%s\", \"%f\");\n", $1, $2} ++ { printf "INSERT INTO english (word, freq) VALUES (\'%s\', \'%f\');\n", $1, $2} + + #quit sqlite3 + END { + # Commit the transcation + print "COMMIT;" +-} +\ No newline at end of file ++} diff --git a/chinese/ibus-pinyin/files/patch-init-config b/chinese/ibus-pinyin/files/patch-src_PYConfig.cc similarity index 77% rename from chinese/ibus-pinyin/files/patch-init-config rename to chinese/ibus-pinyin/files/patch-src_PYConfig.cc index 7e70422cb132..9df4ad6a73eb 100644 --- a/chinese/ibus-pinyin/files/patch-init-config +++ b/chinese/ibus-pinyin/files/patch-src_PYConfig.cc @@ -1,6 +1,4 @@ -diff --git a/src/PYConfig.cc b/src/PYConfig.cc -index 7e24b2c..1ef0b99 100644 ---- src/PYConfig.cc +--- src/PYConfig.cc.orig 2012-12-19 15:30:43 UTC +++ src/PYConfig.cc @@ -114,6 +114,7 @@ Config::initDefaultValues (void) m_init_full_punct = TRUE; diff --git a/chinese/ibus-pinyin/pkg-descr b/chinese/ibus-pinyin/pkg-descr index aa438e9ed01a..0649ebfe14e1 100644 --- a/chinese/ibus-pinyin/pkg-descr +++ b/chinese/ibus-pinyin/pkg-descr @@ -1 +1,5 @@ PinYin engine for IBus. + +This pinyin input method is deprecated; new users should switch to +chinese/ibus-libpinyin, which is a contemporary implementation of pinyin input +method.