diff options
author | markd <markd> | 2005-07-17 12:24:20 +0000 |
---|---|---|
committer | markd <markd> | 2005-07-17 12:24:20 +0000 |
commit | e40729f40cf5080491b17feeba2828103321a640 (patch) | |
tree | 5009f03a800563485d1de71c60f1a965fd3b986a /misc/koffice/patches | |
parent | 8f6349b69420ffbfd9b977fd64812a6d1f9ece49 (diff) | |
download | pkgsrc-e40729f40cf5080491b17feeba2828103321a640.tar.gz |
Remove patch file that should have gone with the last update.
Fix build on NetBSD 1.6:
1.6's tar misnamed a file when unpacking (!?) so fix up if this
happens.
g++'s vector template doesn't have an at() method but what we actually
want is back() (which it does have) so use it.
Diffstat (limited to 'misc/koffice/patches')
-rw-r--r-- | misc/koffice/patches/patch-aa | 13 | ||||
-rw-r--r-- | misc/koffice/patches/patch-am | 13 |
2 files changed, 13 insertions, 13 deletions
diff --git a/misc/koffice/patches/patch-aa b/misc/koffice/patches/patch-aa deleted file mode 100644 index c00bdc4b08d..00000000000 --- a/misc/koffice/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.8 2004/05/04 11:47:30 markd Exp $ - ---- filters/karbon/msod/msodimport.cc.orig 2004-04-12 21:18:28.000000000 +1200 -+++ filters/karbon/msod/msodimport.cc -@@ -30,7 +30,7 @@ DESCRIPTION - #include <qpointarray.h> - - typedef KGenericFactory<MSODImport, KoFilter> MSODImportFactory; --K_EXPORT_COMPONENT_FACTORY( libmsodimport, MSODImportFactory( "karbonmsodimport" ) ) -+K_EXPORT_COMPONENT_FACTORY( libkarbonmsodimport, MSODImportFactory( "karbonmsodimport" ) ) - - const int MSODImport::s_area = 30505; - diff --git a/misc/koffice/patches/patch-am b/misc/koffice/patches/patch-am new file mode 100644 index 00000000000..24e522ef9f9 --- /dev/null +++ b/misc/koffice/patches/patch-am @@ -0,0 +1,13 @@ +$NetBSD: patch-am,v 1.3 2005/07/17 12:24:20 markd Exp $ + +--- filters/kspread/excel/sidewinder/excel.cpp.orig Mon Jul 18 11:17:42 2005 ++++ filters/kspread/excel/sidewinder/excel.cpp +@@ -5499,7 +5499,7 @@ void mergeTokens( UStringStack* stack, i + { + count--; + +- UString last = stack->at( stack->size()-1 ); ++ UString last = stack->back(); + UString tmp = last; + tmp.append( s1 ); + s1 = tmp; |