head 1.12; access; symbols pkgsrc-2017Q3:1.11.0.72 pkgsrc-2017Q3-base:1.11 pkgsrc-2017Q2:1.11.0.68 pkgsrc-2017Q2-base:1.11 pkgsrc-2017Q1:1.11.0.66 pkgsrc-2017Q1-base:1.11 pkgsrc-2016Q4:1.11.0.64 pkgsrc-2016Q4-base:1.11 pkgsrc-2016Q3:1.11.0.62 pkgsrc-2016Q3-base:1.11 pkgsrc-2016Q2:1.11.0.60 pkgsrc-2016Q2-base:1.11 pkgsrc-2016Q1:1.11.0.58 pkgsrc-2016Q1-base:1.11 pkgsrc-2015Q4:1.11.0.56 pkgsrc-2015Q4-base:1.11 pkgsrc-2015Q3:1.11.0.54 pkgsrc-2015Q3-base:1.11 pkgsrc-2015Q2:1.11.0.52 pkgsrc-2015Q2-base:1.11 pkgsrc-2015Q1:1.11.0.50 pkgsrc-2015Q1-base:1.11 pkgsrc-2014Q4:1.11.0.48 pkgsrc-2014Q4-base:1.11 pkgsrc-2014Q3:1.11.0.46 pkgsrc-2014Q3-base:1.11 pkgsrc-2014Q2:1.11.0.44 pkgsrc-2014Q2-base:1.11 pkgsrc-2014Q1:1.11.0.42 pkgsrc-2014Q1-base:1.11 pkgsrc-2013Q4:1.11.0.40 pkgsrc-2013Q4-base:1.11 pkgsrc-2013Q3:1.11.0.38 pkgsrc-2013Q3-base:1.11 pkgsrc-2013Q2:1.11.0.36 pkgsrc-2013Q2-base:1.11 pkgsrc-2013Q1:1.11.0.34 pkgsrc-2013Q1-base:1.11 pkgsrc-2012Q4:1.11.0.32 pkgsrc-2012Q4-base:1.11 pkgsrc-2012Q3:1.11.0.30 pkgsrc-2012Q3-base:1.11 pkgsrc-2012Q2:1.11.0.28 pkgsrc-2012Q2-base:1.11 pkgsrc-2012Q1:1.11.0.26 pkgsrc-2012Q1-base:1.11 pkgsrc-2011Q4:1.11.0.24 pkgsrc-2011Q4-base:1.11 pkgsrc-2011Q3:1.11.0.22 pkgsrc-2011Q3-base:1.11 pkgsrc-2011Q2:1.11.0.20 pkgsrc-2011Q2-base:1.11 pkgsrc-2011Q1:1.11.0.18 pkgsrc-2011Q1-base:1.11 pkgsrc-2010Q4:1.11.0.16 pkgsrc-2010Q4-base:1.11 pkgsrc-2010Q3:1.11.0.14 pkgsrc-2010Q3-base:1.11 pkgsrc-2010Q2:1.11.0.12 pkgsrc-2010Q2-base:1.11 pkgsrc-2010Q1:1.11.0.10 pkgsrc-2010Q1-base:1.11 pkgsrc-2009Q4:1.11.0.8 pkgsrc-2009Q4-base:1.11 pkgsrc-2009Q3:1.11.0.6 pkgsrc-2009Q3-base:1.11 pkgsrc-2009Q2:1.11.0.4 pkgsrc-2009Q2-base:1.11 pkgsrc-2009Q1:1.11.0.2 pkgsrc-2008Q4:1.10.0.24 pkgsrc-2008Q4-base:1.10 pkgsrc-2008Q3:1.10.0.22 pkgsrc-2008Q3-base:1.10 cube-native-xorg:1.10.0.20 cube-native-xorg-base:1.10 pkgsrc-2008Q2:1.10.0.18 pkgsrc-2008Q2-base:1.10 pkgsrc-2008Q1:1.10.0.16 pkgsrc-2008Q1-base:1.10 pkgsrc-2007Q4:1.10.0.14 pkgsrc-2007Q4-base:1.10 pkgsrc-2007Q3:1.10.0.12 pkgsrc-2007Q3-base:1.10 pkgsrc-2007Q2:1.10.0.10 pkgsrc-2007Q2-base:1.10 pkgsrc-2007Q1:1.10.0.8 pkgsrc-2007Q1-base:1.10 pkgsrc-2006Q4:1.10.0.6 pkgsrc-2006Q4-base:1.10 pkgsrc-2006Q3:1.10.0.4 pkgsrc-2006Q3-base:1.10 pkgsrc-2006Q2:1.10.0.2 pkgsrc-2006Q2-base:1.10 pkgsrc-2006Q1:1.8.0.8 pkgsrc-2006Q1-base:1.8 pkgsrc-2005Q4:1.8.0.6 pkgsrc-2005Q4-base:1.8 pkgsrc-2005Q3:1.8.0.4 pkgsrc-2005Q3-base:1.8 pkgsrc-2005Q2:1.8.0.2 pkgsrc-2005Q2-base:1.8 pkgsrc-2005Q1:1.5.0.2 pkgsrc-2005Q1-base:1.5 pkgsrc-2004Q4:1.4.0.6 pkgsrc-2004Q4-base:1.4 pkgsrc-2004Q3:1.4.0.4 pkgsrc-2004Q3-base:1.4 pkgsrc-2004Q2:1.4.0.2 pkgsrc-2004Q2-base:1.4 pkgsrc-2004Q1:1.3.0.2 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.2.0.2 pkgsrc-2003Q4-base:1.2 netbsd-1-6-1:1.1.1.1.0.4 netbsd-1-6-1-base:1.1 netbsd-1-6:1.1.1.1.0.6 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.1.1.0.8 pkgviews-base:1.1 buildlink2-base:1.1.1.1 buildlink2:1.1.1.1.0.2 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.12 date 2017.09.26.10.27.03; author wiz; state dead; branches; next 1.11; commitid 9ARpkXTuh9Wg2H8A; 1.11 date 2009.06.03.12.29.42; author markd; state Exp; branches 1.11.2.1; next 1.10; 1.10 date 2006.06.01.14.19.08; author markd; state dead; branches; next 1.9; 1.9 date 2006.05.31.13.52.54; author tron; state Exp; branches; next 1.8; 1.8 date 2005.05.31.15.01.31; author markd; state dead; branches; next 1.7; 1.7 date 2005.03.29.11.03.18; author markd; state Exp; branches; next 1.6; 1.6 date 2005.03.23.22.26.26; author markd; state dead; branches; next 1.5; 1.5 date 2004.12.23.13.02.17; author markd; state Exp; branches; next 1.4; 1.4 date 2004.04.20.13.52.06; author markd; state dead; branches 1.4.6.1; next 1.3; 1.3 date 2004.03.14.00.44.27; author markd; state Exp; branches; next 1.2; 1.2 date 2003.03.11.13.24.59; author markd; state dead; branches; next 1.1; 1.1 date 2002.06.05.08.58.02; author skrll; state Exp; branches 1.1.1.1; next ; 1.11.2.1 date 2009.06.03.12.29.42; author tron; state dead; branches; next 1.11.2.2; 1.11.2.2 date 2009.06.04.16.49.30; author tron; state Exp; branches; next ; 1.4.6.1 date 2004.12.23.18.53.39; author snj; state Exp; branches; next ; 1.1.1.1 date 2002.06.05.08.58.02; author skrll; state Exp; branches 1.1.1.1.2.1; next ; 1.1.1.1.2.1 date 2002.06.05.08.58.02; author jlam; state dead; branches; next 1.1.1.1.2.2; 1.1.1.1.2.2 date 2002.06.23.18.46.29; author jlam; state Exp; branches; next ; desc @@ 1.12 log @*: remove qt3 and the packages using it, including KDE3 Announced in https://mail-index.netbsd.org/pkgsrc-users/2017/09/10/msg025556.html @ text @$NetBSD: patch-ab,v 1.11 2009/06/03 12:29:42 markd Exp $ xpdf 3.02pl3 by way of poppler git 9f1312f3d7dfa7e536606a7c7296b7c876b11c00 --- kpdf/xpdf/xpdf/JBIG2Stream.h.orig 2007-05-14 19:39:30.000000000 +1200 +++ kpdf/xpdf/xpdf/JBIG2Stream.h @@@@ -78,6 +78,10 @@@@ private: Guint *refSegs, Guint nRefSegs); void readGenericRegionSeg(Guint segNum, GBool imm, GBool lossless, Guint length); + void mmrAddPixels(int a1, int blackPixels, + int *codingLine, int *a0i, int w); + void mmrAddPixelsNeg(int a1, int blackPixels, + int *codingLine, int *a0i, int w); JBIG2Bitmap *readGenericBitmap(GBool mmr, int w, int h, int templ, GBool tpgdOn, GBool useSkip, JBIG2Bitmap *skip, @ 1.11 log @Update kpdf to have the xpdf3.02pl patches for the vulnerabilities reported in CVE-2009-0146, CVE-2009-0147, CVE-2009-0166, CVE-2009-0799, CVE-2009-0800, CVE-2009-1179, CVE-2009-1180, CVE-2009-1181, CVE-2009-1182 and CVE-2009-1183. also some patches from poppler for postscript output generation problems seen here. @ text @d1 1 a1 1 $NetBSD$ @ 1.11.2.1 log @file patch-ab was added on branch pkgsrc-2009Q1 on 2009-06-04 16:49:30 +0000 @ text @d1 17 @ 1.11.2.2 log @Pullup ticket #2784 - requested by markd kdegraphics3: security patch Revisions pulled up: - graphics/kdegraphics3/Makefile 1.81 via patch - graphics/kdegraphics3/distinfo 1.51 - graphics/kdegraphics3/patches/patch-aa 1.14 - graphics/kdegraphics3/patches/patch-ab 1.11 - graphics/kdegraphics3/patches/patch-ac 1.8 --- Module Name: pkgsrc Committed By: markd Date: Wed Jun 3 12:29:43 UTC 2009 Modified Files: pkgsrc/graphics/kdegraphics3: Makefile distinfo Added Files: pkgsrc/graphics/kdegraphics3/patches: patch-aa patch-ab patch-ac Log Message: Update kpdf to have the xpdf3.02pl patches for the vulnerabilities reported in CVE-2009-0146, CVE-2009-0147, CVE-2009-0166, CVE-2009-0799, CVE-2009-0800, CVE-2009-1179, CVE-2009-1180, CVE-2009-1181, CVE-2009-1182 and CVE-2009-1183. also some patches from poppler for postscript output generation problems seen here. @ text @a0 17 $NetBSD$ xpdf 3.02pl3 by way of poppler git 9f1312f3d7dfa7e536606a7c7296b7c876b11c00 --- kpdf/xpdf/xpdf/JBIG2Stream.h.orig 2007-05-14 19:39:30.000000000 +1200 +++ kpdf/xpdf/xpdf/JBIG2Stream.h @@@@ -78,6 +78,10 @@@@ private: Guint *refSegs, Guint nRefSegs); void readGenericRegionSeg(Guint segNum, GBool imm, GBool lossless, Guint length); + void mmrAddPixels(int a1, int blackPixels, + int *codingLine, int *a0i, int w); + void mmrAddPixelsNeg(int a1, int blackPixels, + int *codingLine, int *a0i, int w); JBIG2Bitmap *readGenericBitmap(GBool mmr, int w, int h, int templ, GBool tpgdOn, GBool useSkip, JBIG2Bitmap *skip, @ 1.10 log @Update to KDE 3.5.3 Changes: * KPDF o Fix bug parsing some TOCs o Fix display of some JBIG2 files o Enable print action when opening files using drag and drop * KGhostView o Fix KGhostView .desktop files * Kuickshow o Fix remote browsing of http-urls o Don't display non-existing files @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.9 2006/05/31 13:52:54 tron Exp $ d3 15 a17 31 --- ksvg/impl/libs/libtext2path/src/GlyphTracer.h.orig 2005-10-11 03:56:48.000000000 +1300 +++ ksvg/impl/libs/libtext2path/src/GlyphTracer.h @@@@ -43,20 +43,20 @@@@ namespace T2P virtual void closePath(Glyph *glyph) = 0; // FreeType glyph tracing functions - void setMoveto(int (funcPtr)(FT_Vector *, void *)); - void setLineto(int (funcPtr)(FT_Vector *, void *)); - void setConicBezier(int (funcPtr)(FT_Vector *, FT_Vector *, void *)); - void setCubicBezier(int (funcPtr)(FT_Vector *, FT_Vector *, FT_Vector *, void *)); + void setMoveto(FT_Outline_MoveToFunc funcPtr); + void setLineto(FT_Outline_LineToFunc funcPtr); + void setConicBezier(FT_Outline_ConicToFunc funcPtr); + void setCubicBezier(FT_Outline_CubicToFunc funcPtr); FT_Outline_Funcs *outlineFuncs(); private: FT_Outline_Funcs *m_outlineMethods; - int (*m_moveTo)(FT_Vector *, void *); - int (*m_lineTo)(FT_Vector *, void *); - int (*m_conicBezier)(FT_Vector *, FT_Vector *, void *); - int (*m_cubicBezier)(FT_Vector *, FT_Vector *, FT_Vector *, void *); + FT_Outline_MoveToFunc m_moveTo; + FT_Outline_LineToFunc m_lineTo; + FT_Outline_ConicToFunc m_conicBezier; + FT_Outline_CubicToFunc m_cubicBezier; }; } @ 1.9 log @Make this package build with version 2.2.1 or newer of the "freetype2" package. Patch provided by Mark Davies. Bump package revision. @ text @d1 1 a1 1 $NetBSD$ @ 1.8 log @Update to KDE 3.4.1 Changes: * kpdf: Change atan2f to atan2 so it compiles on Solaris 2.8 * kpdf: Show context menu when in FullScreen even if no document is open * kpdf: Do not leak memory when reloading a document * kpdf: Fix mouse wheel rotation in presentation mode * kpdf: Do not assume only there's only a ObjectRect in a given point * kpdf: Fix properties dialog when there are very large texts * kpdf: Compile when Xft2 headers are in a non-standard path * kpdf: Make Page Up and Page Down work on presentation mode * kpdf: Ask when overwriting files * kpdf: Solaris compile fix * kpdf: Do not move to top of the page when reloading the document * kpdf: Add another path where to look for ghostscript fonts * kpdf: Workaround weakness in gnome handling of desktop files * kpdf: Don't assume Encoding array of Type1 fonts end in "foo def" * kpdf: Fix text copying on some documents * kpdf: Parse Light and Condensed in font name * kpdf: Fix the allocation size of libgoo on 64bit architectures * kpdf: Fix problems with non-standard styles * kpdf: Fix disabled icons * ksnapshot: Rescale screenshot preview when resizing window @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.7 2005/03/29 11:03:18 markd Exp $ d3 4 a6 4 --- kpdf/ui/presentationwidget.cpp.orig 2005-03-29 11:58:40.224750000 +1200 +++ kpdf/ui/presentationwidget.cpp @@@@ -320,7 +320,7 @@@@ void PresentationWidget::overlayClick( c return; d8 25 a32 4 // compute angle relative to indicator (note coord transformation) - float angle = 0.5 + 0.5 * atan2f( -xPos, -yPos ) / M_PI; + float angle = 0.5 + 0.5 * atan2( -xPos, -yPos ) / M_PI; int pageIndex = (int)( angle * ( m_frames.count() - 1 ) + 0.5 ); a33 1 // go to selected page @ 1.7 log @Fix build on Solaris. From KDE's KDE_3_4_BRANCH. @ text @d1 1 a1 1 $NetBSD$ @ 1.6 log @Update to KDE 3.4 Highlights at a glance * Text-to-speech system with support built into Konqueror, Kate, KPDF and the standalone application KSayIt * Support for text to speech synthesis is integrated with the desktop * Completely redesigned, more flexible trash system * Kicker with improved look and feel * KPDF now enables you to select, copy & paste text and images from PDFs, along with many other improvements * Kontact supports now various groupware servers, including eGroupware, GroupWise, Kolab, OpenGroupware.org and SLOX * Kopete supports Novell Groupwise and Lotus Sametime and gets integrated into Kontact * DBUS/HAL support allows to keep dynamic device icons in media:/ and on the desktop in sync with the state of all devices * KHTML has improved standard support and now close to full support for CSS 2.1 and the CSS 3 Selectors module * Better synchronization between 2 PCs * A new high contrast style and a complete monochrome icon set * An icon effect to paint all icons in two chosen colors, converting third party application icons into high contrast monochrome icons * Akregator allows you to read news from your favourite RSS-enabled websites in one application * Juk has now an album cover management via Google Image Search * KMail now stores passwords securely with KWallet * SVG files can now be used as wallpapers * KHTML plug-ins are now configurable, so the user can selectively disable ones that are not used. This does not include Netscape-style plug-ins. Netscape plug-in in CPU usage can be manually lowered, and plug-ins are more stable. * more than 6,500 bugs have been fixed * more than 1,700 wishes have been fullfilled * more than 80,000 contributions with several million lines of code and documentation added or changed @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.5 2004/12/23 13:02:17 markd Exp $ d3 11 a13 23 --- kpdf/xpdf/GfxState.cc.orig 2004-11-29 02:30:57.000000000 +1300 +++ kpdf/xpdf/GfxState.cc @@@@ -708,6 +708,11 @@@@ GfxColorSpace *GfxICCBasedColorSpace::pa } nCompsA = obj2.getInt(); obj2.free(); + if (nCompsA > gfxColorMaxComps) { + error(-1, "ICCBased color space with too many (%d > %d) components", + nCompsA, gfxColorMaxComps); + nCompsA = gfxColorMaxComps; + } if (dict->lookup("Alternate", &obj2)->isNull() || !(altA = GfxColorSpace::parse(&obj2))) { switch (nCompsA) { @@@@ -1054,7 +1059,7 @@@@ GfxColorSpace *GfxDeviceNColorSpace::par } nCompsA = obj1.arrayGetLength(); if (nCompsA > gfxColorMaxComps) { - error(-1, "DeviceN color space with more than %d > %d components", + error(-1, "DeviceN color space with too many (%d > %d) components", nCompsA, gfxColorMaxComps); nCompsA = gfxColorMaxComps; } @ 1.5 log @Fix for security problem: http://www.kde.org/info/security/advisory-20041223-1.txt Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD$ @ 1.4 log @bl3ify and update to kde3.2.2. Changes: * kiconedit: Fix [PATCH] Adds large current color viewer to palette toolbar * kiconedit: Fix Visual difference between a gray and transparent pixel * kpdf: Fix KPDF can't open files whose names have non-ASCII letters * ksvg: Fix Transformed symbols sometimes disappear * configure: Fix Extraneous message in admin/Makefile.common using --prefix * kghostview: Fix the executable linking against the part, by adding a common library. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.3 2004/03/14 00:44:27 markd Exp $ d3 23 a25 670 --- kghostview/Makefile.in 2004-03-01 10:44:41.000000000 +1300 +++ kghostview/Makefile.in 2004-01-26 08:07:02.000000000 +1300 @@@@ -350,18 +350,16 @@@@ ####### Files bin_PROGRAMS = kghostview -lib_LTLIBRARIES = libkghostviewlib.la kde_module_LTLIBRARIES = libkghostviewpart.la noinst_LTLIBRARIES = libdscparse.la -libkghostviewlib_la_LDFLAGS = $(all_libraries) -libkghostviewlib_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -lkdeprint libdscparse.la - libkghostviewpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -libkghostviewpart_la_LIBADD = libkghostviewlib.la +libkghostviewpart_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -lkdeprint \ + libdscparse.la + # Check "make final" after making changes to the following line!! -#>- libkghostviewlib_la_SOURCES = kgvshell.cpp kgvdocument.cpp kgv_miniwidget.cpp \ +#>- libkghostviewpart_la_SOURCES = kgvshell.cpp kgvdocument.cpp kgv_miniwidget.cpp \ #>- marklist.cpp logwindow.cpp infodialog.cpp \ #>- kgvpageview.cpp ps.c kgv_view.cpp scrollbox.cpp kgvpagedecorator.cpp \ #>- kgvconfigdialog.cpp kgvmainwidget.cpp \ @@@@ -369,7 +367,7 @@@@ #>- fullscreenfilter.cpp kgvfactory.cpp \ #>- generalsettingswidget.ui gssettingswidget.ui thumbnailservice.cpp #>+ 7 -libkghostviewlib_la_SOURCES=kgvshell.cpp kgvdocument.cpp kgv_miniwidget.cpp \ +libkghostviewpart_la_SOURCES=kgvshell.cpp kgvdocument.cpp kgv_miniwidget.cpp \ marklist.cpp logwindow.cpp infodialog.cpp \ kgvpageview.cpp ps.c kgv_view.cpp scrollbox.cpp kgvpagedecorator.cpp \ kgvconfigdialog.cpp kgvmainwidget.cpp \ @@@@ -378,11 +376,9 @@@@ thumbnailservice.cpp generalsettingswidget.cpp gssettingswidget.cpp -libkghostviewpart_la_SOURCES = part_dummy.cpp - kghostview_SOURCES = main.cpp kghostview_LDFLAGS = $(all_libraries) $(KDE_RPATH) -kghostview_LDADD = libkghostviewlib.la +kghostview_LDADD = libkghostviewpart.la #>- libdscparse_la_LDFLAGS = $(all_libraries) -no-undefined #>+ 1 @@@@ -411,8 +407,7 @@@@ mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = -LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES) \ - $(noinst_LTLIBRARIES) +LTLIBRARIES = $(kde_module_LTLIBRARIES) $(noinst_LTLIBRARIES) libdscparse_la_DEPENDENCIES = am_libdscparse_la_OBJECTS = dscparse.lo dscparse_adapter.lo @@@@ -422,29 +417,24 @@@@ libdscparse_la_nofinal_OBJECTS = dscparse.lo dscparse_adapter.lo @@KDE_USE_FINAL_FALSE@@libdscparse_la_OBJECTS = $(libdscparse_la_nofinal_OBJECTS) @@KDE_USE_FINAL_TRUE@@libdscparse_la_OBJECTS = $(libdscparse_la_final_OBJECTS) -libkghostviewlib_la_DEPENDENCIES = libdscparse.la -am_libkghostviewlib_la_OBJECTS = kgvshell.lo kgvdocument.lo \ +libkghostviewpart_la_DEPENDENCIES = libdscparse.la +am_libkghostviewpart_la_OBJECTS = kgvshell.lo kgvdocument.lo \ kgv_miniwidget.lo marklist.lo logwindow.lo infodialog.lo \ kgvpageview.lo ps.lo kgv_view.lo scrollbox.lo \ kgvpagedecorator.lo kgvconfigdialog.lo kgvmainwidget.lo \ kdscerrordialog.lo displayoptions.lo kpswidget.lo \ fullscreenfilter.lo kgvfactory.lo thumbnailservice.lo -#>- libkghostviewlib_la_OBJECTS = $(am_libkghostviewlib_la_OBJECTS) +#>- libkghostviewpart_la_OBJECTS = $(am_libkghostviewpart_la_OBJECTS) #>+ 9 -libkghostviewlib_la_final_OBJECTS = libkghostviewlib_la.all_cpp.lo ps.lo -libkghostviewlib_la_nofinal_OBJECTS = kgvshell.lo kgvdocument.lo \ +libkghostviewpart_la_final_OBJECTS = ps.lo libkghostviewpart_la.all_cpp.lo +libkghostviewpart_la_nofinal_OBJECTS = kgvshell.lo kgvdocument.lo \ kgv_miniwidget.lo marklist.lo logwindow.lo infodialog.lo \ kgvpageview.lo ps.lo kgv_view.lo scrollbox.lo \ kgvpagedecorator.lo kgvconfigdialog.lo kgvmainwidget.lo \ kdscerrordialog.lo displayoptions.lo kpswidget.lo \ fullscreenfilter.lo kgvfactory.lo thumbnailservice.lo generalsettingswidget.lo gssettingswidget.lo -@@KDE_USE_FINAL_FALSE@@libkghostviewlib_la_OBJECTS = $(libkghostviewlib_la_nofinal_OBJECTS) -@@KDE_USE_FINAL_TRUE@@libkghostviewlib_la_OBJECTS = $(libkghostviewlib_la_final_OBJECTS) -libkghostviewpart_la_DEPENDENCIES = libkghostviewlib.la -am_libkghostviewpart_la_OBJECTS = part_dummy.lo -#>- libkghostviewpart_la_OBJECTS = $(am_libkghostviewpart_la_OBJECTS) -#>+ 1 -libkghostviewpart_la_OBJECTS = part_dummy.lo +@@KDE_USE_FINAL_FALSE@@libkghostviewpart_la_OBJECTS = $(libkghostviewpart_la_nofinal_OBJECTS) +@@KDE_USE_FINAL_TRUE@@libkghostviewpart_la_OBJECTS = $(libkghostviewpart_la_final_OBJECTS) bin_PROGRAMS = kghostview$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) @@@@ -452,7 +442,7 @@@@ #>- kghostview_OBJECTS = $(am_kghostview_OBJECTS) #>+ 1 kghostview_OBJECTS = main.$(OBJEXT) -kghostview_DEPENDENCIES = libkghostviewlib.la +kghostview_DEPENDENCIES = libkghostviewpart.la DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp @@@@ -473,11 +463,11 @@@@ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kgvpageview.Plo \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kgvshell.Plo ./$(DEPDIR)/kpswidget.Plo \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/logwindow.Plo ./$(DEPDIR)/main.Po \ -#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/marklist.Plo ./$(DEPDIR)/part_dummy.Plo \ -#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/ps.Plo ./$(DEPDIR)/scrollbox.Plo \ +#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/marklist.Plo ./$(DEPDIR)/ps.Plo \ +#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/scrollbox.Plo \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/thumbnailservice.Plo #>+ 38 -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES = $(DEPDIR)/generalsettingswidget.P $(DEPDIR)/gssettingswidget.P $(DEPDIR)/libdscparse_la.all_cpp.P $(DEPDIR)/libkghostviewlib_la.all_cpp.P ./$(DEPDIR)/displayoptions.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES = $(DEPDIR)/generalsettingswidget.P $(DEPDIR)/gssettingswidget.P $(DEPDIR)/libdscparse_la.all_cpp.P $(DEPDIR)/libkghostviewpart_la.all_cpp.P ./$(DEPDIR)/displayoptions.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/dscparse.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/dscparse_adapter.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/fullscreenfilter.Plo \ @@@@ -493,8 +483,8 @@@@ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kgvpageview.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kgvshell.Plo ./$(DEPDIR)/kpswidget.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/logwindow.Plo ./$(DEPDIR)/main.Po \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/marklist.Plo ./$(DEPDIR)/part_dummy.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/ps.Plo ./$(DEPDIR)/scrollbox.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/marklist.Plo ./$(DEPDIR)/ps.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/scrollbox.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/thumbnailservice.Plo @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@DEP_FILES = $(DEPDIR)/generalsettingswidget.P $(DEPDIR)/gssettingswidget.P ./$(DEPDIR)/displayoptions.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/dscparse.Plo \ @@@@ -512,8 +502,8 @@@@ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kgvpageview.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kgvshell.Plo ./$(DEPDIR)/kpswidget.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/logwindow.Plo ./$(DEPDIR)/main.Po \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/marklist.Plo ./$(DEPDIR)/part_dummy.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/ps.Plo ./$(DEPDIR)/scrollbox.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/marklist.Plo ./$(DEPDIR)/ps.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/scrollbox.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/thumbnailservice.Plo COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@@@ -540,8 +530,8 @@@@ #>+ 2 CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@@ -DIST_SOURCES = $(libdscparse_la_SOURCES) $(libkghostviewlib_la_SOURCES) \ - $(libkghostviewpart_la_SOURCES) $(kghostview_SOURCES) +DIST_SOURCES = $(libdscparse_la_SOURCES) $(libkghostviewpart_la_SOURCES) \ + $(kghostview_SOURCES) DATA = $(part_DATA) $(xdg_apps_DATA) HEADERS = $(noinst_HEADERS) @@@@ -561,7 +551,7 @@@@ DIST_COMMON = README $(noinst_HEADERS) AUTHORS ChangeLog Makefile.am \ Makefile.in TODO DIST_SUBDIRS = $(SUBDIRS) -SOURCES = $(libdscparse_la_SOURCES) $(libkghostviewlib_la_SOURCES) $(libkghostviewpart_la_SOURCES) $(kghostview_SOURCES) +SOURCES = $(libdscparse_la_SOURCES) $(libkghostviewpart_la_SOURCES) $(kghostview_SOURCES) #>- all: all-recursive #>+ 1 @@@@ -606,34 +596,6 @@@@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libLTLIBRARIES_INSTALL = $(INSTALL) -install-libLTLIBRARIES: $(lib_LTLIBRARIES) - @@$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(libdir) - @@list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \ - $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \ - else :; fi; \ - done - -uninstall-libLTLIBRARIES: - @@$(NORMAL_UNINSTALL) - @@list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - p="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \ - $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ - done - -clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @@list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) @@@@ -648,8 +610,6 @@@@ @@KDE_USE_CLOSURE_TRUE@@libdscparse.la: libdscparse.la.closure $(libdscparse_la_OBJECTS) $(libdscparse_la_DEPENDENCIES) @@KDE_USE_CLOSURE_FALSE@@libdscparse.la: $(libdscparse_la_OBJECTS) $(libdscparse_la_DEPENDENCIES) $(CXXLINK) $(libdscparse_la_LDFLAGS) $(libdscparse_la_OBJECTS) $(libdscparse_la_LIBADD) $(LIBS) -libkghostviewlib.la: $(libkghostviewlib_la_OBJECTS) $(libkghostviewlib_la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir) $(libkghostviewlib_la_LDFLAGS) $(libkghostviewlib_la_OBJECTS) $(libkghostviewlib_la_LIBADD) $(LIBS) #>- libkghostviewpart.la: $(libkghostviewpart_la_OBJECTS) $(libkghostviewpart_la_DEPENDENCIES) #>+ 2 @@KDE_USE_CLOSURE_TRUE@@libkghostviewpart.la: libkghostviewpart.la.closure $(libkghostviewpart_la_OBJECTS) $(libkghostviewpart_la_DEPENDENCIES) @@@@ -713,7 +673,6 @@@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/logwindow.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/main.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/marklist.Plo@@am__quote@@ -@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/part_dummy.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/ps.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/scrollbox.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/thumbnailservice.Plo@@am__quote@@ @@@@ -1006,11 +965,9 @@@@ check-am: all-am check: check-recursive all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) -install-binPROGRAMS: install-libLTLIBRARIES - installdirs: installdirs-recursive installdirs-am: - $(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(partdir) $(DESTDIR)$(xdg_appsdir) + $(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(bindir) $(DESTDIR)$(partdir) $(DESTDIR)$(xdg_appsdir) install: install-recursive install-exec: install-exec-recursive @@@@ -1041,12 +998,10 @@@@ clean: kde-rpo-clean clean-recursive #>- clean-am: clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \ -#>- clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES \ -#>- mostlyclean-am -#>+ 3 +#>- clean-libtool clean-noinstLTLIBRARIES mostlyclean-am +#>+ 2 clean-am: clean-metasources clean-ui clean-closures clean-bcheck clean-final clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \ - clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES \ - mostlyclean-am + clean-libtool clean-noinstLTLIBRARIES mostlyclean-am distclean: distclean-recursive @@@@ -1067,9 +1022,9 @@@@ install-data-am: install-kde-icons install-partDATA \ install-xdg_appsDATA -#>- install-exec-am: install-binPROGRAMS install-libLTLIBRARIES +#>- install-exec-am: install-binPROGRAMS #>+ 1 -install-exec-am: install-binPROGRAMS install-libLTLIBRARIES install-kde_moduleLTLIBRARIES +install-exec-am: install-binPROGRAMS install-kde_moduleLTLIBRARIES install-info: install-info-recursive @@@@ -1095,27 +1050,26 @@@@ ps-am: #>- uninstall-am: uninstall-binPROGRAMS uninstall-info-am \ -#>- uninstall-kde_moduleLTLIBRARIES uninstall-libLTLIBRARIES \ -#>- uninstall-partDATA uninstall-xdg_appsDATA +#>- uninstall-kde_moduleLTLIBRARIES uninstall-partDATA \ +#>- uninstall-xdg_appsDATA #>+ 3 uninstall-am: uninstall-kde-icons uninstall-binPROGRAMS uninstall-info-am \ - uninstall-kde_moduleLTLIBRARIES uninstall-libLTLIBRARIES \ - uninstall-partDATA uninstall-xdg_appsDATA + uninstall-kde_moduleLTLIBRARIES uninstall-partDATA \ + uninstall-xdg_appsDATA uninstall-info: uninstall-info-recursive .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \ - clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES \ - clean-recursive ctags ctags-recursive distclean \ - distclean-compile distclean-depend distclean-generic \ - distclean-libtool distclean-recursive distclean-tags distdir \ - dvi dvi-am dvi-recursive info info-am info-recursive install \ - install-am install-binPROGRAMS install-data install-data-am \ - install-data-recursive install-exec install-exec-am \ - install-exec-recursive install-info install-info-am \ - install-info-recursive install-kde_moduleLTLIBRARIES \ - install-libLTLIBRARIES install-man install-partDATA \ + clean-libtool clean-noinstLTLIBRARIES clean-recursive ctags \ + ctags-recursive distclean distclean-compile distclean-depend \ + distclean-generic distclean-libtool distclean-recursive \ + distclean-tags distdir dvi dvi-am dvi-recursive info info-am \ + info-recursive install install-am install-binPROGRAMS \ + install-data install-data-am install-data-recursive \ + install-exec install-exec-am install-exec-recursive \ + install-info install-info-am install-info-recursive \ + install-kde_moduleLTLIBRARIES install-man install-partDATA \ install-recursive install-strip install-xdg_appsDATA \ installcheck installcheck-am installdirs installdirs-am \ installdirs-recursive maintainer-clean maintainer-clean-generic \ @@@@ -1124,13 +1078,10 @@@@ pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \ tags-recursive uninstall uninstall-am uninstall-binPROGRAMS \ uninstall-info-am uninstall-info-recursive \ - uninstall-kde_moduleLTLIBRARIES uninstall-libLTLIBRARIES \ - uninstall-partDATA uninstall-recursive uninstall-xdg_appsDATA + uninstall-kde_moduleLTLIBRARIES uninstall-partDATA \ + uninstall-recursive uninstall-xdg_appsDATA -part_dummy.cpp: - touch part_dummy.cpp - messages: rc.cpp $(XGETTEXT) *.cpp *.h -o $(podir)/kghostview.pot @@@@ -1152,13 +1103,6 @@@@ #>+ 3 -thumbnailservice.moc: $(srcdir)/thumbnailservice.h - $(MOC) $(srcdir)/thumbnailservice.h -o thumbnailservice.moc - -#>+ 2 -mocs: thumbnailservice.moc - -#>+ 3 kgvpageview.moc: $(srcdir)/kgvpageview.h $(MOC) $(srcdir)/kgvpageview.h -o kgvpageview.moc @@@@ -1166,60 +1110,60 @@@@ mocs: kgvpageview.moc #>+ 3 -infodialog.moc: $(srcdir)/infodialog.h - $(MOC) $(srcdir)/infodialog.h -o infodialog.moc +kpswidget.moc: $(srcdir)/kpswidget.h + $(MOC) $(srcdir)/kpswidget.h -o kpswidget.moc #>+ 2 -mocs: infodialog.moc +mocs: kpswidget.moc #>+ 3 -viewcontrol.moc: $(srcdir)/viewcontrol.h - $(MOC) $(srcdir)/viewcontrol.h -o viewcontrol.moc +thumbnailservice.moc: $(srcdir)/thumbnailservice.h + $(MOC) $(srcdir)/thumbnailservice.h -o thumbnailservice.moc #>+ 2 -mocs: viewcontrol.moc +mocs: thumbnailservice.moc #>+ 3 -kgvdocument.moc: $(srcdir)/kgvdocument.h - $(MOC) $(srcdir)/kgvdocument.h -o kgvdocument.moc +kgvmainwidget.moc: $(srcdir)/kgvmainwidget.h + $(MOC) $(srcdir)/kgvmainwidget.h -o kgvmainwidget.moc #>+ 2 -mocs: kgvdocument.moc +mocs: kgvmainwidget.moc #>+ 3 -scrollbox.moc: $(srcdir)/scrollbox.h - $(MOC) $(srcdir)/scrollbox.h -o scrollbox.moc +marklist.moc: $(srcdir)/marklist.h + $(MOC) $(srcdir)/marklist.h -o marklist.moc #>+ 2 -mocs: scrollbox.moc +mocs: marklist.moc #>+ 3 -logwindow.moc: $(srcdir)/logwindow.h - $(MOC) $(srcdir)/logwindow.h -o logwindow.moc +kgvconfigdialog.moc: $(srcdir)/kgvconfigdialog.h + $(MOC) $(srcdir)/kgvconfigdialog.h -o kgvconfigdialog.moc #>+ 2 -mocs: logwindow.moc +mocs: kgvconfigdialog.moc #>+ 3 -kgv_miniwidget.moc: $(srcdir)/kgv_miniwidget.h - $(MOC) $(srcdir)/kgv_miniwidget.h -o kgv_miniwidget.moc +kgv_view.moc: $(srcdir)/kgv_view.h + $(MOC) $(srcdir)/kgv_view.h -o kgv_view.moc #>+ 2 -mocs: kgv_miniwidget.moc +mocs: kgv_view.moc #>+ 3 -kgv_view.moc: $(srcdir)/kgv_view.h - $(MOC) $(srcdir)/kgv_view.h -o kgv_view.moc +kgvdocument.moc: $(srcdir)/kgvdocument.h + $(MOC) $(srcdir)/kgvdocument.h -o kgvdocument.moc #>+ 2 -mocs: kgv_view.moc +mocs: kgvdocument.moc #>+ 3 -kpswidget.moc: $(srcdir)/kpswidget.h - $(MOC) $(srcdir)/kpswidget.h -o kpswidget.moc +kdscerrordialog.moc: $(srcdir)/kdscerrordialog.h + $(MOC) $(srcdir)/kdscerrordialog.h -o kdscerrordialog.moc #>+ 2 -mocs: kpswidget.moc +mocs: kdscerrordialog.moc #>+ 3 fullscreenfilter.moc: $(srcdir)/fullscreenfilter.h @@@@ -1229,39 +1173,46 @@@@ mocs: fullscreenfilter.moc #>+ 3 -kgvshell.moc: $(srcdir)/kgvshell.h - $(MOC) $(srcdir)/kgvshell.h -o kgvshell.moc +logwindow.moc: $(srcdir)/logwindow.h + $(MOC) $(srcdir)/logwindow.h -o logwindow.moc #>+ 2 -mocs: kgvshell.moc +mocs: logwindow.moc #>+ 3 -marklist.moc: $(srcdir)/marklist.h - $(MOC) $(srcdir)/marklist.h -o marklist.moc +infodialog.moc: $(srcdir)/infodialog.h + $(MOC) $(srcdir)/infodialog.h -o infodialog.moc #>+ 2 -mocs: marklist.moc +mocs: infodialog.moc #>+ 3 -kgvconfigdialog.moc: $(srcdir)/kgvconfigdialog.h - $(MOC) $(srcdir)/kgvconfigdialog.h -o kgvconfigdialog.moc +viewcontrol.moc: $(srcdir)/viewcontrol.h + $(MOC) $(srcdir)/viewcontrol.h -o viewcontrol.moc #>+ 2 -mocs: kgvconfigdialog.moc +mocs: viewcontrol.moc #>+ 3 -kdscerrordialog.moc: $(srcdir)/kdscerrordialog.h - $(MOC) $(srcdir)/kdscerrordialog.h -o kdscerrordialog.moc +kgv_miniwidget.moc: $(srcdir)/kgv_miniwidget.h + $(MOC) $(srcdir)/kgv_miniwidget.h -o kgv_miniwidget.moc #>+ 2 -mocs: kdscerrordialog.moc +mocs: kgv_miniwidget.moc #>+ 3 -kgvmainwidget.moc: $(srcdir)/kgvmainwidget.h - $(MOC) $(srcdir)/kgvmainwidget.h -o kgvmainwidget.moc +kgvshell.moc: $(srcdir)/kgvshell.h + $(MOC) $(srcdir)/kgvshell.h -o kgvshell.moc #>+ 2 -mocs: kgvmainwidget.moc +mocs: kgvshell.moc + +#>+ 3 +scrollbox.moc: $(srcdir)/scrollbox.h + $(MOC) $(srcdir)/scrollbox.h -o scrollbox.moc + +#>+ 2 +mocs: scrollbox.moc #>+ 8 libkghostviewpart.la.closure: $(libkghostviewpart_la_OBJECTS) $(libkghostviewpart_la_DEPENDENCIES) @@@@ -1274,10 +1225,10 @@@@ #>+ 3 clean-metasources: - -rm -f thumbnailservice.moc kgvpageview.moc infodialog.moc viewcontrol.moc kgvdocument.moc scrollbox.moc logwindow.moc kgv_miniwidget.moc kgv_view.moc kpswidget.moc fullscreenfilter.moc kgvshell.moc marklist.moc kgvconfigdialog.moc kdscerrordialog.moc kgvmainwidget.moc + -rm -f kgvpageview.moc kpswidget.moc thumbnailservice.moc kgvmainwidget.moc marklist.moc kgvconfigdialog.moc kgv_view.moc kgvdocument.moc kdscerrordialog.moc fullscreenfilter.moc logwindow.moc infodialog.moc viewcontrol.moc kgv_miniwidget.moc kgvshell.moc scrollbox.moc #>+ 2 -KDE_DIST=kgv_part.rc gssettingswidget.ui.h gssettingswidget.ui generalsettingswidget.ui.h viewcontrol.cpp kghostviewui.rc cr64-app-kghostview.png cr16-app-kghostview.png kgv.h cr128-app-kghostview.png version.h cr32-app-kghostview.png generalsettingswidget.ui viewcontrol.h cr48-app-kghostview.png +KDE_DIST=viewcontrol.cpp generalsettingswidget.ui.h cr32-app-kghostview.png cr16-app-kghostview.png cr48-app-kghostview.png kghostviewui.rc kgv.h version.h generalsettingswidget.ui cr64-app-kghostview.png cr128-app-kghostview.png viewcontrol.h kgv_part.rc gssettingswidget.ui.h gssettingswidget.ui #>+ 5 clean-ui: @@@@ -1354,36 +1305,36 @@@@ rm -f libdscparse_la.all_cpp.final libdscparse_la.all_cpp.files #>+ 11 -libkghostviewlib_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kgvshell.cpp $(srcdir)/kgvdocument.cpp $(srcdir)/kgv_miniwidget.cpp $(srcdir)/marklist.cpp $(srcdir)/logwindow.cpp $(srcdir)/infodialog.cpp $(srcdir)/kgvpageview.cpp $(srcdir)/kgv_view.cpp $(srcdir)/scrollbox.cpp $(srcdir)/kgvpagedecorator.cpp $(srcdir)/kgvconfigdialog.cpp $(srcdir)/kgvmainwidget.cpp $(srcdir)/kdscerrordialog.cpp $(srcdir)/displayoptions.cpp $(srcdir)/kpswidget.cpp $(srcdir)/fullscreenfilter.cpp $(srcdir)/kgvfactory.cpp $(srcdir)/thumbnailservice.cpp generalsettingswidget.cpp gssettingswidget.cpp kgvpageview.moc thumbnailservice.moc infodialog.moc kgvdocument.moc scrollbox.moc gssettingswidget.moc logwindow.moc kgv_miniwidget.moc kgv_view.moc kpswidget.moc fullscreenfilter.moc kgvshell.moc marklist.moc kgvconfigdialog.moc generalsettingswidget.moc kdscerrordialog.moc kgvmainwidget.moc - @@echo 'creating libkghostviewlib_la.all_cpp.cpp ...'; \ - rm -f libkghostviewlib_la.all_cpp.files libkghostviewlib_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> libkghostviewlib_la.all_cpp.final; \ +libkghostviewpart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kgvshell.cpp $(srcdir)/kgvdocument.cpp $(srcdir)/kgv_miniwidget.cpp $(srcdir)/marklist.cpp $(srcdir)/logwindow.cpp $(srcdir)/infodialog.cpp $(srcdir)/kgvpageview.cpp $(srcdir)/kgv_view.cpp $(srcdir)/scrollbox.cpp $(srcdir)/kgvpagedecorator.cpp $(srcdir)/kgvconfigdialog.cpp $(srcdir)/kgvmainwidget.cpp $(srcdir)/kdscerrordialog.cpp $(srcdir)/displayoptions.cpp $(srcdir)/kpswidget.cpp $(srcdir)/fullscreenfilter.cpp $(srcdir)/kgvfactory.cpp $(srcdir)/thumbnailservice.cpp generalsettingswidget.cpp gssettingswidget.cpp kpswidget.moc marklist.moc kgvmainwidget.moc kgvconfigdialog.moc kgv_view.moc infodialog.moc kgv_miniwidget.moc kgvpageview.moc thumbnailservice.moc kgvdocument.moc kdscerrordialog.moc gssettingswidget.moc fullscreenfilter.moc logwindow.moc generalsettingswidget.moc kgvshell.moc scrollbox.moc + @@echo 'creating libkghostviewpart_la.all_cpp.cpp ...'; \ + rm -f libkghostviewpart_la.all_cpp.files libkghostviewpart_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkghostviewpart_la.all_cpp.final; \ for file in kgvshell.cpp kgvdocument.cpp kgv_miniwidget.cpp marklist.cpp logwindow.cpp infodialog.cpp kgvpageview.cpp kgv_view.cpp scrollbox.cpp kgvpagedecorator.cpp kgvconfigdialog.cpp kgvmainwidget.cpp kdscerrordialog.cpp displayoptions.cpp kpswidget.cpp fullscreenfilter.cpp kgvfactory.cpp thumbnailservice.cpp generalsettingswidget.cpp gssettingswidget.cpp ; do \ - echo "#include \"$$file\"" >> libkghostviewlib_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkghostviewlib_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libkghostviewpart_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkghostviewpart_la.all_cpp.final; \ done; \ - cat libkghostviewlib_la.all_cpp.final libkghostviewlib_la.all_cpp.files > libkghostviewlib_la.all_cpp.cpp; \ - rm -f libkghostviewlib_la.all_cpp.final libkghostviewlib_la.all_cpp.files + cat libkghostviewpart_la.all_cpp.final libkghostviewpart_la.all_cpp.files > libkghostviewpart_la.all_cpp.cpp; \ + rm -f libkghostviewpart_la.all_cpp.final libkghostviewpart_la.all_cpp.files #>+ 3 clean-final: - -rm -f libdscparse_la.all_cpp.cpp libkghostviewlib_la.all_cpp.cpp + -rm -f libdscparse_la.all_cpp.cpp libkghostviewpart_la.all_cpp.cpp #>+ 3 final: - $(MAKE) libdscparse_la_OBJECTS="$(libdscparse_la_final_OBJECTS)" libkghostviewlib_la_OBJECTS="$(libkghostviewlib_la_final_OBJECTS)" all-am + $(MAKE) libdscparse_la_OBJECTS="$(libdscparse_la_final_OBJECTS)" libkghostviewpart_la_OBJECTS="$(libkghostviewpart_la_final_OBJECTS)" all-am #>+ 3 final-install: - $(MAKE) libdscparse_la_OBJECTS="$(libdscparse_la_final_OBJECTS)" libkghostviewlib_la_OBJECTS="$(libkghostviewlib_la_final_OBJECTS)" install-am + $(MAKE) libdscparse_la_OBJECTS="$(libdscparse_la_final_OBJECTS)" libkghostviewpart_la_OBJECTS="$(libkghostviewpart_la_final_OBJECTS)" install-am #>+ 3 no-final: - $(MAKE) libdscparse_la_OBJECTS="$(libdscparse_la_nofinal_OBJECTS)" libkghostviewlib_la_OBJECTS="$(libkghostviewlib_la_nofinal_OBJECTS)" all-am + $(MAKE) libdscparse_la_OBJECTS="$(libdscparse_la_nofinal_OBJECTS)" libkghostviewpart_la_OBJECTS="$(libkghostviewpart_la_nofinal_OBJECTS)" all-am #>+ 3 no-final-install: - $(MAKE) libdscparse_la_OBJECTS="$(libdscparse_la_nofinal_OBJECTS)" libkghostviewlib_la_OBJECTS="$(libkghostviewlib_la_nofinal_OBJECTS)" install-am + $(MAKE) libdscparse_la_OBJECTS="$(libdscparse_la_nofinal_OBJECTS)" libkghostviewpart_la_OBJECTS="$(libkghostviewpart_la_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: @@@@ -1394,75 +1345,61 @@@@ -rm -f *.rpo #>+ 54 -kgvconfigdialog.lo: kgvconfigdialog.moc -fullscreenfilter.o: fullscreenfilter.moc +$(srcdir)/kgvdocument.cpp: generalsettingswidget.h gssettingswidget.h $(srcdir)/fullscreenfilter.cpp: generalsettingswidget.h gssettingswidget.h -infodialog.lo: infodialog.moc -kgvmainwidget.o: kgvmainwidget.moc -viewcontrol.o: viewcontrol.moc -$(srcdir)/infodialog.cpp: generalsettingswidget.h gssettingswidget.h +nmcheck-am: nmcheck +$(srcdir)/kdscerrordialog.cpp: generalsettingswidget.h gssettingswidget.h $(srcdir)/kgv_miniwidget.cpp: generalsettingswidget.h gssettingswidget.h +$(srcdir)/kgvpagedecorator.cpp: generalsettingswidget.h gssettingswidget.h +kgvpageview.o: kgvpageview.moc +infodialog.lo: infodialog.moc +viewcontrol.lo: viewcontrol.moc +logwindow.o: logwindow.moc +infodialog.o: infodialog.moc +marklist.lo: marklist.moc $(srcdir)/thumbnailservice.cpp: generalsettingswidget.h gssettingswidget.h -kgvconfigdialog.o: kgvconfigdialog.moc -$(srcdir)/kgvconfigdialog.cpp: generalsettingswidget.h gssettingswidget.h -$(srcdir)/logwindow.cpp: generalsettingswidget.h gssettingswidget.h -$(srcdir)/kpswidget.cpp: generalsettingswidget.h gssettingswidget.h -fullscreenfilter.lo: fullscreenfilter.moc -kpswidget.o: kpswidget.moc +kgvmainwidget.lo: kgvmainwidget.moc +kgvdocument.o: kgvdocument.moc +thumbnailservice.o: thumbnailservice.moc +$(srcdir)/marklist.cpp: generalsettingswidget.h gssettingswidget.h +$(srcdir)/kgvfactory.cpp: generalsettingswidget.h gssettingswidget.h +$(srcdir)/kgvpageview.cpp: generalsettingswidget.h gssettingswidget.h +viewcontrol.o: viewcontrol.moc kgvpageview.lo: kgvpageview.moc -kgvpageview.o: kgvpageview.moc +nmcheck: kgv_miniwidget.o: kgv_miniwidget.moc +kgvconfigdialog.o: kgvconfigdialog.moc +kgv_miniwidget.lo: kgv_miniwidget.moc +$(srcdir)/kgvshell.cpp: generalsettingswidget.h gssettingswidget.h $(srcdir)/displayoptions.cpp: generalsettingswidget.h gssettingswidget.h -kgv_view.o: kgv_view.moc -$(srcdir)/kgvdocument.cpp: generalsettingswidget.h gssettingswidget.h -kgv_view.lo: kgv_view.moc -$(srcdir)/kgv_view.cpp: generalsettingswidget.h gssettingswidget.h -kgvmainwidget.lo: kgvmainwidget.moc -kdscerrordialog.o: kdscerrordialog.moc -kgvshell.lo: kgvshell.moc +$(srcdir)/kgvconfigdialog.cpp: generalsettingswidget.h gssettingswidget.h $(srcdir)/ps.c: generalsettingswidget.h gssettingswidget.h -marklist.lo: marklist.moc -kdscerrordialog.lo: kdscerrordialog.moc scrollbox.o: scrollbox.moc -nmcheck-am: nmcheck -$(srcdir)/kgvpageview.cpp: generalsettingswidget.h gssettingswidget.h -$(srcdir)/kgvshell.cpp: generalsettingswidget.h gssettingswidget.h -scrollbox.lo: scrollbox.moc +kgv_view.o: kgv_view.moc +$(srcdir)/logwindow.cpp: generalsettingswidget.h gssettingswidget.h +marklist.o: marklist.moc +$(srcdir)/scrollbox.cpp: generalsettingswidget.h gssettingswidget.h +kdscerrordialog.lo: kdscerrordialog.moc +kgvconfigdialog.lo: kgvconfigdialog.moc +kgv_view.lo: kgv_view.moc $(srcdir)/kgvmainwidget.cpp: generalsettingswidget.h gssettingswidget.h -kgvdocument.lo: kgvdocument.moc -kgvshell.o: kgvshell.moc -$(srcdir)/kgvpagedecorator.cpp: generalsettingswidget.h gssettingswidget.h -kgvdocument.o: kgvdocument.moc -kpswidget.lo: kpswidget.moc -$(srcdir)/kdscerrordialog.cpp: generalsettingswidget.h gssettingswidget.h -kgv_miniwidget.lo: kgv_miniwidget.moc -$(srcdir)/marklist.cpp: generalsettingswidget.h gssettingswidget.h -infodialog.o: infodialog.moc thumbnailservice.lo: thumbnailservice.moc -$(srcdir)/scrollbox.cpp: generalsettingswidget.h gssettingswidget.h -marklist.o: marklist.moc -viewcontrol.lo: viewcontrol.moc -$(srcdir)/kgvfactory.cpp: generalsettingswidget.h gssettingswidget.h +kgvshell.lo: kgvshell.moc +kpswidget.o: kpswidget.moc +$(srcdir)/infodialog.cpp: generalsettingswidget.h gssettingswidget.h +$(srcdir)/kpswidget.cpp: generalsettingswidget.h gssettingswidget.h +kpswidget.lo: kpswidget.moc +scrollbox.lo: scrollbox.moc +fullscreenfilter.o: fullscreenfilter.moc logwindow.lo: logwindow.moc -thumbnailservice.o: thumbnailservice.moc -nmcheck: -logwindow.o: logwindow.moc +kgvmainwidget.o: kgvmainwidget.moc +$(srcdir)/kgv_view.cpp: generalsettingswidget.h gssettingswidget.h +kgvshell.o: kgvshell.moc +fullscreenfilter.lo: fullscreenfilter.moc +kgvdocument.lo: kgvdocument.moc +kdscerrordialog.o: kdscerrordialog.moc #>+ 28 -generalsettingswidget.cpp: $(srcdir)/generalsettingswidget.ui generalsettingswidget.h generalsettingswidget.moc - rm -f generalsettingswidget.cpp - echo '#include ' > generalsettingswidget.cpp - $(UIC) -tr ${UIC_TR} -i generalsettingswidget.h $(srcdir)/generalsettingswidget.ui > generalsettingswidget.cpp.temp ; ret=$$?; \ - $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" generalsettingswidget.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_generalsettingswidget,g" >> generalsettingswidget.cpp ;\ - rm -f generalsettingswidget.cpp.temp ;\ - if test "$$ret" = 0; then echo '#include "generalsettingswidget.moc"' >> generalsettingswidget.cpp; else rm -f generalsettingswidget.cpp ; exit $$ret ; fi - -generalsettingswidget.h: $(srcdir)/generalsettingswidget.ui - $(UIC) -o generalsettingswidget.h $(srcdir)/generalsettingswidget.ui - -generalsettingswidget.moc: generalsettingswidget.h - $(MOC) generalsettingswidget.h -o generalsettingswidget.moc - gssettingswidget.cpp: $(srcdir)/gssettingswidget.ui gssettingswidget.h gssettingswidget.moc rm -f gssettingswidget.cpp echo '#include ' > gssettingswidget.cpp @@@@ -1476,3 +1413,17 @@@@ gssettingswidget.moc: gssettingswidget.h $(MOC) gssettingswidget.h -o gssettingswidget.moc + +generalsettingswidget.cpp: $(srcdir)/generalsettingswidget.ui generalsettingswidget.h generalsettingswidget.moc + rm -f generalsettingswidget.cpp + echo '#include ' > generalsettingswidget.cpp + $(UIC) -tr ${UIC_TR} -i generalsettingswidget.h $(srcdir)/generalsettingswidget.ui > generalsettingswidget.cpp.temp ; ret=$$?; \ + $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" generalsettingswidget.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_generalsettingswidget,g" >> generalsettingswidget.cpp ;\ + rm -f generalsettingswidget.cpp.temp ;\ + if test "$$ret" = 0; then echo '#include "generalsettingswidget.moc"' >> generalsettingswidget.cpp; else rm -f generalsettingswidget.cpp ; exit $$ret ; fi + +generalsettingswidget.h: $(srcdir)/generalsettingswidget.ui + $(UIC) -o generalsettingswidget.h $(srcdir)/generalsettingswidget.ui + +generalsettingswidget.moc: generalsettingswidget.h + $(MOC) generalsettingswidget.h -o generalsettingswidget.moc @ 1.4.6.1 log @Pullup ticket 184 - requested by Mark Davies security fix for kdegraphics3 Module Name: pkgsrc Committed By: markd Date: Thu Dec 23 13:02:17 UTC 2004 Modified Files: pkgsrc/graphics/kdegraphics3: Makefile distinfo Added Files: pkgsrc/graphics/kdegraphics3/patches: patch-aa patch-ab Log Message: Fix for security problem: http://www.kde.org/info/security/advisory-20041223-1.txt Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.5 2004/12/23 13:02:17 markd Exp $ d3 670 a672 23 --- kpdf/xpdf/GfxState.cc.orig 2004-11-29 02:30:57.000000000 +1300 +++ kpdf/xpdf/GfxState.cc @@@@ -708,6 +708,11 @@@@ GfxColorSpace *GfxICCBasedColorSpace::pa } nCompsA = obj2.getInt(); obj2.free(); + if (nCompsA > gfxColorMaxComps) { + error(-1, "ICCBased color space with too many (%d > %d) components", + nCompsA, gfxColorMaxComps); + nCompsA = gfxColorMaxComps; + } if (dict->lookup("Alternate", &obj2)->isNull() || !(altA = GfxColorSpace::parse(&obj2))) { switch (nCompsA) { @@@@ -1054,7 +1059,7 @@@@ GfxColorSpace *GfxDeviceNColorSpace::par } nCompsA = obj1.arrayGetLength(); if (nCompsA > gfxColorMaxComps) { - error(-1, "DeviceN color space with more than %d > %d components", + error(-1, "DeviceN color space with too many (%d > %d) components", nCompsA, gfxColorMaxComps); nCompsA = gfxColorMaxComps; } @ 1.3 log @Revert kghostview Makefile.{am,in} to the -3.2.0 version as the latest version produces a kghostview that fails to run on NetBSD and the reason for the change (Debian packaging issues) shouldn't effect us. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Update KDE to 3.1. Many bugfixes and functionality enhancements including: kdegraphics KView: Added KImageViewer interface Added possibility for plugins Added Slideshow plugin Enhanced Mousewheel support Automatic resizing to fit images with varying size kviewshell: added statusbar kviewshell: usability improvements KuickShow: Digital camera jpeg images obey orientaion information KuickShow: General UI improvements, now features a menubar KuickShow: Ability to browse image collections on remote servers KuickShow: Digital camera jpeg images obey orientaion information KPovModeler: Implement support for the missing PovRAY 3.1 primitives, zehender at kde org. KFax: Rewrite all the UI code to be KDE standards compliant, cleanups. (Nadeem Hasan ) libkscan: support for halftoning scan mode where available kooka: thumbnail view of scanned images added kooka: ported to KDockWidgets to provide a customizable GUI kooka: inline image renaming and drag and drop NEW IN KDE:KPovModeler, a modeling and composition program for creating POV-Ray (tm) scenes @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.1 2002/06/05 08:58:02 skrll Exp $ d3 3 a5 64 --- kghostview/dscparse_adapter.h.orig Thu Feb 14 20:56:52 2002 +++ kghostview/dscparse_adapter.h @@@@ -29,6 +29,50 @@@@ #include "dscparse.h" #undef min +#if defined(__GNUC__) +#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 93) +/* + * We add a quick 'n' dirty inline implementation of auto_ptr for older + * releases of GCC, which don't include an auto_ptr implementation in + * . + */ + +template class auto_ptr { +private: + T* _ptr; + +public: + typedef T element_type; + explicit auto_ptr(T* p = 0) : _ptr(p) {} + auto_ptr(auto_ptr& a) : _ptr(a.release()) {} + template auto_ptr(auto_ptr& a) : _ptr(a.release()) {} + auto_ptr& operator=(auto_ptr& a) { + if (&a != this) { + delete _ptr; + _ptr = a.release(); + } + return *this; + } + template + auto_ptr& operator=(auto_ptr& a) { + if (a.get() != this->get()) { + delete _ptr; + _ptr = a.release(); + } + return *this; + } + ~auto_ptr() { delete _ptr; } + + T& operator*() const { return *_ptr; } + T* operator->() const { return _ptr; } + T* get() const { return _ptr; } + T* release() { T* tmp = _ptr; _ptr = 0; return tmp; } + void reset(T* p = 0) { delete _ptr; _ptr = p; } +}; + +#endif +#endif + class KDSCBBOX { @@@@ -259,8 +303,13 @@@@ CDSCMEDIA** media() const; const CDSCMEDIA* page_media() const; +#if defined(__GNUC__) && (__GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 93)) + auto_ptr bbox() const; + auto_ptr page_bbox() const; +#else std::auto_ptr bbox() const; std::auto_ptr page_bbox() const; +#endif d7 5 a11 1 // CDSCDOSEPS *doseps; d13 660 @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ @ 1.1.1.1 log @Initial import of a kdegraphics3 pkg. @ text @@ 1.1.1.1.2.1 log @file patch-ab was added on branch buildlink2 on 2002-06-23 18:46:29 +0000 @ text @d1 69 @ 1.1.1.1.2.2 log @Merge from pkgsrc-current to buildlink2 branch. @ text @a0 69 $NetBSD: patch-ab,v 1.1.1.1.2.1 2002/06/23 18:46:29 jlam Exp $ --- kghostview/dscparse_adapter.h.orig Thu Feb 14 20:56:52 2002 +++ kghostview/dscparse_adapter.h @@@@ -29,6 +29,50 @@@@ #include "dscparse.h" #undef min +#if defined(__GNUC__) +#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 93) +/* + * We add a quick 'n' dirty inline implementation of auto_ptr for older + * releases of GCC, which don't include an auto_ptr implementation in + * . + */ + +template class auto_ptr { +private: + T* _ptr; + +public: + typedef T element_type; + explicit auto_ptr(T* p = 0) : _ptr(p) {} + auto_ptr(auto_ptr& a) : _ptr(a.release()) {} + template auto_ptr(auto_ptr& a) : _ptr(a.release()) {} + auto_ptr& operator=(auto_ptr& a) { + if (&a != this) { + delete _ptr; + _ptr = a.release(); + } + return *this; + } + template + auto_ptr& operator=(auto_ptr& a) { + if (a.get() != this->get()) { + delete _ptr; + _ptr = a.release(); + } + return *this; + } + ~auto_ptr() { delete _ptr; } + + T& operator*() const { return *_ptr; } + T* operator->() const { return _ptr; } + T* get() const { return _ptr; } + T* release() { T* tmp = _ptr; _ptr = 0; return tmp; } + void reset(T* p = 0) { delete _ptr; _ptr = p; } +}; + +#endif +#endif + class KDSCBBOX { @@@@ -259,8 +303,13 @@@@ CDSCMEDIA** media() const; const CDSCMEDIA* page_media() const; +#if defined(__GNUC__) && (__GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 93)) + auto_ptr bbox() const; + auto_ptr page_bbox() const; +#else std::auto_ptr bbox() const; std::auto_ptr page_bbox() const; +#endif // CDSCDOSEPS *doseps; @