diff options
| author | joerg <joerg@pkgsrc.org> | 2013-03-26 23:27:09 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2013-03-26 23:27:09 +0000 |
| commit | 742d125f4676cb66cad1f26594a5497ef3bf9e5a (patch) | |
| tree | f628c18064d23f682d906473fc6ec7e36711ba3b /misc/koffice | |
| parent | 20fdfe8ccc86958d353778dc5ba763266463462f (diff) | |
| download | pkgsrc-742d125f4676cb66cad1f26594a5497ef3bf9e5a.tar.gz | |
The wv2 headers has a transitive closure defining a prototype with
signal as parameter name. This conflicts with the Qt macro of the same
name, so include the header earlier.
Diffstat (limited to 'misc/koffice')
| -rw-r--r-- | misc/koffice/distinfo | 3 | ||||
| -rw-r--r-- | misc/koffice/patches/patch-filters_kword_msword_graphicshandler.cpp | 18 |
2 files changed, 20 insertions, 1 deletions
diff --git a/misc/koffice/distinfo b/misc/koffice/distinfo index 0f0ae77adc5..85b237a8342 100644 --- a/misc/koffice/distinfo +++ b/misc/koffice/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.52 2013/03/23 10:15:26 joerg Exp $ +$NetBSD: distinfo,v 1.53 2013/03/26 23:27:09 joerg Exp $ SHA1 (koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff) = a3d1d85567ccf729a2237f4aa837f7e025ce00ae RMD160 (koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff) = ab6ec62b1ee7c369e8a6f44ba285a56b8c5439b4 @@ -21,6 +21,7 @@ SHA1 (patch-al) = 806334757d3ebca4515738e87454a30d9dd26e53 SHA1 (patch-am) = 022be8c44e0eaa3cab3404da48a4259f1dc3499c SHA1 (patch-ao) = 7d976c4f3094635f984fc70964589a863e914be7 SHA1 (patch-filters_krita_png_kis__png__converter.h) = f19ed6af46344b3516580ca91974d0d8382e5201 +SHA1 (patch-filters_kword_msword_graphicshandler.cpp) = a49e22d237c3b968b066ba56fa98fe34e67893dd SHA1 (patch-kexi_plugins_forms_widgets_kexidblabel_cpp) = 39bf8dcc00a024461cc54b4991f1dfb8a7bdc41b SHA1 (patch-kexi_plugins_forms_widgets_kexiframe_cpp) = 8a19ef7efc3a15d0e54ae84c0df822a8c12caba6 SHA1 (patch-kexi_plugins_importexport_csv_kexicsvexport_cpp) = d8e82dd72e29fcd50f0670d70cbf48550fa5d2be diff --git a/misc/koffice/patches/patch-filters_kword_msword_graphicshandler.cpp b/misc/koffice/patches/patch-filters_kword_msword_graphicshandler.cpp new file mode 100644 index 00000000000..e02a3b50389 --- /dev/null +++ b/misc/koffice/patches/patch-filters_kword_msword_graphicshandler.cpp @@ -0,0 +1,18 @@ +$NetBSD: patch-filters_kword_msword_graphicshandler.cpp,v 1.1 2013/03/26 23:27:09 joerg Exp $ + +--- filters/kword/msword/graphicshandler.cpp.orig 2013-03-24 21:00:42.000000000 +0000 ++++ filters/kword/msword/graphicshandler.cpp +@@ -17,11 +17,11 @@ + * Boston, MA 02110-1301, USA. + */ + ++#include <wv2/olestream.h> ++ + #include "graphicshandler.h" + #include "document.h" + +-#include <wv2/olestream.h> +- + #include <KoStoreDevice.h> + #include <KoSize.h> + #include <kdebug.h> |