rpms/openoffice.org/devel openoffice.org.spec, 1.2086, 1.2087 workspace.cmcfixes67.patch, 1.1, 1.2 workspace.vcl107.patch, 1.2, 1.3 openoffice.org-3.1.0.ooo100273.fix-utf8-hyphenation.patch, 1.1, NONE openoffice.org-3.2.0.rhbz521460.svx.revert-paper-sizes-reordering.patch, 1.1, NONE workspace.fwk125.patch, 1.1, NONE workspace.impress183.patch, 1.1, NONE
Caolan McNamara
caolanm at fedoraproject.org
Thu Nov 26 17:10:56 UTC 2009
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27631
Modified Files:
openoffice.org.spec workspace.cmcfixes67.patch
workspace.vcl107.patch
Removed Files:
openoffice.org-3.1.0.ooo100273.fix-utf8-hyphenation.patch
openoffice.org-3.2.0.rhbz521460.svx.revert-paper-sizes-reordering.patch
workspace.fwk125.patch workspace.impress183.patch
Log Message:
drop integrated patches
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2086
retrieving revision 1.2087
diff -u -p -r1.2086 -r1.2087
--- openoffice.org.spec 26 Nov 2009 15:53:40 -0000 1.2086
+++ openoffice.org.spec 26 Nov 2009 17:10:56 -0000 1.2087
@@ -100,40 +100,36 @@ Patch22: openoffice.org-3.0.1.oooXXXXX.f
Patch23: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
Patch24: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
Patch25: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
-Patch26: openoffice.org-3.1.0.ooo100273.fix-utf8-hyphenation.patch
-Patch27: ooo-build.ooo2497.filter.svg.patch
-Patch28: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
-Patch29: workspace.slideshow1.patch
-Patch30: openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
-Patch31: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
-Patch32: openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
-Patch33: openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
-Patch34: openoffice.org-3.1.0.ooo101567.i18npool.mailocaledata.patch
-Patch35: openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch
-Patch36: openoffice.org-3.1.0.ooo102142.sd.resleak.patch
-Patch37: openoffice.org-2.0.0.ooo46270.svx.search-dialog.no-find-all-in-draw.patch
-Patch38: openoffice.org-3.1.0.ooo104280.xmloff.lcl_IsAtEnd.wrong.patch
-Patch39: openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
-Patch40: openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch
-Patch41: openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch
-Patch42: workspace.vcl106.patch
-Patch43: openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch
-Patch44: openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch
-Patch45: openoffice.org-3.2.0.ooo105988.svx.a11ycrash.patch
-Patch46: openoffice.org-3.2.0.rhbz521460.svx.revert-paper-sizes-reordering.patch
-Patch47: openoffice.org-3.2.0.ooo106032.linguistic.defaulttoplain.patch
-Patch48: workspace.gsminhibit.patch
-Patch49: workspace.vcl107.patch
-Patch50: workspace.fwk125.patch
-Patch51: workspace.impress183.patch
-Patch52: workspace.hb33patches1.patch
-Patch53: workspace.ause109.patch
-Patch54: workspace.cmcfixes67.patch
-Patch55: workspace.srb1.patch
-Patch56: workspace.impress184.patch
-Patch57: openoffice.org-3.2.0.ooo107137.canvas.fixcolorspace.patch
-Patch58: openoffice.org-3.2.0.ooo107151.sc.pop-empty-cell.patch
-Patch59: openoffice.org-3.3.0.ooo102645.fix.es.patch
+Patch26: ooo-build.ooo2497.filter.svg.patch
+Patch27: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
+Patch28: workspace.slideshow1.patch
+Patch29: openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
+Patch30: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
+Patch31: openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
+Patch32: openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
+Patch33: openoffice.org-3.1.0.ooo101567.i18npool.mailocaledata.patch
+Patch34: openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch
+Patch35: openoffice.org-3.1.0.ooo102142.sd.resleak.patch
+Patch36: openoffice.org-2.0.0.ooo46270.svx.search-dialog.no-find-all-in-draw.patch
+Patch37: openoffice.org-3.1.0.ooo104280.xmloff.lcl_IsAtEnd.wrong.patch
+Patch38: openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
+Patch39: openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch
+Patch40: openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch
+Patch41: workspace.vcl106.patch
+Patch42: openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch
+Patch43: openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch
+Patch44: openoffice.org-3.2.0.ooo105988.svx.a11ycrash.patch
+Patch45: openoffice.org-3.2.0.ooo106032.linguistic.defaulttoplain.patch
+Patch46: workspace.gsminhibit.patch
+Patch47: workspace.vcl107.patch
+Patch48: workspace.hb33patches1.patch
+Patch49: workspace.ause109.patch
+Patch50: workspace.cmcfixes67.patch
+Patch51: workspace.srb1.patch
+Patch52: workspace.impress184.patch
+Patch53: openoffice.org-3.2.0.ooo107137.canvas.fixcolorspace.patch
+Patch54: openoffice.org-3.2.0.ooo107151.sc.pop-empty-cell.patch
+Patch55: openoffice.org-3.3.0.ooo102645.fix.es.patch
%define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
%define instdir %{_libdir}
@@ -1627,40 +1623,36 @@ cat %{PATCH10} >> svtools/source/dialogs
%patch23 -p0 -b .ooo98137.filter.redeclared-variables.patch
%patch24 -p1 -b .gccXXXXX.solenv.javaregistration.patch
%patch25 -p1 -b .oooXXXXX.solenv.allowmissing.patch
-%patch26 -p0 -b .ooo100273.fix-utf8-hyphenation.patch
-%patch27 -p1 -b .ooo2497.filter.svg.patch
-%patch28 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
-%patch29 -p2 -b .workspace.slideshow1.patch
-%patch30 -p0 -b .ooo90439.sfx2.qstart.hackaround.patch
-%patch31 -p0 -b .ooo101274.opening-a-directory.patch
-%patch32 -p0 -b .ooo101354.filter.xhtml.do-not-label-list-headers.patch
-%patch33 -p0 -b .ooo101355.filter.no-variables-in-keys.patch
-%patch34 -p0 -b .ooo101567.i18npool.mailocaledata.patch
-%patch35 -p0 -b .ooo102061.sc.cellanchoring.patch
-%patch36 -p0 -b .ooo102142.sd.resleak.patch
-%patch37 -p0 -b .ooo46270.svx.search-dialog.no-find-all-in-draw.patch
-%patch38 -p0 -b .ooo104280.xmloff.lcl_IsAtEnd.wrong.patch
-%patch39 -p0 -b .ooo104329.dbaccess.primarykeys.patch
-%patch40 -p0 -b .ooo64671.canvas.add-support-for-font-pitch.patch
-%patch41 -p1 -b .oooXXXXXX.sal.justcoredump.patch
-%patch42 -p0 -b .workspace.vcl106.patch
-%patch43 -p0 -b .ooo105784.vcl.sniffscriptforsubs.patch
-%patch44 -p0 -b .ooo105827.filter.xpath-on-rtf-not-allowed.patch
-%patch45 -p0 -b .ooo105988.svx.a11ycrash.patch
-%patch46 -p1 -b .rhbz521460.svx.revert-paper-sizes-reordering.patch
-%patch47 -p0 -b .ooo106032.linguistic.defaulttoplain.patch
-%patch48 -p1 -b .workspace.gsminhibit.patch
-%patch49 -p1 -b .workspace.vcl107.patch
-%patch50 -p1 -b .workspace.fwk125.patch
-%patch51 -p0 -b .workspace.impress183.patch
-%patch52 -p0 -b .workspace.hb33patches1.patch
-%patch53 -p0 -b .workspace.ause109.patch
-%patch54 -p1 -b .workspace.cmcfixes67.patch
-%patch55 -p1 -b .workspace.srb1.patch
-%patch56 -p0 -b .workspace.impress184.patch
-%patch57 -p0 -b .ooo107137.canvas.fixcolorspace.patch
-%patch58 -p1 -b .ooo107151.sc.pop-empty-cell.patch
-%patch59 -p0 -b .ooo102645.fix.es.patch
+%patch26 -p1 -b .ooo2497.filter.svg.patch
+%patch27 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
+%patch28 -p2 -b .workspace.slideshow1.patch
+%patch29 -p0 -b .ooo90439.sfx2.qstart.hackaround.patch
+%patch30 -p0 -b .ooo101274.opening-a-directory.patch
+%patch31 -p0 -b .ooo101354.filter.xhtml.do-not-label-list-headers.patch
+%patch32 -p0 -b .ooo101355.filter.no-variables-in-keys.patch
+%patch33 -p0 -b .ooo101567.i18npool.mailocaledata.patch
+%patch34 -p0 -b .ooo102061.sc.cellanchoring.patch
+%patch35 -p0 -b .ooo102142.sd.resleak.patch
+%patch36 -p0 -b .ooo46270.svx.search-dialog.no-find-all-in-draw.patch
+%patch37 -p0 -b .ooo104280.xmloff.lcl_IsAtEnd.wrong.patch
+%patch38 -p0 -b .ooo104329.dbaccess.primarykeys.patch
+%patch39 -p0 -b .ooo64671.canvas.add-support-for-font-pitch.patch
+%patch40 -p1 -b .oooXXXXXX.sal.justcoredump.patch
+%patch41 -p0 -b .workspace.vcl106.patch
+%patch42 -p0 -b .ooo105784.vcl.sniffscriptforsubs.patch
+%patch43 -p0 -b .ooo105827.filter.xpath-on-rtf-not-allowed.patch
+%patch44 -p0 -b .ooo105988.svx.a11ycrash.patch
+%patch45 -p0 -b .ooo106032.linguistic.defaulttoplain.patch
+%patch46 -p1 -b .workspace.gsminhibit.patch
+%patch47 -p1 -b .workspace.vcl107.patch
+%patch48 -p0 -b .workspace.hb33patches1.patch
+%patch49 -p0 -b .workspace.ause109.patch
+%patch50 -p1 -b .workspace.cmcfixes67.patch
+%patch51 -p1 -b .workspace.srb1.patch
+%patch52 -p0 -b .workspace.impress184.patch
+%patch53 -p0 -b .ooo107137.canvas.fixcolorspace.patch
+%patch54 -p1 -b .ooo107151.sc.pop-empty-cell.patch
+%patch55 -p0 -b .ooo102645.fix.es.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4173,6 +4165,13 @@ fi
- add openoffice.org-3.2.0.ooo107151.sc.pop-empty-cell.patch (dtardon)
- Resolves: rhbz#533538 OpenOffice keyboard shortcuts mis-map in the
Spanish localized version of OOo (caolanm)
+- drop post-translations
+ openoffice.org-3.2.0.rhbz521460.svx.revert-paper-sizes-reordering.patch
+ (caolanm)
+- drop integrated openoffice.org-3.1.0.ooo100273.fix-utf8-hyphenation.patch
+ (caolanm)
+- drop integrated workspace.fwk125.patch (caolanm)
+- drop integrated workspace.impress183.patch (caolanm)
* Mon Nov 23 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-5.2
- Resolves: rhbz#540379/ooo#107131 impress tabledrag crash
workspace.cmcfixes67.patch:
a/transex3/source/help/MANIFEST.MF | 2
configure.in | 112 ++++++++++++++++-----------
transex3/source/help/makefile.mk | 19 ----
ucb/source/ucp/gio/gio_mount.cxx | 2
xmlhelp/source/com/sun/star/help/MANIFEST.MF | 1
xmlhelp/source/com/sun/star/help/makefile.mk | 12 --
6 files changed, 73 insertions(+), 75 deletions(-)
Index: workspace.cmcfixes67.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.cmcfixes67.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- workspace.cmcfixes67.patch 24 Nov 2009 13:25:40 -0000 1.1
+++ workspace.cmcfixes67.patch 26 Nov 2009 17:10:56 -0000 1.2
@@ -243,9 +243,9 @@ diff -r dd90334f8680 xmlhelp/source/com/
# --- Targets ------------------------------------------------------
-@@ -94,15 +95,8 @@
+@@ -93,15 +94,8 @@
+
.IF "$(JARTARGETN)"!=""
- $(JAVATARGET) : $(ADDFILES)
$(JARTARGETN) : $(ADDFILES)
-$(JARTARGETN) : $(COMP)
.ENDIF
workspace.vcl107.patch:
accmgr.cxx | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
Index: workspace.vcl107.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.vcl107.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- workspace.vcl107.patch 17 Nov 2009 21:16:39 -0000 1.2
+++ workspace.vcl107.patch 26 Nov 2009 17:10:56 -0000 1.3
@@ -25,270 +25,3 @@ diff -r 170d9f615c3e vcl/source/window/a
// Raus damit
mpAccelList->Remove( pAccel );
}
-diff -r 2691de086167 icc/README
---- a/icc/README Thu Nov 05 15:23:36 2009 +0000
-+++ b/icc/README Thu Nov 05 18:03:59 2009 +0000
-@@ -31,11 +31,9 @@
-
- <build>/misc/build/SampleICC-1.3.2/IccProfLib/IccProfLibConf.h
-
--The patches:
--SampleICC-1.3.2.patch is the file to be used for Linux and Windows
--SampleICC-1.3.2-bendian.patch is the file to be used for
--big endian platform, formed from the above patch plus the big endian
--forcing.
-+The patchs:
-+SampleICC-1.3.2.patch tweaks the build to use the endianness
-+detected in sal.
-
- beppec56 at openoffice.org
-
-diff -r 2691de086167 icc/SampleICC-1.3.2.patch
---- a/icc/SampleICC-1.3.2.patch Thu Nov 05 15:23:36 2009 +0000
-+++ b/icc/SampleICC-1.3.2.patch Thu Nov 05 18:03:59 2009 +0000
-@@ -1,5 +1,5 @@
- *** misc/SampleICC-1.3.2/configure Mon Aug 20 22:10:59 2007
----- misc/build/SampleICC-1.3.2/configure Fri Jan 25 14:24:00 2008
-+--- misc/build/SampleICC-1.3.2/configure Fri Jan 25 14:23:09 2008
- ***************
- *** 19991,19997 ****
-
-@@ -60,7 +60,7 @@
- *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
- *** misc/SampleICC-1.3.2/Contrib/Makefile.in Mon Aug 20 22:10:37 2007
----- misc/build/SampleICC-1.3.2/Contrib/Makefile.in Fri Jan 25 14:24:00 2008
-+--- misc/build/SampleICC-1.3.2/Contrib/Makefile.in Fri Jan 25 14:23:09 2008
- ***************
- *** 103,120 ****
-
-@@ -95,7 +95,7 @@
- subdir = Contrib
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- *** misc/SampleICC-1.3.2/Contrib/CmdLine/Makefile.in Mon Aug 20 22:10:34 2007
----- misc/build/SampleICC-1.3.2/Contrib/CmdLine/Makefile.in Fri Jan 25 14:24:00 2008
-+--- misc/build/SampleICC-1.3.2/Contrib/CmdLine/Makefile.in Fri Jan 25 14:23:09 2008
- ***************
- *** 102,116 ****
- install_sh = @install_sh@
-@@ -126,7 +126,7 @@
- subdir = Contrib/CmdLine
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- *** misc/SampleICC-1.3.2/Contrib/ICC_utils/Makefile.in Mon Aug 20 22:10:35 2007
----- misc/build/SampleICC-1.3.2/Contrib/ICC_utils/Makefile.in Fri Jan 25 14:24:00 2008
-+--- misc/build/SampleICC-1.3.2/Contrib/ICC_utils/Makefile.in Fri Jan 25 14:23:09 2008
- ***************
- *** 133,139 ****
- CONFIG_CLEAN_FILES =
-@@ -145,7 +145,7 @@
- ICC_tool_exception.lo Vetters.lo
- libICC_utils_la_OBJECTS = $(am_libICC_utils_la_OBJECTS)
- *** misc/SampleICC-1.3.2/Contrib/ICC_utils/Stubs.h Mon Aug 20 22:04:53 2007
----- misc/build/SampleICC-1.3.2/Contrib/ICC_utils/Stubs.h Fri Jan 25 14:24:00 2008
-+--- misc/build/SampleICC-1.3.2/Contrib/ICC_utils/Stubs.h Fri Jan 25 14:23:09 2008
- ***************
- *** 130,136 ****
-
-@@ -164,7 +164,7 @@
- return (r_ != p.r_) ? (r_ < p.r_) : ((g_ != p.g_) ? (g_ < p.g_) : (b_ < p.b_));
- }
- *** misc/SampleICC-1.3.2/Contrib/ICC_utils/Vetters.cpp Mon Aug 20 22:04:54 2007
----- misc/build/SampleICC-1.3.2/Contrib/ICC_utils/Vetters.cpp Fri Jan 25 14:49:56 2008
-+--- misc/build/SampleICC-1.3.2/Contrib/ICC_utils/Vetters.cpp Fri Jan 25 14:57:06 2008
- ***************
- *** 1,322 ****
- ! /*
-@@ -820,7 +820,7 @@
- ! }
- ! }
- *** misc/SampleICC-1.3.2/IccProfLib/IccIO.cpp Mon Aug 20 22:05:00 2007
----- misc/build/SampleICC-1.3.2/IccProfLib/IccIO.cpp Fri Jan 25 14:25:33 2008
-+--- misc/build/SampleICC-1.3.2/IccProfLib/IccIO.cpp Fri Jan 25 14:23:09 2008
- ***************
- *** 78,84 ****
- #include "IccIO.h"
-@@ -838,8 +838,20 @@
- #include <string.h>
-
- #ifndef __max
-+*** misc/SampleICC-1.3.2/IccProfLib/IccIO.h Mon Aug 20 22:05:00 2007
-+--- misc/build/SampleICC-1.3.2/IccProfLib/IccIO.h Fri Jan 25 14:23:09 2008
-+***************
-+*** 79,84 ****
-+--- 79,85 ----
-+ #define _ICCIO_H
-+
-+ #include "IccDefs.h"
-++ #include "memory"
-+ #include "stdio.h"
-+
-+ #ifdef USESAMPLEICCNAMESPACE
- *** misc/SampleICC-1.3.2/IccProfLib/IccMpeACS.cpp Mon Aug 20 22:05:00 2007
----- misc/build/SampleICC-1.3.2/IccProfLib/IccMpeACS.cpp Fri Jan 25 14:24:00 2008
-+--- misc/build/SampleICC-1.3.2/IccProfLib/IccMpeACS.cpp Fri Jan 25 14:23:09 2008
- ***************
- *** 136,152 ****
- icChar sigBuf[30];
-@@ -878,7 +890,7 @@
- icMemDump(sDescription, m_pData, m_nDataSize);
- }
- *** misc/SampleICC-1.3.2/IccProfLib/IccMpeBasic.cpp Mon Aug 20 22:05:00 2007
----- misc/build/SampleICC-1.3.2/IccProfLib/IccMpeBasic.cpp Fri Jan 25 14:24:00 2008
-+--- misc/build/SampleICC-1.3.2/IccProfLib/IccMpeBasic.cpp Fri Jan 25 14:23:09 2008
- ***************
- *** 218,249 ****
- sprintf(buf, "%.8f", m_endPoint);
-@@ -1362,8 +1374,56 @@
- return icValidateCriticalError;
- }
-
-+*** misc/SampleICC-1.3.2/IccProfLib/IccProfLibConf.h Mon Aug 20 22:05:00 2007
-+--- misc/build/SampleICC-1.3.2/IccProfLib/IccProfLibConf.h Fri Jan 25 14:23:09 2008
-+***************
-+*** 107,126 ****
-+
-+ #else // non-PC, perhaps Mac or Linux
-+
-+! #define ICCUINT64 unsigned long long
-+! #define ICCINT64 long long
-+! #define ICUINT64TYPE unsigned long long
-+! #define ICINT64TYPE long long
-+!
-+! #if defined(__APPLE__)
-+! #if defined(__LITTLE_ENDIAN__)
-+! #define ICC_BYTE_ORDER_LITTLE_ENDIAN
-+! #else
-+! #define ICC_BYTE_ORDER_BIG_ENDIAN
-+! #endif
-+! #else
-+! #define ICC_BYTE_ORDER_LITTLE_ENDIAN
-+! #endif
-+
-+ #define ICCPROFLIB_API
-+ #define ICCPROFLIB_EXTERN
-+--- 107,129 ----
-+
-+ #else // non-PC, perhaps Mac or Linux
-+
-+! #include <sal/types.h>
-+! #include <osl/endian.h>
-+!
-+! #define ICCUINT64 sal_uInt64
-+! #define ICCINT64 sal_Int64
-+! #define ICUINT64TYPE sal_uInt64
-+! #define ICINT64TYPE sal_Int64
-+! #define ICINT32TYPE sal_Int32
-+! #define ICUINT32TYPE sal_uInt32
-+!
-+! #if defined(_LITTLE_ENDIAN)
-+! # define ICC_BYTE_ORDER_LITTLE_ENDIAN
-+! #elif defined(_BIG_ENDIAN)
-+! # define ICC_BYTE_ORDER_BIG_ENDIAN
-+! #else
-+! # error "ENDIAN unknown"
-+! #endif
-+
-+ #define ICCPROFLIB_API
-+ #define ICCPROFLIB_EXTERN
- *** misc/SampleICC-1.3.2/IccProfLib/IccProfile.cpp Mon Aug 20 22:05:00 2007
----- misc/build/SampleICC-1.3.2/IccProfLib/IccProfile.cpp Fri Jan 25 14:24:00 2008
-+--- misc/build/SampleICC-1.3.2/IccProfLib/IccProfile.cpp Fri Jan 25 14:23:09 2008
- ***************
- *** 567,573 ****
-
-@@ -1989,7 +2049,7 @@
- return NULL;
- }
- *** misc/SampleICC-1.3.2/IccProfLib/IccTagBasic.cpp Mon Aug 20 22:05:00 2007
----- misc/build/SampleICC-1.3.2/IccProfLib/IccTagBasic.cpp Fri Jan 25 14:24:00 2008
-+--- misc/build/SampleICC-1.3.2/IccProfLib/IccTagBasic.cpp Fri Jan 25 14:23:09 2008
- ***************
- *** 166,172 ****
- CIccInfo Info;
-@@ -3311,7 +3371,7 @@
- }
- else {
- *** misc/SampleICC-1.3.2/IccProfLib/IccTagLut.cpp Mon Aug 20 22:05:00 2007
----- misc/build/SampleICC-1.3.2/IccProfLib/IccTagLut.cpp Fri Jan 25 14:24:00 2008
-+--- misc/build/SampleICC-1.3.2/IccProfLib/IccTagLut.cpp Fri Jan 25 14:23:09 2008
- ***************
- *** 323,345 ****
- icChar buf[128], *ptr;
-@@ -4443,7 +4503,7 @@
- }
- }
- *** misc/SampleICC-1.3.2/IccProfLib/IccTagMPE.cpp Mon Aug 20 22:05:00 2007
----- misc/build/SampleICC-1.3.2/IccProfLib/IccTagMPE.cpp Fri Jan 25 14:24:00 2008
-+--- misc/build/SampleICC-1.3.2/IccProfLib/IccTagMPE.cpp Fri Jan 25 14:23:09 2008
- ***************
- *** 218,224 ****
- icGetSig(sigbuf, m_sig), m_nSize);
-@@ -4615,7 +4675,7 @@
- }
-
- *** misc/SampleICC-1.3.2/IccProfLib/IccTagProfSeqId.cpp Mon Aug 20 22:05:00 2007
----- misc/build/SampleICC-1.3.2/IccProfLib/IccTagProfSeqId.cpp Fri Jan 25 14:24:00 2008
-+--- misc/build/SampleICC-1.3.2/IccProfLib/IccTagProfSeqId.cpp Fri Jan 25 14:23:09 2008
- ***************
- *** 234,240 ****
- {
-@@ -4706,7 +4766,7 @@
-
-
- *** misc/SampleICC-1.3.2/IccProfLib/IccTagProfSeqId.h Mon Aug 20 22:05:00 2007
----- misc/build/SampleICC-1.3.2/IccProfLib/IccTagProfSeqId.h Fri Jan 25 14:24:00 2008
-+--- misc/build/SampleICC-1.3.2/IccProfLib/IccTagProfSeqId.h Fri Jan 25 14:23:09 2008
- ***************
- *** 161,164 ****
- }
-@@ -4719,7 +4779,7 @@
-
- ! #endif //_ICCTAGPROFSEQID_H
- *** misc/SampleICC-1.3.2/IccProfLib/IccUtil.cpp Mon Aug 20 22:05:00 2007
----- misc/build/SampleICC-1.3.2/IccProfLib/IccUtil.cpp Fri Jan 25 14:27:16 2008
-+--- misc/build/SampleICC-1.3.2/IccProfLib/IccUtil.cpp Fri Jan 25 14:23:09 2008
- ***************
- *** 79,85 ****
- #include "IccUtil.h"
-@@ -4974,7 +5034,7 @@
- rv = icMaxStatus(rv, icValidateWarning);
- }
- *** misc/SampleICC-1.3.2/IccProfLib/icProfileHeader.h Mon Aug 20 22:05:00 2007
----- misc/build/SampleICC-1.3.2/IccProfLib/icProfileHeader.h Fri Jan 25 14:24:00 2008
-+--- misc/build/SampleICC-1.3.2/IccProfLib/icProfileHeader.h Fri Jan 25 14:23:09 2008
- ***************
- *** 659,668 ****
- typedef enum {
-@@ -5000,7 +5060,7 @@
-
-
- *** misc/SampleICC-1.3.2/Tools/CmdLine/Makefile.in Mon Aug 20 22:10:42 2007
----- misc/build/SampleICC-1.3.2/Tools/CmdLine/Makefile.in Fri Jan 25 14:24:00 2008
-+--- misc/build/SampleICC-1.3.2/Tools/CmdLine/Makefile.in Fri Jan 25 14:23:09 2008
- ***************
- *** 101,117 ****
- am__quote = @am__quote@
-diff -r 2691de086167 icc/makefile.mk
---- a/icc/makefile.mk Thu Nov 05 15:23:36 2009 +0000
-+++ b/icc/makefile.mk Thu Nov 05 18:03:59 2009 +0000
-@@ -41,12 +41,7 @@
- # --- Files --------------------------------------------------------
-
- TARFILE_NAME=SampleICC-1.3.2
--#checking for endianess
--.IF "$(CPU)"=="I"
- PATCH_FILES=$(TARFILE_NAME).patch
--.ELSE
--PATCH_FILES=$(TARFILE_NAME)-bendian.patch
--.ENDIF
-
- CONVERTFILES= \
- IccProfLib$/IccTagProfSeqId.h \
-diff -r 2691de086167 icc/prj/build.lst
---- a/icc/prj/build.lst Thu Nov 05 15:23:36 2009 +0000
-+++ b/icc/prj/build.lst Thu Nov 05 18:03:59 2009 +0000
-@@ -1,3 +1,3 @@
--ip icc : solenv external NULL
-+ip icc : solenv external sal NULL
- ip icc usr1 - all ip_mkout NULL
- ip icc nmake - all ip_icc NULL
--- openoffice.org-3.1.0.ooo100273.fix-utf8-hyphenation.patch DELETED ---
--- openoffice.org-3.2.0.rhbz521460.svx.revert-paper-sizes-reordering.patch DELETED ---
--- workspace.fwk125.patch DELETED ---
--- workspace.impress183.patch DELETED ---
More information about the scm-commits
mailing list