summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorMichael Nottebrock <lofi@FreeBSD.org>2004-12-13 20:12:15 +0000
committerMichael Nottebrock <lofi@FreeBSD.org>2004-12-13 20:12:15 +0000
commit0083804533ca47e8481e5b40de38c7d76c789b91 (patch)
tree89a797089d768e8e3a5e3c4f7b2844f20b954e95 /graphics
parent- Grant maintainership to submitter of previous patch. (diff)
Update to KDE 3.3.2
Notes
Notes: svn path=/head/; revision=123951
Diffstat (limited to 'graphics')
-rw-r--r--graphics/kamera-kde4/distinfo4
-rw-r--r--graphics/kamera-kde4/pkg-plist3
-rw-r--r--graphics/kamera/distinfo4
-rw-r--r--graphics/kamera/pkg-plist3
-rw-r--r--graphics/kdegraphics3/Makefile3
-rw-r--r--graphics/kdegraphics3/distinfo4
-rw-r--r--graphics/kdegraphics3/files/patch-kpdf_xpdf_Catalog.cc42
-rw-r--r--graphics/kdegraphics3/pkg-plist16
-rw-r--r--graphics/kdegraphics4/Makefile3
-rw-r--r--graphics/kdegraphics4/distinfo4
-rw-r--r--graphics/kdegraphics4/files/patch-kpdf_xpdf_Catalog.cc42
-rw-r--r--graphics/kdegraphics4/pkg-plist16
-rw-r--r--graphics/kooka/distinfo4
-rw-r--r--graphics/kuickshow-kde4/distinfo4
-rw-r--r--graphics/kuickshow/distinfo4
15 files changed, 18 insertions, 138 deletions
diff --git a/graphics/kamera-kde4/distinfo b/graphics/kamera-kde4/distinfo
index 754d45c69d5b..8aa0a9e4d516 100644
--- a/graphics/kamera-kde4/distinfo
+++ b/graphics/kamera-kde4/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdegraphics-3.3.1.tar.bz2) = 18f063ec6fad27b304ae97cf4b480140
-SIZE (KDE/kdegraphics-3.3.1.tar.bz2) = 6419816
+MD5 (KDE/kdegraphics-3.3.2.tar.bz2) = 03092b8be2f7054d71895b8fd58ad26e
+SIZE (KDE/kdegraphics-3.3.2.tar.bz2) = 6234394
diff --git a/graphics/kamera-kde4/pkg-plist b/graphics/kamera-kde4/pkg-plist
index 2a1ff03ff33c..d6b97b942226 100644
--- a/graphics/kamera-kde4/pkg-plist
+++ b/graphics/kamera-kde4/pkg-plist
@@ -13,6 +13,3 @@ share/icons/crystalsvg/32x32/devices/camera.png
share/icons/crystalsvg/32x32/filesystems/camera.png
share/services/kamera.protocol
@dirrm share/doc/HTML/en/kamera
-@dirrm share/applnk/Settings/Peripherals
-@dirrm share/applnk/Settings
-@dirrm share/applnk
diff --git a/graphics/kamera/distinfo b/graphics/kamera/distinfo
index 754d45c69d5b..8aa0a9e4d516 100644
--- a/graphics/kamera/distinfo
+++ b/graphics/kamera/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdegraphics-3.3.1.tar.bz2) = 18f063ec6fad27b304ae97cf4b480140
-SIZE (KDE/kdegraphics-3.3.1.tar.bz2) = 6419816
+MD5 (KDE/kdegraphics-3.3.2.tar.bz2) = 03092b8be2f7054d71895b8fd58ad26e
+SIZE (KDE/kdegraphics-3.3.2.tar.bz2) = 6234394
diff --git a/graphics/kamera/pkg-plist b/graphics/kamera/pkg-plist
index 2a1ff03ff33c..d6b97b942226 100644
--- a/graphics/kamera/pkg-plist
+++ b/graphics/kamera/pkg-plist
@@ -13,6 +13,3 @@ share/icons/crystalsvg/32x32/devices/camera.png
share/icons/crystalsvg/32x32/filesystems/camera.png
share/services/kamera.protocol
@dirrm share/doc/HTML/en/kamera
-@dirrm share/applnk/Settings/Peripherals
-@dirrm share/applnk/Settings
-@dirrm share/applnk
diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile
index 2154d034a115..fb73894deb5b 100644
--- a/graphics/kdegraphics3/Makefile
+++ b/graphics/kdegraphics3/Makefile
@@ -10,7 +10,7 @@ PORTNAME= kdegraphics
PORTVERSION= ${KDE_VERSION}
CATEGORIES= graphics kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
+MASTER_SITE_SUBDIR= security_patches
DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
@@ -34,6 +34,7 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
WANT_GNOME= yes
USE_GHOSTSCRIPT=yes
+_NO_KDE_CLOSURE=yes
INSTALLS_SHLIB= yes
LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3
diff --git a/graphics/kdegraphics3/distinfo b/graphics/kdegraphics3/distinfo
index 754d45c69d5b..8aa0a9e4d516 100644
--- a/graphics/kdegraphics3/distinfo
+++ b/graphics/kdegraphics3/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdegraphics-3.3.1.tar.bz2) = 18f063ec6fad27b304ae97cf4b480140
-SIZE (KDE/kdegraphics-3.3.1.tar.bz2) = 6419816
+MD5 (KDE/kdegraphics-3.3.2.tar.bz2) = 03092b8be2f7054d71895b8fd58ad26e
+SIZE (KDE/kdegraphics-3.3.2.tar.bz2) = 6234394
diff --git a/graphics/kdegraphics3/files/patch-kpdf_xpdf_Catalog.cc b/graphics/kdegraphics3/files/patch-kpdf_xpdf_Catalog.cc
deleted file mode 100644
index aa79feb8716e..000000000000
--- a/graphics/kdegraphics3/files/patch-kpdf_xpdf_Catalog.cc
+++ /dev/null
@@ -1,42 +0,0 @@
-Index: kpdf/xpdf/Catalog.cc
-===================================================================
-RCS file: /home/kde/kdegraphics/kpdf/xpdf/Catalog.cc,v
-retrieving revision 1.3.4.1
-diff -u -5 -d -p -r1.3.4.1 Catalog.cc
---- kpdf/xpdf/Catalog.cc 2 Sep 2004 21:30:18 -0000 1.3.4.1
-+++ kpdf/xpdf/Catalog.cc 12 Oct 2004 21:15:38 -0000
-@@ -62,10 +62,19 @@ Catalog::Catalog(XRef *xrefA) {
- obj.getTypeName());
- goto err3;
- }
- pagesSize = numPages0 = (int)obj.getNum();
- obj.free();
-+ // The gcc doesnt optimize this away, so this check is ok,
-+ // even if it looks like a pagesSize != pagesSize check
-+ if (pagesSize*sizeof(Page *)/sizeof(Page *) != pagesSize ||
-+ pagesSize*sizeof(Ref)/sizeof(Ref) != pagesSize) {
-+ error(-1, "Invalid 'pagesSize'");
-+ ok = gFalse;
-+ return;
-+ }
-+
- pages = (Page **)gmalloc(pagesSize * sizeof(Page *));
- pageRefs = (Ref *)gmalloc(pagesSize * sizeof(Ref));
- for (i = 0; i < pagesSize; ++i) {
- pages[i] = NULL;
- pageRefs[i].num = -1;
-@@ -189,10 +198,14 @@ int Catalog::readPageTree(Dict *pagesDic
- ++start;
- goto err3;
- }
- if (start >= pagesSize) {
- pagesSize += 32;
-+ if (pagesSize*sizeof(Page *)/sizeof(Page *) != pagesSize) {
-+ error(-1, "Invalid 'pagesSize' parameter.");
-+ goto err3;
-+ }
- pages = (Page **)grealloc(pages, pagesSize * sizeof(Page *));
- pageRefs = (Ref *)grealloc(pageRefs, pagesSize * sizeof(Ref));
- for (j = pagesSize - 32; j < pagesSize; ++j) {
- pages[j] = NULL;
- pageRefs[j].num = -1;
diff --git a/graphics/kdegraphics3/pkg-plist b/graphics/kdegraphics3/pkg-plist
index 4556beac170b..29d708f3fe0f 100644
--- a/graphics/kdegraphics3/pkg-plist
+++ b/graphics/kdegraphics3/pkg-plist
@@ -987,18 +987,6 @@ share/servicetypes/kimageviewer.desktop
share/servicetypes/kimageviewercanvas.desktop
share/servicetypes/ksvgrenderer.desktop
@dirrm share/services/kconfiguredialog
-@dirrm share/icons/locolor/32x32/apps
-@dirrm share/icons/locolor/32x32
-@dirrm share/icons/locolor/16x16/apps
-@dirrm share/icons/locolor/16x16
-@dirrm share/icons/locolor
-@dirrm share/icons/hicolor/48x48/apps
-@dirrm share/icons/hicolor/48x48
-@dirrm share/icons/hicolor/32x32/apps
-@dirrm share/icons/hicolor/32x32
-@dirrm share/icons/hicolor/16x16/apps
-@dirrm share/icons/hicolor/16x16
-@dirrm share/icons/crystalsvg/22x22/apps
@dirrm share/doc/HTML/en/kview
@dirrm share/doc/HTML/en/ksnapshot
@dirrm share/doc/HTML/en/kruler
@@ -1042,8 +1030,6 @@ share/servicetypes/ksvgrenderer.desktop
@dirrm share/apps/kpovmodeler
@dirrm share/apps/kpdfpart
@dirrm share/apps/kpdf
-@dirrm share/apps/konqueror/servicemenus
-@dirrm share/apps/konqueror
@dirrm share/apps/kolourpaint/pics
@dirrm share/apps/kolourpaint/icons/hicolor/48x48/apps
@dirrm share/apps/kolourpaint/icons/hicolor/48x48
@@ -1064,7 +1050,5 @@ share/servicetypes/ksvgrenderer.desktop
@dirrm share/apps/kfax
@dirrm share/apps/kdvi
@dirrm share/apps/kcoloredit
-@dirrm share/applnk/Graphics
-@dirrm share/applnk
@dirrm include/libtext2path-0.1
@dirrm include/ksvg
diff --git a/graphics/kdegraphics4/Makefile b/graphics/kdegraphics4/Makefile
index 2154d034a115..fb73894deb5b 100644
--- a/graphics/kdegraphics4/Makefile
+++ b/graphics/kdegraphics4/Makefile
@@ -10,7 +10,7 @@ PORTNAME= kdegraphics
PORTVERSION= ${KDE_VERSION}
CATEGORIES= graphics kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
+MASTER_SITE_SUBDIR= security_patches
DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
@@ -34,6 +34,7 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
WANT_GNOME= yes
USE_GHOSTSCRIPT=yes
+_NO_KDE_CLOSURE=yes
INSTALLS_SHLIB= yes
LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3
diff --git a/graphics/kdegraphics4/distinfo b/graphics/kdegraphics4/distinfo
index 754d45c69d5b..8aa0a9e4d516 100644
--- a/graphics/kdegraphics4/distinfo
+++ b/graphics/kdegraphics4/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdegraphics-3.3.1.tar.bz2) = 18f063ec6fad27b304ae97cf4b480140
-SIZE (KDE/kdegraphics-3.3.1.tar.bz2) = 6419816
+MD5 (KDE/kdegraphics-3.3.2.tar.bz2) = 03092b8be2f7054d71895b8fd58ad26e
+SIZE (KDE/kdegraphics-3.3.2.tar.bz2) = 6234394
diff --git a/graphics/kdegraphics4/files/patch-kpdf_xpdf_Catalog.cc b/graphics/kdegraphics4/files/patch-kpdf_xpdf_Catalog.cc
deleted file mode 100644
index aa79feb8716e..000000000000
--- a/graphics/kdegraphics4/files/patch-kpdf_xpdf_Catalog.cc
+++ /dev/null
@@ -1,42 +0,0 @@
-Index: kpdf/xpdf/Catalog.cc
-===================================================================
-RCS file: /home/kde/kdegraphics/kpdf/xpdf/Catalog.cc,v
-retrieving revision 1.3.4.1
-diff -u -5 -d -p -r1.3.4.1 Catalog.cc
---- kpdf/xpdf/Catalog.cc 2 Sep 2004 21:30:18 -0000 1.3.4.1
-+++ kpdf/xpdf/Catalog.cc 12 Oct 2004 21:15:38 -0000
-@@ -62,10 +62,19 @@ Catalog::Catalog(XRef *xrefA) {
- obj.getTypeName());
- goto err3;
- }
- pagesSize = numPages0 = (int)obj.getNum();
- obj.free();
-+ // The gcc doesnt optimize this away, so this check is ok,
-+ // even if it looks like a pagesSize != pagesSize check
-+ if (pagesSize*sizeof(Page *)/sizeof(Page *) != pagesSize ||
-+ pagesSize*sizeof(Ref)/sizeof(Ref) != pagesSize) {
-+ error(-1, "Invalid 'pagesSize'");
-+ ok = gFalse;
-+ return;
-+ }
-+
- pages = (Page **)gmalloc(pagesSize * sizeof(Page *));
- pageRefs = (Ref *)gmalloc(pagesSize * sizeof(Ref));
- for (i = 0; i < pagesSize; ++i) {
- pages[i] = NULL;
- pageRefs[i].num = -1;
-@@ -189,10 +198,14 @@ int Catalog::readPageTree(Dict *pagesDic
- ++start;
- goto err3;
- }
- if (start >= pagesSize) {
- pagesSize += 32;
-+ if (pagesSize*sizeof(Page *)/sizeof(Page *) != pagesSize) {
-+ error(-1, "Invalid 'pagesSize' parameter.");
-+ goto err3;
-+ }
- pages = (Page **)grealloc(pages, pagesSize * sizeof(Page *));
- pageRefs = (Ref *)grealloc(pageRefs, pagesSize * sizeof(Ref));
- for (j = pagesSize - 32; j < pagesSize; ++j) {
- pages[j] = NULL;
- pageRefs[j].num = -1;
diff --git a/graphics/kdegraphics4/pkg-plist b/graphics/kdegraphics4/pkg-plist
index 4556beac170b..29d708f3fe0f 100644
--- a/graphics/kdegraphics4/pkg-plist
+++ b/graphics/kdegraphics4/pkg-plist
@@ -987,18 +987,6 @@ share/servicetypes/kimageviewer.desktop
share/servicetypes/kimageviewercanvas.desktop
share/servicetypes/ksvgrenderer.desktop
@dirrm share/services/kconfiguredialog
-@dirrm share/icons/locolor/32x32/apps
-@dirrm share/icons/locolor/32x32
-@dirrm share/icons/locolor/16x16/apps
-@dirrm share/icons/locolor/16x16
-@dirrm share/icons/locolor
-@dirrm share/icons/hicolor/48x48/apps
-@dirrm share/icons/hicolor/48x48
-@dirrm share/icons/hicolor/32x32/apps
-@dirrm share/icons/hicolor/32x32
-@dirrm share/icons/hicolor/16x16/apps
-@dirrm share/icons/hicolor/16x16
-@dirrm share/icons/crystalsvg/22x22/apps
@dirrm share/doc/HTML/en/kview
@dirrm share/doc/HTML/en/ksnapshot
@dirrm share/doc/HTML/en/kruler
@@ -1042,8 +1030,6 @@ share/servicetypes/ksvgrenderer.desktop
@dirrm share/apps/kpovmodeler
@dirrm share/apps/kpdfpart
@dirrm share/apps/kpdf
-@dirrm share/apps/konqueror/servicemenus
-@dirrm share/apps/konqueror
@dirrm share/apps/kolourpaint/pics
@dirrm share/apps/kolourpaint/icons/hicolor/48x48/apps
@dirrm share/apps/kolourpaint/icons/hicolor/48x48
@@ -1064,7 +1050,5 @@ share/servicetypes/ksvgrenderer.desktop
@dirrm share/apps/kfax
@dirrm share/apps/kdvi
@dirrm share/apps/kcoloredit
-@dirrm share/applnk/Graphics
-@dirrm share/applnk
@dirrm include/libtext2path-0.1
@dirrm include/ksvg
diff --git a/graphics/kooka/distinfo b/graphics/kooka/distinfo
index 754d45c69d5b..8aa0a9e4d516 100644
--- a/graphics/kooka/distinfo
+++ b/graphics/kooka/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdegraphics-3.3.1.tar.bz2) = 18f063ec6fad27b304ae97cf4b480140
-SIZE (KDE/kdegraphics-3.3.1.tar.bz2) = 6419816
+MD5 (KDE/kdegraphics-3.3.2.tar.bz2) = 03092b8be2f7054d71895b8fd58ad26e
+SIZE (KDE/kdegraphics-3.3.2.tar.bz2) = 6234394
diff --git a/graphics/kuickshow-kde4/distinfo b/graphics/kuickshow-kde4/distinfo
index 754d45c69d5b..8aa0a9e4d516 100644
--- a/graphics/kuickshow-kde4/distinfo
+++ b/graphics/kuickshow-kde4/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdegraphics-3.3.1.tar.bz2) = 18f063ec6fad27b304ae97cf4b480140
-SIZE (KDE/kdegraphics-3.3.1.tar.bz2) = 6419816
+MD5 (KDE/kdegraphics-3.3.2.tar.bz2) = 03092b8be2f7054d71895b8fd58ad26e
+SIZE (KDE/kdegraphics-3.3.2.tar.bz2) = 6234394
diff --git a/graphics/kuickshow/distinfo b/graphics/kuickshow/distinfo
index 754d45c69d5b..8aa0a9e4d516 100644
--- a/graphics/kuickshow/distinfo
+++ b/graphics/kuickshow/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdegraphics-3.3.1.tar.bz2) = 18f063ec6fad27b304ae97cf4b480140
-SIZE (KDE/kdegraphics-3.3.1.tar.bz2) = 6419816
+MD5 (KDE/kdegraphics-3.3.2.tar.bz2) = 03092b8be2f7054d71895b8fd58ad26e
+SIZE (KDE/kdegraphics-3.3.2.tar.bz2) = 6234394
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 01:24:39 +0000