Attachment 210984 Details for Bug 243541 – A svn diff for japanese/ibus-anthy

[patch] A svn diff for japanese/ibus-anthy

ibus-anthy.diff (text/plain), 13.57 KB, created by WATANABE Kazuhiro on 2020-01-23 12:30:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: WATANABE Kazuhiro

Created: 2020-01-23 12:30:42 UTC

Size: 13.57 KB

patch

obsolete

>Index: ibus-anthy/Makefile
>===================================================================
>--- ibus-anthy/Makefile	(revision 523858)
>+++ ibus-anthy/Makefile	(working copy)
>@@ -2,45 +2,26 @@
> # $FreeBSD$
> 
> PORTNAME=	ibus-anthy
>-PORTVERSION=	1.2.7
>-PORTREVISION=	7
>+PORTVERSION=	1.5.11
> CATEGORIES=	japanese
> MASTER_SITES=	https://github.com/ibus/ibus-anthy/releases/download/${PORTVERSION}/
> PKGNAMEPREFIX=	ja-
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	CQG00620@nifty.ne.jp
> COMMENT=	Anthy engine for IBus
> 
>-DEPRECATED=	Unmaintained, uses EOLed python27
>-EXPIRATION_DATE=	2020-01-27
>+LICENSE=	GPLv2
>+LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-BUILD_DEPENDS=	swig3.0:devel/swig30
> LIB_DEPENDS=	libanthy.so:japanese/anthy \
> 		libibus-1.0.so:textproc/ibus
>-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/pynotify/_pynotify.so:devel/py-notify
> 
> GNU_CONFIGURE=	yes
>-USES=		gettext gmake gnome libtool pkgconfig python:2.7
>-USE_GNOME=	intltool pygtk2
>-BINARY_ALIAS=	swig=swig3.0
>+INSTALL_TARGET=	install-strip
>+CONFIGURE_ARGS+=--with-layout=default
>+USES=		gettext gmake gnome libtool pkgconfig python:3.6+
>+USE_GNOME=	pygobject3
>+INSTALLS_ICONS=	yes
>+GLIB_SCHEMAS=	org.freedesktop.ibus.engine.anthy.gschema.xml
> 
>-LOCALBASE_REPLACE_FILES= \
>-		engine/engine.py \
>-		setup/anthyprefs.py \
>-		setup/main.py
>-
>-INCLUDEDIR_REPLACE_FILES= \
>-		engine/Makefile.am \
>-		engine/Makefile.in
>-
>-post-patch:
>-	cd ${WRKSRC} && \
>-                ${REINPLACE_CMD} "s,@@LOCALBASE@@,${LOCALBASE},g" \
>-                ${LOCALBASE_REPLACE_FILES} && \
>-                ${REINPLACE_CMD} "s,@@INCLUDEDIR@@,${INCLUDEDIR},g" \
>-                ${INCLUDEDIR_REPLACE_FILES}
>-
>-post-install:
>-	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/_anthy.so
>-
> .include <bsd.port.mk>
>Index: ibus-anthy/distinfo
>===================================================================
>--- ibus-anthy/distinfo	(revision 523858)
>+++ ibus-anthy/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (ibus-anthy-1.2.7.tar.gz) = 33c42c1612423f84fddd8c38f8b2439b8af5f0b5fc7725ae195a01b8999d85e9
>-SIZE (ibus-anthy-1.2.7.tar.gz) = 523139
>+TIMESTAMP = 1578574826
>+SHA256 (ibus-anthy-1.5.11.tar.gz) = 809596b0d4630c5861a96fc28800ebaa1ab007787b22f5d7d3c7c0152fd78fff
>+SIZE (ibus-anthy-1.5.11.tar.gz) = 809725
>Index: ibus-anthy/files/patch-configure
>===================================================================
>--- ibus-anthy/files/patch-configure	(revision 523858)
>+++ ibus-anthy/files/patch-configure	(nonexistent)
>@@ -1,38 +0,0 @@
>---- configure.orig	2012-04-08 17:47:23.699623266 +0900
>-+++ configure	2012-04-08 17:58:11.837622677 +0900
>-@@ -17078,7 +17078,7 @@
>- if test $ac_have_decl = 1; then :
>- 
>- else
>--  as_fn_error $? "Could not find NTH_*_CANDIDATE values in anthy.h" "$LINENO" 5
>-+#  as_fn_error $? "Could not find NTH_*_CANDIDATE values in anthy.h" "$LINENO" 5
>- fi
>- ac_fn_c_check_decl "$LINENO" "NTH_KATAKANA_CANDIDATE" "ac_cv_have_decl_NTH_KATAKANA_CANDIDATE" "#include <anthy/anthy.h>
>- "
>-@@ -17094,7 +17094,7 @@
>- if test $ac_have_decl = 1; then :
>- 
>- else
>--  as_fn_error $? "Could not find NTH_*_CANDIDATE values in anthy.h" "$LINENO" 5
>-+#  as_fn_error $? "Could not find NTH_*_CANDIDATE values in anthy.h" "$LINENO" 5
>- fi
>- ac_fn_c_check_decl "$LINENO" "NTH_HIRAGANA_CANDIDATE" "ac_cv_have_decl_NTH_HIRAGANA_CANDIDATE" "#include <anthy/anthy.h>
>- "
>-@@ -17110,7 +17110,7 @@
>- if test $ac_have_decl = 1; then :
>- 
>- else
>--  as_fn_error $? "Could not find NTH_*_CANDIDATE values in anthy.h" "$LINENO" 5
>-+#  as_fn_error $? "Could not find NTH_*_CANDIDATE values in anthy.h" "$LINENO" 5
>- fi
>- ac_fn_c_check_decl "$LINENO" "NTH_HALFKANA_CANDIDATE" "ac_cv_have_decl_NTH_HALFKANA_CANDIDATE" "#include <anthy/anthy.h>
>- "
>-@@ -17126,7 +17126,7 @@
>- if test $ac_have_decl = 1; then :
>- 
>- else
>--  as_fn_error $? "Could not find NTH_*_CANDIDATE values in anthy.h" "$LINENO" 5
>-+#  as_fn_error $? "Could not find NTH_*_CANDIDATE values in anthy.h" "$LINENO" 5
>- fi
>- 
>- 
>
>Property changes on: ibus-anthy/files/patch-configure
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: ibus-anthy/files/patch-engine_Makefile.in
>===================================================================
>--- ibus-anthy/files/patch-engine_Makefile.in	(revision 523858)
>+++ ibus-anthy/files/patch-engine_Makefile.in	(nonexistent)
>@@ -1,11 +0,0 @@
>---- engine/Makefile.in.orig	2012-04-08 17:47:23.680622559 +0900
>-+++ engine/Makefile.in	2012-04-08 17:58:25.467629657 +0900
>-@@ -801,7 +801,7 @@
>- 
>- 
>- anthy.py anthy_wrap.c: anthy.i
>--	$(SWIG) -python $(ANTHY_CFLAGS) -I/usr/include -o anthy_wrap.c $(srcdir)/anthy.i
>-+	$(SWIG) -python -I@@INCLUDEDIR@@ ${ANTHY_CFLAGS} -o anthy_wrap.c $(srcdir)/anthy.i
>- 
>- anthy.xml: anthy.xml.in
>- 	( \
>
>Property changes on: ibus-anthy/files/patch-engine_Makefile.in
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: ibus-anthy/files/patch-po_Makefile.in.in
>===================================================================
>--- ibus-anthy/files/patch-po_Makefile.in.in	(revision 523858)
>+++ ibus-anthy/files/patch-po_Makefile.in.in	(nonexistent)
>@@ -1,11 +0,0 @@
>---- po/Makefile.in.in.orig	2012-04-08 17:47:23.690620919 +0900
>-+++ po/Makefile.in.in	2012-04-08 17:58:36.694619782 +0900
>-@@ -34,7 +34,7 @@
>- datarootdir = @datarootdir@
>- libdir = @libdir@
>- DATADIRNAME = @DATADIRNAME@
>--itlocaledir = $(prefix)/$(DATADIRNAME)/locale
>-+itlocaledir = @localedir@
>- subdir = po
>- install_sh = @install_sh@
>- # Automake >= 1.8 provides @mkdir_p@.
>
>Property changes on: ibus-anthy/files/patch-po_Makefile.in.in
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: ibus-anthy/files/patch-setup_main.py
>===================================================================
>--- ibus-anthy/files/patch-setup_main.py	(revision 523858)
>+++ ibus-anthy/files/patch-setup_main.py	(nonexistent)
>@@ -1,11 +0,0 @@
>---- setup/main.py.orig	2012-04-08 17:47:23.692620971 +0900
>-+++ setup/main.py	2012-04-08 17:58:44.140619685 +0900
>-@@ -63,7 +63,7 @@
>-         # glade "icon_name" property has a custom scaling and it seems
>-         # to be difficult to show the complicated small icon in metacity.
>-         # This can add the pixbuf without scaling.
>--        anthydir = path.dirname(path.dirname(__file__))
>-+        anthydir = "@@LOCALBASE@@/share/ibus-anthy"
>-         if not anthydir:
>-             anthydir = "/usr/share/ibus-anthy"
>-         icon_path = path.join(anthydir, "icons", "ibus-anthy.png")
>
>Property changes on: ibus-anthy/files/patch-setup_main.py
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: ibus-anthy/pkg-message
>===================================================================
>--- ibus-anthy/pkg-message	(revision 523858)
>+++ ibus-anthy/pkg-message	(working copy)
>@@ -3,24 +3,23 @@
>   message: <<EOM
> ibus-anthy installation finished. To use ibus-anthy, please do the following:
> 
>-If you are using bash or zsh, please add following lines to your $HOME/.bashrc or
>-$HOME/.zshrc:
>+If you are using bash, please add following lines to your $HOME/.bashrc:
> 
> export XIM=ibus
> export GTK_IM_MODULE=ibus
>-export QT_IM_MODULE=xim
>+export QT_IM_MODULE=ibus
> export XMODIFIERS=@im=ibus
> export XIM_PROGRAM="ibus-daemon"
>-export XIM_ARGS="-r --daemonize --xim"
>+export XIM_ARGS="--daemonize --xim"
> 
> If you are using tcsh, please add following lines to your $HOME/.cshrc:
> 
> setenv XIM ibus
> setenv GTK_IM_MODULE ibus
>-setenv QT_IM_MODULE xim
>+setenv QT_IM_MODULE ibus
> setenv XMODIFIERS @im=ibus
> setenv XIM_PROGRAM ibus-daemon
>-setenv XIM_ARGS "-r --daemonize --xim"
>+setenv XIM_ARGS "--daemonize --xim"
> 
> If you are using KDE4, you may create a shell script in $HOME/.kde4/env,
> and add following lines:
>@@ -28,14 +27,19 @@
> #!/bin/sh
> export XIM=ibus
> export GTK_IM_MODULE=ibus
>-export QT_IM_MODULE=xim
>+export QT_IM_MODULE=ibus
> export XMODIFIERS=@im=ibus
> export XIM_PROGRAM="ibus-daemon"
>-export XIM_ARGS="-r --daemonize --xim"
>+export XIM_ARGS="--daemonize --xim"
> 
>-If ibus cannot start or the panel does not appear, please ensure
>-that you are using up-to-date python.
>-There's a bug in python 2.5, which may prevent the panel from appearing.
>+-------------
>+
>+If you cannot launch the IM selection panel by hitting "Super+space"
>+(usually "Win+space"), run the "ibus-setup" command and add "Japanese -
>+Anthy" via the Imput Method tab.
>+
>+You may also add "ibus-daemon --daemonize --xim" to your ~/.xinitrc or
>+~/.xsession .
> EOM
> }
> ]
>Index: ibus-anthy/pkg-plist
>===================================================================
>--- ibus-anthy/pkg-plist	(revision 523858)
>+++ ibus-anthy/pkg-plist	(working copy)
>@@ -1,48 +1,70 @@
>-%%PYTHON_SITELIBDIR%%/_anthy.so
>-%%PYTHON_SITELIBDIR%%/anthy.py
>+include/ibus-anthy-1.0/anthygcontext.h
> libexec/ibus-engine-anthy
> libexec/ibus-setup-anthy
>+lib/girepository-1.0/Anthy-9000.typelib
>+lib/libanthygobject-1.0.so
>+lib/libanthygobject-1.0.so.5
>+lib/libanthygobject-1.0.so.5.0.511
>+share/applications/ibus-setup-anthy.desktop
>+share/gir-1.0/Anthy-9000.gir
>+%%DATADIR%%/dicts/emoji.t
>+%%DATADIR%%/dicts/era.t
> %%DATADIR%%/dicts/oldchar.t
> %%DATADIR%%/dicts/symbol.t
>+%%DATADIR%%/dicts/zipcode.t
>+%%DATADIR%%/engine/__pycache__/_config.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
>+%%DATADIR%%/engine/__pycache__/_config.cpython-%%PYTHON_SUFFIX%%.pyc
>+%%DATADIR%%/engine/__pycache__/engine.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
>+%%DATADIR%%/engine/__pycache__/engine.cpython-%%PYTHON_SUFFIX%%.pyc
>+%%DATADIR%%/engine/__pycache__/factory.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
>+%%DATADIR%%/engine/__pycache__/factory.cpython-%%PYTHON_SUFFIX%%.pyc
>+%%DATADIR%%/engine/__pycache__/jastring.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
>+%%DATADIR%%/engine/__pycache__/jastring.cpython-%%PYTHON_SUFFIX%%.pyc
>+%%DATADIR%%/engine/__pycache__/kana.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
>+%%DATADIR%%/engine/__pycache__/kana.cpython-%%PYTHON_SUFFIX%%.pyc
>+%%DATADIR%%/engine/__pycache__/main.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
>+%%DATADIR%%/engine/__pycache__/main.cpython-%%PYTHON_SUFFIX%%.pyc
>+%%DATADIR%%/engine/__pycache__/romaji.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
>+%%DATADIR%%/engine/__pycache__/romaji.cpython-%%PYTHON_SUFFIX%%.pyc
>+%%DATADIR%%/engine/__pycache__/segment.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
>+%%DATADIR%%/engine/__pycache__/segment.cpython-%%PYTHON_SUFFIX%%.pyc
>+%%DATADIR%%/engine/__pycache__/tables.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
>+%%DATADIR%%/engine/__pycache__/tables.cpython-%%PYTHON_SUFFIX%%.pyc
>+%%DATADIR%%/engine/__pycache__/thumb.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
>+%%DATADIR%%/engine/__pycache__/thumb.cpython-%%PYTHON_SUFFIX%%.pyc
>+%%DATADIR%%/engine/_config.py
>+%%DATADIR%%/engine/default.xml
> %%DATADIR%%/engine/engine.py
>-%%DATADIR%%/engine/engine.pyc
>-%%DATADIR%%/engine/engine.pyo
> %%DATADIR%%/engine/factory.py
>-%%DATADIR%%/engine/factory.pyc
>-%%DATADIR%%/engine/factory.pyo
> %%DATADIR%%/engine/jastring.py
>-%%DATADIR%%/engine/jastring.pyc
>-%%DATADIR%%/engine/jastring.pyo
> %%DATADIR%%/engine/kana.py
>-%%DATADIR%%/engine/kana.pyc
>-%%DATADIR%%/engine/kana.pyo
> %%DATADIR%%/engine/main.py
>-%%DATADIR%%/engine/main.pyc
>-%%DATADIR%%/engine/main.pyo
> %%DATADIR%%/engine/romaji.py
>-%%DATADIR%%/engine/romaji.pyc
>-%%DATADIR%%/engine/romaji.pyo
> %%DATADIR%%/engine/segment.py
>-%%DATADIR%%/engine/segment.pyc
>-%%DATADIR%%/engine/segment.pyo
> %%DATADIR%%/engine/tables.py
>-%%DATADIR%%/engine/tables.pyc
>-%%DATADIR%%/engine/tables.pyo
> %%DATADIR%%/engine/thumb.py
>-%%DATADIR%%/engine/thumb.pyc
>-%%DATADIR%%/engine/thumb.pyo
>-%%DATADIR%%/icons/ibus-anthy.png
>+%%DATADIR%%/setup/__pycache__/_config.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
>+%%DATADIR%%/setup/__pycache__/_config.cpython-%%PYTHON_SUFFIX%%.pyc
>+%%DATADIR%%/setup/__pycache__/anthyprefs.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
>+%%DATADIR%%/setup/__pycache__/anthyprefs.cpython-%%PYTHON_SUFFIX%%.pyc
>+%%DATADIR%%/setup/__pycache__/main.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
>+%%DATADIR%%/setup/__pycache__/main.cpython-%%PYTHON_SUFFIX%%.pyc
>+%%DATADIR%%/setup/__pycache__/prefs.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
>+%%DATADIR%%/setup/__pycache__/prefs.cpython-%%PYTHON_SUFFIX%%.pyc
>+%%DATADIR%%/setup/_config.py
> %%DATADIR%%/setup/anthyprefs.py
>-%%DATADIR%%/setup/anthyprefs.pyc
>-%%DATADIR%%/setup/anthyprefs.pyo
> %%DATADIR%%/setup/main.py
>-%%DATADIR%%/setup/main.pyc
>-%%DATADIR%%/setup/main.pyo
> %%DATADIR%%/setup/prefs.py
>-%%DATADIR%%/setup/prefs.pyc
>-%%DATADIR%%/setup/prefs.pyo
>-%%DATADIR%%/setup/setup.glade
>+%%DATADIR%%/setup/setup.ui
> share/ibus/component/anthy.xml
>+share/icons/hicolor/scalable/apps/ibus-anthy.svg
>+share/locale/ca/LC_MESSAGES/ibus-anthy.mo
>+share/locale/cs/LC_MESSAGES/ibus-anthy.mo
>+share/locale/el/LC_MESSAGES/ibus-anthy.mo
>+share/locale/es/LC_MESSAGES/ibus-anthy.mo
> share/locale/fr/LC_MESSAGES/ibus-anthy.mo
> share/locale/ja/LC_MESSAGES/ibus-anthy.mo
>+share/locale/pt_BR/LC_MESSAGES/ibus-anthy.mo
>+share/locale/uk/LC_MESSAGES/ibus-anthy.mo
> share/locale/zh_CN/LC_MESSAGES/ibus-anthy.mo
>+share/metainfo/org.freedesktop.ibus.engine.anthy.metainfo.xml

Actions: View | Diff

Attachments on bug 243541: 210984 | 210985