pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Move over psi-0.15 with my enchant2 patch.

Module Name:	pkgsrc-wip
Committed By:	Benny Siegert <bsiegert%gmail.com@localhost>
Pushed By:	bsiegert
Date:		Sun Nov 18 11:38:30 2018 +0100
Changeset:	2f6cd4f3de91cc80c6bc9f902543ea32adfcd43c

Added Files:
	psi/DESCR
	psi/Makefile
	psi/PLIST
	psi/distinfo
	psi/options.mk
	psi/patches/patch-ad
	psi/patches/patch-ah
	psi/patches/patch-ak
	psi/patches/patch-al
	psi/patches/patch-configure
	psi/patches/patch-src_src.pro

Log Message:
Move over psi-0.15 with my enchant2 patch.

This needs more work. Also, psi-1.3.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2f6cd4f3de91cc80c6bc9f902543ea32adfcd43c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 psi/DESCR                     |  24 ++++++
 psi/Makefile                  |  80 ++++++++++++++++++
 psi/PLIST                     | 192 ++++++++++++++++++++++++++++++++++++++++++
 psi/distinfo                  |  12 +++
 psi/options.mk                |  68 +++++++++++++++
 psi/patches/patch-ad          |  21 +++++
 psi/patches/patch-ah          |  16 ++++
 psi/patches/patch-ak          |  16 ++++
 psi/patches/patch-al          |  16 ++++
 psi/patches/patch-configure   |  15 ++++
 psi/patches/patch-src_src.pro |  14 +++
 11 files changed, 474 insertions(+)

diffs:
diff --git a/psi/DESCR b/psi/DESCR
new file mode 100644
index 0000000000..9241715720
--- /dev/null
+++ b/psi/DESCR
@@ -0,0 +1,24 @@
+XMPP is an open, XML based, distributed, Instant Messaging system
+that seeks to be the standard IM network.
+
+Psi is a client for the Jabber system. Written in C++ and based on
+the Qt library, there are versions available for NetBSD, Linux (and
+other flavors of Unix/X11), Microsoft Windows, and Apple MacOS X.
+Psi is released under the GNU General Public License.
+
+Features:
+* Message (ICQ-style) and Chat (AIM-style) modes
+* Drag and drop to send to multiple contacts
+* Full Unicode support
+* Secure connections
+* Saving contact list locally, and server sync on login
+* Icon Themes
+* Agent registration and searching
+* Retrieving and updating User Info
+* Sound support for incoming events
+* Auto-away after a configurable amount of time
+* Tray/dock icon for KDE/GNOME environments
+* Language plugins
+* OpenPGP integration (via GnuPG via security/qca2-gnupg)
+* Groupchat invites / private-messaging
+* File transfer
diff --git a/psi/Makefile b/psi/Makefile
new file mode 100644
index 0000000000..2c5be6a366
--- /dev/null
+++ b/psi/Makefile
@@ -0,0 +1,80 @@
+# $NetBSD: Makefile,v 1.86 2018/07/18 00:06:11 joerg Exp $
+
+DISTNAME=	psi-0.15
+PKGREVISION=	11
+CATEGORIES=	chat
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=psi/}
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	schnoebe%NetBSD.org@localhost
+HOMEPAGE=	http://psi-im.org/
+COMMENT=	Psi XMPP/Jabber Client
+LICENSE=	gnu-gpl-v2
+
+DEPENDS+=	qca2-ossl>=2.0.0beta3:../../security/qca2-ossl
+
+DIST_SUBDIR=	${DISTNAME}
+DISTFILES=	${DEFAULT_DISTFILES}
+
+USE_TOOLS+=	gmake unzip pkg-config
+USE_LANGUAGES=	c c++03
+USE_LIBTOOL=	yes
+HAS_CONFIGURE=	yes
+
+CONFIG_SHELL=	${SH}
+
+CONFIGURE_ARGS+=	--prefix=${PREFIX}
+CONFIGURE_ARGS+=	--qtdir=${QTDIR}
+CONFIGURE_ARGS+=	--with-zlib-inc=${BUILDLINK_PREFIX.zlib}/include
+CONFIGURE_ARGS+=	--with-zlib-lib=${BUILDLINK_PREFIX.zlib}/lib
+CONFIGURE_ARGS+=	--with-qca-lib=${BUILDLINK_PREFIX.qca2}/lib
+CONFIGURE_ARGS+=	--with-qca-inc=${BUILDLINK_PREFIX.qca2}/include
+
+#
+# a group of scripts that aren't to be installed, and aren't used
+# by the pkgsrc system.  But they all have the non-standard
+# "==" in them. (silly linux developers thinking [ bash = sh ].
+#
+CHECK_PORTABILITY_SKIP=	    admin/build/devconfig.sh \
+			    admin/build/build_package.sh \
+			    admin/build/prep_dist.sh
+
+
+INSTALLATION_DIRS=	bin share/psi share/doc/psi
+INSTALL_DIRS=		src
+INSTALL_TARGET=		install_target install_sharedfiles
+INSTALL_MAKE_FLAGS=	INSTALL_ROOT=${DESTDIR}
+
+.include "options.mk"
+
+#
+#   LANG_FILES are the translations we're going to install
+#
+# LANG_FILES= psi_be.qm psi_cs.qm psi_de.qm psi_eo.qm psi_es.qm \
+# 	    psi_es_ES.qm psi_fr.qm psi_it.qm psi_ja.qm psi_mk.qm \
+# 	    psi_pl.qm psi_pt_BR.qm psi_ru.qm psi_sl.qm psi_sv.qm \
+# 	    psi_uk.qm psi_ur_PK.qm psi_vi.qm psi_zh_CN.qm psi_zh_TW.qm
+
+.for f in ${LANG_FILES}
+DISTFILES+=	${f}
+SITES.${f}=	http://psi-im.org/download/lang/
+.endfor
+
+post-install:
+	# remove some files that shouldn't be there,
+	# install some files where they should be installed
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/psi
+	${RM} ${DESTDIR}${PREFIX}/share/psi/README
+	${INSTALL_DATA} ${WRKSRC}/COPYING ${DESTDIR}${PREFIX}/share/doc/psi
+	${RM} ${DESTDIR}${PREFIX}/share/psi/COPYING
+	# install the translations
+.for f in ${LANG_FILES}
+	${INSTALL_DATA} ${WRKDIR}/${f} ${DESTDIR}${PREFIX}/share/psi
+.endfor
+
+.include "../../devel/libidn/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../security/qca2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.qt4-libs+=	qt4-libs>=4.7.0
+.include "../../x11/qt4-libs/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/psi/PLIST b/psi/PLIST
new file mode 100644
index 0000000000..cd05c87faf
--- /dev/null
+++ b/psi/PLIST
@@ -0,0 +1,192 @@
+@comment $NetBSD: PLIST,v 1.15 2012/12/07 23:52:09 schnoebe Exp $
+bin/psi
+share/doc/psi/COPYING
+share/doc/psi/README
+share/psi/certs/README
+share/psi/certs/startcom_ca.crt
+share/psi/certs/startcom_ca_new.crt
+share/psi/iconsets/emoticons/default/angry.png
+share/psi/iconsets/emoticons/default/bat.png
+share/psi/iconsets/emoticons/default/beer.png
+share/psi/iconsets/emoticons/default/biggrin.png
+share/psi/iconsets/emoticons/default/blush.png
+share/psi/iconsets/emoticons/default/boy.png
+share/psi/iconsets/emoticons/default/brflower.png
+share/psi/iconsets/emoticons/default/brheart.png
+share/psi/iconsets/emoticons/default/coffee.png
+share/psi/iconsets/emoticons/default/coolglasses.png
+share/psi/iconsets/emoticons/default/cry.png
+share/psi/iconsets/emoticons/default/cuffs.png
+share/psi/iconsets/emoticons/default/devil.png
+share/psi/iconsets/emoticons/default/drink.png
+share/psi/iconsets/emoticons/default/flower.png
+share/psi/iconsets/emoticons/default/frowning.png
+share/psi/iconsets/emoticons/default/girl.png
+share/psi/iconsets/emoticons/default/heart.png
+share/psi/iconsets/emoticons/default/hugleft.png
+share/psi/iconsets/emoticons/default/hugright.png
+share/psi/iconsets/emoticons/default/icondef.xml
+share/psi/iconsets/emoticons/default/kiss.png
+share/psi/iconsets/emoticons/default/lamp.png
+share/psi/iconsets/emoticons/default/mail.png
+share/psi/iconsets/emoticons/default/music.png
+share/psi/iconsets/emoticons/default/no.png
+share/psi/iconsets/emoticons/default/oh.png
+share/psi/iconsets/emoticons/default/phone.png
+share/psi/iconsets/emoticons/default/photo.png
+share/psi/iconsets/emoticons/default/pussy.png
+share/psi/iconsets/emoticons/default/rainbow.png
+share/psi/iconsets/emoticons/default/smile.png
+share/psi/iconsets/emoticons/default/star.png
+share/psi/iconsets/emoticons/default/stare.png
+share/psi/iconsets/emoticons/default/tongue.png
+share/psi/iconsets/emoticons/default/unhappy.png
+share/psi/iconsets/emoticons/default/wink.png
+share/psi/iconsets/emoticons/default/yes.png
+share/psi/iconsets/roster/README
+share/psi/iconsets/roster/crystal-aim.jisp
+share/psi/iconsets/roster/crystal-gadu.jisp
+share/psi/iconsets/roster/crystal-icq.jisp
+share/psi/iconsets/roster/crystal-msn.jisp
+share/psi/iconsets/roster/crystal-roster.jisp
+share/psi/iconsets/roster/crystal-service.jisp
+share/psi/iconsets/roster/crystal-sms.jisp
+share/psi/iconsets/roster/crystal-yahoo.jisp
+share/psi/iconsets/roster/default/ask.png
+share/psi/iconsets/roster/default/away.png
+share/psi/iconsets/roster/default/call.png
+share/psi/iconsets/roster/default/chat.fading.png
+share/psi/iconsets/roster/default/chatty.png
+share/psi/iconsets/roster/default/dnd.png
+share/psi/iconsets/roster/default/file.fading.png
+share/psi/iconsets/roster/default/groupclose.png
+share/psi/iconsets/roster/default/groupopen.png
+share/psi/iconsets/roster/default/headline.png
+share/psi/iconsets/roster/default/icondef.xml
+share/psi/iconsets/roster/default/invisible.png
+share/psi/iconsets/roster/default/message.fading.png
+share/psi/iconsets/roster/default/noauth.png
+share/psi/iconsets/roster/default/offline.png
+share/psi/iconsets/roster/default/online.dimming.png
+share/psi/iconsets/roster/default/online.png
+share/psi/iconsets/roster/default/perr.png
+share/psi/iconsets/roster/default/system.png
+share/psi/iconsets/roster/default/xa.png
+share/psi/iconsets/roster/stellar-1.jisp
+share/psi/iconsets/system/README
+share/psi/iconsets/system/default/account.png
+share/psi/iconsets/system/default/add.png
+share/psi/iconsets/system/default/advanced.png
+share/psi/iconsets/system/default/appearance.png
+share/psi/iconsets/system/default/arrow_down.png
+share/psi/iconsets/system/default/arrow_left.png
+share/psi/iconsets/system/default/arrow_right.png
+share/psi/iconsets/system/default/arrow_up.png
+share/psi/iconsets/system/default/browse.png
+share/psi/iconsets/system/default/cancel.png
+share/psi/iconsets/system/default/changeacc.png
+share/psi/iconsets/system/default/chatclear.png
+share/psi/iconsets/system/default/close.png
+share/psi/iconsets/system/default/closetab.png
+share/psi/iconsets/system/default/command.png
+share/psi/iconsets/system/default/configure-room.png
+share/psi/iconsets/system/default/configure_toolbars.png
+share/psi/iconsets/system/default/disco.png
+share/psi/iconsets/system/default/download.png
+share/psi/iconsets/system/default/events.png
+share/psi/iconsets/system/default/eye_blue.png
+share/psi/iconsets/system/default/filemanager.png
+share/psi/iconsets/system/default/groupchat.png
+share/psi/iconsets/system/default/gstreamer-logo-50.png
+share/psi/iconsets/system/default/help.png
+share/psi/iconsets/system/default/history.png
+share/psi/iconsets/system/default/icondef.xml
+share/psi/iconsets/system/default/info.png
+share/psi/iconsets/system/default/jabber.png
+share/psi/iconsets/system/default/key.png
+share/psi/iconsets/system/default/key_bad.png
+share/psi/iconsets/system/default/key_unknown.png
+share/psi/iconsets/system/default/logo_128.png
+share/psi/iconsets/system/default/logo_16.png
+share/psi/iconsets/system/default/logo_32.png
+share/psi/iconsets/system/default/logo_48.png
+share/psi/iconsets/system/default/logo_64.png
+share/psi/iconsets/system/default/ok.png
+share/psi/iconsets/system/default/options.png
+share/psi/iconsets/system/default/pgp.png
+share/psi/iconsets/system/default/play.png
+share/psi/iconsets/system/default/play_sounds.png
+share/psi/iconsets/system/default/psilogo.png
+share/psi/iconsets/system/default/psimain.png
+share/psi/iconsets/system/default/publish_tune.png
+share/psi/iconsets/system/default/quit.png
+share/psi/iconsets/system/default/register.png
+share/psi/iconsets/system/default/reload.png
+share/psi/iconsets/system/default/remove.png
+share/psi/iconsets/system/default/search.png
+share/psi/iconsets/system/default/self.png
+share/psi/iconsets/system/default/send.png
+share/psi/iconsets/system/default/shortcuts.png
+share/psi/iconsets/system/default/show_away.png
+share/psi/iconsets/system/default/show_hidden.png
+share/psi/iconsets/system/default/show_offline.png
+share/psi/iconsets/system/default/smile.png
+share/psi/iconsets/system/default/ssl_no.png
+share/psi/iconsets/system/default/ssl_yes.png
+share/psi/iconsets/system/default/start-chat.png
+share/psi/iconsets/system/default/status.png
+share/psi/iconsets/system/default/stop.png
+share/psi/iconsets/system/default/time.png
+share/psi/iconsets/system/default/tip.png
+share/psi/iconsets/system/default/upload.png
+share/psi/iconsets/system/default/url.png
+share/psi/iconsets/system/default/vcard.png
+share/psi/iconsets/system/default/whiteboarding/add_image.png
+share/psi/iconsets/system/default/whiteboarding/add_text.png
+share/psi/iconsets/system/default/whiteboarding/bring_forwards.png
+share/psi/iconsets/system/default/whiteboarding/bring_to_front.png
+share/psi/iconsets/system/default/whiteboarding/draw_circles.png
+share/psi/iconsets/system/default/whiteboarding/draw_ellipses.png
+share/psi/iconsets/system/default/whiteboarding/draw_lines.png
+share/psi/iconsets/system/default/whiteboarding/draw_paths.png
+share/psi/iconsets/system/default/whiteboarding/draw_rectangles.png
+share/psi/iconsets/system/default/whiteboarding/erase.png
+share/psi/iconsets/system/default/whiteboarding/group.png
+share/psi/iconsets/system/default/whiteboarding/rotate.png
+share/psi/iconsets/system/default/whiteboarding/save.png
+share/psi/iconsets/system/default/whiteboarding/scale.png
+share/psi/iconsets/system/default/whiteboarding/scroll.png
+share/psi/iconsets/system/default/whiteboarding/select.png
+share/psi/iconsets/system/default/whiteboarding/send_backwards.png
+share/psi/iconsets/system/default/whiteboarding/send_to_back.png
+share/psi/iconsets/system/default/whiteboarding/translate.png
+share/psi/iconsets/system/default/whiteboarding/ungroup.png
+share/psi/iconsets/system/default/whiteboarding/whiteboard.png
+share/psi/iconsets/system/default/xml.png
+${PLIST.be}share/psi/psi_be.qm
+${PLIST.cs}share/psi/psi_cs.qm
+${PLIST.de}share/psi/psi_de.qm
+${PLIST.eo}share/psi/psi_eo.qm
+${PLIST.es}share/psi/psi_es.qm
+${PLIST.es-es}share/psi/psi_es_ES.qm
+${PLIST.fr}share/psi/psi_fr.qm
+${PLIST.it}share/psi/psi_it.qm
+${PLIST.ja}share/psi/psi_ja.qm
+${PLIST.mk}share/psi/psi_mk.qm
+${PLIST.pl}share/psi/psi_pl.qm
+${PLIST.pt-br}share/psi/psi_pt_BR.qm
+${PLIST.ru}share/psi/psi_ru.qm
+${PLIST.sl}share/psi/psi_sl.qm
+${PLIST.sv}share/psi/psi_sv.qm
+${PLIST.uk}share/psi/psi_uk.qm
+${PLIST.ur-pk}share/psi/psi_ur_PK.qm
+${PLIST.vi}share/psi/psi_vi.qm
+${PLIST.zh-cn}share/psi/psi_zh_CN.qm
+${PLIST.zh-tw}share/psi/psi_zh_TW.qm
+share/psi/sound/chat1.wav
+share/psi/sound/chat2.wav
+share/psi/sound/ft_complete.wav
+share/psi/sound/ft_incoming.wav
+share/psi/sound/offline.wav
+share/psi/sound/online.wav
+share/psi/sound/send.wav
diff --git a/psi/distinfo b/psi/distinfo
new file mode 100644
index 0000000000..ed9acf9b81
--- /dev/null
+++ b/psi/distinfo
@@ -0,0 +1,12 @@
+$NetBSD: distinfo,v 1.27 2015/11/03 01:20:23 agc Exp $
+
+SHA1 (psi-0.15/psi-0.15.tar.bz2) = 4801866d4fa2af43a9b3f431e2c9d633a97276db
+RMD160 (psi-0.15/psi-0.15.tar.bz2) = 0c5d461fb2b7e7b25850f19f79bcc23c1e87efb3
+SHA512 (psi-0.15/psi-0.15.tar.bz2) = 17e972adc8dfc541977e3717c21eb694f4e1268e4719e97432f260682867290d7034b98a345b6efd73026f98a425493e9159fef9c0e0af4c83b02e07d29a704a
+Size (psi-0.15/psi-0.15.tar.bz2) = 1984777 bytes
+SHA1 (patch-ad) = 3ee21a1cb17637ed650b6b58e5575c8fa246a4f0
+SHA1 (patch-ah) = 1c50b81daf5c4e9a4fcefc102ba5780ae90cf44e
+SHA1 (patch-ak) = f3870be31be769ac51a3f26a1fc6f6e14564e685
+SHA1 (patch-al) = 44d17e5ca70061c13164cadf69b8a5f84648c177
+SHA1 (patch-configure) = 3fb1061ec3f4b5c810348109bf397cfad6a6999d
+SHA1 (patch-src_src.pro) = d35d1f22b91b8ca14692c4b5bfb13d11f1d06c34
diff --git a/psi/options.mk b/psi/options.mk
new file mode 100644
index 0000000000..bb6bde0017
--- /dev/null
+++ b/psi/options.mk
@@ -0,0 +1,68 @@
+# $NetBSD: options.mk,v 1.2 2012/12/07 23:52:09 schnoebe Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.psi
+PKG_SUPPORTED_OPTIONS+=	aspell enchant dbus whiteboard xscreensaver
+PKG_SUGGESTED_OPTIONS+=	aspell enchant
+
+# from an idea stolen from ../../misc/openoffice3.
+PSI_SUPPORTED_LANGUAGES=be cs de eo es es-es fr it ja mk pl pt-br ru \
+			sl sv uk ur-pk vi zh-cn zh-tw
+
+.for l in ${PSI_SUPPORTED_LANGUAGES}
+PKG_SUPPORTED_OPTIONS+= lang-${l}
+PLIST_VARS+=${l}
+.endfor
+
+.include "../../mk/bsd.options.mk"
+
+# handle the languages first
+#   bit of special logic, as the dialects of languages are handled
+#   as lang_DIALECT (aka, lower underscore UPPER) in the PSI translations
+.for lang in ${PKG_OPTIONS:Mlang-*:S/lang-//g}
+PLIST.${lang} = yes
+. if ${lang:M??-??}
+    LANG_FILES+= psi_${lang:C/-.*//g}_${lang:C/.*-//g:tu}.qm
+. else
+    LANG_FILES+= psi_${lang}.qm
+. endif
+.endfor
+
+# enable aspell
+.if !empty(PKG_OPTIONS:Maspell)
+CONFIGURE_ARGS+=	--with-aspell-inc=${BUILDLINK_PREFIX.aspell}/include
+CONFIGURE_ARGS+=	--with-aspell-lib=${BUILDLINK_PREFIX.aspell}/lib
+.include "../../textproc/aspell/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-aspell
+.endif
+
+# enable enchant
+.if !empty(PKG_OPTIONS:Menchant)
+.include "../../textproc/enchant2/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-enchant
+.endif
+
+# enable qdbus
+.if !empty(PKG_OPTIONS:Mdbus)
+.include "../../x11/qt4-qdbus/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-qdbus
+.endif
+
+# enable whiteboarding
+.if !empty(PKG_OPTIONS:Mwhiteboard)
+CONFIGURE_ARGS+=	--enable-whiteboarding
+.endif
+
+# enable xscreensaver extension
+.if empty(PKG_OPTIONS:Mxscreensaver)
+CONFIGURE_ARGS+=	--disable-xss
+.endif
+
+# enable growl
+# .if empty(PKG_OPTIONS:Mgrowl)
+# CONFIGURE_ARGS+=	--with-growl=${BUILDLINK_PREFIX.growl}
+# .else
+# CONFIGURE_ARGS+=	--disable-growl
+# .endif
diff --git a/psi/patches/patch-ad b/psi/patches/patch-ad
new file mode 100644
index 0000000000..c2a4575585
--- /dev/null
+++ b/psi/patches/patch-ad
@@ -0,0 +1,21 @@
+$NetBSD: patch-ad,v 1.5 2011/01/02 23:53:13 schnoebe Exp $
+
+Some old versions of zlib defined OF; not needed, but provide compat for it.
+
+--- src/libpsi/tools/zip/minizip/unzip.h.orig	2007-10-14 09:00:55.000000000 -0500
++++ src/libpsi/tools/zip/minizip/unzip.h
+@@ -49,6 +49,14 @@ extern "C" {
+ #include "zlib.h"
+ #endif
+ 
++#ifndef OF
++#  ifdef STDC
++#    define OF(x)      x
++#  else
++#    define OF(x)
++#  endif
++#endif
++
+ #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
+ /* like the STRICT of WIN32, we define a pointer that cannot be converted
+     from (void*) without cast */
diff --git a/psi/patches/patch-ah b/psi/patches/patch-ah
new file mode 100644
index 0000000000..efb6aa777a
--- /dev/null
+++ b/psi/patches/patch-ah
@@ -0,0 +1,16 @@
+$NetBSD: patch-ah,v 1.4 2012/12/07 23:52:09 schnoebe Exp $
+
+pkgsrc places idna.h in a different directory than other package
+managers
+
+--- iris/src/xmpp/xmpp-core/connector.cpp.orig	2012-10-04 00:53:09.000000000 +0000
++++ iris/src/xmpp/xmpp-core/connector.cpp
+@@ -36,7 +36,7 @@
+ #include <QUrl>
+ #include <QTimer>
+ #include <qca.h>
+-#include <libidn/idna.h>
++#include <idna.h>
+ 
+ #include "bsocket.h"
+ #include "httpconnect.h"
diff --git a/psi/patches/patch-ak b/psi/patches/patch-ak
new file mode 100644
index 0000000000..7674e052d2
--- /dev/null
+++ b/psi/patches/patch-ak
@@ -0,0 +1,16 @@
+$NetBSD: patch-ak,v 1.2 2012/12/07 23:52:09 schnoebe Exp $
+
+pkgsrc places IDN's stringprep in a different directory than other
+package managers.
+
+--- iris/src/xmpp/jid/jid.cpp.orig	2012-10-04 00:53:09.000000000 +0000
++++ iris/src/xmpp/jid/jid.cpp
+@@ -24,7 +24,7 @@
+ #include <QCoreApplication>
+ #include <QByteArray>
+ #include <QHash>
+-#include <libidn/stringprep.h>
++#include <stringprep.h>
+ 
+ #ifndef NO_IRISNET
+ #include "irisnetglobal_p.h"
diff --git a/psi/patches/patch-al b/psi/patches/patch-al
new file mode 100644
index 0000000000..b6798d2b69
--- /dev/null
+++ b/psi/patches/patch-al
@@ -0,0 +1,16 @@
+$NetBSD: patch-al,v 1.1 2011/01/02 23:53:13 schnoebe Exp $
+
+Add NetBSD to the list of resolvers that support threading, having a
+"modern" resolver API.
+
+--- iris/src/jdns/jdns_sys.c.orig	2009-07-26 16:02:12.000000000 -0500
++++ iris/src/jdns/jdns_sys.c
+@@ -679,7 +679,7 @@ static jdns_dnsparams_t *dnsparams_get_u
+ 	return params;
+ }
+ 
+-#if defined(__GLIBC__) && ((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 3)))
++#if defined(__GLIBC__) && ((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 3))) || defined(JDNS_OS_NETBSD)
+ # define JDNS_MODERN_RES_API
+ #endif
+ 
diff --git a/psi/patches/patch-configure b/psi/patches/patch-configure
new file mode 100644
index 0000000000..8ad2a01063
--- /dev/null
+++ b/psi/patches/patch-configure
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Enchant 2 support.
+
+--- configure.orig	2012-10-04 00:53:03.000000000 +0000
++++ configure
+@@ -1262,7 +1262,7 @@ public:
+ 
+ 		QStringList incs;
+ 		QString version, libs, other;
+-		if(!conf->findPkgConfig("enchant", VersionMin, "1.3.0", &version, &incs, &libs, &other))
++		if(!conf->findPkgConfig("enchant-2", VersionMin, "2.0.0", &version, &incs, &libs, &other))
+                         return false;
+ 
+ 		qc_enchant_defs += "HAVE_ENCHANT";
diff --git a/psi/patches/patch-src_src.pro b/psi/patches/patch-src_src.pro
new file mode 100644
index 0000000000..5477479ba1
--- /dev/null
+++ b/psi/patches/patch-src_src.pro
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_src.pro,v 1.1 2012/12/07 23:52:09 schnoebe Exp $
+
+Remove unneeded DESTDIR statement, it broke the install target.
+
+--- src/src.pro.orig	2012-10-04 00:53:03.000000000 +0000
++++ src/src.pro
+@@ -6,7 +6,6 @@
+ TEMPLATE = app
+ TARGET   = psi
+ CONFIG  += qt thread x11
+-DESTDIR  = $$PWD/..
+ 
+ #CONFIG += use_crash
+ CONFIG += pep
Home | Main Index | Thread Index | Old Index