Attachment 203531 Details for Bug 237148 – patch

[patch] patch

scim-fcitx.patch (text/plain), 4.49 KB, created by Piotr Kubaj on 2019-04-09 08:40:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Piotr Kubaj

Created: 2019-04-09 08:40:40 UTC

Size: 4.49 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 498040)
>+++ Makefile	(working copy)
>@@ -18,7 +18,8 @@
> BUILD_DEPENDS=	${RUN_DEPENDS}
> RUN_DEPENDS=	scim:textproc/scim
> 
>-USES=		tar:bzip2 gmake libtool:keepla pkgconfig
>+USES=		compiler:c++11-lang tar:bzip2 gmake libtool:keepla pkgconfig \
>+		localbase:ldflags
> GNU_CONFIGURE=	yes
> INSTALL_TARGET=	install-strip
> MAKE_JOBS_UNSAFE=	yes
>@@ -27,8 +28,7 @@
> 
> CONFIGURE_ENV+=	SCIM_DATADIR=${PREFIX}/share/scim \
> 		SCIM_ICONDIR=${PREFIX}/share/scim/icons
>-CPPFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib -lintl
>+LDFLAGS+=	-lintl
> 
> SUB_FILES=	pkg-message
> 
>Index: files/patch-src__sp.cpp
>===================================================================
>--- files/patch-src__sp.cpp	(revision 498040)
>+++ files/patch-src__sp.cpp	(working copy)
>@@ -1,10 +1,10 @@
>---- src/sp.cpp.orig	2005-05-08 20:11:29.000000000 +0400
>-+++ src/sp.cpp	2014-07-23 03:21:49.000000000 +0400
>-@@ -11,6 +11,7 @@
>+--- src/sp.cpp.orig	2019-04-09 08:22:14 UTC
>++++ src/sp.cpp
>+@@ -7,6 +7,7 @@
>+ #include "scim_fcitx_imengine.h"
>+ using namespace scim;
>+ 
>++#include <cstring>
>+ #include <stdio.h>
>  #include <sys/stat.h>
>  #include <limits.h>
>- #include <ctype.h>
>-+#include <unistd.h> // for access()
>- 
>- #include "main.h"
>- #include "sp.h"
>Index: files/patch-src_ime.cpp
>===================================================================
>--- files/patch-src_ime.cpp	(nonexistent)
>+++ files/patch-src_ime.cpp	(working copy)
>@@ -0,0 +1,10 @@
>+--- src/ime.cpp.orig	2019-04-09 08:15:56 UTC
>++++ src/ime.cpp
>+@@ -2,6 +2,7 @@
>+ #define Uses_SCIM_ICONV
>+ #define Uses_SCIM_CONFIG_BASE
>+ #define Uses_SCIM_CONFIG_PATH
>++#include <cstring>
>+ #include <ctype.h>
>+ 
>+ #include <scim.h>
>
>Property changes on: files/patch-src_ime.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-src_ime.h
>===================================================================
>--- files/patch-src_ime.h	(nonexistent)
>+++ files/patch-src_ime.h	(working copy)
>@@ -0,0 +1,12 @@
>+--- src/ime.h.orig	2019-04-09 08:16:46 UTC
>++++ src/ime.h
>+@@ -2,6 +2,9 @@
>+ #define _IME_H
>+ 
>+ #include "xim.h"
>++#ifdef __FreeBSD__
>++#include <sys/types.h>
>++#endif
>+ 
>+ #include "scim_fcitx_imengine.h"
>+ 
>
>Property changes on: files/patch-src_ime.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-src_pyParser.h
>===================================================================
>--- files/patch-src_pyParser.h	(nonexistent)
>+++ files/patch-src_pyParser.h	(working copy)
>@@ -0,0 +1,13 @@
>+--- src/pyParser.h.orig	2019-04-09 08:24:03 UTC
>++++ src/pyParser.h
>+@@ -11,6 +11,10 @@
>+ 
>+ #include "py.h"
>+ 
>++#ifdef __FreeBSD__
>++#include <sys/types.h>
>++#endif
>++
>+ #define PY_SEPERATOR '\''
>+ #define PY_SEPERATOR_S "'"
>+ 
>
>Property changes on: files/patch-src_pyParser.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-src_scim__fcitx__imengine.cpp
>===================================================================
>--- files/patch-src_scim__fcitx__imengine.cpp	(nonexistent)
>+++ files/patch-src_scim__fcitx__imengine.cpp	(working copy)
>@@ -0,0 +1,13 @@
>+--- src/scim_fcitx_imengine.cpp.orig	2019-04-09 08:12:58 UTC
>++++ src/scim_fcitx_imengine.cpp
>+@@ -35,6 +35,10 @@
>+ #define Uses_SCIM_CONFIG_BASE
>+ #define Uses_SCIM_CONFIG_PATH
>+ 
>++#ifdef __FreeBSD__
>++#include <sys/types.h>
>++#endif
>++#include <cstring>
>+ #include <scim.h>
>+ #include "scim_fcitx_imengine.h"
>+ #include "main.h"
>
>Property changes on: files/patch-src_scim__fcitx__imengine.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 237148: 203531