rpms/koffice/devel exiv2-0.18-attempt1.diff, NONE, 1.1 koffice.spec, 1.94, 1.95

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/koffice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22747

Modified Files:
	koffice.spec 
Added Files:
	exiv2-0.18-attempt1.diff 
Log Message:
exiv2-0.18 patch


exiv2-0.18-attempt1.diff:

--- NEW FILE exiv2-0.18-attempt1.diff ---
Index: kis_exif_io.cpp
===================================================================
--- kis_exif_io.cpp	(revision 917290)
+++ kis_exif_io.cpp	(working copy)
@@ -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") {


Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- koffice.spec	29 Jan 2009 04:15:00 -0000	1.94
+++ koffice.spec	30 Jan 2009 13:40:12 -0000	1.95
@@ -18,6 +18,8 @@
 Source0:        http://download.kde.org/unstable/koffice-%{version}/src/koffice-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: exiv2-0.18-attempt1.diff
+
 #-- The following OPTIONAL packages could NOT be located on your system.
 #-- Consider installing them to enable more features from this software.
 #+ OpenCTL, 0.9.2 or higher: OpenCTL is needed for some color spaces (High Dynamic Range Color Spaces, YCbCr and LMS) <http://www.openctl.org>
@@ -261,6 +263,10 @@
 %prep
 %setup -q
 
+pushd krita/ui/kisexiv2
+%patch1 -p0 -b .exiv2-0.18
+popd
+
 
 %build
 
@@ -272,7 +278,7 @@
   ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
@@ -282,41 +288,41 @@
 
 # unpackaged files
 # conflicts with oxygen-icon-theme  
-rm -f %{buildroot}%{_kde4_iconsdir}/oxygen/16x16/actions/format-justify-{center,fill,left,right}.png
-rm -f %{buildroot}%{_kde4_iconsdir}/oxygen/16x16/actions/format-text-{bold,italic,underline}.png
-rm -f %{buildroot}%{_kde4_iconsdir}/oxygen/16x16/actions/object-{group,ungroup}.png
-rm -f %{buildroot}%{_kde4_iconsdir}/oxygen/16x16/actions/object-order-{back,front,lower,raise}.png
+rm -fv %{buildroot}%{_kde4_iconsdir}/oxygen/16x16/actions/format-justify-{center,fill,left,right}.png
+rm -fv %{buildroot}%{_kde4_iconsdir}/oxygen/16x16/actions/format-text-{bold,italic,underline}.png
+rm -fv %{buildroot}%{_kde4_iconsdir}/oxygen/16x16/actions/object-{group,ungroup}.png
+rm -fv %{buildroot}%{_kde4_iconsdir}/oxygen/16x16/actions/object-order-{back,front,lower,raise}.png
 # extraneous stuff we don't want in -devel
-rm -f %{buildroot}%{_kde4_libdir}/lib*common.so
-rm -f %{buildroot}%{_kde4_libdir}/lib*filters.so
-rm -f %{buildroot}%{_kde4_libdir}/lib*private.so
-rm -f %{buildroot}%{_kde4_libdir}/libkarbon*.so
-rm -f %{buildroot}%{_kde4_libdir}/libkexi*.so
-rm -f %{buildroot}%{_kde4_libdir}/libkisexiv2.so
-rm -f %{buildroot}%{_kde4_libdir}/libkformdesigner.so
-rm -f %{buildroot}%{_kde4_libdir}/libkplato*.so
-rm -f %{buildroot}%{_kde4_libdir}/libkword*.so
-rm -f %{buildroot}%{_kde4_libdir}/libkrita*.so
-rm -f %{buildroot}%{_kde4_libdir}/libkross*.so
+rm -fv %{buildroot}%{_kde4_libdir}/lib*common.so
+rm -fv %{buildroot}%{_kde4_libdir}/lib*filters.so
+rm -fv %{buildroot}%{_kde4_libdir}/lib*private.so
+rm -fv %{buildroot}%{_kde4_libdir}/libkarbon*.so
+rm -fv %{buildroot}%{_kde4_libdir}/libkexi*.so
+rm -fv %{buildroot}%{_kde4_libdir}/libkisexiv2.so
+rm -fv %{buildroot}%{_kde4_libdir}/libkformdesigner.so
+rm -fv %{buildroot}%{_kde4_libdir}/libkplato*.so
+rm -fv %{buildroot}%{_kde4_libdir}/libkword*.so
+rm -fv %{buildroot}%{_kde4_libdir}/libkrita*.so
+rm -fv %{buildroot}%{_kde4_libdir}/libkross*.so
 %if ! 0%{?kchart}
-rm -f %{buildroot}%{_kde4_libdir}/libkchartcommon.so.*
-rm -f %{buildroot}%{_kde4_libdir}/kde4/*kchart*.*
-rm -rf %{buildroot}%{_kde4_appsdir}/kchart/
-rm -rf %{buildroot}%{_kde4_docdir}/HTML/en/kchart/
-rm -f %{buildroot}%{_kde4_datadir}/kde4/services/kchart*.desktop
-rm -f %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/kchart_konqi.desktop
+rm -fv %{buildroot}%{_kde4_libdir}/libkchartcommon.so.*
+rm -fv %{buildroot}%{_kde4_libdir}/kde4/*kchart*.*
+rm -rfv %{buildroot}%{_kde4_appsdir}/kchart/
+rm -rfv %{buildroot}%{_kde4_docdir}/HTML/en/kchart/
+rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/kchart*.desktop
+rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/kchart_konqi.desktop
 %endif
 %if ! 0%{?kexi}
-rm -rf %{buildroot}%{_kde4_docdir}/HTML/en/kexi/
-rm -f %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/kexi_konqi.desktop
+rm -rfv %{buildroot}%{_kde4_docdir}/HTML/en/kexi/
+rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/kexi_konqi.desktop
 %endif
 %if ! 0%{?kformula}
-rm -rf %{buildroot}%{_kde4_docdir}/HTML/en/kformula/
-rm -f %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/kformula_konqi.desktop
+rm -rfv %{buildroot}%{_kde4_docdir}/HTML/en/kformula/
+rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/kformula_konqi.desktop
 %endif
 %if ! 0%{?kivio}
-rm -rf %{buildroot}%{_kde4_docdir}/HTML/en/kivio/
-rm -f %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/kivio_konqi.desktop
+rm -rfv %{buildroot}%{_kde4_docdir}/HTML/en/kivio/
+rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/kivio_konqi.desktop
 %endif