diff options
| author | minskim <minskim> | 2006-03-02 06:45:46 +0000 |
|---|---|---|
| committer | minskim <minskim> | 2006-03-02 06:45:46 +0000 |
| commit | e378241b494776a9db8d6b9dc1349b9053476c60 (patch) | |
| tree | 69f8639c3fa11e0c7f5d10a6a21f000f7e74414d /x11 | |
| parent | d1251c48caec932691432ba3ff3fd3128bac2d6a (diff) | |
| download | pkgsrc-e378241b494776a9db8d6b9dc1349b9053476c60.tar.gz | |
Make the package build on Darwin by forcing to use X11 instead of
Mac OS X's GUI.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/qt4-libs/distinfo | 4 | ||||
| -rw-r--r-- | x11/qt4-libs/patches/patch-ad | 28 |
2 files changed, 28 insertions, 4 deletions
diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo index 9ea7897d044..d428e129dbd 100644 --- a/x11/qt4-libs/distinfo +++ b/x11/qt4-libs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2006/02/28 18:02:47 adam Exp $ +$NetBSD: distinfo,v 1.3 2006/03/02 06:45:46 minskim Exp $ SHA1 (qt-x11-opensource-src-4.1.1.tar.gz) = 44ca2afc223e327c6d326f5ee07a0049869defa5 RMD160 (qt-x11-opensource-src-4.1.1.tar.gz) = 188d99f3ac2929038238229e3b432fc5d5465af2 @@ -6,7 +6,7 @@ Size (qt-x11-opensource-src-4.1.1.tar.gz) = 27761487 bytes SHA1 (patch-aa) = 5587f3d9c0613f9be04de1eed76175c9342ce5e0 SHA1 (patch-ab) = 6c42d051ce036820167bcecc0480f7dd6d2f7334 SHA1 (patch-ac) = 766ca4aba25029765f83c8a72873b603864ea821 -SHA1 (patch-ad) = 25057aa091f8d144a991101e59e7dd5dd51baa67 +SHA1 (patch-ad) = 95558402aa3a02596cacd359bf5702dc7c038770 SHA1 (patch-af) = a8576bc098c14cb5a13d45d4231b7ee21441eb89 SHA1 (patch-ag) = d5b8d3c895f4a87397b90795c61de8be56ab517f SHA1 (patch-ah) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112 diff --git a/x11/qt4-libs/patches/patch-ad b/x11/qt4-libs/patches/patch-ad index 7f935e44936..48307ca1a4f 100644 --- a/x11/qt4-libs/patches/patch-ad +++ b/x11/qt4-libs/patches/patch-ad @@ -1,6 +1,6 @@ -$NetBSD: patch-ad,v 1.1.1.1 2006/02/20 12:08:15 adam Exp $ +$NetBSD: patch-ad,v 1.2 2006/03/02 06:45:46 minskim Exp $ ---- src/corelib/global/qglobal.h.orig 2005-12-16 12:51:59.000000000 +0100 +--- src/corelib/global/qglobal.h.orig 2006-02-16 02:51:07.000000000 -0800 +++ src/corelib/global/qglobal.h @@ -55,6 +55,7 @@ NETBSD - NetBSD @@ -20,3 +20,27 @@ $NetBSD: patch-ad,v 1.1.1.1 2006/02/20 12:08:15 adam Exp $ #elif defined(__OpenBSD__) # define Q_OS_OPENBSD # define Q_OS_BSD4 +@@ -145,11 +149,6 @@ + # define Q_OS_WIN + #endif + +-#if defined(Q_OS_DARWIN) +-# define Q_OS_MAC /* Q_OS_MAC is mostly for compatiblity, but also more clear */ +-# define Q_OS_MACX /* Q_OS_MACX is only for compatiblity.*/ +-#endif +- + #if defined(Q_OS_MSDOS) || defined(Q_OS_OS2) || defined(Q_OS_WIN) + # undef Q_OS_UNIX + #elif !defined(Q_OS_UNIX) +@@ -532,10 +531,7 @@ + # define Q_WS_PM + # error "Qt does not work with OS/2 Presentation Manager or Workplace Shell" + #elif defined(Q_OS_UNIX) +-# if defined(Q_OS_DARWIN) && !defined(__USE_WS_X11__) +-# define Q_WS_MAC +-# define Q_WS_MACX +-# elif !defined(Q_WS_QWS) ++# if !defined(Q_WS_QWS) + # define Q_WS_X11 + # endif + #endif |