Kpdf saveas fix.

Package-Manager: portage-2.0.54

4 files changed, 26 insertions, 4 deletions

diff --git a/kde-base/kdegraphics/ChangeLog b/kde-base/kdegraphics/ChangeLog
index 681256b9b545..47bc02cff5a9 100644
--- a/kde-base/kdegraphics/ChangeLog
+++ b/kde-base/kdegraphics/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdegraphics
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/ChangeLog,v 1.225 2006/01/28 14:35:38 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/ChangeLog,v 1.226 2006/01/31 23:32:14 carlo Exp $
+
+  31 Jan 2006; Carsten Lohrke <carlo@gentoo.org>
+  +files/kpdf-3.5.1-saveas.patch, kdegraphics-3.5.1.ebuild:
+  Kpdf saveas fix.
 
   28 Jan 2006; Dan Armak <danarmak@gentoo.org> +kdegraphics-3.5.1.ebuild:
   Version 3.5.1. Not yet released upstream, so package.masked for now.
diff --git a/kde-base/kdegraphics/Manifest b/kde-base/kdegraphics/Manifest
index 56a59ab76dc0..f928f61bd9de 100644
--- a/kde-base/kdegraphics/Manifest
+++ b/kde-base/kdegraphics/Manifest
@@ -1,4 +1,4 @@
-MD5 fce7d1e5b135284848b71e6760a46c41 ChangeLog 32029
+MD5 83b512387780a16dbdd2c774080f5abd ChangeLog 32155
 MD5 284f518172a2843428d308d2d48bbbee files/CAN-2005-0064.patch 793
 MD5 9eb12845ce85cc31e216d463877cb519 files/digest-kdegraphics-3.3.2-r3 71
 MD5 1a6dde4414b4ad894e4ed7ed3fa919ff files/digest-kdegraphics-3.4.1-r1 71
@@ -20,6 +20,7 @@ MD5 4caddebea4d845abb2de6dbbfe1b979a files/kdegraphics-3.4.2-kpdf-fix.patch 1024
 MD5 8db8a9b442f66e9567ad591c8f03530e files/kdegraphics-3.5.0-kpovmodeler.patch 446
 MD5 cba50683fe0c9704ddfcd91fde5129c8 files/kpdf-3.5.0-cropbox-fix.patch 631
 MD5 d18efc8eb0bf3e3b54a33cf04cdba3fd files/kpdf-3.5.0-splitter-io.patch 1415
+MD5 191a45e1b9346c3bbeb4bfda29f3d48a files/kpdf-3.5.1-saveas.patch 926
 MD5 4a4bcdcb2456ab92b7846b6646da1bcb files/post-3.3.1-kdegraphics-4.diff 1797
 MD5 bf6b28780e0f5ea8f99e0777187e73cb files/post-3.3.2-kdegraphics.diff 1385
 MD5 ec3b95efe9139f4259d6de213fe4b87b files/post-3.4.1-kdegraphics-4.diff 1827
@@ -36,5 +37,5 @@ MD5 5709a55ffcff66d128e042db2770cb23 kdegraphics-3.5.0-r2.ebuild 1967
 MD5 ac5906cf478a42d22cdd61b24fa2514a kdegraphics-3.5.0-r3.ebuild 2109
 MD5 a26db213b1c84e8b28f243cd297c5d88 kdegraphics-3.5.0-r4.ebuild 2401
 MD5 9653b01977a047d3528800df71e30411 kdegraphics-3.5.0.ebuild 1858
-MD5 bfdcc3dcf87c68efb893fc2123aaf660 kdegraphics-3.5.1.ebuild 1860
+MD5 95b0c33b8dedac8ed50ae44f58faccff kdegraphics-3.5.1.ebuild 1948
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-base/kdegraphics/files/kpdf-3.5.1-saveas.patch b/kde-base/kdegraphics/files/kpdf-3.5.1-saveas.patch
new file mode 100644
index 000000000000..7649d393453e
--- /dev/null
+++ b/kde-base/kdegraphics/files/kpdf-3.5.1-saveas.patch
@@ -0,0 +1,14 @@
+--- branches/KDE/3.5/kdegraphics/kpdf/part.cpp	2006/01/18 21:57:05	499855
++++ branches/KDE/3.5/kdegraphics/kpdf/part.cpp	2006/01/23 23:11:54	501814
+@@ -697,6 +697,11 @@
+     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)
diff --git a/kde-base/kdegraphics/kdegraphics-3.5.1.ebuild b/kde-base/kdegraphics/kdegraphics-3.5.1.ebuild
index 40ace2557f2f..e9ed7a632ab0 100644
--- a/kde-base/kdegraphics/kdegraphics-3.5.1.ebuild
+++ b/kde-base/kdegraphics/kdegraphics-3.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.5.1.ebuild,v 1.1 2006/01/28 14:35:38 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.5.1.ebuild,v 1.2 2006/01/31 23:32:15 carlo Exp $
 
 inherit kde-dist eutils
 
@@ -35,6 +35,8 @@ RDEPEND="${DEPEND}
 DEPEND="${DEPEND}
 	dev-util/pkgconfig"
 
+PATCHES="${FILESDIR}/kpdf-3.5.1-saveas.patch"
+
 pkg_setup() {
 	if ! built_with_use virtual/ghostscript X; then
 		eerror "This package requires virtual/ghostscript compiled with X11 support."
@@ -56,5 +58,6 @@ src_compile() {
 	use scanner || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kooka libkscan"
 	use povray || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kpovmodeler"
 
+	replace-flags "-Os" "-O2" # see bug 114822
 	kde_src_compile
 }