Attachment #198961 for bug #230891

Lines 1-2 Link Here

(-)scim-bridge/distinfo (-2 / +3 lines)
1	SHA256 (scim-bridge-0.4.16.tar.gz) = 50d9da4a2842ab31cd3b27b1baacb14c458614bdb35855c6ecd09ab855ac702c	1	TIMESTAMP = 1537995740
2	SIZE (scim-bridge-0.4.16.tar.gz) = 508870	2	SHA256 (scim-im-scim-bridge-v0.4.17_GH0.tar.gz) = 3825b45b021aafe6ec7e06cfcb67d71d94eb072e326d6fb7f43ec739bde68f36
		3	SIZE (scim-im-scim-bridge-v0.4.17_GH0.tar.gz) = 143702

Lines 1-6 Link Here

(-)scim-bridge/files/patch-agent_scim-bridge-agent-accept-listener.cpp (-3 / +3 lines)
1	--- agent/scim-bridge-agent-accept-listener.cpp.orig	1	--- agent/scim-bridge-agent-accept-listener.cpp.orig 2017-08-07 08:09:12 UTC
2	+++ agent/scim-bridge-agent-accept-listener.cpp	2	+++ agent/scim-bridge-agent-accept-listener.cpp
3	@@ -106,12 +106,12 @@	3	@@ -106,12 +106,12 @@ retval_t ScimBridgeAgentAcceptListenerIm
4	struct sockaddr_un socket_addr;	4	struct sockaddr_un socket_addr;
5	memset (&socket_addr, 0, sizeof (struct sockaddr_un));	5	memset (&socket_addr, 0, sizeof (struct sockaddr_un));
6	socket_addr.sun_family = AF_UNIX;	6	socket_addr.sun_family = AF_UNIX;
Lines 15-21 Link Here
15	if (i == MAX_TRIAL - 1) {	15	if (i == MAX_TRIAL - 1) {
16	scim_bridge_pdebugln (6, "It seems like there is no other agent for the old socket.");	16	scim_bridge_pdebugln (6, "It seems like there is no other agent for the old socket.");
17	break;	17	break;
18	@@ -163,7 +163,7 @@	18	@@ -163,7 +163,7 @@ retval_t ScimBridgeAgentAcceptListenerIm
19	return RETVAL_FAILED;	19	return RETVAL_FAILED;
20	}	20	}
21		21

Lines 1-4 Link Here

(-)scim-bridge/files/patch-agent_scim-bridge-agent-signal-listener.cpp (-1 / +1 lines)
1	--- agent/scim-bridge-agent-signal-listener.cpp.orig 2008-11-02 06:44:50.000000000 +0000	1	--- agent/scim-bridge-agent-signal-listener.cpp.orig 2017-08-07 08:09:12 UTC
2	+++ agent/scim-bridge-agent-signal-listener.cpp	2	+++ agent/scim-bridge-agent-signal-listener.cpp
3	@@ -22,6 +22,7 @@	3	@@ -22,6 +22,7 @@
4	#include <signal.h>	4	#include <signal.h>

Lines 1-10 Link Here

(-)scim-bridge/files/patch-agent_utils_scim-bridge-agent-panel-client.cpp (-10 lines)
1	--- agent/utils/scim-bridge-agent-panel-client.cpp.orig 2009-01-17 17:20:15.000000000 +0000
2	+++ agent/utils/scim-bridge-agent-panel-client.cpp
3	@@ -20,6 +20,7 @@
4
5	#include <errno.h>
6	#include <string.h>
7	+#include <unistd.h>
8
9	#include <sys/stat.h>
10	#include <sys/types.h>




--- configure.orig
+++ configure
@@ -24583,6 +24583,7 @@
 
   enable_gtk2_immodule="yes";
 fi
+enable_gtk2_immodule="no";
 
 # Check if we should build scim-bridge-qt-immodule
 
@@ -24660,6 +24661,7 @@
 
   enable_qt3_immodule="yes";
 fi
+enable_qt3_immodule="no";
 
 
 pkg_failed=no
@@ -24736,6 +24738,7 @@
 
   enable_qt4_immodule="yes";
 fi
+enable_qt4_immodule="no";
 
 ###########################################################
 ##             Definiation of compile args.              ##




--- configure.ac.orig	2017-08-07 08:09:12 UTC
+++ configure.ac
@@ -82,6 +82,7 @@ if test "$SCIM_BRIDGE_HAS_GTK2" = "yes";
   AC_SUBST(GTK_BINARY_VERSION)
   enable_gtk2_immodule="yes";
 fi
+enable_gtk2_immodule="no";
 
 # Check if we should build scim-bridge-qt-immodule
 PKG_CHECK_MODULES(QT3, [qt-mt >= 3.3],
@@ -95,6 +96,7 @@ if test "$SCIM_BRIDGE_HAS_QT3" = "yes"; 
   AC_SUBST(QT3_PREFIX)
   enable_qt3_immodule="yes";
 fi
+enable_qt3_immodule="no";
 
 PKG_CHECK_MODULES(QT4, [QtGui >= 4.0, QtCore >= 4.0],
 			[SCIM_BRIDGE_HAS_QT4=yes],
@@ -111,6 +113,7 @@ if test "$SCIM_BRIDGE_HAS_QT4" = "yes"; 
   AC_SUBST(QT4_LIBDIR)
   enable_qt4_immodule="yes";
 fi
+enable_qt4_immodule="no";
 
 ###########################################################
 ##             Definiation of compile args.              ##




# $FreeBSD: head/textproc/scim-bridge/Makefile 479238 2018-09-08 09:19:13Z tobik $

PORTNAME=	scim-bridge
DISTVERSIONPREFIX=	v
PORTVERSION=	0.4.17
CATEGORIES=	textproc
MASTER_SITES=	SF/scim/${PORTNAME}/${PORTVERSION}

MAINTAINER=	ashish@FreeBSD.org
COMMENT=	Scim-bridge agent (server)


LIB_DEPENDS=	libscim-1.0.so:textproc/scim

USES=		gettext gmake pkgconfig autoreconf:build
USE_GITHUB=	yes
GH_ACCOUNT=	scim-im
GNU_CONFIGURE=	yes

CPPFLAGS+=	-I${LOCALBASE}/include -D__STDC_ISO_10646__


.include <bsd.port.pre.mk>

.if ${OPSYS} == FreeBSD
.if ( ${OSVERSION} >= 1101513 && ${OSVERSION} < 1200000 ) || ${OSVERSION} >= 1200060
BROKEN=	fails to compile with clang6 or later
.endif
.endif

post-patch:
	@${GREP} -lR "<malloc\.h>" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
		's|<malloc\.h>|<stdlib.h>|g'
	@${GREP} -lR "<alloca\.h>" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
		's|<alloca\.h>|<stdlib.h>|g'

pre-configure:
	@cd ${WRKSRC} && ./bootstrap

.include <bsd.port.post.mk>

Return to bug 230891

Lines 1-26 Link Here

(-)scim-bridge/files/patch-configure (-26 lines)
1	--- configure.orig
2	+++ configure
3	@@ -24583,6 +24583,7 @@
4
5	enable_gtk2_immodule="yes";
6	fi
7	+enable_gtk2_immodule="no";
8
9	# Check if we should build scim-bridge-qt-immodule
10
11	@@ -24660,6 +24661,7 @@
12
13	enable_qt3_immodule="yes";
14	fi
15	+enable_qt3_immodule="no";
16
17
18	pkg_failed=no
19	@@ -24736,6 +24738,7 @@
20
21	enable_qt4_immodule="yes";
22	fi
23	+enable_qt4_immodule="no";
24
25	###########################################################
26	## Definiation of compile args. ##

Line 0 Link Here

(-)scim-bridge/files/patch-configure.ac (+26 lines)
	1	--- configure.ac.orig 2017-08-07 08:09:12 UTC
	2	+++ configure.ac
	3	@@ -82,6 +82,7 @@ if test "$SCIM_BRIDGE_HAS_GTK2" = "yes";
	4	AC_SUBST(GTK_BINARY_VERSION)
	5	enable_gtk2_immodule="yes";
	6	fi
	7	+enable_gtk2_immodule="no";
	8
	9	# Check if we should build scim-bridge-qt-immodule
	10	PKG_CHECK_MODULES(QT3, [qt-mt >= 3.3],
	11	@@ -95,6 +96,7 @@ if test "$SCIM_BRIDGE_HAS_QT3" = "yes";
	12	AC_SUBST(QT3_PREFIX)
	13	enable_qt3_immodule="yes";
	14	fi
	15	+enable_qt3_immodule="no";
	16
	17	PKG_CHECK_MODULES(QT4, [QtGui >= 4.0, QtCore >= 4.0],
	18	[SCIM_BRIDGE_HAS_QT4=yes],
	19	@@ -111,6 +113,7 @@ if test "$SCIM_BRIDGE_HAS_QT4" = "yes";
	20	AC_SUBST(QT4_LIBDIR)
	21	enable_qt4_immodule="yes";
	22	fi
	23	+enable_qt4_immodule="no";
	24
	25	###########################################################
	26	## Definiation of compile args. ##

Lines 1-10 Link Here

(-)scim-bridge/Makefile (-10 / +8 lines)
1	# $FreeBSD: head/textproc/scim-bridge/Makefile 479238 2018-09-08 09:19:13Z tobik $	1	# $FreeBSD: head/textproc/scim-bridge/Makefile 479238 2018-09-08 09:19:13Z tobik $
2		2
3	PORTNAME= scim-bridge	3	PORTNAME= scim-bridge
4	PORTVERSION= 0.4.16	4	DISTVERSIONPREFIX= v
5	PORTREVISION= 2	5	PORTVERSION= 0.4.17
6	CATEGORIES= textproc	6	CATEGORIES= textproc
7	MASTER_SITES= SF/scim/${PORTNAME}/${PORTVERSION}
8		7
9	MAINTAINER= ashish@FreeBSD.org	8	MAINTAINER= ashish@FreeBSD.org
10	COMMENT= Scim-bridge agent (server)	9	COMMENT= Scim-bridge agent (server)
Lines 16-22 Link Here
16		15
17	LIB_DEPENDS= libscim-1.0.so:textproc/scim	16	LIB_DEPENDS= libscim-1.0.so:textproc/scim
18		17
19	USES= gettext gmake pkgconfig	18	USES= gettext gmake pkgconfig autoreconf:build
		19	USE_GITHUB= yes
		20	GH_ACCOUNT= scim-im
20	GNU_CONFIGURE= yes	21	GNU_CONFIGURE= yes
21		22
22	CPPFLAGS+= -I${LOCALBASE}/include -D__STDC_ISO_10646__	23	CPPFLAGS+= -I${LOCALBASE}/include -D__STDC_ISO_10646__
Lines 32-47 Link Here
32		33
33	.include <bsd.port.pre.mk>	34	.include <bsd.port.pre.mk>
34		35
35	.if ${OPSYS} == FreeBSD
36	.if ( ${OSVERSION} >= 1101513 && ${OSVERSION} < 1200000 ) \|\| ${OSVERSION} >= 1200060
37	BROKEN= fails to compile with clang6 or later
38	.endif
39	.endif
40
41	post-patch:	36	post-patch:
42	@${GREP} -lR "<malloc\.h>" ${WRKSRC} \| ${XARGS} ${REINPLACE_CMD} -e \	37	@${GREP} -lR "<malloc\.h>" ${WRKSRC} \| ${XARGS} ${REINPLACE_CMD} -e \
43	's\|<malloc\.h>\|<stdlib.h>\|g'	38	's\|<malloc\.h>\|<stdlib.h>\|g'
44	@${GREP} -lR "<alloca\.h>" ${WRKSRC} \| ${XARGS} ${REINPLACE_CMD} -e \	39	@${GREP} -lR "<alloca\.h>" ${WRKSRC} \| ${XARGS} ${REINPLACE_CMD} -e \
45	's\|<alloca\.h>\|<stdlib.h>\|g'	40	's\|<alloca\.h>\|<stdlib.h>\|g'
46		41
		42	pre-configure:
		43	@cd ${WRKSRC} && ./bootstrap
		44
47	.include <bsd.port.post.mk>	45	.include <bsd.port.post.mk>