Attachment 89197 Details for Bug 126080 – psi-0.12.diff

[patch] psi-0.12.diff

psi-0.12.diff (text/x-diff; charset="us-ascii"), 7.85 KB, created by Max Brazhnikov on 2008-07-29 23:57:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Max Brazhnikov

Created: 2008-07-29 23:57:15 UTC

Size: 7.85 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/net-im/psi/Makefile /home/makc/porting/ports/net-im/psi/Makefile
>--- /usr/ports/net-im/psi/Makefile	2008-07-11 03:27:03.000000000 +0400
>+++ /home/makc/porting/ports/net-im/psi/Makefile	2008-07-30 01:56:48.000000000 +0400
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	psi
>-DISTVERSION=	0.11
>+DISTVERSION=	0.12
> CATEGORIES=	net-im
> MASTER_SITES=	SF
> 
>@@ -21,18 +21,19 @@
> QT_COMPONENTS=	corelib dbus gui iconengines imageformats qt3support \
> 		inputmethods moc network rcc script svg uic xml
> 
>-
> CONFIGURE_ENV=	QMAKESPEC=${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
> 		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
> 		PTHREAD_LDFLAGS=${PTHREAD_LIBS} \
> 		KDEDIR=${LOCALBASE}
> CONFIGURE_ARGS=	--prefix=${PREFIX} --qtdir=${LOCALBASE} \
>-		--with-qca-inc=${LOCALBASE}/include/QtCrypto \
>-		--with-qca-lib=${LOCALBASE}/lib \
>-		--disable-growl --disable-dnotify --disable-ghbnr
>+		--disable-growl --disable-ghbnr
> MAKE_ARGS+=	QTDIR=${QT_PREFIX} \
> 		QMAKESPEC=${LOCALBASE}/share/qt4/mkspecs/freebsd-g++
> 
>+post-patch:
>+	#fix build when libzip is installed
>+	cd ${WRKSRC}/src/tools/zip && ${LN} zip.h psi-zip.h
>+
> post-install:
> 	${STRIP_CMD} ${PREFIX}/bin/psi
> 
>diff -ruN --exclude=CVS /usr/ports/net-im/psi/distinfo /home/makc/porting/ports/net-im/psi/distinfo
>--- /usr/ports/net-im/psi/distinfo	2008-07-11 03:27:03.000000000 +0400
>+++ /home/makc/porting/ports/net-im/psi/distinfo	2008-07-30 01:13:11.000000000 +0400
>@@ -1,3 +1,3 @@
>-MD5 (psi-0.11.tar.bz2) = 6ccc81783eece7959140951289cf5310
>-SHA256 (psi-0.11.tar.bz2) = be37b7b8d86e965362512f47bf68af2b21d35e5c886a9e0eccf1c9bc519706b3
>-SIZE (psi-0.11.tar.bz2) = 2000216
>+MD5 (psi-0.12.tar.bz2) = 47b654c944ef8766b860fe0645615d18
>+SHA256 (psi-0.12.tar.bz2) = 0309d48891ab18cb8afc15416db2e9db979bc66f5cd879b382de226043e91e6c
>+SIZE (psi-0.12.tar.bz2) = 2122406
>diff -ruN --exclude=CVS /usr/ports/net-im/psi/files/patch-iris_jaber_s5b.cpp /home/makc/porting/ports/net-im/psi/files/patch-iris_jaber_s5b.cpp
>--- /usr/ports/net-im/psi/files/patch-iris_jaber_s5b.cpp	2005-04-08 10:37:01.000000000 +0400
>+++ /home/makc/porting/ports/net-im/psi/files/patch-iris_jaber_s5b.cpp	1970-01-01 03:00:00.000000000 +0300
>@@ -1,10 +0,0 @@
>---- iris/jabber/s5b.cpp.orig	Fri Apr  8 09:22:20 2005
>-+++ iris/jabber/s5b.cpp	Fri Apr  8 09:22:48 2005
>-@@ -31,6 +31,7 @@
>- #ifdef Q_OS_WIN
>- # include <windows.h>
>- #else
>-+# include <sys/types.h>
>- # include <netinet/in.h>
>- #endif
>- 
>diff -ruN --exclude=CVS /usr/ports/net-im/psi/files/patch-src__tools__iconset__iconset.cpp /home/makc/porting/ports/net-im/psi/files/patch-src__tools__iconset__iconset.cpp
>--- /usr/ports/net-im/psi/files/patch-src__tools__iconset__iconset.cpp	1970-01-01 03:00:00.000000000 +0300
>+++ /home/makc/porting/ports/net-im/psi/files/patch-src__tools__iconset__iconset.cpp	2008-07-30 01:53:57.000000000 +0400
>@@ -0,0 +1,11 @@
>+--- ./src/tools/iconset/iconset.cpp.orig	2008-03-19 01:24:57.000000000 +0300
>++++ ./src/tools/iconset/iconset.cpp	2008-07-30 01:53:45.000000000 +0400
>+@@ -50,7 +50,7 @@
>+ #endif
>+ 
>+ #ifdef ICONSET_ZIP
>+-#	include "zip.h"
>++#	include "psi-zip.h"
>+ #endif
>+ 
>+ #include <QApplication>
>diff -ruN --exclude=CVS /usr/ports/net-im/psi/files/patch-src__tools__zip__zip.cpp /home/makc/porting/ports/net-im/psi/files/patch-src__tools__zip__zip.cpp
>--- /usr/ports/net-im/psi/files/patch-src__tools__zip__zip.cpp	1970-01-01 03:00:00.000000000 +0300
>+++ /home/makc/porting/ports/net-im/psi/files/patch-src__tools__zip__zip.cpp	2008-07-30 01:53:57.000000000 +0400
>@@ -0,0 +1,11 @@
>+--- ./src/tools/zip/zip.cpp.orig	2007-04-08 12:19:03.000000000 +0400
>++++ ./src/tools/zip/zip.cpp	2008-07-30 01:52:00.000000000 +0400
>+@@ -23,7 +23,7 @@
>+ #include <QFile>
>+ 
>+ #include "minizip/unzip.h"
>+-#include "zip.h"
>++#include "psi-zip.h"
>+ 
>+ class UnZipPrivate
>+ {
>diff -ruN --exclude=CVS /usr/ports/net-im/psi/files/patch-third-party-qca-cyrus-sasl.cpp /home/makc/porting/ports/net-im/psi/files/patch-third-party-qca-cyrus-sasl.cpp
>--- /usr/ports/net-im/psi/files/patch-third-party-qca-cyrus-sasl.cpp	2008-07-11 03:27:03.000000000 +0400
>+++ /home/makc/porting/ports/net-im/psi/files/patch-third-party-qca-cyrus-sasl.cpp	1970-01-01 03:00:00.000000000 +0300
>@@ -1,10 +0,0 @@
>---- third-party/qca/qca-cyrus-sasl/qca-cyrus-sasl.cpp.orig	2007-10-14 18:00:57.000000000 +0400
>-+++ third-party/qca/qca-cyrus-sasl/qca-cyrus-sasl.cpp	2008-02-06 18:08:20.000000000 +0300
>-@@ -20,6 +20,7 @@
>-  */
>- 
>- #include <QtCrypto>
>-+#include <qcaprovider.h>
>- #include <QDebug>
>- #include <QtCore/qplugin.h>
>- 
>diff -ruN --exclude=CVS /usr/ports/net-im/psi/files/patch-third-party-qca-gnupg.cpp /home/makc/porting/ports/net-im/psi/files/patch-third-party-qca-gnupg.cpp
>--- /usr/ports/net-im/psi/files/patch-third-party-qca-gnupg.cpp	2008-07-11 03:27:03.000000000 +0400
>+++ /home/makc/porting/ports/net-im/psi/files/patch-third-party-qca-gnupg.cpp	1970-01-01 03:00:00.000000000 +0300
>@@ -1,10 +0,0 @@
>---- third-party/qca/qca-gnupg/qca-gnupg.cpp.orig	2008-02-06 18:10:33.000000000 +0300
>-+++ third-party/qca/qca-gnupg/qca-gnupg.cpp	2008-02-06 18:10:39.000000000 +0300
>-@@ -17,6 +17,7 @@
>-  */
>- 
>- #include <QtCrypto>
>-+#include <qcaprovider.h>
>- #include <QtPlugin>
>- 
>- #ifdef Q_OS_MAC
>diff -ruN --exclude=CVS /usr/ports/net-im/psi/files/patch-third-party-qca-ossl.cpp /home/makc/porting/ports/net-im/psi/files/patch-third-party-qca-ossl.cpp
>--- /usr/ports/net-im/psi/files/patch-third-party-qca-ossl.cpp	2008-07-11 03:27:03.000000000 +0400
>+++ /home/makc/porting/ports/net-im/psi/files/patch-third-party-qca-ossl.cpp	1970-01-01 03:00:00.000000000 +0300
>@@ -1,10 +0,0 @@
>---- third-party/qca/qca-ossl/qca-ossl.cpp.orig	2007-10-14 18:00:57.000000000 +0400
>-+++ third-party/qca/qca-ossl/qca-ossl.cpp	2008-02-06 18:09:55.000000000 +0300
>-@@ -19,6 +19,7 @@
>-  */
>- 
>- #include <QtCrypto>
>-+#include <qcaprovider.h>
>- 
>- #include <QDebug>
>- #include <QtCore/qplugin.h>
>diff -ruN --exclude=CVS /usr/ports/net-im/psi/pkg-plist /home/makc/porting/ports/net-im/psi/pkg-plist
>--- /usr/ports/net-im/psi/pkg-plist	2008-07-11 03:27:03.000000000 +0400
>+++ /home/makc/porting/ports/net-im/psi/pkg-plist	2008-07-30 02:10:49.000000000 +0400
>@@ -10,6 +10,7 @@
> %%DATADIR%%/certs/README
> %%DATADIR%%/certs/rootcerts.pem
> %%DATADIR%%/certs/startcom_ca.crt
>+%%DATADIR%%/certs/startcom_ca_new.crt
> %%DATADIR%%/iconsets/emoticons/default/angry.png
> %%DATADIR%%/iconsets/emoticons/default/bat.png
> %%DATADIR%%/iconsets/emoticons/default/beer.png
>@@ -76,6 +77,7 @@
> %%DATADIR%%/iconsets/roster/default/perr.png
> %%DATADIR%%/iconsets/roster/default/system.png
> %%DATADIR%%/iconsets/roster/default/xa.png
>+%%DATADIR%%/iconsets/roster/stellar-1.jisp
> %%DATADIR%%/iconsets/system/README
> %%DATADIR%%/iconsets/system/default/account.png
> %%DATADIR%%/iconsets/system/default/add.png
>@@ -155,6 +157,7 @@
> %%DATADIR%%/iconsets/system/default/whiteboarding/erase.png
> %%DATADIR%%/iconsets/system/default/whiteboarding/group.png
> %%DATADIR%%/iconsets/system/default/whiteboarding/rotate.png
>+%%DATADIR%%/iconsets/system/default/whiteboarding/save.png
> %%DATADIR%%/iconsets/system/default/whiteboarding/scale.png
> %%DATADIR%%/iconsets/system/default/whiteboarding/scroll.png
> %%DATADIR%%/iconsets/system/default/whiteboarding/select.png
>@@ -182,16 +185,16 @@
> @dirrm %%DATADIR%%/iconsets
> @dirrm %%DATADIR%%/certs
> @dirrm %%DATADIR%%
>-@dirrmtry share/applications
>-@dirrmtry share/icons/hicolor/16x16/apps
>-@dirrmtry share/icons/hicolor/16x16
>-@dirrmtry share/icons/hicolor/32x32/apps
>-@dirrmtry share/icons/hicolor/32x32
>-@dirrmtry share/icons/hicolor/48x48/apps
>-@dirrmtry share/icons/hicolor/48x48
> @dirrmtry share/icons/hicolor/64x64/apps
> @dirrmtry share/icons/hicolor/64x64
>+@dirrmtry share/icons/hicolor/48x48/apps
>+@dirrmtry share/icons/hicolor/48x48
>+@dirrmtry share/icons/hicolor/32x32/apps
>+@dirrmtry share/icons/hicolor/32x32
>+@dirrmtry share/icons/hicolor/16x16/apps
>+@dirrmtry share/icons/hicolor/16x16
> @dirrmtry share/icons/hicolor/128x128/apps
> @dirrmtry share/icons/hicolor/128x128
> @dirrmtry share/icons/hicolor
> @dirrmtry share/icons
>+@dirrmtry share/applications

Actions: View | Diff

Attachments on bug 126080: 89196 | 89197