diff options
author | Michael Nottebrock <lofi@FreeBSD.org> | 2007-03-13 19:13:51 +0000 |
---|---|---|
committer | Michael Nottebrock <lofi@FreeBSD.org> | 2007-03-13 19:13:51 +0000 |
commit | a209c5b185423decb49344e360900c7bd7e43222 (patch) | |
tree | beea7a17a306cd21cbbf4ce8ce1eae64ec530cca /editors/calligra | |
parent | 2007-03-09 sysutils/diskusage: Unmainntaied, MASTER_SITES disappeared, WWW di... (diff) |
Update to KDE 3.5.6 / KOffice 1.6.2
Notes
Notes:
svn path=/head/; revision=187334
Diffstat (limited to 'editors/calligra')
-rw-r--r-- | editors/calligra/Makefile | 3 | ||||
-rw-r--r-- | editors/calligra/distinfo | 6 | ||||
-rw-r--r-- | editors/calligra/files/patch-kexi_examples-build_kexi_file.sh | 15 | ||||
-rw-r--r-- | editors/calligra/files/patch-kexi_examples-update_sql_files.sh | 15 | ||||
-rw-r--r-- | editors/calligra/files/patch-koffce-xpdf-CVE-2007-0104.diff | 74 | ||||
-rw-r--r-- | editors/calligra/pkg-plist | 48 |
6 files changed, 70 insertions, 91 deletions
diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile index be4d53dee422..ef53f99fcc71 100644 --- a/editors/calligra/Makefile +++ b/editors/calligra/Makefile @@ -6,8 +6,7 @@ # PORTNAME= koffice -PORTVERSION= 1.6.1 -PORTREVISION= 1 +PORTVERSION= 1.6.2 PORTEPOCH= 2 CATEGORIES= editors kde MASTER_SITES= ${MASTER_SITE_KDE} diff --git a/editors/calligra/distinfo b/editors/calligra/distinfo index 04ee84201ab5..a851f75e77e8 100644 --- a/editors/calligra/distinfo +++ b/editors/calligra/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/koffice/koffice-1.6.1.tar.bz2) = f7b90b46b79019edc60761a6bff2d387 -SHA256 (KDE/koffice/koffice-1.6.1.tar.bz2) = 5505a6c54009dd0cb75a3770c3daa476154958f92692ca0748b1842d9cd6e728 -SIZE (KDE/koffice/koffice-1.6.1.tar.bz2) = 56999028 +MD5 (KDE/koffice/koffice-1.6.2.tar.bz2) = 74ef62a5f8f766fe8192d5b7d65a3928 +SHA256 (KDE/koffice/koffice-1.6.2.tar.bz2) = fa5ca02eba02219d34c3c6efff92bf767060b4b1343da56eb63139661d53f380 +SIZE (KDE/koffice/koffice-1.6.2.tar.bz2) = 57049103 diff --git a/editors/calligra/files/patch-kexi_examples-build_kexi_file.sh b/editors/calligra/files/patch-kexi_examples-build_kexi_file.sh new file mode 100644 index 000000000000..1fb0916c33a0 --- /dev/null +++ b/editors/calligra/files/patch-kexi_examples-build_kexi_file.sh @@ -0,0 +1,15 @@ +--- kexi/examples/build_kexi_file.sh.orig Mon Mar 5 01:50:05 2007 ++++ kexi/examples/build_kexi_file.sh Mon Mar 5 01:50:31 2007 +@@ -7,9 +7,9 @@ + # Only .kexi file that is older than .sql file is recreated. + # ksqlite is needed on the $PATH. + +-KEXISQL3PATH=../3rdparty/kexisql3/src/.libs/ +-PATH=$PATH:$KEXISQL3PATH +-LD_LIBRARY_PATH=$KEXISQL3PATH:$KEXISQL3PATH ++export KEXISQL3PATH=../3rdparty/kexisql3/src/.libs/ ++export PATH=$PATH:$KEXISQL3PATH ++export LD_LIBRARY_PATH=$KEXISQL3PATH:$KEXISQL3PATH + which ksqlite > /dev/null || exit 1 + + [ $# -lt 1 ] && echo "Missing .sql filename." && exit 1 diff --git a/editors/calligra/files/patch-kexi_examples-update_sql_files.sh b/editors/calligra/files/patch-kexi_examples-update_sql_files.sh new file mode 100644 index 000000000000..1c869369a21e --- /dev/null +++ b/editors/calligra/files/patch-kexi_examples-update_sql_files.sh @@ -0,0 +1,15 @@ +--- kexi/examples/update_sql_files.sh.orig Sun Mar 4 13:49:03 2007 ++++ kexi/examples/update_sql_files.sh Sun Mar 4 13:49:14 2007 +@@ -4,9 +4,9 @@ + # Only .sql file that is older than .kexi file is recreated. + # ksqlite is needed on the PATH + +-KEXISQL3PATH=../3rdparty/kexisql3/src/.libs/ +-PATH=$PATH:$KEXISQL3PATH +-LD_LIBRARY_PATH=$KEXISQL3PATH:$KEXISQL3PATH ++export KEXISQL3PATH=../3rdparty/kexisql3/src/.libs/ ++export PATH=$PATH:$KEXISQL3PATH ++export LD_LIBRARY_PATH=$KEXISQL3PATH:$KEXISQL3PATH + which ksqlite > /dev/null || exit 1 + + for f in `ls -1 *.kexi` ; do diff --git a/editors/calligra/files/patch-koffce-xpdf-CVE-2007-0104.diff b/editors/calligra/files/patch-koffce-xpdf-CVE-2007-0104.diff deleted file mode 100644 index f5e51a1c706e..000000000000 --- a/editors/calligra/files/patch-koffce-xpdf-CVE-2007-0104.diff +++ /dev/null @@ -1,74 +0,0 @@ ------------------------------------------------------------------------- -r622463 | aacid | 2007-01-11 23:05:54 +0100 (Thu, 11 Jan 2007) | 2 lines -Changed paths: - M /branches/koffice/1.6/koffice/filters/kword/pdf/xpdf/xpdf/Catalog.cc - M /branches/koffice/1.6/koffice/filters/kword/pdf/xpdf/xpdf/Catalog.h - -Commiting the patch agreed between kpdf and poppler developers to fix MOAB-06-01-2007 issue. - ------------------------------------------------------------------------- -Index: filters/kword/pdf/xpdf/xpdf/Catalog.cc -=================================================================== ---- filters/kword/pdf/xpdf/xpdf/Catalog.cc (revision 622462) -+++ filters/kword/pdf/xpdf/xpdf/Catalog.cc (revision 622463) -@@ -24,6 +24,12 @@ - #include "Link.h" - #include "Catalog.h" - -+// This define is used to limit the depth of recursive readPageTree calls -+// This is needed because the page tree nodes can reference their parents -+// leaving us in an infinite loop -+// Most sane pdf documents don't have a call depth higher than 10 -+#define MAX_CALL_DEPTH 1000 -+ - //------------------------------------------------------------------------ - // Catalog - //------------------------------------------------------------------------ -@@ -77,7 +83,7 @@ Catalog::Catalog(XRef *xrefA) { - pageRefs[i].num = -1; - pageRefs[i].gen = -1; - } -- numPages = readPageTree(pagesDict.getDict(), NULL, 0); -+ numPages = readPageTree(pagesDict.getDict(), NULL, 0, 0); - if (numPages != numPages0) { - error(-1, "Page count in top-level pages object is incorrect"); - } -@@ -171,7 +177,7 @@ GString *Catalog::readMetadata() { - return s; - } - --int Catalog::readPageTree(Dict *pagesDict, PageAttrs *attrs, int start) { -+int Catalog::readPageTree(Dict *pagesDict, PageAttrs *attrs, int start, int callDepth) { - Object kids; - Object kid; - Object kidRef; -@@ -221,9 +227,13 @@ int Catalog::readPageTree(Dict *pagesDic - // This should really be isDict("Pages"), but I've seen at least one - // PDF file where the /Type entry is missing. - } else if (kid.isDict()) { -- if ((start = readPageTree(kid.getDict(), attrs1, start)) -- < 0) -- goto err2; -+ if (callDepth > MAX_CALL_DEPTH) { -+ error(-1, "Limit of %d recursive calls reached while reading the page tree. If your document is correct and not a test to try to force a crash, please report a bug.", MAX_CALL_DEPTH); -+ } else { -+ if ((start = readPageTree(kid.getDict(), attrs1, start, callDepth + 1)) -+ < 0) -+ goto err2; -+ } - } else { - error(-1, "Kid object (page %d) is wrong type (%s)", - start+1, kid.getTypeName()); -Index: filters/kword/pdf/xpdf/xpdf/Catalog.h -=================================================================== ---- filters/kword/pdf/xpdf/xpdf/Catalog.h (revision 622462) -+++ filters/kword/pdf/xpdf/xpdf/Catalog.h (revision 622463) -@@ -82,7 +82,7 @@ private: - Object outline; // outline dictionary - GBool ok; // true if catalog is valid - -- int readPageTree(Dict *pages, PageAttrs *attrs, int start); -+ int readPageTree(Dict *pages, PageAttrs *attrs, int start, int callDepth); - Object *findDestInTree(Object *tree, GString *name, Object *obj); - }; - diff --git a/editors/calligra/pkg-plist b/editors/calligra/pkg-plist index 23edb3d4c816..43968f2c3adf 100644 --- a/editors/calligra/pkg-plist +++ b/editors/calligra/pkg-plist @@ -1,6 +1,10 @@ bin/karbon bin/kchart bin/kexi +bin/kexi_add_column +bin/kexi_add_column_gui +bin/kexi_delete_column +bin/kexi_delete_column_gui bin/kformula bin/kivio bin/koconverter @@ -113,30 +117,40 @@ include/Kolinewidthaction.h include/Koversiondialog.h include/kcoloractions.h include/kdchart_export.h +include/kexidb/admin.h +include/kexidb/alter.h include/kexidb/connection.h include/kexidb/connectiondata.h include/kexidb/cursor.h +include/kexidb/dbobjectnamevalidator.h +include/kexidb/dbproperties.h include/kexidb/driver.h +include/kexidb/driver_p.h include/kexidb/drivermanager.h include/kexidb/error.h include/kexidb/expression.h include/kexidb/field.h include/kexidb/fieldlist.h +include/kexidb/fieldvalidator.h include/kexidb/global.h include/kexidb/indexschema.h include/kexidb/kexidb_export.h include/kexidb/keximigrate.h include/kexidb/keximigratedata.h +include/kexidb/lookupfieldschema.h include/kexidb/migratemanager.h +include/kexidb/msghandler.h include/kexidb/object.h -include/kexidb/parser.h include/kexidb/preparedstatement.h include/kexidb/queryschema.h include/kexidb/queryschemaparameter.h include/kexidb/relationship.h +include/kexidb/roweditbuffer.h include/kexidb/schemadata.h +include/kexidb/simplecommandlineapp.h include/kexidb/tableschema.h include/kexidb/transaction.h +include/kexidb/utils.h include/kexiutils/identifier.h include/kexiutils/kexiutils_export.h include/kexiutils/longlongvalidator.h @@ -459,6 +473,9 @@ lib/kde3/kritacimg.so lib/kde3/kritacmykplugin.a lib/kde3/kritacmykplugin.la lib/kde3/kritacmykplugin.so +lib/kde3/kritacolorify.a +lib/kde3/kritacolorify.la +lib/kde3/kritacolorify.so lib/kde3/kritacolorrange.a lib/kde3/kritacolorrange.la lib/kde3/kritacolorrange.so @@ -1254,8 +1271,19 @@ lib/libkwordprivate.a lib/libkwordprivate.la lib/libkwordprivate.so lib/libkwordprivate.so.4 +share/applications/kde/karbon.desktop +share/applications/kde/kchart.desktop +share/applications/kde/kexi.desktop +share/applications/kde/kformula.desktop share/applications/kde/kivio.desktop +share/applications/kde/koshell.desktop +share/applications/kde/kplato.desktop +share/applications/kde/kpresenter.desktop share/applications/kde/krita.desktop +share/applications/kde/kspread.desktop +share/applications/kde/kudesigner.desktop +share/applications/kde/kugar.desktop +share/applications/kde/kword.desktop share/applnk/.hidden/krita_jpeg.desktop share/applnk/.hidden/krita_magick.desktop share/applnk/.hidden/krita_openexr.desktop @@ -1264,17 +1292,6 @@ share/applnk/.hidden/krita_png.desktop share/applnk/.hidden/krita_raw.desktop share/applnk/.hidden/krita_tiff.desktop share/applnk/Office/KThesaurus.desktop -share/applnk/Office/karbon.desktop -share/applnk/Office/kchart.desktop -share/applnk/Office/kexi.desktop -share/applnk/Office/kformula.desktop -share/applnk/Office/koshell.desktop -share/applnk/Office/kplato.desktop -share/applnk/Office/kpresenter.desktop -share/applnk/Office/kspread.desktop -share/applnk/Office/kudesigner.desktop -share/applnk/Office/kugar.desktop -share/applnk/Office/kword.desktop share/apps/karbon/gradients/allcolors.kgr share/apps/karbon/gradients/simple.kgr share/apps/karbon/icons/crystalsvg/16x16/actions/14_layer_deletelayer.png @@ -1473,11 +1490,13 @@ share/apps/kchart/templates/chart/.source/BarChart.chrt share/apps/kchart/templates/chart/.source/Empty.chrt share/apps/kchart/templates/chart/BarChart.desktop share/apps/kchart/templates/chart/Empty.desktop +share/apps/kexi/examples/Simple_Database.kexi share/apps/kexi/icons/crystalsvg/128x128/actions/form_action.png share/apps/kexi/icons/crystalsvg/16x16/actions/add_field.png share/apps/kexi/icons/crystalsvg/16x16/actions/aofit.png share/apps/kexi/icons/crystalsvg/16x16/actions/aogrid.png share/apps/kexi/icons/crystalsvg/16x16/actions/aopos2grid.png +share/apps/kexi/icons/crystalsvg/16x16/actions/autofield.png share/apps/kexi/icons/crystalsvg/16x16/actions/autonumber.png share/apps/kexi/icons/crystalsvg/16x16/actions/business_user.png share/apps/kexi/icons/crystalsvg/16x16/actions/button.png @@ -1543,6 +1562,7 @@ share/apps/kexi/icons/crystalsvg/22x22/actions/aoshortest.png share/apps/kexi/icons/crystalsvg/22x22/actions/aotallest.png share/apps/kexi/icons/crystalsvg/22x22/actions/aotop.png share/apps/kexi/icons/crystalsvg/22x22/actions/aowidest.png +share/apps/kexi/icons/crystalsvg/22x22/actions/autofield.png share/apps/kexi/icons/crystalsvg/22x22/actions/business_user.png share/apps/kexi/icons/crystalsvg/22x22/actions/button.png share/apps/kexi/icons/crystalsvg/22x22/actions/check.png @@ -5216,6 +5236,8 @@ share/icons/hicolor/scalable/apps/kexi.svgz share/icons/hicolor/scalable/apps/koshell.svgz share/icons/locolor/16x16/apps/kudesigner.png share/icons/locolor/32x32/apps/kudesigner.png +share/locale/pl/LC_MESSAGES/kexi_add_column_gui_transl_pl.sh +share/locale/pl/LC_MESSAGES/kexi_delete_column_gui_transl_pl.sh share/mimelnk/application/x-kexi-connectiondata.desktop share/mimelnk/application/x-kexiproject-shortcut.desktop share/mimelnk/application/x-kexiproject-sqlite.desktop @@ -5320,6 +5342,7 @@ share/services/kritablurfilter.desktop share/services/kritabumpmapfilter.desktop share/services/kritacimg.desktop share/services/kritacmykplugin.desktop +share/services/kritacolorifyfilter.desktop share/services/kritacolorrange.desktop share/services/kritacolorsfilter.desktop share/services/kritacolorspaceconversion.desktop @@ -5807,6 +5830,7 @@ share/templates/TextDocument.desktop @dirrm share/apps/kexi/icons/crystalsvg/128x128 @dirrm share/apps/kexi/icons/crystalsvg @dirrm share/apps/kexi/icons +@dirrm share/apps/kexi/examples @dirrm share/apps/kexi @dirrm share/apps/kchart/templates/chart/.source @dirrm share/apps/kchart/templates/chart |