Attachment 225242 Details for Bug 256139 – Patch

[patch] Patch

psi.patch (text/plain), 7.86 KB, created by Chris Mangin on 2021-05-25 02:16:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Mangin

Created: 2021-05-25 02:16:21 UTC

Size: 7.86 KB

patch

obsolete

>diff -ruN psi.orig/Makefile psi/Makefile
>--- psi.orig/Makefile	2021-04-06 16:19:55.687416000 -0400
>+++ psi/Makefile	2021-05-24 20:55:49.313935000 -0400
>@@ -2,8 +2,8 @@
> 
> PORTNAME=	psi
> PORTVERSION=	1.5
>+PORTREVISION=	1
> CATEGORIES=	net-im
>-MASTER_SITES=	SF/${PORTNAME}/Psi/${PORTVERSION}
> 
> MAINTAINER=	danfe@FreeBSD.org
> COMMENT=	Qt-based Jabber (XMPP) client
>@@ -19,19 +19,55 @@
> 		x11extras xml buildtools_build qmake_build imageformats_run
> USE_XORG=	ice sm x11 xcb xext xscrnsaver
> 
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	psi-im
>+GH_TUPLE+=	psi-im:libpsi:b89b906:libpsi/src/libpsi
>+GH_TUPLE+=	psi-im:iris:ecbaf62:iris/iris
>+
> CMAKE_ARGS=	-DIDN_LIBRARY:FILEPATH="${LOCALBASE}/lib/libidn.so" \
> 		-DIDN_INCLUDE_DIR:PATH="${LOCALBASE}/include"
> 
>-OPTIONS_DEFINE=	WEBKIT
>+OPTIONS_DEFINE=	WEBKIT NLS PLUGINS
> OPTIONS_RADIO=	SPELLCHECK
> OPTIONS_RADIO_SPELLCHECK=	HUNSPELL ENCHANT
> SPELLCHECK_DESC=	Spell checker backend
>-OPTIONS_DEFAULT=	HUNSPELL
>+OPTIONS_DEFAULT=	HUNSPELL NLS PLUGINS
> OPTIONS_SUB=	yes
> 
> WEBKIT_USE=		QT=webkit
> WEBKIT_CMAKE_BOOL=	ENABLE_WEBKIT
> 
>+NLS_USE=		QT=linguisttools_build
>+
>+PLUGINS_DESC=		Psi+ plugins
>+PLUGINS_LIB_DEPENDS=	libotr.so:security/libotr\
>+			libtidy-0.99.so.0:www/tidy-lib\
>+			libgcrypt.so:security/libgcrypt\
>+			libgpg-error.so:security/libgpg-error
>+
>+# List of all available 'generic' plugins with the exception of:
>+# - screenshotplugin which does not build at this time
>+# - imagepreviewplugin and juickplugin which require option WEBKIT
>+
>+PLUGINS_VARS=		plugin_list+=;attentionplugin;autoreplyplugin;
>+PLUGINS_VARS+=		plugin_list+=;birthdayreminderplugin;chessplugin;
>+PLUGINS_VARS+=		plugin_list+=;cleanerplugin;conferenceloggerplugin;
>+PLUGINS_VARS+=		plugin_list+=;contentdownloaderplugin;
>+PLUGINS_VARS+=		plugin_list+=;enummessagesplugin;extendedmenuplugin;
>+PLUGINS_VARS+=		plugin_list+=;extendedoptionsplugin;gnupgplugin;
>+PLUGINS_VARS+=		plugin_list+=;gomokugameplugin;historykeeperplugin;
>+PLUGINS_VARS+=		plugin_list+=;httpuploadplugin;icqdieplugin;
>+PLUGINS_VARS+=		plugin_list+=;imageplugin;jabberdiskplugin;
>+PLUGINS_VARS+=		plugin_list+=;messagefilterplugin;otrplugin;
>+PLUGINS_VARS+=		plugin_list+=;pepchangenotifyplugin;qipxstatusesplugin;
>+PLUGINS_VARS+=		plugin_list+=;skinsplugin;stopspamplugin;
>+PLUGINS_VARS+=		plugin_list+=;storagenotesplugin;translateplugin;
>+PLUGINS_VARS+=		plugin_list+=;videostatusplugin;watcherplugin;
>+
>+PLUGINS_CMAKE_ON=	-DENABLE_PLUGINS="ON" \
>+			-DBUILD_PLUGINS="${PLUGIN_LIST}"\
>+			-DPLUGINS_PATH="lib/psi/plugins"
>+
> HUNSPELL_LIB_DEPENDS=	libhunspell-1.7.so:textproc/hunspell
> HUNSPELL_CMAKE_BOOL=	USE_HUNSPELL
> 
>@@ -39,6 +75,18 @@
> ENCHANT_LIB_DEPENDS=	libenchant.so:textproc/enchant
> ENCHANT_CMAKE_BOOL=	USE_ENCHANT
> 
>+.include <bsd.port.options.mk>
>+.if ${PORT_OPTIONS:MNLS}
>+GH_TUPLE+=		psi-im:psi-l10n:0508744:l10n/l10n
>+.endif
>+
>+.if ${PORT_OPTIONS:MPLUGINS}
>+GH_TUPLE+=		psi-im:plugins:ed8c471:plugins/plugins
>+.if ${PORT_OPTIONS:MWEBKIT}
>+PLUGINS_VARS+=		plugin_list+=;imagepreviewplugin;juickplugin;
>+.endif
>+.endif
>+
> post-patch:
> # Replace original Hunspell implementation with better alternative
> 	@${CP} ${FILESDIR}/hunspellchecker.* \
>@@ -48,4 +96,10 @@
> 	@${REINPLACE_CMD} -i .c++20 's,SOURCE_DIR}/version,&.txt,' \
> 		${WRKSRC}/CMakeLists.txt
> 
>+post-extract-NLS-on:
>+	@${MV} ${WRKSRC}/l10n/translations ${WRKSRC}/translations
>+
>+post-extract-PLUGINS-on:
>+	@${MV} ${WRKSRC}/plugins/generic ${WRKSRC}/src/plugins/generic
>+	@${MV} ${WRKSRC}/plugins/unix ${WRKSRC}/src/plugins/unix
> .include <bsd.port.mk>
>diff -ruN psi.orig/distinfo psi/distinfo
>--- psi.orig/distinfo	2021-04-06 16:19:55.687845000 -0400
>+++ psi/distinfo	2021-05-24 12:22:44.211193000 -0400
>@@ -1,3 +1,11 @@
>-TIMESTAMP = 1599398002
>-SHA256 (psi-1.5.tar.xz) = 3167350fd43fab4dc948cb5179ca10159a7aa318472d1a8a7617e41f5aa8b5b7
>-SIZE (psi-1.5.tar.xz) = 2125104
>+TIMESTAMP = 1621873364
>+SHA256 (psi-im-psi-1.5_GH0.tar.gz) = 09dc0c57a8537b881e43727e65a9968e75b59ceca5bc184ab31bd519319a7635
>+SIZE (psi-im-psi-1.5_GH0.tar.gz) = 2195914
>+SHA256 (psi-im-libpsi-b89b906_GH0.tar.gz) = 20e43a42cfd30fc3221542925abd4cd202a07e133dfea9d4634f6735b9fbfb6d
>+SIZE (psi-im-libpsi-b89b906_GH0.tar.gz) = 78852
>+SHA256 (psi-im-iris-ecbaf62_GH0.tar.gz) = ccc83ac0cbf80a28c7979a40754a724622e6b76c76901518ccd261cee4fd40f1
>+SIZE (psi-im-iris-ecbaf62_GH0.tar.gz) = 465713
>+SHA256 (psi-im-psi-l10n-0508744_GH0.tar.gz) = 721aeb5c63ec69708bd5f304965dccbb135f882980950312992b4fb98b2e1e4c
>+SIZE (psi-im-psi-l10n-0508744_GH0.tar.gz) = 3038112
>+SHA256 (psi-im-plugins-ed8c471_GH0.tar.gz) = 4089be1bf33863484c0525de4d1e87faea7795d28076160aee15ebf3de6b9f20
>+SIZE (psi-im-plugins-ed8c471_GH0.tar.gz) = 841826
>diff -ruN psi.orig/pkg-plist psi/pkg-plist
>--- psi.orig/pkg-plist	2021-04-06 16:19:55.689789000 -0400
>+++ psi/pkg-plist	2021-05-24 20:55:24.523768000 -0400
>@@ -1,4 +1,33 @@
> bin/psi
>+%%PLUGINS%%lib/psi/plugins/libattentionplugin.so
>+%%PLUGINS%%lib/psi/plugins/libautoreplyplugin.so
>+%%PLUGINS%%lib/psi/plugins/libbirthdayreminderplugin.so
>+%%PLUGINS%%lib/psi/plugins/libchessplugin.so
>+%%PLUGINS%%lib/psi/plugins/libcleanerplugin.so
>+%%PLUGINS%%lib/psi/plugins/libconferenceloggerplugin.so
>+%%PLUGINS%%lib/psi/plugins/libcontentdownloaderplugin.so
>+%%PLUGINS%%lib/psi/plugins/libenummessagesplugin.so
>+%%PLUGINS%%lib/psi/plugins/libextendedmenuplugin.so
>+%%PLUGINS%%lib/psi/plugins/libextendedoptionsplugin.so
>+%%PLUGINS%%lib/psi/plugins/libgnupgplugin.so
>+%%PLUGINS%%lib/psi/plugins/libgomokugameplugin.so
>+%%PLUGINS%%lib/psi/plugins/libhistorykeeperplugin.so
>+%%PLUGINS%%lib/psi/plugins/libhttpuploadplugin.so
>+%%PLUGINS%%lib/psi/plugins/libicqdieplugin.so
>+%%PLUGINS%%lib/psi/plugins/libimageplugin.so
>+%%PLUGINS%%lib/psi/plugins/libjabberdiskplugin.so
>+%%PLUGINS%%lib/psi/plugins/libmessagefilterplugin.so
>+%%PLUGINS%%lib/psi/plugins/libotrplugin.so
>+%%PLUGINS%%lib/psi/plugins/libpepchangenotifyplugin.so
>+%%PLUGINS%%lib/psi/plugins/libqipxstatusesplugin.so
>+%%PLUGINS%%lib/psi/plugins/libskinsplugin.so
>+%%PLUGINS%%lib/psi/plugins/libstopspamplugin.so
>+%%PLUGINS%%lib/psi/plugins/libstoragenotesplugin.so
>+%%PLUGINS%%lib/psi/plugins/libtranslateplugin.so
>+%%PLUGINS%%lib/psi/plugins/libvideostatusplugin.so
>+%%PLUGINS%%lib/psi/plugins/libwatcherplugin.so
>+%%WEBKIT%%%%PLUGINS%%/lib//psi/plugins/libimagepreviewplugin.so
>+%%WEBKIT%%%%PLUGINS%%/lib//psi/plugins/libjuickplugin.so
> share/applications/psi.desktop
> share/pixmaps/psi.png
> %%DATADIR%%/certs/README
>@@ -414,3 +443,36 @@
> %%WEBKIT%%%%DATADIR%%/themes/chatview/psi/new_classic/load.js
> %%WEBKIT%%%%DATADIR%%/themes/chatview/psi/new_classic/screenshot.png
> %%WEBKIT%%%%DATADIR%%/themes/chatview/util.js
>+%%NLS%%%%DATADIR%%/translations/psi_be.qm
>+%%NLS%%%%DATADIR%%/translations/psi_bg.qm
>+%%NLS%%%%DATADIR%%/translations/psi_ca.qm
>+%%NLS%%%%DATADIR%%/translations/psi_cs.qm
>+%%NLS%%%%DATADIR%%/translations/psi_de.qm
>+%%NLS%%%%DATADIR%%/translations/psi_en.qm
>+%%NLS%%%%DATADIR%%/translations/psi_eo.qm
>+%%NLS%%%%DATADIR%%/translations/psi_es.qm
>+%%NLS%%%%DATADIR%%/translations/psi_et.qm
>+%%NLS%%%%DATADIR%%/translations/psi_fa.qm
>+%%NLS%%%%DATADIR%%/translations/psi_fi.qm
>+%%NLS%%%%DATADIR%%/translations/psi_fr.qm
>+%%NLS%%%%DATADIR%%/translations/psi_he.qm
>+%%NLS%%%%DATADIR%%/translations/psi_hu.qm
>+%%NLS%%%%DATADIR%%/translations/psi_it.qm
>+%%NLS%%%%DATADIR%%/translations/psi_ja.qm
>+%%NLS%%%%DATADIR%%/translations/psi_kk.qm
>+%%NLS%%%%DATADIR%%/translations/psi_mk.qm
>+%%NLS%%%%DATADIR%%/translations/psi_nl.qm
>+%%NLS%%%%DATADIR%%/translations/psi_pl.qm
>+%%NLS%%%%DATADIR%%/translations/psi_pt_BR.qm
>+%%NLS%%%%DATADIR%%/translations/psi_pt.qm
>+%%NLS%%%%DATADIR%%/translations/psi_ru.qm
>+%%NLS%%%%DATADIR%%/translations/psi_sk.qm
>+%%NLS%%%%DATADIR%%/translations/psi_sl.qm
>+%%NLS%%%%DATADIR%%/translations/psi_sr@latin.qm
>+%%NLS%%%%DATADIR%%/translations/psi_sv.qm
>+%%NLS%%%%DATADIR%%/translations/psi_sw.qm
>+%%NLS%%%%DATADIR%%/translations/psi_uk.qm
>+%%NLS%%%%DATADIR%%/translations/psi_ur_PK.qm
>+%%NLS%%%%DATADIR%%/translations/psi_vi.qm
>+%%NLS%%%%DATADIR%%/translations/psi_zh_CN.qm
>+%%NLS%%%%DATADIR%%/translations/psi_zh_TW.qm

Actions: View | Diff

Attachments on bug 256139: 225242