Mailinglist Archive: opensuse-commit (1083 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package libkexiv2
checked in at Tue Sep 4 00:50:05 CEST 2007.

--------
--- KDE/libkexiv2/libkexiv2.changes     2007-06-18 15:14:14.000000000 +0200
+++ /mounts/work_src_done/STABLE/libkexiv2/libkexiv2.changes    2007-09-04 00:35:32.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Sep  4 00:35:19 CEST 2007 - dmueller@xxxxxxx
+
+- backport important crash fixes
+
+-------------------------------------------------------------------

New:
----
  r704515.diff
  r707242.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libkexiv2.spec ++++++
--- /var/tmp/diff_new_pack.R20643/_old  2007-09-04 00:49:26.000000000 +0200
+++ /var/tmp/diff_new_pack.R20643/_new  2007-09-04 00:49:26.000000000 +0200
@@ -13,13 +13,15 @@
 Name:           libkexiv2
 URL:            http://www.kipi-plugins.org/
 BuildRequires:  kdelibs3-devel libexiv2-devel
-License:        GNU General Public License (GPL)
+License:        GPL v2 or later
 Group:          Development/Libraries/KDE
 Summary:        Library to manipulate picture meta data
 Version:        0.1.5
-Release:        1
+Release:        25
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source0:        %name-%{version}.tar.bz2
+Patch0:         r704515.diff
+Patch1:         r707242.diff
 
 %description
 Libkexiv2 is a wrapper around Exiv2 library to manipulate pictures
@@ -51,6 +53,8 @@
 
 %prep
 %setup -q
+%patch0
+%patch1
 . /etc/opt/kde3/common_options
 update_admin
 
@@ -86,6 +90,8 @@
 /opt/kde3/%_lib/libkexiv2.so.*
 
 %changelog
+* Tue Sep 04 2007 - dmueller@xxxxxxx
+- backport important crash fixes
 * Mon Jun 18 2007 - stbinner@xxxxxxx
 - update to 0.1.5:
   * added 4 new static methods to get Exif/Iptc tags description/title.

++++++ r704515.diff ++++++
------------------------------------------------------------------------
r704515 | cgilles | 2007-08-25 10:03:06 +0200 (Sat, 25 Aug 2007) | 6 lines

libkexiv2 from KDE3 branch : backport Marcel commit #693337 from trunk (KDE4) about to handle properly Exiv2 exceptions, depending of GCC visility option use to compile.
CCBUGS: 148014
--This l from KDEine, and those below, will be ignored--

M    kexiv2.cpp

------------------------------------------------------------------------
--- libkexiv2/kexiv2.cpp
+++ libkexiv2/kexiv2.cpp
@@ -51,12 +51,18 @@
 
 // Exiv2 includes.
 
+// The pragmas are required to be able to catch exceptions thrown by libexiv2:
+// See http://gcc.gnu.org/wiki/Visibility, the section about c++ exceptions.
+// They are needed for all libexiv2 versions that do not care about visibility.
+#pragma GCC visibility push(default)
+#include <exiv2/error.hpp>
 #include <exiv2/image.hpp>
 #include <exiv2/jpgimage.hpp>
 #include <exiv2/datasets.hpp>
 #include <exiv2/tags.hpp>
 #include <exiv2/types.hpp>
 #include <exiv2/exif.hpp>
+#pragma GCC visibility pop
 
 // Make sure an EXIV2_TEST_VERSION macro exists:
 
++++++ r707242.diff ++++++
------------------------------------------------------------------------
r707242 | cgilles | 2007-09-01 12:46:32 +0200 (Sat, 01 Sep 2007) | 3 lines

libkexiv2 from KDE3 branch : fix IPTC strings creation with non-zero value at end
CCBUGS: 148182

------------------------------------------------------------------------
--- libkexiv2/kexiv2.cpp
+++ libkexiv2/kexiv2.cpp
@@ -2042,7 +2042,7 @@ bool KExiv2::setImageKeywords(const QStr
             QString key = *it;
             key.truncate(64);
             
-            Exiv2::Value::AutoPtr val = Exiv2::Value::create(Exiv2::asciiString);
+            Exiv2::Value::AutoPtr val = Exiv2::Value::create(Exiv2::string);
             val->read(key.latin1());
             iptcData.add(iptcTag, val.get());        
         }
@@ -2125,7 +2125,7 @@ bool KExiv2::setImageSubjects(const QStr
             QString key = *it;
             key.truncate(236);
             
-            Exiv2::Value::AutoPtr val = Exiv2::Value::create(Exiv2::asciiString);
+            Exiv2::Value::AutoPtr val = Exiv2::Value::create(Exiv2::string);
             val->read(key.latin1());
             iptcData.add(iptcTag, val.get());        
         }
@@ -2209,7 +2209,7 @@ bool KExiv2::setImageSubCategories(const
             QString key = *it;
             key.truncate(32);
             
-            Exiv2::Value::AutoPtr val = Exiv2::Value::create(Exiv2::asciiString);
+            Exiv2::Value::AutoPtr val = Exiv2::Value::create(Exiv2::string);
             val->read(key.latin1());
             iptcData.add(iptcTag, val.get());        
         }

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx