diff options
author | markd <markd> | 2004-02-05 01:32:47 +0000 |
---|---|---|
committer | markd <markd> | 2004-02-05 01:32:47 +0000 |
commit | 8437361b64cb41aa0d403bf906eda37d3853e229 (patch) | |
tree | 7f8868940f37c37ba532f9cb947f7fee00d1379f /graphics/kdegraphics3 | |
parent | 346910f6396255145f101a66129f9f05345b0a81 (diff) | |
download | pkgsrc-8437361b64cb41aa0d403bf906eda37d3853e229.tar.gz |
Update to KDE 3.2
Changes:
Graphics
KPDF
* NEW IN KDE: PDF viewer based on XPDF Christophe Devriese
KSVG
* NEW IN KDE: Scalable Vector Graphics plugins for Konqueror Nikolas
Zimmermann
KFilePlugins
* pcx: Displays width, height, bpp, dpi for PCX images Nadeem Hasan
* dvi: show basic information Stefan Kebekus
* pnm: Display format, dimension, bpp and comments of PBM, PGM and PPM
images. Volker Krause
KDVI
* Function to embed external PostScript files into a DVI file Stefan Kebekus
* support for colored fonts Stefan Kebekus
* KDVI can now use Type1 and TrueType fonts in addition to PK
fonts. This reduces waiting times for font generation to a minimum,
and give easier access to fonts used in Asian languages Stefan Kebekus
* massive performance improvement Stefan Kebekus
* support for papersize specials Stefan Kebekus
* usability enhancements (better statusbar display, reload button, 'read-up'
feature, etc.) Stefan Kebekus
kviewshell
* FullScreen mode Stefan Kebekus
* more intelligent handling of paper sizes/orientations Stefan Kebekus
* usability enhancements Stefan Kebekus
KView
* autoscroll the image when creating a selection Matthias Kretz
* drag and drop support Matthias Kretz
* some basic image effects as a new plugin Matthias Kretz
* open images from stdin Matthias Kretz
KSnapshot
* Window snapshots optionally don't include window decorations Lubos Lunak
* Region snapshots. User interface makeover. Nadeem Hasan
KGamma
* NEW IN KDE: A KControl module for monitor gamma correction. Michael
v.Ostheim
KPovModeler
* Basic plugin framework Andreas Zehender
* The user is asked if pending changes should be saved before rendering
Andreas Zehender
* Control point selection in the properties view for bicubic patch, sor,
lathe and prism Andreas Zehender
* Export flag for graphical objects and the camera Andreas Zehender
* Height field view structure Leon Pennington
* Light object gained, parallel, circular and orient options Leon
Pennington
* Dispersion options are supported for interior Leon Pennington
* Support for POV-Ray 3.5 noise generators Leon Pennington
* New POV-Ray 3.5 warp types Leon Pennington
* New POV-Ray 3.5 objects: isosurface, projected through, radiosity,
global photons, photons, light groups, interior texture, mesh Leon
Pennington, Andreas Zehender
KGhostView
* Thumbnail generation for all pages Albert Astals Cid, Luis Pedro
Coelho
Diffstat (limited to 'graphics/kdegraphics3')
-rw-r--r-- | graphics/kdegraphics3/Makefile | 11 | ||||
-rw-r--r-- | graphics/kdegraphics3/PLIST | 179 | ||||
-rw-r--r-- | graphics/kdegraphics3/buildlink2.mk | 73 | ||||
-rw-r--r-- | graphics/kdegraphics3/distinfo | 12 | ||||
-rw-r--r-- | graphics/kdegraphics3/patches/patch-ac | 42 | ||||
-rw-r--r-- | graphics/kdegraphics3/patches/patch-ad | 276 | ||||
-rw-r--r-- | graphics/kdegraphics3/patches/patch-af | 15 | ||||
-rw-r--r-- | graphics/kdegraphics3/patches/patch-ag | 47 | ||||
-rw-r--r-- | graphics/kdegraphics3/patches/patch-ah | 442 | ||||
-rw-r--r-- | graphics/kdegraphics3/patches/patch-ai | 15 |
10 files changed, 205 insertions, 907 deletions
diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile index c2fb8ef4487..60c88bb7b30 100644 --- a/graphics/kdegraphics3/Makefile +++ b/graphics/kdegraphics3/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.28 2004/01/23 21:50:45 jmmv Exp $ +# $NetBSD: Makefile,v 1.29 2004/02/05 01:32:47 markd Exp $ -DISTNAME= kdegraphics-3.1.5 -PKGREVISION= 1 +DISTNAME= kdegraphics-${_KDE_VERSION} CATEGORIES= graphics COMMENT= Graphics programs for the KDE integrated X11 desktop @@ -18,12 +17,6 @@ CONFIGURE_ARGS+= --with-imlib-config=${X11PREFIX}/bin # Ensure we export symbols in the linked shared object. LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS} -FOO_MAIN_FILES= \ - kview/kview_main.cpp \ - kuickshow/src/kuickshow_main.cpp - -.include "../../meta-pkgs/kde3/Makefile.foo_main" - .include "../../graphics/tiff/buildlink2.mk" .include "../../graphics/glut/buildlink2.mk" .include "../../graphics/imlib/buildlink2.mk" diff --git a/graphics/kdegraphics3/PLIST b/graphics/kdegraphics3/PLIST index 0c60097134a..63c7aab8323 100644 --- a/graphics/kdegraphics3/PLIST +++ b/graphics/kdegraphics3/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2003/09/17 23:45:22 markd Exp $ +@comment $NetBSD: PLIST,v 1.8 2004/02/05 01:32:47 markd Exp $ bin/kcolorchooser bin/kcoloredit bin/kdvi @@ -7,6 +7,7 @@ bin/kghostview bin/kiconedit bin/kooka bin/kpaint +bin/kpdf bin/kpovmodeler bin/kruler bin/ksnapshot @@ -14,6 +15,7 @@ bin/kuickshow bin/kview bin/kviewshell bin/mrmlsearch +bin/xf86gammacfg include/devselector.h include/dispgamma.h include/gammadialog.h @@ -30,8 +32,20 @@ include/previewer.h include/scanparams.h include/scansourcedialog.h include/sizeindicator.h +lib/kde3/kcm_kgamma.la +lib/kde3/kcm_kgamma.so lib/kde3/kcm_kmrml.la lib/kde3/kcm_kmrml.so +lib/kde3/kcm_kviewcanvasconfig.la +lib/kde3/kcm_kviewcanvasconfig.so +lib/kde3/kcm_kviewgeneralconfig.la +lib/kde3/kcm_kviewgeneralconfig.so +lib/kde3/kcm_kviewpluginsconfig.la +lib/kde3/kcm_kviewpluginsconfig.so +lib/kde3/kcm_kviewpresenterconfig.la +lib/kde3/kcm_kviewpresenterconfig.so +lib/kde3/kcm_kviewviewerpluginsconfig.la +lib/kde3/kcm_kviewviewerpluginsconfig.so lib/kde3/kded_daemonwatcher.la lib/kde3/kded_daemonwatcher.so lib/kde3/kdvipart.la @@ -40,14 +54,20 @@ lib/kde3/kfaxpart.la lib/kde3/kfaxpart.so lib/kde3/kfile_bmp.la lib/kde3/kfile_bmp.so +lib/kde3/kfile_dvi.la +lib/kde3/kfile_dvi.so lib/kde3/kfile_ico.la lib/kde3/kfile_ico.so lib/kde3/kfile_jpeg.la lib/kde3/kfile_jpeg.so +lib/kde3/kfile_pcx.la +lib/kde3/kfile_pcx.so lib/kde3/kfile_pdf.la lib/kde3/kfile_pdf.so lib/kde3/kfile_png.la lib/kde3/kfile_png.so +lib/kde3/kfile_pnm.la +lib/kde3/kfile_pnm.so lib/kde3/kfile_ps.la lib/kde3/kfile_ps.so lib/kde3/kfile_tga.la @@ -58,8 +78,14 @@ lib/kde3/kfile_xbm.la lib/kde3/kfile_xbm.so lib/kde3/kio_mrml.la lib/kde3/kio_mrml.so +lib/kde3/kuickshow.la +lib/kde3/kuickshow.so +lib/kde3/kview.la +lib/kde3/kview.so lib/kde3/kview_browserplugin.la lib/kde3/kview_browserplugin.so +lib/kde3/kview_effectsplugin.la +lib/kde3/kview_effectsplugin.so lib/kde3/kview_presenterplugin.la lib/kde3/kview_presenterplugin.so lib/kde3/kview_scannerplugin.la @@ -70,40 +96,53 @@ lib/kde3/libkghostviewpart.la lib/kde3/libkghostviewpart.so lib/kde3/libkmrmlpart.la lib/kde3/libkmrmlpart.so +lib/kde3/libkpdfpart.la +lib/kde3/libkpdfpart.so lib/kde3/libkpovmodelerpart.la lib/kde3/libkpovmodelerpart.so lib/kde3/libkviewcanvas.la lib/kde3/libkviewcanvas.so lib/kde3/libkviewviewer.la lib/kde3/libkviewviewer.so -lib/kuickshow.la -lib/kuickshow.so -lib/kview.la -lib/kview.so +lib/kde3/mrmlsearch.la +lib/kde3/mrmlsearch.so +lib/libkdeinit_kuickshow.la +lib/libkdeinit_kuickshow.so +lib/libkdeinit_kview.la +lib/libkdeinit_kview.so +lib/libkdeinit_mrmlsearch.la +lib/libkdeinit_mrmlsearch.so +lib/libkimageviewer.la +lib/libkimageviewer.so +lib/libkimageviewer.so.0 +lib/libkimageviewer.so.0.0 lib/libkmultipage.la lib/libkmultipage.so lib/libkmultipage.so.0 lib/libkmultipage.so.0.0 -lib/libkpagetest.la -lib/libkpagetest.so +lib/libkpovmodeler.la +lib/libkpovmodeler.so +lib/libkpovmodeler.so.0 +lib/libkpovmodeler.so.0.0 lib/libkscan.la lib/libkscan.so lib/libkscan.so.1 lib/libkscan.so.1.0 -lib/libkuickshow_main.la -lib/libkuickshow_main.so -lib/libkuickshow_main.so.0 -lib/libkuickshow_main.so.0.0 -lib/libkview_main.la -lib/libkview_main.so -lib/libkview_main.so.0 -lib/libkview_main.so.0.0 -lib/libkviewsupport.la -lib/libkviewsupport.so -lib/libkviewsupport.so.0 -lib/libkviewsupport.so.0.0 -lib/mrmlsearch.la -lib/mrmlsearch.so +share/applications/kde/kcmkmrml.desktop +share/applications/kde/kcolorchooser.desktop +share/applications/kde/kcoloredit.desktop +share/applications/kde/kdvi.desktop +share/applications/kde/kfax.desktop +share/applications/kde/kghostview.desktop +share/applications/kde/kiconedit.desktop +share/applications/kde/kooka.desktop +share/applications/kde/kpaint.desktop +share/applications/kde/kpdf.desktop +share/applications/kde/kpovmodeler.desktop +share/applications/kde/kruler.desktop +share/applications/kde/ksnapshot.desktop +share/applications/kde/kuickshow.desktop +share/applications/kde/kview.desktop share/doc/kde/HTML/en/kamera/common share/doc/kde/HTML/en/kamera/index.cache.bz2 share/doc/kde/HTML/en/kamera/index.docbook @@ -121,6 +160,9 @@ share/doc/kde/HTML/en/kdvi/optionrequester1.png share/doc/kde/HTML/en/kdvi/optionrequester2.png share/doc/kde/HTML/en/kdvi/srcltx.sty share/doc/kde/HTML/en/kdvi/srctex.sty +share/doc/kde/HTML/en/kgamma/common +share/doc/kde/HTML/en/kgamma/index.cache.bz2 +share/doc/kde/HTML/en/kgamma/index.docbook share/doc/kde/HTML/en/kghostview/common share/doc/kde/HTML/en/kghostview/index.cache.bz2 share/doc/kde/HTML/en/kghostview/index.docbook @@ -142,6 +184,9 @@ share/doc/kde/HTML/en/kooka/toolbar2.png share/doc/kde/HTML/en/kpaint/common share/doc/kde/HTML/en/kpaint/index.cache.bz2 share/doc/kde/HTML/en/kpaint/index.docbook +share/doc/kde/HTML/en/kpdf/common +share/doc/kde/HTML/en/kpdf/index.cache.bz2 +share/doc/kde/HTML/en/kpdf/index.docbook share/doc/kde/HTML/en/kpovmodeler/cameraview.png share/doc/kde/HTML/en/kpovmodeler/common share/doc/kde/HTML/en/kpovmodeler/controlpoints.png @@ -218,25 +263,8 @@ share/doc/kde/HTML/en/kview/snapshot6.png share/doc/kde/HTML/en/kview/snapshot7.png share/doc/kde/HTML/en/kview/snapshot8.png share/doc/kde/HTML/en/kview/snapshot9.png -share/kde/applnk/Graphics/More/kcolorchooser.desktop -share/kde/applnk/Graphics/More/kcoloredit.desktop -share/kde/applnk/Graphics/More/kiconedit.desktop -share/kde/applnk/Graphics/More/kruler.desktop -share/kde/applnk/Graphics/More/ksnapshot.desktop -share/kde/applnk/Graphics/kcolorchooser.desktop -share/kde/applnk/Graphics/kcoloredit.desktop -share/kde/applnk/Graphics/kdvi.desktop -share/kde/applnk/Graphics/kfax.desktop -share/kde/applnk/Graphics/kghostview.desktop -share/kde/applnk/Graphics/kiconedit.desktop -share/kde/applnk/Graphics/kooka.desktop -share/kde/applnk/Graphics/kpaint.desktop -share/kde/applnk/Graphics/kpovmodeler.desktop +share/kde/applnk/.hidden/kgamma.desktop share/kde/applnk/Graphics/kruler.desktop -share/kde/applnk/Graphics/ksnapshot.desktop -share/kde/applnk/Graphics/kuickshow.desktop -share/kde/applnk/Graphics/kview.desktop -share/kde/applnk/Settings/System/kcmkmrml.desktop share/kde/apps/kcoloredit/kcoloreditui.rc share/kde/apps/kdvi/kdvi_part.rc share/kde/apps/kdvi/tips @@ -247,9 +275,17 @@ share/kde/apps/kfax/kfax_part.rc share/kde/apps/kfax/kfaxui.rc share/kde/apps/kfax/pics/kfax.tif share/kde/apps/kfax/pics/kfaxlogo.xpm +share/kde/apps/kgamma/pics/background.png +share/kde/apps/kgamma/pics/cmyscale.png +share/kde/apps/kgamma/pics/darkgrey.png +share/kde/apps/kgamma/pics/greyscale.png +share/kde/apps/kgamma/pics/lightgrey.png +share/kde/apps/kgamma/pics/midgrey.png +share/kde/apps/kgamma/pics/rgbscale.png share/kde/apps/kghostview/kghostviewui.rc share/kde/apps/kghostview/kgv_part.rc share/kde/apps/kghostview/pdf_sec.ps +share/kde/apps/kiconedit/kiconeditui.rc share/kde/apps/kiconedit/pics/compressed.png share/kde/apps/kiconedit/pics/source.png share/kde/apps/kiconedit/pics/standard.png @@ -279,12 +315,15 @@ share/kde/apps/kiconedit/toolbar/selectrect.png share/kde/apps/kiconedit/toolbar/transform.png share/kde/apps/konqueror/servicemenus/mrml-servicemenu.desktop share/kde/apps/kooka/kookaui.rc +share/kde/apps/kooka/pics/gocr.png +share/kde/apps/kooka/pics/lockzoom.png share/kde/apps/kooka/pics/mirror-both.png share/kde/apps/kooka/pics/mirror-horiz.png share/kde/apps/kooka/pics/mirror-vert.png share/kde/apps/kooka/pics/newfromselect.png share/kde/apps/kooka/pics/ocr-select.png share/kde/apps/kooka/pics/ocr.png +share/kde/apps/kooka/pics/ocrad.png share/kde/apps/kooka/pics/scaleorig.png share/kde/apps/kooka/pics/scaletoheight.png share/kde/apps/kooka/pics/scaletowidth.png @@ -297,6 +336,9 @@ share/kde/apps/kpaint/toolbar/ellipse.png share/kde/apps/kpaint/toolbar/line.png share/kde/apps/kpaint/toolbar/rectangle.png share/kde/apps/kpaint/toolbar/roundangle.png +share/kde/apps/kpdf/kpdf_shell.rc +share/kde/apps/kpdfpart/kpdf_part.rc +share/kde/apps/kpovmodeler/baseinsertrules.xml share/kde/apps/kpovmodeler/examples/includes/inlined/chars.kpm share/kde/apps/kpovmodeler/examples/includes/inlined/finish.kpm share/kde/apps/kpovmodeler/examples/includes/inlined/glass.kpm @@ -348,6 +390,7 @@ share/kde/apps/kpovmodeler/examples/scenes/objects/sor.kpm share/kde/apps/kpovmodeler/examples/scenes/objects/superellipsoid.kpm share/kde/apps/kpovmodeler/examples/scenes/objects/text.kpm share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmaddpoint.png +share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmaddpointabove.png share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmaddsubprism.png share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmbicubicpatch.png share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmblendmapmodifiers.png @@ -379,6 +422,7 @@ share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmfinish.png share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmfinishdeclare.png share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmfog.png share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmfogdeclare.png +share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmglobalphotons.png share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmglobalsettings.png share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmglview.png share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmheightfield.png @@ -389,10 +433,14 @@ share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pminsertlastchild.png share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pminsertsibling.png share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pminterior.png share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pminteriordeclare.png +share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pminteriortexture.png +share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pminteriortexturedeclare.png share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmintersection.png +share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmisosurface.png share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmjuliafractal.png share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmlathe.png share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmlight.png +share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmlightgroup.png share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmlistpattern.png share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmlookslike.png share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmmaterial.png @@ -402,6 +450,7 @@ share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmmatrix.png share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmmedia.png share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmmediadeclare.png share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmmerge.png +share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmmesh.png share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmnormal.png share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmnormaldeclare.png share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmnormallist.png @@ -410,6 +459,7 @@ share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmnormalmapdeclare.png share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmobjectdeclare.png share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmobjectlink.png share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmpattern.png +share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmphotons.png share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmpigment.png share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmpigmentdeclare.png share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmpigmentlist.png @@ -418,7 +468,9 @@ share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmpigmentmapdeclare.pn share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmplane.png share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmpolynom.png share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmprism.png +share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmprojectedthrough.png share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmquickcolor.png +share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmradiosity.png share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmrainbow.png share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmrainbowdeclare.png share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmraw.png @@ -437,6 +489,7 @@ share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmslopemapdeclare.png share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmsolidcolor.png share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmsor.png share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmsphere.png +share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmspheresweep.png share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmsqe.png share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmtext.png share/kde/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmtexture.png @@ -465,6 +518,16 @@ share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmcolormap.png share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmcolormapdeclare.png share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmcomment.png share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmcone.png +share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmconfigurecolors.png +share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmconfiguredialogview.png +share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmconfiguregraphicalview.png +share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmconfiguregrid.png +share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmconfigureobjectlibrary.png +share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmconfigureobjects.png +share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmconfigureopengl.png +share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmconfigurepovray.png +share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmconfiguretexturepreview.png +share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmconfigureviewlayout.png share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmcylinder.png share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmdeclare.png share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmdensity.png @@ -479,16 +542,21 @@ share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmfinish.png share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmfinishdeclare.png share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmfog.png share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmfogdeclare.png +share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmglobalphotons.png share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmglobalsettings.png share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmheightfield.png share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmimagemap.png share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pminserterrors.png share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pminterior.png share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pminteriordeclare.png +share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pminteriortexture.png +share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pminteriortexturedeclare.png share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmintersection.png +share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmisosurface.png share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmjuliafractal.png share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmlathe.png share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmlight.png +share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmlightgroup.png share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmlistpattern.png share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmlookslike.png share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmmaterial.png @@ -498,6 +566,7 @@ share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmmatrix.png share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmmedia.png share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmmediadeclare.png share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmmerge.png +share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmmesh.png share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmnormal.png share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmnormaldeclare.png share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmnormallist.png @@ -506,6 +575,7 @@ share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmnormalmapdeclare.png share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmobjectdeclare.png share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmobjectlink.png share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmpattern.png +share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmphotons.png share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmpigment.png share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmpigmentdeclare.png share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmpigmentlist.png @@ -514,7 +584,9 @@ share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmpigmentmapdeclare.pn share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmplane.png share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmpolynom.png share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmprism.png +share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmprojectedthrough.png share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmquickcolor.png +share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmradiosity.png share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmrainbow.png share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmrainbowdeclare.png share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmraw.png @@ -532,6 +604,7 @@ share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmslopemapdeclare.png share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmsolidcolor.png share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmsor.png share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmsphere.png +share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmspheresweep.png share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmsqe.png share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmtext.png share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmtexture.png @@ -545,6 +618,7 @@ share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmtriangle.png share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmunion.png share/kde/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmwarp.png share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmaddpoint.png +share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmaddpointabove.png share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmaddsubprism.png share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmbicubicpatch.png share/kde/apps/kpovmodeler/icons/locolor/16x16/actions/pmblendmapmodifiers.png @@ -621,6 +695,7 @@ share/kde/apps/kpovmodeler/kpovmodelerbrowser.rc share/kde/apps/kpovmodeler/kpovmodelershell.rc share/kde/apps/kpovmodeler/kpovmodelerui.rc share/kde/apps/kpovmodeler/povraydocmap.xml +share/kde/apps/kpovmodeler/questionmark.png share/kde/apps/kruler/eventsrc share/kde/apps/kruler/pics/kruler-east.png share/kde/apps/kruler/pics/kruler-north.png @@ -637,10 +712,13 @@ share/kde/apps/kuickshow/pics/ksslide.png share/kde/apps/kuickshow/pics/kuickshow-day.jpg share/kde/apps/kuickshow/pics/kuickshow-night.jpg share/kde/apps/kuickshow/pics/logo.png +share/kde/apps/kview/kpartplugins/kvieweffects.desktop +share/kde/apps/kview/kpartplugins/kvieweffects.rc share/kde/apps/kview/kpartplugins/kviewpresenter.desktop share/kde/apps/kview/kpartplugins/kviewpresenter.rc share/kde/apps/kview/kpartplugins/kviewscanner.desktop share/kde/apps/kview/kpartplugins/kviewscanner.rc +share/kde/apps/kview/kview.setdlg share/kde/apps/kview/kviewui.rc share/kde/apps/kviewerpart/kviewerpart.rc share/kde/apps/kviewshell/kviewshell.rc @@ -655,6 +733,7 @@ share/kde/icons/crystalsvg/16x16/actions/palette_color.png share/kde/icons/crystalsvg/16x16/actions/palette_gray.png share/kde/icons/crystalsvg/16x16/actions/palette_halftone.png share/kde/icons/crystalsvg/16x16/actions/palette_lineart.png +share/kde/icons/crystalsvg/16x16/apps/kcolorchooser.png share/kde/icons/crystalsvg/16x16/apps/kcoloredit.png share/kde/icons/crystalsvg/16x16/apps/kdvi.png share/kde/icons/crystalsvg/16x16/apps/kfax.png @@ -668,6 +747,7 @@ share/kde/icons/crystalsvg/16x16/apps/kuickshow.png share/kde/icons/crystalsvg/16x16/apps/kview.png share/kde/icons/crystalsvg/16x16/apps/kviewshell.png share/kde/icons/crystalsvg/16x16/mimetypes/kpovmodeler_doc.png +share/kde/icons/crystalsvg/22x22/apps/kcolorchooser.png share/kde/icons/crystalsvg/32x32/apps/kcoloredit.png share/kde/icons/crystalsvg/32x32/apps/kdvi.png share/kde/icons/crystalsvg/32x32/apps/kfax.png @@ -691,6 +771,12 @@ share/kde/icons/crystalsvg/48x48/apps/ksnapshot.png share/kde/icons/crystalsvg/48x48/apps/kview.png share/kde/icons/crystalsvg/48x48/apps/kviewshell.png share/kde/icons/crystalsvg/64x64/apps/kghostview.png +share/kde/icons/hicolor/16x16/apps/kgamma.png +share/kde/icons/hicolor/16x16/apps/kpdf.png +share/kde/icons/hicolor/32x32/apps/kgamma.png +share/kde/icons/hicolor/32x32/apps/kpdf.png +share/kde/icons/hicolor/48x48/apps/kgamma.png +share/kde/icons/hicolor/48x48/apps/kpdf.png share/kde/icons/locolor/16x16/apps/kcoloredit.png share/kde/icons/locolor/16x16/apps/kpovmodeler.png share/kde/icons/locolor/16x16/apps/kuickshow.png @@ -698,16 +784,25 @@ share/kde/icons/locolor/32x32/apps/kcoloredit.png share/kde/icons/locolor/32x32/apps/kpovmodeler.png share/kde/icons/locolor/32x32/apps/kuickshow.png share/kde/mimelnk/text/mrml.desktop +share/kde/services/kconfiguredialog/kviewcanvasconfig.desktop +share/kde/services/kconfiguredialog/kviewgeneralconfig.desktop +share/kde/services/kconfiguredialog/kviewpluginsconfig.desktop +share/kde/services/kconfiguredialog/kviewpresenterconfig.desktop +share/kde/services/kconfiguredialog/kviewviewerpluginsconfig.desktop share/kde/services/kded/daemonwatcher.desktop share/kde/services/kfile_bmp.desktop +share/kde/services/kfile_dvi.desktop share/kde/services/kfile_ico.desktop share/kde/services/kfile_jpeg.desktop +share/kde/services/kfile_pcx.desktop share/kde/services/kfile_pdf.desktop share/kde/services/kfile_png.desktop +share/kde/services/kfile_pnm.desktop share/kde/services/kfile_ps.desktop share/kde/services/kfile_tga.desktop share/kde/services/kfile_tiff.desktop share/kde/services/kfile_xbm.desktop +share/kde/services/kpdf_part.desktop share/kde/services/kviewcanvas.desktop share/kde/services/kviewviewer.desktop share/kde/services/mrml.protocol @@ -759,6 +854,8 @@ share/kde/servicetypes/kimageviewercanvas.desktop @dirrm share/kde/apps/kpovmodeler/examples/includes @dirrm share/kde/apps/kpovmodeler/examples @dirrm share/kde/apps/kpovmodeler +@dirrm share/kde/apps/kpdfpart +@dirrm share/kde/apps/kpdf @dirrm share/kde/apps/kpaint/toolbar @dirrm share/kde/apps/kpaint @dirrm share/kde/apps/kooka/pics @@ -768,6 +865,8 @@ share/kde/servicetypes/kimageviewercanvas.desktop @dirrm share/kde/apps/kiconedit/pics @dirrm share/kde/apps/kiconedit @dirrm share/kde/apps/kghostview +@dirrm share/kde/apps/kgamma/pics +@dirrm share/kde/apps/kgamma @dirrm share/kde/apps/kfax/pics @dirrm share/kde/apps/kfax @dirrm share/kde/apps/kdvi/toolbar @@ -782,10 +881,12 @@ share/kde/servicetypes/kimageviewercanvas.desktop @dirrm share/doc/kde/HTML/en/ksnapshot @dirrm share/doc/kde/HTML/en/kruler @dirrm share/doc/kde/HTML/en/kpovmodeler +@dirrm share/doc/kde/HTML/en/kpdf @dirrm share/doc/kde/HTML/en/kpaint @dirrm share/doc/kde/HTML/en/kooka @dirrm share/doc/kde/HTML/en/kiconedit @dirrm share/doc/kde/HTML/en/kghostview +@dirrm share/doc/kde/HTML/en/kgamma @dirrm share/doc/kde/HTML/en/kdvi @dirrm share/doc/kde/HTML/en/kcoloredit @dirrm share/doc/kde/HTML/en/kamera diff --git a/graphics/kdegraphics3/buildlink2.mk b/graphics/kdegraphics3/buildlink2.mk index 56c5b59f342..89822eeb85a 100644 --- a/graphics/kdegraphics3/buildlink2.mk +++ b/graphics/kdegraphics3/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.11 2004/01/03 18:49:43 reed Exp $ +# $NetBSD: buildlink2.mk,v 1.12 2004/02/05 01:32:47 markd Exp $ # # This Makefile fragment is included by packages that use kdegraphics. # @@ -7,29 +7,76 @@ KDEGRAPHICS_BUILDLINK2_MK= # defined BUILDLINK_PACKAGES+= kdegraphics -BUILDLINK_DEPENDS.kdegraphics?= kdegraphics>=3.1.4nb1 +BUILDLINK_DEPENDS.kdegraphics?= kdegraphics>=3.2.0 BUILDLINK_PKGSRCDIR.kdegraphics?= ../../graphics/kdegraphics3 EVAL_PREFIX+= BUILDLINK_PREFIX.kdegraphics=kdegraphics BUILDLINK_PREFIX.kdegraphics_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.kdegraphics+= include/devselector.h +BUILDLINK_FILES.kdegraphics+= include/dispgamma.h +BUILDLINK_FILES.kdegraphics+= include/gammadialog.h +BUILDLINK_FILES.kdegraphics+= include/img_canvas.h +BUILDLINK_FILES.kdegraphics+= include/imgscaledialog.h +BUILDLINK_FILES.kdegraphics+= include/kgammatable.h BUILDLINK_FILES.kdegraphics+= include/kmultipageInterface.h -BUILDLINK_FILES.kdegraphics+= lib/kcolorchooser.* +BUILDLINK_FILES.kdegraphics+= include/kscandevice.h +BUILDLINK_FILES.kdegraphics+= include/kscanoption.h +BUILDLINK_FILES.kdegraphics+= include/kscanoptset.h +BUILDLINK_FILES.kdegraphics+= include/kscanslider.h +BUILDLINK_FILES.kdegraphics+= include/massscandialog.h +BUILDLINK_FILES.kdegraphics+= include/previewer.h +BUILDLINK_FILES.kdegraphics+= include/scanparams.h +BUILDLINK_FILES.kdegraphics+= include/scansourcedialog.h +BUILDLINK_FILES.kdegraphics+= include/sizeindicator.h +BUILDLINK_FILES.kdegraphics+= lib/kde3/kcm_kgamma.* +BUILDLINK_FILES.kdegraphics+= lib/kde3/kcm_kmrml.* +BUILDLINK_FILES.kdegraphics+= lib/kde3/kcm_kviewcanvasconfig.* +BUILDLINK_FILES.kdegraphics+= lib/kde3/kcm_kviewgeneralconfig.* +BUILDLINK_FILES.kdegraphics+= lib/kde3/kcm_kviewpluginsconfig.* +BUILDLINK_FILES.kdegraphics+= lib/kde3/kcm_kviewpresenterconfig.* +BUILDLINK_FILES.kdegraphics+= lib/kde3/kcm_kviewviewerpluginsconfig.* +BUILDLINK_FILES.kdegraphics+= lib/kde3/kded_daemonwatcher.* +BUILDLINK_FILES.kdegraphics+= lib/kde3/kdvipart.* +BUILDLINK_FILES.kdegraphics+= lib/kde3/kfaxpart.* +BUILDLINK_FILES.kdegraphics+= lib/kde3/kfile_bmp.* +BUILDLINK_FILES.kdegraphics+= lib/kde3/kfile_dvi.* +BUILDLINK_FILES.kdegraphics+= lib/kde3/kfile_ico.* +BUILDLINK_FILES.kdegraphics+= lib/kde3/kfile_jpeg.* +BUILDLINK_FILES.kdegraphics+= lib/kde3/kfile_pcx.* BUILDLINK_FILES.kdegraphics+= lib/kde3/kfile_pdf.* BUILDLINK_FILES.kdegraphics+= lib/kde3/kfile_png.* +BUILDLINK_FILES.kdegraphics+= lib/kde3/kfile_pnm.* BUILDLINK_FILES.kdegraphics+= lib/kde3/kfile_ps.* -BUILDLINK_FILES.kdegraphics+= lib/kuickshow.* -BUILDLINK_FILES.kdegraphics+= lib/kview.* -BUILDLINK_FILES.kdegraphics+= lib/libkdvi.* -BUILDLINK_FILES.kdegraphics+= lib/libkfax.* -BUILDLINK_FILES.kdegraphics+= lib/libkghostview.* +BUILDLINK_FILES.kdegraphics+= lib/kde3/kfile_tga.* +BUILDLINK_FILES.kdegraphics+= lib/kde3/kfile_tiff.* +BUILDLINK_FILES.kdegraphics+= lib/kde3/kfile_xbm.* +BUILDLINK_FILES.kdegraphics+= lib/kde3/kio_mrml.* +BUILDLINK_FILES.kdegraphics+= lib/kde3/kuickshow.* +BUILDLINK_FILES.kdegraphics+= lib/kde3/kview.* +BUILDLINK_FILES.kdegraphics+= lib/kde3/kview_browserplugin.* +BUILDLINK_FILES.kdegraphics+= lib/kde3/kview_effectsplugin.* +BUILDLINK_FILES.kdegraphics+= lib/kde3/kview_presenterplugin.* +BUILDLINK_FILES.kdegraphics+= lib/kde3/kview_scannerplugin.* +BUILDLINK_FILES.kdegraphics+= lib/kde3/kviewerpart.* +BUILDLINK_FILES.kdegraphics+= lib/kde3/libkghostviewpart.* +BUILDLINK_FILES.kdegraphics+= lib/kde3/libkmrmlpart.* +BUILDLINK_FILES.kdegraphics+= lib/kde3/libkpdfpart.* +BUILDLINK_FILES.kdegraphics+= lib/kde3/libkpovmodelerpart.* +BUILDLINK_FILES.kdegraphics+= lib/kde3/libkviewcanvas.* +BUILDLINK_FILES.kdegraphics+= lib/kde3/libkviewviewer.* +BUILDLINK_FILES.kdegraphics+= lib/kde3/mrmlsearch.* +BUILDLINK_FILES.kdegraphics+= lib/libkdeinit_kuickshow.* +BUILDLINK_FILES.kdegraphics+= lib/libkdeinit_kview.* +BUILDLINK_FILES.kdegraphics+= lib/libkdeinit_mrmlsearch.* +BUILDLINK_FILES.kdegraphics+= lib/libkimageviewer.* BUILDLINK_FILES.kdegraphics+= lib/libkmultipage.* -BUILDLINK_FILES.kdegraphics+= lib/libkpagetest.* -BUILDLINK_FILES.kdegraphics+= lib/libkuickshow_main.* -BUILDLINK_FILES.kdegraphics+= lib/libkview_main.* -BUILDLINK_FILES.kdegraphics+= lib/libkviewerpart.* -BUILDLINK_FILES.kdegraphics+= lib/libkviewpart.* +BUILDLINK_FILES.kdegraphics+= lib/libkpovmodeler.* +BUILDLINK_FILES.kdegraphics+= lib/libkscan.* +.include "../../graphics/tiff/buildlink2.mk" +.include "../../graphics/glut/buildlink2.mk" .include "../../graphics/imlib/buildlink2.mk" +.include "../../graphics/sane-backends/buildlink2.mk" .include "../../meta-pkgs/kde3/buildlink2.mk" .include "../../x11/kdebase3/buildlink2.mk" diff --git a/graphics/kdegraphics3/distinfo b/graphics/kdegraphics3/distinfo index 4251b8a80d9..d43d4d67f68 100644 --- a/graphics/kdegraphics3/distinfo +++ b/graphics/kdegraphics3/distinfo @@ -1,10 +1,4 @@ -$NetBSD: distinfo,v 1.14 2004/01/15 10:50:34 markd Exp $ +$NetBSD: distinfo,v 1.15 2004/02/05 01:32:47 markd Exp $ -SHA1 (kdegraphics-3.1.5.tar.bz2) = f761d37bd9cc645c9e914317bc4d899e519839f1 -Size (kdegraphics-3.1.5.tar.bz2) = 4588751 bytes -SHA1 (patch-ac) = fb07e0d4b91261dc14bd53925d5a7b98dcbbb570 -SHA1 (patch-ad) = b362bd0ec5be944aa6cfcc4161e2f71e547212bc -SHA1 (patch-af) = 854f2f4eac31afd89184871a79dc7f459f866f34 -SHA1 (patch-ag) = ee685c88b0bcbd70256f49190e9b9bb4520d81e0 -SHA1 (patch-ah) = fe9ed6232ce92b8ab932218a8549ee6f6156790a -SHA1 (patch-ai) = 78e82154d831918f7ebe6d4a1d89b5cb208b57f1 +SHA1 (kdegraphics-3.2.0.tar.bz2) = 2067cf959b69269b8e3a61c4bede53e2d720082d +Size (kdegraphics-3.2.0.tar.bz2) = 5672335 bytes diff --git a/graphics/kdegraphics3/patches/patch-ac b/graphics/kdegraphics3/patches/patch-ac deleted file mode 100644 index 5319437f802..00000000000 --- a/graphics/kdegraphics3/patches/patch-ac +++ /dev/null @@ -1,42 +0,0 @@ -$NetBSD: patch-ac,v 1.2 2003/03/11 13:24:59 markd Exp $ - ---- kview/Makefile.am.orig Sun Oct 27 11:15:54 2002 -+++ kview/Makefile.am -@@ -5,7 +5,7 @@ INCLUDES = -I$(top_srcdir)/kview $(all_i - METASOURCES = AUTO - - bin_PROGRAMS = kview --lib_LTLIBRARIES = kview.la libkviewsupport.la -+lib_LTLIBRARIES = libkview_main.la kview.la libkviewsupport.la - - noinst_HEADERS = kview.h kpreferencesdialog.h kpreferencesmodule.h kpluginselector.h kviewconfmodules.h - -@@ -13,13 +13,17 @@ libkviewsupport_la_SOURCES = kpreference - libkviewsupport_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 0:0 - libkviewsupport_la_LIBADD = $(LIB_KDEUI) - --kview_SOURCES = dummy.cpp -+kview_SOURCES = kview_main.cpp - kview_LDFLAGS = $(all_libraries) $(KDE_RPATH) --kview_LDADD = kview.la -+kview_LDADD = libkview_main.la - --kview_la_SOURCES = kviewconfmodules.cpp kview.cpp main.cpp -+libkview_main_la_SOURCES = kviewconfmodules.cpp kview.cpp main.cpp -+libkview_main_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -+libkview_main_la_LIBADD = $(LIB_KPARTS) libkviewsupport.la -+ -+kview_la_SOURCES = kview_main.cpp - kview_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module -avoid-version --kview_la_LIBADD = $(LIB_KPARTS) libkviewsupport.la -+kview_la_LIBADD = libkview_main.la - - lnkdir = $(kde_appsdir)/Graphics - lnk_DATA = kview.desktop -@@ -32,6 +36,3 @@ rc_DATA = kviewui.rc - messages: rc.cpp - $(EXTRACTRC) kviewviewer/*.rc kviewviewer/*.ui >> rc.cpp - $(XGETTEXT) kviewviewer/*.cpp kviewcanvas/*.cpp *.cpp *.h -o $(podir)/kview.pot -- --dummy.cpp: -- echo > dummy.cpp diff --git a/graphics/kdegraphics3/patches/patch-ad b/graphics/kdegraphics3/patches/patch-ad deleted file mode 100644 index ca17fd2c310..00000000000 --- a/graphics/kdegraphics3/patches/patch-ad +++ /dev/null @@ -1,276 +0,0 @@ -$NetBSD: patch-ad,v 1.6 2004/01/15 10:50:34 markd Exp $ - ---- kview/Makefile.in.orig 2003-12-29 11:27:02.000000000 +1300 -+++ kview/Makefile.in -@@ -300,7 +300,7 @@ INCLUDES = -I$(top_srcdir)/kview $(all_i - #>- METASOURCES = AUTO - - bin_PROGRAMS = kview --lib_LTLIBRARIES = kview.la libkviewsupport.la -+lib_LTLIBRARIES = libkview_main.la kview.la libkviewsupport.la - - noinst_HEADERS = kview.h kpreferencesdialog.h kpreferencesmodule.h kpluginselector.h kviewconfmodules.h - -@@ -308,13 +308,17 @@ libkviewsupport_la_SOURCES = kpreference - libkviewsupport_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 0:0 - libkviewsupport_la_LIBADD = $(LIB_KDEUI) - --kview_SOURCES = dummy.cpp -+kview_SOURCES = kview_main.cpp - kview_LDFLAGS = $(all_libraries) $(KDE_RPATH) --kview_LDADD = kview.la -+kview_LDADD = libkview_main.la - --kview_la_SOURCES = kviewconfmodules.cpp kview.cpp main.cpp -+libkview_main_la_SOURCES = kviewconfmodules.cpp kview.cpp main.cpp -+libkview_main_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -+libkview_main_la_LIBADD = $(LIB_KPARTS) libkviewsupport.la -+ -+kview_la_SOURCES = kview_main.cpp - kview_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module -avoid-version --kview_la_LIBADD = $(LIB_KPARTS) libkviewsupport.la -+kview_la_LIBADD = libkview_main.la - - lnkdir = $(kde_appsdir)/Graphics - lnk_DATA = kview.desktop -@@ -330,14 +334,19 @@ CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - LTLIBRARIES = $(lib_LTLIBRARIES) - --kview_la_DEPENDENCIES = libkviewsupport.la --am_kview_la_OBJECTS = kviewconfmodules.lo kview.lo main.lo -+kview_la_DEPENDENCIES = libkview_main.la -+am_kview_la_OBJECTS = kview_main.lo - #>- kview_la_OBJECTS = $(am_kview_la_OBJECTS) -+#>+ 1 -+kview_la_OBJECTS = kview_main.lo -+libkview_main_la_DEPENDENCIES = libkviewsupport.la -+am_libkview_main_la_OBJECTS = kviewconfmodules.lo kview.lo main.lo -+#>- libkview_main_la_OBJECTS = $(am_libkview_main_la_OBJECTS) - #>+ 4 --kview_la_final_OBJECTS = kview_la.all_cpp.lo --kview_la_nofinal_OBJECTS = kviewconfmodules.lo kview.lo main.lo --@KDE_USE_FINAL_FALSE@kview_la_OBJECTS = $(kview_la_nofinal_OBJECTS) --@KDE_USE_FINAL_TRUE@kview_la_OBJECTS = $(kview_la_final_OBJECTS) -+libkview_main_la_final_OBJECTS = libkview_main_la.all_cpp.lo -+libkview_main_la_nofinal_OBJECTS = kviewconfmodules.lo kview.lo main.lo -+@KDE_USE_FINAL_FALSE@libkview_main_la_OBJECTS = $(libkview_main_la_nofinal_OBJECTS) -+@KDE_USE_FINAL_TRUE@libkview_main_la_OBJECTS = $(libkview_main_la_final_OBJECTS) - libkviewsupport_la_DEPENDENCIES = - am_libkviewsupport_la_OBJECTS = kpreferencesdialog.lo \ - kpreferencesmodule.lo kpluginselector.lo -@@ -351,35 +360,35 @@ libkviewsupport_la_nofinal_OBJECTS = kpr - bin_PROGRAMS = kview$(EXEEXT) - PROGRAMS = $(bin_PROGRAMS) - --am_kview_OBJECTS = dummy.$(OBJEXT) -+am_kview_OBJECTS = kview_main.$(OBJEXT) - #>- kview_OBJECTS = $(am_kview_OBJECTS) - #>+ 1 --kview_OBJECTS = dummy.$(OBJEXT) --kview_DEPENDENCIES = kview.la -+kview_OBJECTS = kview_main.$(OBJEXT) -+kview_DEPENDENCIES = libkview_main.la - - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/admin/depcomp - am__depfiles_maybe = depfiles --#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po \ --#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpluginselector.Plo \ -+#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/kpluginselector.Plo \ - #>- @AMDEP_TRUE@ ./$(DEPDIR)/kpreferencesdialog.Plo \ - #>- @AMDEP_TRUE@ ./$(DEPDIR)/kpreferencesmodule.Plo \ --#>- @AMDEP_TRUE@ ./$(DEPDIR)/kview.Plo \ -+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kview.Plo ./$(DEPDIR)/kview_main.Plo \ -+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kview_main.Po \ - #>- @AMDEP_TRUE@ ./$(DEPDIR)/kviewconfmodules.Plo \ - #>- @AMDEP_TRUE@ ./$(DEPDIR)/main.Plo - #>+ 15 --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kview_la.all_cpp.P $(DEPDIR)/libkviewsupport_la.all_cpp.P ./$(DEPDIR)/dummy.Po \ --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpluginselector.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/libkview_main_la.all_cpp.P $(DEPDIR)/libkviewsupport_la.all_cpp.P ./$(DEPDIR)/kpluginselector.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpreferencesdialog.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpreferencesmodule.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kview.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kview.Plo ./$(DEPDIR)/kview_main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kview_main.Po \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kviewconfmodules.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/main.Plo --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = ./$(DEPDIR)/dummy.Po \ --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpluginselector.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = ./$(DEPDIR)/kpluginselector.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpreferencesdialog.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpreferencesmodule.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kview.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kview.Plo ./$(DEPDIR)/kview_main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kview_main.Po \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kviewconfmodules.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/main.Plo - -@@ -401,8 +410,8 @@ CXXLD = $(CXX) - #>+ 2 - CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ --DIST_SOURCES = $(kview_la_SOURCES) $(libkviewsupport_la_SOURCES) \ -- $(kview_SOURCES) -+DIST_SOURCES = $(kview_la_SOURCES) $(libkview_main_la_SOURCES) \ -+ $(libkviewsupport_la_SOURCES) $(kview_SOURCES) - DATA = $(lnk_DATA) $(rc_DATA) - - HEADERS = $(noinst_HEADERS) -@@ -415,7 +424,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r - check-recursive installcheck-recursive - DIST_COMMON = $(noinst_HEADERS) AUTHORS Makefile.am Makefile.in TODO - DIST_SUBDIRS = $(SUBDIRS) --SOURCES = $(kview_la_SOURCES) $(libkviewsupport_la_SOURCES) $(kview_SOURCES) -+SOURCES = $(kview_la_SOURCES) $(libkview_main_la_SOURCES) $(libkviewsupport_la_SOURCES) $(kview_SOURCES) - - #>- all: all-recursive - #>+ 1 -@@ -462,6 +471,8 @@ clean-libLTLIBRARIES: - done - kview.la: $(kview_la_OBJECTS) $(kview_la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir) $(kview_la_LDFLAGS) $(kview_la_OBJECTS) $(kview_la_LIBADD) $(LIBS) -+libkview_main.la: $(libkview_main_la_OBJECTS) $(libkview_main_la_DEPENDENCIES) -+ $(CXXLINK) -rpath $(libdir) $(libkview_main_la_LDFLAGS) $(libkview_main_la_OBJECTS) $(libkview_main_la_LIBADD) $(LIBS) - #>- libkviewsupport.la: $(libkviewsupport_la_OBJECTS) $(libkviewsupport_la_DEPENDENCIES) - #>+ 2 - @KDE_USE_CLOSURE_TRUE@libkviewsupport.la: libkviewsupport.la.closure $(libkviewsupport_la_OBJECTS) $(libkviewsupport_la_DEPENDENCIES) -@@ -506,11 +517,12 @@ mostlyclean-compile: - distclean-compile: - -rm -f *.tab.c - --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kpluginselector.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kpreferencesdialog.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kpreferencesmodule.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kview.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kview_main.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kview_main.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kviewconfmodules.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@ - -@@ -721,7 +733,7 @@ distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - #>+ 4 --KDE_DIST=kview.desktop cr16-app-kview.png cr48-app-kview.png kviewui.rc cr32-app-kview.png version.h -+KDE_DIST=kview.desktop cr48-app-kview.png kviewui.rc version.h Makefile.in.rej cr16-app-kview.png cr32-app-kview.png - - DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) - -@@ -887,9 +899,6 @@ uninstall-info: uninstall-info-recursive - messages: rc.cpp - $(EXTRACTRC) kviewviewer/*.rc kviewviewer/*.ui >> rc.cpp - $(XGETTEXT) kviewviewer/*.cpp kviewcanvas/*.cpp *.cpp *.h -o $(podir)/kview.pot -- --dummy.cpp: -- echo > dummy.cpp - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: -@@ -901,12 +910,6 @@ kpluginselector.moc: $(srcdir)/kpluginse - #>+ 1 - mocs: kpluginselector.moc - #>+ 3 --kviewconfmodules.moc: $(srcdir)/kviewconfmodules.h -- $(MOC) $(srcdir)/kviewconfmodules.h -o kviewconfmodules.moc -- --#>+ 1 --mocs: kviewconfmodules.moc --#>+ 3 - kpreferencesmodule.moc: $(srcdir)/kpreferencesmodule.h - $(MOC) $(srcdir)/kpreferencesmodule.h -o kpreferencesmodule.moc - -@@ -919,6 +922,12 @@ kview.moc: $(srcdir)/kview.h - #>+ 1 - mocs: kview.moc - #>+ 3 -+kviewconfmodules.moc: $(srcdir)/kviewconfmodules.h -+ $(MOC) $(srcdir)/kviewconfmodules.h -o kviewconfmodules.moc -+ -+#>+ 1 -+mocs: kviewconfmodules.moc -+#>+ 3 - kpreferencesdialog.moc: $(srcdir)/kpreferencesdialog.h - $(MOC) $(srcdir)/kpreferencesdialog.h -o kpreferencesdialog.moc - -@@ -935,7 +944,7 @@ libkviewsupport.la.closure: $(libkviewsu - - #>+ 3 - clean-metasources: -- -rm -f kpluginselector.moc kviewconfmodules.moc kpreferencesmodule.moc kview.moc kpreferencesdialog.moc -+ -rm -f kpluginselector.moc kpreferencesmodule.moc kview.moc kviewconfmodules.moc kpreferencesdialog.moc - - #>+ 3 - clean-closures: -@@ -966,16 +975,16 @@ force-reedit: - - - #>+ 11 --kview_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kviewconfmodules.cpp $(srcdir)/kview.cpp $(srcdir)/main.cpp kviewconfmodules.moc kview.moc -- @echo 'creating kview_la.all_cpp.cpp ...'; \ -- rm -f kview_la.all_cpp.files kview_la.all_cpp.final; \ -- echo "#define KDE_USE_FINAL 1" >> kview_la.all_cpp.final; \ -+libkview_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kviewconfmodules.cpp $(srcdir)/kview.cpp $(srcdir)/main.cpp kview.moc kviewconfmodules.moc -+ @echo 'creating libkview_main_la.all_cpp.cpp ...'; \ -+ rm -f libkview_main_la.all_cpp.files libkview_main_la.all_cpp.final; \ -+ echo "#define KDE_USE_FINAL 1" >> libkview_main_la.all_cpp.final; \ - for file in kviewconfmodules.cpp kview.cpp main.cpp ; do \ -- echo "#include \"$$file\"" >> kview_la.all_cpp.files; \ -- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kview_la.all_cpp.final; \ -+ echo "#include \"$$file\"" >> libkview_main_la.all_cpp.files; \ -+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkview_main_la.all_cpp.final; \ - done; \ -- cat kview_la.all_cpp.final kview_la.all_cpp.files > kview_la.all_cpp.cpp; \ -- rm -f kview_la.all_cpp.final kview_la.all_cpp.files -+ cat libkview_main_la.all_cpp.final libkview_main_la.all_cpp.files > libkview_main_la.all_cpp.cpp; \ -+ rm -f libkview_main_la.all_cpp.final libkview_main_la.all_cpp.files - - #>+ 11 - libkviewsupport_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kpreferencesdialog.cpp $(srcdir)/kpreferencesmodule.cpp $(srcdir)/kpluginselector.cpp kpluginselector.moc kpreferencesmodule.moc kpreferencesdialog.moc -@@ -991,20 +1000,20 @@ libkviewsupport_la.all_cpp.cpp: $(srcdir - - #>+ 3 - clean-final: -- -rm -f kview_la.all_cpp.cpp libkviewsupport_la.all_cpp.cpp -+ -rm -f libkview_main_la.all_cpp.cpp libkviewsupport_la.all_cpp.cpp - - #>+ 2 - final: -- $(MAKE) kview_la_OBJECTS="$(kview_la_final_OBJECTS)" libkviewsupport_la_OBJECTS="$(libkviewsupport_la_final_OBJECTS)" all-am -+ $(MAKE) libkview_main_la_OBJECTS="$(libkview_main_la_final_OBJECTS)" libkviewsupport_la_OBJECTS="$(libkviewsupport_la_final_OBJECTS)" all-am - #>+ 2 - final-install: -- $(MAKE) kview_la_OBJECTS="$(kview_la_final_OBJECTS)" libkviewsupport_la_OBJECTS="$(libkviewsupport_la_final_OBJECTS)" install-am -+ $(MAKE) libkview_main_la_OBJECTS="$(libkview_main_la_final_OBJECTS)" libkviewsupport_la_OBJECTS="$(libkviewsupport_la_final_OBJECTS)" install-am - #>+ 2 - no-final: -- $(MAKE) kview_la_OBJECTS="$(kview_la_nofinal_OBJECTS)" libkviewsupport_la_OBJECTS="$(libkviewsupport_la_nofinal_OBJECTS)" all-am -+ $(MAKE) libkview_main_la_OBJECTS="$(libkview_main_la_nofinal_OBJECTS)" libkviewsupport_la_OBJECTS="$(libkviewsupport_la_nofinal_OBJECTS)" all-am - #>+ 2 - no-final-install: -- $(MAKE) kview_la_OBJECTS="$(kview_la_nofinal_OBJECTS)" libkviewsupport_la_OBJECTS="$(libkviewsupport_la_nofinal_OBJECTS)" install-am -+ $(MAKE) libkview_main_la_OBJECTS="$(libkview_main_la_nofinal_OBJECTS)" libkviewsupport_la_OBJECTS="$(libkviewsupport_la_nofinal_OBJECTS)" install-am - #>+ 3 - cvs-clean: - $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -1014,13 +1023,13 @@ kde-rpo-clean: - -rm -f *.rpo - - #>+ 11 --kview.lo: kview.moc -+kpreferencesdialog.o: kpreferencesdialog.moc -+kviewconfmodules.o: kviewconfmodules.moc - kview.o: kview.moc -+kpreferencesmodule.o: kpreferencesmodule.moc - kpluginselector.lo: kpluginselector.moc --kpreferencesdialog.o: kpreferencesdialog.moc - kpreferencesmodule.lo: kpreferencesmodule.moc --kpreferencesmodule.o: kpreferencesmodule.moc -+kpreferencesdialog.lo: kpreferencesdialog.moc - kviewconfmodules.lo: kviewconfmodules.moc - kpluginselector.o: kpluginselector.moc --kviewconfmodules.o: kviewconfmodules.moc --kpreferencesdialog.lo: kpreferencesdialog.moc -+kview.lo: kview.moc diff --git a/graphics/kdegraphics3/patches/patch-af b/graphics/kdegraphics3/patches/patch-af deleted file mode 100644 index ce3ee8a9e10..00000000000 --- a/graphics/kdegraphics3/patches/patch-af +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-af,v 1.2 2003/03/11 13:25:00 markd Exp $ - ---- kview/main.cpp.orig Mon Sep 16 09:12:50 2002 -+++ kview/main.cpp -@@ -32,7 +32,9 @@ static KCmdLineOptions options[] = - { 0, 0, 0 } - }; - --int main( int argc, char ** argv ) -+extern "C" int kdemain( int, char *[] ); -+ -+int kdemain( int argc, char *argv[] ) - { - KAboutData about( "kview", I18N_NOOP( "KView" ), - KVIEW_VERSION, description, diff --git a/graphics/kdegraphics3/patches/patch-ag b/graphics/kdegraphics3/patches/patch-ag deleted file mode 100644 index 778098af0a1..00000000000 --- a/graphics/kdegraphics3/patches/patch-ag +++ /dev/null @@ -1,47 +0,0 @@ -$NetBSD: patch-ag,v 1.2 2003/03/11 13:25:00 markd Exp $ - ---- kuickshow/src/Makefile.am.orig Mon Sep 16 09:12:49 2002 -+++ kuickshow/src/Makefile.am -@@ -1,25 +1,28 @@ - ## Makefile.am for kuickshow - - bin_PROGRAMS = kuickshow --lib_LTLIBRARIES = kuickshow.la -+lib_LTLIBRARIES = libkuickshow_main.la kuickshow.la - - # set the include path for X, qt and KDE - INCLUDES = $(all_includes) - KDE_CXXFLAGS = $(IMLIB_CFLAGS) --CLEANFILES = dummy.cpp - METASOURCES = AUTO - --kuickshow_la_LDFLAGS = $(all_libraries) -module -avoid-version --kuickshow_la_LIBADD = $(LIB_KDEPRINT) $(LIB_IMLIB) --kuickshow_la_SOURCES = kuickshow.cpp \ -+libkuickshow_main_la_LDFLAGS = $(all_libraries) -+libkuickshow_main_la_LIBADD = $(LIB_KDEPRINT) $(LIB_IMLIB) -+libkuickshow_main_la_SOURCES = kuickshow.cpp \ - aboutwidget.cpp generalwidget.cpp kuickconfigdlg.cpp main.cpp \ - defaultswidget.cpp imagewindow.cpp kuickdata.cpp \ - imdata.cpp filefinder.cpp kurlwidget.cpp filewidget.cpp \ - kuickio.cpp kuick.cpp imlibwidget.cpp slideshowwidget.cpp printing.cpp - -+kuickshow_la_LDFLAGS = $(all_libraries) -module -avoid-version -+kuickshow_la_LIBADD = $(LIB_KDEPRINT) $(LIB_IMLIB) libkuickshow_main.la -+kuickshow_la_SOURCES = kuickshow_main.cpp -+ - # now the kuickshow binary --kuickshow_LDADD = kuickshow.la $(LIB_KIO) $(LIB_IMLIB) --kuickshow_SOURCES = dummy.cpp -+kuickshow_LDADD = libkuickshow_main.la $(LIB_KIO) $(LIB_IMLIB) -+kuickshow_SOURCES = kuickshow_main.cpp - kuickshow_LDFLAGS = $(all_libraries) $(KDE_RPATH) - - -@@ -35,6 +38,3 @@ KDE_ICON = kuickshow - # this is where the kdelnk file will go - appsdir = $(kde_appsdir)/Graphics - apps_DATA = kuickshow.desktop -- --dummy.cpp: -- echo "// generated dummy file" > dummy.cpp diff --git a/graphics/kdegraphics3/patches/patch-ah b/graphics/kdegraphics3/patches/patch-ah deleted file mode 100644 index 76e734bf648..00000000000 --- a/graphics/kdegraphics3/patches/patch-ah +++ /dev/null @@ -1,442 +0,0 @@ -$NetBSD: patch-ah,v 1.6 2004/01/15 10:50:34 markd Exp $ - ---- kuickshow/src/Makefile.in.orig 2003-12-29 11:27:02.000000000 +1300 -+++ kuickshow/src/Makefile.in -@@ -295,26 +295,29 @@ x_includes = @x_includes@ - x_libraries = @x_libraries@ - - bin_PROGRAMS = kuickshow --lib_LTLIBRARIES = kuickshow.la -+lib_LTLIBRARIES = libkuickshow_main.la kuickshow.la - - # set the include path for X, qt and KDE - INCLUDES = $(all_includes) - KDE_CXXFLAGS = $(IMLIB_CFLAGS) --CLEANFILES = dummy.cpp - #>- METASOURCES = AUTO - --kuickshow_la_LDFLAGS = $(all_libraries) -module -avoid-version --kuickshow_la_LIBADD = $(LIB_KDEPRINT) $(LIB_IMLIB) --kuickshow_la_SOURCES = kuickshow.cpp \ -+libkuickshow_main_la_LDFLAGS = $(all_libraries) -+libkuickshow_main_la_LIBADD = $(LIB_KDEPRINT) $(LIB_IMLIB) -+libkuickshow_main_la_SOURCES = kuickshow.cpp \ - aboutwidget.cpp generalwidget.cpp kuickconfigdlg.cpp main.cpp \ - defaultswidget.cpp imagewindow.cpp kuickdata.cpp \ - imdata.cpp filefinder.cpp kurlwidget.cpp filewidget.cpp \ - kuickio.cpp kuick.cpp imlibwidget.cpp slideshowwidget.cpp printing.cpp - - -+kuickshow_la_LDFLAGS = $(all_libraries) -module -avoid-version -+kuickshow_la_LIBADD = $(LIB_KDEPRINT) $(LIB_IMLIB) libkuickshow_main.la -+kuickshow_la_SOURCES = kuickshow_main.cpp -+ - # now the kuickshow binary --kuickshow_LDADD = kuickshow.la $(LIB_KIO) $(LIB_IMLIB) --kuickshow_SOURCES = dummy.cpp -+kuickshow_LDADD = libkuickshow_main.la $(LIB_KIO) $(LIB_IMLIB) -+kuickshow_SOURCES = kuickshow_main.cpp - kuickshow_LDFLAGS = $(all_libraries) $(KDE_RPATH) - - # if you "make distclean", this files get removed. If you want to remove -@@ -331,36 +334,41 @@ CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - LTLIBRARIES = $(lib_LTLIBRARIES) - --kuickshow_la_DEPENDENCIES = --am_kuickshow_la_OBJECTS = kuickshow.lo aboutwidget.lo generalwidget.lo \ -- kuickconfigdlg.lo main.lo defaultswidget.lo imagewindow.lo \ -- kuickdata.lo imdata.lo filefinder.lo kurlwidget.lo \ -- filewidget.lo kuickio.lo kuick.lo imlibwidget.lo \ -- slideshowwidget.lo printing.lo -+kuickshow_la_DEPENDENCIES = libkuickshow_main.la -+am_kuickshow_la_OBJECTS = kuickshow_main.lo - #>- kuickshow_la_OBJECTS = $(am_kuickshow_la_OBJECTS) -+#>+ 1 -+kuickshow_la_OBJECTS = kuickshow_main.lo -+libkuickshow_main_la_DEPENDENCIES = -+am_libkuickshow_main_la_OBJECTS = kuickshow.lo aboutwidget.lo \ -+ generalwidget.lo kuickconfigdlg.lo main.lo defaultswidget.lo \ -+ imagewindow.lo kuickdata.lo imdata.lo filefinder.lo \ -+ kurlwidget.lo filewidget.lo kuickio.lo kuick.lo imlibwidget.lo \ -+ slideshowwidget.lo printing.lo -+#>- libkuickshow_main_la_OBJECTS = $(am_libkuickshow_main_la_OBJECTS) - #>+ 8 --kuickshow_la_final_OBJECTS = kuickshow_la.all_cpp.lo --kuickshow_la_nofinal_OBJECTS = kuickshow.lo aboutwidget.lo generalwidget.lo \ -- kuickconfigdlg.lo main.lo defaultswidget.lo imagewindow.lo \ -- kuickdata.lo imdata.lo filefinder.lo kurlwidget.lo \ -- filewidget.lo kuickio.lo kuick.lo imlibwidget.lo \ -+libkuickshow_main_la_final_OBJECTS = libkuickshow_main_la.all_cpp.lo -+libkuickshow_main_la_nofinal_OBJECTS = kuickshow.lo aboutwidget.lo \ -+ generalwidget.lo kuickconfigdlg.lo main.lo defaultswidget.lo \ -+ imagewindow.lo kuickdata.lo imdata.lo filefinder.lo \ -+ kurlwidget.lo filewidget.lo kuickio.lo kuick.lo imlibwidget.lo \ - slideshowwidget.lo printing.lo --@KDE_USE_FINAL_FALSE@kuickshow_la_OBJECTS = $(kuickshow_la_nofinal_OBJECTS) --@KDE_USE_FINAL_TRUE@kuickshow_la_OBJECTS = $(kuickshow_la_final_OBJECTS) -+@KDE_USE_FINAL_FALSE@libkuickshow_main_la_OBJECTS = $(libkuickshow_main_la_nofinal_OBJECTS) -+@KDE_USE_FINAL_TRUE@libkuickshow_main_la_OBJECTS = $(libkuickshow_main_la_final_OBJECTS) - bin_PROGRAMS = kuickshow$(EXEEXT) - PROGRAMS = $(bin_PROGRAMS) - --am_kuickshow_OBJECTS = dummy.$(OBJEXT) -+am_kuickshow_OBJECTS = kuickshow_main.$(OBJEXT) - #>- kuickshow_OBJECTS = $(am_kuickshow_OBJECTS) - #>+ 1 --kuickshow_OBJECTS = dummy.$(OBJEXT) --kuickshow_DEPENDENCIES = kuickshow.la -+kuickshow_OBJECTS = kuickshow_main.$(OBJEXT) -+kuickshow_DEPENDENCIES = libkuickshow_main.la - - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/admin/depcomp - am__depfiles_maybe = depfiles - #>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/aboutwidget.Plo \ --#>- @AMDEP_TRUE@ ./$(DEPDIR)/defaultswidget.Plo ./$(DEPDIR)/dummy.Po \ -+#>- @AMDEP_TRUE@ ./$(DEPDIR)/defaultswidget.Plo \ - #>- @AMDEP_TRUE@ ./$(DEPDIR)/filefinder.Plo \ - #>- @AMDEP_TRUE@ ./$(DEPDIR)/filewidget.Plo \ - #>- @AMDEP_TRUE@ ./$(DEPDIR)/generalwidget.Plo \ -@@ -369,12 +377,14 @@ am__depfiles_maybe = depfiles - #>- @AMDEP_TRUE@ ./$(DEPDIR)/kuickconfigdlg.Plo \ - #>- @AMDEP_TRUE@ ./$(DEPDIR)/kuickdata.Plo ./$(DEPDIR)/kuickio.Plo \ - #>- @AMDEP_TRUE@ ./$(DEPDIR)/kuickshow.Plo \ -+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kuickshow_main.Plo \ -+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kuickshow_main.Po \ - #>- @AMDEP_TRUE@ ./$(DEPDIR)/kurlwidget.Plo ./$(DEPDIR)/main.Plo \ - #>- @AMDEP_TRUE@ ./$(DEPDIR)/printing.Plo \ - #>- @AMDEP_TRUE@ ./$(DEPDIR)/slideshowwidget.Plo --#>+ 27 --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kuickshow_la.all_cpp.P ./$(DEPDIR)/aboutwidget.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/defaultswidget.Plo ./$(DEPDIR)/dummy.Po \ -+#>+ 31 -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/libkuickshow_main_la.all_cpp.P ./$(DEPDIR)/aboutwidget.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/defaultswidget.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/filefinder.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/filewidget.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/generalwidget.Plo \ -@@ -383,11 +393,13 @@ am__depfiles_maybe = depfiles - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kuickconfigdlg.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kuickdata.Plo ./$(DEPDIR)/kuickio.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kuickshow.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kuickshow_main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kuickshow_main.Po \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kurlwidget.Plo ./$(DEPDIR)/main.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/printing.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/slideshowwidget.Plo - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = ./$(DEPDIR)/aboutwidget.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/defaultswidget.Plo ./$(DEPDIR)/dummy.Po \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/defaultswidget.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/filefinder.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/filewidget.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/generalwidget.Plo \ -@@ -396,6 +408,8 @@ am__depfiles_maybe = depfiles - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kuickconfigdlg.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kuickdata.Plo ./$(DEPDIR)/kuickio.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kuickshow.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kuickshow_main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kuickshow_main.Po \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kurlwidget.Plo ./$(DEPDIR)/main.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/printing.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/slideshowwidget.Plo -@@ -418,11 +432,12 @@ CXXLD = $(CXX) - #>+ 2 - CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ --DIST_SOURCES = $(kuickshow_la_SOURCES) $(kuickshow_SOURCES) -+DIST_SOURCES = $(kuickshow_la_SOURCES) $(libkuickshow_main_la_SOURCES) \ -+ $(kuickshow_SOURCES) - DATA = $(apps_DATA) - - DIST_COMMON = Makefile.am Makefile.in --SOURCES = $(kuickshow_la_SOURCES) $(kuickshow_SOURCES) -+SOURCES = $(kuickshow_la_SOURCES) $(libkuickshow_main_la_SOURCES) $(kuickshow_SOURCES) - - #>- all: all-am - #>+ 1 -@@ -469,6 +484,8 @@ clean-libLTLIBRARIES: - done - kuickshow.la: $(kuickshow_la_OBJECTS) $(kuickshow_la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir) $(kuickshow_la_LDFLAGS) $(kuickshow_la_OBJECTS) $(kuickshow_la_LIBADD) $(LIBS) -+libkuickshow_main.la: $(libkuickshow_main_la_OBJECTS) $(libkuickshow_main_la_DEPENDENCIES) -+ $(CXXLINK) -rpath $(libdir) $(libkuickshow_main_la_LDFLAGS) $(libkuickshow_main_la_OBJECTS) $(libkuickshow_main_la_LIBADD) $(LIBS) - binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) - install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) -@@ -510,7 +527,6 @@ distclean-compile: - - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aboutwidget.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/defaultswidget.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filefinder.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filewidget.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/generalwidget.Plo@am__quote@ -@@ -522,6 +538,8 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kuickdata.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kuickio.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kuickshow.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kuickshow_main.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kuickshow_main.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kurlwidget.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printing.Plo@am__quote@ -@@ -646,7 +664,7 @@ distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - #>+ 4 --KDE_DIST=kuickshow.h slideshowwidget.h filefinder.h kuickshow.desktop lo32-app-kuickshow.png imlibwidget.h cr32-app-kuickshow.png kuickglobals.h kuickio.h lo16-app-kuickshow.png cr16-app-kuickshow.png kuick.h defaultswidget.h imagewindow.h imdata.h aboutwidget.h kuickdata.h kurlwidget.h mainwidget.h kuickconfigdlg.h filewidget.h generalwidget.h mainwidget.cpp version.h printing.h -+KDE_DIST=slideshowwidget.h printing.h kuickshow.h kuickshow.desktop kuickio.h cr32-app-kuickshow.png mainwidget.h cr16-app-kuickshow.png lo32-app-kuickshow.png imdata.h mainwidget.cpp imlibwidget.h kuickconfigdlg.h version.h lo16-app-kuickshow.png generalwidget.h kurlwidget.h kuickdata.h Makefile.in.rej kuickglobals.h defaultswidget.h filefinder.h filewidget.h imagewindow.h kuick.h aboutwidget.h - - DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) - -@@ -706,7 +724,6 @@ install-strip: - mostlyclean-generic: - - clean-generic: -- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) -@@ -792,100 +809,97 @@ messages: - $(XGETTEXT) *.cpp *.h -o $(podir)/kuickshow.pot - - # this is where the kdelnk file will go -- --dummy.cpp: -- echo "// generated dummy file" > dummy.cpp - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: - - #>+ 3 --kurlwidget.moc: $(srcdir)/kurlwidget.h -- $(MOC) $(srcdir)/kurlwidget.h -o kurlwidget.moc -+mainwidget.moc: $(srcdir)/mainwidget.h -+ $(MOC) $(srcdir)/mainwidget.h -o mainwidget.moc - - #>+ 1 --mocs: kurlwidget.moc -+mocs: mainwidget.moc - #>+ 3 --kuickio.moc: $(srcdir)/kuickio.h -- $(MOC) $(srcdir)/kuickio.h -o kuickio.moc -+filefinder.moc: $(srcdir)/filefinder.h -+ $(MOC) $(srcdir)/filefinder.h -o filefinder.moc - - #>+ 1 --mocs: kuickio.moc -+mocs: filefinder.moc - #>+ 3 --defaultswidget.moc: $(srcdir)/defaultswidget.h -- $(MOC) $(srcdir)/defaultswidget.h -o defaultswidget.moc -+kuickconfigdlg.moc: $(srcdir)/kuickconfigdlg.h -+ $(MOC) $(srcdir)/kuickconfigdlg.h -o kuickconfigdlg.moc - - #>+ 1 --mocs: defaultswidget.moc -+mocs: kuickconfigdlg.moc - #>+ 3 --imlibwidget.moc: $(srcdir)/imlibwidget.h -- $(MOC) $(srcdir)/imlibwidget.h -o imlibwidget.moc -+printing.moc: $(srcdir)/printing.h -+ $(MOC) $(srcdir)/printing.h -o printing.moc - - #>+ 1 --mocs: imlibwidget.moc -+mocs: printing.moc - #>+ 3 --kuickshow.moc: $(srcdir)/kuickshow.h -- $(MOC) $(srcdir)/kuickshow.h -o kuickshow.moc -+imlibwidget.moc: $(srcdir)/imlibwidget.h -+ $(MOC) $(srcdir)/imlibwidget.h -o imlibwidget.moc - - #>+ 1 --mocs: kuickshow.moc -+mocs: imlibwidget.moc - #>+ 3 --mainwidget.moc: $(srcdir)/mainwidget.h -- $(MOC) $(srcdir)/mainwidget.h -o mainwidget.moc -+generalwidget.moc: $(srcdir)/generalwidget.h -+ $(MOC) $(srcdir)/generalwidget.h -o generalwidget.moc - - #>+ 1 --mocs: mainwidget.moc -+mocs: generalwidget.moc - #>+ 3 --printing.moc: $(srcdir)/printing.h -- $(MOC) $(srcdir)/printing.h -o printing.moc -+defaultswidget.moc: $(srcdir)/defaultswidget.h -+ $(MOC) $(srcdir)/defaultswidget.h -o defaultswidget.moc - - #>+ 1 --mocs: printing.moc -+mocs: defaultswidget.moc - #>+ 3 --filewidget.moc: $(srcdir)/filewidget.h -- $(MOC) $(srcdir)/filewidget.h -o filewidget.moc -+aboutwidget.moc: $(srcdir)/aboutwidget.h -+ $(MOC) $(srcdir)/aboutwidget.h -o aboutwidget.moc - - #>+ 1 --mocs: filewidget.moc -+mocs: aboutwidget.moc - #>+ 3 --imagewindow.moc: $(srcdir)/imagewindow.h -- $(MOC) $(srcdir)/imagewindow.h -o imagewindow.moc -+kuickshow.moc: $(srcdir)/kuickshow.h -+ $(MOC) $(srcdir)/kuickshow.h -o kuickshow.moc - - #>+ 1 --mocs: imagewindow.moc -+mocs: kuickshow.moc - #>+ 3 --slideshowwidget.moc: $(srcdir)/slideshowwidget.h -- $(MOC) $(srcdir)/slideshowwidget.h -o slideshowwidget.moc -+kurlwidget.moc: $(srcdir)/kurlwidget.h -+ $(MOC) $(srcdir)/kurlwidget.h -o kurlwidget.moc - - #>+ 1 --mocs: slideshowwidget.moc -+mocs: kurlwidget.moc - #>+ 3 --aboutwidget.moc: $(srcdir)/aboutwidget.h -- $(MOC) $(srcdir)/aboutwidget.h -o aboutwidget.moc -+filewidget.moc: $(srcdir)/filewidget.h -+ $(MOC) $(srcdir)/filewidget.h -o filewidget.moc - - #>+ 1 --mocs: aboutwidget.moc -+mocs: filewidget.moc - #>+ 3 --kuickconfigdlg.moc: $(srcdir)/kuickconfigdlg.h -- $(MOC) $(srcdir)/kuickconfigdlg.h -o kuickconfigdlg.moc -+slideshowwidget.moc: $(srcdir)/slideshowwidget.h -+ $(MOC) $(srcdir)/slideshowwidget.h -o slideshowwidget.moc - - #>+ 1 --mocs: kuickconfigdlg.moc -+mocs: slideshowwidget.moc - #>+ 3 --filefinder.moc: $(srcdir)/filefinder.h -- $(MOC) $(srcdir)/filefinder.h -o filefinder.moc -+imagewindow.moc: $(srcdir)/imagewindow.h -+ $(MOC) $(srcdir)/imagewindow.h -o imagewindow.moc - - #>+ 1 --mocs: filefinder.moc -+mocs: imagewindow.moc - #>+ 3 --generalwidget.moc: $(srcdir)/generalwidget.h -- $(MOC) $(srcdir)/generalwidget.h -o generalwidget.moc -+kuickio.moc: $(srcdir)/kuickio.h -+ $(MOC) $(srcdir)/kuickio.h -o kuickio.moc - - #>+ 1 --mocs: generalwidget.moc -+mocs: kuickio.moc - #>+ 3 - clean-metasources: -- -rm -f kurlwidget.moc kuickio.moc defaultswidget.moc imlibwidget.moc kuickshow.moc mainwidget.moc printing.moc filewidget.moc imagewindow.moc slideshowwidget.moc aboutwidget.moc kuickconfigdlg.moc filefinder.moc generalwidget.moc -+ -rm -f mainwidget.moc filefinder.moc kuickconfigdlg.moc printing.moc imlibwidget.moc generalwidget.moc defaultswidget.moc aboutwidget.moc kuickshow.moc kurlwidget.moc filewidget.moc slideshowwidget.moc imagewindow.moc kuickio.moc - - #>+ 2 - docs-am: -@@ -915,33 +929,33 @@ force-reedit: - - - #>+ 11 --kuickshow_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kuickshow.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/generalwidget.cpp $(srcdir)/kuickconfigdlg.cpp $(srcdir)/main.cpp $(srcdir)/defaultswidget.cpp $(srcdir)/imagewindow.cpp $(srcdir)/kuickdata.cpp $(srcdir)/imdata.cpp $(srcdir)/filefinder.cpp $(srcdir)/kurlwidget.cpp $(srcdir)/filewidget.cpp $(srcdir)/kuickio.cpp $(srcdir)/kuick.cpp $(srcdir)/imlibwidget.cpp $(srcdir)/slideshowwidget.cpp $(srcdir)/printing.cpp kurlwidget.moc kuickio.moc defaultswidget.moc imlibwidget.moc kuickshow.moc printing.moc filewidget.moc filefinder.moc kuickconfigdlg.moc aboutwidget.moc slideshowwidget.moc imagewindow.moc generalwidget.moc -- @echo 'creating kuickshow_la.all_cpp.cpp ...'; \ -- rm -f kuickshow_la.all_cpp.files kuickshow_la.all_cpp.final; \ -- echo "#define KDE_USE_FINAL 1" >> kuickshow_la.all_cpp.final; \ -+libkuickshow_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kuickshow.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/generalwidget.cpp $(srcdir)/kuickconfigdlg.cpp $(srcdir)/main.cpp $(srcdir)/defaultswidget.cpp $(srcdir)/imagewindow.cpp $(srcdir)/kuickdata.cpp $(srcdir)/imdata.cpp $(srcdir)/filefinder.cpp $(srcdir)/kurlwidget.cpp $(srcdir)/filewidget.cpp $(srcdir)/kuickio.cpp $(srcdir)/kuick.cpp $(srcdir)/imlibwidget.cpp $(srcdir)/slideshowwidget.cpp $(srcdir)/printing.cpp kuickconfigdlg.moc filefinder.moc printing.moc imlibwidget.moc generalwidget.moc defaultswidget.moc aboutwidget.moc kuickshow.moc filewidget.moc kurlwidget.moc slideshowwidget.moc kuickio.moc imagewindow.moc -+ @echo 'creating libkuickshow_main_la.all_cpp.cpp ...'; \ -+ rm -f libkuickshow_main_la.all_cpp.files libkuickshow_main_la.all_cpp.final; \ -+ echo "#define KDE_USE_FINAL 1" >> libkuickshow_main_la.all_cpp.final; \ - for file in kuickshow.cpp aboutwidget.cpp generalwidget.cpp kuickconfigdlg.cpp main.cpp defaultswidget.cpp imagewindow.cpp kuickdata.cpp imdata.cpp filefinder.cpp kurlwidget.cpp filewidget.cpp kuickio.cpp kuick.cpp imlibwidget.cpp slideshowwidget.cpp printing.cpp ; do \ -- echo "#include \"$$file\"" >> kuickshow_la.all_cpp.files; \ -- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kuickshow_la.all_cpp.final; \ -+ echo "#include \"$$file\"" >> libkuickshow_main_la.all_cpp.files; \ -+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkuickshow_main_la.all_cpp.final; \ - done; \ -- cat kuickshow_la.all_cpp.final kuickshow_la.all_cpp.files > kuickshow_la.all_cpp.cpp; \ -- rm -f kuickshow_la.all_cpp.final kuickshow_la.all_cpp.files -+ cat libkuickshow_main_la.all_cpp.final libkuickshow_main_la.all_cpp.files > libkuickshow_main_la.all_cpp.cpp; \ -+ rm -f libkuickshow_main_la.all_cpp.final libkuickshow_main_la.all_cpp.files - - #>+ 3 - clean-final: -- -rm -f kuickshow_la.all_cpp.cpp -+ -rm -f libkuickshow_main_la.all_cpp.cpp - - #>+ 2 - final: -- $(MAKE) kuickshow_la_OBJECTS="$(kuickshow_la_final_OBJECTS)" all-am -+ $(MAKE) libkuickshow_main_la_OBJECTS="$(libkuickshow_main_la_final_OBJECTS)" all-am - #>+ 2 - final-install: -- $(MAKE) kuickshow_la_OBJECTS="$(kuickshow_la_final_OBJECTS)" install-am -+ $(MAKE) libkuickshow_main_la_OBJECTS="$(libkuickshow_main_la_final_OBJECTS)" install-am - #>+ 2 - no-final: -- $(MAKE) kuickshow_la_OBJECTS="$(kuickshow_la_nofinal_OBJECTS)" all-am -+ $(MAKE) libkuickshow_main_la_OBJECTS="$(libkuickshow_main_la_nofinal_OBJECTS)" all-am - #>+ 2 - no-final-install: -- $(MAKE) kuickshow_la_OBJECTS="$(kuickshow_la_nofinal_OBJECTS)" install-am -+ $(MAKE) libkuickshow_main_la_OBJECTS="$(libkuickshow_main_la_nofinal_OBJECTS)" install-am - #>+ 3 - cvs-clean: - $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -951,31 +965,31 @@ kde-rpo-clean: - -rm -f *.rpo - - #>+ 29 --filewidget.o: filewidget.moc --kuickshow.o: kuickshow.moc -+filefinder.o: filefinder.moc -+filefinder.lo: filefinder.moc -+mainwidget.lo: mainwidget.moc - defaultswidget.lo: defaultswidget.moc -+generalwidget.lo: generalwidget.moc -+slideshowwidget.o: slideshowwidget.moc - kurlwidget.lo: kurlwidget.moc -+kuickshow.o: kuickshow.moc -+aboutwidget.lo: aboutwidget.moc -+filewidget.lo: filewidget.moc - printing.lo: printing.moc - kurlwidget.o: kurlwidget.moc --kuickio.o: kuickio.moc --generalwidget.lo: generalwidget.moc --slideshowwidget.lo: slideshowwidget.moc --printing.o: printing.moc --filefinder.lo: filefinder.moc --generalwidget.o: generalwidget.moc -+filewidget.o: filewidget.moc - imagewindow.o: imagewindow.moc --aboutwidget.o: aboutwidget.moc --aboutwidget.lo: aboutwidget.moc --mainwidget.lo: mainwidget.moc --imlibwidget.lo: imlibwidget.moc -+kuickio.lo: kuickio.moc - kuickconfigdlg.lo: kuickconfigdlg.moc --slideshowwidget.o: slideshowwidget.moc --filefinder.o: filefinder.moc --filewidget.lo: filewidget.moc -+aboutwidget.o: aboutwidget.moc -+slideshowwidget.lo: slideshowwidget.moc -+imagewindow.lo: imagewindow.moc -+printing.o: printing.moc -+kuickio.o: kuickio.moc - kuickshow.lo: kuickshow.moc -+imlibwidget.lo: imlibwidget.moc - mainwidget.o: mainwidget.moc --defaultswidget.o: defaultswidget.moc --kuickconfigdlg.o: kuickconfigdlg.moc --imagewindow.lo: imagewindow.moc - imlibwidget.o: imlibwidget.moc --kuickio.lo: kuickio.moc -+generalwidget.o: generalwidget.moc -+kuickconfigdlg.o: kuickconfigdlg.moc -+defaultswidget.o: defaultswidget.moc diff --git a/graphics/kdegraphics3/patches/patch-ai b/graphics/kdegraphics3/patches/patch-ai deleted file mode 100644 index 4330a358ea0..00000000000 --- a/graphics/kdegraphics3/patches/patch-ai +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ai,v 1.1 2002/08/28 07:15:31 skrll Exp $ - ---- kuickshow/src/main.cpp.orig Wed Oct 10 18:57:48 2001 -+++ kuickshow/src/main.cpp -@@ -23,7 +23,9 @@ static KCmdLineOptions options[] = - { 0, 0, 0 } - }; - --int main(int argc, char **argv) -+extern "C" int kdemain(int argc, char **argv); -+ -+int kdemain(int argc, char **argv) - { - KAboutData about( - "kuickshow", I18N_NOOP( "KuickShow" ), KUICKSHOWVERSION, |