From 11e65986795590bcf6283af54b3470286a22b36d Mon Sep 17 00:00:00 2001 From: Will Andrews Date: Wed, 18 Jun 2003 02:34:27 +0000 Subject: [PATCH] Fix rendering crash with patch developed by the Ted developer and sent via the submitter. Set maintainer to submitter. PR: 53329 Submitted by: Jonathan Drews --- editors/ted/Makefile | 8 +- .../patch-appFrame-appFileChooserMotif.c | 93 +++++++++++++++++++ editors/ted/pkg-descr | 9 +- 3 files changed, 100 insertions(+), 10 deletions(-) create mode 100644 editors/ted/files/patch-appFrame-appFileChooserMotif.c diff --git a/editors/ted/Makefile b/editors/ted/Makefile index 9604b8226c2f..796095a8a56e 100644 --- a/editors/ted/Makefile +++ b/editors/ted/Makefile @@ -11,12 +11,13 @@ CATEGORIES= editors textproc print MASTER_SITES= ftp://ftp.nluug.nl/pub/editors/ted/ EXTRACT_SUFX= .src.tar.gz -MAINTAINER= ports@FreeBSD.org +MAINTAINER= j.e.drews@att.net COMMENT= X11 based RTF editor LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff +RUN_DEPENDS= ${LOCALBASE}/share/ghostscript/fonts/Fontmap:${PORTSDIR}/print/gsfonts WRKSRC= ${WRKDIR}/Ted-${PORTVERSION} CONFIGURE_WRKSRC= ${WRKSRC}/Ted @@ -33,7 +34,7 @@ MAKE_ENV= DEF_AFMDIR="-DAFMDIR=\"\\\"${AFMDIR}\\\"\"" \ ALL_TARGET= compile.shared AFMDIR= ${PREFIX}/share/Ted/afm -INDDIR= ${PREFIX}/share/Ted/ind +INDDIR= ${PREFIX}/share/Ted/ind INFODIR= ${PREFIX}/share/doc/Ted post-extract: @@ -41,8 +42,7 @@ post-extract: post-patch: ${FIND} ${WRKSRC} -name "configure" | ${XARGS} ${REINPLACE_CMD} -e \ - 's|/usr/apps|${LOCALBASE}|g ; \ - s|gtk-config|${GTK_CONFIG:T}|g' + 's|/usr/apps|${LOCALBASE}|g ; ' ${REINPLACE_CMD} \ 's|DEF_PKGDIR|DEF_DOCUMENT_DIR|g' ${WRKSRC}/Ted/makefile.in diff --git a/editors/ted/files/patch-appFrame-appFileChooserMotif.c b/editors/ted/files/patch-appFrame-appFileChooserMotif.c new file mode 100644 index 000000000000..156e7f97464c --- /dev/null +++ b/editors/ted/files/patch-appFrame-appFileChooserMotif.c @@ -0,0 +1,93 @@ +--- appFrame/appFileChooserMotif.c Fri Apr 4 06:46:48 2003 ++++ /home/bsd/patches/TedFixes/appFileChooserMotif.c Sun Jun 1 20:19:07 2003 +@@ -549,6 +549,7 @@ + static int appMakeFileChooser( AppChooserInformation ** pAci, + Widget relative, + EditApplication * ea, ++ int withFilter, + const char * defaultFilter, + Widget option ) + { +@@ -624,15 +625,21 @@ + NULL ); + + /* Not necessary +- XtAddCallback( text, XmNactivateCallback, ++ if ( withFilter ) ++ { ++ XtAddCallback( text, XmNactivateCallback, + appFileFilterActivated, (void *)aci ); ++ } + */ + + filterButton= XmFileSelectionBoxGetChild( aci->aciDialog.adDialog, + XmDIALOG_APPLY_BUTTON ); + +- XtAddCallback( filterButton, XmNactivateCallback, ++ if ( withFilter ) ++ { ++ XtAddCallback( filterButton, XmNactivateCallback, + appFileFilterActivated, (void *)aci ); ++ } + + text= XmFileSelectionBoxGetChild( aci->aciDialog.adDialog, XmDIALOG_TEXT ); + XtVaSetValues( text, +@@ -705,14 +712,15 @@ + EditApplication * ea ) + { + AppChooserInformation * aci= (AppChooserInformation *)0; ++ const int withFilter= extensionCount > 0; + +- if ( appMakeFileChooser( &aci, relative, ea, defaultFilter, option ) ) ++ if ( appMakeFileChooser( &aci, relative, ea, withFilter, defaultFilter, option ) ) + { LDEB(1); return; } + + XtAddCallback( aci->aciDialog.adDialog, + XmNokCallback, appOpenChooserOk, (XtPointer)aci ); + +- if ( extensionCount > 0 ) ++ if ( withFilter ) + { + appFileMakeFilter( aci ); + +@@ -727,7 +735,7 @@ + aci->aciOpenDocument= openDocument; + aci->aciFilename= (char *)0; + +- if ( extensionCount > 0 ) ++ if ( withFilter ) + { + WidgetList children; + Cardinal childCount= 0; +@@ -920,16 +928,17 @@ + char ** pFilename ) + { + AppChooserInformation * aci= (AppChooserInformation *)0; ++ const int withFilter= ea->eaFileExtensionCount > 0; + int response; + +- if ( appMakeFileChooser( &aci, relative, ea, ++ if ( appMakeFileChooser( &aci, relative, ea, withFilter, + ea->eaDefaultFileFilter, option ) ) + { return ACIrespFAILURE; } + + XtAddCallback( aci->aciDialog.adDialog, + XmNokCallback, appSaveOkPushed, (XtPointer)aci ); + +- if ( ea->eaFileExtensionCount > 0 ) ++ if ( withFilter ) + { + appFileMakeFilter( aci ); + +@@ -977,9 +986,10 @@ + char ** pFilename ) + { + AppChooserInformation * aci= (AppChooserInformation *)0; ++ const int withFilter= 0; + int response; + +- if ( appMakeFileChooser( &aci, panel, ea, "*.ps", option ) ) ++ if ( appMakeFileChooser( &aci, panel, ea, withFilter, "*.ps", option ) ) + { LDEB(1); return ACIrespFAILURE; } + + XtAddCallback( aci->aciDialog.adDialog, diff --git a/editors/ted/pkg-descr b/editors/ted/pkg-descr index 0dc689480d4c..7b9483468bd5 100644 --- a/editors/ted/pkg-descr +++ b/editors/ted/pkg-descr @@ -1,5 +1,4 @@ -Ted is a text editor running under X Windows on Unix/Linux systems. Ted was -developed as an operating system accessory like Wordpad on MS-Windows. +Ted is a text editor running under X Windows on Unix/Linux systems. Features -------- @@ -11,11 +10,9 @@ Features Portuguese, French and Spanish.) * Directly mailing documents from Ted. * Cut/Copy/Paste, also with other applications. - * Find/Replace. + * Find/Replace using regular expressions. * Ruler: Paragraph indentation, Indentation of first line, Tabs. - * Copy/Paste - Ruler. - * Page breaks. + * Footnotes and endnotes. * Tables: Insert Table, Row, Column. Changing the column width of tables with their ruler. * Symbols and accented characters are fully supported.