kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

1. Update to use kdelibs3

Browse source 
2. Add patches to fix compilation under gcc3

Obtained from:	konverse project CVS [2]
This commit is contained in:
Hye-Shik Chang 2002-09-16 06:17:42 +00:00
parent 0a9a53e8ca
commit 2db234e8ed
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=66414
16 changed files with 240 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
net-im/konverse/Makefile
View file

@ -7,32 +7,32 @@
PORTNAME= konverse
PORTVERSION= 0.2
PORTREVISION= 1
CATEGORIES= net kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= perky@FreeBSD.org
USE_KDELIBS_VER=2
USE_KDELIBS_VER=3
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_REINPLACE= yes
CONFIGURE_ARGS+=--with-extra-includes=${LOCALBASE}/include \
--x-includes=${X11BASE}/include \
--x-libraries=${X11BASE}/lib
REPATCH= cd ${WRKSRC} && ${SED}
REPATCHSUBST= -e 's/libqt\./lib${QTNAME}\./' \
-e 's/-lqt/-l${QTNAME}/' \
-e 's/\(LDADD.*\)-ldl/\1/' \
-e 's/\(QDateTime.*\)timezone/\1local-\>tm_gmtoff/g'
REPATCHFILES= configure ${PORTNAME}/Makefile.in ${PORTNAME}/jabbercore.cpp
TMPSUFFIX= .temp
--x-libraries=${X11BASE}/lib \
--with-qt-libraries=${QT_PREFIX}/lib
pre-patch:
.for file in ${REPATCHFILES}
${REPATCH} ${REPATCHSUBST} ${file} > ${file}${TMPSUFFIX} && \
${CAT} ${file}${TMPSUFFIX} > ${file}
${REINPLACE_CMD} -e 's/-lqt/-lqt-mt '${PTHREAD_LIBS}'/' \
-e 's/libqt\.\*/libqt-mt.*/' ${WRKSRC}/configure
${REINPLACE_CMD} -e 's/\(LDADD.*\)-ldl/\1/' \
-e 's/-lqt/'${PTHREAD_LIBS}'/' ${WRKSRC}/konverse/Makefile.in
${REINPLACE_CMD} -e 's/\(QDateTime.*\)timezone/\1local-\>tm_gmtoff/g' \
${WRKSRC}/konverse/jabbercore.cpp
.for f in konverse/rostertree.h konverse/dlgchat.h
${REINPLACE_CMD} -e 's/ktmainwindow\.h/kmainwindow.h/g' ${WRKSRC}/${f}
.endfor
.include <bsd.port.mk>

39
net-im/konverse/files/patch-jabberid.cpp Normal file
View file

@ -0,0 +1,39 @@
--- konverse/jabberid.cpp 2000/12/28 03:41:37 1.10
+++ konverse/jabberid.cpp 2002/02/20 04:25:25 1.11
@@ -35,7 +35,7 @@
_resource = resource.copy();
}
-JabberID::JabberID(JabberID &jid)
+JabberID::JabberID(const JabberID &jid)
{
_node = jid.getNode().copy();
_domain = jid.getDomain().copy();
@@ -81,22 +81,22 @@
}
}
-QString JabberID::getDomain()
+QString JabberID::getDomain() const
{
return _domain;
}
-QString JabberID::getNode()
+QString JabberID::getNode() const
{
return _node;
}
-QString JabberID::getResource()
+QString JabberID::getResource() const
{
return _resource;
}
-QString JabberID::getJID()
+QString JabberID::getJID() const
{
QString fullID;

25
net-im/konverse/files/patch-jabberid.h Normal file
View file

@ -0,0 +1,25 @@
--- konverse/jabberid.h 2001/02/27 02:31:57 1.4
+++ konverse/jabberid.h 2002/02/20 04:25:25 1.5
@@ -44,16 +44,16 @@
*/
JabberID( QString jid );
JabberID( QString node, QString domain, QString resource );
- JabberID( JabberID &jid );
+ JabberID( const JabberID &jid );
/**
* Returns jabber id strings.
*/
- QString getJID(); //In [node@]domain[/resource] format
+ QString getJID() const; //In [node@]domain[/resource] format
- QString getNode();
- QString getDomain();
- QString getResource();
+ QString getNode() const;
+ QString getDomain() const;
+ QString getResource() const;
JabberID operator=(QString& jid);

10
net-im/konverse/files/patch-konverse.cpp Normal file
View file

@ -0,0 +1,10 @@
--- konverse/konverse.cpp.orig Thu Aug 8 17:59:49 2002
+++ konverse/konverse.cpp Thu Aug 8 17:59:06 2002
@@ -16,6 +16,7 @@
* *
***************************************************************************/
+#include <qcursor.h>
#include "konverse.h"
#include <setstatus.h>
#include <kaboutdata.h>

10
net-im/konverse/files/patch-prefs.h Normal file
View file

@ -0,0 +1,10 @@
--- konverse/prefs.h.orig Thu Aug 8 18:03:59 2002
+++ konverse/prefs.h Thu Aug 8 18:04:08 2002
@@ -7,6 +7,7 @@
#include <qstring.h>
#include <qcheckbox.h>
#include <qvbox.h>
+#include <qgrid.h>
#include <kdialogbase.h>

10
net-im/konverse/files/patch-wrapedit.h Normal file
View file

@ -0,0 +1,10 @@
--- konverse/wrapedit.h.orig Thu Aug 8 17:50:36 2002
+++ konverse/wrapedit.h Thu Aug 8 17:50:42 2002
@@ -6,6 +6,7 @@
#include <qmlined.h>
#include <qwidget.h>
#include <qfontmetrics.h>
+#include <keditcl.h>
/**
* A simple wrap edit widget (QTextArea with wrap turned on)

12
net-im/konverse/files/patch-xmlstream.h Normal file
View file

@ -0,0 +1,12 @@
--- konverse/xmlstream.cpp 2001/04/07 03:37:01 1.11
+++ konverse/xmlstream.cpp 2002/02/25 04:20:53 1.12
@@ -167,7 +167,7 @@
bytesWritten = write(fd, (void *)(const char *)utf, utf.length());
- if ( bytesWritten != (int)s.length() )
+ if ( bytesWritten != (int)utf.length() )
connectionLost();
return bytesWritten;

2
net-im/konverse/pkg-plist
View file

@ -26,7 +26,6 @@ share/apps/konverse/icons/hicolor/22x22/actions/vcard.png
share/apps/konverse/icons/hicolor/22x22/apps/konverse.png
share/apps/konverse/pics/konverse-large.png
@dirrm share/apps/konverse/pics
@dirrm share/apps/konverse/icons
@dirrm share/apps/konverse/icons/hicolor/16x16/actions
@dirrm share/apps/konverse/icons/hicolor/16x16/apps
@dirrm share/apps/konverse/icons/hicolor/16x16
@ -34,4 +33,5 @@ share/apps/konverse/pics/konverse-large.png
@dirrm share/apps/konverse/icons/hicolor/22x22/apps
@dirrm share/apps/konverse/icons/hicolor/22x22
@dirrm share/apps/konverse/icons/hicolor
@dirrm share/apps/konverse/icons
@dirrm share/apps/konverse

26
net/konverse/Makefile
View file

@ -7,32 +7,32 @@
PORTNAME= konverse
PORTVERSION= 0.2
PORTREVISION= 1
CATEGORIES= net kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= perky@FreeBSD.org
USE_KDELIBS_VER=2
USE_KDELIBS_VER=3
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_REINPLACE= yes
CONFIGURE_ARGS+=--with-extra-includes=${LOCALBASE}/include \
--x-includes=${X11BASE}/include \
--x-libraries=${X11BASE}/lib
REPATCH= cd ${WRKSRC} && ${SED}
REPATCHSUBST= -e 's/libqt\./lib${QTNAME}\./' \
-e 's/-lqt/-l${QTNAME}/' \
-e 's/\(LDADD.*\)-ldl/\1/' \
-e 's/\(QDateTime.*\)timezone/\1local-\>tm_gmtoff/g'
REPATCHFILES= configure ${PORTNAME}/Makefile.in ${PORTNAME}/jabbercore.cpp
TMPSUFFIX= .temp
--x-libraries=${X11BASE}/lib \
--with-qt-libraries=${QT_PREFIX}/lib
pre-patch:
.for file in ${REPATCHFILES}
${REPATCH} ${REPATCHSUBST} ${file} > ${file}${TMPSUFFIX} && \
${CAT} ${file}${TMPSUFFIX} > ${file}
${REINPLACE_CMD} -e 's/-lqt/-lqt-mt '${PTHREAD_LIBS}'/' \
-e 's/libqt\.\*/libqt-mt.*/' ${WRKSRC}/configure
${REINPLACE_CMD} -e 's/\(LDADD.*\)-ldl/\1/' \
-e 's/-lqt/'${PTHREAD_LIBS}'/' ${WRKSRC}/konverse/Makefile.in
${REINPLACE_CMD} -e 's/\(QDateTime.*\)timezone/\1local-\>tm_gmtoff/g' \
${WRKSRC}/konverse/jabbercore.cpp
.for f in konverse/rostertree.h konverse/dlgchat.h
${REINPLACE_CMD} -e 's/ktmainwindow\.h/kmainwindow.h/g' ${WRKSRC}/${f}
.endfor
.include <bsd.port.mk>

39
net/konverse/files/patch-jabberid.cpp Normal file
View file

@ -0,0 +1,39 @@
--- konverse/jabberid.cpp 2000/12/28 03:41:37 1.10
+++ konverse/jabberid.cpp 2002/02/20 04:25:25 1.11
@@ -35,7 +35,7 @@
_resource = resource.copy();
}
-JabberID::JabberID(JabberID &jid)
+JabberID::JabberID(const JabberID &jid)
{
_node = jid.getNode().copy();
_domain = jid.getDomain().copy();
@@ -81,22 +81,22 @@
}
}
-QString JabberID::getDomain()
+QString JabberID::getDomain() const
{
return _domain;
}
-QString JabberID::getNode()
+QString JabberID::getNode() const
{
return _node;
}
-QString JabberID::getResource()
+QString JabberID::getResource() const
{
return _resource;
}
-QString JabberID::getJID()
+QString JabberID::getJID() const
{
QString fullID;

25
net/konverse/files/patch-jabberid.h Normal file
View file

@ -0,0 +1,25 @@
--- konverse/jabberid.h 2001/02/27 02:31:57 1.4
+++ konverse/jabberid.h 2002/02/20 04:25:25 1.5
@@ -44,16 +44,16 @@
*/
JabberID( QString jid );
JabberID( QString node, QString domain, QString resource );
- JabberID( JabberID &jid );
+ JabberID( const JabberID &jid );
/**
* Returns jabber id strings.
*/
- QString getJID(); //In [node@]domain[/resource] format
+ QString getJID() const; //In [node@]domain[/resource] format
- QString getNode();
- QString getDomain();
- QString getResource();
+ QString getNode() const;
+ QString getDomain() const;
+ QString getResource() const;
JabberID operator=(QString& jid);

10
net/konverse/files/patch-konverse.cpp Normal file
View file

@ -0,0 +1,10 @@
--- konverse/konverse.cpp.orig Thu Aug 8 17:59:49 2002
+++ konverse/konverse.cpp Thu Aug 8 17:59:06 2002
@@ -16,6 +16,7 @@
* *
***************************************************************************/
+#include <qcursor.h>
#include "konverse.h"
#include <setstatus.h>
#include <kaboutdata.h>

10
net/konverse/files/patch-prefs.h Normal file
View file

@ -0,0 +1,10 @@
--- konverse/prefs.h.orig Thu Aug 8 18:03:59 2002
+++ konverse/prefs.h Thu Aug 8 18:04:08 2002
@@ -7,6 +7,7 @@
#include <qstring.h>
#include <qcheckbox.h>
#include <qvbox.h>
+#include <qgrid.h>
#include <kdialogbase.h>

10
net/konverse/files/patch-wrapedit.h Normal file
View file

@ -0,0 +1,10 @@
--- konverse/wrapedit.h.orig Thu Aug 8 17:50:36 2002
+++ konverse/wrapedit.h Thu Aug 8 17:50:42 2002
@@ -6,6 +6,7 @@
#include <qmlined.h>
#include <qwidget.h>
#include <qfontmetrics.h>
+#include <keditcl.h>
/**
* A simple wrap edit widget (QTextArea with wrap turned on)

12
net/konverse/files/patch-xmlstream.h Normal file
View file

@ -0,0 +1,12 @@
--- konverse/xmlstream.cpp 2001/04/07 03:37:01 1.11
+++ konverse/xmlstream.cpp 2002/02/25 04:20:53 1.12
@@ -167,7 +167,7 @@
bytesWritten = write(fd, (void *)(const char *)utf, utf.length());
- if ( bytesWritten != (int)s.length() )
+ if ( bytesWritten != (int)utf.length() )
connectionLost();
return bytesWritten;

2
net/konverse/pkg-plist
View file

@ -26,7 +26,6 @@ share/apps/konverse/icons/hicolor/22x22/actions/vcard.png
share/apps/konverse/icons/hicolor/22x22/apps/konverse.png
share/apps/konverse/pics/konverse-large.png
@dirrm share/apps/konverse/pics
@dirrm share/apps/konverse/icons
@dirrm share/apps/konverse/icons/hicolor/16x16/actions
@dirrm share/apps/konverse/icons/hicolor/16x16/apps
@dirrm share/apps/konverse/icons/hicolor/16x16
@ -34,4 +33,5 @@ share/apps/konverse/pics/konverse-large.png
@dirrm share/apps/konverse/icons/hicolor/22x22/apps
@dirrm share/apps/konverse/icons/hicolor/22x22
@dirrm share/apps/konverse/icons/hicolor
@dirrm share/apps/konverse/icons
@dirrm share/apps/konverse