summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--www/kdewebdev/Makefile2
-rw-r--r--www/kdewebdev/files/patch-post-3.4.0-kdewebdev-kommander2
-rw-r--r--www/kdewebdev4/Makefile2
-rw-r--r--www/kdewebdev4/files/patch-post-3.4.0-kdewebdev-kommander2
-rw-r--r--x11/kdelibs3/Makefile2
-rw-r--r--x11/kdelibs3/files/patch-post-3.4.0-kdelibs-kimgio9
-rw-r--r--x11/kdelibs4/Makefile2
-rw-r--r--x11/kdelibs4/files/patch-post-3.4.0-kdelibs-kimgio9
8 files changed, 6 insertions, 24 deletions
diff --git a/www/kdewebdev/Makefile b/www/kdewebdev/Makefile
index efecbe45be04..9b13290c52d4 100644
--- a/www/kdewebdev/Makefile
+++ b/www/kdewebdev/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kdewebdev
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 2
CATEGORIES= www kde
MASTER_SITES= ${MASTER_SITE_KDE}
diff --git a/www/kdewebdev/files/patch-post-3.4.0-kdewebdev-kommander b/www/kdewebdev/files/patch-post-3.4.0-kdewebdev-kommander
index 78f6aecad8cb..5260fb2f0404 100644
--- a/www/kdewebdev/files/patch-post-3.4.0-kdewebdev-kommander
+++ b/www/kdewebdev/files/patch-post-3.4.0-kdewebdev-kommander
@@ -34,7 +34,7 @@ diff -u -3 -d -p -r1.49 -r1.49.2.3
+
+ bool inTemp = false;
+ for (QStringList::ConstIterator I = tmpDirs.begin(); I != tmpDirs.end(); ++I)
-+ if (m_uiFileName.directory().startsWith(*I))
++ if (m_uiFileName.directory(false).startsWith(*I))
+ inTemp = true;
+
+ if (inTemp)
diff --git a/www/kdewebdev4/Makefile b/www/kdewebdev4/Makefile
index efecbe45be04..9b13290c52d4 100644
--- a/www/kdewebdev4/Makefile
+++ b/www/kdewebdev4/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kdewebdev
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 2
CATEGORIES= www kde
MASTER_SITES= ${MASTER_SITE_KDE}
diff --git a/www/kdewebdev4/files/patch-post-3.4.0-kdewebdev-kommander b/www/kdewebdev4/files/patch-post-3.4.0-kdewebdev-kommander
index 78f6aecad8cb..5260fb2f0404 100644
--- a/www/kdewebdev4/files/patch-post-3.4.0-kdewebdev-kommander
+++ b/www/kdewebdev4/files/patch-post-3.4.0-kdewebdev-kommander
@@ -34,7 +34,7 @@ diff -u -3 -d -p -r1.49 -r1.49.2.3
+
+ bool inTemp = false;
+ for (QStringList::ConstIterator I = tmpDirs.begin(); I != tmpDirs.end(); ++I)
-+ if (m_uiFileName.directory().startsWith(*I))
++ if (m_uiFileName.directory(false).startsWith(*I))
+ inTemp = true;
+
+ if (inTemp)
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index fd21ee05e54b..078c64a7a715 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -8,7 +8,7 @@
PORTNAME= kdelibs
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/x11/kdelibs3/files/patch-post-3.4.0-kdelibs-kimgio b/x11/kdelibs3/files/patch-post-3.4.0-kdelibs-kimgio
index f7990101ae3f..c1ede2bf9945 100644
--- a/x11/kdelibs3/files/patch-post-3.4.0-kdelibs-kimgio
+++ b/x11/kdelibs3/files/patch-post-3.4.0-kdelibs-kimgio
@@ -620,15 +620,6 @@ diff -u -3 -d -p -r1.31 -r1.31.2.1
for (x = 0; x < m_xsize; x++, c++)
*c = qRgba(qRed(*c), qGreen(*c), qBlue(*c), line[x]);
}
-@@ -270,7 +272,7 @@ bool SGIImage::readImage(QImage& img)
- // sanity ckeck
- if (m_rle)
- for (uint o = 0; o < m_numrows; o++)
-- if (m_starttab[o] + m_lengthtab[o] > m_data.size()) {
-+ if (m_starttab[o] + m_lengthtab[o] >= m_data.size()) {
- kdDebug(399) << "image corrupt (sanity check failed)" << endl;
- return false;
- }
diff -u -3 -d -p -r1.14 -r1.14.2.1
--- kimgio/tiffr.cpp 22 Nov 2004 03:52:18 -0000 1.14
+++ kimgio/tiffr.cpp 19 Apr 2005 10:48:00 -0000 1.14.2.1
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index fd21ee05e54b..078c64a7a715 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -8,7 +8,7 @@
PORTNAME= kdelibs
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/x11/kdelibs4/files/patch-post-3.4.0-kdelibs-kimgio b/x11/kdelibs4/files/patch-post-3.4.0-kdelibs-kimgio
index f7990101ae3f..c1ede2bf9945 100644
--- a/x11/kdelibs4/files/patch-post-3.4.0-kdelibs-kimgio
+++ b/x11/kdelibs4/files/patch-post-3.4.0-kdelibs-kimgio
@@ -620,15 +620,6 @@ diff -u -3 -d -p -r1.31 -r1.31.2.1
for (x = 0; x < m_xsize; x++, c++)
*c = qRgba(qRed(*c), qGreen(*c), qBlue(*c), line[x]);
}
-@@ -270,7 +272,7 @@ bool SGIImage::readImage(QImage& img)
- // sanity ckeck
- if (m_rle)
- for (uint o = 0; o < m_numrows; o++)
-- if (m_starttab[o] + m_lengthtab[o] > m_data.size()) {
-+ if (m_starttab[o] + m_lengthtab[o] >= m_data.size()) {
- kdDebug(399) << "image corrupt (sanity check failed)" << endl;
- return false;
- }
diff -u -3 -d -p -r1.14 -r1.14.2.1
--- kimgio/tiffr.cpp 22 Nov 2004 03:52:18 -0000 1.14
+++ kimgio/tiffr.cpp 19 Apr 2005 10:48:00 -0000 1.14.2.1