[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (e207fdf97c5b4088d666760958df334ae30e9e82)

Treeve Jelbert scm at sourcemage.org
Thu Feb 5 04:14:47 EST 2009


GIT changes to master grimoire by Treeve Jelbert <treeve at sourcemage.org>:

 kde4-apps/koffice2/DETAILS    |    4 ++--
 kde4-apps/koffice2/HISTORY    |    5 +++++
 kde4-apps/koffice2/PRE_BUILD  |    2 ++
 kde4-apps/koffice2/exiv2.diff |   35 +++++++++++++++++++++++++++++++++++
 4 files changed, 44 insertions(+), 2 deletions(-)

New commits:
commit e230f09bd96544d9e836f64bac680b7ad50eb156
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    koffice2-1.9.98.6

diff --git a/kde4-apps/koffice2/DETAILS b/kde4-apps/koffice2/DETAILS
index b85d5f7..c3b154f 100755
--- a/kde4-apps/koffice2/DETAILS
+++ b/kde4-apps/koffice2/DETAILS
@@ -1,6 +1,6 @@
            SPELL=koffice2
-         VERSION=1.9.98.5
-     SOURCE_HASH=sha512:04d4bc3f871e855a7337d4e62c790752d7c87b7996776ac678b195d8d2a547168bdba2b0f7d213a5d833ed99cebf2a68351d0e0d83e97cfa6fa3ee04f1f3cd6b
+         VERSION=1.9.98.6
+     SOURCE_HASH=sha512:6116897eef026e7a85d8807740995469de0feee350b3705e86df0c8753c5e518116c4a8b8d000bd1cc6346faf6d178aab1ee256e7da0bab2f448ffda0ca7f3aa
           SPELLX=${SPELL//2}-${VERSION}
           SOURCE=$SPELLX.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX
diff --git a/kde4-apps/koffice2/HISTORY b/kde4-apps/koffice2/HISTORY
index bd54a2a..418d4c2 100644
--- a/kde4-apps/koffice2/HISTORY
+++ b/kde4-apps/koffice2/HISTORY
@@ -1,3 +1,8 @@
+2009-02-05 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 1.9.98.6
+	* exiv2.diff: added, fix compile with latest exiv2
+	* PRE_BUILD: apply patch
+
 2009-01-14 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 1.9.98.5
 
diff --git a/kde4-apps/koffice2/PRE_BUILD b/kde4-apps/koffice2/PRE_BUILD
index a59c484..cc0e1c9 100755
--- a/kde4-apps/koffice2/PRE_BUILD
+++ b/kde4-apps/koffice2/PRE_BUILD
@@ -1,3 +1,5 @@
+
 default_pre_build    &&
 cd $SOURCE_DIRECTORY &&
+patch -p2 < $SPELL_DIRECTORY/exiv2.diff &&
 sed -i '/update_xdg_mimetypes/D' filters/krita/ora/CMakeLists.txt
diff --git a/kde4-apps/koffice2/exiv2.diff b/kde4-apps/koffice2/exiv2.diff
new file mode 100644
index 0000000..cf1307e
--- /dev/null
+++ b/kde4-apps/koffice2/exiv2.diff
@@ -0,0 +1,35 @@
+--- trunk/koffice/krita/ui/kisexiv2/kis_exif_io.cpp	2009/01/24 21:11:52	916220
++++ trunk/koffice/krita/ui/kisexiv2/kis_exif_io.cpp	2009/01/30 12:11:56	918638
+@@ -457,12 +457,14 @@
+     ioDevice->open(QIODevice::ReadOnly);
+     QByteArray arr = ioDevice->readAll();
+     Exiv2::ExifData exifData;
++    Exiv2::ByteOrder byteOrder;
+ #if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 17
+     exifData.load((const Exiv2::byte*)arr.data(), arr.size());
++    byteOrder = exifData.byteOrder();
+ #else
+-    Exiv2::ExifParser::decode( exifData, (const Exiv2::byte*)arr.data(), arr.size());
++    byteOrder = Exiv2::ExifParser::decode( exifData, (const Exiv2::byte*)arr.data(), arr.size());
+ #endif
+-    dbgFile << "Byte order = " << exifData.byteOrder() << ppVar(Exiv2::bigEndian) << ppVar(Exiv2::littleEndian);
++    dbgFile << "Byte order = " << byteOrder << ppVar(Exiv2::bigEndian) << ppVar(Exiv2::littleEndian);
+     dbgFile << "There are" << exifData.count() << " entries in the exif section";
+     const KisMetaData::Schema* tiffSchema = KisMetaData::SchemaRegistry::instance()->schemaFromUri(KisMetaData::Schema::TIFFSchemaUri);
+     const KisMetaData::Schema* exifSchema = KisMetaData::SchemaRegistry::instance()->schemaFromUri(KisMetaData::Schema::EXIFSchemaUri);
+@@ -508,13 +510,13 @@
+             } else if (it->key() == "Exif.Photo.ComponentsConfiguration") {
+                 v = exifArrayToKMDIntOrderedArray(it->getValue());
+             } else if (it->key() == "Exif.Photo.OECF") {
+-                v = exifOECFToKMDOECFStructure(it->getValue(), exifData.byteOrder());
++                v = exifOECFToKMDOECFStructure(it->getValue(), byteOrder);
+             } else if (it->key() == "Exif.Photo.DateTimeDigitized" || it->key() == "Exif.Photo.DateTimeOriginal") {
+                 v = KisMetaData::Value(exivValueToDateTime(it->getValue()));
+             } else if (it->key() == "Exif.Photo.DeviceSettingDescription") {
+                 v = deviceSettingDescriptionExifToKMD(it->getValue());
+             } else if (it->key() == "Exif.Photo.CFAPattern") {
+-                v = cfaPatternExifToKMD(it->getValue(), exifData.byteOrder());
++                v = cfaPatternExifToKMD(it->getValue(), byteOrder);
+             } else if (it->key() == "Exif.Photo.Flash") {
+                 v = flashExifToKMD(it->getValue());
+             } else if (it->key() == "Exif.Photo.UserComment") {



More information about the SM-Commit mailing list