Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (eafcf56b09d68f4bdc21c41ef9687392031a99ac)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (eafcf56b09d68f4bdc21c41ef9687392031a99ac)
  • Date: Thu, 5 Mar 2009 06:05:54 -0600

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 | 1 -
kde4-apps/koffice2/exiv2.diff | 35 -----------------------------------
4 files changed, 7 insertions(+), 38 deletions(-)

New commits:
commit 4a9705e00075fdf3a44b2357b88286b766410a99
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

koffice2: => 1.9.98.7

diff --git a/kde4-apps/koffice2/DETAILS b/kde4-apps/koffice2/DETAILS
index c3b154f..fd4a977 100755
--- a/kde4-apps/koffice2/DETAILS
+++ b/kde4-apps/koffice2/DETAILS
@@ -1,6 +1,6 @@
SPELL=koffice2
- VERSION=1.9.98.6
-
SOURCE_HASH=sha512:6116897eef026e7a85d8807740995469de0feee350b3705e86df0c8753c5e518116c4a8b8d000bd1cc6346faf6d178aab1ee256e7da0bab2f448ffda0ca7f3aa
+ VERSION=1.9.98.7
+
SOURCE_HASH=sha512:d038aa40ce822dc50b16803f932134d2c15636886590f09416bd1986951d16b8e7bbf7f35b86462299d6258b58fbdc9ea1d8c8f0e6743127d20e7630fe7f847f
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 418d4c2..0e5363e 100644
--- a/kde4-apps/koffice2/HISTORY
+++ b/kde4-apps/koffice2/HISTORY
@@ -1,3 +1,8 @@
+2009-03-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.9.98.7
+ * exiv2.diff: deleted
+ * PRE_BUILD: don't apply patch
+
2009-02-05 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.9.98.6
* exiv2.diff: added, fix compile with latest exiv2
diff --git a/kde4-apps/koffice2/PRE_BUILD b/kde4-apps/koffice2/PRE_BUILD
index cc0e1c9..6c55f0a 100755
--- a/kde4-apps/koffice2/PRE_BUILD
+++ b/kde4-apps/koffice2/PRE_BUILD
@@ -1,5 +1,4 @@

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
deleted file mode 100644
index cf1307e..0000000
--- a/kde4-apps/koffice2/exiv2.diff
+++ /dev/null
@@ -1,35 +0,0 @@
---- 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") {



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (eafcf56b09d68f4bdc21c41ef9687392031a99ac), Treeve Jelbert, 03/05/2009

Archive powered by MHonArc 2.6.24.

Top of Page