fix a very obvious stack smash in karbon.

With the recent ld.so changes, karbon now apparently works more or less...
This commit is contained in:
espie 2005-09-20 18:04:29 +00:00
parent 6befda6c28
commit 521a1935f1
6 changed files with 30 additions and 15 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.24 2005/08/05 10:49:18 espie Exp $ # $OpenBSD: Makefile,v 1.25 2005/09/20 18:04:29 espie Exp $
COMMENT= "office suite for KDE" COMMENT= "office suite for KDE"
@ -7,8 +7,9 @@ VMEM_WARNING= Yes
MASTER_SITES?= ${MASTER_SITE_KDE:S@$@stable/koffice-1.4.1/src/@} MASTER_SITES?= ${MASTER_SITE_KDE:S@$@stable/koffice-1.4.1/src/@}
DISTNAME= koffice-1.4.1 DISTNAME= koffice-1.4.1
PKGNAME= koffice-1.4.1 PKGNAME= ${DISTNAME}p0
FLAVORS=debug
FAKE_FLAGS= ${MAKE_FLAGS} TAR=tar DESTDIR=${WRKINST} FAKE_FLAGS= ${MAKE_FLAGS} TAR=tar DESTDIR=${WRKINST}
SEPARATE_BUILD= flavored SEPARATE_BUILD= flavored

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-karbon_dockers_vdocumentdocker_cc,v 1.1 2005/09/20 18:04:30 espie Exp $
--- karbon/dockers/vdocumentdocker.cc.orig Tue Sep 20 19:29:31 2005
+++ karbon/dockers/vdocumentdocker.cc Tue Sep 20 19:29:43 2005
@@ -846,8 +846,8 @@ void
VHistoryItem::init()
{
kdDebug(38000) << "In VHistoryItem::init() : " << m_command->name() << endl;
- char buffer[64];
- sprintf( buffer, "%064ld", ++g_lastKey );
+ char buffer[70];
+ snprintf( buffer, 70, "%064ld", ++g_lastKey );
m_key = buffer;
setPixmap( 0, QPixmap( KGlobal::iconLoader()->iconPath( m_command->icon(), KIcon::Small ) ) );
setText( 0, m_command->name() );

View File

@ -1,6 +1,6 @@
--- krita/plugins/colorspaceconversion/wdgconvertcolorspace.ui.orig Thu Sep 15 12:38:33 2005 --- krita/plugins/colorspaceconversion/wdgconvertcolorspace.ui.orig Tue Jul 19 16:09:43 2005
+++ krita/plugins/colorspaceconversion/wdgconvertcolorspace.ui Thu Sep 15 12:38:52 2005 +++ krita/plugins/colorspaceconversion/wdgconvertcolorspace.ui Tue Sep 20 12:04:01 2005
@@ -265,7 +265,4 @@ @@ -265,7 +265,4 @@ colors (Pantone, TruMatch, logo colors,
<tabstop>radioPerceptual</tabstop> <tabstop>radioPerceptual</tabstop>
</tabstops> </tabstops>
<layoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>

View File

@ -1,6 +1,6 @@
--- krita/plugins/screenshot/ksnapshotwidget.ui.orig Thu Sep 15 12:30:37 2005 --- krita/plugins/screenshot/ksnapshotwidget.ui.orig Tue Jul 19 16:09:46 2005
+++ krita/plugins/screenshot/ksnapshotwidget.ui Thu Sep 15 12:30:56 2005 +++ krita/plugins/screenshot/ksnapshotwidget.ui Tue Sep 20 12:04:01 2005
@@ -332,7 +332,4 @@ @@ -332,7 +332,4 @@ If &lt;i&gt;no delay&lt;/i&gt; is set, t
<pixmapfunction>SmallIconSet</pixmapfunction> <pixmapfunction>SmallIconSet</pixmapfunction>
<layoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>

View File

@ -1,6 +1,6 @@
--- krita/ui/wdgcolorsettings.ui.orig Thu Sep 15 18:25:18 2005 --- krita/ui/wdgcolorsettings.ui.orig Tue Jul 19 16:10:21 2005
+++ krita/ui/wdgcolorsettings.ui Thu Sep 15 18:25:26 2005 +++ krita/ui/wdgcolorsettings.ui Tue Sep 20 12:04:01 2005
@@ -361,8 +361,4 @@ @@ -361,8 +361,4 @@ result in neutral grays. Intended for im
<tabstop>radioPerceptual</tabstop> <tabstop>radioPerceptual</tabstop>
</tabstops> </tabstops>
<layoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-kspread_plugins_calculator_Makefile_in,v 1.2 2005/08/05 10:49:18 espie Exp $ $OpenBSD: patch-kspread_plugins_calculator_Makefile_in,v 1.3 2005/09/20 18:04:30 espie Exp $
--- kspread/plugins/calculator/Makefile.in.orig Wed Jun 1 11:21:59 2005 --- kspread/plugins/calculator/Makefile.in.orig Tue Jul 19 21:58:08 2005
+++ kspread/plugins/calculator/Makefile.in Mon Jun 13 12:32:50 2005 +++ kspread/plugins/calculator/Makefile.in Tue Sep 20 12:04:52 2005
@@ -578,7 +578,7 @@ clean-kde_moduleLTLIBRARIES: @@ -577,7 +577,7 @@ clean-kde_moduleLTLIBRARIES:
#>+ 2 #>+ 2
@KDE_USE_CLOSURE_TRUE@libkspreadcalc.la: libkspreadcalc.la.closure $(libkspreadcalc_la_OBJECTS) $(libkspreadcalc_la_DEPENDENCIES) @KDE_USE_CLOSURE_TRUE@libkspreadcalc.la: libkspreadcalc.la.closure $(libkspreadcalc_la_OBJECTS) $(libkspreadcalc_la_DEPENDENCIES)
@KDE_USE_CLOSURE_FALSE@libkspreadcalc.la: $(libkspreadcalc_la_OBJECTS) $(libkspreadcalc_la_DEPENDENCIES) @KDE_USE_CLOSURE_FALSE@libkspreadcalc.la: $(libkspreadcalc_la_OBJECTS) $(libkspreadcalc_la_DEPENDENCIES)