diff options
| author | arved <arved@FreeBSD.org> | 2004-01-26 17:59:01 +0800 |
|---|---|---|
| committer | arved <arved@FreeBSD.org> | 2004-01-26 17:59:01 +0800 |
| commit | 47b691f36fefd404da7fafdcfc7d0db80856055e (patch) | |
| tree | e0727a0f85bc4809fe1fb17460b3ef3fd612b567 | |
| parent | ff878ae410e0c7fe89e8f6bd27a8ea3deec8f5d3 (diff) | |
| download | freebsd-ports-gnome-47b691f36fefd404da7fafdcfc7d0db80856055e.tar.gz freebsd-ports-gnome-47b691f36fefd404da7fafdcfc7d0db80856055e.tar.zst freebsd-ports-gnome-47b691f36fefd404da7fafdcfc7d0db80856055e.zip | |
Update to use QT3
Submitted by: Adriaan de Groot <adridg@cs.kun.nl>
| -rw-r--r-- | graphics/kisomandel/Makefile | 11 | ||||
| -rw-r--r-- | graphics/kisomandel/files/patch-settings | 48 |
2 files changed, 52 insertions, 7 deletions
diff --git a/graphics/kisomandel/Makefile b/graphics/kisomandel/Makefile index 176c6e7731d1..c78ef8ea7989 100644 --- a/graphics/kisomandel/Makefile +++ b/graphics/kisomandel/Makefile @@ -8,6 +8,7 @@ PORTNAME= kisomandel PORTVERSION= 0.66 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= arved @@ -19,21 +20,17 @@ LIB_DEPENDS= png:${PORTSDIR}/graphics/png USE_BZIP2= yes USE_REINPLACE= yes -USE_QT_VER= 2 +USE_QT_VER= 3 GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/${PORTNAME} USE_GMAKE= yes .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 501000 -BROKEN= "Does not compile" -.endif - post-patch: - @${REINPLACE_CMD} -e "s,-lqt,-lqt2,g" ${WRKSRC}/configure + @${REINPLACE_CMD} -e "s,-lqt,-lqt-mt ${PTHREAD_LIBS},g" ${WRKSRC}/configure @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} \ - ${REINPLACE_CMD} -e "s,-lqt,-lqt2,g" + ${REINPLACE_CMD} -e "s,-lqt,-lqt-mt ${PTHREAD_LIBS},g" @${REINPLACE_CMD} -e "s,malloc.h,stdlib.h,g" ${WRKSRC}/kisomandel/fractal.cpp .include <bsd.port.post.mk> diff --git a/graphics/kisomandel/files/patch-settings b/graphics/kisomandel/files/patch-settings new file mode 100644 index 000000000000..0c91468c51d7 --- /dev/null +++ b/graphics/kisomandel/files/patch-settings @@ -0,0 +1,48 @@ +--- settings.h.orig Fri Jan 23 20:58:47 2004 ++++ kisomandel/settings.h Fri Jan 23 20:59:01 2004 +@@ -29,6 +29,7 @@ + #include <qdial.h> + #include <qlayout.h> + #include <qvalidator.h> ++#include <qlineedit.h> + + #include "kisomandel.h" + #include "isosettings_form.h" +--- settings.cpp.orig Fri Jan 23 20:58:51 2004 ++++ kisomandel/settings.cpp Fri Jan 23 20:59:31 2004 +@@ -52,7 +52,7 @@ + + ///////////////////// DoubleNumEdit ///////////////////// + +-DoubleNumEdit::DoubleNumEdit (QWidget *parent = 0, const char* name = 0, WFlags fl = 0 ) : QLineEdit (parent,name) ++DoubleNumEdit::DoubleNumEdit (QWidget *parent , const char* name , WFlags fl ) : QLineEdit (parent,name) + { + setValidator (new QDoubleValidator(this) ); + } +@@ -108,7 +108,7 @@ + + ///////////////////// IsoPrefsForm ///////////////////// + +-IsoPrefs::IsoPrefs (QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ) : IsoPrefsForm (parent,name) ++IsoPrefs::IsoPrefs (QWidget* parent , const char* name , WFlags fl ) : IsoPrefsForm (parent,name) + { + settingUp=false; + +@@ -283,7 +283,7 @@ + ///////////////////// FractPrefsForm ///////////////////// + + +-FractPrefs::FractPrefs (QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ) : FractPrefsForm (parent,name) ++FractPrefs::FractPrefs (QWidget* parent , const char* name , WFlags fl ) : FractPrefsForm (parent,name) + { + if (fract->prefsPosX == -1 || fract->prefsPosY == -1) + { +@@ -537,7 +537,7 @@ + + ///////////////////// GeneralPrefsForm ///////////////////// + +-GeneralPrefs::GeneralPrefs (QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ) ++GeneralPrefs::GeneralPrefs (QWidget* parent , const char* name , WFlags fl ) + { + if (mainwin->generalPrefsPosX == -1 || mainwin->generalPrefsPosY == -1) + { |