Attachment 175120 Details for Bug 207937 – Fix packaging with python 3 and fix filesystem violation

[patch] Fix packaging with python 3 and fix filesystem violation

mozc-server.diff (text/plain), 1.55 KB, created by Ruslan Makhmatkhanov on 2016-09-24 12:29:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ruslan Makhmatkhanov

Created: 2016-09-24 12:29:40 UTC

Size: 1.55 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 422698)
>+++ Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	mozc
> PORTVERSION=	2.17.2322.102
>+PORTREVISION=	1
> CATEGORIES=	japanese
> MASTER_SITES=	https://codeload.github.com/google/${PORTNAME}/tar.gz/9b4c9e0?dummy=/:main \
> 		https://codeload.github.com/hiroyuki-komatsu/japanese-usage-dictionary/tar.gz/e5b3425?dummy=/:udic
>@@ -18,7 +19,6 @@
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> BUILD_DEPENDS=	ninja:devel/ninja \
>-		python:lang/python \
> 		gyp:devel/py-gyp
> EXTRACT_DEPENDS=${PYTHON_CMD}:${PYTHON_PORTSDIR}
> LIB_DEPENDS=	libprotobuf.so:devel/protobuf \
>@@ -26,8 +26,9 @@
> RUN_DEPENDS=	xdg-open:devel/xdg-utils
> 
> USES=		compiler:c++11-lang pkgconfig iconv:wchar_t gmake \
>-		tar:bzip2 python:build
>+		tar:bzip2 python:2.7,build shebangfix
> WRKSRC=		${WRKDIR}/${PORTNAME}-9b4c9e0
>+SHEBANG_FILES=	src/build_mozc.py
> BUILD_WRKSRC=	${WRKSRC}/src
> 
> BUILD_MOZC_LIST?=	mozc_server
>@@ -98,6 +99,8 @@
> post-patch:
> 	${REINPLACE_CMD} 's,-liconv,${ICONV_LIB},g' \
> 	    ${BUILD_WRKSRC}/gui/qt_libraries.gypi
>+	${FIND} ${BUILD_WRKSRC} $ -name '*.gyp' -o -name '*.gypi' $ -exec \
>+	    ${REINPLACE_CMD} "s,'python','${PYTHON_CMD}',g" {} \;
> .if ${BUILD_MOZC_LIST:Mfcitx_mozc} == "fcitx_mozc"
> 	${REINPLACE_CMD} 's,/po/mo},%po}mo,g' \
> 	    ${BUILD_WRKSRC}/unix/fcitx/gen_fcitx_mozc_i18n.sh
>@@ -416,6 +419,8 @@
> .endif
> 
> do-build: ${BUILD_MOZC_LIST:S/^/do-build-/}
>+post-build:
>+	${RMDIR} /root/.mozc
> do-install: ${BUILD_MOZC_LIST:S/^/do-install-/}
> 
> .include <bsd.port.post.mk>

Flags:

rm: maintainer-approval? (hrs)

Actions: View | Diff

Attachments on bug 207937: 168065 | 175120 | 175122