summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mail/kiltdown/Makefile6
-rw-r--r--mail/kiltdown/files/patch-Makefile.in4
-rw-r--r--mail/kiltdown/files/patch-folderview.cc10
-rw-r--r--mail/kiltdown/files/patch-kiltdown.ccmoc11
-rw-r--r--mail/kiltdown/files/patch-kmaillist.cc61
-rw-r--r--mail/kiltdown/files/patch-kwindowbase.ccmoc11
-rw-r--r--mail/kiltdown/files/patch-maileditwindow.cc79
-rw-r--r--mail/kiltdown/files/patch-mailfolder.cc15
-rw-r--r--mail/kiltdown/files/patch-mailviewer.h11
9 files changed, 203 insertions, 5 deletions
diff --git a/mail/kiltdown/Makefile b/mail/kiltdown/Makefile
index 17ff265..e6323d2 100644
--- a/mail/kiltdown/Makefile
+++ b/mail/kiltdown/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kiltdown
PORTVERSION= 0.8.045
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= kiltdown
@@ -17,10 +17,10 @@ MAINTAINER= dinoex@FreeBSD.org
LIB_DEPENDS= db3.3:${PORTSDIR}/databases/db3
USE_X_PREFIX= yes
-USE_QT_VER= 2
+USE_QT_VER= 3
USE_GMAKE= yes
MY_CONFIGURE_ARGS= -release
-MY_CONFIGURE_ARGS+= -qtinc ${X11BASE}/include/qt2 -qtlib ${X11BASE}/lib
+MY_CONFIGURE_ARGS+= -qtinc ${X11BASE}/include -qtlib ${X11BASE}/lib
MY_CONFIGURE_ARGS+= -dbinc ${LOCALBASE}/include/db3 -dblib ${LOCALBASE}/lib
BUILD_ENV+= PATH=${PATH}:${X11BASE}/bin
diff --git a/mail/kiltdown/files/patch-Makefile.in b/mail/kiltdown/files/patch-Makefile.in
index 20e4241da..15bb5bb 100644
--- a/mail/kiltdown/files/patch-Makefile.in
+++ b/mail/kiltdown/files/patch-Makefile.in
@@ -5,7 +5,7 @@
#
-MOC=$(QTBIN)moc
-+MOC=$(QTBIN)moc2
++MOC=$(QTBIN)moc
UIC=$(QTBIN)uic
RESCOMP=../tools/rescomp
DLGSTRIP=../tools/dlgstrip
@@ -14,7 +14,7 @@
CFLAGS=$(CFLAGSBASE) -fno-implicit-templates
LDFLAGS= $(SYS_LDFLAGS) -L$(QTLIB) -L$(DBLIB) -L$(X11LIB) $(USER_LPATH)
-LIBS=-lSM -lX11 -lXext -lICE -lqt-mt -ldb $(JPEGLIB) $(SYS_LIBS) $(USER_LIBS)
-+LIBS=-lSM -lX11 -lXext -lICE -lqt2-mt -ldb3 $(JPEGLIB) $(SYS_LIBS) $(USER_LIBS)
++LIBS=-lSM -lX11 -lXext -lICE -lqt-mt -ldb3 $(JPEGLIB) $(SYS_LIBS) $(USER_LIBS)
#
###################################################################
diff --git a/mail/kiltdown/files/patch-folderview.cc b/mail/kiltdown/files/patch-folderview.cc
new file mode 100644
index 0000000..2ba7caa
--- /dev/null
+++ b/mail/kiltdown/files/patch-folderview.cc
@@ -0,0 +1,10 @@
+--- kiltdown/folderview.cc.orig Mon May 14 05:25:23 2001
++++ kiltdown/folderview.cc Mon Sep 9 06:47:52 2002
+@@ -15,6 +15,7 @@
+ #include <qlineedit.h>
+ #include <qmessagebox.h>
+ #include <qpopupmenu.h>
++#include <qpainter.h>
+ #include <string.h>
+
+ #include "folderview.h"
diff --git a/mail/kiltdown/files/patch-kiltdown.ccmoc b/mail/kiltdown/files/patch-kiltdown.ccmoc
new file mode 100644
index 0000000..4dca927
--- /dev/null
+++ b/mail/kiltdown/files/patch-kiltdown.ccmoc
@@ -0,0 +1,11 @@
+--- kiltdown/kiltdown.ccmoc.orig Mon May 14 05:25:23 2001
++++ kiltdown/kiltdown.ccmoc Mon Sep 9 12:11:24 2002
+@@ -1115,7 +1115,7 @@
+ this, mainToolBarData[i].member,
+ mainToolBar, NULL);
+ } else {
+- button = new QToolButton(NULL,
++ button = new QToolButton((const QIconSet &)NULL,
+ label ? QString(label) : QString::null,
+ QString::null,
+ this, mainToolBarData[i].member,
diff --git a/mail/kiltdown/files/patch-kmaillist.cc b/mail/kiltdown/files/patch-kmaillist.cc
new file mode 100644
index 0000000..5e2bbd2
--- /dev/null
+++ b/mail/kiltdown/files/patch-kmaillist.cc
@@ -0,0 +1,61 @@
+--- kiltdown/kmaillist.cc.orig Mon May 14 05:25:23 2001
++++ kiltdown/kmaillist.cc Mon Sep 9 11:53:44 2002
+@@ -12,6 +12,7 @@
+
+ #include <qdrawutil.h>
+ #include <qpainter.h>
++#include <qstyle.h>
+ #include <stdio.h>
+ #include <string.h>
+
+@@ -616,6 +617,7 @@
+ int w = this->drawableWidth() - PAD;
+ int colwidth, colleft = PAD;
+ int x;
++ QRect *rect;
+
+ /**
+ * First thing we need to do is figure out how much space the fixed width
+@@ -646,8 +648,12 @@
+ if (!_backgroundBrush) _backgroundBrush = new QBrush(cg.color(QColorGroup::Button));
+ if (!_backgroundBrush) return;
+
+- style().drawBevelButton(&painter, colleft, 0, colwidth, getRowHeight(),
+- cg, headers[x].pressed, _backgroundBrush);
++ rect = new QRect( colleft, 0, colwidth, getRowHeight() );
++ style().drawPrimitive( QStyle::PE_ButtonBevel, &painter, *rect, cg,
++ headers[x].pressed ?
++ QStyle::Style_Default :
++ QStyle::Style_Sunken );
++ delete rect;
+
+ /**
+ * Next, draw the text or the image.
+@@ -1717,15 +1723,15 @@
+ && (x < (w + PAD + 1))
+ && (headers[z - 1].type != CW_FIXED)) {
+
+- this->setCursor(SplitVCursor);
++ this->setCursor(splitVCursor);
+ break;
+ } else {
+- this->setCursor(ArrowCursor);
++ this->setCursor(arrowCursor);
+ w += headers[z].widthCache;
+ }
+ }
+ } else {
+- this->setCursor(ArrowCursor);
++ this->setCursor(arrowCursor);
+ }
+ }
+ break;
+@@ -2471,7 +2477,7 @@
+ /**
+ * Finally, reset the cursor, mode, and repaint ourself.
+ */
+- this->setCursor(ArrowCursor);
++ this->setCursor(arrowCursor);
+ this->mouseMode = MMNormal;
+ emitColumnsChanged();
+ this->forceUpdate();
diff --git a/mail/kiltdown/files/patch-kwindowbase.ccmoc b/mail/kiltdown/files/patch-kwindowbase.ccmoc
new file mode 100644
index 0000000..7c8eb46
--- /dev/null
+++ b/mail/kiltdown/files/patch-kwindowbase.ccmoc
@@ -0,0 +1,11 @@
+--- kiltdown/kwindowbase.ccmoc.orig Mon May 14 05:25:23 2001
++++ kiltdown/kwindowbase.ccmoc Mon Sep 9 12:11:24 2002
+@@ -373,7 +373,7 @@
+ receiver, toolBarData[i].member,
+ localToolBar, NULL);
+ } else {
+- button = new QToolButton(NULL,
++ button = new QToolButton((const QIconSet &)NULL,
+ label ? QString(label) : QString::null,
+ QString::null,
+ receiver, toolBarData[i].member,
diff --git a/mail/kiltdown/files/patch-maileditwindow.cc b/mail/kiltdown/files/patch-maileditwindow.cc
new file mode 100644
index 0000000..c6bd8f8
--- /dev/null
+++ b/mail/kiltdown/files/patch-maileditwindow.cc
@@ -0,0 +1,79 @@
+--- kiltdown/maileditwindow.cc.orig Mon May 14 05:25:23 2001
++++ kiltdown/maileditwindow.cc Mon Sep 9 12:02:02 2002
+@@ -451,7 +451,7 @@
+ er = (*pwindow)->initialize();
+ RETURN_ON_FAILURE(er);
+
+- (*pwindow)->editBox->setUndoEnabled(false);
++ //(*pwindow)->editBox->setUndoEnabled(false);
+
+ /**
+ * Lastly, insert the user's signature.
+@@ -461,7 +461,7 @@
+
+ (*pwindow)->editBox->insert("\n");
+ (*pwindow)->editBox->setCursorPosition(0, 0);
+- (*pwindow)->editBox->setUndoEnabled(true);
++ //(*pwindow)->editBox->setUndoEnabled(true);
+
+ return S_OK;
+ }
+@@ -1008,7 +1008,7 @@
+ localFree(subject);
+
+ (*pwindow)->subjectEdit->setText(buf);
+- (*pwindow)->editBox->setUndoEnabled(false);
++ //(*pwindow)->editBox->setUndoEnabled(false);
+
+ /**
+ * now go and extract the to/from information and write out the header.
+@@ -1041,7 +1041,7 @@
+ (*pwindow)->editBox->insert("\n\n\n");
+ (*pwindow)->editBox->setCursorPosition(0, 0);
+ (*pwindow)->toEdit->setFocus();
+- (*pwindow)->editBox->setUndoEnabled(true);
++ //(*pwindow)->editBox->setUndoEnabled(true);
+
+
+ return S_OK;
+@@ -2121,7 +2121,7 @@
+ er = (*pwindow)->initialize();
+ GOTO_ON_FAILURE(er, Error);
+
+- (*pwindow)->editBox->setUndoEnabled(false);
++ //(*pwindow)->editBox->setUndoEnabled(false);
+ (*pwindow)->toEdit->clear();
+ (*pwindow)->ccEdit->clear();
+
+@@ -2211,11 +2211,11 @@
+ (*pwindow)->editBox->setCursorPosition(0, 0);
+ (*pwindow)->toEdit->setFocus();
+
+- (*pwindow)->editBox->setUndoEnabled(true);
++ //(*pwindow)->editBox->setUndoEnabled(true);
+ return S_OK;
+
+ Error:
+- (*pwindow)->editBox->setUndoEnabled(true);
++ //(*pwindow)->editBox->setUndoEnabled(true);
+ delete *pwindow;
+ return er;
+
+@@ -2593,7 +2593,7 @@
+ const char *pstr;
+ ERRCODE er;
+
+- editbox->setUndoEnabled(false);
++ //editbox->setUndoEnabled(false);
+ editbox->end();
+
+ if (addsep && list.countElements() && !editbox->text().isEmpty())
+@@ -2611,7 +2611,7 @@
+ er = list.nextElement(&pstr);
+ }
+
+- editbox->setUndoEnabled(true);
++ //editbox->setUndoEnabled(true);
+ }
+
+
diff --git a/mail/kiltdown/files/patch-mailfolder.cc b/mail/kiltdown/files/patch-mailfolder.cc
new file mode 100644
index 0000000..89968eb
--- /dev/null
+++ b/mail/kiltdown/files/patch-mailfolder.cc
@@ -0,0 +1,15 @@
+--- kiltdown/mailfolder.cc.orig Mon May 14 05:25:23 2001
++++ kiltdown/mailfolder.cc Mon Sep 9 12:04:36 2002
+@@ -1353,10 +1353,10 @@
+ messagePreview->setFont(QFont(pstr, i));
+ localFree(pstr);
+ }
+- messagePreview->setUndoEnabled(false);
++ //messagePreview->setUndoEnabled(false);
+ messagePreview->setText(body);
+ messagePreview->setCursorPosition(0, 0);
+- messagePreview->setUndoEnabled(true);
++ //messagePreview->setUndoEnabled(true);
+
+ er = S_OK;
+
diff --git a/mail/kiltdown/files/patch-mailviewer.h b/mail/kiltdown/files/patch-mailviewer.h
new file mode 100644
index 0000000..032d37d
--- /dev/null
+++ b/mail/kiltdown/files/patch-mailviewer.h
@@ -0,0 +1,11 @@
+--- kiltdown/mailviewer.h.orig Mon May 14 05:25:23 2001
++++ kiltdown/mailviewer.h Mon Sep 9 06:35:23 2002
+@@ -21,6 +21,8 @@
+ #include <qlineedit.h>
+ #include <qmainwindow.h>
+ #include <qmenubar.h>
++#include <qtoolbutton.h>
++#include <qpopupmenu.h>
+
+
+ #include "kwindowbase.h"
OpenPOWER on IntegriCloud