diff options
| author | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2003-02-17 20:36:21 +0000 |
|---|---|---|
| committer | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2003-02-17 20:36:21 +0000 |
| commit | f7f7f593cd77104adaccd44c2104ec648d7e7a56 (patch) | |
| tree | 3f429516ebeedae1d1f4e1276ad030ff605df02a | |
| parent | Add digikam, a KDE frontend to the gphoto2 library. (diff) | |
o Fix a include inside a header file. It was pointing to a no longer
existent file [1]. This fixes unixODBC port GUI build.
o qt applications should be built with thread support per default.
Thus, add this to default qmake.conf for FreeBSD. [2]
o Bump PORTREVISION due to aforementioned
PR: 48303 [1]
Submitted by: Michael Collette <metrol@metrol.net> [1],
arved [2]
Reviewed by: Lauri Watts <lauri@kde.org> (FreeBSD KDE Team)
Notes
Notes:
svn path=/head/; revision=75735
| -rw-r--r-- | x11-toolkits/qt31/Makefile | 4 | ||||
| -rw-r--r-- | x11-toolkits/qt31/files/patch-include-qmlined.h | 9 | ||||
| -rw-r--r-- | x11-toolkits/qt32/Makefile | 4 | ||||
| -rw-r--r-- | x11-toolkits/qt32/files/patch-include-qmlined.h | 9 | ||||
| -rw-r--r-- | x11-toolkits/qt33/Makefile | 4 | ||||
| -rw-r--r-- | x11-toolkits/qt33/files/patch-include-qmlined.h | 9 |
6 files changed, 36 insertions, 3 deletions
diff --git a/x11-toolkits/qt31/Makefile b/x11-toolkits/qt31/Makefile index 44e2800f53c3..bfc49b88d0c3 100644 --- a/x11-toolkits/qt31/Makefile +++ b/x11-toolkits/qt31/Makefile @@ -8,7 +8,7 @@ PORTNAME= qt PORTVERSION= 3.1.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES?= x11-toolkits MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \ ftp://ftp.silug.org/pub/qt/ \ @@ -93,6 +93,8 @@ post-patch: ${WRKSRC}/mkspecs/freebsd-g++/qmake.conf @${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},' \ ${WRKSRC}/mkspecs/freebsd-g++/qmake.conf + @${REINPLACE_CMD} -e 's,release,release thread,' \ + ${WRKSRC}/mkspecs/freebsd-g++/qmake.conf post-build: .for tool in makeqpf mergetr msg2qm qembed qvfb diff --git a/x11-toolkits/qt31/files/patch-include-qmlined.h b/x11-toolkits/qt31/files/patch-include-qmlined.h new file mode 100644 index 000000000000..822c77855959 --- /dev/null +++ b/x11-toolkits/qt31/files/patch-include-qmlined.h @@ -0,0 +1,9 @@ +--- include/qmlined.h.orig Sat Feb 15 02:26:37 2003 ++++ include/qmlined.h Sat Feb 15 02:27:45 2003 +@@ -22,5 +22,5 @@ + *****************************************************************************/ + #ifndef QMLINED_H + #define QMLINED_H +-#include "qtmultilineedit.h" ++#include "qtextedit.h" + #endif diff --git a/x11-toolkits/qt32/Makefile b/x11-toolkits/qt32/Makefile index 44e2800f53c3..bfc49b88d0c3 100644 --- a/x11-toolkits/qt32/Makefile +++ b/x11-toolkits/qt32/Makefile @@ -8,7 +8,7 @@ PORTNAME= qt PORTVERSION= 3.1.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES?= x11-toolkits MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \ ftp://ftp.silug.org/pub/qt/ \ @@ -93,6 +93,8 @@ post-patch: ${WRKSRC}/mkspecs/freebsd-g++/qmake.conf @${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},' \ ${WRKSRC}/mkspecs/freebsd-g++/qmake.conf + @${REINPLACE_CMD} -e 's,release,release thread,' \ + ${WRKSRC}/mkspecs/freebsd-g++/qmake.conf post-build: .for tool in makeqpf mergetr msg2qm qembed qvfb diff --git a/x11-toolkits/qt32/files/patch-include-qmlined.h b/x11-toolkits/qt32/files/patch-include-qmlined.h new file mode 100644 index 000000000000..822c77855959 --- /dev/null +++ b/x11-toolkits/qt32/files/patch-include-qmlined.h @@ -0,0 +1,9 @@ +--- include/qmlined.h.orig Sat Feb 15 02:26:37 2003 ++++ include/qmlined.h Sat Feb 15 02:27:45 2003 +@@ -22,5 +22,5 @@ + *****************************************************************************/ + #ifndef QMLINED_H + #define QMLINED_H +-#include "qtmultilineedit.h" ++#include "qtextedit.h" + #endif diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile index 44e2800f53c3..bfc49b88d0c3 100644 --- a/x11-toolkits/qt33/Makefile +++ b/x11-toolkits/qt33/Makefile @@ -8,7 +8,7 @@ PORTNAME= qt PORTVERSION= 3.1.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES?= x11-toolkits MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \ ftp://ftp.silug.org/pub/qt/ \ @@ -93,6 +93,8 @@ post-patch: ${WRKSRC}/mkspecs/freebsd-g++/qmake.conf @${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},' \ ${WRKSRC}/mkspecs/freebsd-g++/qmake.conf + @${REINPLACE_CMD} -e 's,release,release thread,' \ + ${WRKSRC}/mkspecs/freebsd-g++/qmake.conf post-build: .for tool in makeqpf mergetr msg2qm qembed qvfb diff --git a/x11-toolkits/qt33/files/patch-include-qmlined.h b/x11-toolkits/qt33/files/patch-include-qmlined.h new file mode 100644 index 000000000000..822c77855959 --- /dev/null +++ b/x11-toolkits/qt33/files/patch-include-qmlined.h @@ -0,0 +1,9 @@ +--- include/qmlined.h.orig Sat Feb 15 02:26:37 2003 ++++ include/qmlined.h Sat Feb 15 02:27:45 2003 +@@ -22,5 +22,5 @@ + *****************************************************************************/ + #ifndef QMLINED_H + #define QMLINED_H +-#include "qtmultilineedit.h" ++#include "qtextedit.h" + #endif |