diff options
| author | joerg <joerg@pkgsrc.org> | 2007-01-16 22:38:08 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2007-01-16 22:38:08 +0000 |
| commit | bee63833c8f28a89e4cec9ded77f355f61cda4e9 (patch) | |
| tree | ab060890e79e1cdac409ce3be48bef96b7887164 | |
| parent | e717686df86b93b0d35e910aa2c9b640733c579e (diff) | |
| download | pkgsrc-bee63833c8f28a89e4cec9ded77f355f61cda4e9.tar.gz | |
Use sys/endian.h on DragonFly as well. As DragonFly has the FreeBSD
define of Qt set, but ships with a Single Unix Specification compliant
iconv.h, don't use the FreeBSD (libiconv) or NetBSD (incorrect iconv.h)
code. This should be fixed upstream by utilising the ICONV_CONST
configure test, but for a local pkgsrc fix it is too much work.
| -rw-r--r-- | sysutils/k3b/distinfo | 5 | ||||
| -rw-r--r-- | sysutils/k3b/patches/patch-ab | 6 | ||||
| -rw-r--r-- | sysutils/k3b/patches/patch-ac | 13 |
3 files changed, 19 insertions, 5 deletions
diff --git a/sysutils/k3b/distinfo b/sysutils/k3b/distinfo index 29ef400fad4..b3373834342 100644 --- a/sysutils/k3b/distinfo +++ b/sysutils/k3b/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.9 2007/01/14 09:33:58 wiz Exp $ +$NetBSD: distinfo,v 1.10 2007/01/16 22:38:08 joerg Exp $ SHA1 (k3b-1.0rc4.tar.bz2) = 5b42ef4a74aa04cb9aef220d65c4f26f64afdb8f RMD160 (k3b-1.0rc4.tar.bz2) = d9e8253257a0a9c6213ce4fab3366ed2c71b2c76 Size (k3b-1.0rc4.tar.bz2) = 3828519 bytes SHA1 (patch-aa) = 2d6bcf8ee4eeaf7802cf5278bb69db8336c26a62 -SHA1 (patch-ab) = 654821bf3e6411fa7db3c732c1fc1771c54559e6 +SHA1 (patch-ab) = f1d082c09351d687de9aaa621a801469fa383fff +SHA1 (patch-ac) = 38902921193ff0219c1769ffa3b793de6f3f4c0c diff --git a/sysutils/k3b/patches/patch-ab b/sysutils/k3b/patches/patch-ab index 7bd653e82d4..67cbe5e78f1 100644 --- a/sysutils/k3b/patches/patch-ab +++ b/sysutils/k3b/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.4 2007/01/14 09:33:58 wiz Exp $ +$NetBSD: patch-ab,v 1.5 2007/01/16 22:38:08 joerg Exp $ --- src/projects/k3bencodingconverter.cpp.orig 2007-01-09 13:36:36.000000000 +0000 +++ src/projects/k3bencodingconverter.cpp @@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.4 2007/01/14 09:33:58 wiz Exp $ #ifdef HAVE_ICONV_H QCString utf8Encoded( s.length()*2 ); -#ifdef Q_OS_FREEBSD -+#if defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD) ++#if (defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)) && !defined(__DragonFly__) const char* in = s.data(); #else char* in = s.data(); @@ -16,7 +16,7 @@ $NetBSD: patch-ab,v 1.4 2007/01/14 09:33:58 wiz Exp $ result.resize( s.length() * 2 ); -#ifdef Q_OS_FREEBSD -+#if defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD) ++#if (defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)) && !defined(__DragonFly__) const char* in = s.data(); #else char* in = s.data(); diff --git a/sysutils/k3b/patches/patch-ac b/sysutils/k3b/patches/patch-ac new file mode 100644 index 00000000000..863bfb11d26 --- /dev/null +++ b/sysutils/k3b/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.3 2007/01/16 22:38:08 joerg Exp $ + +--- libk3b/core/k3bglobals.cpp.orig 2007-01-16 21:29:07.000000000 +0000 ++++ libk3b/core/k3bglobals.cpp +@@ -46,7 +46,7 @@ + #include <sys/utsname.h> + #include <sys/stat.h> + +-#if defined(__FreeBSD__) || defined(__NetBSD__) ++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) + # include <sys/param.h> + # include <sys/mount.h> + # include <sys/endian.h> |