rpms/openoffice.org/devel openoffice.org.spec, 1.977, 1.978 workspace.icuupgrade.patch, 1.1, 1.2 openoffice.org-1.9.128.ooo54479.systemicu.patch, 1.16, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Mon Dec 18 16:05:16 UTC 2006


Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21060

Modified Files:
	openoffice.org.spec workspace.icuupgrade.patch 
Removed Files:
	openoffice.org-1.9.128.ooo54479.systemicu.patch 
Log Message:
match patches to upstream workspaces


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.977
retrieving revision 1.978
diff -u -r1.977 -r1.978
--- openoffice.org.spec	18 Dec 2006 16:00:52 -0000	1.977
+++ openoffice.org.spec	18 Dec 2006 16:05:14 -0000	1.978
@@ -82,57 +82,56 @@
 Patch14: openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch
 Patch15: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
 Patch16: openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch
-Patch17: openoffice.org-1.9.128.ooo54479.systemicu.patch
-Patch18: workspace.icuupgrade.patch
-Patch19: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
-Patch20: workspace.inplaceobjects.patch
-Patch21: openoffice.org-2.0.2.rh188467.printingdefaults.patch
-Patch22: workspace.cmcfixes29.patch
-Patch23: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
-Patch24: workspace.fpicker6.patch
-Patch25: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
-Patch26: openoffice.org-2.0.2.ooo59127.vcl.honourcairofont.patch
-Patch27: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
-Patch28: openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch
-Patch29: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
-Patch30: ooobuild.VBAObjects.patch
-Patch31: openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch
-Patch32: openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch
-Patch33: openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
-Patch34: openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch
-Patch35: workspace.os89.patch
-Patch36: openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
-Patch37: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
-Patch38: openoffice.org-2.0.4.oooXXXXX.vcl.x86_64.impressatk.patch
-Patch39: openoffice.org-1.9.129.ooo54603.fontconfig.part3.patch
-Patch40: openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch
-Patch41: pseudoworkspace.valgrind1.patch
-Patch42: openoffice.org-2.0.4.gccXXXXX.svtools.fsstorage.patch
-Patch43: workspace.thbpp6.patch
-Patch44: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
-Patch45: openoffice.org-2.0.4.ooo69992.sw.syncbackspace.patch
-Patch46: openoffice.org-2.0.4.ooo70779.vcl.setprgname.patch
-Patch47: openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch
-Patch48: workspace.aw024.patch
-Patch49: openoffice.org.2.0.4.oooXXXXX.i18npool.extendgrapheme.patch
-Patch50: workspace.dr51.patch
-Patch51: openoffice.org-1.9.129.ooo54603.fontconfig.part4.patch
-Patch52: openoffice.org-2.0.4.rh213710.vba.patch
-Patch53: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
-Patch54: openoffice.org-2.1.0.ooo61812.svx.a11ycrash.patch
-Patch55: workspace.sixtyfour09.patch
-Patch56: workspace.vcl69.patch
-Patch57: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
-Patch58: workspace.dba22b.patch
-Patch59: workspace.sixtyfour10.patch
-Patch60: openoffice.org-2.1.0.ooo72014.officecfg.malayammenu.patch
-Patch61: visibility.warning.patch
-Patch62: workspace.vcl70.patch
-Patch63: openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemhunspell.patch
-Patch64: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
-Patch65: openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch
-Patch66: openoffice.org-2.1.0.oooXXXXX.vcl.filterzwatrender.patch
-Patch67: workspace.vcl71.patch
+Patch17: workspace.icuupgrade.patch
+Patch18: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
+Patch19: workspace.inplaceobjects.patch
+Patch20: openoffice.org-2.0.2.rh188467.printingdefaults.patch
+Patch21: workspace.cmcfixes29.patch
+Patch22: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
+Patch23: workspace.fpicker6.patch
+Patch24: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
+Patch25: openoffice.org-2.0.2.ooo59127.vcl.honourcairofont.patch
+Patch26: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
+Patch27: openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch
+Patch28: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
+Patch29: ooobuild.VBAObjects.patch
+Patch30: openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch
+Patch31: openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch
+Patch32: openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
+Patch33: openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch
+Patch34: workspace.os89.patch
+Patch35: openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
+Patch36: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
+Patch37: openoffice.org-2.0.4.oooXXXXX.vcl.x86_64.impressatk.patch
+Patch38: openoffice.org-1.9.129.ooo54603.fontconfig.part3.patch
+Patch39: openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch
+Patch40: pseudoworkspace.valgrind1.patch
+Patch41: openoffice.org-2.0.4.gccXXXXX.svtools.fsstorage.patch
+Patch42: workspace.thbpp6.patch
+Patch43: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
+Patch44: openoffice.org-2.0.4.ooo69992.sw.syncbackspace.patch
+Patch45: openoffice.org-2.0.4.ooo70779.vcl.setprgname.patch
+Patch46: openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch
+Patch47: workspace.aw024.patch
+Patch48: openoffice.org.2.0.4.oooXXXXX.i18npool.extendgrapheme.patch
+Patch49: workspace.dr51.patch
+Patch50: openoffice.org-1.9.129.ooo54603.fontconfig.part4.patch
+Patch51: openoffice.org-2.0.4.rh213710.vba.patch
+Patch52: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
+Patch53: openoffice.org-2.1.0.ooo61812.svx.a11ycrash.patch
+Patch54: workspace.sixtyfour09.patch
+Patch55: workspace.vcl69.patch
+Patch56: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
+Patch57: workspace.dba22b.patch
+Patch58: workspace.sixtyfour10.patch
+Patch59: openoffice.org-2.1.0.ooo72014.officecfg.malayammenu.patch
+Patch60: visibility.warning.patch
+Patch61: workspace.vcl70.patch
+Patch62: openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemhunspell.patch
+Patch63: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
+Patch64: openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch
+Patch65: openoffice.org-2.1.0.oooXXXXX.vcl.filterzwatrender.patch
+Patch66: workspace.vcl71.patch
 
 %define instdir %{_libdir}/openoffice.org2.1
 
@@ -952,57 +951,56 @@
 %patch14 -p1 -b .oooXXXXX.newsystemdb.xmlhelp.patch
 %patch15 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
 %patch16 -p1 -b .ooo30380.uselibxslt.xmlhelp.patch
-%patch17 -p1 -b .ooo54479.systemicu.patch
-%patch18 -p1 -b .workspace.icuupgrade.patch
-%patch19 -p1 -b .ooo58606.sw.pre-edit.patch
-%patch20 -p1 -b .workspace.inplaceobjects.patch
-%patch21 -p1
-%patch22 -p1 -b .workspace.cmcfixes29.patch
-%patch23 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
-%patch24 -p1 -b .workspace.fpicker6.patch
-%patch25 -p1 -b .oooXXXXX.selinux.bridges.patch
-%patch26 -p1 -b .ooo59127.vcl.honourcairofont.patch
-%patch27 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
-%patch28 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch
-%patch29 -p1 -b .rh187919.gtkunderkde.patch
-%patch30 -p0 -b .ooobuild.VBAObjects.patch
-%patch31 -p1 -b .ooo67658.sfx2.reloadcrash.patch
-%patch32 -p1 -b .gccXXXXX.basegfx.crash.patch
-%patch33 -p1 -b .ooo67740.xmlhelp.doublefree.patch
-%patch34 -p1 -b .rh200118.filter.xalanbroken.patch
-%patch35 -p1 -b .workspace.os89.patch
-%patch36 -p1 -b .ooo54603.fontconfig.part2.patch
-%patch37 -p1 -b .ooo68048.vcl.imsurroundtext.patch
-%patch38 -p1 -b .oooXXXXX.vcl.x86_64.impressatk.patch
-%patch39 -p1 -b .ooo54603.fontconfig.part3.patch
-%patch40 -p1 -b .ooo69051.vcl.singlekeypress.patch
-%patch41 -p1 -b .pseudoworkspace.valgrind1.patch
-%patch42 -p1 -b .gccXXXXX.svtools.fsstorage.patch
-%patch43 -p1 -b .workspace.thbpp6.patch
-%patch44 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
-%patch45 -p1 -b .ooo69992.sw.syncbackspace.patch
-%patch46 -p1 -b .ooo70779.vcl.setprgname.patch
-%patch47 -p1 -b .ooo70155.fasterhelplinking.patch
-%patch48 -p1 -b .workspace.aw024.patch
-%patch49 -p1 -b .oooXXXXX.i18npool.extendgrapheme.patch
-%patch50 -p1 -b .workspace.dr51.patch
-%patch51 -p1 -b .ooo54603.fontconfig.part4.patch
-%patch52 -p1 -b .rh213710.vba.patch
-%patch53 -p1 -b .ooo65491.psprint.enablenups.patch
-%patch54 -p1 -b .ooo61812.svx.a11ycrash.patch
-%patch55 -p1 -b .workspace.sixtyfour09.patch
-%patch56 -p1 -b .workspace.vcl69.patch
-cat %{PATCH57} >> svtools/source/dialogs/localize.sdf
-%patch58 -p1 -b .workspace.dba22b.patch
-%patch59 -p1 -b .workspace.sixtyfour10.patch
-%patch60 -p1 -b .ooo72014.officecfg.malayammenu.patch
-%patch61 -p1 -b .visibility.warning.patch
-%patch62 -p1 -b .workspace.vcl70.patch
-%patch63 -p1 -b .oooXXXXX.lingucomponent.systemhunspell.patch
-%patch64 -p1 -b .rh217269.officecfg.nosequencecheck.patch
-%patch65 -p1 -b .ooo72129.vcl.fontglyphindex.patch
-%patch66 -p1 -b .oooXXXXX.vcl.filterzwatrender.patch
-%patch67 -p1 -b .workspace.vcl71.patch
+%patch17 -p1 -b .workspace.icuupgrade.patch
+%patch18 -p1 -b .ooo58606.sw.pre-edit.patch
+%patch19 -p1 -b .workspace.inplaceobjects.patch
+%patch20 -p1
+%patch21 -p1 -b .workspace.cmcfixes29.patch
+%patch22 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
+%patch23 -p1 -b .workspace.fpicker6.patch
+%patch24 -p1 -b .oooXXXXX.selinux.bridges.patch
+%patch25 -p1 -b .ooo59127.vcl.honourcairofont.patch
+%patch26 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
+%patch27 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch
+%patch28 -p1 -b .rh187919.gtkunderkde.patch
+%patch29 -p0 -b .ooobuild.VBAObjects.patch
+%patch30 -p1 -b .ooo67658.sfx2.reloadcrash.patch
+%patch31 -p1 -b .gccXXXXX.basegfx.crash.patch
+%patch32 -p1 -b .ooo67740.xmlhelp.doublefree.patch
+%patch33 -p1 -b .rh200118.filter.xalanbroken.patch
+%patch34 -p1 -b .workspace.os89.patch
+%patch35 -p1 -b .ooo54603.fontconfig.part2.patch
+%patch36 -p1 -b .ooo68048.vcl.imsurroundtext.patch
+%patch37 -p1 -b .oooXXXXX.vcl.x86_64.impressatk.patch
+%patch38 -p1 -b .ooo54603.fontconfig.part3.patch
+%patch39 -p1 -b .ooo69051.vcl.singlekeypress.patch
+%patch40 -p1 -b .pseudoworkspace.valgrind1.patch
+%patch41 -p1 -b .gccXXXXX.svtools.fsstorage.patch
+%patch42 -p1 -b .workspace.thbpp6.patch
+%patch43 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
+%patch44 -p1 -b .ooo69992.sw.syncbackspace.patch
+%patch45 -p1 -b .ooo70779.vcl.setprgname.patch
+%patch46 -p1 -b .ooo70155.fasterhelplinking.patch
+%patch47 -p1 -b .workspace.aw024.patch
+%patch48 -p1 -b .oooXXXXX.i18npool.extendgrapheme.patch
+%patch49 -p1 -b .workspace.dr51.patch
+%patch50 -p1 -b .ooo54603.fontconfig.part4.patch
+%patch51 -p1 -b .rh213710.vba.patch
+%patch52 -p1 -b .ooo65491.psprint.enablenups.patch
+%patch53 -p1 -b .ooo61812.svx.a11ycrash.patch
+%patch54 -p1 -b .workspace.sixtyfour09.patch
+%patch55 -p1 -b .workspace.vcl69.patch
+cat %{PATCH56} >> svtools/source/dialogs/localize.sdf
+%patch57 -p1 -b .workspace.dba22b.patch
+%patch58 -p1 -b .workspace.sixtyfour10.patch
+%patch59 -p1 -b .ooo72014.officecfg.malayammenu.patch
+%patch60 -p1 -b .visibility.warning.patch
+%patch61 -p1 -b .workspace.vcl70.patch
+%patch62 -p1 -b .oooXXXXX.lingucomponent.systemhunspell.patch
+%patch63 -p1 -b .rh217269.officecfg.nosequencecheck.patch
+%patch64 -p1 -b .ooo72129.vcl.fontglyphindex.patch
+%patch65 -p1 -b .oooXXXXX.vcl.filterzwatrender.patch
+%patch66 -p1 -b .workspace.vcl71.patch
 
 %if %{langpacks}
 tar xzf %{SOURCE1}

workspace.icuupgrade.patch:
 config_office/configure.in                              |   52 +++++-----
 config_office/set_soenv.in                              |    6 -
 gsl/vcl/source/gdi/sallayout.cxx                        |   82 ++++++++--------
 gsl/vcl/source/glyphs/gcach_layout.cxx                  |   31 ++++--
 i18npool/inc/breakiterator_unicode.hxx                  |    1 
 i18npool/prj/build.lst                                  |    2 
 i18npool/source/breakiterator/breakiterator_unicode.cxx |   24 +++-
 i18npool/source/breakiterator/makefile.mk               |   20 +--
 i18npool/source/collator/collator_unicode.cxx           |   32 ++----
 i18npool/source/collator/gencoll_rule.cxx               |    4 
 inc/breakiterator_unicode.hxx                           |    0 
 linguistic/source/hhconvdic.cxx                         |    2 
 prj/build.lst                                           |    0 
 scp2/prj/build.lst                                      |    2 
 scp2/source/ooo/file_library_ooo.scp                    |    4 
 scp2/source/ooo/makefile.mk                             |   11 +-
 scp2/source/ooo/shortcut_ooo.scp                        |   30 -----
 source/breakiterator/breakiterator_unicode.cxx          |    0 
 source/breakiterator/makefile.mk                        |    0 
 source/collator/collator_unicode.cxx                    |    0 
 source/collator/gencoll_rule.cxx                        |    0 
 source/hhconvdic.cxx                                    |    0 
 vcl/prj/build.lst                                       |    2 
 23 files changed, 155 insertions(+), 150 deletions(-)

Index: workspace.icuupgrade.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.icuupgrade.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.icuupgrade.patch	3 Aug 2006 08:59:16 -0000	1.1
+++ workspace.icuupgrade.patch	18 Dec 2006 16:05:14 -0000	1.2
@@ -210,3 +210,485 @@
      // determine need for kashida justification
      if( (rArgs.mpDXArray || rArgs.mnLayoutWidth)
      &&  ((meScriptCode == arabScriptCode) || (meScriptCode == syrcScriptCode)) )
+diff -ru config_office.orig/configure.in config_office/configure.in
+--- openoffice.org.orig/config_office/configure.in	2005-09-09 08:23:03.000000000 +0100
++++ openoffice.org/config_office/configure.in	2005-09-09 08:24:46.000000000 +0100
+@@ -226,9 +226,9 @@
+ AC_ARG_WITH(system-python,
+ [  --with-system-python    Use python already on system
+ ],,)
+-#AC_ARG_WITH(system-icu,
+-#[  --with-system-icu       Use icu already on system
+-#],,)
++AC_ARG_WITH(system-icu,
++[  --with-system-icu       Use icu already on system
++],,)
+ AC_ARG_WITH(system-db,
+ [  --with-system-db        Use berkeley db already on system
+ ],,)
+@@ -2965,32 +2965,32 @@
+ fi
+ AC_SUBST(SYSTEM_SANE_HEADER)
+ 
+-# DISABLED; INCOMPLETE
+ dnl ===================================================================
+ dnl Check for system icu
+ dnl ===================================================================
+-#AC_MSG_CHECKING([which icu to use])
+-#if test -n "$with_system_icu" -o -n "$with_system_libs" && \
+-#	test "$with_system_icu" != "no"; then
+-#   AC_MSG_RESULT([external])
+-#   SYSTEM_ICU=YES
+-#   AC_MSG_CHECKING([for unicode/rbbi.h])
+-#   AC_TRY_CPP(unicode/rbbi.h, AC_MSG_RESULT([checked.]), AC_MSG_ERROR([icu headers not found.]))
+-#   AC_PATH_PROG(SYSTEM_GENBRK, genbrk)
+-#   if test -z "$SYSTEM_GENBRK"; then
+-#      AC_MSG_ERROR([\"genbrk\" not found in \$PATH, install the icu development tool \"genbrk"\])
+-#   fi
+-#   AC_PATH_PROG(SYSTEM_GENCCODE, genccode)
+-#   if test -z "$SYSTEM_GENCCODE"; then
+-#      AC_MSG_ERROR([\"genccode\" not found in \$PATH, install the icu development tool \"genccode"\])
+-#   fi
+-#else
+-#    AC_MSG_RESULT([internal])
+-#    SYSTEM_ICU=NO
+-#fi
+-#AC_SUBST(SYSTEM_ICU)
+-#AC_SUBST(SYSTEM_GENBRK)
+-#AC_SUBST(SYSTEM_GENCCODE)
++AC_MSG_CHECKING([which icu to use])
++if test -n "$with_system_icu" -o -n "$with_system_libs" && \
++	test "$with_system_icu" != "no"; then
++   AC_MSG_RESULT([external])
++   SYSTEM_ICU=YES
++   AC_MSG_CHECKING([for unicode/rbbi.h])
++   AC_TRY_CPP(unicode/rbbi.h, AC_MSG_RESULT([checked.]), AC_MSG_ERROR([icu headers not found.]))
++   AC_PATH_PROG(SYSTEM_GENBRK, genbrk)
++   if test -z "$SYSTEM_GENBRK"; then
++      AC_MSG_ERROR([\"genbrk\" not found in \$PATH, install the icu development tool \"genbrk"\])
++   fi
++   AC_PATH_PROG(SYSTEM_GENCCODE, genccode)
++   if test -z "$SYSTEM_GENCCODE"; then
++      AC_MSG_ERROR([\"genccode\" not found in \$PATH, install the icu development tool \"genccode"\])
++   fi
++else
++    AC_MSG_RESULT([internal])
++    SYSTEM_ICU=NO
++    BUILD_TYPE="$BUILD_TYPE ICU"
++fi
++AC_SUBST(SYSTEM_ICU)
++AC_SUBST(SYSTEM_GENBRK)
++AC_SUBST(SYSTEM_GENCCODE)
+ 
+ dnl ===================================================================
+ dnl Checks for libraries.
+diff -ru config_office.orig/set_soenv.in config_office/set_soenv.in
+--- openoffice.org.orig/config_office/set_soenv.in	2005-09-09 08:23:03.000000000 +0100
++++ openoffice.org/config_office/set_soenv.in	2005-09-09 08:25:28.000000000 +0100
+@@ -1731,9 +1731,9 @@
+ ToFile( "SYSTEM_PYTHON",     "@SYSTEM_PYTHON@",    "e" );
+ ToFile( "PYTHON_CFLAGS",     "@PYTHON_CFLAGS@",    "e" );
+ ToFile( "PYTHON_LIBS",       "@PYTHON_LIBS@",      "e" );
+-#ToFile( "SYSTEM_ICU",        "@SYSTEM_ICU@",       "e" );
+-#ToFile( "SYSTEM_GENBRK",     "@SYSTEM_GENBRK@",    "e" );
+-#ToFile( "SYSTEM_GENCCODE",   "@SYSTEM_GENCCODE@",  "e" );
++ToFile( "SYSTEM_ICU",        "@SYSTEM_ICU@",       "e" );
++ToFile( "SYSTEM_GENBRK",     "@SYSTEM_GENBRK@",    "e" );
++ToFile( "SYSTEM_GENCCODE",   "@SYSTEM_GENCCODE@",  "e" );
+ ToFile( "SYSTEM_JPEG",       "@SYSTEM_JPEG@",      "e" );
+ ToFile( "SYSTEM_FREETYPE",   "@SYSTEM_FREETYPE@",  "e" );
+ ToFile( "FREETYPE_CFLAGS",   "@FREETYPE_CFLAGS@",  "e" );
+Index: source/hhconvdic.cxx
+===================================================================
+RCS file: /cvs/sw/linguistic/source/hhconvdic.cxx,v
+retrieving revision 1.4
+diff -u -p -u -r1.4 hhconvdic.cxx
+--- openoffice.org.orig/linguistic/source/hhconvdic.cxx	26 Nov 2004 14:29:09 -0000	1.4
++++ openoffice.org/linguistic/source/hhconvdic.cxx	10 Sep 2005 07:47:25 -0000
+@@ -60,7 +60,7 @@
+  ************************************************************************/
+ 
+ #ifndef USCRIPT_H
+-#include <external/unicode/uscript.h>
++#include <unicode/uscript.h>
+ #endif
+ 
+ #ifndef _LANG_HXX //autogen wg. LANGUAGE_ENGLISH_US
+diff -ru scp2.orig/prj/build.lst scp2/prj/build.lst
+--- openoffice.org.orig/scp2/prj/build.lst	2005-09-09 10:00:30.000000000 +0100
++++ openoffice.org/scp2/prj/build.lst	2005-09-09 08:37:48.000000000 +0100
+@@ -1,4 +1,4 @@
+-cp    scp2    :    setup_native transex3 PYTHON:python icu NULL
++cp    scp2    :    setup_native transex3 PYTHON:python ICU:icu NULL
+ cp    scp2                        usr1     -    all    cp_mkout NULL
+ cp    scp2\macros                 nmake    -    all    cp_langmacros NULL
+ cp    scp2\source\activex         nmake    -    all    cp_activex cp_langmacros NULL
+diff -ru scp2.orig/source/ooo/file_library_ooo.scp scp2/source/ooo/file_library_ooo.scp
+--- openoffice.org.orig/scp2/source/ooo/file_library_ooo.scp	2005-09-09 10:00:18.000000000 +0100
++++ openoffice.org/scp2/source/ooo/file_library_ooo.scp	2005-09-09 10:04:07.000000000 +0100
+@@ -801,6 +801,8 @@
+     Styles = (PACKED,PATCH);
+ End
+ 
++#ifndef SYSTEM_ICU
++
+ File gid_File_Lib_Icudata
+     TXT_FILE_BODY;
+   #ifdef UNX
+@@ -845,6 +847,8 @@
+     Styles = (PACKED);
+ End
+ 
++#endif
++
+ File gid_File_Lib_Iiopbrdg
+     TXT_FILE_BODY;
+     Styles = (PACKED,UNO_COMPONENT);
+diff -ru scp2.orig/source/ooo/makefile.mk scp2/source/ooo/makefile.mk
+--- openoffice.org.orig/scp2/source/ooo/makefile.mk	2005-09-09 10:00:18.000000000 +0100
++++ openoffice.org/scp2/source/ooo/makefile.mk	2005-09-09 13:00:17.000000000 +0100
+@@ -45,7 +45,6 @@
+ # --- Settings -----------------------------------------------------
+ 
+ .INCLUDE :  settings.mk
+-.INCLUDE :  icuversion.mk
+ .INCLUDE :  i18npool/version.mk
+ 
+ .IF "$(ENABLE_CRASHDUMP)"!=""
+@@ -177,11 +176,17 @@
+ SCPDEFS+=-DENABLE_CAIRO
+ .ENDIF
+ 
++.IF "$(SYSTEM_ICU)" == "YES"
++SCPDEFS+=-DSYSTEM_ICU
++.ELSE
++.INCLUDE :  icuversion.mk
+ SCPDEFS+=\
+     -DICU_MAJOR=$(ICU_MAJOR) \
+     -DICU_MINOR=$(ICU_MINOR) \
+-    -DICU_MICRO=$(ICU_MICRO) \
+-	-DISOLANG_MAJOR=$(ISOLANG_MAJOR)
++    -DICU_MICRO=$(ICU_MICRO)
++.ENDIF
++
++SCPDEFS+=-DISOLANG_MAJOR=$(ISOLANG_MAJOR)
+ 
+ .IF "$(DISABLE_NEON)" == "TRUE"
+ SCPDEFS+=-DDISABLE_NEON
+diff -ru scp2.orig/source/ooo/shortcut_ooo.scp scp2/source/ooo/shortcut_ooo.scp
+--- openoffice.org.orig/scp2/source/ooo/shortcut_ooo.scp	2005-09-09 10:00:18.000000000 +0100
++++ openoffice.org/scp2/source/ooo/shortcut_ooo.scp	2005-09-09 10:05:21.000000000 +0100
+@@ -193,6 +193,7 @@
+ #endif
+ 
+ #ifdef UNX
++#ifndef SYSTEM_ICU
+ 
+ Shortcut gid_Shortcut_Lib_Icudata_0
+     FileID = gid_File_Lib_Icudata;
+@@ -201,10 +202,6 @@
+     Styles = (NETWORK,RELATIVE);
+ End
+ 
+-#endif
+-
+-#ifdef UNX
+-
+ Shortcut gid_Shortcut_Lib_Icudata_1
+     FileID = gid_File_Lib_Icudata;
+     Dir = gid_Dir_Program;
+@@ -212,10 +209,6 @@
+     Styles = (NETWORK,RELATIVE);
+ End
+ 
+-#endif
+-
+-#ifdef UNX
+-
+ Shortcut gid_Shortcut_Lib_Icui18n_0
+     FileID = gid_File_Lib_Icui18n;
+     Dir = gid_Dir_Program;
+@@ -223,10 +216,6 @@
+     Styles = (NETWORK,RELATIVE);
+ End
+ 
+-#endif
+-
+-#ifdef UNX
+-
+ Shortcut gid_Shortcut_Lib_Icui18n_1
+     FileID = gid_File_Lib_Icui18n;
+     Dir = gid_Dir_Program;
+@@ -234,10 +223,6 @@
+     Styles = (NETWORK,RELATIVE);
+ End
+ 
+-#endif
+-
+-#ifdef UNX
+-
+ Shortcut gid_Shortcut_Lib_Icule_0
+     FileID = gid_File_Lib_Icule;
+     Dir = gid_Dir_Program;
+@@ -245,10 +230,6 @@
+     Styles = (NETWORK,RELATIVE);
+ End
+ 
+-#endif
+-
+-#ifdef UNX
+-
+ Shortcut gid_Shortcut_Lib_Icule_1
+     FileID = gid_File_Lib_Icule;
+     Dir = gid_Dir_Program;
+@@ -256,10 +237,6 @@
+     Styles = (NETWORK,RELATIVE);
+ End
+ 
+-#endif
+-
+-#ifdef UNX
+-
+ Shortcut gid_Shortcut_Lib_Icuuc_0
+     FileID = gid_File_Lib_Icuuc;
+     Dir = gid_Dir_Program;
+@@ -267,10 +244,6 @@
+     Styles = (NETWORK,RELATIVE);
+ End
+ 
+-#endif
+-
+-#ifdef UNX
+-
+ Shortcut gid_Shortcut_Lib_Icuuc_1
+     FileID = gid_File_Lib_Icuuc;
+     Dir = gid_Dir_Program;
+@@ -279,6 +252,7 @@
+ End
+ 
+ #endif
++#endif
+ 
+ #ifdef UNX
+ 
+--- openoffice.org.orig/vcl/prj/build.lst	2005-09-13 08:51:51.000000000 +0100
++++ openoffice.org/vcl/prj/build.lst	2005-09-09 08:37:54.000000000 +0100
+@@ -1,4 +1,4 @@
+-vc	vcl	:	BOOST:boost NAS:nas FREETYPE:freetype psprint rsc sot ucbhelper unotools icu i18npool unoil ridljar X11_EXTENSIONS:x11_extensions offuh basegfx SNDFILE:sndfile PORTAUDIO:portaudio transex3 SO:officenames NULL
++vc	vcl	:	BOOST:boost NAS:nas FREETYPE:freetype psprint rsc sot ucbhelper unotools ICU:icu i18npool unoil ridljar X11_EXTENSIONS:x11_extensions offuh basegfx SNDFILE:sndfile PORTAUDIO:portaudio transex3 SO:officenames NULL
+ vc	vcl										usr1	-	all	vc_mkout NULL
+ vc	vcl\source\glyphs						nmake	-	all	vc_glyphs NULL
+ vc	vcl\source\app							nmake	-	all	vc_app NULL
+Index: inc/breakiterator_unicode.hxx
+===================================================================
+RCS file: /cvs/l10n/i18npool/inc/breakiterator_unicode.hxx,v
+retrieving revision 1.12
+diff -u -r1.12 breakiterator_unicode.hxx
+--- openoffice.org.orig/i18npool/inc/breakiterator_unicode.hxx	17 Nov 2005 20:30:00 -0000	1.12
++++ openoffice.org/i18npool/inc/breakiterator_unicode.hxx	8 Aug 2006 11:31:48 -0000
+@@ -92,6 +92,7 @@
+ 
+     struct {
+         rtl::OUString aText;
++	UnicodeString aICUText;
+         icu::BreakIterator *aBreakIterator;
+     } character, word, sentence, line, *icuBI; 
+     com::sun::star::lang::Locale aLocale;
+Index: prj/build.lst
+===================================================================
+RCS file: /cvs/l10n/i18npool/prj/build.lst,v
+retrieving revision 1.20
+diff -u -r1.20 build.lst
+--- openoffice.org.orig/i18npool/prj/build.lst	7 Apr 2006 14:30:57 -0000	1.20
++++ openoffice.org/i18npool/prj/build.lst	8 Aug 2006 11:31:48 -0000
+@@ -1,4 +1,4 @@
+-inp  i18npool    :   bridges sax stoc comphelper icu i18nutil regexp NULL
++inp  i18npool    :   bridges sax stoc comphelper ICU:icu i18nutil regexp NULL
+ inp  i18npool                                   usr1    -   all inp_mkout NULL
+ inp  i18npool\source\unotypes                   nmake   -   all inp_utypes NULL
+ inp  i18npool\source\registerservices           nmake   -   all inp_rserv inp_utypes NULL
+Index: source/breakiterator/breakiterator_unicode.cxx
+===================================================================
+RCS file: /cvs/l10n/i18npool/source/breakiterator/breakiterator_unicode.cxx,v
+retrieving revision 1.22
+diff -u -r1.22 breakiterator_unicode.cxx
+--- openoffice.org.orig/i18npool/source/breakiterator/breakiterator_unicode.cxx	17 Nov 2005 20:30:35 -0000	1.22
++++ openoffice.org/i18npool/source/breakiterator/breakiterator_unicode.cxx	8 Aug 2006 11:31:48 -0000
+@@ -37,9 +37,10 @@
+ #include <unicode/locid.h>
+ #include <unicode/rbbi.h>
+ #include <unicode/udata.h>
++#include <rtl/strbuf.hxx>
+ 
+ U_CDECL_BEGIN
+-extern const char OpenOffice_icu_dat[];
++extern const char OpenOffice_dat[];
+ U_CDECL_END
+ 
+ using namespace ::com::sun::star::uno;
+@@ -99,16 +100,22 @@
+                         rWordType == WordType::DICTIONARY_WORD ? "dict_word" : "edit_word";
+ 
+             status = U_ZERO_ERROR;
+-            udata_setAppData("OpenOffice", OpenOffice_icu_dat, &status);
++            udata_setAppData("OpenOffice", OpenOffice_dat, &status);
+             if ( !U_SUCCESS(status) ) throw ERROR;
+ 
+             status = U_ZERO_ERROR;
+-            icuBI->aBreakIterator = new RuleBasedBreakIterator(udata_open("OpenOffice", "brk", 
+-                    OUStringToOString(OUString::createFromAscii(rule)+OUString::createFromAscii("_")+rLocale.Language,
+-                    RTL_TEXTENCODING_ASCII_US).getStr(), &status), status);
++            OStringBuffer aUDName(64);
++            aUDName.append(rule);
++            aUDName.append('_');
++            aUDName.append( OUStringToOString(rLocale.Language, RTL_TEXTENCODING_ASCII_US));
++            UDataMemory* pUData = udata_open("OpenOffice", "brk", aUDName.getStr(), &status);
++            if( U_SUCCESS(status) )
++                icuBI->aBreakIterator = new RuleBasedBreakIterator( pUData, status);
+             if (!U_SUCCESS(status) ) {
+                 status = U_ZERO_ERROR;
+-                icuBI->aBreakIterator = new RuleBasedBreakIterator(udata_open("OpenOffice", "brk", rule, &status), status);
++                pUData = udata_open("OpenOffice", "brk", rule, &status);
++                if( U_SUCCESS(status) )
++                    icuBI->aBreakIterator = new RuleBasedBreakIterator( pUData, status);
+                 if (!U_SUCCESS(status) ) icuBI->aBreakIterator=NULL;
+             }
+         }
+@@ -151,7 +158,10 @@
+ 
+     if (newBreak || !icuBI->aText.equals(rText)) {
+         icuBI->aText = rText;
+-        icuBI->aBreakIterator->setText(UnicodeString(icuBI->aText.getStr(), icuBI->aText.getLength()));
++	//ICU doesn't copy or reference such a UnicodeString, only a pointer to it, so it must exist
++	//for the duration of the usage
++        icuBI->aICUText = UnicodeString(icuBI->aText.getStr(), icuBI->aText.getLength());
++        icuBI->aBreakIterator->setText(icuBI->aICUText);
+     }
+ }
+ 
+Index: source/breakiterator/makefile.mk
+===================================================================
+RCS file: /cvs/l10n/i18npool/source/breakiterator/makefile.mk,v
+retrieving revision 1.9
+diff -u -r1.9 makefile.mk
+--- openoffice.org.orig/i18npool/source/breakiterator/makefile.mk	1 Nov 2005 14:52:19 -0000	1.9
++++ openoffice.org/i18npool/source/breakiterator/makefile.mk	8 Aug 2006 11:31:48 -0000
+@@ -49,11 +49,11 @@
+ MY_BRK_TXTFILES:=$(shell ls data/*.txt)
+ 
+ # insert "OpenOffice" as icu package name in front of the  name of each rule file for searching on application provided data
+-MY_BRK_BRKFILES:=$(subst,data/,$(MISC)$/OpenOffice_ $(MY_BRK_TXTFILES:s/.txt/.brk/))
++MY_BRK_BRKFILES:=$(subst,data/,$(MISC)$/ $(MY_BRK_TXTFILES:s/.txt/.brk/))
+ 
+-# OpenOffice_icu_dat.c is a generated file from the rule file list by gencmn
++# OpenOffice_dat.c is a generated file from the rule file list by gencmn
+ MY_MISC_CXXFILES := \
+-        $(MISC)$/OpenOffice_icu_dat.c \
++        $(MISC)$/OpenOffice_dat.c \
+         $(MY_BRK_BRKFILES:s/.brk/_brk.c/)
+ 
+ SLOFILES=   \
+@@ -80,13 +80,9 @@
+ # The output of gencmn generates warnings under Windows. We want to minimize the patches to external tools,
+ # so the output (OpenOffice_icu_dat.c) is changed here to include a pragma to disable the warnings.
+ # Output of gencmn is redirected to OpenOffice_icu_tmp.c with the -t switch.
+-$(MISC)$/OpenOffice_icu_dat.c :  $(MY_BRK_BRKFILES)
+-    +$(WRAPCMD) $(SOLARBINDIR)$/gencmn -e OpenOffice_icu -n OpenOffice_icu -t tmp -S -d $(MISC) O $(mktmp $(MY_BRK_BRKFILES:t"\n"))
+-    echo $(USQ)#ifdef _MSC_VER$(USQ) > $@
+-    echo $(USQ)#pragma warning( disable : 4229 4668 )$(USQ) >> $@
+-    echo $(USQ)#endif$(USQ) >> $@
+-    +$(TYPE) $(@:s/_dat/_tmp/) >> $@
+-$(MISC)$/OpenOffice_%.brk : data/%.txt
+-    +$(WRAPCMD) $(SOLARBINDIR)$/genbrk -r $< -o $(MISC)$/OpenOffice_$*.brk
++$(MISC)$/OpenOffice_dat.c :  $(MY_BRK_BRKFILES) makefile.mk
++    +$(WRAPCMD) gencmn -n OpenOffice -S -d $(MISC) O $(mktmp $(subst,$(MISC)$/, $(MY_BRK_BRKFILES:t"\n")))
++$(MISC)$/%.brk : data/%.txt
++    +$(WRAPCMD) genbrk -r $< -o $(MISC)$/$*.brk
+ $(MISC)$/%_brk.c : $(MISC)$/%.brk
+-    +$(WRAPCMD) $(SOLARBINDIR)$/genccode -d $(MISC)$ $(MISC)$/$*.brk
++    +$(WRAPCMD) genccode -n OpenOffice -d $(MISC)$ $(MISC)$/$*.brk
+Index: source/collator/collator_unicode.cxx
+===================================================================
+RCS file: /cvs/l10n/i18npool/source/collator/collator_unicode.cxx,v
+retrieving revision 1.12
+diff -u -r1.12 collator_unicode.cxx
+--- openoffice.org.orig/i18npool/source/collator/collator_unicode.cxx	20 Apr 2006 13:41:49 -0000	1.12
++++ openoffice.org/i18npool/source/collator/collator_unicode.cxx	8 Aug 2006 11:31:49 -0000
+@@ -73,8 +73,21 @@
+ 	throw(RuntimeException)
+ {
+ 	if (!collator) {
++        /** ICU collators are loaded using a locale only.
++            ICU uses Variant as collation algorithm name (like de__PHONEBOOK
++            locale), note the empty territory (Country) designator in this special
++            case here. The icu::Locale contructor changes the algorithm name to
++            uppercase itself, so we don't have to bother with that.
++        */
++        icu::Locale icuLocale(
++               OUStringToOString(rLocale.Language, RTL_TEXTENCODING_ASCII_US).getStr(),
++               OUStringToOString(rLocale.Country, RTL_TEXTENCODING_ASCII_US).getStr(),
++               OUStringToOString(rAlgorithm, RTL_TEXTENCODING_ASCII_US).getStr());
+         // load ICU collator
+         UErrorCode status = U_ZERO_ERROR;
++        collator = (RuleBasedCollator*) icu::Collator::createInstance(icuLocale, status);
++        if (! U_SUCCESS(status))
++            throw RuntimeException();
+         if (OUString::createFromAscii(LOCAL_RULE_LANGS).indexOf(rLocale.Language) >= 0) {
+             OUStringBuffer aBuf;
+ #ifdef SAL_DLLPREFIX
+@@ -108,29 +121,12 @@
+                 }
+                 if (func) {
+                     const sal_uInt8* ruleImage=func();
+-                    collator = new RuleBasedCollator(reinterpret_cast<const uint8_t*>(ruleImage), status);
++                    collator = new RuleBasedCollator(reinterpret_cast<const uint8_t*>(ruleImage), -1, collator, status);
+                     if (! U_SUCCESS(status))
+                         throw RuntimeException();
+                 }
+                 osl_unloadModule(hModule);
+             }
+-        }
+-        if (!collator) {
+-           // load ICU collator
+-            /** ICU collators are loaded using a locale only.
+-                ICU uses Variant as collation algorithm name (like de__PHONEBOOK
+-                locale), note the empty territory (Country) designator in this special
+-                case here. The icu::Locale contructor changes the algorithm name to
+-                uppercase itself, so we don't have to bother with that.
+-            */
+-           icu::Locale icuLocale(
+-                   OUStringToOString(rLocale.Language, RTL_TEXTENCODING_ASCII_US).getStr(),
+-                   OUStringToOString(rLocale.Country, RTL_TEXTENCODING_ASCII_US).getStr(),
+-                   OUStringToOString(rAlgorithm, RTL_TEXTENCODING_ASCII_US).getStr());
+-
+-            collator = (RuleBasedCollator*) icu::Collator::createInstance(icuLocale, status);
+-            if (! U_SUCCESS(status))
+-                throw RuntimeException();
+         }
+     }
+ 
+Index: source/collator/gencoll_rule.cxx
+===================================================================
+RCS file: /cvs/l10n/i18npool/source/collator/gencoll_rule.cxx,v
+retrieving revision 1.7
+diff -u -r1.7 gencoll_rule.cxx
+--- openoffice.org.orig/i18npool/source/collator/gencoll_rule.cxx	31 Jan 2006 18:36:13 -0000	1.7
++++ openoffice.org/i18npool/source/collator/gencoll_rule.cxx	8 Aug 2006 11:31:49 -0000
+@@ -81,9 +81,6 @@
+ 
+ }
+ 
+-U_CAPI uint8_t* U_EXPORT2
+-ucol_cloneRuleData(const UCollator *coll, int32_t *length, UErrorCode *status);
+-
+ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
+ {
+ 	FILE *fp;
+@@ -125,7 +122,6 @@
+     if (U_SUCCESS(status)) {
+ 
+         int32_t len = 0;
+-        //uint8_t *data = ucol_cloneRuleData(coll, &len, &status);
+         uint8_t *data = coll->cloneRuleData(len, status);
+ 
+         if (U_SUCCESS(status) && data != NULL)


--- openoffice.org-1.9.128.ooo54479.systemicu.patch DELETED ---




More information about the fedora-cvs-commits mailing list