diff options
| author | Will Andrews <will@FreeBSD.org> | 2001-08-29 01:53:47 +0000 |
|---|---|---|
| committer | Will Andrews <will@FreeBSD.org> | 2001-08-29 01:53:47 +0000 |
| commit | d3762340a385270c261f55db634b633e07c86f14 (patch) | |
| tree | dee728770e01eaa6b50143841b3880ccbe2294f6 /x11/kdelibs3 | |
| parent | EEK! Put PORTEPOCH back! (diff) | |
Fix problem with meinproc coredumping on -CURRENT. Basically what the
problem is is that there are a few sloppy pieces of code in xslt.cpp.
Bump PORTREVISION to account for recent changes (I had intended to do this
much earlier, but wanted to include these patches first, and there was
a problem getting them together correctly).
Submitted by: mi
Tested by: dwcjr, petef
Notes
Notes:
svn path=/head/; revision=47050
Diffstat (limited to 'x11/kdelibs3')
| -rw-r--r-- | x11/kdelibs3/Makefile | 2 | ||||
| -rw-r--r-- | x11/kdelibs3/files/patch-kdoctools::Makefile.in | 14 | ||||
| -rw-r--r-- | x11/kdelibs3/files/patch-kdoctools::xslt.cpp | 13 |
3 files changed, 28 insertions, 1 deletions
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index eb7c6bcfcda2..540b32e9e15d 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -7,7 +7,7 @@ PORTNAME= kdelibs PORTVERSION= 2.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src diff --git a/x11/kdelibs3/files/patch-kdoctools::Makefile.in b/x11/kdelibs3/files/patch-kdoctools::Makefile.in new file mode 100644 index 000000000000..42e4165ac2a7 --- /dev/null +++ b/x11/kdelibs3/files/patch-kdoctools::Makefile.in @@ -0,0 +1,14 @@ +--- kdoctools/Makefile.in Sun Aug 5 20:27:17 2001 ++++ kdoctools/Makefile.in.new Tue Aug 28 20:08:34 2001 +@@ -757,10 +757,7 @@ + + + xslt_pure.o: xslt.cpp +- -rm -f xslt_pure.cpp +- $(LN_S) $(srcdir)/xslt.cpp xslt_pure.cpp +- $(CXXCOMPILE) -DSIMPLE_XSLT -c xslt_pure.cpp +- -rm -f xslt_pure.cpp ++ $(CXXCOMPILE) -DSIMPLE_XSLT -c xslt.cpp -o xslt_pure.o + + messages: + $(XGETTEXT) *.cpp -o $(podir)/kdebase/kio_help.pot diff --git a/x11/kdelibs3/files/patch-kdoctools::xslt.cpp b/x11/kdelibs3/files/patch-kdoctools::xslt.cpp new file mode 100644 index 000000000000..aa384e393527 --- /dev/null +++ b/x11/kdelibs3/files/patch-kdoctools::xslt.cpp @@ -0,0 +1,13 @@ +--- kdoctools/xslt.cpp Mon Jul 30 17:11:20 2001 ++++ kdoctools/xslt.cpp.new Tue Aug 28 20:09:34 2001 +@@ -86,9 +86,7 @@ + INFO(i18n("Reading document")); + QFile xmlFile( pat ); + xmlFile.open(IO_ReadOnly); +- QCString contents; +- contents.assign(xmlFile.readAll()); +- contents.truncate(xmlFile.size()); ++ QCString contents(xmlFile.readAll(), xmlFile.size() + 1); + xmlFile.close(); + /* if (contents.left(5) != "<?xml") { + fprintf(stderr, "xmlizer\n"); |