Update to KDE 3.4.3 / KOffice 1.4.2

6 files changed, 4 insertions, 61 deletions

diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile
index 40fd6748e580..4b49bf3ae684 100644
--- a/graphics/kdegraphics3/Makefile
+++ b/graphics/kdegraphics3/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	kdegraphics
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	1
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/graphics/kdegraphics3/distinfo b/graphics/kdegraphics3/distinfo
index c1c59560f44e..57d2116fe256 100644
--- a/graphics/kdegraphics3/distinfo
+++ b/graphics/kdegraphics3/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdegraphics-3.4.2.tar.bz2) = 50916460952c4142329a7c6a47fe1530
-SIZE (KDE/kdegraphics-3.4.2.tar.bz2) = 6579227
+MD5 (KDE/kdegraphics-3.4.3.tar.bz2) = e2b2926301204a0f587d9e6e163c06d9
+SIZE (KDE/kdegraphics-3.4.3.tar.bz2) = 6554272
diff --git a/graphics/kdegraphics3/files/patch-kpdf_xpdf_xpdf-PDFDOC.cc b/graphics/kdegraphics3/files/patch-kpdf_xpdf_xpdf-PDFDOC.cc
deleted file mode 100644
index 23167b544f9f..000000000000
--- a/graphics/kdegraphics3/files/patch-kpdf_xpdf_xpdf-PDFDOC.cc
+++ /dev/null
@@ -1,34 +0,0 @@
---- kpdf/xpdf/xpdf/PDFDoc.cc.orig	Tue Aug  2 19:37:37 2005
-+++ kpdf/xpdf/xpdf/PDFDoc.cc	Tue Aug  2 19:43:32 2005
-@@ -115,24 +115,20 @@
- GBool PDFDoc::setup(GString *ownerPassword, GString *userPassword) {
-   str->reset();
-   
--  char eof[8];
-+  char *eof = new char[1025];
-   int pos = str->getPos();
--  str->setPos(7, -1);
--  eof[0] = str->getChar();
--  eof[1] = str->getChar();
--  eof[2] = str->getChar();
--  eof[3] = str->getChar();
--  eof[4] = str->getChar();
--  eof[5] = str->getChar();
--  eof[6] = str->getChar();
--  eof[7] = '\0';
-+  str->setPos(1024, -1);
-+  for (int i = 0; i < 1024; i++) eof[i] = str->getChar();
-+  eof[1024] = '\0';
-   if (strstr(eof, "%%EOF") == NULL)
-   {
-     error(-1, "Document does not have ending %%EOF");	      
-     errCode = errDamaged;
-+    delete[] eof;
-     return gFalse;
-   }
--  
-+  delete[] eof;
-+
-   str->setPos(pos);
-   
-   // check header
diff --git a/graphics/kdegraphics3/files/patch-ksnapshot-ksnapshotwidget.ui b/graphics/kdegraphics3/files/patch-ksnapshot-ksnapshotwidget.ui
deleted file mode 100644
index 4bff83669e96..000000000000
--- a/graphics/kdegraphics3/files/patch-ksnapshot-ksnapshotwidget.ui
+++ /dev/null
@@ -1,10 +0,0 @@
---- ksnapshot/ksnapshotwidget.ui.orig	Thu Sep 15 12:46:22 2005
-+++ ksnapshot/ksnapshotwidget.ui	Thu Sep 15 12:46:29 2005
-@@ -342,7 +342,6 @@
- <layoutdefaults spacing="6" margin="11"/>
- <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
- <includehints>
--    <includehint>ksnapshotpreview.h</includehint>
-     <includehint>kpushbutton.h</includehint>
-     <includehint>kpushbutton.h</includehint>
-     <includehint>kpushbutton.h</includehint>
diff --git a/graphics/kdegraphics3/files/patch-kviewshell-pageSizeWidget_base.ui b/graphics/kdegraphics3/files/patch-kviewshell-pageSizeWidget_base.ui
deleted file mode 100644
index b61ede67c084..000000000000
--- a/graphics/kdegraphics3/files/patch-kviewshell-pageSizeWidget_base.ui
+++ /dev/null
@@ -1,12 +0,0 @@
---- kviewshell/pageSizeWidget_base.ui.orig	Thu Sep 15 19:05:14 2005
-+++ kviewshell/pageSizeWidget_base.ui	Thu Sep 15 19:05:36 2005
-@@ -281,9 +281,5 @@
- <layoutdefaults spacing="6" margin="11"/>
- <includehints>
-     <includehint>kcombobox.h</includehint>
--    <includehint>kcombobox.h</includehint>
--    <includehint>kcombobox.h</includehint>
--    <includehint>kcombobox.h</includehint>
--    <includehint>sizepreview.h</includehint>
- </includehints>
- </UI>
diff --git a/graphics/kdegraphics3/pkg-plist b/graphics/kdegraphics3/pkg-plist
index a2d64b30f3f8..3a7980637e57 100644
--- a/graphics/kdegraphics3/pkg-plist
+++ b/graphics/kdegraphics3/pkg-plist
@@ -259,6 +259,8 @@ lib/kde3/libkviewcanvas.la
 lib/kde3/libkviewcanvas.so
 lib/kde3/libkviewviewer.la
 lib/kde3/libkviewviewer.so
+lib/kde3/libphotobook.la
+lib/kde3/libphotobook.so
 lib/kde3/mrmlsearch.la
 lib/kde3/mrmlsearch.so
 lib/kde3/svgthumbnail.la
@@ -282,8 +284,6 @@ lib/libkpovmodeler.so.0
 lib/libksvg.la
 lib/libksvg.so
 lib/libksvg.so.0
-lib/libphotobook.la
-lib/libphotobook.so
 lib/libtext2path.la
 lib/libtext2path.so
 lib/libtext2path.so.0