head	1.4;
access;
symbols
	pkgsrc-2013Q2:1.4.0.8
	pkgsrc-2013Q2-base:1.4
	pkgsrc-2012Q4:1.4.0.6
	pkgsrc-2012Q4-base:1.4
	pkgsrc-2011Q4:1.4.0.4
	pkgsrc-2011Q4-base:1.4
	pkgsrc-2011Q2:1.4.0.2
	pkgsrc-2011Q2-base:1.4
	pkgsrc-2010Q3:1.1.0.2
	pkgsrc-2010Q3-base:1.1;
locks; strict;
comment	@# @;


1.4
date	2010.12.06.11.43.39;	author markd;	state dead;
branches;
next	1.3;

1.3
date	2010.12.05.23.22.00;	author wiz;	state Exp;
branches;
next	1.2;

1.2
date	2010.10.25.20.55.23;	author markd;	state dead;
branches;
next	1.1;

1.1
date	2010.09.15.19.47.33;	author markd;	state Exp;
branches;
next	;


desc
@@


1.4
log
@Update to KDE SC 4.5.4

4.5.4 brings bugfixes and translation updates
@
text
@$NetBSD: patch-aa,v 1.3 2010/12/05 23:22:00 wiz Exp $

Fix build with exiv2-0.21. From SVN.

--- libs/libkexiv2/libkexiv2/kexiv2exif.cpp.orig	2010-12-05 23:06:51.000000000 +0000
+++ libs/libkexiv2/libkexiv2/kexiv2exif.cpp
@@@@ -295,7 +295,11 @@@@ QString KExiv2::getExifTagTitle(const ch
     {
         std::string exifkey(exifTagName);
         Exiv2::ExifKey ek(exifkey);
+#if (EXIV2_TEST_VERSION(0,21,0))
+        return QString::fromLocal8Bit( ek.tagLabel().c_str() );
+#else
         return QString::fromLocal8Bit( Exiv2::ExifTags::tagTitle(ek.tag(), ek.ifdId()) );
+#endif
     }
     catch (Exiv2::Error& e)
     {
@@@@ -311,7 +315,11 @@@@ QString KExiv2::getExifTagDescription(co
     {
         std::string exifkey(exifTagName);
         Exiv2::ExifKey ek(exifkey);
+#if (EXIV2_TEST_VERSION(0,21,0))
+        return QString::fromLocal8Bit( ek.tagDesc().c_str() );
+#else
         return QString::fromLocal8Bit( Exiv2::ExifTags::tagDesc(ek.tag(), ek.ifdId()) );
+#endif
     }
     catch (Exiv2::Error& e)
     {
@@@@ -950,12 +958,45 @@@@ KExiv2::TagsMap KExiv2::getStdExifTagsLi
     try
     {
         QList<const Exiv2::TagInfo*> tags;
+        TagsMap                      tagsMap;
+
+#if (EXIV2_TEST_VERSION(0,21,0))
+        const Exiv2::GroupInfo* gi = Exiv2::ExifTags::groupList();
+        while (gi->tagList_ != 0)
+        {
+            if (QString(gi->ifdName_) != QString("Makernote"))
+            {
+                Exiv2::TagListFct tl     = gi->tagList_;
+                const Exiv2::TagInfo* ti = tl();
+
+                while (ti->tag_ != 0xFFFF)
+                {
+                    tags << ti;
+                    ++ti;
+                }
+            }
+            ++gi;
+        }
+
+        for (QList<const Exiv2::TagInfo*>::iterator it = tags.begin(); it != tags.end(); ++it)
+        {
+            do
+            {
+                const Exiv2::TagInfo* ti = *it;
+                QString key              = QLatin1String( Exiv2::ExifKey(*ti).key().c_str() );
+                QStringList values;
+                values << ti->name_ << ti->title_ << ti->desc_;
+                tagsMap.insert(key, values);
+                ++(*it);
+            }
+            while((*it)->tag_ != 0xffff);
+        }
+#else
         tags << Exiv2::ExifTags::ifdTagList()
              << Exiv2::ExifTags::exifTagList()
              << Exiv2::ExifTags::iopTagList()
              << Exiv2::ExifTags::gpsTagList();
 
-        TagsMap tagsMap;
         for (QList<const Exiv2::TagInfo*>::iterator it = tags.begin(); it != tags.end(); ++it)
         {
             do
@@@@ -968,6 +1009,7 @@@@ KExiv2::TagsMap KExiv2::getStdExifTagsLi
             }
             while((*it)->tag_ != 0xffff);
         }
+#endif
         return tagsMap;
     }
     catch( Exiv2::Error& e )
@@@@ -983,14 +1025,15 @@@@ KExiv2::TagsMap KExiv2::getMakernoteTags
     try
     {
         QList<const Exiv2::TagInfo*> tags;
+        TagsMap                      tagsMap;
 
 #if (EXIV2_TEST_VERSION(0,21,0))
 
         const Exiv2::GroupInfo* gi = Exiv2::ExifTags::groupList();
 
-        while (gi->ifdId_ != Exiv2::lastIfdId)
+        while (gi->tagList_ != 0)
         {
-            if (QString(gi->name_) == QString("Makernote"))
+            if (QString(gi->ifdName_) == QString("Makernote"))
             {
                 Exiv2::TagListFct tl     = gi->tagList_;
                 const Exiv2::TagInfo* ti = tl();
@@@@ -1004,6 +1047,20 @@@@ KExiv2::TagsMap KExiv2::getMakernoteTags
             ++gi;
         }
 
+        for (QList<const Exiv2::TagInfo*>::iterator it = tags.begin(); it != tags.end(); ++it)
+        {
+            do
+            {
+                const Exiv2::TagInfo* ti = *it;
+                QString key              = QLatin1String( Exiv2::ExifKey(*ti).key().c_str() );
+                QStringList values;
+                values << ti->name_ << ti->title_ << ti->desc_;
+                tagsMap.insert(key, values);
+                ++(*it);
+            }
+            while((*it)->tag_ != 0xffff);
+        }
+
 #else
 
 #if (EXIV2_TEST_VERSION(0,18,1))
@@@@ -1056,9 +1113,6 @@@@ KExiv2::TagsMap KExiv2::getMakernoteTags
 
 #endif // (EXIV2_TEST_VERSION(0,18,1))
 
-#endif // (EXIV2_TEST_VERSION(0,21,0))
-
-        TagsMap tagsMap;
         for (QList<const Exiv2::TagInfo*>::iterator it = tags.begin(); it != tags.end(); ++it)
         {
             do
@@@@ -1071,6 +1125,9 @@@@ KExiv2::TagsMap KExiv2::getMakernoteTags
             }
             while((*it)->tag_ != 0xffff);
         }
+
+#endif // (EXIV2_TEST_VERSION(0,21,0))
+
         return tagsMap;
     }
     catch( Exiv2::Error& e )
@


1.3
log
@Add patch to fix build with exiv2-0.21. From upstream SVN.
@
text
@d1 1
a1 1
$NetBSD$
@


1.2
log
@Update to KDE SC 4.5.2

4.5.2
translation updates, performance and stability improvements and other
bugfixes.

4.5.0
new versions of the Plasma Workspaces, the KDE Applications and the KDE
Development Platform in version 4.5.0. While focus within this release
cycle lay on stability, the overall polish and performance gain is well
noticable. Features such as the reworked notification area, Marble's map
routing and support for WebKit in Konqueror round up this release.
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.1 2010/09/15 19:47:33 markd Exp $
d3 1
a3 1
svn r1167826 for advisory 20100825-1
d5 42
a46 11
Index: okular/generators/plucker/unpluck/image.cpp
===================================================================
--- okular/generators/plucker/unpluck/image.cpp	(revision 1167825)
+++ okular/generators/plucker/unpluck/image.cpp	(revision 1167826)
@@@@ -289,8 +289,23 @@@@
             for (j = 0; j < bytes_per_row;) {
                 incount = *palm_ptr++;
                 inval = *palm_ptr++;
-                memset (rowbuf + j, inval, incount);
-                j += incount;
+                if (incount + j <= bytes_per_row  * width)
d48 2
a49 2
+                    memset (rowbuf + j, inval, incount);
+                    j += incount;
d51 3
a53 5
+                else
+                {
+                    free (rowbuf);
+                    free (lastrow);
+                    free (jpeg_row);
d55 66
a120 3
+                    jpeg_destroy_compress (&cinfo);
+
+                    fclose( outfile );
d122 14
a135 2
+                    return false;
+                }
d137 1
d139 6
a144 1
         else if ((flags & PALM_IS_COMPRESSED_FLAG)
@


1.1
log
@patch for kde security advisory 20100825-1
@
text
@d1 1
a1 1
$NetBSD$
@