diff options
| author | Alan Eldridge <alane@FreeBSD.org> | 2003-01-02 13:59:16 +0000 |
|---|---|---|
| committer | Alan Eldridge <alane@FreeBSD.org> | 2003-01-02 13:59:16 +0000 |
| commit | 2d1fcec5239403a7bb0bbd825724c02b14cb74e5 (patch) | |
| tree | 957db074c31fa30e84e67f21ec933140a42291ba | |
| parent | Update to 0.8.2. (diff) | |
Update to 1.2.1.
33 files changed, 333 insertions, 993 deletions
diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile index 72cd699d5388..246b244eacbd 100644 --- a/editors/calligra/Makefile +++ b/editors/calligra/Makefile @@ -1,3 +1,4 @@ +# -*-mode: makefile-*- # New ports collection makefile for: koffice # Date created: Sun May 14 2000 16:33:15 # Whom: Will Andrews <will@FreeBSD.org> @@ -6,33 +7,29 @@ # PORTNAME= koffice -PORTVERSION= 1.2 +PORTVERSION= 1.2.1 PORTEPOCH= 1 CATEGORIES= editors kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTNAME}-${PORTVERSION}/src -DIST_SUBDIR= KDE +DIST_SUBDIR= KDE/koffice MAINTAINER= kde@FreeBSD.org -BUILD_DEPENDS= autoconf:${PORTSDIR}/devel/autoconf \ - automake:${PORTSDIR}/devel/automake LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv \ art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 -_NO_KDE_PATCHUP=yes -USE_KDELIBS_VER=3 -GNU_CONFIGURE= yes -USE_PYTHON= yes -USE_BZIP2= yes -INSTALLS_SHLIB= yes -USE_GMAKE= yes +USE_KDELIBS_VER= 3 +PREFIX= ${KDE_PREFIX} -CONFIGURE_ENV+= DO_NOT_COMPILE=kontour # KDE calls it "badly broken" +USE_BZIP2= yes +USE_GMAKE= yes +USE_PYTHON= yes +GNU_CONFIGURE= yes -.include "${.CURDIR}/../../x11/kde3/Makefile.kde" +INSTALLS_SHLIB= yes +LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 -pre-configure: - cd ${WRKSRC} && ${GMAKE} -f Makefile.cvs +.include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.mk> diff --git a/editors/calligra/distinfo b/editors/calligra/distinfo index 07883502da2d..6988c28cdb50 100644 --- a/editors/calligra/distinfo +++ b/editors/calligra/distinfo @@ -1 +1 @@ -MD5 (KDE/koffice-1.2.tar.bz2) = 34cb13104bc1d4f0916b0dda6dec7ee0 +MD5 (KDE/koffice/koffice-1.2.1.tar.bz2) = 6a73aa72b094ca7b7377f74a508e804e diff --git a/editors/calligra/files/patch-karbon-karbon_view.cc b/editors/calligra/files/patch-karbon-karbon_view.cc deleted file mode 100644 index 5209dc9a610f..000000000000 --- a/editors/calligra/files/patch-karbon-karbon_view.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- ./karbon/karbon_view.cc.orig Sat Aug 31 07:12:55 2002 -+++ ./karbon/karbon_view.cc Sun Nov 17 06:31:40 2002 -@@ -1086,7 +1086,7 @@ - m_joinStyle->addState( new QPixmap( DesktopIcon( "join_miter" ) ) ); - m_joinStyle->addState( new QPixmap( DesktopIcon( "join_round" ) ) ); - m_joinStyle->setState( 0 ); --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - new KWidgetAction( m_joinStyle, i18n("Set Join Style"), 0, this, SLOT( slotJoinStyleClicked() ), actionCollection(), "setJoinStyle" ); - #endif - connect( m_joinStyle, SIGNAL(clicked()), this, SLOT(slotJoinStyleClicked()) ); -@@ -1097,7 +1097,7 @@ - m_capStyle->addState( new QPixmap( DesktopIcon( "cap_square" ) ) ); - m_capStyle->addState( new QPixmap( DesktopIcon( "cap_round" ) ) ); - m_capStyle->setState( 0 ); --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - new KWidgetAction( m_capStyle, i18n("Set Cap Style"), 0, this, SLOT( slotCapStyleClicked() ), actionCollection(), "setCapStyle" ); - #endif - connect( m_capStyle, SIGNAL(clicked()), this, SLOT(slotCapStyleClicked()) ); -@@ -1109,7 +1109,7 @@ - this, SLOT( selectionChanged() ) ); - connect( m_strokeFillPreview, SIGNAL( fillChanged( const VFill & ) ), - this, SLOT( selectionChanged() ) ); --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - //new KWidgetAction( m_strokeFillPreview, i18n(""), 0, this, SLOT( ), actionCollection(), "preview" ); - #endif - mainWindow()->toolBar( "Toolbox" )->insertWidget( 10, 30, m_strokeFillPreview ); diff --git a/editors/calligra/files/patch-kpresenter-kpresenter_dlg_config.cc b/editors/calligra/files/patch-kpresenter-kpresenter_dlg_config.cc deleted file mode 100644 index 012854cf57d2..000000000000 --- a/editors/calligra/files/patch-kpresenter-kpresenter_dlg_config.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- ./kpresenter/kpresenter_dlg_config.cc.orig Sat Aug 31 07:13:35 2002 -+++ ./kpresenter/kpresenter_dlg_config.cc Sun Nov 17 06:30:28 2002 -@@ -305,7 +305,7 @@ - grid1->addWidget( lab, 0, 0 ); - - bgColor = new KColorButton( oldBgColor, --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - oldBgColor, - #endif - tmpQGroupBox ); -@@ -318,7 +318,7 @@ - grid1->addWidget( lab, 2, 0 ); - - gridColor = new KColorButton( oldGridColor, --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - oldGridColor, - #endif - tmpQGroupBox ); diff --git a/editors/calligra/files/patch-kpresenter-kpresenter_view.cc b/editors/calligra/files/patch-kpresenter-kpresenter_view.cc deleted file mode 100644 index bb78c80bfee4..000000000000 --- a/editors/calligra/files/patch-kpresenter-kpresenter_view.cc +++ /dev/null @@ -1,74 +0,0 @@ ---- ./kpresenter/kpresenter_view.cc.orig Sat Aug 31 07:13:36 2002 -+++ ./kpresenter/kpresenter_view.cc Sun Nov 17 06:31:18 2002 -@@ -3224,7 +3224,7 @@ - actionCollection(), "format_style" ); - connect( actionFormatStyle, SIGNAL( activated( int ) ), - this, SLOT( textStyleSelected( int ) ) ); --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - actionFormatStyle->setRemoveAmpersandsInCombo( true ); - #endif - updateStyleList(); -@@ -3972,7 +3972,7 @@ - { - QColor c = kPresenterDoc()->presPen().color(); - if ( KColorDialog::getColor( c --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - , Qt::red - #endif - ) ) { -@@ -5116,7 +5116,7 @@ - { - if (m_spell.kspell) return; // Already in progress - m_spell.macroCmdSpellCheck=0L; --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - m_spell.replaceAll.clear(); - #endif - -@@ -5173,7 +5173,7 @@ - if(m_pKPresenterDoc->getKSpellConfig()) - { - m_pKPresenterDoc->getKSpellConfig()->setIgnoreList(m_pKPresenterDoc->spellListIgnoreAll()); --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - m_pKPresenterDoc->getKSpellConfig()->setReplaceAllList(m_spell.replaceAll); - #endif - -@@ -5194,7 +5194,7 @@ - this, SLOT( spellCheckerDone( const QString & ) ) ); - QObject::connect( m_spell.kspell, SIGNAL( ignoreall (const QString & ) ), - this, SLOT( spellCheckerIgnoreAll( const QString & ) ) ); --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - QObject::connect( m_spell.kspell, SIGNAL( replaceall( const QString &, const QString & )), this, SLOT( spellCheckerReplaceAll( const QString &, const QString & ))); - #endif - -@@ -5323,7 +5323,7 @@ - { - m_pKPresenterDoc->setReadWrite(true); - m_spell.textObject.clear(); --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - m_spell.replaceAll.clear(); - #endif - -@@ -5362,7 +5362,7 @@ - m_spell.macroCmdSpellCheck=0L; - - m_pKPresenterDoc->setReadWrite(true); --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - m_spell.replaceAll.clear(); - #endif - -@@ -6273,7 +6273,7 @@ - // to individual actions - QStringList lstWithAccels; - // Generate unique accelerators for the menu items --#if KDE_VERSION >= 305 // but only if the '&' will be removed from the combobox -+#if KDE_VERSION >= 306 // but only if the '&' will be removed from the combobox - KAccelGen::generate( lst, lstWithAccels ); - #else - lstWithAccels = lst; diff --git a/editors/calligra/files/patch-kspread-kspread_dlg_preference.cc b/editors/calligra/files/patch-kspread-kspread_dlg_preference.cc deleted file mode 100644 index c3398be9f749..000000000000 --- a/editors/calligra/files/patch-kspread-kspread_dlg_preference.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- ./kspread/kspread_dlg_preference.cc.orig Mon Jul 29 09:24:21 2002 -+++ ./kspread/kspread_dlg_preference.cc Sun Nov 17 06:31:59 2002 -@@ -719,7 +719,7 @@ - QLabel *label = new QLabel(i18n("&Grid color:"), tmpQGroupBox,"label20" ); - - gridColor = new KColorButton( _gridColor, --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - Qt::lightGray, - #endif - tmpQGroupBox ); -@@ -736,7 +736,7 @@ - QLabel * label2 = new QLabel( i18n("&Page borders:"), tmpQGroupBox, "label21" ); - - pageBorderColor = new KColorButton( _pbColor, --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - Qt::red, - #endif - tmpQGroupBox ); diff --git a/editors/calligra/files/patch-kspread-kspread_view.cc b/editors/calligra/files/patch-kspread-kspread_view.cc deleted file mode 100644 index 6b481feb2b45..000000000000 --- a/editors/calligra/files/patch-kspread-kspread_view.cc +++ /dev/null @@ -1,47 +0,0 @@ ---- ./kspread/kspread_view.cc.orig Sat Aug 31 07:13:44 2002 -+++ ./kspread/kspread_view.cc Sun Nov 17 06:32:41 2002 -@@ -1426,7 +1426,7 @@ - if(m_pDoc->getKSpellConfig()) - { - m_pDoc->getKSpellConfig()->setIgnoreList(m_pDoc->spellListIgnoreAll()); --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - m_pDoc->getKSpellConfig()->setReplaceAllList(m_spell.replaceAll); - #endif - -@@ -1457,7 +1457,7 @@ - QObject::connect( m_spell.kspell, SIGNAL( ignoreall (const QString & ) ), - this, SLOT( spellCheckerIgnoreAll( const QString & ) ) ); - --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - QObject::connect( m_spell.kspell, SIGNAL( replaceall( const QString & , const QString & )), this, SLOT( spellCheckerReplaceAll( const QString & , const QString & ))); - #endif - -@@ -1567,7 +1567,7 @@ - m_spell.firstSpellTable = 0L; - m_spell.currentSpellTable = 0L; - m_spell.currentCell = 0L; --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - m_spell.replaceAll.clear(); - #endif - -@@ -1713,7 +1713,7 @@ - } - } - } --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - m_spell.replaceAll.clear(); - #endif - -@@ -1733,7 +1733,7 @@ - m_spell.kspell->cleanUp(); - delete m_spell.kspell; - m_spell.kspell = 0L; --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - m_spell.replaceAll.clear(); - #endif - diff --git a/editors/calligra/files/patch-kword-kwview.cc b/editors/calligra/files/patch-kword-kwview.cc deleted file mode 100644 index ba97326d9e00..000000000000 --- a/editors/calligra/files/patch-kword-kwview.cc +++ /dev/null @@ -1,56 +0,0 @@ ---- ./kword/kwview.cc.orig Sat Aug 31 07:13:52 2002 -+++ ./kword/kwview.cc Sun Nov 17 06:33:20 2002 -@@ -1043,7 +1043,7 @@ - // Necessary for the actions that are not plugged anywhere - // Deprecated with KDE-3.1. - // Note entirely sure it's necessary for 3.0, please test and report. --#if KDE_VERSION < 305 -+#if KDE_VERSION < 306 - KAccel * accel = new KAccel( this ); - actNbsp->plugAccel( accel ); - actSoftHyphen->plugAccel( accel ); -@@ -1928,7 +1928,7 @@ - // to individual actions - QStringList lstWithAccels; - // Generate unique accelerators for the menu items --#if KDE_VERSION >= 305 // but only if the '&' will be removed from the combobox -+#if KDE_VERSION >= 306 // but only if the '&' will be removed from the combobox - KAccelGen::generate( lst, lstWithAccels ); - #else - lstWithAccels = lst; -@@ -1998,7 +1998,7 @@ - // to individual actions - QStringList lstWithAccels; - // Generate unique accelerators for the menu items --#if KDE_VERSION >= 305 // but only if the '&' will be removed from the combobox -+#if KDE_VERSION >= 306 // but only if the '&' will be removed from the combobox - KAccelGen::generate( lst, lstWithAccels ); - #else - lstWithAccels = lst; -@@ -2073,7 +2073,7 @@ - // to individual actions - QStringList lstWithAccels; - // Generate unique accelerators for the menu items --#if KDE_VERSION >= 305 // but only if the '&' will be removed from the combobox -+#if KDE_VERSION >= 306 // but only if the '&' will be removed from the combobox - KAccelGen::generate( lst, lstWithAccels ); - #else - lstWithAccels = lst; -@@ -4979,7 +4979,7 @@ - if(m_doc->getKSpellConfig()) - { - m_doc->getKSpellConfig()->setIgnoreList(m_doc->spellListIgnoreAll()); --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - m_doc->getKSpellConfig()->setReplaceAllList(m_spell.replaceAll); - #endif - } -@@ -5000,7 +5000,7 @@ - QObject::connect( m_spell.kspell, SIGNAL( ignoreall (const QString & ) ), - this, SLOT( spellCheckerIgnoreAll( const QString & ) ) ); - --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - QObject::connect( m_spell.kspell, SIGNAL( replaceall( const QString & , const QString & )), this, SLOT( spellCheckerReplaceAll( const QString & , const QString & ))); - #endif - diff --git a/editors/calligra/files/patch-lib-kofficecore-koMainWindow.cc b/editors/calligra/files/patch-lib-kofficecore-koMainWindow.cc deleted file mode 100644 index d11c803fe245..000000000000 --- a/editors/calligra/files/patch-lib-kofficecore-koMainWindow.cc +++ /dev/null @@ -1,38 +0,0 @@ ---- ./lib/kofficecore/koMainWindow.cc.orig Sat Aug 31 07:13:56 2002 -+++ ./lib/kofficecore/koMainWindow.cc Sun Nov 17 06:33:37 2002 -@@ -179,7 +179,7 @@ - d->m_manager->setSelectionPolicy( KParts::PartManager::TriState ); - d->m_manager->setAllowNestedParts( true ); - d->m_manager->setIgnoreScrollBars( true ); --#if KDE_VERSION > 305 -+#if KDE_VERSION > 306 - d->m_manager->setActivationButtonMask( Qt::LeftButton | Qt::MidButton ); - #endif - -@@ -1115,7 +1115,7 @@ - QApplication::sendEvent( d->m_activeView, &ev ); - - // As of KDE-3.1, the plugins are child XMLGUI objects of the part --#if KDE_VERSION < 305 -+#if KDE_VERSION < 306 - QPtrList<KParts::Plugin> plugins = KParts::Plugin::pluginObjects( d->m_activeView ); - KParts::Plugin *plugin = plugins.last(); - while ( plugin ) -@@ -1133,7 +1133,7 @@ - - if ( !d->bMainWindowGUIBuilt ) - { --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - // Load mainwindow plugins - KParts::Plugin::loadPlugins( this, this, instance(), true ); - #endif -@@ -1149,7 +1149,7 @@ - factory->addClient( d->m_activeView ); - - // As of KDE-3.1, the plugins are child XMLGUI objects of the part --#if KDE_VERSION < 305 -+#if KDE_VERSION < 306 - QPtrList<KParts::Plugin> plugins = KParts::Plugin::pluginObjects( d->m_activeView ); - QPtrListIterator<KParts::Plugin> pIt( plugins ); - for (; pIt.current(); ++pIt ) diff --git a/editors/calligra/files/patch-lib-kotext-koParagDia.cc b/editors/calligra/files/patch-lib-kotext-koParagDia.cc deleted file mode 100644 index 96e6f7bc38d9..000000000000 --- a/editors/calligra/files/patch-lib-kotext-koParagDia.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- ./lib/kotext/koParagDia.cc.orig Sun Sep 1 14:09:03 2002 -+++ ./lib/kotext/koParagDia.cc Sun Nov 17 06:33:53 2002 -@@ -1132,7 +1132,7 @@ - grid->addWidget( lColor, 4, 0 ); - - bColor = new KColorButton( black, --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - black, - #endif - this ); -@@ -1955,7 +1955,7 @@ - QLabel *lcolor = new QLabel( i18n( "Color:" ), shadow ); - grid2->addWidget(lcolor,0,0); - color = new KColorButton( black, --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - black, - #endif - shadow ); diff --git a/editors/calligra/pkg-plist b/editors/calligra/pkg-plist index 719d6cb03e93..c556aea1b068 100644 --- a/editors/calligra/pkg-plist +++ b/editors/calligra/pkg-plist @@ -3,6 +3,7 @@ bin/kchart bin/kformula bin/kivio bin/koconverter +bin/kontour bin/koscript bin/koshell bin/kprconverter.pl @@ -167,6 +168,8 @@ lib/kde3/libkformulapart.la lib/kde3/libkformulapart.so lib/kde3/libkiviopart.la lib/kde3/libkiviopart.so +lib/kde3/libkontourpart.la +lib/kde3/libkontourpart.so lib/kde3/libkontourrtfexport.la lib/kde3/libkontourrtfexport.so lib/kde3/libkounavailpart.la @@ -229,6 +232,8 @@ lib/kformulamain.la lib/kformulamain.so lib/kivio.la lib/kivio.so +lib/kontour.la +lib/kontour.so lib/koshell.la lib/koshell.so lib/kpresenter.la @@ -286,12 +291,12 @@ lib/libkwmf.so.2 lib/libkwordexportfilters.la lib/libkwordexportfilters.so lib/libkwordexportfilters.so.1 -lib/straight_connector.ksp share/applnk/Office/KThesaurus.desktop share/applnk/Office/karbon.desktop share/applnk/Office/kchart.desktop share/applnk/Office/kformula.desktop share/applnk/Office/kivio.desktop +share/applnk/Office/kontour.desktop share/applnk/Office/koshell.desktop share/applnk/Office/kpresenter.desktop share/applnk/Office/kspread.desktop @@ -412,6 +417,7 @@ share/apps/kformula/symbol.font share/apps/kformula/unicode.tbl share/apps/kivio/autoloadStencils/Text.sml share/apps/kivio/autoloadStencils/Text.xpm +share/apps/kivio/autoloadStencils/straight_connector.ksp share/apps/kivio/autoloadStencils/straight_connector.xpm share/apps/kivio/icons/hicolor/16x16/actions/add_stencil.xpm share/apps/kivio/icons/hicolor/16x16/actions/bring_stencil_to_front.xpm @@ -684,7 +690,78 @@ share/apps/koffice/pics/koKoolBarUp.png share/apps/koffice/pics/koRulerFirst.png share/apps/koffice/pics/koRulerLeft.png share/apps/koffice/pics/koffice-logo.png +share/apps/kontour/icons/hicolor/16x16/actions/abottom.png +share/apps/kontour/icons/hicolor/16x16/actions/ahcenter.png +share/apps/kontour/icons/hicolor/16x16/actions/aleft.png +share/apps/kontour/icons/hicolor/16x16/actions/aright.png +share/apps/kontour/icons/hicolor/16x16/actions/atop.png +share/apps/kontour/icons/hicolor/16x16/actions/avcenter.png +share/apps/kontour/icons/hicolor/16x16/actions/beziertool.png +share/apps/kontour/icons/hicolor/16x16/actions/cap_butt.png +share/apps/kontour/icons/hicolor/16x16/actions/cap_round.png +share/apps/kontour/icons/hicolor/16x16/actions/cap_square.png +share/apps/kontour/icons/hicolor/16x16/actions/dbottom.png +share/apps/kontour/icons/hicolor/16x16/actions/deleteNode.png +share/apps/kontour/icons/hicolor/16x16/actions/deletelayer.png +share/apps/kontour/icons/hicolor/16x16/actions/dhcenter.png +share/apps/kontour/icons/hicolor/16x16/actions/dhdist.png +share/apps/kontour/icons/hicolor/16x16/actions/dleft.png +share/apps/kontour/icons/hicolor/16x16/actions/dright.png +share/apps/kontour/icons/hicolor/16x16/actions/dtop.png +share/apps/kontour/icons/hicolor/16x16/actions/dvcenter.png +share/apps/kontour/icons/hicolor/16x16/actions/dvdist.png +share/apps/kontour/icons/hicolor/16x16/actions/ellipse1.png +share/apps/kontour/icons/hicolor/16x16/actions/ellipse2.png +share/apps/kontour/icons/hicolor/16x16/actions/ellipse3.png +share/apps/kontour/icons/hicolor/16x16/actions/ellipsetool.png +share/apps/kontour/icons/hicolor/16x16/actions/eye.png +share/apps/kontour/icons/hicolor/16x16/actions/freehandtool.png +share/apps/kontour/icons/hicolor/16x16/actions/group.png +share/apps/kontour/icons/hicolor/16x16/actions/hmirror.png +share/apps/kontour/icons/hicolor/16x16/actions/insertclipart.png +share/apps/kontour/icons/hicolor/16x16/actions/item_add.png +share/apps/kontour/icons/hicolor/16x16/actions/item_remove.png +share/apps/kontour/icons/hicolor/16x16/actions/item_rename.png +share/apps/kontour/icons/hicolor/16x16/actions/joinNodes.png +share/apps/kontour/icons/hicolor/16x16/actions/join_bevel.png +share/apps/kontour/icons/hicolor/16x16/actions/join_miter.png +share/apps/kontour/icons/hicolor/16x16/actions/join_round.png +share/apps/kontour/icons/hicolor/16x16/actions/linetool.png +share/apps/kontour/icons/hicolor/16x16/actions/lowerlayer.png +share/apps/kontour/icons/hicolor/16x16/actions/moveNode.png +share/apps/kontour/icons/hicolor/16x16/actions/newNode.png +share/apps/kontour/icons/hicolor/16x16/actions/newlayer.png +share/apps/kontour/icons/hicolor/16x16/actions/pointtool.png +share/apps/kontour/icons/hicolor/16x16/actions/polygontool.png +share/apps/kontour/icons/hicolor/16x16/actions/raiselayer.png +share/apps/kontour/icons/hicolor/16x16/actions/recttool.png +share/apps/kontour/icons/hicolor/16x16/actions/snap_to_grid.png +share/apps/kontour/icons/hicolor/16x16/actions/split.png +share/apps/kontour/icons/hicolor/16x16/actions/tcenteralign.png +share/apps/kontour/icons/hicolor/16x16/actions/texttool.png +share/apps/kontour/icons/hicolor/16x16/actions/tleftalign.png +share/apps/kontour/icons/hicolor/16x16/actions/trightalign.png +share/apps/kontour/icons/hicolor/16x16/actions/ungroup.png +share/apps/kontour/icons/hicolor/16x16/actions/vmirror.png +share/apps/kontour/icons/hicolor/16x16/apps/kontour.png +share/apps/kontour/icons/hicolor/22x22/actions/selecttool.png +share/apps/kontour/icons/hicolor/32x32/actions/rect1.png +share/apps/kontour/icons/hicolor/32x32/actions/rect2.png +share/apps/kontour/icons/hicolor/32x32/actions/rect3.png +share/apps/kontour/icons/hicolor/32x32/actions/rect4.png +share/apps/kontour/icons/hicolor/32x32/actions/rect5.png +share/apps/kontour/icons/hicolor/32x32/actions/rect6.png +share/apps/kontour/icons/hicolor/32x32/actions/rect7.png +share/apps/kontour/icons/hicolor/32x32/actions/rect8.png +share/apps/kontour/icons/hicolor/32x32/apps/kontour.png +share/apps/kontour/icons/hicolor/48x48/apps/kontour.png +share/apps/kontour/kontour.rc +share/apps/kontour/kontour_readonly.rc share/apps/kontour/kpartplugins/scan-kontour.rc +share/apps/kontour/templates/Simple/.directory +share/apps/kontour/templates/Simple/.icon/Plain.png +share/apps/kontour/templates/Simple/.source/Plain.kon +share/apps/kontour/templates/Simple/Plain.desktop share/apps/kpresenter/autoforms/.autoforms share/apps/kpresenter/autoforms/Arrows/.directory share/apps/kpresenter/autoforms/Arrows/.icon/ArrowDown.png @@ -1632,6 +1709,7 @@ share/icons/hicolor/16x16/apps/karbon.png share/icons/hicolor/16x16/apps/kchart.png share/icons/hicolor/16x16/apps/kformula.png share/icons/hicolor/16x16/apps/kivio.png +share/icons/hicolor/16x16/apps/kontour.png share/icons/hicolor/16x16/apps/kpresenter.png share/icons/hicolor/16x16/apps/kspread.png share/icons/hicolor/16x16/apps/kudesigner.png @@ -1679,6 +1757,7 @@ share/icons/hicolor/32x32/apps/karbon.png share/icons/hicolor/32x32/apps/kchart.png share/icons/hicolor/32x32/apps/kformula.png share/icons/hicolor/32x32/apps/kivio.png +share/icons/hicolor/32x32/apps/kontour.png share/icons/hicolor/32x32/apps/kpresenter.png share/icons/hicolor/32x32/apps/kspread.png share/icons/hicolor/32x32/apps/kudesigner.png @@ -1689,6 +1768,7 @@ share/icons/hicolor/48x48/apps/karbon.png share/icons/hicolor/48x48/apps/kchart.png share/icons/hicolor/48x48/apps/kformula.png share/icons/hicolor/48x48/apps/kivio.png +share/icons/hicolor/48x48/apps/kontour.png share/icons/hicolor/48x48/apps/kpresenter.png share/icons/hicolor/48x48/apps/kspread.png share/icons/hicolor/48x48/apps/kugar.png @@ -1785,13 +1865,10 @@ share/templates/Illustration.desktop share/templates/Presentation.desktop share/templates/SpreadSheet.desktop share/templates/TextDocument.desktop -@comment empty dirs @exec /bin/mkdir -p %D/share/doc/HTML/en/koffice-apidocs/lib/html -@comment directories +@unexec /bin/rmdir %D/share/doc/HTML/en/koffice-apidocs/lib/html || true @dirrm share/templates/.source @dirrm share/templates -@dirrm share/servicetypes -@dirrm share/services @dirrm share/mimelnk/application @dirrm share/mimelnk @dirrm share/icons/locolor/32x32/mimetypes @@ -1820,14 +1897,12 @@ share/templates/TextDocument.desktop @dirrm share/icons/hicolor/16x16/actions @dirrm share/icons/hicolor/16x16 @dirrm share/icons/hicolor -@dirrm share/icons @dirrm share/doc/HTML/en/thesaurus @dirrm share/doc/HTML/en/kword @dirrm share/doc/HTML/en/kugar @dirrm share/doc/HTML/en/kspread @dirrm share/doc/HTML/en/kpresenter @dirrm share/doc/HTML/en/koshell -@dirrm share/doc/HTML/en/koffice-apidocs/lib/html @dirrm share/doc/HTML/en/koffice-apidocs/lib @dirrm share/doc/HTML/en/koffice-apidocs @dirrm share/doc/HTML/en/koffice @@ -1835,7 +1910,6 @@ share/templates/TextDocument.desktop @dirrm share/doc/HTML/en/kchart @dirrm share/doc/HTML/en @dirrm share/doc/HTML -@dirrm share/doc @dirrm share/apps/xsltfilter/export/kword/xslfo @dirrm share/apps/xsltfilter/export/kword @dirrm share/apps/xsltfilter/export @@ -1916,7 +1990,23 @@ share/templates/TextDocument.desktop @dirrm share/apps/kpresenter/autoforms/Arrows @dirrm share/apps/kpresenter/autoforms @dirrm share/apps/kpresenter +@dirrm share/apps/kontour/templates/Simple/.source +@dirrm share/apps/kontour/templates/Simple/.icon +@dirrm share/apps/kontour/templates/Simple +@dirrm share/apps/kontour/templates @dirrm share/apps/kontour/kpartplugins +@dirrm share/apps/kontour/icons/hicolor/48x48/apps +@dirrm share/apps/kontour/icons/hicolor/48x48 +@dirrm share/apps/kontour/icons/hicolor/32x32/apps +@dirrm share/apps/kontour/icons/hicolor/32x32/actions +@dirrm share/apps/kontour/icons/hicolor/32x32 +@dirrm share/apps/kontour/icons/hicolor/22x22/actions +@dirrm share/apps/kontour/icons/hicolor/22x22 +@dirrm share/apps/kontour/icons/hicolor/16x16/apps +@dirrm share/apps/kontour/icons/hicolor/16x16/actions +@dirrm share/apps/kontour/icons/hicolor/16x16 +@dirrm share/apps/kontour/icons/hicolor +@dirrm share/apps/kontour/icons @dirrm share/apps/kontour @dirrm share/apps/koffice/pics @dirrm share/apps/koffice/icons/hicolor/48x48/apps @@ -1972,7 +2062,4 @@ share/templates/TextDocument.desktop @dirrm share/apps/karbon/icons/hicolor @dirrm share/apps/karbon/icons @dirrm share/apps/karbon -@dirrm share/apps @dirrm share/applnk/Office -@dirrm share/applnk -@dirrm lib/kde3 diff --git a/editors/koffice-kde3/Makefile b/editors/koffice-kde3/Makefile index 72cd699d5388..246b244eacbd 100644 --- a/editors/koffice-kde3/Makefile +++ b/editors/koffice-kde3/Makefile @@ -1,3 +1,4 @@ +# -*-mode: makefile-*- # New ports collection makefile for: koffice # Date created: Sun May 14 2000 16:33:15 # Whom: Will Andrews <will@FreeBSD.org> @@ -6,33 +7,29 @@ # PORTNAME= koffice -PORTVERSION= 1.2 +PORTVERSION= 1.2.1 PORTEPOCH= 1 CATEGORIES= editors kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTNAME}-${PORTVERSION}/src -DIST_SUBDIR= KDE +DIST_SUBDIR= KDE/koffice MAINTAINER= kde@FreeBSD.org -BUILD_DEPENDS= autoconf:${PORTSDIR}/devel/autoconf \ - automake:${PORTSDIR}/devel/automake LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv \ art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 -_NO_KDE_PATCHUP=yes -USE_KDELIBS_VER=3 -GNU_CONFIGURE= yes -USE_PYTHON= yes -USE_BZIP2= yes -INSTALLS_SHLIB= yes -USE_GMAKE= yes +USE_KDELIBS_VER= 3 +PREFIX= ${KDE_PREFIX} -CONFIGURE_ENV+= DO_NOT_COMPILE=kontour # KDE calls it "badly broken" +USE_BZIP2= yes +USE_GMAKE= yes +USE_PYTHON= yes +GNU_CONFIGURE= yes -.include "${.CURDIR}/../../x11/kde3/Makefile.kde" +INSTALLS_SHLIB= yes +LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 -pre-configure: - cd ${WRKSRC} && ${GMAKE} -f Makefile.cvs +.include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.mk> diff --git a/editors/koffice-kde3/distinfo b/editors/koffice-kde3/distinfo index 07883502da2d..6988c28cdb50 100644 --- a/editors/koffice-kde3/distinfo +++ b/editors/koffice-kde3/distinfo @@ -1 +1 @@ -MD5 (KDE/koffice-1.2.tar.bz2) = 34cb13104bc1d4f0916b0dda6dec7ee0 +MD5 (KDE/koffice/koffice-1.2.1.tar.bz2) = 6a73aa72b094ca7b7377f74a508e804e diff --git a/editors/koffice-kde3/files/patch-karbon-karbon_view.cc b/editors/koffice-kde3/files/patch-karbon-karbon_view.cc deleted file mode 100644 index 5209dc9a610f..000000000000 --- a/editors/koffice-kde3/files/patch-karbon-karbon_view.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- ./karbon/karbon_view.cc.orig Sat Aug 31 07:12:55 2002 -+++ ./karbon/karbon_view.cc Sun Nov 17 06:31:40 2002 -@@ -1086,7 +1086,7 @@ - m_joinStyle->addState( new QPixmap( DesktopIcon( "join_miter" ) ) ); - m_joinStyle->addState( new QPixmap( DesktopIcon( "join_round" ) ) ); - m_joinStyle->setState( 0 ); --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - new KWidgetAction( m_joinStyle, i18n("Set Join Style"), 0, this, SLOT( slotJoinStyleClicked() ), actionCollection(), "setJoinStyle" ); - #endif - connect( m_joinStyle, SIGNAL(clicked()), this, SLOT(slotJoinStyleClicked()) ); -@@ -1097,7 +1097,7 @@ - m_capStyle->addState( new QPixmap( DesktopIcon( "cap_square" ) ) ); - m_capStyle->addState( new QPixmap( DesktopIcon( "cap_round" ) ) ); - m_capStyle->setState( 0 ); --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - new KWidgetAction( m_capStyle, i18n("Set Cap Style"), 0, this, SLOT( slotCapStyleClicked() ), actionCollection(), "setCapStyle" ); - #endif - connect( m_capStyle, SIGNAL(clicked()), this, SLOT(slotCapStyleClicked()) ); -@@ -1109,7 +1109,7 @@ - this, SLOT( selectionChanged() ) ); - connect( m_strokeFillPreview, SIGNAL( fillChanged( const VFill & ) ), - this, SLOT( selectionChanged() ) ); --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - //new KWidgetAction( m_strokeFillPreview, i18n(""), 0, this, SLOT( ), actionCollection(), "preview" ); - #endif - mainWindow()->toolBar( "Toolbox" )->insertWidget( 10, 30, m_strokeFillPreview ); diff --git a/editors/koffice-kde3/files/patch-kpresenter-kpresenter_dlg_config.cc b/editors/koffice-kde3/files/patch-kpresenter-kpresenter_dlg_config.cc deleted file mode 100644 index 012854cf57d2..000000000000 --- a/editors/koffice-kde3/files/patch-kpresenter-kpresenter_dlg_config.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- ./kpresenter/kpresenter_dlg_config.cc.orig Sat Aug 31 07:13:35 2002 -+++ ./kpresenter/kpresenter_dlg_config.cc Sun Nov 17 06:30:28 2002 -@@ -305,7 +305,7 @@ - grid1->addWidget( lab, 0, 0 ); - - bgColor = new KColorButton( oldBgColor, --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - oldBgColor, - #endif - tmpQGroupBox ); -@@ -318,7 +318,7 @@ - grid1->addWidget( lab, 2, 0 ); - - gridColor = new KColorButton( oldGridColor, --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - oldGridColor, - #endif - tmpQGroupBox ); diff --git a/editors/koffice-kde3/files/patch-kpresenter-kpresenter_view.cc b/editors/koffice-kde3/files/patch-kpresenter-kpresenter_view.cc deleted file mode 100644 index bb78c80bfee4..000000000000 --- a/editors/koffice-kde3/files/patch-kpresenter-kpresenter_view.cc +++ /dev/null @@ -1,74 +0,0 @@ ---- ./kpresenter/kpresenter_view.cc.orig Sat Aug 31 07:13:36 2002 -+++ ./kpresenter/kpresenter_view.cc Sun Nov 17 06:31:18 2002 -@@ -3224,7 +3224,7 @@ - actionCollection(), "format_style" ); - connect( actionFormatStyle, SIGNAL( activated( int ) ), - this, SLOT( textStyleSelected( int ) ) ); --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - actionFormatStyle->setRemoveAmpersandsInCombo( true ); - #endif - updateStyleList(); -@@ -3972,7 +3972,7 @@ - { - QColor c = kPresenterDoc()->presPen().color(); - if ( KColorDialog::getColor( c --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - , Qt::red - #endif - ) ) { -@@ -5116,7 +5116,7 @@ - { - if (m_spell.kspell) return; // Already in progress - m_spell.macroCmdSpellCheck=0L; --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - m_spell.replaceAll.clear(); - #endif - -@@ -5173,7 +5173,7 @@ - if(m_pKPresenterDoc->getKSpellConfig()) - { - m_pKPresenterDoc->getKSpellConfig()->setIgnoreList(m_pKPresenterDoc->spellListIgnoreAll()); --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - m_pKPresenterDoc->getKSpellConfig()->setReplaceAllList(m_spell.replaceAll); - #endif - -@@ -5194,7 +5194,7 @@ - this, SLOT( spellCheckerDone( const QString & ) ) ); - QObject::connect( m_spell.kspell, SIGNAL( ignoreall (const QString & ) ), - this, SLOT( spellCheckerIgnoreAll( const QString & ) ) ); --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - QObject::connect( m_spell.kspell, SIGNAL( replaceall( const QString &, const QString & )), this, SLOT( spellCheckerReplaceAll( const QString &, const QString & ))); - #endif - -@@ -5323,7 +5323,7 @@ - { - m_pKPresenterDoc->setReadWrite(true); - m_spell.textObject.clear(); --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - m_spell.replaceAll.clear(); - #endif - -@@ -5362,7 +5362,7 @@ - m_spell.macroCmdSpellCheck=0L; - - m_pKPresenterDoc->setReadWrite(true); --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - m_spell.replaceAll.clear(); - #endif - -@@ -6273,7 +6273,7 @@ - // to individual actions - QStringList lstWithAccels; - // Generate unique accelerators for the menu items --#if KDE_VERSION >= 305 // but only if the '&' will be removed from the combobox -+#if KDE_VERSION >= 306 // but only if the '&' will be removed from the combobox - KAccelGen::generate( lst, lstWithAccels ); - #else - lstWithAccels = lst; diff --git a/editors/koffice-kde3/files/patch-kspread-kspread_dlg_preference.cc b/editors/koffice-kde3/files/patch-kspread-kspread_dlg_preference.cc deleted file mode 100644 index c3398be9f749..000000000000 --- a/editors/koffice-kde3/files/patch-kspread-kspread_dlg_preference.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- ./kspread/kspread_dlg_preference.cc.orig Mon Jul 29 09:24:21 2002 -+++ ./kspread/kspread_dlg_preference.cc Sun Nov 17 06:31:59 2002 -@@ -719,7 +719,7 @@ - QLabel *label = new QLabel(i18n("&Grid color:"), tmpQGroupBox,"label20" ); - - gridColor = new KColorButton( _gridColor, --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - Qt::lightGray, - #endif - tmpQGroupBox ); -@@ -736,7 +736,7 @@ - QLabel * label2 = new QLabel( i18n("&Page borders:"), tmpQGroupBox, "label21" ); - - pageBorderColor = new KColorButton( _pbColor, --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - Qt::red, - #endif - tmpQGroupBox ); diff --git a/editors/koffice-kde3/files/patch-kspread-kspread_view.cc b/editors/koffice-kde3/files/patch-kspread-kspread_view.cc deleted file mode 100644 index 6b481feb2b45..000000000000 --- a/editors/koffice-kde3/files/patch-kspread-kspread_view.cc +++ /dev/null @@ -1,47 +0,0 @@ ---- ./kspread/kspread_view.cc.orig Sat Aug 31 07:13:44 2002 -+++ ./kspread/kspread_view.cc Sun Nov 17 06:32:41 2002 -@@ -1426,7 +1426,7 @@ - if(m_pDoc->getKSpellConfig()) - { - m_pDoc->getKSpellConfig()->setIgnoreList(m_pDoc->spellListIgnoreAll()); --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - m_pDoc->getKSpellConfig()->setReplaceAllList(m_spell.replaceAll); - #endif - -@@ -1457,7 +1457,7 @@ - QObject::connect( m_spell.kspell, SIGNAL( ignoreall (const QString & ) ), - this, SLOT( spellCheckerIgnoreAll( const QString & ) ) ); - --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - QObject::connect( m_spell.kspell, SIGNAL( replaceall( const QString & , const QString & )), this, SLOT( spellCheckerReplaceAll( const QString & , const QString & ))); - #endif - -@@ -1567,7 +1567,7 @@ - m_spell.firstSpellTable = 0L; - m_spell.currentSpellTable = 0L; - m_spell.currentCell = 0L; --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - m_spell.replaceAll.clear(); - #endif - -@@ -1713,7 +1713,7 @@ - } - } - } --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - m_spell.replaceAll.clear(); - #endif - -@@ -1733,7 +1733,7 @@ - m_spell.kspell->cleanUp(); - delete m_spell.kspell; - m_spell.kspell = 0L; --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - m_spell.replaceAll.clear(); - #endif - diff --git a/editors/koffice-kde3/files/patch-kword-kwview.cc b/editors/koffice-kde3/files/patch-kword-kwview.cc deleted file mode 100644 index ba97326d9e00..000000000000 --- a/editors/koffice-kde3/files/patch-kword-kwview.cc +++ /dev/null @@ -1,56 +0,0 @@ ---- ./kword/kwview.cc.orig Sat Aug 31 07:13:52 2002 -+++ ./kword/kwview.cc Sun Nov 17 06:33:20 2002 -@@ -1043,7 +1043,7 @@ - // Necessary for the actions that are not plugged anywhere - // Deprecated with KDE-3.1. - // Note entirely sure it's necessary for 3.0, please test and report. --#if KDE_VERSION < 305 -+#if KDE_VERSION < 306 - KAccel * accel = new KAccel( this ); - actNbsp->plugAccel( accel ); - actSoftHyphen->plugAccel( accel ); -@@ -1928,7 +1928,7 @@ - // to individual actions - QStringList lstWithAccels; - // Generate unique accelerators for the menu items --#if KDE_VERSION >= 305 // but only if the '&' will be removed from the combobox -+#if KDE_VERSION >= 306 // but only if the '&' will be removed from the combobox - KAccelGen::generate( lst, lstWithAccels ); - #else - lstWithAccels = lst; -@@ -1998,7 +1998,7 @@ - // to individual actions - QStringList lstWithAccels; - // Generate unique accelerators for the menu items --#if KDE_VERSION >= 305 // but only if the '&' will be removed from the combobox -+#if KDE_VERSION >= 306 // but only if the '&' will be removed from the combobox - KAccelGen::generate( lst, lstWithAccels ); - #else - lstWithAccels = lst; -@@ -2073,7 +2073,7 @@ - // to individual actions - QStringList lstWithAccels; - // Generate unique accelerators for the menu items --#if KDE_VERSION >= 305 // but only if the '&' will be removed from the combobox -+#if KDE_VERSION >= 306 // but only if the '&' will be removed from the combobox - KAccelGen::generate( lst, lstWithAccels ); - #else - lstWithAccels = lst; -@@ -4979,7 +4979,7 @@ - if(m_doc->getKSpellConfig()) - { - m_doc->getKSpellConfig()->setIgnoreList(m_doc->spellListIgnoreAll()); --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - m_doc->getKSpellConfig()->setReplaceAllList(m_spell.replaceAll); - #endif - } -@@ -5000,7 +5000,7 @@ - QObject::connect( m_spell.kspell, SIGNAL( ignoreall (const QString & ) ), - this, SLOT( spellCheckerIgnoreAll( const QString & ) ) ); - --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - QObject::connect( m_spell.kspell, SIGNAL( replaceall( const QString & , const QString & )), this, SLOT( spellCheckerReplaceAll( const QString & , const QString & ))); - #endif - diff --git a/editors/koffice-kde3/files/patch-lib-kofficecore-koMainWindow.cc b/editors/koffice-kde3/files/patch-lib-kofficecore-koMainWindow.cc deleted file mode 100644 index d11c803fe245..000000000000 --- a/editors/koffice-kde3/files/patch-lib-kofficecore-koMainWindow.cc +++ /dev/null @@ -1,38 +0,0 @@ ---- ./lib/kofficecore/koMainWindow.cc.orig Sat Aug 31 07:13:56 2002 -+++ ./lib/kofficecore/koMainWindow.cc Sun Nov 17 06:33:37 2002 -@@ -179,7 +179,7 @@ - d->m_manager->setSelectionPolicy( KParts::PartManager::TriState ); - d->m_manager->setAllowNestedParts( true ); - d->m_manager->setIgnoreScrollBars( true ); --#if KDE_VERSION > 305 -+#if KDE_VERSION > 306 - d->m_manager->setActivationButtonMask( Qt::LeftButton | Qt::MidButton ); - #endif - -@@ -1115,7 +1115,7 @@ - QApplication::sendEvent( d->m_activeView, &ev ); - - // As of KDE-3.1, the plugins are child XMLGUI objects of the part --#if KDE_VERSION < 305 -+#if KDE_VERSION < 306 - QPtrList<KParts::Plugin> plugins = KParts::Plugin::pluginObjects( d->m_activeView ); - KParts::Plugin *plugin = plugins.last(); - while ( plugin ) -@@ -1133,7 +1133,7 @@ - - if ( !d->bMainWindowGUIBuilt ) - { --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - // Load mainwindow plugins - KParts::Plugin::loadPlugins( this, this, instance(), true ); - #endif -@@ -1149,7 +1149,7 @@ - factory->addClient( d->m_activeView ); - - // As of KDE-3.1, the plugins are child XMLGUI objects of the part --#if KDE_VERSION < 305 -+#if KDE_VERSION < 306 - QPtrList<KParts::Plugin> plugins = KParts::Plugin::pluginObjects( d->m_activeView ); - QPtrListIterator<KParts::Plugin> pIt( plugins ); - for (; pIt.current(); ++pIt ) diff --git a/editors/koffice-kde3/files/patch-lib-kotext-koParagDia.cc b/editors/koffice-kde3/files/patch-lib-kotext-koParagDia.cc deleted file mode 100644 index 96e6f7bc38d9..000000000000 --- a/editors/koffice-kde3/files/patch-lib-kotext-koParagDia.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- ./lib/kotext/koParagDia.cc.orig Sun Sep 1 14:09:03 2002 -+++ ./lib/kotext/koParagDia.cc Sun Nov 17 06:33:53 2002 -@@ -1132,7 +1132,7 @@ - grid->addWidget( lColor, 4, 0 ); - - bColor = new KColorButton( black, --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - black, - #endif - this ); -@@ -1955,7 +1955,7 @@ - QLabel *lcolor = new QLabel( i18n( "Color:" ), shadow ); - grid2->addWidget(lcolor,0,0); - color = new KColorButton( black, --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - black, - #endif - shadow ); diff --git a/editors/koffice-kde3/pkg-plist b/editors/koffice-kde3/pkg-plist index 719d6cb03e93..c556aea1b068 100644 --- a/editors/koffice-kde3/pkg-plist +++ b/editors/koffice-kde3/pkg-plist @@ -3,6 +3,7 @@ bin/kchart bin/kformula bin/kivio bin/koconverter +bin/kontour bin/koscript bin/koshell bin/kprconverter.pl @@ -167,6 +168,8 @@ lib/kde3/libkformulapart.la lib/kde3/libkformulapart.so lib/kde3/libkiviopart.la lib/kde3/libkiviopart.so +lib/kde3/libkontourpart.la +lib/kde3/libkontourpart.so lib/kde3/libkontourrtfexport.la lib/kde3/libkontourrtfexport.so lib/kde3/libkounavailpart.la @@ -229,6 +232,8 @@ lib/kformulamain.la lib/kformulamain.so lib/kivio.la lib/kivio.so +lib/kontour.la +lib/kontour.so lib/koshell.la lib/koshell.so lib/kpresenter.la @@ -286,12 +291,12 @@ lib/libkwmf.so.2 lib/libkwordexportfilters.la lib/libkwordexportfilters.so lib/libkwordexportfilters.so.1 -lib/straight_connector.ksp share/applnk/Office/KThesaurus.desktop share/applnk/Office/karbon.desktop share/applnk/Office/kchart.desktop share/applnk/Office/kformula.desktop share/applnk/Office/kivio.desktop +share/applnk/Office/kontour.desktop share/applnk/Office/koshell.desktop share/applnk/Office/kpresenter.desktop share/applnk/Office/kspread.desktop @@ -412,6 +417,7 @@ share/apps/kformula/symbol.font share/apps/kformula/unicode.tbl share/apps/kivio/autoloadStencils/Text.sml share/apps/kivio/autoloadStencils/Text.xpm +share/apps/kivio/autoloadStencils/straight_connector.ksp share/apps/kivio/autoloadStencils/straight_connector.xpm share/apps/kivio/icons/hicolor/16x16/actions/add_stencil.xpm share/apps/kivio/icons/hicolor/16x16/actions/bring_stencil_to_front.xpm @@ -684,7 +690,78 @@ share/apps/koffice/pics/koKoolBarUp.png share/apps/koffice/pics/koRulerFirst.png share/apps/koffice/pics/koRulerLeft.png share/apps/koffice/pics/koffice-logo.png +share/apps/kontour/icons/hicolor/16x16/actions/abottom.png +share/apps/kontour/icons/hicolor/16x16/actions/ahcenter.png +share/apps/kontour/icons/hicolor/16x16/actions/aleft.png +share/apps/kontour/icons/hicolor/16x16/actions/aright.png +share/apps/kontour/icons/hicolor/16x16/actions/atop.png +share/apps/kontour/icons/hicolor/16x16/actions/avcenter.png +share/apps/kontour/icons/hicolor/16x16/actions/beziertool.png +share/apps/kontour/icons/hicolor/16x16/actions/cap_butt.png +share/apps/kontour/icons/hicolor/16x16/actions/cap_round.png +share/apps/kontour/icons/hicolor/16x16/actions/cap_square.png +share/apps/kontour/icons/hicolor/16x16/actions/dbottom.png +share/apps/kontour/icons/hicolor/16x16/actions/deleteNode.png +share/apps/kontour/icons/hicolor/16x16/actions/deletelayer.png +share/apps/kontour/icons/hicolor/16x16/actions/dhcenter.png +share/apps/kontour/icons/hicolor/16x16/actions/dhdist.png +share/apps/kontour/icons/hicolor/16x16/actions/dleft.png +share/apps/kontour/icons/hicolor/16x16/actions/dright.png +share/apps/kontour/icons/hicolor/16x16/actions/dtop.png +share/apps/kontour/icons/hicolor/16x16/actions/dvcenter.png +share/apps/kontour/icons/hicolor/16x16/actions/dvdist.png +share/apps/kontour/icons/hicolor/16x16/actions/ellipse1.png +share/apps/kontour/icons/hicolor/16x16/actions/ellipse2.png +share/apps/kontour/icons/hicolor/16x16/actions/ellipse3.png +share/apps/kontour/icons/hicolor/16x16/actions/ellipsetool.png +share/apps/kontour/icons/hicolor/16x16/actions/eye.png +share/apps/kontour/icons/hicolor/16x16/actions/freehandtool.png +share/apps/kontour/icons/hicolor/16x16/actions/group.png +share/apps/kontour/icons/hicolor/16x16/actions/hmirror.png +share/apps/kontour/icons/hicolor/16x16/actions/insertclipart.png +share/apps/kontour/icons/hicolor/16x16/actions/item_add.png +share/apps/kontour/icons/hicolor/16x16/actions/item_remove.png +share/apps/kontour/icons/hicolor/16x16/actions/item_rename.png +share/apps/kontour/icons/hicolor/16x16/actions/joinNodes.png +share/apps/kontour/icons/hicolor/16x16/actions/join_bevel.png +share/apps/kontour/icons/hicolor/16x16/actions/join_miter.png +share/apps/kontour/icons/hicolor/16x16/actions/join_round.png +share/apps/kontour/icons/hicolor/16x16/actions/linetool.png +share/apps/kontour/icons/hicolor/16x16/actions/lowerlayer.png +share/apps/kontour/icons/hicolor/16x16/actions/moveNode.png +share/apps/kontour/icons/hicolor/16x16/actions/newNode.png +share/apps/kontour/icons/hicolor/16x16/actions/newlayer.png +share/apps/kontour/icons/hicolor/16x16/actions/pointtool.png +share/apps/kontour/icons/hicolor/16x16/actions/polygontool.png +share/apps/kontour/icons/hicolor/16x16/actions/raiselayer.png +share/apps/kontour/icons/hicolor/16x16/actions/recttool.png +share/apps/kontour/icons/hicolor/16x16/actions/snap_to_grid.png +share/apps/kontour/icons/hicolor/16x16/actions/split.png +share/apps/kontour/icons/hicolor/16x16/actions/tcenteralign.png +share/apps/kontour/icons/hicolor/16x16/actions/texttool.png +share/apps/kontour/icons/hicolor/16x16/actions/tleftalign.png +share/apps/kontour/icons/hicolor/16x16/actions/trightalign.png +share/apps/kontour/icons/hicolor/16x16/actions/ungroup.png +share/apps/kontour/icons/hicolor/16x16/actions/vmirror.png +share/apps/kontour/icons/hicolor/16x16/apps/kontour.png +share/apps/kontour/icons/hicolor/22x22/actions/selecttool.png +share/apps/kontour/icons/hicolor/32x32/actions/rect1.png +share/apps/kontour/icons/hicolor/32x32/actions/rect2.png +share/apps/kontour/icons/hicolor/32x32/actions/rect3.png +share/apps/kontour/icons/hicolor/32x32/actions/rect4.png +share/apps/kontour/icons/hicolor/32x32/actions/rect5.png +share/apps/kontour/icons/hicolor/32x32/actions/rect6.png +share/apps/kontour/icons/hicolor/32x32/actions/rect7.png +share/apps/kontour/icons/hicolor/32x32/actions/rect8.png +share/apps/kontour/icons/hicolor/32x32/apps/kontour.png +share/apps/kontour/icons/hicolor/48x48/apps/kontour.png +share/apps/kontour/kontour.rc +share/apps/kontour/kontour_readonly.rc share/apps/kontour/kpartplugins/scan-kontour.rc +share/apps/kontour/templates/Simple/.directory +share/apps/kontour/templates/Simple/.icon/Plain.png +share/apps/kontour/templates/Simple/.source/Plain.kon +share/apps/kontour/templates/Simple/Plain.desktop share/apps/kpresenter/autoforms/.autoforms share/apps/kpresenter/autoforms/Arrows/.directory share/apps/kpresenter/autoforms/Arrows/.icon/ArrowDown.png @@ -1632,6 +1709,7 @@ share/icons/hicolor/16x16/apps/karbon.png share/icons/hicolor/16x16/apps/kchart.png share/icons/hicolor/16x16/apps/kformula.png share/icons/hicolor/16x16/apps/kivio.png +share/icons/hicolor/16x16/apps/kontour.png share/icons/hicolor/16x16/apps/kpresenter.png share/icons/hicolor/16x16/apps/kspread.png share/icons/hicolor/16x16/apps/kudesigner.png @@ -1679,6 +1757,7 @@ share/icons/hicolor/32x32/apps/karbon.png share/icons/hicolor/32x32/apps/kchart.png share/icons/hicolor/32x32/apps/kformula.png share/icons/hicolor/32x32/apps/kivio.png +share/icons/hicolor/32x32/apps/kontour.png share/icons/hicolor/32x32/apps/kpresenter.png share/icons/hicolor/32x32/apps/kspread.png share/icons/hicolor/32x32/apps/kudesigner.png @@ -1689,6 +1768,7 @@ share/icons/hicolor/48x48/apps/karbon.png share/icons/hicolor/48x48/apps/kchart.png share/icons/hicolor/48x48/apps/kformula.png share/icons/hicolor/48x48/apps/kivio.png +share/icons/hicolor/48x48/apps/kontour.png share/icons/hicolor/48x48/apps/kpresenter.png share/icons/hicolor/48x48/apps/kspread.png share/icons/hicolor/48x48/apps/kugar.png @@ -1785,13 +1865,10 @@ share/templates/Illustration.desktop share/templates/Presentation.desktop share/templates/SpreadSheet.desktop share/templates/TextDocument.desktop -@comment empty dirs @exec /bin/mkdir -p %D/share/doc/HTML/en/koffice-apidocs/lib/html -@comment directories +@unexec /bin/rmdir %D/share/doc/HTML/en/koffice-apidocs/lib/html || true @dirrm share/templates/.source @dirrm share/templates -@dirrm share/servicetypes -@dirrm share/services @dirrm share/mimelnk/application @dirrm share/mimelnk @dirrm share/icons/locolor/32x32/mimetypes @@ -1820,14 +1897,12 @@ share/templates/TextDocument.desktop @dirrm share/icons/hicolor/16x16/actions @dirrm share/icons/hicolor/16x16 @dirrm share/icons/hicolor -@dirrm share/icons @dirrm share/doc/HTML/en/thesaurus @dirrm share/doc/HTML/en/kword @dirrm share/doc/HTML/en/kugar @dirrm share/doc/HTML/en/kspread @dirrm share/doc/HTML/en/kpresenter @dirrm share/doc/HTML/en/koshell -@dirrm share/doc/HTML/en/koffice-apidocs/lib/html @dirrm share/doc/HTML/en/koffice-apidocs/lib @dirrm share/doc/HTML/en/koffice-apidocs @dirrm share/doc/HTML/en/koffice @@ -1835,7 +1910,6 @@ share/templates/TextDocument.desktop @dirrm share/doc/HTML/en/kchart @dirrm share/doc/HTML/en @dirrm share/doc/HTML -@dirrm share/doc @dirrm share/apps/xsltfilter/export/kword/xslfo @dirrm share/apps/xsltfilter/export/kword @dirrm share/apps/xsltfilter/export @@ -1916,7 +1990,23 @@ share/templates/TextDocument.desktop @dirrm share/apps/kpresenter/autoforms/Arrows @dirrm share/apps/kpresenter/autoforms @dirrm share/apps/kpresenter +@dirrm share/apps/kontour/templates/Simple/.source +@dirrm share/apps/kontour/templates/Simple/.icon +@dirrm share/apps/kontour/templates/Simple +@dirrm share/apps/kontour/templates @dirrm share/apps/kontour/kpartplugins +@dirrm share/apps/kontour/icons/hicolor/48x48/apps +@dirrm share/apps/kontour/icons/hicolor/48x48 +@dirrm share/apps/kontour/icons/hicolor/32x32/apps +@dirrm share/apps/kontour/icons/hicolor/32x32/actions +@dirrm share/apps/kontour/icons/hicolor/32x32 +@dirrm share/apps/kontour/icons/hicolor/22x22/actions +@dirrm share/apps/kontour/icons/hicolor/22x22 +@dirrm share/apps/kontour/icons/hicolor/16x16/apps +@dirrm share/apps/kontour/icons/hicolor/16x16/actions +@dirrm share/apps/kontour/icons/hicolor/16x16 +@dirrm share/apps/kontour/icons/hicolor +@dirrm share/apps/kontour/icons @dirrm share/apps/kontour @dirrm share/apps/koffice/pics @dirrm share/apps/koffice/icons/hicolor/48x48/apps @@ -1972,7 +2062,4 @@ share/templates/TextDocument.desktop @dirrm share/apps/karbon/icons/hicolor @dirrm share/apps/karbon/icons @dirrm share/apps/karbon -@dirrm share/apps @dirrm share/applnk/Office -@dirrm share/applnk -@dirrm lib/kde3 diff --git a/editors/koffice-kde4/Makefile b/editors/koffice-kde4/Makefile index 72cd699d5388..246b244eacbd 100644 --- a/editors/koffice-kde4/Makefile +++ b/editors/koffice-kde4/Makefile @@ -1,3 +1,4 @@ +# -*-mode: makefile-*- # New ports collection makefile for: koffice # Date created: Sun May 14 2000 16:33:15 # Whom: Will Andrews <will@FreeBSD.org> @@ -6,33 +7,29 @@ # PORTNAME= koffice -PORTVERSION= 1.2 +PORTVERSION= 1.2.1 PORTEPOCH= 1 CATEGORIES= editors kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTNAME}-${PORTVERSION}/src -DIST_SUBDIR= KDE +DIST_SUBDIR= KDE/koffice MAINTAINER= kde@FreeBSD.org -BUILD_DEPENDS= autoconf:${PORTSDIR}/devel/autoconf \ - automake:${PORTSDIR}/devel/automake LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv \ art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 -_NO_KDE_PATCHUP=yes -USE_KDELIBS_VER=3 -GNU_CONFIGURE= yes -USE_PYTHON= yes -USE_BZIP2= yes -INSTALLS_SHLIB= yes -USE_GMAKE= yes +USE_KDELIBS_VER= 3 +PREFIX= ${KDE_PREFIX} -CONFIGURE_ENV+= DO_NOT_COMPILE=kontour # KDE calls it "badly broken" +USE_BZIP2= yes +USE_GMAKE= yes +USE_PYTHON= yes +GNU_CONFIGURE= yes -.include "${.CURDIR}/../../x11/kde3/Makefile.kde" +INSTALLS_SHLIB= yes +LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 -pre-configure: - cd ${WRKSRC} && ${GMAKE} -f Makefile.cvs +.include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.mk> diff --git a/editors/koffice-kde4/distinfo b/editors/koffice-kde4/distinfo index 07883502da2d..6988c28cdb50 100644 --- a/editors/koffice-kde4/distinfo +++ b/editors/koffice-kde4/distinfo @@ -1 +1 @@ -MD5 (KDE/koffice-1.2.tar.bz2) = 34cb13104bc1d4f0916b0dda6dec7ee0 +MD5 (KDE/koffice/koffice-1.2.1.tar.bz2) = 6a73aa72b094ca7b7377f74a508e804e diff --git a/editors/koffice-kde4/files/patch-karbon-karbon_view.cc b/editors/koffice-kde4/files/patch-karbon-karbon_view.cc deleted file mode 100644 index 5209dc9a610f..000000000000 --- a/editors/koffice-kde4/files/patch-karbon-karbon_view.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- ./karbon/karbon_view.cc.orig Sat Aug 31 07:12:55 2002 -+++ ./karbon/karbon_view.cc Sun Nov 17 06:31:40 2002 -@@ -1086,7 +1086,7 @@ - m_joinStyle->addState( new QPixmap( DesktopIcon( "join_miter" ) ) ); - m_joinStyle->addState( new QPixmap( DesktopIcon( "join_round" ) ) ); - m_joinStyle->setState( 0 ); --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - new KWidgetAction( m_joinStyle, i18n("Set Join Style"), 0, this, SLOT( slotJoinStyleClicked() ), actionCollection(), "setJoinStyle" ); - #endif - connect( m_joinStyle, SIGNAL(clicked()), this, SLOT(slotJoinStyleClicked()) ); -@@ -1097,7 +1097,7 @@ - m_capStyle->addState( new QPixmap( DesktopIcon( "cap_square" ) ) ); - m_capStyle->addState( new QPixmap( DesktopIcon( "cap_round" ) ) ); - m_capStyle->setState( 0 ); --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - new KWidgetAction( m_capStyle, i18n("Set Cap Style"), 0, this, SLOT( slotCapStyleClicked() ), actionCollection(), "setCapStyle" ); - #endif - connect( m_capStyle, SIGNAL(clicked()), this, SLOT(slotCapStyleClicked()) ); -@@ -1109,7 +1109,7 @@ - this, SLOT( selectionChanged() ) ); - connect( m_strokeFillPreview, SIGNAL( fillChanged( const VFill & ) ), - this, SLOT( selectionChanged() ) ); --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - //new KWidgetAction( m_strokeFillPreview, i18n(""), 0, this, SLOT( ), actionCollection(), "preview" ); - #endif - mainWindow()->toolBar( "Toolbox" )->insertWidget( 10, 30, m_strokeFillPreview ); diff --git a/editors/koffice-kde4/files/patch-kpresenter-kpresenter_dlg_config.cc b/editors/koffice-kde4/files/patch-kpresenter-kpresenter_dlg_config.cc deleted file mode 100644 index 012854cf57d2..000000000000 --- a/editors/koffice-kde4/files/patch-kpresenter-kpresenter_dlg_config.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- ./kpresenter/kpresenter_dlg_config.cc.orig Sat Aug 31 07:13:35 2002 -+++ ./kpresenter/kpresenter_dlg_config.cc Sun Nov 17 06:30:28 2002 -@@ -305,7 +305,7 @@ - grid1->addWidget( lab, 0, 0 ); - - bgColor = new KColorButton( oldBgColor, --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - oldBgColor, - #endif - tmpQGroupBox ); -@@ -318,7 +318,7 @@ - grid1->addWidget( lab, 2, 0 ); - - gridColor = new KColorButton( oldGridColor, --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - oldGridColor, - #endif - tmpQGroupBox ); diff --git a/editors/koffice-kde4/files/patch-kpresenter-kpresenter_view.cc b/editors/koffice-kde4/files/patch-kpresenter-kpresenter_view.cc deleted file mode 100644 index bb78c80bfee4..000000000000 --- a/editors/koffice-kde4/files/patch-kpresenter-kpresenter_view.cc +++ /dev/null @@ -1,74 +0,0 @@ ---- ./kpresenter/kpresenter_view.cc.orig Sat Aug 31 07:13:36 2002 -+++ ./kpresenter/kpresenter_view.cc Sun Nov 17 06:31:18 2002 -@@ -3224,7 +3224,7 @@ - actionCollection(), "format_style" ); - connect( actionFormatStyle, SIGNAL( activated( int ) ), - this, SLOT( textStyleSelected( int ) ) ); --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - actionFormatStyle->setRemoveAmpersandsInCombo( true ); - #endif - updateStyleList(); -@@ -3972,7 +3972,7 @@ - { - QColor c = kPresenterDoc()->presPen().color(); - if ( KColorDialog::getColor( c --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - , Qt::red - #endif - ) ) { -@@ -5116,7 +5116,7 @@ - { - if (m_spell.kspell) return; // Already in progress - m_spell.macroCmdSpellCheck=0L; --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - m_spell.replaceAll.clear(); - #endif - -@@ -5173,7 +5173,7 @@ - if(m_pKPresenterDoc->getKSpellConfig()) - { - m_pKPresenterDoc->getKSpellConfig()->setIgnoreList(m_pKPresenterDoc->spellListIgnoreAll()); --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - m_pKPresenterDoc->getKSpellConfig()->setReplaceAllList(m_spell.replaceAll); - #endif - -@@ -5194,7 +5194,7 @@ - this, SLOT( spellCheckerDone( const QString & ) ) ); - QObject::connect( m_spell.kspell, SIGNAL( ignoreall (const QString & ) ), - this, SLOT( spellCheckerIgnoreAll( const QString & ) ) ); --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - QObject::connect( m_spell.kspell, SIGNAL( replaceall( const QString &, const QString & )), this, SLOT( spellCheckerReplaceAll( const QString &, const QString & ))); - #endif - -@@ -5323,7 +5323,7 @@ - { - m_pKPresenterDoc->setReadWrite(true); - m_spell.textObject.clear(); --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - m_spell.replaceAll.clear(); - #endif - -@@ -5362,7 +5362,7 @@ - m_spell.macroCmdSpellCheck=0L; - - m_pKPresenterDoc->setReadWrite(true); --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - m_spell.replaceAll.clear(); - #endif - -@@ -6273,7 +6273,7 @@ - // to individual actions - QStringList lstWithAccels; - // Generate unique accelerators for the menu items --#if KDE_VERSION >= 305 // but only if the '&' will be removed from the combobox -+#if KDE_VERSION >= 306 // but only if the '&' will be removed from the combobox - KAccelGen::generate( lst, lstWithAccels ); - #else - lstWithAccels = lst; diff --git a/editors/koffice-kde4/files/patch-kspread-kspread_dlg_preference.cc b/editors/koffice-kde4/files/patch-kspread-kspread_dlg_preference.cc deleted file mode 100644 index c3398be9f749..000000000000 --- a/editors/koffice-kde4/files/patch-kspread-kspread_dlg_preference.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- ./kspread/kspread_dlg_preference.cc.orig Mon Jul 29 09:24:21 2002 -+++ ./kspread/kspread_dlg_preference.cc Sun Nov 17 06:31:59 2002 -@@ -719,7 +719,7 @@ - QLabel *label = new QLabel(i18n("&Grid color:"), tmpQGroupBox,"label20" ); - - gridColor = new KColorButton( _gridColor, --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - Qt::lightGray, - #endif - tmpQGroupBox ); -@@ -736,7 +736,7 @@ - QLabel * label2 = new QLabel( i18n("&Page borders:"), tmpQGroupBox, "label21" ); - - pageBorderColor = new KColorButton( _pbColor, --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - Qt::red, - #endif - tmpQGroupBox ); diff --git a/editors/koffice-kde4/files/patch-kspread-kspread_view.cc b/editors/koffice-kde4/files/patch-kspread-kspread_view.cc deleted file mode 100644 index 6b481feb2b45..000000000000 --- a/editors/koffice-kde4/files/patch-kspread-kspread_view.cc +++ /dev/null @@ -1,47 +0,0 @@ ---- ./kspread/kspread_view.cc.orig Sat Aug 31 07:13:44 2002 -+++ ./kspread/kspread_view.cc Sun Nov 17 06:32:41 2002 -@@ -1426,7 +1426,7 @@ - if(m_pDoc->getKSpellConfig()) - { - m_pDoc->getKSpellConfig()->setIgnoreList(m_pDoc->spellListIgnoreAll()); --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - m_pDoc->getKSpellConfig()->setReplaceAllList(m_spell.replaceAll); - #endif - -@@ -1457,7 +1457,7 @@ - QObject::connect( m_spell.kspell, SIGNAL( ignoreall (const QString & ) ), - this, SLOT( spellCheckerIgnoreAll( const QString & ) ) ); - --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - QObject::connect( m_spell.kspell, SIGNAL( replaceall( const QString & , const QString & )), this, SLOT( spellCheckerReplaceAll( const QString & , const QString & ))); - #endif - -@@ -1567,7 +1567,7 @@ - m_spell.firstSpellTable = 0L; - m_spell.currentSpellTable = 0L; - m_spell.currentCell = 0L; --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - m_spell.replaceAll.clear(); - #endif - -@@ -1713,7 +1713,7 @@ - } - } - } --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - m_spell.replaceAll.clear(); - #endif - -@@ -1733,7 +1733,7 @@ - m_spell.kspell->cleanUp(); - delete m_spell.kspell; - m_spell.kspell = 0L; --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - m_spell.replaceAll.clear(); - #endif - diff --git a/editors/koffice-kde4/files/patch-kword-kwview.cc b/editors/koffice-kde4/files/patch-kword-kwview.cc deleted file mode 100644 index ba97326d9e00..000000000000 --- a/editors/koffice-kde4/files/patch-kword-kwview.cc +++ /dev/null @@ -1,56 +0,0 @@ ---- ./kword/kwview.cc.orig Sat Aug 31 07:13:52 2002 -+++ ./kword/kwview.cc Sun Nov 17 06:33:20 2002 -@@ -1043,7 +1043,7 @@ - // Necessary for the actions that are not plugged anywhere - // Deprecated with KDE-3.1. - // Note entirely sure it's necessary for 3.0, please test and report. --#if KDE_VERSION < 305 -+#if KDE_VERSION < 306 - KAccel * accel = new KAccel( this ); - actNbsp->plugAccel( accel ); - actSoftHyphen->plugAccel( accel ); -@@ -1928,7 +1928,7 @@ - // to individual actions - QStringList lstWithAccels; - // Generate unique accelerators for the menu items --#if KDE_VERSION >= 305 // but only if the '&' will be removed from the combobox -+#if KDE_VERSION >= 306 // but only if the '&' will be removed from the combobox - KAccelGen::generate( lst, lstWithAccels ); - #else - lstWithAccels = lst; -@@ -1998,7 +1998,7 @@ - // to individual actions - QStringList lstWithAccels; - // Generate unique accelerators for the menu items --#if KDE_VERSION >= 305 // but only if the '&' will be removed from the combobox -+#if KDE_VERSION >= 306 // but only if the '&' will be removed from the combobox - KAccelGen::generate( lst, lstWithAccels ); - #else - lstWithAccels = lst; -@@ -2073,7 +2073,7 @@ - // to individual actions - QStringList lstWithAccels; - // Generate unique accelerators for the menu items --#if KDE_VERSION >= 305 // but only if the '&' will be removed from the combobox -+#if KDE_VERSION >= 306 // but only if the '&' will be removed from the combobox - KAccelGen::generate( lst, lstWithAccels ); - #else - lstWithAccels = lst; -@@ -4979,7 +4979,7 @@ - if(m_doc->getKSpellConfig()) - { - m_doc->getKSpellConfig()->setIgnoreList(m_doc->spellListIgnoreAll()); --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - m_doc->getKSpellConfig()->setReplaceAllList(m_spell.replaceAll); - #endif - } -@@ -5000,7 +5000,7 @@ - QObject::connect( m_spell.kspell, SIGNAL( ignoreall (const QString & ) ), - this, SLOT( spellCheckerIgnoreAll( const QString & ) ) ); - --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - QObject::connect( m_spell.kspell, SIGNAL( replaceall( const QString & , const QString & )), this, SLOT( spellCheckerReplaceAll( const QString & , const QString & ))); - #endif - diff --git a/editors/koffice-kde4/files/patch-lib-kofficecore-koMainWindow.cc b/editors/koffice-kde4/files/patch-lib-kofficecore-koMainWindow.cc deleted file mode 100644 index d11c803fe245..000000000000 --- a/editors/koffice-kde4/files/patch-lib-kofficecore-koMainWindow.cc +++ /dev/null @@ -1,38 +0,0 @@ ---- ./lib/kofficecore/koMainWindow.cc.orig Sat Aug 31 07:13:56 2002 -+++ ./lib/kofficecore/koMainWindow.cc Sun Nov 17 06:33:37 2002 -@@ -179,7 +179,7 @@ - d->m_manager->setSelectionPolicy( KParts::PartManager::TriState ); - d->m_manager->setAllowNestedParts( true ); - d->m_manager->setIgnoreScrollBars( true ); --#if KDE_VERSION > 305 -+#if KDE_VERSION > 306 - d->m_manager->setActivationButtonMask( Qt::LeftButton | Qt::MidButton ); - #endif - -@@ -1115,7 +1115,7 @@ - QApplication::sendEvent( d->m_activeView, &ev ); - - // As of KDE-3.1, the plugins are child XMLGUI objects of the part --#if KDE_VERSION < 305 -+#if KDE_VERSION < 306 - QPtrList<KParts::Plugin> plugins = KParts::Plugin::pluginObjects( d->m_activeView ); - KParts::Plugin *plugin = plugins.last(); - while ( plugin ) -@@ -1133,7 +1133,7 @@ - - if ( !d->bMainWindowGUIBuilt ) - { --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - // Load mainwindow plugins - KParts::Plugin::loadPlugins( this, this, instance(), true ); - #endif -@@ -1149,7 +1149,7 @@ - factory->addClient( d->m_activeView ); - - // As of KDE-3.1, the plugins are child XMLGUI objects of the part --#if KDE_VERSION < 305 -+#if KDE_VERSION < 306 - QPtrList<KParts::Plugin> plugins = KParts::Plugin::pluginObjects( d->m_activeView ); - QPtrListIterator<KParts::Plugin> pIt( plugins ); - for (; pIt.current(); ++pIt ) diff --git a/editors/koffice-kde4/files/patch-lib-kotext-koParagDia.cc b/editors/koffice-kde4/files/patch-lib-kotext-koParagDia.cc deleted file mode 100644 index 96e6f7bc38d9..000000000000 --- a/editors/koffice-kde4/files/patch-lib-kotext-koParagDia.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- ./lib/kotext/koParagDia.cc.orig Sun Sep 1 14:09:03 2002 -+++ ./lib/kotext/koParagDia.cc Sun Nov 17 06:33:53 2002 -@@ -1132,7 +1132,7 @@ - grid->addWidget( lColor, 4, 0 ); - - bColor = new KColorButton( black, --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - black, - #endif - this ); -@@ -1955,7 +1955,7 @@ - QLabel *lcolor = new QLabel( i18n( "Color:" ), shadow ); - grid2->addWidget(lcolor,0,0); - color = new KColorButton( black, --#if KDE_VERSION >= 305 -+#if KDE_VERSION >= 306 - black, - #endif - shadow ); diff --git a/editors/koffice-kde4/pkg-plist b/editors/koffice-kde4/pkg-plist index 719d6cb03e93..c556aea1b068 100644 --- a/editors/koffice-kde4/pkg-plist +++ b/editors/koffice-kde4/pkg-plist @@ -3,6 +3,7 @@ bin/kchart bin/kformula bin/kivio bin/koconverter +bin/kontour bin/koscript bin/koshell bin/kprconverter.pl @@ -167,6 +168,8 @@ lib/kde3/libkformulapart.la lib/kde3/libkformulapart.so lib/kde3/libkiviopart.la lib/kde3/libkiviopart.so +lib/kde3/libkontourpart.la +lib/kde3/libkontourpart.so lib/kde3/libkontourrtfexport.la lib/kde3/libkontourrtfexport.so lib/kde3/libkounavailpart.la @@ -229,6 +232,8 @@ lib/kformulamain.la lib/kformulamain.so lib/kivio.la lib/kivio.so +lib/kontour.la +lib/kontour.so lib/koshell.la lib/koshell.so lib/kpresenter.la @@ -286,12 +291,12 @@ lib/libkwmf.so.2 lib/libkwordexportfilters.la lib/libkwordexportfilters.so lib/libkwordexportfilters.so.1 -lib/straight_connector.ksp share/applnk/Office/KThesaurus.desktop share/applnk/Office/karbon.desktop share/applnk/Office/kchart.desktop share/applnk/Office/kformula.desktop share/applnk/Office/kivio.desktop +share/applnk/Office/kontour.desktop share/applnk/Office/koshell.desktop share/applnk/Office/kpresenter.desktop share/applnk/Office/kspread.desktop @@ -412,6 +417,7 @@ share/apps/kformula/symbol.font share/apps/kformula/unicode.tbl share/apps/kivio/autoloadStencils/Text.sml share/apps/kivio/autoloadStencils/Text.xpm +share/apps/kivio/autoloadStencils/straight_connector.ksp share/apps/kivio/autoloadStencils/straight_connector.xpm share/apps/kivio/icons/hicolor/16x16/actions/add_stencil.xpm share/apps/kivio/icons/hicolor/16x16/actions/bring_stencil_to_front.xpm @@ -684,7 +690,78 @@ share/apps/koffice/pics/koKoolBarUp.png share/apps/koffice/pics/koRulerFirst.png share/apps/koffice/pics/koRulerLeft.png share/apps/koffice/pics/koffice-logo.png +share/apps/kontour/icons/hicolor/16x16/actions/abottom.png +share/apps/kontour/icons/hicolor/16x16/actions/ahcenter.png +share/apps/kontour/icons/hicolor/16x16/actions/aleft.png +share/apps/kontour/icons/hicolor/16x16/actions/aright.png +share/apps/kontour/icons/hicolor/16x16/actions/atop.png +share/apps/kontour/icons/hicolor/16x16/actions/avcenter.png +share/apps/kontour/icons/hicolor/16x16/actions/beziertool.png +share/apps/kontour/icons/hicolor/16x16/actions/cap_butt.png +share/apps/kontour/icons/hicolor/16x16/actions/cap_round.png +share/apps/kontour/icons/hicolor/16x16/actions/cap_square.png +share/apps/kontour/icons/hicolor/16x16/actions/dbottom.png +share/apps/kontour/icons/hicolor/16x16/actions/deleteNode.png +share/apps/kontour/icons/hicolor/16x16/actions/deletelayer.png +share/apps/kontour/icons/hicolor/16x16/actions/dhcenter.png +share/apps/kontour/icons/hicolor/16x16/actions/dhdist.png +share/apps/kontour/icons/hicolor/16x16/actions/dleft.png +share/apps/kontour/icons/hicolor/16x16/actions/dright.png +share/apps/kontour/icons/hicolor/16x16/actions/dtop.png +share/apps/kontour/icons/hicolor/16x16/actions/dvcenter.png +share/apps/kontour/icons/hicolor/16x16/actions/dvdist.png +share/apps/kontour/icons/hicolor/16x16/actions/ellipse1.png +share/apps/kontour/icons/hicolor/16x16/actions/ellipse2.png +share/apps/kontour/icons/hicolor/16x16/actions/ellipse3.png +share/apps/kontour/icons/hicolor/16x16/actions/ellipsetool.png +share/apps/kontour/icons/hicolor/16x16/actions/eye.png +share/apps/kontour/icons/hicolor/16x16/actions/freehandtool.png +share/apps/kontour/icons/hicolor/16x16/actions/group.png +share/apps/kontour/icons/hicolor/16x16/actions/hmirror.png +share/apps/kontour/icons/hicolor/16x16/actions/insertclipart.png +share/apps/kontour/icons/hicolor/16x16/actions/item_add.png +share/apps/kontour/icons/hicolor/16x16/actions/item_remove.png +share/apps/kontour/icons/hicolor/16x16/actions/item_rename.png +share/apps/kontour/icons/hicolor/16x16/actions/joinNodes.png +share/apps/kontour/icons/hicolor/16x16/actions/join_bevel.png +share/apps/kontour/icons/hicolor/16x16/actions/join_miter.png +share/apps/kontour/icons/hicolor/16x16/actions/join_round.png +share/apps/kontour/icons/hicolor/16x16/actions/linetool.png +share/apps/kontour/icons/hicolor/16x16/actions/lowerlayer.png +share/apps/kontour/icons/hicolor/16x16/actions/moveNode.png +share/apps/kontour/icons/hicolor/16x16/actions/newNode.png +share/apps/kontour/icons/hicolor/16x16/actions/newlayer.png +share/apps/kontour/icons/hicolor/16x16/actions/pointtool.png +share/apps/kontour/icons/hicolor/16x16/actions/polygontool.png +share/apps/kontour/icons/hicolor/16x16/actions/raiselayer.png +share/apps/kontour/icons/hicolor/16x16/actions/recttool.png +share/apps/kontour/icons/hicolor/16x16/actions/snap_to_grid.png +share/apps/kontour/icons/hicolor/16x16/actions/split.png +share/apps/kontour/icons/hicolor/16x16/actions/tcenteralign.png +share/apps/kontour/icons/hicolor/16x16/actions/texttool.png +share/apps/kontour/icons/hicolor/16x16/actions/tleftalign.png +share/apps/kontour/icons/hicolor/16x16/actions/trightalign.png +share/apps/kontour/icons/hicolor/16x16/actions/ungroup.png +share/apps/kontour/icons/hicolor/16x16/actions/vmirror.png +share/apps/kontour/icons/hicolor/16x16/apps/kontour.png +share/apps/kontour/icons/hicolor/22x22/actions/selecttool.png +share/apps/kontour/icons/hicolor/32x32/actions/rect1.png +share/apps/kontour/icons/hicolor/32x32/actions/rect2.png +share/apps/kontour/icons/hicolor/32x32/actions/rect3.png +share/apps/kontour/icons/hicolor/32x32/actions/rect4.png +share/apps/kontour/icons/hicolor/32x32/actions/rect5.png +share/apps/kontour/icons/hicolor/32x32/actions/rect6.png +share/apps/kontour/icons/hicolor/32x32/actions/rect7.png +share/apps/kontour/icons/hicolor/32x32/actions/rect8.png +share/apps/kontour/icons/hicolor/32x32/apps/kontour.png +share/apps/kontour/icons/hicolor/48x48/apps/kontour.png +share/apps/kontour/kontour.rc +share/apps/kontour/kontour_readonly.rc share/apps/kontour/kpartplugins/scan-kontour.rc +share/apps/kontour/templates/Simple/.directory +share/apps/kontour/templates/Simple/.icon/Plain.png +share/apps/kontour/templates/Simple/.source/Plain.kon +share/apps/kontour/templates/Simple/Plain.desktop share/apps/kpresenter/autoforms/.autoforms share/apps/kpresenter/autoforms/Arrows/.directory share/apps/kpresenter/autoforms/Arrows/.icon/ArrowDown.png @@ -1632,6 +1709,7 @@ share/icons/hicolor/16x16/apps/karbon.png share/icons/hicolor/16x16/apps/kchart.png share/icons/hicolor/16x16/apps/kformula.png share/icons/hicolor/16x16/apps/kivio.png +share/icons/hicolor/16x16/apps/kontour.png share/icons/hicolor/16x16/apps/kpresenter.png share/icons/hicolor/16x16/apps/kspread.png share/icons/hicolor/16x16/apps/kudesigner.png @@ -1679,6 +1757,7 @@ share/icons/hicolor/32x32/apps/karbon.png share/icons/hicolor/32x32/apps/kchart.png share/icons/hicolor/32x32/apps/kformula.png share/icons/hicolor/32x32/apps/kivio.png +share/icons/hicolor/32x32/apps/kontour.png share/icons/hicolor/32x32/apps/kpresenter.png share/icons/hicolor/32x32/apps/kspread.png share/icons/hicolor/32x32/apps/kudesigner.png @@ -1689,6 +1768,7 @@ share/icons/hicolor/48x48/apps/karbon.png share/icons/hicolor/48x48/apps/kchart.png share/icons/hicolor/48x48/apps/kformula.png share/icons/hicolor/48x48/apps/kivio.png +share/icons/hicolor/48x48/apps/kontour.png share/icons/hicolor/48x48/apps/kpresenter.png share/icons/hicolor/48x48/apps/kspread.png share/icons/hicolor/48x48/apps/kugar.png @@ -1785,13 +1865,10 @@ share/templates/Illustration.desktop share/templates/Presentation.desktop share/templates/SpreadSheet.desktop share/templates/TextDocument.desktop -@comment empty dirs @exec /bin/mkdir -p %D/share/doc/HTML/en/koffice-apidocs/lib/html -@comment directories +@unexec /bin/rmdir %D/share/doc/HTML/en/koffice-apidocs/lib/html || true @dirrm share/templates/.source @dirrm share/templates -@dirrm share/servicetypes -@dirrm share/services @dirrm share/mimelnk/application @dirrm share/mimelnk @dirrm share/icons/locolor/32x32/mimetypes @@ -1820,14 +1897,12 @@ share/templates/TextDocument.desktop @dirrm share/icons/hicolor/16x16/actions @dirrm share/icons/hicolor/16x16 @dirrm share/icons/hicolor -@dirrm share/icons @dirrm share/doc/HTML/en/thesaurus @dirrm share/doc/HTML/en/kword @dirrm share/doc/HTML/en/kugar @dirrm share/doc/HTML/en/kspread @dirrm share/doc/HTML/en/kpresenter @dirrm share/doc/HTML/en/koshell -@dirrm share/doc/HTML/en/koffice-apidocs/lib/html @dirrm share/doc/HTML/en/koffice-apidocs/lib @dirrm share/doc/HTML/en/koffice-apidocs @dirrm share/doc/HTML/en/koffice @@ -1835,7 +1910,6 @@ share/templates/TextDocument.desktop @dirrm share/doc/HTML/en/kchart @dirrm share/doc/HTML/en @dirrm share/doc/HTML -@dirrm share/doc @dirrm share/apps/xsltfilter/export/kword/xslfo @dirrm share/apps/xsltfilter/export/kword @dirrm share/apps/xsltfilter/export @@ -1916,7 +1990,23 @@ share/templates/TextDocument.desktop @dirrm share/apps/kpresenter/autoforms/Arrows @dirrm share/apps/kpresenter/autoforms @dirrm share/apps/kpresenter +@dirrm share/apps/kontour/templates/Simple/.source +@dirrm share/apps/kontour/templates/Simple/.icon +@dirrm share/apps/kontour/templates/Simple +@dirrm share/apps/kontour/templates @dirrm share/apps/kontour/kpartplugins +@dirrm share/apps/kontour/icons/hicolor/48x48/apps +@dirrm share/apps/kontour/icons/hicolor/48x48 +@dirrm share/apps/kontour/icons/hicolor/32x32/apps +@dirrm share/apps/kontour/icons/hicolor/32x32/actions +@dirrm share/apps/kontour/icons/hicolor/32x32 +@dirrm share/apps/kontour/icons/hicolor/22x22/actions +@dirrm share/apps/kontour/icons/hicolor/22x22 +@dirrm share/apps/kontour/icons/hicolor/16x16/apps +@dirrm share/apps/kontour/icons/hicolor/16x16/actions +@dirrm share/apps/kontour/icons/hicolor/16x16 +@dirrm share/apps/kontour/icons/hicolor +@dirrm share/apps/kontour/icons @dirrm share/apps/kontour @dirrm share/apps/koffice/pics @dirrm share/apps/koffice/icons/hicolor/48x48/apps @@ -1972,7 +2062,4 @@ share/templates/TextDocument.desktop @dirrm share/apps/karbon/icons/hicolor @dirrm share/apps/karbon/icons @dirrm share/apps/karbon -@dirrm share/apps @dirrm share/applnk/Office -@dirrm share/applnk -@dirrm lib/kde3 |