diff options
| author | Alex Alexander <alex.alexander@gmail.com> | 2009-03-07 13:31:00 +0200 |
|---|---|---|
| committer | Alex Alexander <alex.alexander@gmail.com> | 2009-03-07 13:31:00 +0200 |
| commit | 3f029ff08dbeaf2c0f48259df07bbaae05cbb2bf (patch) | |
| tree | 34436503868cd9d1f7a8d26ec30671eb94ea4efc | |
| parent | ca89beb7ff38377a0b4f43ddac4fb6a8358424db (diff) | |
| download | kde-3f029ff08dbeaf2c0f48259df07bbaae05cbb2bf.tar.gz kde-3f029ff08dbeaf2c0f48259df07bbaae05cbb2bf.tar.bz2 kde-3f029ff08dbeaf2c0f48259df07bbaae05cbb2bf.zip | |
added patch for wv2 USE flag, KDE bug #186297
| -rw-r--r-- | app-office/kword/ChangeLog | 4 | ||||
| -rw-r--r-- | app-office/kword/Manifest | 5 | ||||
| -rw-r--r-- | app-office/kword/files/kword-1.9.98.7-int-cast-fix.patch | 20 | ||||
| -rw-r--r-- | app-office/kword/kword-1.9.98.7.ebuild | 2 |
4 files changed, 29 insertions, 2 deletions
diff --git a/app-office/kword/ChangeLog b/app-office/kword/ChangeLog index d544ec1cf6b..f27e76360af 100644 --- a/app-office/kword/ChangeLog +++ b/app-office/kword/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 07 Mar 2009; Alex Alexander (wired) <alex.alexander@gmail.com> + +files/kword-1.9.98.7-int-cast-fix.patch, kword-1.9.98.7.ebuild: + added patch that fixes wv2 USE, b.k.o #186297 + *kword-1.9.98.7 (06 Mar 2009) 06 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> -kword-1.9.98.6.ebuild, diff --git a/app-office/kword/Manifest b/app-office/kword/Manifest index 6db1ce5245d..656949aafc3 100644 --- a/app-office/kword/Manifest +++ b/app-office/kword/Manifest @@ -1,5 +1,6 @@ +AUX kword-1.9.98.7-int-cast-fix.patch 1026 RMD160 fe3f374bdde6687b61b8445f640457a1e02e70fd SHA1 d93d249ebbde36cd53ad2d4a478e847f4b88a294 SHA256 59f5f54fdcce494329c1c1ec5919461df4505896601f2d7e77d9e5435d60b7ec DIST koffice-1.9.98.7.tar.bz2 83440368 RMD160 c97da0b20b0b98f5e2c731b9a0a1de2d89202cab SHA1 5d78a26ac3baf3ab25238793380548d6d41e9d06 SHA256 e369d9cbdbf4d9bc2ca5a722970eeb2f716952241587372941a3434383ef24e1 -EBUILD kword-1.9.98.7.ebuild 586 RMD160 aab26e2d2abd12c724dfbda12df7fd95c2a3f364 SHA1 febc8fafac9f721dfd25e2f4e0b025dbd741fce9 SHA256 388a2a68ca4c35e8e724f3904e93953a4999171514a57021f7cc392eca736c0a +EBUILD kword-1.9.98.7.ebuild 647 RMD160 ff5a43fe601f7be746ed8b89ae6e9c536be0e4d3 SHA1 a7fdf8f287d1b46b221df49fd621b0305aace02f SHA256 e7d2587f1e000d8e9f165da197f2828994df94f112bb912c14f65b01aaac929f EBUILD kword-9999.ebuild 575 RMD160 9be2ae091011816251f718d0ca3e1673bd2deb8d SHA1 18c0428ae83773efe7ea855b5c55ec0521bd3824 SHA256 ac36a1e164b4cef3ee5c7728eeb0fd67d4233e3e07e49eb97ec614e5b9ea48c9 -MISC ChangeLog 1227 RMD160 61cb30606bd91fd5f57ab100d2928e08fbb7faa5 SHA1 bdcec07599226f551cdd0759d593d69c02d2a9f9 SHA256 dccafdbe7e40d1076d2adfcc715385e667881579a8af11954aee7308a5bbd6f6 +MISC ChangeLog 1408 RMD160 30d9c1fdb2a273f2a5dcc4e1e6a77890e49e0dcf SHA1 45c6c8e00c53d3c1ffa78bbcb0af4f34726b8ba9 SHA256 b0d4c5651ebbc247d3d38d7c3ebf747c4a1a7fb62733c32173078efa9dc092f2 MISC metadata.xml 283 RMD160 fbaac5a3e6372bbdfbd1c8e2f21667b24177083a SHA1 234fa1319e29712e6ac237921eeaae0a591d0602 SHA256 40523c9d7d6ebd6453db54f4912636eaa7b089efdeb7c4f2ee8cbf0abebeb57e diff --git a/app-office/kword/files/kword-1.9.98.7-int-cast-fix.patch b/app-office/kword/files/kword-1.9.98.7-int-cast-fix.patch new file mode 100644 index 00000000000..9d923904a22 --- /dev/null +++ b/app-office/kword/files/kword-1.9.98.7-int-cast-fix.patch @@ -0,0 +1,20 @@ +--- filters/kword/msword-odf/graphicshandler.cpp 2009-02-25 23:43:39.000000000 +0200 ++++ filters/kword/msword-odf/graphicshandler.cpp 2009-03-07 13:23:26.881172525 +0200 +@@ -66,7 +66,7 @@ + wvWare::U8* buf = new wvWare::U8[IMG_BUF_SIZE]; + size_t n = reader.read( buf, qMin( len, IMG_BUF_SIZE ) ); + Q_LONG n1 = m_store->write( (const char*)buf, n ); +- kDebug(30513) << "n=" << n << ", n1=" << n1 << "; buf contains " << (int) buf; ++ kDebug(30513) << "n=" << n << ", n1=" << n1 << "; buf contains " << (void*) buf; + len -= n; + delete [] buf; + //error checking +@@ -109,7 +109,7 @@ + } + //size_t n = reader.read( buf, qMin( len, IMG_BUF_SIZE ) ); + Q_LONG n1 = m_store->write( (const char*)buf, n ); +- kDebug(30513) << "n=" << n << ", n1=" << n1 << "; buf contains " << (int) buf; ++ kDebug(30513) << "n=" << n << ", n1=" << n1 << "; buf contains " << (void*) buf; + len -= n; + delete [] buf; + //error checking diff --git a/app-office/kword/kword-1.9.98.7.ebuild b/app-office/kword/kword-1.9.98.7.ebuild index 1ed52b6f3c8..dcec66b96f1 100644 --- a/app-office/kword/kword-1.9.98.7.ebuild +++ b/app-office/kword/kword-1.9.98.7.ebuild @@ -30,6 +30,8 @@ KMEXTRACTONLY=" KMLOADLIBS="koffice-libs" +PATCHES=( "${FILESDIR}/kword-1.9.98.7-int-cast-fix.patch" ) + src_configure() { mycmakeargs="${mycmakeargs} $(cmake-utils_use_with wpd WPD) |