aboutsummaryrefslogtreecommitdiff
path: root/chinese
diff options
context:
space:
mode:
authorXin LI <delphij@FreeBSD.org>2019-08-16 08:31:55 +0000
committerXin LI <delphij@FreeBSD.org>2019-08-16 08:31:55 +0000
commitbea148f53b49e73a28457283d15dcc474af775ae (patch)
tree62ffe262328fbde595bd2b6772aa13bead68cb36 /chinese
parent631931ebf39aaccbf97c81e9bed0ab6748bcc4dd (diff)
downloadports-bea148f53b49e73a28457283d15dcc474af775ae.tar.gz
ports-bea148f53b49e73a28457283d15dcc474af775ae.zip
Update Chinese Pinyin related ports:
chinese/ibus-libpinyin: 1.10.0 -> 1.11.1, enable OpenCC chinese/libpinyin: 2.2.0 -> 2.3.0 textproc/ibus: 1.5.18 -> 1.5.20, while there also fix pkg-message for Qt Reviewed: Zhihao Yuan <lichray gmail com>, Henry Hu <henry.hu.sh gmail com> Differential Revision: https://reviews.freebsd.org/D21177
Notes
Notes: svn path=/head/; revision=509067
Diffstat (limited to 'chinese')
-rw-r--r--chinese/ibus-libpinyin/Makefile11
-rw-r--r--chinese/ibus-libpinyin/distinfo6
-rw-r--r--chinese/ibus-libpinyin/files/patch-data_Makefile.am11
-rw-r--r--chinese/ibus-libpinyin/files/patch-data_Makefile.in11
-rw-r--r--chinese/ibus-libpinyin/pkg-plist1
-rw-r--r--chinese/libpinyin/Makefile10
-rw-r--r--chinese/libpinyin/distinfo6
-rw-r--r--chinese/libpinyin/files/patch-data_Makefile.in6
-rw-r--r--chinese/libpinyin/files/patch-libpinyin.pc.in6
9 files changed, 46 insertions, 22 deletions
diff --git a/chinese/ibus-libpinyin/Makefile b/chinese/ibus-libpinyin/Makefile
index df1fc0bdaf6f..8e7c01e98cf7 100644
--- a/chinese/ibus-libpinyin/Makefile
+++ b/chinese/ibus-libpinyin/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= ibus-libpinyin
-PORTVERSION= 1.10.0
-PORTREVISION= 3
+PORTVERSION= 1.11.1
CATEGORIES= chinese
MASTER_SITES= SF/libpinyin/${PORTNAME}
@@ -16,9 +15,10 @@ LIB_DEPENDS= libsqlite3.so:databases/sqlite3 \
libibus-1.0.so:textproc/ibus \
libpinyin.so:chinese/libpinyin
-USES= compiler:c++11-lib gmake python pkgconfig gettext
-USE_GNOME= glib20
+USES= compiler:c++11-lib gmake gnome python pkgconfig gettext
USE_PYTHON= py3kplist
+USE_GNOME= glib20
+GLIB_SCHEMAS= com.github.libpinyin.ibus-libpinyin.gschema.xml
WRKSRC= ${WRKDIR}/${DISTNAME}
@@ -27,7 +27,7 @@ CONFIGURE_ARGS= --disable-dependency-tracking --disable-boost \
--disable-lua-extension
OPTIONS_DEFINE= ENGLISH STROKE OPENCC NLS
-OPTIONS_DEFAULT= ENGLISH STROKE
+OPTIONS_DEFAULT= ENGLISH STROKE OPENCC
OPTIONS_SUB= yes
ENGLISH_DESC= Enable English input mode
STROKE_DESC= Enable stroke input mode
@@ -36,7 +36,6 @@ OPENCC_DESC= Use opencc for simplified and traditional Chinese conversion
ENGLISH_CONFIGURE_ENABLE= english-input-mode
STROKE_CONFIGURE_ENABLE= stroke-input-mode
-OPENCC_BROKEN= Requires newer OpenCC
OPENCC_CONFIGURE_ENABLE= opencc
OPENCC_LIB_DEPENDS= libopencc.so:chinese/opencc
diff --git a/chinese/ibus-libpinyin/distinfo b/chinese/ibus-libpinyin/distinfo
index 1cb238410d8f..2fba6c6d46eb 100644
--- a/chinese/ibus-libpinyin/distinfo
+++ b/chinese/ibus-libpinyin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1539584534
-SHA256 (ibus-libpinyin-1.10.0.tar.gz) = 6cc4f80d2348f93ed408d52fb33b45736f51ae33335a869e8a3bb6460957087b
-SIZE (ibus-libpinyin-1.10.0.tar.gz) = 1081199
+TIMESTAMP = 1565071977
+SHA256 (ibus-libpinyin-1.11.1.tar.gz) = 80f530ccb88d44c51cfbb20d1191d50b0d4240c2a087de4e3aae89c6e26381ae
+SIZE (ibus-libpinyin-1.11.1.tar.gz) = 1177679
diff --git a/chinese/ibus-libpinyin/files/patch-data_Makefile.am b/chinese/ibus-libpinyin/files/patch-data_Makefile.am
new file mode 100644
index 000000000000..f67763c2a0cc
--- /dev/null
+++ b/chinese/ibus-libpinyin/files/patch-data_Makefile.am
@@ -0,0 +1,11 @@
+--- data/Makefile.am.orig 2019-05-09 06:57:21 UTC
++++ data/Makefile.am
+@@ -67,7 +67,7 @@ desktop_files = $(desktop_in_files:.desktop.in=.deskto
+
+ $(desktop_files): $(desktop_in_files) Makefile
+ $(AM_V_GEN)$(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+- sed -i -e 's|@libexecdir[@]|$(libexecdir)|g' \
++ sed -i '' -e 's|@libexecdir[@]|$(libexecdir)|g' \
+ -e 's|@pkgdatadir[@]|$(pkgdatadir)|g' $@
+
+ desktopdir=$(datadir)/applications
diff --git a/chinese/ibus-libpinyin/files/patch-data_Makefile.in b/chinese/ibus-libpinyin/files/patch-data_Makefile.in
new file mode 100644
index 000000000000..8fd45e396c14
--- /dev/null
+++ b/chinese/ibus-libpinyin/files/patch-data_Makefile.in
@@ -0,0 +1,11 @@
+--- data/Makefile.in.orig 2019-05-09 06:57:27 UTC
++++ data/Makefile.in
+@@ -863,7 +863,7 @@ $(STROKES_DB): $(STROKES) $(STROKES_AWK)
+
+ $(desktop_files): $(desktop_in_files) Makefile
+ $(AM_V_GEN)$(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+- sed -i -e 's|@libexecdir[@]|$(libexecdir)|g' \
++ sed -i '' -e 's|@libexecdir[@]|$(libexecdir)|g' \
+ -e 's|@pkgdatadir[@]|$(pkgdatadir)|g' $@
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/chinese/ibus-libpinyin/pkg-plist b/chinese/ibus-libpinyin/pkg-plist
index 7419ecbdcc6c..5359465b77f3 100644
--- a/chinese/ibus-libpinyin/pkg-plist
+++ b/chinese/ibus-libpinyin/pkg-plist
@@ -9,7 +9,6 @@ libexec/ibus-setup-libpinyin
share/appdata/libpinyin.appdata.xml
share/applications/ibus-setup-libbopomofo.desktop
share/applications/ibus-setup-libpinyin.desktop
-share/glib-2.0/schemas/com.github.libpinyin.ibus-libpinyin.gschema.xml
%%ENGLISH%%%%DATADIR%%/db/english.db
%%STROKE%%%%DATADIR%%/db/strokes.db
%%DATADIR%%/icons/chinese.svg
diff --git a/chinese/libpinyin/Makefile b/chinese/libpinyin/Makefile
index 112b2407e398..1c9e53d60e6e 100644
--- a/chinese/libpinyin/Makefile
+++ b/chinese/libpinyin/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= libpinyin
-PORTVERSION= 2.2.0
-PORTREVISION= 2
+PORTVERSION= 2.3.0
CATEGORIES= chinese textproc
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}
@@ -12,8 +11,9 @@ COMMENT= Library to deal with pinyin
LICENSE= GPLv2
-USES= bdb compiler:c++11-lang gettext gmake libtool pathfix pkgconfig
+USES= bdb compiler:c++11-lang gmake gnome libtool pathfix pkgconfig
USE_GNOME= glib20
+
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
@@ -22,6 +22,10 @@ CONFIGURE_ARGS+=CPPFLAGS="-I${LOCALBASE}/include \
LDFLAGS="-L${LOCALBASE}/lib -l${BDB_LIB_NAME}"
INSTALL_TARGET=install-strip
+OPTIONS_DEFINE= NLS
+
+NLS_USES= gettext
+
PLIST_SUB+= VER=${PORTVERSION}
post-install:
diff --git a/chinese/libpinyin/distinfo b/chinese/libpinyin/distinfo
index c7c662b879db..03171f45f82e 100644
--- a/chinese/libpinyin/distinfo
+++ b/chinese/libpinyin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1539587914
-SHA256 (libpinyin-2.2.0.tar.gz) = f22144418031f48784ea4b417927e935424bb6767a63ceea107377b9d9ee9cb0
-SIZE (libpinyin-2.2.0.tar.gz) = 19602224
+TIMESTAMP = 1564885156
+SHA256 (libpinyin-2.3.0.tar.gz) = b3dc9c6a1af55e9427f9d462ff176fbab6a3793368080a2f8e2a58c4cd4e2691
+SIZE (libpinyin-2.3.0.tar.gz) = 20465096
diff --git a/chinese/libpinyin/files/patch-data_Makefile.in b/chinese/libpinyin/files/patch-data_Makefile.in
index 6c83f868faa1..68047fc9ed7a 100644
--- a/chinese/libpinyin/files/patch-data_Makefile.in
+++ b/chinese/libpinyin/files/patch-data_Makefile.in
@@ -1,6 +1,6 @@
---- data/Makefile.in.orig 2014-06-05 14:21:55.000000000 +0800
-+++ data/Makefile.in 2014-06-05 14:22:17.000000000 +0800
-@@ -288,7 +288,7 @@
+--- data/Makefile.in.orig 2019-08-07 02:01:59 UTC
++++ data/Makefile.in
+@@ -307,7 +307,7 @@ EXTRA_DIST = $(textual_model_data) \
libpinyin_db_DATA = $(binary_model_data) \
table.conf
diff --git a/chinese/libpinyin/files/patch-libpinyin.pc.in b/chinese/libpinyin/files/patch-libpinyin.pc.in
index 2610935b5743..77d7d5d5290a 100644
--- a/chinese/libpinyin/files/patch-libpinyin.pc.in
+++ b/chinese/libpinyin/files/patch-libpinyin.pc.in
@@ -1,6 +1,6 @@
---- libpinyin.pc.in.orig 2014-06-05 14:28:26.000000000 +0800
-+++ libpinyin.pc.in 2014-06-05 14:28:35.000000000 +0800
-@@ -2,7 +2,7 @@
+--- libpinyin.pc.in.orig 2018-05-28 08:15:28 UTC
++++ libpinyin.pc.in
+@@ -2,7 +2,7 @@ prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 02:55:56 +0000