ports/52572: Update port: deskutils/krss
KATO Tsuguru
tkato at prontomail.com
Thu May 22 15:10:19 UTC 2003
>Number: 52572
>Category: ports
>Synopsis: Update port: deskutils/krss
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu May 22 08:10:13 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.8-RELEASE i386
>Organization:
>Environment:
>Description:
- Fix build on -current
New file:
files/patch-krss-amphetadeskinport.cpp
files/patch-krss-filterhandler.cpp
files/patch-krss-rssparser.cpp
files/patch-krss-schemeeditor.cpp
files/patch-krss-sitehandler.cpp
files/patch-krss-syncdialog.cpp
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/deskutils/krss/Makefile deskutils/krss/Makefile
--- /usr/ports/deskutils/krss/Makefile Sun May 18 22:32:55 2003
+++ deskutils/krss/Makefile Wed May 21 11:42:12 2003
@@ -13,27 +13,19 @@
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
-MAINTAINER= kde at freebsd.org
+MAINTAINER= kde at FreeBSD.org
COMMENT= KDE Rich Site Summary viewer
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \
- png:${PORTSDIR}/graphics/png
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN= "Does not compile (bad C++ code)"
-.endif
-
-USE_KDEBASE_VER=3
-GNU_CONFIGURE= yes
-QTCFGLIBS+= -pthread
-CONFIGURE_ENV+= LIBQT="-lqt-mt"
+USE_KDEBASE_VER= 3
USE_GMAKE= yes
-MAKE_ENV= ${CONFIGURE_ENV}
+GNU_CONFIGURE= yes
+CONFIGURE_ENV= LIBQT="-lqt-mt"
+
+QTCPPFLAGS+= ${PTHREAD_CFLAGS}
+QTCFGLIBS+= ${PTHREAD_LIBS}
pre-configure:
${MKDIR} ${WRKSRC}/auto-bin
@@ -46,4 +38,4 @@
cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \
${GMAKE} -f Makefile.dist
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -urN /usr/ports/deskutils/krss/files/patch-krss-amphetadeskinport.cpp deskutils/krss/files/patch-krss-amphetadeskinport.cpp
--- /usr/ports/deskutils/krss/files/patch-krss-amphetadeskinport.cpp Thu Jan 1 09:00:00 1970
+++ deskutils/krss/files/patch-krss-amphetadeskinport.cpp Wed May 21 10:21:31 2003
@@ -0,0 +1,11 @@
+--- krss/amphetadeskinport.cpp.orig Wed Feb 20 15:46:11 2002
++++ krss/amphetadeskinport.cpp Wed May 21 10:21:02 2003
+@@ -38,6 +38,8 @@
+
+ #include "sitehandler.h"
+
++using namespace std;
++
+
+ AmphetaDeskInport::AmphetaDeskInport(KApplication *app, SiteHandler *sitehandler, QWidget *parent, const char *name )
+ : KDialogBase(parent,name,true,i18n("Import Sites from AmphetaDesk"),Details|User1|Close,Close,true,i18n("Import")), QXmlDefaultHandler()
diff -urN /usr/ports/deskutils/krss/files/patch-krss-filterdialog.cpp deskutils/krss/files/patch-krss-filterdialog.cpp
--- /usr/ports/deskutils/krss/files/patch-krss-filterdialog.cpp Sat Sep 21 12:44:43 2002
+++ deskutils/krss/files/patch-krss-filterdialog.cpp Wed May 21 10:25:10 2003
@@ -1,5 +1,5 @@
---- krss/filterdialog.cpp~ Tue Oct 16 12:05:58 2001
-+++ krss/filterdialog.cpp Tue Sep 10 22:56:44 2002
+--- krss/filterdialog.cpp.orig Wed Oct 17 04:05:58 2001
++++ krss/filterdialog.cpp Wed May 21 10:24:47 2003
@@ -18,6 +18,7 @@
#include "filterdialog.h"
@@ -8,3 +8,12 @@
#include <klocale.h>
#include <klistview.h>
+@@ -27,6 +28,8 @@
+ #include "filterviewbackend.h"
+
+ #include "filterruledialog.h"
++
++using namespace std;
+
+
+ FilterDialog::FilterDialog(QWidget *parent, const char *name )
diff -urN /usr/ports/deskutils/krss/files/patch-krss-filterhandler.cpp deskutils/krss/files/patch-krss-filterhandler.cpp
--- /usr/ports/deskutils/krss/files/patch-krss-filterhandler.cpp Thu Jan 1 09:00:00 1970
+++ deskutils/krss/files/patch-krss-filterhandler.cpp Wed May 21 10:23:40 2003
@@ -0,0 +1,11 @@
+--- krss/filterhandler.cpp.orig Thu Oct 18 00:06:25 2001
++++ krss/filterhandler.cpp Wed May 21 10:23:16 2003
+@@ -29,6 +29,8 @@
+
+ #include <iostream>
+
++using namespace std;
++
+ FilterHandler::FilterHandler(FilterRule::Action defaultAction)
+ {
+ mFilters.setAutoDelete(true);
diff -urN /usr/ports/deskutils/krss/files/patch-krss-krss.cpp deskutils/krss/files/patch-krss-krss.cpp
--- /usr/ports/deskutils/krss/files/patch-krss-krss.cpp Sat Sep 21 12:44:43 2002
+++ deskutils/krss/files/patch-krss-krss.cpp Wed May 21 10:41:37 2003
@@ -1,5 +1,5 @@
---- krss/krss.cpp~ Wed Feb 20 09:00:22 2002
-+++ krss/krss.cpp Tue Sep 10 23:11:14 2002
+--- krss/krss.cpp.orig Thu Feb 21 02:00:22 2002
++++ krss/krss.cpp Wed May 21 10:41:25 2003
@@ -24,6 +24,7 @@
#include <qscrollbar.h>
#include <qsplitter.h>
@@ -17,7 +17,16 @@
// application specific includes
#include "krss.h"
-@@ -518,7 +519,7 @@
+@@ -62,6 +63,8 @@
+
+ #define ID_STATUS_MSG 1
+
++using namespace std;
++
+ KrssApp::KrssApp(QWidget* , const char* name)
+ : KMainWindow(0, name)
+ {
+@@ -518,7 +521,7 @@
{
config->setGroup(QString("General"));
QString mExec = config->readEntry(QString("Open URLs With"), QString("konqueror %url"));
@@ -26,7 +35,7 @@
slotStatusMsg(i18n("Starting ") + mExec + QString("..."));
-@@ -967,12 +968,12 @@
+@@ -967,12 +970,12 @@
config->setGroup(QString("General"));
QStringList uh_list = config->readListEntry(QString("URL Handlers"));
QString default_handler = config->readEntry(QString("Open URLs With"), QString("konqueror %url"));
diff -urN /usr/ports/deskutils/krss/files/patch-krss-rssparser.cpp deskutils/krss/files/patch-krss-rssparser.cpp
--- /usr/ports/deskutils/krss/files/patch-krss-rssparser.cpp Thu Jan 1 09:00:00 1970
+++ deskutils/krss/files/patch-krss-rssparser.cpp Wed May 21 10:35:43 2003
@@ -0,0 +1,11 @@
+--- krss/rssparser.cpp.orig Wed Feb 20 14:39:36 2002
++++ krss/rssparser.cpp Wed May 21 10:35:29 2003
+@@ -35,6 +35,8 @@
+ #include "mychannelbaritem.h"
+ #include "filterhandler.h"
+
++using namespace std;
++
+ RSSParser::RSSParser()
+ : QXmlDefaultHandler()
+ {
diff -urN /usr/ports/deskutils/krss/files/patch-krss-schemeeditor.cpp deskutils/krss/files/patch-krss-schemeeditor.cpp
--- /usr/ports/deskutils/krss/files/patch-krss-schemeeditor.cpp Thu Jan 1 09:00:00 1970
+++ deskutils/krss/files/patch-krss-schemeeditor.cpp Wed May 21 10:28:13 2003
@@ -0,0 +1,11 @@
+--- krss/schemeeditor.cpp.orig Mon Nov 26 10:08:12 2001
++++ krss/schemeeditor.cpp Wed May 21 10:27:55 2003
+@@ -43,6 +43,8 @@
+ #include "schemeparser.h"
+ #include "colourconverter.h"
+
++using namespace std;
++
+ SchemeEditor::SchemeEditor(QWidget *parent, const char *name )
+ : QWidget(parent,name)
+ {
diff -urN /usr/ports/deskutils/krss/files/patch-krss-schemeparser.cpp deskutils/krss/files/patch-krss-schemeparser.cpp
--- /usr/ports/deskutils/krss/files/patch-krss-schemeparser.cpp Sat Sep 21 12:44:43 2002
+++ deskutils/krss/files/patch-krss-schemeparser.cpp Wed May 21 10:32:40 2003
@@ -1,12 +1,21 @@
---- krss/schemeparser.cpp~ Sun Nov 25 17:12:50 2001
-+++ krss/schemeparser.cpp Tue Sep 10 22:58:36 2002
-@@ -342,9 +342,6 @@
+--- krss/schemeparser.cpp.orig Mon Nov 26 10:12:50 2001
++++ krss/schemeparser.cpp Wed May 21 10:32:25 2003
+@@ -18,6 +18,8 @@
+ #include "schemeparser.h"
+ #include <iostream>
+
++using namespace std;
++
+ SchemeParser::SchemeParser()
+ {
+ schemetag = QString("scheme");
+@@ -341,9 +343,6 @@
+ font.setUnderline(true);
else
font.setUnderline(false);
- }
+- }
- else if(atts.qName(i).compare("charset") == 0) {
- font.setCharSet((QFont::CharSet) atts.value(i).toInt());
-- }
+ }
}
if(mReadingChannel) {
- if(mReadingTitle) {
diff -urN /usr/ports/deskutils/krss/files/patch-krss-schemetree.cpp deskutils/krss/files/patch-krss-schemetree.cpp
--- /usr/ports/deskutils/krss/files/patch-krss-schemetree.cpp Sat Sep 21 12:44:43 2002
+++ deskutils/krss/files/patch-krss-schemetree.cpp Wed May 21 10:33:49 2003
@@ -1,6 +1,15 @@
---- krss/schemetree.cpp~ Sun Nov 25 17:16:21 2001
-+++ krss/schemetree.cpp Tue Sep 10 23:01:49 2002
-@@ -178,7 +178,6 @@
+--- krss/schemetree.cpp.orig Mon Nov 26 10:16:21 2001
++++ krss/schemetree.cpp Wed May 21 10:33:35 2003
+@@ -24,6 +24,8 @@
+
+ #include "colourconverter.h"
+
++using namespace std;
++
+ SchemeTree::SchemeTree()
+ {
+ clear();
+@@ -178,7 +180,6 @@
ctfelm.setAttribute("underline", "true");
else
ctfelm.setAttribute("underline", "false");
@@ -8,7 +17,7 @@
ctelm.appendChild(ctfelm);
QDomElement ctaelm = doc.createElement("align");
QDomText ctatxt = doc.createTextNode(QString::number(channelTitleAlign()));
-@@ -220,7 +219,6 @@
+@@ -220,7 +221,6 @@
cdfelm.setAttribute("underline", "true");
else
cdfelm.setAttribute("underline", "false");
@@ -16,7 +25,7 @@
cdelm.appendChild(cdfelm);
QDomElement cdaelm = doc.createElement("align");
QDomText cdatxt = doc.createTextNode(QString::number(channelDescriptionAlign()));
-@@ -251,7 +249,6 @@
+@@ -251,7 +251,6 @@
ntfelm.setAttribute("underline", "true");
else
ntfelm.setAttribute("underline", "false");
@@ -24,7 +33,7 @@
ntelm.appendChild(ntfelm);
QDomElement ntaelm = doc.createElement("align");
QDomText ntatxt = doc.createTextNode(QString::number(newsTitleAlign()));
-@@ -283,7 +280,6 @@
+@@ -283,7 +282,6 @@
ndfelm.setAttribute("underline", "true");
else
ndfelm.setAttribute("underline", "false");
diff -urN /usr/ports/deskutils/krss/files/patch-krss-sitehandler.cpp deskutils/krss/files/patch-krss-sitehandler.cpp
--- /usr/ports/deskutils/krss/files/patch-krss-sitehandler.cpp Thu Jan 1 09:00:00 1970
+++ deskutils/krss/files/patch-krss-sitehandler.cpp Wed May 21 10:38:53 2003
@@ -0,0 +1,11 @@
+--- krss/sitehandler.cpp.orig Wed Feb 20 13:38:38 2002
++++ krss/sitehandler.cpp Wed May 21 10:38:31 2003
+@@ -35,6 +35,8 @@
+ #include "mychannelbar.h"
+ #include "editfeedlistviewitem.h"
+
++using namespace std;
++
+ SiteHandler::SiteHandler()
+ {
+ mReadingSites = mReadingSite = mReadingName = mReadingUsed = false;
diff -urN /usr/ports/deskutils/krss/files/patch-krss-syncdialog.cpp deskutils/krss/files/patch-krss-syncdialog.cpp
--- /usr/ports/deskutils/krss/files/patch-krss-syncdialog.cpp Thu Jan 1 09:00:00 1970
+++ deskutils/krss/files/patch-krss-syncdialog.cpp Wed May 21 10:31:00 2003
@@ -0,0 +1,11 @@
+--- krss/syncdialog.cpp.orig Tue Sep 11 01:23:37 2001
++++ krss/syncdialog.cpp Wed May 21 10:30:45 2003
+@@ -27,6 +27,8 @@
+
+ #include <klocale.h>
+
++using namespace std;
++
+ SyncDialog::SyncDialog(KConfig *config, QWidget *parent, const char *name )
+ : KDialogBase(parent,name,true,i18n("Sharing Feeds"),User1|Close,Close,true,i18n("Skip"))
+ {
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list