diff options
| author | joerg <joerg@pkgsrc.org> | 2005-11-01 15:20:50 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2005-11-01 15:20:50 +0000 |
| commit | bc8bf3e7f683695833acfa0e4006a0b2c2d7a693 (patch) | |
| tree | 4125ff52a95d1b8e47ca4c856977aa8fece9bd41 /x11/qt3-libs | |
| parent | d243d73f5ea3e773b916b75b05ea2b41d549b75b (diff) | |
| download | pkgsrc-bc8bf3e7f683695833acfa0e4006a0b2c2d7a693.tar.gz | |
Adjust Qt 3.3 PostgreSQL patches to work with all versions. Drop the
requirement of 7.3, it compiles fine with all versions in pkgsrc (and
should work with them). Bump the revision to annotate the possibly
changed dependency.
Diffstat (limited to 'x11/qt3-libs')
| -rw-r--r-- | x11/qt3-libs/distinfo | 5 | ||||
| -rw-r--r-- | x11/qt3-libs/patches/patch-ba | 13 | ||||
| -rw-r--r-- | x11/qt3-libs/patches/patch-bb | 5 |
3 files changed, 4 insertions, 19 deletions
diff --git a/x11/qt3-libs/distinfo b/x11/qt3-libs/distinfo index 3de33f99c65..8a535747ceb 100644 --- a/x11/qt3-libs/distinfo +++ b/x11/qt3-libs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.32 2005/09/27 07:46:20 adam Exp $ +$NetBSD: distinfo,v 1.33 2005/11/01 15:20:50 joerg Exp $ SHA1 (qt-x11-free-3.3.5.tar.bz2) = 8d7c7ba0b39848ef60b3cd93fc1d33e9527694ec RMD160 (qt-x11-free-3.3.5.tar.bz2) = 376ae3fc36c70ec864653ca78582ba29410def7f @@ -12,8 +12,7 @@ SHA1 (patch-af) = 513b0419dcbe0d2e65d9912868effcf0681119ae SHA1 (patch-ag) = a413055f8df258b0bb91e46d6f611e9ec511b913 SHA1 (patch-ah) = f9e0a77ea62e06b3c037921094e0eb1d50a5ffce SHA1 (patch-ai) = 582a02a1b697ef038cd5a8ead5dd3b0910e6297b -SHA1 (patch-ba) = 0f5baae5501a83ea53e5d4df846bb1f338e4d802 -SHA1 (patch-bb) = df300b77d0adb653eaa16c97f995ed2def8e7d87 +SHA1 (patch-bb) = b6a15a4b2b7b83b89bd3610cf2e48c242dbce2e5 SHA1 (patch-bc) = d8a84e1b66bf1953b53df57ae81d2c98cce69c41 SHA1 (patch-bd) = a116ecf305ee5b5338bf84cb908d695f3baea830 SHA1 (patch-ia) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112 diff --git a/x11/qt3-libs/patches/patch-ba b/x11/qt3-libs/patches/patch-ba deleted file mode 100644 index c63d2c67872..00000000000 --- a/x11/qt3-libs/patches/patch-ba +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ba,v 1.1 2002/10/28 10:46:07 drochner Exp $ - ---- src/sql/drivers/psql/qsql_psql.h.orig Sun Oct 27 22:21:30 2002 -+++ src/sql/drivers/psql/qsql_psql.h Sun Oct 27 22:21:51 2002 -@@ -40,7 +40,7 @@ - #include <qsqlresult.h> - #include <qsqlfield.h> - #include <qsqldriver.h> --#include <libpq-fe.h> -+#include <pgsql/libpq-fe.h> - - #ifdef QT_PLUGIN - #define Q_EXPORT_SQLDRIVER_PSQL diff --git a/x11/qt3-libs/patches/patch-bb b/x11/qt3-libs/patches/patch-bb index 7b2f2298cbf..17156cfcc4d 100644 --- a/x11/qt3-libs/patches/patch-bb +++ b/x11/qt3-libs/patches/patch-bb @@ -1,4 +1,4 @@ -$NetBSD: patch-bb,v 1.4 2004/07/06 16:59:04 wiz Exp $ +$NetBSD: patch-bb,v 1.5 2005/11/01 15:20:51 joerg Exp $ --- src/sql/drivers/psql/qsql_psql.cpp.orig 2004-03-10 13:29:45.000000000 +0100 +++ src/sql/drivers/psql/qsql_psql.cpp @@ -7,9 +7,8 @@ $NetBSD: patch-bb,v 1.4 2004/07/06 16:59:04 wiz Exp $ # undef DEBUG #endif -#include <postgres.h> --#include <libpq/libpq-fs.h> +#include <postgresql/server/postgres.h> -+#include <postgresql/libpq/libpq-fs.h> + #include <libpq/libpq-fs.h> // PostgreSQL header <catalog/pg_type.h> redefines errno erroneously. #if defined(errno) # undef errno |