Attachment 155741 Details for Bug 199546 – patch

[patch] patch

kopete-crypto.patch (text/plain), 6.68 KB, created by Tijl Coosemans on 2015-04-19 18:27:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tijl Coosemans

Created: 2015-04-19 18:27:31 UTC

Size: 6.68 KB

patch

obsolete

>Index: deskutils/kdepim4/Makefile
>===================================================================
>--- deskutils/kdepim4/Makefile	(revision 384295)
>+++ deskutils/kdepim4/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	kdepim
> PORTVERSION=	${KDE4_VERSION}
>+PORTREVISION=	1
> CATEGORIES=	deskutils kde
> MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
> DIST_SUBDIR=	KDE/${PORTVERSION}
>@@ -44,4 +45,12 @@ post-patch:
> 	${REINPLACE_CMD} -e '1 s|^.*/|/|g' \
> 		${WRKSRC}/knotes/configdialog/knotecollectionconfigwidget.cpp
> 
>+post-install:
>+	${MKDIR} ${STAGEDIR}${PREFIX}/include/kleo
>+	${INSTALL_DATA} ${WRKSRC}/libkleo/kleo/*.h \
>+		${STAGEDIR}${PREFIX}/include/kleo
>+	${MKDIR} ${STAGEDIR}${PREFIX}/include/kleo/ui
>+	${INSTALL_DATA} ${WRKSRC}/libkleo/ui/*.h \
>+		${STAGEDIR}${PREFIX}/include/kleo/ui
>+
> .include <bsd.port.mk>
>Index: deskutils/kdepim4/pkg-plist
>===================================================================
>--- deskutils/kdepim4/pkg-plist	(revision 384295)
>+++ deskutils/kdepim4/pkg-plist	(working copy)
>@@ -43,6 +43,60 @@ bin/pimsettingexporter
> bin/sieveeditor
> bin/storageservicemanager
> etc/dbus-1/system.d/org.kde.kalarmrtcwake.conf
>+include/kleo/abstractimportjob.h
>+include/kleo/adduseridjob.h
>+include/kleo/changeexpiryjob.h
>+include/kleo/changeownertrustjob.h
>+include/kleo/changepasswdjob.h
>+include/kleo/checksumdefinition.h
>+include/kleo/cryptobackend.h
>+include/kleo/cryptobackendfactory.h
>+include/kleo/cryptoconfig.h
>+include/kleo/decryptjob.h
>+include/kleo/decryptverifyjob.h
>+include/kleo/deletejob.h
>+include/kleo/dn.h
>+include/kleo/downloadjob.h
>+include/kleo/encryptjob.h
>+include/kleo/enum.h
>+include/kleo/exception.h
>+include/kleo/exportjob.h
>+include/kleo/hierarchicalkeylistjob.h
>+include/kleo/importfromkeyserverjob.h
>+include/kleo/importjob.h
>+include/kleo/job.h
>+include/kleo/kconfigbasedkeyfilter.h
>+include/kleo/keyfilter.h
>+include/kleo/keyfiltermanager.h
>+include/kleo/keygenerationjob.h
>+include/kleo/keylistjob.h
>+include/kleo/kleo_export.h
>+include/kleo/listallkeysjob.h
>+include/kleo/multideletejob.h
>+include/kleo/oidmap.h
>+include/kleo/refreshkeysjob.h
>+include/kleo/signencryptjob.h
>+include/kleo/signjob.h
>+include/kleo/signkeyjob.h
>+include/kleo/specialjob.h
>+include/kleo/stl_util.h
>+include/kleo/ui/cryptoconfigdialog.h
>+include/kleo/ui/cryptoconfigmodule.h
>+include/kleo/ui/cryptoconfigmodule_p.h
>+include/kleo/ui/directoryserviceswidget.h
>+include/kleo/ui/dnattributeorderconfigwidget.h
>+include/kleo/ui/filenamerequester.h
>+include/kleo/ui/kdhorizontalline.h
>+include/kleo/ui/keyapprovaldialog.h
>+include/kleo/ui/keylistview.h
>+include/kleo/ui/keyrequester.h
>+include/kleo/ui/keyselectiondialog.h
>+include/kleo/ui/messagebox.h
>+include/kleo/ui/messagebox_p.h
>+include/kleo/ui/progressbar.h
>+include/kleo/ui/progressdialog.h
>+include/kleo/verifydetachedjob.h
>+include/kleo/verifyopaquejob.h
> lib/akonadi/contact/editorpageplugins/cryptopageplugin.so
> lib/kde4/akregator_config_advanced.so
> lib/kde4/akregator_config_appearance.so
>Index: net-im/kopete-kde4/Makefile
>===================================================================
>--- net-im/kopete-kde4/Makefile	(revision 384295)
>+++ net-im/kopete-kde4/Makefile	(working copy)
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	kopete
> PORTVERSION=	${KDE4_VERSION}
>+PORTREVISION=	1
> CATEGORIES=	net-im kde
> MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
> DIST_SUBDIR=	KDE/${PORTVERSION}
>@@ -13,24 +14,17 @@ LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/l
> 		libqca.so:${PORTSDIR}/devel/qca \
> 		libotr.so.5:${PORTSDIR}/security/libotr \
> 		libgadu.so:${PORTSDIR}/polish/libgadu \
>-		libortp.so:${PORTSDIR}/net/ortp \
>-		libmediastreamer_base.so:${PORTSDIR}/net/mediastreamer \
>-		libspeex.so:${PORTSDIR}/audio/speex \
>-		libexpat.so:${PORTSDIR}/textproc/expat2 \
>+		libkleo.so:${PORTSDIR}/deskutils/kdepim4 \
> 		libmeanwhile.so:${PORTSDIR}/net-im/meanwhile \
> 		libv4l2.so:${PORTSDIR}/multimedia/libv4l \
> 		libjasper.so:${PORTSDIR}/graphics/jasper \
>-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
>-		libjsoncpp.so:${PORTSDIR}/devel/jsoncpp
>-BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat \
>-		${LOCALBASE}/lib/mediastreamer/plugins/libmsilbc.so:${PORTSDIR}/audio/msilbc
>-RUN_DEPENDS=	${LOCALBASE}/lib/mediastreamer/plugins/libmsilbc.so:${PORTSDIR}/audio/msilbc
>+		libjpeg.so:${PORTSDIR}/graphics/jpeg
>+BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
> 
> USES=		cmake:outsource pkgconfig shebangfix tar:xz webplugin:native
> USE_GNOME=	libxml2 libxslt
> USE_KDE4=	kdelibs kdeprefix pimlibs \
> 		automoc4 qimageblitz
>-USE_OPENSSL=	yes
> USE_QT4=	corelib gui network qt3support sql xml \
> 		moc_build qmake_build rcc_build uic_build uic3_build
> USE_SQLITE=	yes
>@@ -51,7 +45,7 @@ CMAKE_ARGS+=	-DWITH_Alsa:BOOL=OFF
> CMAKE_ARGS+=	-DMOZPLUGIN_INSTALL_DIR:PATH="${WEBPLUGIN_DIR}"
> 
> # Forcefully disable net-im/libmsn which was deprecated on 2013-07-27.
>-CMAKE_ARGS+=	-DHAVE_LIBMSN:BOOL=OFF
>+CMAKE_ARGS+=	-DWITH_wlm:BOOL=OFF
> 
> # Fix build with fresh multimedia/v4l_compat installed.
> CFLAGS+=	-DHAVE_LINUX_INTEGER_TYPES=1
>Index: net-im/kopete-kde4/pkg-plist
>===================================================================
>--- net-im/kopete-kde4/pkg-plist	(revision 384295)
>+++ net-im/kopete-kde4/pkg-plist	(working copy)
>@@ -78,6 +78,7 @@ lib/kde4/kcm_kopete_autoreplace.so
> lib/kde4/kcm_kopete_avdeviceconfig.so
> lib/kde4/kcm_kopete_behaviorconfig.so
> lib/kde4/kcm_kopete_chatwindowconfig.so
>+lib/kde4/kcm_kopete_cryptography.so
> lib/kde4/kcm_kopete_highlight.so
> lib/kde4/kcm_kopete_history.so
> lib/kde4/kcm_kopete_history2.so
>@@ -98,6 +99,7 @@ lib/kde4/kopete_autoreplace.so
> lib/kde4/kopete_bonjour.so
> lib/kde4/kopete_chatwindow.so
> lib/kde4/kopete_contactnotes.so
>+lib/kde4/kopete_cryptography.so
> lib/kde4/kopete_emailwindow.so
> lib/kde4/kopete_gadu.so
> lib/kde4/kopete_groupwise.so
>@@ -588,6 +590,8 @@ share/apps/kopete/webpresence/webpresenc
> share/apps/kopete/webpresence/webpresence_xhtml.xsl
> share/apps/kopete/webpresence/webpresence_xhtml_images.xsl
> share/apps/kopete_contactnotes/contactnotesui.rc
>+share/apps/kopete_cryptography/cryptographychatui.rc
>+share/apps/kopete_cryptography/cryptographyui.rc
> share/apps/kopete_groupwise/gwchatui.rc
> share/apps/kopete_history/historychatui.rc
> share/apps/kopete_history/historyui.rc
>@@ -745,6 +749,7 @@ share/kde4/services/chatwindow.desktop
> share/kde4/services/emailwindow.desktop
> share/kde4/services/kconfiguredialog/kopete_addbookmarks_config.desktop
> share/kde4/services/kconfiguredialog/kopete_autoreplace_config.desktop
>+share/kde4/services/kconfiguredialog/kopete_cryptography_config.desktop
> share/kde4/services/kconfiguredialog/kopete_highlight_config.desktop
> share/kde4/services/kconfiguredialog/kopete_history2_config.desktop
> share/kde4/services/kconfiguredialog/kopete_history_config.desktop

Actions: View | Diff

Attachments on bug 199546: 155741