diff options
| author | gahr <gahr@FreeBSD.org> | 2008-06-11 19:07:54 +0800 |
|---|---|---|
| committer | gahr <gahr@FreeBSD.org> | 2008-06-11 19:07:54 +0800 |
| commit | bb8191cf1c8af3a8824f4f88e6f432f756a20d18 (patch) | |
| tree | aed7f954f1e04b32c2cbba54358c232f66836269 /mail | |
| parent | 3dad5032b364b546f9740ae98a6f6115a4ed9589 (diff) | |
| download | freebsd-ports-gnome-bb8191cf1c8af3a8824f4f88e6f432f756a20d18.tar.gz freebsd-ports-gnome-bb8191cf1c8af3a8824f4f88e6f432f756a20d18.tar.zst freebsd-ports-gnome-bb8191cf1c8af3a8824f4f88e6f432f756a20d18.zip | |
- Unbreak - fix build with GCC 4.2
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/kiltdown/Makefile | 8 | ||||
| -rw-r--r-- | mail/kiltdown/files/patch-kiltdown.ccmoc | 2 | ||||
| -rw-r--r-- | mail/kiltdown/files/patch-kwindowbase.ccmoc | 2 |
3 files changed, 3 insertions, 9 deletions
diff --git a/mail/kiltdown/Makefile b/mail/kiltdown/Makefile index 6aab97f077bb..425a55eb94aa 100644 --- a/mail/kiltdown/Makefile +++ b/mail/kiltdown/Makefile @@ -25,12 +25,6 @@ MY_CONFIGURE_ARGS+= -qtinc ${LOCALBASE}/include -qtlib ${LOCALBASE}/lib MY_CONFIGURE_ARGS+= -dbinc ${LOCALBASE}/include/db3 -dblib ${LOCALBASE}/lib BUILD_ENV+= PATH=${PATH}:${LOCALBASE}/bin -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 700042 -BROKEN= Broken with gcc 4.2 -.endif - post-patch: @${MV} ${WRKSRC}/configs/bsd-generic ${WRKSRC}/configs/bsd-generic.sed ${SED} \ @@ -46,4 +40,4 @@ do-configure: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/kiltdown/kiltdown ${PREFIX}/bin/ -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/mail/kiltdown/files/patch-kiltdown.ccmoc b/mail/kiltdown/files/patch-kiltdown.ccmoc index 4dca927572d4..35bfba993093 100644 --- a/mail/kiltdown/files/patch-kiltdown.ccmoc +++ b/mail/kiltdown/files/patch-kiltdown.ccmoc @@ -5,7 +5,7 @@ mainToolBar, NULL); } else { - button = new QToolButton(NULL, -+ button = new QToolButton((const QIconSet &)NULL, ++ button = new QToolButton(QPixmap(), label ? QString(label) : QString::null, QString::null, this, mainToolBarData[i].member, diff --git a/mail/kiltdown/files/patch-kwindowbase.ccmoc b/mail/kiltdown/files/patch-kwindowbase.ccmoc index 7c8eb463f003..0bfce88aa79f 100644 --- a/mail/kiltdown/files/patch-kwindowbase.ccmoc +++ b/mail/kiltdown/files/patch-kwindowbase.ccmoc @@ -5,7 +5,7 @@ localToolBar, NULL); } else { - button = new QToolButton(NULL, -+ button = new QToolButton((const QIconSet &)NULL, ++ button = new QToolButton(QPixmap(), label ? QString(label) : QString::null, QString::null, receiver, toolBarData[i].member, |