Attachment 134533 Details for Bug 179217 – net-im_libjingle.diff

[patch] net-im_libjingle.diff

net-im_libjingle.diff (text/x-diff), 4.48 KB, created by tkato432 on 2013-06-04 18:57:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2013-06-04 18:57:20 UTC

Size: 4.48 KB

patch

obsolete

>diff -urN /usr/ports/net-im/libjingle/Makefile net-im/libjingle/Makefile
>--- /usr/ports/net-im/libjingle/Makefile	2013-04-24 01:02:10.000000000 +0900
>+++ net-im/libjingle/Makefile	2014-08-13 06:05:00.000000000 +0900
>@@ -10,6 +10,9 @@
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Google Talk's implementation of Jingle and Jingle-Audio
> 
>+LICENSE=	BSD
>+LICENSE_FILE=	${WRKSRC}/COPYING
>+
> LIB_DEPENDS=	speex:${PORTSDIR}/audio/speex \
> 		ilbc:${PORTSDIR}/net/ilbc \
> 		ortp:${PORTSDIR}/net/linphone-base \
>@@ -19,26 +22,25 @@
> 		clusterit-[0-9]* pcp-[0-9]* synce-librapi2-[0-9]*
> 
> USES=		pkgconfig
>+USE_DOS2UNIX=	README
> USE_GNOME=	glib20
> USE_OPENSSL=	yes
>-USE_AUTOTOOLS=	libtool
>-USE_DOS2UNIX=	README
> USE_GMAKE=	yes
>-GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--with-ilbc=${LOCALBASE} \
>-		--with-speex=${LOCALBASE}
>-CONFIGURE_ENV=	PKG_CONFIG="${PKG_CONFIG}" \
>-		EXPAT_CFLAGS="-I${LOCALBASE}/include" \
>+USE_AUTOTOOLS=	libtool
>+CONFIGURE_ENV=	EXPAT_CFLAGS="-I${LOCALBASE}/include" \
> 		EXPAT_LIBS="-L${LOCALBASE}/lib -lexpat" \
>-		GLIB_CFLAGS="$$(${PKG_CONFIG} --cflags glib-2.0)" \
>-		GLIB_LIBS="$$(${PKG_CONFIG} --libs glib-2.0)" \
>+		GLIB_CFLAGS="$$(pkg-config --cflags glib-2.0)" \
>+		GLIB_LIBS="$$(pkg-config --libs glib-2.0)" \
> 		ILBC_CFLAGS="-I${LOCALBASE}/include/ilbc" \
> 		ILBC_LIBS="-L${LOCALBASE}/lib -lilbc" \
>-		SPEEX_CFLAGS="$$(${PKG_CONFIG} --cflags speex)" \
>-		SPEEX_LIBS="$$(${PKG_CONFIG} --libs speex)"
>-CPPFLAGS+=	-I${LOCALBASE}/include -I${OPENSSLINC} ${PTHREAD_CFLAGS} -g
>+		SPEEX_CFLAGS="$$(pkg-config --cflags speex)" \
>+		SPEEX_LIBS="$$(pkg-config --libs speex)"
>+CONFIGURE_ARGS=	--with-ilbc=${LOCALBASE} \
>+		--with-speex=${LOCALBASE}
> MAKE_JOBS_SAFE=	yes
>-LDFLAGS+=-L${LOCALBASE}/lib -L${OPENSSLLIB} ${PTHREAD_LIBS}
>+
>+CPPFLAGS+=	-I${OPENSSLINC} -I${LOCALBASE}/include -g
>+LDFLAGS+=	-L${OPENSSLLIB} -L${LOCALBASE}/lib -pthread
> 
> PORTDOCS=	AUTHORS \
> 		ChangeLog \
>@@ -72,6 +74,12 @@
> 		'#define ${feature} 1' >> \
> 		${CONFIGURE_WRKSRC}/config.h
> .endfor
>+	@${REINPLACE_CMD} -e \
>+		'/^int main/s|char\* argv|char** argv|' \
>+		${WRKSRC}/talk/base/virtualsocket_unittest.cc
>+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
>+		's|`pkg-config --cflags gtk+-2.0`|| ; \
>+		 s|-lpthread|-pthread|'
> 
> post-install:
> .if ${PORT_OPTIONS:MDOCS}
>diff -urN /usr/ports/net-im/libjingle/files/patch-talk__base__openssladapter.cpp net-im/libjingle/files/patch-talk__base__openssladapter.cpp
>--- /usr/ports/net-im/libjingle/files/patch-talk__base__openssladapter.cpp	1970-01-01 09:00:00.000000000 +0900
>+++ net-im/libjingle/files/patch-talk__base__openssladapter.cpp	2014-08-13 06:05:00.000000000 +0900
>@@ -0,0 +1,14 @@
>+--- talk/base/openssladapter.cc.orig
>++++ talk/base/openssladapter.cc
>+@@ -641,7 +641,11 @@
>+     int extension_nid = OBJ_obj2nid(X509_EXTENSION_get_object(extension));
>+ 
>+     if (extension_nid == NID_subject_alt_name) {
>++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
>++      const X509V3_EXT_METHOD* meth = X509V3_EXT_get(extension);
>++#else
>+       X509V3_EXT_METHOD* meth = X509V3_EXT_get(extension);
>++#endif
>+       if (!meth)
>+         break;
>+ 
>diff -urN /usr/ports/net-im/libjingle/files/patch-talk__base__stringutils.h net-im/libjingle/files/patch-talk__base__stringutils.h
>--- /usr/ports/net-im/libjingle/files/patch-talk__base__stringutils.h	2012-11-08 06:33:18.000000000 +0900
>+++ net-im/libjingle/files/patch-talk__base__stringutils.h	2014-08-13 06:05:00.000000000 +0900
>@@ -1,5 +1,37 @@
> --- talk/base/stringutils.h.orig	2008-09-06 23:10:21.000000000 -0300
> +++ talk/base/stringutils.h	2008-09-06 23:13:17.000000000 -0300
>+@@ -197,15 +197,6 @@
>+ }
>+ 
>+ template<class CTYPE>
>+-size_t sprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format, ...) {
>+-  va_list args;
>+-  va_start(args, format);
>+-  size_t len = vsprintfn(buffer, buflen, format, args);
>+-  va_end(args);
>+-  return len;
>+-}
>+-
>+-template<class CTYPE>
>+ size_t vsprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format,
>+                  va_list args) {
>+   int len = vsnprintf(buffer, buflen, format, args);
>+@@ -216,6 +207,15 @@
>+   return len;
>+ }
>+ 
>++template<class CTYPE>
>++size_t sprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format, ...) {
>++  va_list args;
>++  va_start(args, format);
>++  size_t len = vsprintfn(buffer, buflen, format, args);
>++  va_end(args);
>++  return len;
>++}
>++
>+ ///////////////////////////////////////////////////////////////////////////////
>+ // Allow safe comparing and copying ascii (not UTF-8) with both wide and
>+ // non-wide character strings.
> @@ -269,7 +269,7 @@
>  template<>
>  struct Traits<char> {

Actions: View | Diff

Attachments on bug 179217: 134532 | 134533