diff options
| author | joerg <joerg> | 2005-12-12 14:56:07 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2005-12-12 14:56:07 +0000 |
| commit | 51e58ddf3231e94a6a168ac1353829ae9f2f7824 (patch) | |
| tree | 6dffb727d94f28a2404bfac84987a18e60c2855a /x11/qt1/patches | |
| parent | 540e0281a4e91b921b54e3d9f8acb7bac1458637 (diff) | |
| download | pkgsrc-51e58ddf3231e94a6a168ac1353829ae9f2f7824.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/patches')
| -rw-r--r-- | x11/qt1/patches/patch-af | 13 | ||||
| -rw-r--r-- | x11/qt1/patches/patch-ag | 23 |
2 files changed, 36 insertions, 0 deletions
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; |