Attachment 161063 Details for Bug 203125 – jitsi patch

[patch] jitsi patch

jitsi.diff (text/plain), 6.99 KB, created by Steve Wills on 2015-09-15 13:37:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Wills

Created: 2015-09-15 13:37:29 UTC

Size: 6.99 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 396752)
>+++ Makefile	(working copy)
>@@ -2,12 +2,13 @@
> # $FreeBSD$
> 
> PORTNAME=	jitsi
>-PORTVERSION=	2.3
>+PORTVERSION=	2.8
> CATEGORIES=	net-im java
>-MASTER_SITES=	http://aetos.it.teithe.gr/~tzabal/ports/jitsi/ \
>-		http://www.c-s.li/ports/
>-DISTNAME=	jitsi-master-084e2b42b5
>+MASTER_SITES=	https://download.jitsi.org/jitsi/src/
>+DISTFILES=	jitsi-src-${PORTVERSION}.5426${EXTRACT_SUFX}
> 
>+WRKSRC=		${WRKDIR}/${PORTNAME}
>+
> MAINTAINER=	tzabal@it.teithe.gr
> COMMENT=	Open source IM and VoIP application
> 
>@@ -29,35 +30,23 @@
> 		true
> 
> do-install:
>-	@${ECHO_CMD} ">> Creating Jitsi directories..."
>-	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/jitsi/sc-bundles
>-	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/jitsi/lib/bundle
>-	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/jitsi/lib/native
>-# Bundles (Jitsi modules)
>-	@${ECHO_CMD} ">> Installing bundles (Jitsi modules)..."
>-	@cd ${WRKSRC}/sc-bundles && ${COPYTREE_SHARE} . \
>+	${MKDIR} ${STAGEDIR}${PREFIX}/lib/jitsi/sc-bundles
>+	${MKDIR} ${STAGEDIR}${PREFIX}/lib/jitsi/lib/bundle
>+	${MKDIR} ${STAGEDIR}${PREFIX}/lib/jitsi/lib/native
>+	cd ${WRKSRC}/sc-bundles && ${COPYTREE_SHARE} . \
> 		${STAGEDIR}${PREFIX}/lib/jitsi/sc-bundles
>-	@${RM} ${STAGEDIR}${PREFIX}/lib/jitsi/sc-bundles/*slick*.jar
>-	@${RM} -r ${STAGEDIR}${PREFIX}/lib/jitsi/sc-bundles/os-specific
>-# Library JARs
>-	@${ECHO_CMD} ">> Installing library jars..."
>-	@cd ${WRKSRC}/lib/bundle && ${COPYTREE_SHARE} . \
>+	${RM} ${STAGEDIR}${PREFIX}/lib/jitsi/sc-bundles/*slick*.jar
>+	${RM} -r ${STAGEDIR}${PREFIX}/lib/jitsi/sc-bundles/os-specific
>+	cd ${WRKSRC}/lib/bundle && ${COPYTREE_SHARE} . \
> 		${STAGEDIR}${PREFIX}/lib/jitsi/lib/bundle "! -name junit.jar"
>-	@cd ${WRKSRC}/lib && ${COPYTREE_SHARE} "felix.jar jdic-all.jar \
>+	cd ${WRKSRC}/lib && ${COPYTREE_SHARE} "felix.jar \
> 		felix.client.run.properties logging.properties" \
> 			${STAGEDIR}${PREFIX}/lib/jitsi/lib
>-# Native libraries
>-	@${ECHO_CMD} ">> Installing native (${ARCH}) libraries..."
>-	@cd ${WRKSRC}/lib/native/freebsd${ARCH:S/i386//:S/amd/-/:S/x86_/-/} && \
>+	cd ${WRKSRC}/lib/native/freebsd${ARCH:S/i386//:S/amd/-/:S/x86_/-/} && \
> 		${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/jitsi/lib/native
>-# Wrapper script to run Jitsi
>-	@${ECHO_CMD} ">> Installing wrapper script..."
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/jitsi/lib/native/*.so
> 	${INSTALL_SCRIPT} ${FILESDIR}/jitsi.sh ${STAGEDIR}${PREFIX}/bin/jitsi
>-# Manual page
>-	@${ECHO_CMD} ">> Installing the manual page..."
> 	${INSTALL_MAN} ${FILESDIR}/jitsi.1 ${STAGEDIR}${MANPREFIX}/man/man1
>-# Desktop related
>-	@${ECHO_CMD} ">> Installing Jitsi's logo..."
> 	${INSTALL_DATA} ${WRKSRC}/resources/images/logo/sc_logo_128x128.png \
> 		${STAGEDIR}${PREFIX}/share/pixmaps/jitsi.png
> 
>Index: distinfo
>===================================================================
>--- distinfo	(revision 396752)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (jitsi-master-084e2b42b5.zip) = e11100ca4c19083002a3d57d3b34711e5601da2c388f4ee89f9b98862d2df01c
>-SIZE (jitsi-master-084e2b42b5.zip) = 68936481
>+SHA256 (jitsi-src-2.8.5426.zip) = e649867e186cf195c4b1bb159d7ffe0a38c4dc60659e5c55f9a74461a309f36c
>+SIZE (jitsi-src-2.8.5426.zip) = 67515973
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 396752)
>+++ pkg-plist	(working copy)
>@@ -4,17 +4,11 @@
> lib/jitsi/lib/bundle/org.apache.felix.bundlerepository-1.6.4.jar
> lib/jitsi/lib/felix.client.run.properties
> lib/jitsi/lib/felix.jar
>-lib/jitsi/lib/jdic-all.jar
> lib/jitsi/lib/logging.properties
> lib/jitsi/lib/native/libhid.so
> lib/jitsi/lib/native/libhwaddressretriever.so
> lib/jitsi/lib/native/libjdic_misc.so
>-lib/jitsi/lib/native/libjnffmpeg.so
>-lib/jitsi/lib/native/libjnopus.so
>-lib/jitsi/lib/native/libjnpulseaudio.so
>-lib/jitsi/lib/native/libjnvideo4linux2.so
>-lib/jitsi/lib/native/libjnvpx.so
>-lib/jitsi/lib/native/libtray.so
>+lib/jitsi/sc-bundles/accountinfo.jar
> lib/jitsi/sc-bundles/addrbook.jar
> lib/jitsi/sc-bundles/advancedconfig.jar
> lib/jitsi/sc-bundles/aimaccregwizz.jar
>@@ -29,7 +23,9 @@
> lib/jitsi/sc-bundles/chatalerter.jar
> lib/jitsi/sc-bundles/chatconfig.jar
> lib/jitsi/sc-bundles/commons-codec.jar
>+lib/jitsi/sc-bundles/commons-lang.jar
> lib/jitsi/sc-bundles/configuration.jar
>+lib/jitsi/sc-bundles/connectioninfo.jar
> lib/jitsi/sc-bundles/contacteventhandler.jar
> lib/jitsi/sc-bundles/contactinfo.jar
> lib/jitsi/sc-bundles/contactlist.jar
>@@ -53,14 +49,20 @@
> lib/jitsi/sc-bundles/googlecontacts-service.jar
> lib/jitsi/sc-bundles/googlecontacts.jar
> lib/jitsi/sc-bundles/googletalkaccregwizz.jar
>+lib/jitsi/sc-bundles/guava.jar
> lib/jitsi/sc-bundles/hid-service.jar
> lib/jitsi/sc-bundles/hid.jar
> lib/jitsi/sc-bundles/history.jar
>+lib/jitsi/sc-bundles/hsqldb.jar
> lib/jitsi/sc-bundles/httpclient.jar
>+lib/jitsi/sc-bundles/httpcore.jar
> lib/jitsi/sc-bundles/httputil.jar
> lib/jitsi/sc-bundles/icqaccregwizz.jar
> lib/jitsi/sc-bundles/ippiaccregwizz.jar
> lib/jitsi/sc-bundles/iptelaccregwizz.jar
>+lib/jitsi/sc-bundles/irc-api-1.0.jar
>+lib/jitsi/sc-bundles/irc-commands.jar
>+lib/jitsi/sc-bundles/ircaccregwizz.jar
> lib/jitsi/sc-bundles/jabberaccregwizz.jar
> lib/jitsi/sc-bundles/jfontchooserlib.jar
> lib/jitsi/sc-bundles/jmdnslib.jar
>@@ -74,7 +76,7 @@
> lib/jitsi/sc-bundles/meta-cl.jar
> lib/jitsi/sc-bundles/metahistory.jar
> lib/jitsi/sc-bundles/msghistory.jar
>-lib/jitsi/sc-bundles/msnaccregwizz.jar
>+lib/jitsi/sc-bundles/muc.jar
> lib/jitsi/sc-bundles/neomedia.jar
> lib/jitsi/sc-bundles/netaddr.jar
> lib/jitsi/sc-bundles/notification-handlers.jar
>@@ -85,6 +87,7 @@
> lib/jitsi/sc-bundles/otr.jar
> lib/jitsi/sc-bundles/packetlogging.jar
> lib/jitsi/sc-bundles/phonenumbercontactsource.jar
>+lib/jitsi/sc-bundles/phonenumbers.jar
> lib/jitsi/sc-bundles/plugin-certconfig.jar
> lib/jitsi/sc-bundles/plugin-contactsourceconfig.jar
> lib/jitsi/sc-bundles/plugin-ldap.jar
>@@ -94,10 +97,10 @@
> lib/jitsi/sc-bundles/pluginmanager.jar
> lib/jitsi/sc-bundles/propertieseditor.jar
> lib/jitsi/sc-bundles/protocol-icq.jar
>+lib/jitsi/sc-bundles/protocol-irc.jar
> lib/jitsi/sc-bundles/protocol-jabber.jar
> lib/jitsi/sc-bundles/protocol-media.jar
> lib/jitsi/sc-bundles/protocol-mock.jar
>-lib/jitsi/sc-bundles/protocol-msn.jar
> lib/jitsi/sc-bundles/protocol-sip.jar
> lib/jitsi/sc-bundles/protocol-yahoo.jar
> lib/jitsi/sc-bundles/protocol.jar
>@@ -127,8 +130,11 @@
> lib/jitsi/sc-bundles/simpleaccreg.jar
> lib/jitsi/sc-bundles/sipaccregwizz.jar
> lib/jitsi/sc-bundles/skinmanager.jar
>+lib/jitsi/sc-bundles/slf4j-api.jar
>+lib/jitsi/sc-bundles/slf4j-jdk14.jar
> lib/jitsi/sc-bundles/smacklib.jar
> lib/jitsi/sc-bundles/spellChecker.jar
>+lib/jitsi/sc-bundles/splash-screen.jar
> lib/jitsi/sc-bundles/swing-ui.jar
> lib/jitsi/sc-bundles/swingnotification.jar
> lib/jitsi/sc-bundles/sysactivitynotifications.jar
>@@ -137,9 +143,8 @@
> lib/jitsi/sc-bundles/ui-service.jar
> lib/jitsi/sc-bundles/update.jar
> lib/jitsi/sc-bundles/updateservice.jar
>+lib/jitsi/sc-bundles/usersearch.jar
> lib/jitsi/sc-bundles/util.jar
> lib/jitsi/sc-bundles/version-impl.jar
> lib/jitsi/sc-bundles/yahooaccregwizz.jar
> lib/jitsi/sc-bundles/zrtp4j.jar
>-man/man1/jitsi.1.gz
>-share/pixmaps/jitsi.png

Actions: View | Diff

Attachments on bug 203125: 161063