diff options
| -rw-r--r-- | misc/koffice/Makefile | 13 | ||||
| -rw-r--r-- | misc/koffice/PLIST | 191 | ||||
| -rw-r--r-- | misc/koffice/distinfo | 14 | ||||
| -rw-r--r-- | misc/koffice/patches/patch-ab | 30 | ||||
| -rw-r--r-- | misc/koffice/patches/patch-am | 10 | ||||
| -rw-r--r-- | misc/koffice/patches/patch-ao | 8 |
6 files changed, 217 insertions, 49 deletions
diff --git a/misc/koffice/Makefile b/misc/koffice/Makefile index 4e89e189f91..43d09179706 100644 --- a/misc/koffice/Makefile +++ b/misc/koffice/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.85 2006/07/15 21:14:00 markd Exp $ +# $NetBSD: Makefile,v 1.86 2006/10/17 09:33:15 markd Exp $ -DISTNAME= koffice-1.5.2 +DISTNAME= koffice-1.6.0 CATEGORIES= misc kde -MASTER_SITES= ${MASTER_SITE_KDE:=koffice-1.5.2/src/} +MASTER_SITES= ${MASTER_SITE_KDE:=koffice-1.6.0/src/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= markd@NetBSD.org @@ -41,10 +41,6 @@ LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS} .include "options.mk" -.if ${OPSYS} == "SunOS" -USE_TOOLS+= gawk:pkgsrc -.endif - post-install: @# The global desktop template files need to be user-writeable, or @# else users won't be able to alter them after copying them to @@ -57,10 +53,13 @@ post-install: .include "../../textproc/aspell/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/libxslt/buildlink3.mk" +.include "../../graphics/GraphicsMagick/buildlink3.mk" .include "../../graphics/ImageMagick/buildlink3.mk" .include "../../graphics/jasper/buildlink3.mk" .include "../../graphics/libart2/buildlink3.mk" +.include "../../graphics/libexif/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" +.include "../../print/poppler-qt/buildlink3.mk" .include "../../x11/kdebase3/buildlink3.mk" .include "../../x11/kdelibs3/buildlink3.mk" diff --git a/misc/koffice/PLIST b/misc/koffice/PLIST index b0cd7771868..2b792c7d0f3 100644 --- a/misc/koffice/PLIST +++ b/misc/koffice/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.21 2006/06/11 13:50:19 markd Exp $ +@comment $NetBSD: PLIST,v 1.22 2006/10/17 09:33:15 markd Exp $ bin/karbon bin/kchart bin/kexi @@ -147,7 +147,6 @@ include/kis_basic_histogram_producers.h include/kis_boundary.h include/kis_brush.h include/kis_button_event.h -include/kis_button_press_event.h include/kis_button_release_event.h include/kis_canvas_controller.h include/kis_canvas_observer.h @@ -205,7 +204,6 @@ include/kis_iteratorpixeltrait.h include/kis_iterators_pixel.h include/kis_label_zoom.h include/kis_layer.h -include/kis_layer_visitor.h include/kis_layerbox.h include/kis_layerlist.h include/kis_matrix_widget.ui.h @@ -218,7 +216,6 @@ include/kis_nameserver.h include/kis_opengl_image_context.h include/kis_paint_device.h include/kis_paint_device_iface.h -include/kis_paint_layer.h include/kis_painter.h include/kis_paintop.h include/kis_paintop_box.h @@ -226,6 +223,7 @@ include/kis_paintop_registry.h include/kis_palette.h include/kis_palette_widget.h include/kis_pattern.h +include/kis_perspective_math.h include/kis_point.h include/kis_previewdialog.h include/kis_previewwidget.h @@ -236,6 +234,7 @@ include/kis_rect.h include/kis_resource.h include/kis_selection.h include/kis_shared_ptr_vector.h +include/kis_substrate.h include/kis_tileddatamanager.h include/kis_tool.h include/kis_tool_controller.h @@ -260,7 +259,6 @@ include/kobirdeyepanel.h include/koffice_export.h include/kofficeversion.h include/kopalettemanager.h -include/kross/api/argument.h include/kross/api/callable.h include/kross/api/class.h include/kross/api/dict.h @@ -340,6 +338,9 @@ lib/kde3/krita_lms_f32_plugin.la lib/kde3/krita_rgb_f16half_plugin.la lib/kde3/krita_rgb_f32_plugin.la lib/kde3/krita_rgb_u16_plugin.la +lib/kde3/krita_ycbcr_u16_plugin.la +lib/kde3/krita_ycbcr_u8_plugin.la +lib/kde3/kritablurfilter.la lib/kde3/kritabumpmap.la lib/kde3/kritacimg.la lib/kde3/kritacmykplugin.la @@ -352,15 +353,21 @@ lib/kde3/kritadefaulttools.la lib/kde3/kritadropshadow.la lib/kde3/kritaembossfilter.la lib/kde3/kritaexample.la +lib/kde3/kritaextensioncolorsfilters.la +lib/kde3/kritafastcolortransfer.la lib/kde3/kritafiltersgallery.la lib/kde3/kritagrayplugin.la lib/kde3/kritahistogram.la lib/kde3/kritahistogramdocker.la lib/kde3/kritaimageenhancement.la lib/kde3/kritaimagesize.la +lib/kde3/kritalenscorrectionfilter.la +lib/kde3/kritamodifyselection.la +lib/kde3/kritanoisefilter.la lib/kde3/kritaoilpaintfilter.la lib/kde3/kritapixelizefilter.la lib/kde3/kritaraindropsfilter.la +lib/kde3/kritarandompickfilter.la lib/kde3/kritargbplugin.la lib/kde3/kritarotateimage.la lib/kde3/kritaroundcornersfilter.la @@ -370,21 +377,28 @@ lib/kde3/kritaselectiontools.la lib/kde3/kritaseparatechannels.la lib/kde3/kritashearimage.la lib/kde3/kritasmalltilesfilter.la -lib/kde3/kritasmearybrush.la lib/kde3/kritasobelfilter.la +lib/kde3/kritasubstrate.la lib/kde3/kritatoolcrop.la +lib/kde3/kritatoolcurves.la lib/kde3/kritatoolfilter.la +lib/kde3/kritatoolperspectivegrid.la +lib/kde3/kritatoolperspectivetransform.la lib/kde3/kritatoolpolygon.la lib/kde3/kritatoolpolyline.la lib/kde3/kritatoolselectsimilar.la lib/kde3/kritatoolstar.la lib/kde3/kritatooltransform.la +lib/kde3/kritaunsharpfilter.la +lib/kde3/kritawavefilter.la lib/kde3/kritawetplugin.la lib/kde3/krosskexiapp.la lib/kde3/krosskexidb.la lib/kde3/krosskritacore.la +lib/kde3/krosskspreadcore.la lib/kde3/krosspython.la lib/kde3/kspread.la +lib/kde3/kspreadscripting.la lib/kde3/kthesaurus.la lib/kde3/kudesigner.la lib/kde3/kugar.la @@ -458,17 +472,19 @@ lib/kde3/libkprkword.la lib/kde3/libkrita_openexr_export.la lib/kde3/libkrita_openexr_import.la lib/kde3/libkrita_raw_import.la +lib/kde3/libkritagmagickexport.la +lib/kde3/libkritagmagickimport.la lib/kde3/libkritajpegexport.la lib/kde3/libkritajpegimport.la -lib/kde3/libkritamagickexport.la -lib/kde3/libkritamagickimport.la lib/kde3/libkritapart.la +lib/kde3/libkritapdfimport.la lib/kde3/libkritapngexport.la lib/kde3/libkritapngimport.la lib/kde3/libkritatiffexport.la lib/kde3/libkritatiffimport.la lib/kde3/libkspreadhtmlexport.la lib/kde3/libkspreadinsertcalendar.la +lib/kde3/libkspreadkexiimport.la lib/kde3/libkspreadlatexexport.la lib/kde3/libkspreadpart.la lib/kde3/libkudesignerpart.la @@ -480,6 +496,7 @@ lib/kde3/libkwordpart.la ${HAVE_WV2}lib/kde3/libmswordimport.la lib/kde3/libmswriteexport.la lib/kde3/libmswriteimport.la +lib/kde3/libolefilter.la lib/kde3/liboodrawimport.la lib/kde3/libooimpressexport.la lib/kde3/libooimpressimport.la @@ -490,7 +507,6 @@ lib/kde3/libopencalcimport.la lib/kde3/libpalmdocexport.la lib/kde3/libpalmdocimport.la lib/kde3/libpdfimport.la -lib/kde3/libpowerpointimport.la lib/kde3/libqproimport.la lib/kde3/librtfexport.la lib/kde3/librtfimport.la @@ -554,6 +570,8 @@ lib/libkrita_lms_f32.la lib/libkrita_rgb_f16half.la lib/libkrita_rgb_f32.la lib/libkrita_rgb_u16.la +lib/libkrita_ycbcr_u16.la +lib/libkrita_ycbcr_u8.la lib/libkritacolor.la lib/libkritacommon.la lib/libkritagrayscale.la @@ -618,14 +636,19 @@ share/doc/kde/HTML/en/kchart/toolbars.png share/doc/kde/HTML/en/kexi/basics.docbook share/doc/kde/HTML/en/kexi/building.docbook share/doc/kde/HTML/en/kexi/common +share/doc/kde/HTML/en/kexi/comparing.docbook share/doc/kde/HTML/en/kexi/configuration.docbook share/doc/kde/HTML/en/kexi/contact-example.png share/doc/kde/HTML/en/kexi/credits.docbook share/doc/kde/HTML/en/kexi/database.docbook +share/doc/kde/HTML/en/kexi/designingforms.docbook +share/doc/kde/HTML/en/kexi/enteringdataintotables.docbook +share/doc/kde/HTML/en/kexi/enteringdatausingforms.docbook share/doc/kde/HTML/en/kexi/index.cache.bz2 share/doc/kde/HTML/en/kexi/index.docbook share/doc/kde/HTML/en/kexi/intro.docbook share/doc/kde/HTML/en/kexi/menus.docbook +share/doc/kde/HTML/en/kexi/querydesigning.docbook share/doc/kde/HTML/en/kformula/ambiguous-string.png share/doc/kde/HTML/en/kformula/common share/doc/kde/HTML/en/kformula/correct_index_location.png @@ -802,6 +825,7 @@ share/doc/kde/HTML/en/kpresenter/tut25.png share/doc/kde/HTML/en/kpresenter/tut26.png share/doc/kde/HTML/en/kpresenter/tutorial.docbook share/doc/kde/HTML/en/kpresenter/zoomfactor.png +share/doc/kde/HTML/en/krita/README.SCREENSHOTS share/doc/kde/HTML/en/krita/commands-dialogs.docbook share/doc/kde/HTML/en/krita/commands-menus.docbook share/doc/kde/HTML/en/krita/commands-palettes.docbook @@ -810,7 +834,15 @@ share/doc/kde/HTML/en/krita/commands.docbook share/doc/kde/HTML/en/krita/common share/doc/kde/HTML/en/krita/createdocument.png share/doc/kde/HTML/en/krita/credits.docbook +share/doc/kde/HTML/en/krita/crocusses-autocontrast.png +share/doc/kde/HTML/en/krita/crocusses-blur.png +share/doc/kde/HTML/en/krita/crocusses-brightnesscontrast.png share/doc/kde/HTML/en/krita/crocusses-bumpmap.png +share/doc/kde/HTML/en/krita/crocusses-coloradjustment.png +share/doc/kde/HTML/en/krita/crocusses-colortoalpha.png +share/doc/kde/HTML/en/krita/crocusses-colortransfer.png +share/doc/kde/HTML/en/krita/crocusses-customconvolution.png +share/doc/kde/HTML/en/krita/crocusses-desaturate.png share/doc/kde/HTML/en/krita/crocusses-edgebottom.png share/doc/kde/HTML/en/krita/crocusses-edgeleft.png share/doc/kde/HTML/en/krita/crocusses-edgeright.png @@ -818,24 +850,37 @@ share/doc/kde/HTML/en/krita/crocusses-embossall.png share/doc/kde/HTML/en/krita/crocusses-embosshorvert.png share/doc/kde/HTML/en/krita/crocusses-embossvariable.png share/doc/kde/HTML/en/krita/crocusses-gaussianblur.png +share/doc/kde/HTML/en/krita/crocusses-gaussiannoise.png share/doc/kde/HTML/en/krita/crocusses-invert.png +share/doc/kde/HTML/en/krita/crocusses-lenscorrection.png +share/doc/kde/HTML/en/krita/crocusses-maximizechannel.png share/doc/kde/HTML/en/krita/crocusses-meanremoval.png +share/doc/kde/HTML/en/krita/crocusses-minimizechannel.png share/doc/kde/HTML/en/krita/crocusses-oilpaint.png share/doc/kde/HTML/en/krita/crocusses-pixelize.png share/doc/kde/HTML/en/krita/crocusses-raindrops.png +share/doc/kde/HTML/en/krita/crocusses-randomnoise.png +share/doc/kde/HTML/en/krita/crocusses-randompick.png share/doc/kde/HTML/en/krita/crocusses-roundcorners.png share/doc/kde/HTML/en/krita/crocusses-sharpen.png -share/doc/kde/HTML/en/krita/crocusses-simplenoise.png +share/doc/kde/HTML/en/krita/crocusses-smalltiles.png share/doc/kde/HTML/en/krita/crocusses-sobel.png -share/doc/kde/HTML/en/krita/crocusses-tiles.png share/doc/kde/HTML/en/krita/crocusses-topedge.png +share/doc/kde/HTML/en/krita/crocusses-unsharpmask.png +share/doc/kde/HTML/en/krita/crocusses-wave.png +share/doc/kde/HTML/en/krita/crocusses-waveletnoise.png share/doc/kde/HTML/en/krita/crocusses.png +share/doc/kde/HTML/en/krita/developers-plugins.docbook +share/doc/kde/HTML/en/krita/developers-scripting.docbook share/doc/kde/HTML/en/krita/developers.docbook share/doc/kde/HTML/en/krita/dialogs-addpalette.png +share/doc/kde/HTML/en/krita/dialogs-blur.png share/doc/kde/HTML/en/krita/dialogs-brightnesscontrast.png share/doc/kde/HTML/en/krita/dialogs-bumpmap.png share/doc/kde/HTML/en/krita/dialogs-coloradjustment.png share/doc/kde/HTML/en/krita/dialogs-colorrange.png +share/doc/kde/HTML/en/krita/dialogs-colortoalpha.png +share/doc/kde/HTML/en/krita/dialogs-colortransfer.png share/doc/kde/HTML/en/krita/dialogs-convertimagetype.png share/doc/kde/HTML/en/krita/dialogs-convertlayertype.png share/doc/kde/HTML/en/krita/dialogs-cubism.png @@ -844,17 +889,21 @@ share/doc/kde/HTML/en/krita/dialogs-documentinformation.png share/doc/kde/HTML/en/krita/dialogs-dropshadow.png share/doc/kde/HTML/en/krita/dialogs-emboss.png share/doc/kde/HTML/en/krita/dialogs-filtersgallery.png +share/doc/kde/HTML/en/krita/dialogs-gaussiannoise.png share/doc/kde/HTML/en/krita/dialogs-histogram.png share/doc/kde/HTML/en/krita/dialogs-imageproperties.png share/doc/kde/HTML/en/krita/dialogs-imagerestoration.png share/doc/kde/HTML/en/krita/dialogs-imagesize.png share/doc/kde/HTML/en/krita/dialogs-layerproperties.png share/doc/kde/HTML/en/krita/dialogs-layersize.png +share/doc/kde/HTML/en/krita/dialogs-lenscorrection.png share/doc/kde/HTML/en/krita/dialogs-newadjustmentlayer.png share/doc/kde/HTML/en/krita/dialogs-newlayer.png share/doc/kde/HTML/en/krita/dialogs-oilpaint.png share/doc/kde/HTML/en/krita/dialogs-pixelize.png share/doc/kde/HTML/en/krita/dialogs-raindrops.png +share/doc/kde/HTML/en/krita/dialogs-randomnoise.png +share/doc/kde/HTML/en/krita/dialogs-randompick.png share/doc/kde/HTML/en/krita/dialogs-rotateimage.png share/doc/kde/HTML/en/krita/dialogs-rotatelayer.png share/doc/kde/HTML/en/krita/dialogs-roundcorners.png @@ -863,31 +912,56 @@ share/doc/kde/HTML/en/krita/dialogs-shearimage.png share/doc/kde/HTML/en/krita/dialogs-shearlayer.png share/doc/kde/HTML/en/krita/dialogs-smalltiles.png share/doc/kde/HTML/en/krita/dialogs-sobel.png +share/doc/kde/HTML/en/krita/dialogs-substrate.png +share/doc/kde/HTML/en/krita/dialogs-unsharpmask.png +share/doc/kde/HTML/en/krita/dialogs-wave.png +share/doc/kde/HTML/en/krita/dialogs-waveletnoise.png share/doc/kde/HTML/en/krita/faq.docbook share/doc/kde/HTML/en/krita/index.cache.bz2 share/doc/kde/HTML/en/krita/index.docbook share/doc/kde/HTML/en/krita/installation.docbook share/doc/kde/HTML/en/krita/introduction.docbook share/doc/kde/HTML/en/krita/mainscreen.png +share/doc/kde/HTML/en/krita/mountains-burn.png +share/doc/kde/HTML/en/krita/mountains-color.png +share/doc/kde/HTML/en/krita/mountains-darken.png +share/doc/kde/HTML/en/krita/mountains-divide.png +share/doc/kde/HTML/en/krita/mountains-dodge.png +share/doc/kde/HTML/en/krita/mountains-hue.png +share/doc/kde/HTML/en/krita/mountains-lighten.png +share/doc/kde/HTML/en/krita/mountains-multiply.png +share/doc/kde/HTML/en/krita/mountains-normal.png +share/doc/kde/HTML/en/krita/mountains-original.png +share/doc/kde/HTML/en/krita/mountains-overlay.png +share/doc/kde/HTML/en/krita/mountains-saturation.png +share/doc/kde/HTML/en/krita/mountains-screen.png +share/doc/kde/HTML/en/krita/mountains-value.png +share/doc/kde/HTML/en/krita/mountains.png share/doc/kde/HTML/en/krita/newimage.png share/doc/kde/HTML/en/krita/palettes-colors-gray.png share/doc/kde/HTML/en/krita/palettes-colors-hsv.png share/doc/kde/HTML/en/krita/palettes-colors-palettes.png share/doc/kde/HTML/en/krita/palettes-colors-rgb.png share/doc/kde/HTML/en/krita/palettes-colors-watercolors.png +share/doc/kde/HTML/en/krita/palettes-controlbox-bezier.png share/doc/kde/HTML/en/krita/palettes-controlbox-brush.png share/doc/kde/HTML/en/krita/palettes-controlbox-colorpicker.png share/doc/kde/HTML/en/krita/palettes-controlbox-contiguousfill.png share/doc/kde/HTML/en/krita/palettes-controlbox-crop.png +share/doc/kde/HTML/en/krita/palettes-controlbox-duplicate.png +share/doc/kde/HTML/en/krita/palettes-controlbox-ellipse.png +share/doc/kde/HTML/en/krita/palettes-controlbox-fill.png share/doc/kde/HTML/en/krita/palettes-controlbox-gradient.png share/doc/kde/HTML/en/krita/palettes-controlbox-histogram.png share/doc/kde/HTML/en/krita/palettes-controlbox-line.png share/doc/kde/HTML/en/krita/palettes-controlbox-overview.png share/doc/kde/HTML/en/krita/palettes-controlbox-paintwithfilters.png share/doc/kde/HTML/en/krita/palettes-controlbox-polygon.png +share/doc/kde/HTML/en/krita/palettes-controlbox-polyline.png share/doc/kde/HTML/en/krita/palettes-controlbox-rectangle.png share/doc/kde/HTML/en/krita/palettes-controlbox-select.png share/doc/kde/HTML/en/krita/palettes-controlbox-selectcontiguous.png +share/doc/kde/HTML/en/krita/palettes-controlbox-selectmagnetic.png share/doc/kde/HTML/en/krita/palettes-controlbox-selectsimilar.png share/doc/kde/HTML/en/krita/palettes-controlbox-star.png share/doc/kde/HTML/en/krita/palettes-controlbox-text.png @@ -901,8 +975,11 @@ share/doc/kde/HTML/en/krita/preferences-grid.png share/doc/kde/HTML/en/krita/preferences-performance.png share/doc/kde/HTML/en/krita/preferences-sidebar.png share/doc/kde/HTML/en/krita/preferences-tablet.png -share/doc/kde/HTML/en/krita/scripting.docbook share/doc/kde/HTML/en/krita/settings.docbook +share/doc/kde/HTML/en/krita/tool-bezier-example.png +share/doc/kde/HTML/en/krita/tool-bezier-example2.png +share/doc/kde/HTML/en/krita/tool-bezier-example3.png +share/doc/kde/HTML/en/krita/tool-bezier.png share/doc/kde/HTML/en/krita/tool-brush.png share/doc/kde/HTML/en/krita/tool-colorpicker.png share/doc/kde/HTML/en/krita/tool-contiguousfill.png @@ -914,13 +991,18 @@ share/doc/kde/HTML/en/krita/tool-gradient.png share/doc/kde/HTML/en/krita/tool-line.png share/doc/kde/HTML/en/krita/tool-move.png share/doc/kde/HTML/en/krita/tool-paintselection.png +share/doc/kde/HTML/en/krita/tool-paintwithfilters-example.png share/doc/kde/HTML/en/krita/tool-paintwithfilters.png share/doc/kde/HTML/en/krita/tool-pan.png +share/doc/kde/HTML/en/krita/tool-perspectivegrid.png +share/doc/kde/HTML/en/krita/tool-perspectivetransform.png share/doc/kde/HTML/en/krita/tool-polygon.png share/doc/kde/HTML/en/krita/tool-polyline.png share/doc/kde/HTML/en/krita/tool-rectangle.png +share/doc/kde/HTML/en/krita/tool-selectbezier.png share/doc/kde/HTML/en/krita/tool-selectcontiguous.png share/doc/kde/HTML/en/krita/tool-selectelliptical.png +share/doc/kde/HTML/en/krita/tool-selectmagnetic.png share/doc/kde/HTML/en/krita/tool-selectoutline.png share/doc/kde/HTML/en/krita/tool-selectpolygonal.png share/doc/kde/HTML/en/krita/tool-selectrectangular.png @@ -941,6 +1023,8 @@ share/doc/kde/HTML/en/krita/toolbar-file.png share/doc/kde/HTML/en/krita/toolbar-krita.png share/doc/kde/HTML/en/krita/toolbar-navigation.png share/doc/kde/HTML/en/krita/toolbar-transformationtools.png +share/doc/kde/HTML/en/krita/toolbars-button-zoomin.png +share/doc/kde/HTML/en/krita/toolbars-button-zoomout.png share/doc/kde/HTML/en/krita/tutorial-quick-starts.docbook share/doc/kde/HTML/en/krita/tutorial-quick-starts1.png share/doc/kde/HTML/en/krita/tutorial-quick-starts10.png @@ -970,9 +1054,14 @@ share/doc/kde/HTML/en/krita/tutorial-select-layer-9.png share/doc/kde/HTML/en/krita/tutorial-select-layer-sample.png share/doc/kde/HTML/en/krita/tutorial-select-layer.docbook share/doc/kde/HTML/en/krita/tutorial-starting.docbook +share/doc/kde/HTML/en/krita/tutorial-tablet-1.png +share/doc/kde/HTML/en/krita/tutorial-tablet-2.png +share/doc/kde/HTML/en/krita/tutorial-tablet-3.png +share/doc/kde/HTML/en/krita/tutorial-tablet.docbook share/doc/kde/HTML/en/krita/tutorial.docbook share/doc/kde/HTML/en/krita/using-colorspaces.docbook share/doc/kde/HTML/en/krita/using-filters.docbook +share/doc/kde/HTML/en/krita/using-images.docbook share/doc/kde/HTML/en/krita/using-layers.docbook share/doc/kde/HTML/en/krita/using-selections-1.png share/doc/kde/HTML/en/krita/using-selections-2.png @@ -981,6 +1070,7 @@ share/doc/kde/HTML/en/krita/using-selections-4.png share/doc/kde/HTML/en/krita/using-selections-5.png share/doc/kde/HTML/en/krita/using-selections-6.png share/doc/kde/HTML/en/krita/using-selections.docbook +share/doc/kde/HTML/en/krita/using-views.docbook share/doc/kde/HTML/en/kspread/a11y.docbook share/doc/kde/HTML/en/kspread/advanced.docbook share/doc/kde/HTML/en/kspread/basics.docbook @@ -1176,6 +1266,7 @@ share/doc/kde/HTML/en/kword/formframe2.png share/doc/kde/HTML/en/kword/formframe3.png share/doc/kde/HTML/en/kword/formframe4.png share/doc/kde/HTML/en/kword/formframe5.png +share/doc/kde/HTML/en/kword/formframe6.png share/doc/kde/HTML/en/kword/forminteg.png share/doc/kde/HTML/en/kword/formllind.png share/doc/kde/HTML/en/kword/formlrind.png @@ -1259,6 +1350,7 @@ share/doc/kde/HTML/en/kword/opt2.png share/doc/kde/HTML/en/kword/opt3.png share/doc/kde/HTML/en/kword/opt4.png share/doc/kde/HTML/en/kword/opt5.png +share/doc/kde/HTML/en/kword/opt6.png share/doc/kde/HTML/en/kword/optkb.png share/doc/kde/HTML/en/kword/optkb2.png share/doc/kde/HTML/en/kword/opttb.png @@ -1341,6 +1433,7 @@ share/kde/applnk/Office/kpresenter.desktop share/kde/applnk/Office/krita_jpeg.desktop share/kde/applnk/Office/krita_magick.desktop share/kde/applnk/Office/krita_openexr.desktop +share/kde/applnk/Office/krita_pdf.desktop share/kde/applnk/Office/krita_png.desktop share/kde/applnk/Office/krita_raw.desktop share/kde/applnk/Office/krita_tiff.desktop @@ -1520,13 +1613,21 @@ share/kde/apps/kchart/pics/chart_hilo_normal.png share/kde/apps/kchart/pics/chart_hilo_openclose.png share/kde/apps/kchart/pics/chart_legend_bottom.png share/kde/apps/kchart/pics/chart_legend_bottomleft.png +share/kde/apps/kchart/pics/chart_legend_bottomleftbottom.png +share/kde/apps/kchart/pics/chart_legend_bottomleftleft.png share/kde/apps/kchart/pics/chart_legend_bottomright.png +share/kde/apps/kchart/pics/chart_legend_bottomrightbottom.png +share/kde/apps/kchart/pics/chart_legend_bottomrightright.png share/kde/apps/kchart/pics/chart_legend_left.png share/kde/apps/kchart/pics/chart_legend_nolegend.png share/kde/apps/kchart/pics/chart_legend_right.png share/kde/apps/kchart/pics/chart_legend_top.png share/kde/apps/kchart/pics/chart_legend_topleft.png +share/kde/apps/kchart/pics/chart_legend_topleftleft.png +share/kde/apps/kchart/pics/chart_legend_toplefttop.png share/kde/apps/kchart/pics/chart_legend_topright.png +share/kde/apps/kchart/pics/chart_legend_toprightright.png +share/kde/apps/kchart/pics/chart_legend_toprighttop.png share/kde/apps/kchart/pics/chart_line_normal.png share/kde/apps/kchart/pics/chart_line_percent.png share/kde/apps/kchart/pics/chart_line_stacked.png @@ -1548,6 +1649,7 @@ share/kde/apps/kexi/icons/crystalsvg/16x16/actions/business_user.png share/kde/apps/kexi/icons/crystalsvg/16x16/actions/button.png share/kde/apps/kexi/icons/crystalsvg/16x16/actions/check.png share/kde/apps/kexi/icons/crystalsvg/16x16/actions/clear_table_contents.png +share/kde/apps/kexi/icons/crystalsvg/16x16/actions/combo.png share/kde/apps/kexi/icons/crystalsvg/16x16/actions/database.png share/kde/apps/kexi/icons/crystalsvg/16x16/actions/database_import.png share/kde/apps/kexi/icons/crystalsvg/16x16/actions/delete_table_row.png @@ -1561,6 +1663,8 @@ share/kde/apps/kexi/icons/crystalsvg/16x16/actions/line.png share/kde/apps/kexi/icons/crystalsvg/16x16/actions/line_horizontal.png share/kde/apps/kexi/icons/crystalsvg/16x16/actions/line_vertical.png share/kde/apps/kexi/icons/crystalsvg/16x16/actions/lineedit.png +share/kde/apps/kexi/icons/crystalsvg/16x16/actions/macro.png +share/kde/apps/kexi/icons/crystalsvg/16x16/actions/macro_newobj.png share/kde/apps/kexi/icons/crystalsvg/16x16/actions/mouse_pointer.png share/kde/apps/kexi/icons/crystalsvg/16x16/actions/multiple_obj.png share/kde/apps/kexi/icons/crystalsvg/16x16/actions/navigator_first.png @@ -1631,6 +1735,8 @@ share/kde/apps/kexi/icons/crystalsvg/22x22/actions/lineedit.png share/kde/apps/kexi/icons/crystalsvg/22x22/actions/listbox.png share/kde/apps/kexi/icons/crystalsvg/22x22/actions/listview.png share/kde/apps/kexi/icons/crystalsvg/22x22/actions/lower.png +share/kde/apps/kexi/icons/crystalsvg/22x22/actions/macro.png +share/kde/apps/kexi/icons/crystalsvg/22x22/actions/macro_newobj.png share/kde/apps/kexi/icons/crystalsvg/22x22/actions/mouse_pointer.png share/kde/apps/kexi/icons/crystalsvg/22x22/actions/multiple_obj.png share/kde/apps/kexi/icons/crystalsvg/22x22/actions/new_sign.png @@ -1669,6 +1775,8 @@ share/kde/apps/kexi/icons/crystalsvg/32x32/actions/form_action.png share/kde/apps/kexi/icons/crystalsvg/32x32/actions/grid.png share/kde/apps/kexi/icons/crystalsvg/32x32/actions/insert_table_row.png share/kde/apps/kexi/icons/crystalsvg/32x32/actions/key.png +share/kde/apps/kexi/icons/crystalsvg/32x32/actions/macro.png +share/kde/apps/kexi/icons/crystalsvg/32x32/actions/macro_newobj.png share/kde/apps/kexi/icons/crystalsvg/32x32/actions/new_sign.png share/kde/apps/kexi/icons/crystalsvg/32x32/actions/pixmaplabel.png share/kde/apps/kexi/icons/crystalsvg/32x32/actions/query.png @@ -1710,15 +1818,13 @@ share/kde/apps/kexi/scripts/importxhtml/ImportXHTML.rc share/kde/apps/kexi/scripts/projectdocumentor/ProjectDocumentor.py share/kde/apps/kexi/scripts/projectdocumentor/ProjectDocumentor.rc share/kde/apps/kformula/dtd/kformula.dtd -share/kde/apps/kformula/fonts/cmbx10.ttf +share/kde/apps/kformula/fonts/Arev.ttf +share/kde/apps/kformula/fonts/ArevBI.ttf +share/kde/apps/kformula/fonts/ArevBd.ttf +share/kde/apps/kformula/fonts/ArevIt.ttf share/kde/apps/kformula/fonts/cmex10.ttf -share/kde/apps/kformula/fonts/cmmi10.ttf -share/kde/apps/kformula/fonts/cmr10.ttf -share/kde/apps/kformula/fonts/cmsy10.ttf share/kde/apps/kformula/fonts/fonts.dir share/kde/apps/kformula/fonts/fonts.scale -share/kde/apps/kformula/fonts/msam10.ttf -share/kde/apps/kformula/fonts/msbm10.ttf share/kde/apps/kformula/kformula.rc share/kde/apps/kformula/kformula_readonly.rc share/kde/apps/kformula/tips @@ -3831,11 +3937,19 @@ share/kde/apps/krita/pics/polyline.png share/kde/apps/krita/pics/raiselayer.png share/kde/apps/krita/pics/rotate_cursor.xpm share/kde/apps/krita/pics/tablet.png +share/kde/apps/krita/pics/tool_bezier_cursor.png +share/kde/apps/krita/pics/tool_bezier_paint.png +share/kde/apps/krita/pics/tool_bezier_select.png share/kde/apps/krita/pics/tool_brush_selection.png share/kde/apps/krita/pics/tool_brush_selection_cursor.png +share/kde/apps/krita/pics/tool_color_fill.png +share/kde/apps/krita/pics/tool_colorpicker.png share/kde/apps/krita/pics/tool_contiguous_selection.png share/kde/apps/krita/pics/tool_contiguous_selection_cursor.png +share/kde/apps/krita/pics/tool_crop.png share/kde/apps/krita/pics/tool_crop_cursor.png +share/kde/apps/krita/pics/tool_curve_dragging.png +share/kde/apps/krita/pics/tool_duplicate.png share/kde/apps/krita/pics/tool_duplicate_cursor.png share/kde/apps/krita/pics/tool_ellipse.png share/kde/apps/krita/pics/tool_ellipse_cursor.png @@ -3843,6 +3957,8 @@ share/kde/apps/krita/pics/tool_elliptical_selection.png share/kde/apps/krita/pics/tool_elliptical_selection_cursor.png share/kde/apps/krita/pics/tool_eraser_selection.png share/kde/apps/krita/pics/tool_eraser_selection_cursor.png +share/kde/apps/krita/pics/tool_example.png +share/kde/apps/krita/pics/tool_example_cursor.png share/kde/apps/krita/pics/tool_fill_cursor.png share/kde/apps/krita/pics/tool_filter.png share/kde/apps/krita/pics/tool_filter_cursor.png @@ -3852,9 +3968,15 @@ share/kde/apps/krita/pics/tool_gradient.png share/kde/apps/krita/pics/tool_gradient_cursor.png share/kde/apps/krita/pics/tool_line.png share/kde/apps/krita/pics/tool_line_cursor.png +share/kde/apps/krita/pics/tool_moutline.png +share/kde/apps/krita/pics/tool_moutline_cursor.png +share/kde/apps/krita/pics/tool_moutline_editing.png +share/kde/apps/krita/pics/tool_move.png share/kde/apps/krita/pics/tool_outline_selection.png share/kde/apps/krita/pics/tool_outline_selection_cursor.png share/kde/apps/krita/pics/tool_pan.png +share/kde/apps/krita/pics/tool_perspectivegrid.png +share/kde/apps/krita/pics/tool_perspectivetransform.png share/kde/apps/krita/pics/tool_polygon.png share/kde/apps/krita/pics/tool_polygon_cursor.png share/kde/apps/krita/pics/tool_polygonal_selection.png @@ -3872,6 +3994,8 @@ share/kde/apps/krita/pics/tool_star.png share/kde/apps/krita/pics/tool_star_cursor.png share/kde/apps/krita/pics/tool_text.png share/kde/apps/krita/pics/tool_text_cursor.png +share/kde/apps/krita/pics/tool_transform.png +share/kde/apps/krita/pics/tool_zoom.png share/kde/apps/krita/pics/tool_zoom_minus_cursor.png share/kde/apps/krita/pics/tool_zoom_plus_cursor.png share/kde/apps/krita/pics/unlinked.png @@ -3943,10 +4067,12 @@ share/kde/apps/kritaplugins/imageseparate.rc share/kde/apps/kritaplugins/imagesize.rc share/kde/apps/kritaplugins/kritafiltersgallery.rc share/kde/apps/kritaplugins/kritahistogramdocker.rc +share/kde/apps/kritaplugins/modify_selection.rc share/kde/apps/kritaplugins/rotateimage.rc share/kde/apps/kritaplugins/screenshot-krita.rc share/kde/apps/kritaplugins/scripting.rc share/kde/apps/kritaplugins/shearimage.rc +share/kde/apps/kritaplugins/substrate.rc share/kde/apps/kritaplugins/wetplugin.rc share/kde/apps/kross/python/RestrictedPython/Eval.py share/kde/apps/kross/python/RestrictedPython/Guards.py @@ -4094,8 +4220,13 @@ share/kde/apps/kspread/icons/crystalsvg/scalable/actions/template_studentidcard. share/kde/apps/kspread/icons/crystalsvg/scalable/actions/template_vacationchecklist.svgz share/kde/apps/kspread/icons/crystalsvg/scalable/actions/template_worksheet.svgz share/kde/apps/kspread/kpartplugins/insertcalendar.rc +share/kde/apps/kspread/kpartplugins/scripting.rc share/kde/apps/kspread/kspread.rc share/kde/apps/kspread/kspread_readonly.rc +share/kde/apps/kspread/scripts/exporthtml/ExportHtml.py +share/kde/apps/kspread/scripts/exporthtml/ExportHtml.rc +share/kde/apps/kspread/scripts/scripteditor/ScriptEditor.py +share/kde/apps/kspread/scripts/scripteditor/ScriptEditor.rc share/kde/apps/kspread/sheetstyles/standard1.ksts share/kde/apps/kspread/sheetstyles/standard1.png share/kde/apps/kspread/sheetstyles/standard1.xml @@ -4494,7 +4625,6 @@ share/kde/services/kpresenter_mng_export.desktop share/kde/services/kpresenter_ooimpress_export.desktop share/kde/services/kpresenter_ooimpress_import.desktop share/kde/services/kpresenter_png_export.desktop -share/kde/services/kpresenter_powerpoint_import.desktop share/kde/services/kpresenter_svg_export.desktop share/kde/services/kpresenter_xbm_export.desktop share/kde/services/kpresenter_xpm_export.desktop @@ -4509,6 +4639,7 @@ share/kde/services/krita_magick_export.desktop share/kde/services/krita_magick_import.desktop share/kde/services/krita_openexr_export.desktop share/kde/services/krita_openexr_import.desktop +share/kde/services/krita_pdf_import.desktop share/kde/services/krita_png_export.desktop share/kde/services/krita_png_import.desktop share/kde/services/krita_raw_import.desktop @@ -4517,6 +4648,9 @@ share/kde/services/krita_rgb_f32_plugin.desktop share/kde/services/krita_rgb_u16_plugin.desktop share/kde/services/krita_tiff_export.desktop share/kde/services/krita_tiff_import.desktop +share/kde/services/krita_ycbcr_u16_plugin.desktop +share/kde/services/krita_ycbcr_u8_plugin.desktop +share/kde/services/kritablurfilter.desktop share/kde/services/kritabumpmapfilter.desktop share/kde/services/kritacimg.desktop share/kde/services/kritacmykplugin.desktop @@ -4529,16 +4663,22 @@ share/kde/services/kritadefaulttools.desktop share/kde/services/kritadropshadow.desktop share/kde/services/kritaembossfilter.desktop share/kde/services/kritaexample.desktop +share/kde/services/kritaextensioncolorsfilters.desktop +share/kde/services/kritafastcolortransfer.desktop share/kde/services/kritafiltersgallery.desktop share/kde/services/kritagrayplugin.desktop share/kde/services/kritahistogram.desktop share/kde/services/kritahistogramdocker.desktop share/kde/services/kritaimageenhancement.desktop share/kde/services/kritaimagesize.desktop +share/kde/services/kritalenscorrectionfilter.desktop +share/kde/services/kritamodifyselection.desktop +share/kde/services/kritanoisefilter.desktop share/kde/services/kritaoilpaintfilter.desktop share/kde/services/kritapart.desktop share/kde/services/kritapixelizefilter.desktop share/kde/services/kritaraindropsfilter.desktop +share/kde/services/kritarandompickfilter.desktop share/kde/services/kritargbplugin.desktop share/kde/services/kritarotateimage.desktop share/kde/services/kritaroundcornersfilter.desktop @@ -4548,15 +4688,20 @@ share/kde/services/kritaselectiontools.desktop share/kde/services/kritaseparatechannels.desktop share/kde/services/kritashearimage.desktop share/kde/services/kritasmalltilesfilter.desktop -share/kde/services/kritasmearybrush.desktop share/kde/services/kritasobelfilter.desktop +share/kde/services/kritasubstrate.desktop share/kde/services/kritatoolcrop.desktop +share/kde/services/kritatoolcurves.desktop share/kde/services/kritatoolfilter.desktop +share/kde/services/kritatoolperspectivegrid.desktop +share/kde/services/kritatoolperspectivetransform.desktop share/kde/services/kritatoolpolygon.desktop share/kde/services/kritatoolpolyline.desktop share/kde/services/kritatoolselectsimilar.desktop share/kde/services/kritatoolstar.desktop share/kde/services/kritatooltransform.desktop +share/kde/services/kritaunsharpfilter.desktop +share/kde/services/kritawavefilter.desktop share/kde/services/kritawetplugin.desktop share/kde/services/kspread_applixspread_import.desktop share/kde/services/kspread_csv_export.desktop @@ -4566,11 +4711,13 @@ share/kde/services/kspread_excel_import.desktop share/kde/services/kspread_gnumeric_export.desktop share/kde/services/kspread_gnumeric_import.desktop share/kde/services/kspread_html_export.desktop +share/kde/services/kspread_kexi_import.desktop share/kde/services/kspread_latex_export.desktop share/kde/services/kspread_opencalc_export.desktop share/kde/services/kspread_opencalc_import.desktop share/kde/services/kspread_qpro_import.desktop share/kde/services/kspreadpart.desktop +share/kde/services/kspreadscripting.desktop share/kde/services/kugar_kugar_import.desktop share/kde/services/kugarpart.desktop share/kde/services/kwmailmerge_kabc.desktop @@ -4605,6 +4752,7 @@ ${HAVE_WPD}share/kde/services/kword_wp_import.desktop share/kde/services/kwordpart.desktop share/kde/services/kwserialletter_classic.desktop share/kde/services/kwserialletter_qtsqldb_power.desktop +share/kde/services/ole_powerpoint97_import.desktop share/kde/services/thesaurustool.desktop share/kde/services/xslt_export.desktop share/kde/services/xslt_import.desktop @@ -4712,6 +4860,9 @@ share/kde/templates/TextDocument.desktop @dirrm share/kde/apps/kspread/templates/Business @dirrm share/kde/apps/kspread/templates @dirrm share/kde/apps/kspread/sheetstyles +@dirrm share/kde/apps/kspread/scripts/scripteditor +@dirrm share/kde/apps/kspread/scripts/exporthtml +@dirrm share/kde/apps/kspread/scripts @dirrm share/kde/apps/kspread/kpartplugins @dirrm share/kde/apps/kspread/icons/crystalsvg/scalable/actions @dirrm share/kde/apps/kspread/icons/crystalsvg/scalable diff --git a/misc/koffice/distinfo b/misc/koffice/distinfo index 38b8ef3fa2e..ace929411a4 100644 --- a/misc/koffice/distinfo +++ b/misc/koffice/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.32 2006/07/15 21:14:00 markd Exp $ +$NetBSD: distinfo,v 1.33 2006/10/17 09:33:15 markd Exp $ -SHA1 (koffice-1.5.2.tar.bz2) = e35bd08adfb3bf6acf195dd176147de1d6cf215a -RMD160 (koffice-1.5.2.tar.bz2) = eb33d9e74adec0fc3409d38c2bfe84b5dfdd5546 -Size (koffice-1.5.2.tar.bz2) = 35878218 bytes -SHA1 (patch-ab) = 6f253484f6c09877cca6b1d1d7610725c895e13a +SHA1 (koffice-1.6.0.tar.bz2) = e34d57d0941884496bd3f99b85787697fb55692e +RMD160 (koffice-1.6.0.tar.bz2) = be09c18005eb33f6dc35ab0359cc97a8a658ce7c +Size (koffice-1.6.0.tar.bz2) = 56718478 bytes +SHA1 (patch-ab) = f2e9067f24d1de2e3c9f139727c33ecaf6dc8503 SHA1 (patch-af) = a79564e57f2ef8eb43e8c1e23bb6a8e3d2a1d110 SHA1 (patch-ag) = f0ad29395bbf52f70dd96f65c291fdb2ff0c6083 SHA1 (patch-ah) = 094eaa1ff9a5f38adc2bf2f74965b0e47ccd2843 @@ -11,5 +11,5 @@ SHA1 (patch-ai) = d12fa21d16a1bb11af9b35d65e5dfa9538a635b7 SHA1 (patch-aj) = 2cbe0c00dbb0b3b52f15caaf5b925bc68e1f55b8 SHA1 (patch-ak) = 6aebf5300ffcb3d1adcfa274f080c63b0c3a4270 SHA1 (patch-al) = 806334757d3ebca4515738e87454a30d9dd26e53 -SHA1 (patch-am) = f0a9ace27553df24aa50bf8ccb485ece5b372c8c -SHA1 (patch-ao) = 141495350a1078cbf3315ac9c556f983741719aa +SHA1 (patch-am) = 022be8c44e0eaa3cab3404da48a4259f1dc3499c +SHA1 (patch-ao) = 7d976c4f3094635f984fc70964589a863e914be7 diff --git a/misc/koffice/patches/patch-ab b/misc/koffice/patches/patch-ab index d2e1c5d9746..943385be54c 100644 --- a/misc/koffice/patches/patch-ab +++ b/misc/koffice/patches/patch-ab @@ -1,15 +1,33 @@ -$NetBSD: patch-ab,v 1.6 2004/02/10 21:06:33 markd Exp $ +$NetBSD: patch-ab,v 1.7 2006/10/17 09:33:15 markd Exp $ ---- configure.orig 2004-01-21 08:11:50.000000000 +1300 +--- configure.orig 2006-10-08 12:08:50.000000000 +1300 +++ configure -@@ -32275,6 +32275,10 @@ else - version=""2.3"" +@@ -41734,7 +41734,7 @@ fi + + + +-if test "x$compile_kexi_macros_plugin" == "xyes"; then ++if test "x$compile_kexi_macros_plugin" = "xyes"; then + compile_kexi_macros_plugin_TRUE= + compile_kexi_macros_plugin_FALSE='#' + else +@@ -41743,7 +41743,7 @@ else + fi + + +-if test "$compile_kexi_macros_plugin" == "yes"; then ++if test "$compile_kexi_macros_plugin" = "yes"; then + + cat >>confdefs.h <<\_ACEOF + #define KEXI_MACROS_SUPPORT 1 +@@ -42176,6 +42176,10 @@ else + version=""2.5"" fi +if test -n "${PYVERSSUFFIX}"; then + version="${PYVERSSUFFIX}" +fi + - echo "$as_me:$LINENO: checking for Python$version" >&5 - echo $ECHO_N "checking for Python$version... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for Python$version" >&5 + echo $ECHO_N "checking for Python$version... $ECHO_C" >&6; } diff --git a/misc/koffice/patches/patch-am b/misc/koffice/patches/patch-am index fd03a439fe2..d26869de4b5 100644 --- a/misc/koffice/patches/patch-am +++ b/misc/koffice/patches/patch-am @@ -1,13 +1,13 @@ -$NetBSD: patch-am,v 1.4 2006/04/12 12:37:35 markd Exp $ +$NetBSD: patch-am,v 1.5 2006/10/17 09:33:16 markd Exp $ ---- lib/kformula/fonts/Makefile.in.orig 2006-04-09 22:34:31.000000000 +1200 +--- lib/kformula/fonts/Makefile.in.orig 2006-10-08 12:08:46.000000000 +1300 +++ lib/kformula/fonts/Makefile.in -@@ -523,7 +523,7 @@ x_libraries = @x_libraries@ +@@ -547,7 +547,7 @@ x_libraries = @x_libraries@ xdg_appsdir = @xdg_appsdir@ xdg_directorydir = @xdg_directorydir@ xdg_menudir = @xdg_menudir@ -fontdir = $(prefix)/share/apps/kformula/fonts +fontdir = $(kde_datadir)/kformula/fonts - font_DATA = cmbx10.ttf cmex10.ttf cmmi10.ttf cmr10.ttf cmsy10.ttf msam10.ttf msbm10.ttf - EXTRA_DIST = $(font_DATA) LICENCE + font_DATA = cmex10.ttf Arev.ttf ArevIt.ttf ArevBd.ttf ArevBI.ttf + EXTRA_DIST = $(font_DATA) README LICENSE.BAKOMA LICENSE.BITSTREAM LICENCE.AREV #>- all: all-am diff --git a/misc/koffice/patches/patch-ao b/misc/koffice/patches/patch-ao index 69a06e0edb3..e993839d4c3 100644 --- a/misc/koffice/patches/patch-ao +++ b/misc/koffice/patches/patch-ao @@ -1,13 +1,13 @@ -$NetBSD: patch-ao,v 1.3 2006/05/24 12:54:45 markd Exp $ +$NetBSD: patch-ao,v 1.4 2006/10/17 09:33:16 markd Exp $ ---- krita/plugins/filters/cimg/CImg.h.orig 2006-05-11 06:28:04.000000000 +1200 +--- krita/plugins/filters/cimg/CImg.h.orig 2006-10-08 02:33:53.000000000 +1300 +++ krita/plugins/filters/cimg/CImg.h -@@ -65,7 +65,7 @@ +@@ -73,7 +73,7 @@ #if defined(sun) || defined(__sun) || defined(linux) || defined(__linux) \ || defined(__linux__) || defined(__CYGWIN__) || defined(BSD) || defined(__FreeBSD__) \ || defined(__OPENBSD__) || defined(__MACOSX__) || defined(__APPLE__) || defined(sgi) \ - || defined(__sgi) + || defined(__sgi) || defined(__NetBSD__) - // Unix (Linux,Solaris,BSD,Irix,...) + // Unix-like (Linux, Solaris, BSD, Irix,...) #define cimg_OS 1 #ifndef cimg_display_type |