Attachment 198961 Details for Bug 230891 – Update to 0.4.17

[patch] Update to 0.4.17

scim-bridge.diff (text/plain), 6.25 KB, created by Ashish SHUKLA on 2018-11-05 11:43:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ashish SHUKLA

Created: 2018-11-05 11:43:12 UTC

Size: 6.25 KB

patch

obsolete

>diff -urN /usr/ports/textproc/scim-bridge/distinfo scim-bridge/distinfo
>--- /usr/ports/textproc/scim-bridge/distinfo	2014-01-22 21:00:13.000000000 +0530
>+++ scim-bridge/distinfo	2018-09-27 02:32:20.619743000 +0530
>@@ -1,2 +1,3 @@
>-SHA256 (scim-bridge-0.4.16.tar.gz) = 50d9da4a2842ab31cd3b27b1baacb14c458614bdb35855c6ecd09ab855ac702c
>-SIZE (scim-bridge-0.4.16.tar.gz) = 508870
>+TIMESTAMP = 1537995740
>+SHA256 (scim-im-scim-bridge-v0.4.17_GH0.tar.gz) = 3825b45b021aafe6ec7e06cfcb67d71d94eb072e326d6fb7f43ec739bde68f36
>+SIZE (scim-im-scim-bridge-v0.4.17_GH0.tar.gz) = 143702
>diff -urN /usr/ports/textproc/scim-bridge/files/patch-agent_scim-bridge-agent-accept-listener.cpp scim-bridge/files/patch-agent_scim-bridge-agent-accept-listener.cpp
>--- /usr/ports/textproc/scim-bridge/files/patch-agent_scim-bridge-agent-accept-listener.cpp	2015-05-23 02:04:27.000000000 +0530
>+++ scim-bridge/files/patch-agent_scim-bridge-agent-accept-listener.cpp	2018-11-05 16:29:40.503969000 +0530
>@@ -1,6 +1,6 @@
>---- agent/scim-bridge-agent-accept-listener.cpp.orig
>+--- agent/scim-bridge-agent-accept-listener.cpp.orig	2017-08-07 08:09:12 UTC
> +++ agent/scim-bridge-agent-accept-listener.cpp
>-@@ -106,12 +106,12 @@
>+@@ -106,12 +106,12 @@ retval_t ScimBridgeAgentAcceptListenerIm
>      struct sockaddr_un socket_addr;
>      memset (&socket_addr, 0, sizeof (struct sockaddr_un));
>      socket_addr.sun_family = AF_UNIX;
>@@ -15,7 +15,7 @@
>              if (i == MAX_TRIAL - 1) {
>                  scim_bridge_pdebugln (6, "It seems like there is no other agent for the old socket.");
>                  break;
>-@@ -163,7 +163,7 @@
>+@@ -163,7 +163,7 @@ retval_t ScimBridgeAgentAcceptListenerIm
>          return RETVAL_FAILED;
>      }
>      
>diff -urN /usr/ports/textproc/scim-bridge/files/patch-agent_scim-bridge-agent-signal-listener.cpp scim-bridge/files/patch-agent_scim-bridge-agent-signal-listener.cpp
>--- /usr/ports/textproc/scim-bridge/files/patch-agent_scim-bridge-agent-signal-listener.cpp	2013-10-01 18:03:57.000000000 +0530
>+++ scim-bridge/files/patch-agent_scim-bridge-agent-signal-listener.cpp	2018-11-05 16:29:40.505673000 +0530
>@@ -1,4 +1,4 @@
>---- agent/scim-bridge-agent-signal-listener.cpp.orig	2008-11-02 06:44:50.000000000 +0000
>+--- agent/scim-bridge-agent-signal-listener.cpp.orig	2017-08-07 08:09:12 UTC
> +++ agent/scim-bridge-agent-signal-listener.cpp
> @@ -22,6 +22,7 @@
>  #include <signal.h>
>diff -urN /usr/ports/textproc/scim-bridge/files/patch-agent_utils_scim-bridge-agent-panel-client.cpp scim-bridge/files/patch-agent_utils_scim-bridge-agent-panel-client.cpp
>--- /usr/ports/textproc/scim-bridge/files/patch-agent_utils_scim-bridge-agent-panel-client.cpp	2013-10-01 18:03:57.000000000 +0530
>+++ scim-bridge/files/patch-agent_utils_scim-bridge-agent-panel-client.cpp	1970-01-01 05:30:00.000000000 +0530
>@@ -1,10 +0,0 @@
>---- agent/utils/scim-bridge-agent-panel-client.cpp.orig	2009-01-17 17:20:15.000000000 +0000
>-+++ agent/utils/scim-bridge-agent-panel-client.cpp
>-@@ -20,6 +20,7 @@
>- 
>- #include <errno.h>
>- #include <string.h>
>-+#include <unistd.h>
>- 
>- #include <sys/stat.h>
>- #include <sys/types.h>
>diff -urN /usr/ports/textproc/scim-bridge/files/patch-configure scim-bridge/files/patch-configure
>--- /usr/ports/textproc/scim-bridge/files/patch-configure	2015-05-23 02:04:27.000000000 +0530
>+++ scim-bridge/files/patch-configure	1970-01-01 05:30:00.000000000 +0530
>@@ -1,26 +0,0 @@
>---- 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.              ##
>diff -urN /usr/ports/textproc/scim-bridge/files/patch-configure.ac scim-bridge/files/patch-configure.ac
>--- /usr/ports/textproc/scim-bridge/files/patch-configure.ac	1970-01-01 05:30:00.000000000 +0530
>+++ scim-bridge/files/patch-configure.ac	2018-11-05 16:55:11.743855000 +0530
>@@ -0,0 +1,26 @@
>+--- 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.              ##
>diff -urN /usr/ports/textproc/scim-bridge/Makefile scim-bridge/Makefile
>--- /usr/ports/textproc/scim-bridge/Makefile	2018-09-08 14:49:13.000000000 +0530
>+++ scim-bridge/Makefile	2018-09-27 02:36:10.786669000 +0530
>@@ -1,10 +1,9 @@
> # $FreeBSD: head/textproc/scim-bridge/Makefile 479238 2018-09-08 09:19:13Z tobik $
> 
> PORTNAME=	scim-bridge
>-PORTVERSION=	0.4.16
>-PORTREVISION=	2
>+DISTVERSIONPREFIX=	v
>+PORTVERSION=	0.4.17
> CATEGORIES=	textproc
>-MASTER_SITES=	SF/scim/${PORTNAME}/${PORTVERSION}
> 
> MAINTAINER=	ashish@FreeBSD.org
> COMMENT=	Scim-bridge agent (server)
>@@ -16,7 +15,9 @@
> 
> LIB_DEPENDS=	libscim-1.0.so:textproc/scim
> 
>-USES=		gettext gmake pkgconfig
>+USES=		gettext gmake pkgconfig autoreconf:build
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	scim-im
> GNU_CONFIGURE=	yes
> 
> CPPFLAGS+=	-I${LOCALBASE}/include -D__STDC_ISO_10646__
>@@ -32,16 +33,13 @@
> 
> .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>

Actions: View | Diff

Attachments on bug 230891: 196531 | 198961