From a3694da6d998b5c8b6376c8a238e88f31386fd88 Mon Sep 17 00:00:00 2001 From: markd Date: Thu, 30 Mar 2006 03:02:01 +0000 Subject: Update KDE to 3.5.2 * KDVI o Fix problems with PS header inclusion * KPDF o Don't destroy the document when overwriting itself with save as... o Fix crash on some documents o Fix crash when embedded on Konqueror * KolourPaint o Printing improvements o Respect image DPI o Fit image to page if image is too big o Center image on page --- graphics/kdegraphics3/Makefile | 14 +++++--------- graphics/kdegraphics3/PLIST | 4 +--- graphics/kdegraphics3/distinfo | 12 ++++-------- graphics/kdegraphics3/patches/patch-aa | 16 ---------------- 4 files changed, 10 insertions(+), 36 deletions(-) delete mode 100644 graphics/kdegraphics3/patches/patch-aa (limited to 'graphics') diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile index a59460b7992..d56a545c344 100644 --- a/graphics/kdegraphics3/Makefile +++ b/graphics/kdegraphics3/Makefile @@ -1,13 +1,9 @@ -# $NetBSD: Makefile,v 1.62 2006/03/09 01:29:46 reed Exp $ +# $NetBSD: Makefile,v 1.63 2006/03/30 03:02:01 markd Exp $ DISTNAME= kdegraphics-${_KDE_VERSION} -PKGREVISION= 3 CATEGORIES= graphics COMMENT= Graphics programs for the KDE integrated X11 desktop -PATCH_SITES= ftp://ftp.kde.org/pub/kde/security_patches/ -PATCHFILES= post-3.5.1-kdegraphics-CVE-2006-0301.diff - .include "../../meta-pkgs/kde3/Makefile.kde3" USE_DIRS+= xdg-1.1 @@ -15,16 +11,16 @@ USE_TOOLS+= gs:run pkg-config BUILDLINK_DEPENDS.lcms+= lcms>=1.12 -REPLACE_PERL= kghostview/update-to-xt-names.pl +REPLACE_PERL+= kghostview/update-to-xt-names.pl CONFIGURE_ARGS+= --with-imlib-config=${X11PREFIX}/bin SUBST_CLASSES+= kpdf SUBST_STAGE.kpdf= post-patch -SUBST_MESSAGE.kpdf= "Fixing hardcoded paths." +SUBST_MESSAGE.kpdf= Fixing hardcoded paths. SUBST_FILES.kpdf= kpdf/xpdf/xpdf/GlobalParams.cc -SUBST_SED.kpdf= -e 's:/usr/pkg:${LOCALBASE}:g' \ - -e 's:/usr/X11R6:${X11BASE}:g' +SUBST_SED.kpdf= -e 's:/usr/pkg:${LOCALBASE}:g' +SUBST_SED.kpdf+= -e 's:/usr/X11R6:${X11BASE}:g' # Ensure we export symbols in the linked shared object. LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS} diff --git a/graphics/kdegraphics3/PLIST b/graphics/kdegraphics3/PLIST index bab2cb7f77f..94c719d0619 100644 --- a/graphics/kdegraphics3/PLIST +++ b/graphics/kdegraphics3/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.26 2006/01/31 22:47:11 markd Exp $ +@comment $NetBSD: PLIST,v 1.27 2006/03/30 03:02:01 markd Exp $ bin/kcolorchooser bin/kcoloredit bin/kdvi @@ -1025,7 +1025,6 @@ share/kde/config.kcfg/kghostview.kcfg share/kde/config.kcfg/kpdf.kcfg share/kde/config.kcfg/kviewshell.kcfg share/kde/config/kookarc -share/kde/config/magic/x-image-raw.magic share/kde/icons/crystalsvg/16x16/actions/camera_test.png share/kde/icons/crystalsvg/16x16/actions/palette_color.png share/kde/icons/crystalsvg/16x16/actions/palette_gray.png @@ -1109,7 +1108,6 @@ share/kde/icons/hicolor/scalable/apps/kfaxview.svgz share/kde/icons/hicolor/scalable/apps/kolourpaint.svgz share/kde/icons/hicolor/scalable/apps/kpdf.svgz share/kde/icons/hicolor/scalable/apps/ksnapshot.svgz -share/kde/mimelnk/image/x-image-raw.desktop share/kde/mimelnk/text/mrml.desktop share/kde/services/camera.protocol share/kde/services/djvumultipage.desktop diff --git a/graphics/kdegraphics3/distinfo b/graphics/kdegraphics3/distinfo index a7387210d8a..a45cfe81861 100644 --- a/graphics/kdegraphics3/distinfo +++ b/graphics/kdegraphics3/distinfo @@ -1,9 +1,5 @@ -$NetBSD: distinfo,v 1.36 2006/02/04 11:01:03 markd Exp $ +$NetBSD: distinfo,v 1.37 2006/03/30 03:02:01 markd Exp $ -SHA1 (kdegraphics-3.5.1.tar.bz2) = 2cf6d50576f5bcb72fd2e54f80250d3b0816fd1e -RMD160 (kdegraphics-3.5.1.tar.bz2) = a8b2b94c0378c689c9be808a1f57e93ecef54418 -Size (kdegraphics-3.5.1.tar.bz2) = 7315482 bytes -SHA1 (post-3.5.1-kdegraphics-CVE-2006-0301.diff) = 0590315a17dd638d69f108bdb47cdbf8de64a68f -RMD160 (post-3.5.1-kdegraphics-CVE-2006-0301.diff) = 8f3cae16be3b68fb6b120aa133d41608579d4f38 -Size (post-3.5.1-kdegraphics-CVE-2006-0301.diff) = 1684 bytes -SHA1 (patch-aa) = aa3c7573c3b18af4d7964224cdc11bf19f04f969 +SHA1 (kdegraphics-3.5.2.tar.bz2) = 80703d46fd90b7ab95f92d7b7c411a04f431d13b +RMD160 (kdegraphics-3.5.2.tar.bz2) = cf2fce91b76af7d570b20f336ba551c5c3bd767f +Size (kdegraphics-3.5.2.tar.bz2) = 7288264 bytes diff --git a/graphics/kdegraphics3/patches/patch-aa b/graphics/kdegraphics3/patches/patch-aa deleted file mode 100644 index cc733fa321a..00000000000 --- a/graphics/kdegraphics3/patches/patch-aa +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-aa,v 1.10 2006/01/31 22:47:11 markd Exp $ - ---- kpdf/part.cpp.orig 2006-01-20 05:38:22.000000000 +1300 -+++ kpdf/part.cpp -@@ -697,6 +697,11 @@ void Part::slotSaveFileAs() - KURL saveURL = KFileDialog::getSaveURL( url().isLocalFile() ? url().url() : url().fileName(), QString::null, widget() ); - if ( saveURL.isValid() && !saveURL.isEmpty() ) - { -+ if (saveURL == url()) -+ { -+ KMessageBox::information( widget(), i18n("You are trying to overwrite \"%1\" with itself. This is not allowed. Please save it in another location.").arg(saveURL.filename()) ); -+ return; -+ } - if ( KIO::NetAccess::exists( saveURL, false, widget() ) ) - { - if (KMessageBox::warningContinueCancel( widget(), i18n("A file named \"%1\" already exists. Are you sure you want to overwrite it?").arg(saveURL.filename()), QString::null, i18n("Overwrite")) != KMessageBox::Continue) -- cgit v1.2.3