diff options
| author | markd <markd> | 2007-03-18 13:25:56 +0000 |
|---|---|---|
| committer | markd <markd> | 2007-03-18 13:25:56 +0000 |
| commit | 22934fae258a2999a30aa8f79cb5afe8e0c763b7 (patch) | |
| tree | cd6e50645a33f4a7a1ddf42d634c34dc33b720b5 /sysutils/k3b/patches | |
| parent | 8b519e24b1cbb5eee7e49739cdc8949cb508bbe5 (diff) | |
| download | pkgsrc-22934fae258a2999a30aa8f79cb5afe8e0c763b7.tar.gz | |
Update k3b to 1.0
Changes since rc4:
bug fixes.
new themes.
Diffstat (limited to 'sysutils/k3b/patches')
| -rw-r--r-- | sysutils/k3b/patches/patch-aa | 38 | ||||
| -rw-r--r-- | sysutils/k3b/patches/patch-ab | 8 |
2 files changed, 25 insertions, 21 deletions
diff --git a/sysutils/k3b/patches/patch-aa b/sysutils/k3b/patches/patch-aa index d3de4291d7c..d373cf60209 100644 --- a/sysutils/k3b/patches/patch-aa +++ b/sysutils/k3b/patches/patch-aa @@ -1,18 +1,22 @@ -$NetBSD: patch-aa,v 1.5 2007/01/14 09:33:58 wiz Exp $ +$NetBSD: patch-aa,v 1.6 2007/03/18 13:25:56 markd Exp $ ---- libk3b/tools/k3bfilesysteminfo.cpp.orig 2007-01-09 13:49:54.000000000 +0000 -+++ libk3b/tools/k3bfilesysteminfo.cpp -@@ -31,6 +31,13 @@ - #endif - #ifdef HAVE_SYS_STATVFS_H - # include <sys/statvfs.h> -+# if defined(Q_OS_NETBSD) -+# include <sys/param.h> -+# if __NetBSD_Version__ > 299000000 -+# define statfs statvfs -+# define f_type f_fsid -+# endif -+# endif - #endif - #ifdef HAVE_SYS_VFS_H - # include <sys/vfs.h> +--- libk3bdevice/k3bdevice.cpp.orig 2007-03-17 08:03:46.000000000 +1300 ++++ libk3bdevice/k3bdevice.cpp +@@ -1546,7 +1546,7 @@ bool K3bDevice::Device::eject() const + close(); + } + return success; +-#elifdef Q_OS_LINUX ++#elif Q_OS_LINUX + bool success = false; + bool needToClose = !isOpen(); + +@@ -1588,7 +1588,7 @@ bool K3bDevice::Device::load() const + close(); + } + return success; +-#elifdef Q_OS_LINUX ++#elif Q_OS_LINUX + bool success = false; + bool needToClose = !isOpen(); + diff --git a/sysutils/k3b/patches/patch-ab b/sysutils/k3b/patches/patch-ab index 67cbe5e78f1..d1964374bb9 100644 --- a/sysutils/k3b/patches/patch-ab +++ b/sysutils/k3b/patches/patch-ab @@ -1,12 +1,12 @@ -$NetBSD: patch-ab,v 1.5 2007/01/16 22:38:08 joerg Exp $ +$NetBSD: patch-ab,v 1.6 2007/03/18 13:25:56 markd Exp $ ---- src/projects/k3bencodingconverter.cpp.orig 2007-01-09 13:36:36.000000000 +0000 +--- src/projects/k3bencodingconverter.cpp.orig 2007-03-17 08:04:05.000000000 +1300 +++ src/projects/k3bencodingconverter.cpp @@ -62,7 +62,7 @@ bool K3bEncodingConverter::encodedLocall { #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 @@ -15,7 +15,7 @@ $NetBSD: patch-ab,v 1.5 2007/01/16 22:38:08 joerg Exp $ iconv_t ic = ::iconv_open( to.local8Bit(), from.local8Bit() ); 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 |