diff options
author | joerg <joerg@pkgsrc.org> | 2005-12-12 14:56:07 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2005-12-12 14:56:07 +0000 |
commit | 32c8dc50e27fcac5eecb4852cedc04c76a952715 (patch) | |
tree | 6dffb727d94f28a2404bfac84987a18e60c2855a /x11/qt1 | |
parent | 1f6a39a84e10fec37df3728c67f6821cc88e7231 (diff) | |
download | pkgsrc-32c8dc50e27fcac5eecb4852cedc04c76a952715.tar.gz |
Add DragonFly support. Move two methods in qfont.h out of private scope,
GCC 3.4 doesn't allow a private methods as friends.
XXX Should netbsd-g++-static be used for all platforms?
Diffstat (limited to 'x11/qt1')
-rw-r--r-- | x11/qt1/Makefile | 10 | ||||
-rw-r--r-- | x11/qt1/distinfo | 4 | ||||
-rw-r--r-- | x11/qt1/patches/patch-af | 13 | ||||
-rw-r--r-- | x11/qt1/patches/patch-ag | 23 |
4 files changed, 47 insertions, 3 deletions
diff --git a/x11/qt1/Makefile b/x11/qt1/Makefile index 6f6bfc47e09..788c2d9515d 100644 --- a/x11/qt1/Makefile +++ b/x11/qt1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/12/05 20:51:18 rillig Exp $ +# $NetBSD: Makefile,v 1.24 2005/12/12 14:56:07 joerg Exp $ # DISTNAME= qt-1.44 @@ -29,8 +29,14 @@ PKG_SUPPORTED_OPTIONS= gif .include "../../mk/bsd.options.mk" .include "../../mk/x11.buildlink3.mk" +.if ${OPSYS} == "DragonFly" +QT1_PLATFORM= netbsd-g++-static +.else +QT1_PLATFORM= ${LOWER_OPSYS}-g++-static +.endif + do-configure: - @cd ${WRKSRC} && ${MAKE} QTDIR=${WRKSRC} ${LOWER_OPSYS}-g++-static + @cd ${WRKSRC} && ${MAKE} QTDIR=${WRKSRC} ${QT1_PLATFORM} .if !empty(PKG_OPTIONS:Mgif) post-patch: diff --git a/x11/qt1/distinfo b/x11/qt1/distinfo index 4bf1512108a..34dedf03032 100644 --- a/x11/qt1/distinfo +++ b/x11/qt1/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2005/02/23 17:36:19 wiz Exp $ +$NetBSD: distinfo,v 1.7 2005/12/12 14:56:07 joerg Exp $ SHA1 (qt-1.44.tar.gz) = 08848fe5534bb210b151a1d9f3480fe83c0053c1 RMD160 (qt-1.44.tar.gz) = f15179396774f4038a082e984d8bdd4a7c4d1ae1 @@ -8,3 +8,5 @@ SHA1 (patch-ab) = 76d0ac60cd386518b5d8a48d15552abc5c8737ef SHA1 (patch-ac) = ffc97fce918d66d8581bfd6d307322d57fa23904 SHA1 (patch-ad) = cee971069a2f41219c14669ee5b4e1687d445dd8 SHA1 (patch-ae) = cef04901bf46e4511fafe08a9d7eee975ceae320 +SHA1 (patch-af) = 7e15f50952061ea53e76c136c6a3e7bce87312ce +SHA1 (patch-ag) = c1fb895f7fa09a498d227ce93db0083a5d8e5533 diff --git a/x11/qt1/patches/patch-af b/x11/qt1/patches/patch-af new file mode 100644 index 00000000000..fb7f30f7b3f --- /dev/null +++ b/x11/qt1/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.1 2005/12/12 14:56:07 joerg Exp $ + +--- src/tools/qglobal.h.orig 2005-12-12 14:10:03.000000000 +0000 ++++ src/tools/qglobal.h +@@ -82,7 +82,7 @@ + #define _OS_ULTRIX_ + #elif defined(linux) || defined(__linux) || defined(__linux__) + #define _OS_LINUX_ +-#elif defined(__FreeBSD__) ++#elif defined(__FreeBSD__) || defined(__DragonFly__) + #define _OS_FREEBSD_ + #elif defined(__NetBSD__) + #define _OS_NETBSD_ diff --git a/x11/qt1/patches/patch-ag b/x11/qt1/patches/patch-ag new file mode 100644 index 00000000000..92e6b7acdb2 --- /dev/null +++ b/x11/qt1/patches/patch-ag @@ -0,0 +1,23 @@ +$NetBSD: patch-ag,v 1.1 2005/12/12 14:56:07 joerg Exp $ + +--- src/kernel/qfont.h.orig 2005-12-12 14:34:40.000000000 +0000 ++++ src/kernel/qfont.h +@@ -113,6 +113,9 @@ public: + static void cleanup(); + static void cacheStatistics(); + ++ void initFontInfo() const; ++ void load( HANDLE=0 ) const; ++ + protected: + bool dirty() const; + +@@ -126,8 +129,6 @@ private: + QFont( bool ); + void init(); + void detach(); +- void initFontInfo() const; +- void load( HANDLE=0 ) const; + #if defined(_WS_WIN_) + HANDLE create( bool *, HANDLE=0, bool=FALSE ) const; + void *textMetric() const; |