rpms/koffice/devel koffice-filters-krita-tiff.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 koffice.spec, 1.32, 1.33 sources, 1.8, 1.9 koffice-kotext-lines.patch, 1.1, NONE koffice-kspread-cpp.patch, 1.1, NONE

Andreas Bierfert (awjb) fedora-extras-commits at redhat.com
Thu Mar 30 12:07:43 UTC 2006


Author: awjb

Update of /cvs/extras/rpms/koffice/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1499/devel

Modified Files:
	.cvsignore koffice.spec sources 
Added Files:
	koffice-filters-krita-tiff.patch 
Removed Files:
	koffice-kotext-lines.patch koffice-kspread-cpp.patch 
Log Message:
- version upgrade


koffice-filters-krita-tiff.patch:

--- NEW FILE koffice-filters-krita-tiff.patch ---
--- branches/koffice/1.5/koffice/filters/krita/tiff/kis_ycbcr_u8_colorspace.cpp	2006/03/24 09:22:37	522034
+++ branches/koffice/1.5/koffice/filters/krita/tiff/kis_ycbcr_u8_colorspace.cpp	2006/03/27 12:34:23	523115
@@ -26,8 +26,8 @@
 #include <kis_integer_maths.h>
 
 namespace {
-    const Q_INT32 MAX_CHANNEL_YCbCr = 3;
-    const Q_INT32 MAX_CHANNEL_YCbCrA = 4;
+    const Q_INT32 MAX_CHANNEL_YCbCr_U8 = 3;
+    const Q_INT32 MAX_CHANNEL_YCbCrA_U8 = 4;
 }
 
 KisYCbCrU8ColorSpace::KisYCbCrU8ColorSpace(KisColorSpaceFactoryRegistry* parent, KisProfile* p)
@@ -169,15 +169,15 @@
 }
 
 Q_UINT32 KisYCbCrU8ColorSpace::nChannels() const {
-    return MAX_CHANNEL_YCbCrA;
+    return MAX_CHANNEL_YCbCrA_U8;
 }
 
 Q_UINT32 KisYCbCrU8ColorSpace::nColorChannels() const {
-    return MAX_CHANNEL_YCbCr;
+    return MAX_CHANNEL_YCbCr_U8;
 }
 
 Q_UINT32 KisYCbCrU8ColorSpace::pixelSize() const {
-    return MAX_CHANNEL_YCbCrA*sizeof(Q_UINT8);
+    return MAX_CHANNEL_YCbCrA_U8*sizeof(Q_UINT8);
 }
 
 
@@ -192,7 +192,7 @@
     Q_INT32 i = 0;
     uchar *j = img.bits();
 
-    while ( i < width * height * MAX_CHANNEL_YCbCrA) {
+    while ( i < width * height * MAX_CHANNEL_YCbCrA_U8) {
         Q_UINT8 Y = *( data + i + PIXEL_Y );
         Q_UINT8 Cb = *( data + i + PIXEL_Cb );
         Q_UINT8 Cr = *( data + i + PIXEL_Cr );
@@ -210,8 +210,8 @@
         *( j + 1 ) = Cb;
         *( j + 0 ) = Cr;*/
 #endif
-        i += MAX_CHANNEL_YCbCrA;
-        j += MAX_CHANNEL_YCbCrA;
+        i += MAX_CHANNEL_YCbCrA_U8;
+        j += MAX_CHANNEL_YCbCrA_U8;
     }
     return img;
 }
@@ -265,7 +265,7 @@
                 }
 
                 if (srcAlpha == OPACITY_OPAQUE) {
-                    memcpy(dst, src, MAX_CHANNEL_YCbCrA * sizeof(Q_UINT8));
+                    memcpy(dst, src, MAX_CHANNEL_YCbCrA_U8 * sizeof(Q_UINT8));
                 } else {
                     Q_UINT8 dstAlpha = dst[PIXEL_ALPHA];
 
@@ -285,7 +285,7 @@
                     }
 
                     if (srcBlend == OPACITY_OPAQUE) {
-                        memcpy(dst, src, MAX_CHANNEL_YCbCr * sizeof(Q_UINT8));
+                        memcpy(dst, src, MAX_CHANNEL_YCbCr_U8 * sizeof(Q_UINT8));
                     } else {
                         dst[PIXEL_Y] = UINT8_BLEND(src[PIXEL_Y], dst[PIXEL_Y], srcBlend);
                         dst[PIXEL_Cb] = UINT8_BLEND(src[PIXEL_Cb], dst[PIXEL_Cb], srcBlend);
@@ -295,8 +295,8 @@
             }
 
             columns--;
-            src += MAX_CHANNEL_YCbCrA;
-            dst += MAX_CHANNEL_YCbCrA;
+            src += MAX_CHANNEL_YCbCrA_U8;
+            dst += MAX_CHANNEL_YCbCrA_U8;
         }
 
         rows--;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	15 Mar 2006 21:16:35 -0000	1.8
+++ .cvsignore	30 Mar 2006 12:07:43 -0000	1.9
@@ -1 +1 @@
-koffice-1.4.95.tar.bz2
+koffice-1.5.0-rc1.tar.bz2


Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- koffice.spec	15 Mar 2006 21:16:35 -0000	1.32
+++ koffice.spec	30 Mar 2006 12:07:43 -0000	1.33
@@ -1,17 +1,17 @@
 Name:           koffice
-Version:        1.4.95
-Release:        1%{?dist}
+Version:        1.5.0
+Release:        0.1.rc1%{?dist}
 Summary:        A free, integrated office suite for KDE
 
 Group:          Applications/Productivity
 License:        GPL/LGPL
 URL:            http://www.koffice.org/
-Source0:        ftp://ftp.kde.org/pub/kde/unstable/koffice-1.5-beta2/koffice-1.4.95.tar.bz2
+Source0:        ftp://ftp.kde.org/pub/kde/unstable/koffice-1.5-rc1/src/koffice-1.5.0-rc1.tar.bz2
 Source100:      koshell.png
 
 # stuff for the build configuration
 Patch0:         koffice-admin-gcc4isok.patch
-Patch1:         koffice-kspread-cpp.patch
+Patch1:         koffice-filters-krita-tiff.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # BuildRequires: world-devel ;)
@@ -206,9 +206,9 @@
 %{summary}
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-rc1
 %patch0 -p1
-%patch1
+%patch1 -p4
 
 # this will make sure that patch0 is considered
 make -f admin/Makefile.common
@@ -513,7 +513,6 @@
 %{_datadir}/apps/kofficewidgets/pics/kounitdoublespinbox2.png
 %{_datadir}/apps/kofficewidgets/pics/kounitdoublespincombobox.png
 %{_datadir}/apps/kross
-%exclude %{_datadir}/mimelnk/image/x-raw.desktop
 
 %files devel
 %{_includedir}/*
@@ -669,7 +668,6 @@
 %{_libdir}/kde3/krita_rgb_u16_plugin.*
 %{_libdir}/kde3/kritabumpmap.*
 %{_libdir}/kde3/kritacmykplugin.*
-%{_libdir}/kde3/kritacubismfilter.*
 %{_libdir}/kde3/kritadropshadow.*
 %{_libdir}/kde3/kritafiltersgallery.*
 %{_libdir}/kde3/kritahistogramdocker.*
@@ -692,6 +690,7 @@
 %{_libdir}/kde3/libkritapngimport.*
 %{_libdir}/kde3/libkritatiffexport.*
 %{_libdir}/kde3/libkritatiffimport.*
+%{_libdir}/kde3/kritaperftest.*
 %{_datadir}/apps/krita
 %{_datadir}/services/krita*.desktop
 %{_datadir}/servicetypes/krita*.desktop
@@ -895,6 +894,10 @@
 %{_datadir}/applications/fedora-kplato.desktop
 
 %changelog
+* Thu Mar 30 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.5.0-0.1.rc1
+- version upgrade
+
 * Mon Mar 13 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.4.95-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	15 Mar 2006 21:16:35 -0000	1.8
+++ sources	30 Mar 2006 12:07:43 -0000	1.9
@@ -1 +1 @@
-ddeca5c989e892baf4871a443fd2daea  koffice-1.4.95.tar.bz2
+e9346977d18c67185d5b50f49ee8225b  koffice-1.5.0-rc1.tar.bz2


--- koffice-kotext-lines.patch DELETED ---


--- koffice-kspread-cpp.patch DELETED ---




More information about the fedora-extras-commits mailing list