Hello community, here is the log from the commit of package libreoffice for openSUSE:Factory checked in at 2012-06-01 22:31:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libreoffice (Old) and /work/SRC/openSUSE:Factory/.libreoffice.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libreoffice", Maintainer is "pmla...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libreoffice/libreoffice-branding-upstream.changes 2012-05-08 06:46:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-branding-upstream.changes 2012-06-01 22:32:07.000000000 +0200 @@ -1,0 +2,5 @@ +Thu May 17 19:06:15 UTC 2012 - pmla...@suse.com + +- updated to libreoffice-3.5.4.3 (SUSE 3.5 beta1, based on upstream 3.5.4-rc1) + +------------------------------------------------------------------- libreoffice-help-en-US.changes: same change libreoffice-help-group1.changes: same change libreoffice-help-group2.changes: same change libreoffice-help-group3.changes: same change libreoffice-help-group4.changes: same change libreoffice-help-group5.changes: same change libreoffice-icon-themes.changes: same change libreoffice-l10n.changes: same change --- /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes 2012-05-08 06:46:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice.changes 2012-06-01 22:32:14.000000000 +0200 @@ -1,0 +2,61 @@ +Thu May 24 15:46:45 UTC 2012 - pmla...@suse.com + +- recommends librsvg; it allows to insert SVG pictures; it is dlopened, so there + is not a direct dependency + +------------------------------------------------------------------- +Thu May 17 19:06:15 UTC 2012 - pmla...@suse.com + +- updated to libreoffice-3.5.4.3 (SUSE 3.5 beta1, based on upstream 3.5.4-rc1): + * version 3.5.4.3, tag suse-3.5.4.3 (SUSE LO 3.5-beta1) + * add back mono support + * text over images (bnc#759212) + * add inch as source unit (fdo#48969) + * forward moving of a table (bnc#706138) + * macro syntax error in Calc (bnc#745930) + * fix HTML table border export (fdo#47670) + * import HTML CSS STYLE border (fdo#41796) + * find toolbar X error handling (fdo#46687) + * more robust NSS initialization (fdo#45171) + * recognize VBA macro in JAPANESE (fdo#49324) + * count mirrored monitors as one (rhbz#809019) + * removed unwanted/bad cast fixes (bnc#759178) + * parsing of arc paths in SVG import (fdo#48070) + * outline numbering only for headings (bnc#751028) + * string result of formula is also valid (fdo#49052) + * incorrect square gradients in slideshow (fdo#49508) + * bad import positions of shapes & controls (fdo#49430) + * finish handling of w:pStyle in numbering (bnc#751028) + * full page lines are wrapping in .doc file (bnc#757651) + * ignore corrupted items in recent documents (fdo#46074) + * correctly map monitor index back to screen (fdo#49365) + * enable caching of grammar checker properties (fdo#35270) + * use BorderLine2 instead of older BorderLine (bnc#758914) + * properly draw separators in vertical toolbars (fdo#39106) + * check if a missing font is a known symbol font (fdo#34814) + * crash on "connect to existing database" wizard (fdo#45580) + * performance problems with very long paragraphs (fdo#49208) + * allow keyword Append to be used as a variable (bnc#745930) + * numbering properties with paragraph properties (bnc#751028) + * import XSL with HTML as such, not CSV (fdo#49639, fdo#40021) + * dropdown list in Letter Wizard are now ordered alphabetically + * default to Office 2007/2010 filter for OOXML export (fdo#48941) + * type for property UNO_NAME_SAVE_FILTER_DATA is wrong (fdo#45592) + * textboxes import with OLE objects inside (bnc#747471, bnc#693238) + * properties that aren't valid for paragraphs (part of (bnc#751028) + * comparing empty document with attached one crashes LO (fdo#43424) + * ignore corrupted items in recent documents (fdo#49948, fdo#46074) + * default printer settings only when explicitly mentioned (bnc#758575) + * changing spelling preferences requires application restart (fdo#39999) + * add VBA support for BackColor, AutoSize, Locked attributes (bnc#749960) + * border painting (fdo#45562, fdo#47717, fdo#42750, fdo#45562, fdo#48647, + fdo#44010, fdo#38215) + * lots RTF import/export fixes (fdo#49692, fdo#38176, fdo#48023, fdo#48876, + fdo#47764, fdo#48193, fdo#48037, fdo#48356, fdo#49692, fdo#49501, + fdo#39053) +- jvmfwk-disable-gcj.diff: do not detect GCJ; LO newer worked well + with it +- implement-unicode-6.1-hebrew-line.diff: icu49 adds some extra Hebrew + rules (fdo#49849) + +------------------------------------------------------------------- Old: ---- libreoffice-binfilter-3.5.3.2.tar.bz2 libreoffice-core-3.5.3.2.tar.bz2 libreoffice-help-3.5.3.2.tar.bz2 libreoffice-translations-3.5.3.2.tar.bz2 New: ---- implement-unicode-6.1-hebrew-line.diff jvmfwk-disable-gcj.diff libreoffice-binfilter-3.5.4.3.tar.bz2 libreoffice-core-3.5.4.3.tar.bz2 libreoffice-help-3.5.4.3.tar.bz2 libreoffice-translations-3.5.4.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-branding-upstream.spec ++++++ --- /var/tmp/diff_new_pack.4pl8hd/_old 2012-06-01 22:32:28.000000000 +0200 +++ /var/tmp/diff_new_pack.4pl8hd/_new 2012-06-01 22:32:28.000000000 +0200 @@ -17,10 +17,10 @@ Name: libreoffice-branding-upstream -Version: 3.5.3.2 +Version: 3.5.4.3 Release: 0 -%define lo_build_version 3.5.3.2 -%define lo_piece_version 3.5.3.2 +%define lo_build_version 3.5.4.3 +%define lo_piece_version 3.5.4.3 %define lo_sourcedirname libreoffice-build-%lo_piece_version %define lo_home libreoffice Summary: Original Branding for LibreOffice ++++++ libreoffice-help-en-US.spec ++++++ --- /var/tmp/diff_new_pack.4pl8hd/_old 2012-06-01 22:32:28.000000000 +0200 +++ /var/tmp/diff_new_pack.4pl8hd/_new 2012-06-01 22:32:28.000000000 +0200 @@ -22,7 +22,7 @@ ## Generated by: ## perl lo-help-gen-spec libreoffice-help-en-US.spec.in lo-help-en-US ################################################################### -Version: 3.5.3.2 +Version: 3.5.4.3 Release: 0 %define gnu_make_version 3.82 %define gnu_make_snapshot 20120301 ++++++ libreoffice-help-group1.spec ++++++ --- /var/tmp/diff_new_pack.4pl8hd/_old 2012-06-01 22:32:28.000000000 +0200 +++ /var/tmp/diff_new_pack.4pl8hd/_new 2012-06-01 22:32:28.000000000 +0200 @@ -22,7 +22,7 @@ ## Generated by: ## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX ################################################################### -Version: 3.5.3.2 +Version: 3.5.4.3 Release: 0 %define gnu_make_version 3.82 %define gnu_make_snapshot 20120301 libreoffice-help-group2.spec: same change libreoffice-help-group3.spec: same change libreoffice-help-group4.spec: same change libreoffice-help-group5.spec: same change ++++++ libreoffice-icon-themes.spec ++++++ --- /var/tmp/diff_new_pack.4pl8hd/_old 2012-06-01 22:32:28.000000000 +0200 +++ /var/tmp/diff_new_pack.4pl8hd/_new 2012-06-01 22:32:28.000000000 +0200 @@ -17,7 +17,7 @@ Name: libreoffice-icon-themes -Version: 3.5.3.2 +Version: 3.5.4.3 Release: 0 %define ooo_home libreoffice BuildRequires: libreoffice-icon-themes-prebuilt = %version ++++++ libreoffice-l10n.spec ++++++ --- /var/tmp/diff_new_pack.4pl8hd/_old 2012-06-01 22:32:28.000000000 +0200 +++ /var/tmp/diff_new_pack.4pl8hd/_new 2012-06-01 22:32:28.000000000 +0200 @@ -22,7 +22,7 @@ ## perl lo-l10n-gen-spec libreoffice-l10n.spec.in lo-l10n-data ################################################################### Name: libreoffice-l10n -Version: 3.5.3.2 +Version: 3.5.4.3 Release: 0 %define piece l10n %define ooo_home libreoffice ++++++ libreoffice.spec ++++++ --- /var/tmp/diff_new_pack.4pl8hd/_old 2012-06-01 22:32:28.000000000 +0200 +++ /var/tmp/diff_new_pack.4pl8hd/_new 2012-06-01 22:32:28.000000000 +0200 @@ -213,11 +213,13 @@ # the manifest file must be in the right place; registration does not work with some repacked jars %define __jar_repack %{nil} %endif -Version: 3.5.3.2 +Version: 3.5.4.3 Release: 0 Requires: libreoffice-branding < 4 Requires: libreoffice-branding > 3.2.99.3 Requires: libreoffice-icon-themes = %version +# librsvg allows to insert SVG pictures; it is dlopened, so there is not a direct dependency +Recommends: librsvg # we need a JRE for oobase and the other stuff %if 0%{?suse_version} # gij is enough on SL 10.1 and higher @@ -604,6 +606,8 @@ # FIXME: the right fix is to compile the help and produce the .db_, .ht_, and other files Patch11: nlpsolver-no-broken-help.diff Patch12: mediawiki-no-broken-help.diff +# LO newer worked well with it +Patch13: jvmfwk-disable-gcj.diff # generate selected bytecode version also in gbuild # FIXME: push upstream and be ready to fix problem on other systems Patch14: solenv-java-source-version.diff @@ -624,6 +628,9 @@ Patch910: libreoffice-poppler-0.17.0-reject-fix.diff # crazy hack to avoid /usr/lib64 in RPATH and pass brp-rpath check (bnc#717262) Patch920: redland-rpath-hack.diff +# icu49 adds some extra Hebrew rules (fdo#49849) +# FIXME: this patch works only with icu-49; LO-3.6 will include hack to make it working with both +Patch930: implement-unicode-6.1-hebrew-line.diff # # Patches against zip-3.0 Patch2000: zip-3.0-iso8859_2.patch @@ -1320,6 +1327,7 @@ %patch10 %patch11 %patch12 +%patch13 -p1 %patch14 %patch15 %patch21 @@ -1339,6 +1347,11 @@ # crazy hack to avoid /usr/lib64 in RPATH and pass brp-rpath check (bnc#717262) %patch920 %endif +# +%if %suse_version > 1210 +# Get working Hebrew rules with icu49 +%patch930 -p1 +%endif # other sources bin/unpack-sources `pwd` %{S:1} %{S:2} %{S:3} # 256x256 icons @@ -2166,7 +2179,6 @@ %files -f file-lists/mono_list.txt mono %defattr(-,root,root) -%doc README-mono.txt %endif %files -f file-lists/pyuno_list.txt pyuno ++++++ desktop-submenu.diff ++++++ --- /var/tmp/diff_new_pack.4pl8hd/_old 2012-06-01 22:32:28.000000000 +0200 +++ /var/tmp/diff_new_pack.4pl8hd/_new 2012-06-01 22:32:28.000000000 +0200 @@ -1,5 +1,7 @@ ---- sysui/desktop/menus/math.desktop.old 2012-02-24 16:34:51.000000000 +0100 -+++ sysui/desktop/menus/math.desktop 2012-03-01 16:35:23.000000000 +0100 +Index: sysui/desktop/menus/math.desktop +=================================================================== +--- sysui/desktop/menus/math.desktop.orig ++++ sysui/desktop/menus/math.desktop @@ -4,7 +4,7 @@ Terminal=false NoDisplay=true Icon=math @@ -7,10 +9,12 @@ -Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Other; +Categories=Office;Math;X-Red-Hat-Base;X-MandrivaLinux-Office-Other; Exec=${UNIXBASISROOTNAME} --math %U - MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math;application/vnd.stardivision.math; + MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math;application/vnd.stardivision.math;application/vnd.oasis.opendocument.formula-template;text/mathml; Name=%PRODUCTNAME Math ---- sysui/desktop/menus/base.desktop.old 2012-02-24 16:34:51.000000000 +0100 -+++ sysui/desktop/menus/base.desktop 2012-03-01 16:35:23.000000000 +0100 +Index: sysui/desktop/menus/base.desktop +=================================================================== +--- sysui/desktop/menus/base.desktop.orig ++++ sysui/desktop/menus/base.desktop @@ -3,7 +3,7 @@ Version=1.0 Terminal=false Icon=base @@ -20,8 +24,10 @@ Exec=${UNIXBASISROOTNAME} --base %U MimeType=application/vnd.oasis.opendocument.database;application/vnd.sun.xml.base; Name=%PRODUCTNAME Base ---- sysui/desktop/menus/calc.desktop.old 2012-02-24 16:34:51.000000000 +0100 -+++ sysui/desktop/menus/calc.desktop 2012-03-01 16:35:23.000000000 +0100 +Index: sysui/desktop/menus/calc.desktop +=================================================================== +--- sysui/desktop/menus/calc.desktop.orig ++++ sysui/desktop/menus/calc.desktop @@ -3,7 +3,7 @@ Version=1.0 Terminal=false Icon=calc @@ -29,10 +35,12 @@ -Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Spreadsheets; +Categories=Office;Spreadsheet;X-Red-Hat-Base;X-MandrivaLinux-Office-Spreadsheets; Exec=${UNIXBASISROOTNAME} --calc %U - MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-flat-xml;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/vnd.stardivision.calc;application/vnd.stardivision.chart;application/msexcel;application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12;text/csv;application/x-dbf;text/spreadsheet; + MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-flat-xml;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/vnd.stardivision.calc;application/vnd.stardivision.chart;application/msexcel;application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12;text/csv;application/x-dbf;application/csv;application/excel;application/tab-separated-values;application/vnd.lotus-1-2-3;application/vnd.oasis.opendocument.chart;application/vnd.oasis.opendocument.chart-template;application/x-dbase;application/x-dos_ms_excel;application/x-excel;application/x-msexcel;application/x-ms-excel;application/x-quattropro;application/x-123;text/comma-separated-values;text/spreadsheet;text/tab-separated-values;text/x-comma-separated-values;text/x-csv; Name=%PRODUCTNAME Calc ---- sysui/desktop/menus/draw.desktop.old 2012-02-24 16:34:51.000000000 +0100 -+++ sysui/desktop/menus/draw.desktop 2012-03-01 16:35:23.000000000 +0100 +Index: sysui/desktop/menus/draw.desktop +=================================================================== +--- sysui/desktop/menus/draw.desktop.orig ++++ sysui/desktop/menus/draw.desktop @@ -3,7 +3,7 @@ Version=1.0 Terminal=false Icon=draw @@ -40,10 +48,12 @@ -Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Drawing; +Categories=Office;FlowChart;VectorGraphics;X-Red-Hat-Base;X-MandrivaLinux-Office-Drawing; Exec=${UNIXBASISROOTNAME} --draw %U - MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-flat-xml;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.stardivision.draw; + MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-flat-xml;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.stardivision.draw;application/x-wpg; Name=%PRODUCTNAME Draw ---- sysui/desktop/menus/impress.desktop.old 2012-02-24 16:34:51.000000000 +0100 -+++ sysui/desktop/menus/impress.desktop 2012-03-01 16:35:23.000000000 +0100 +Index: sysui/desktop/menus/impress.desktop +=================================================================== +--- sysui/desktop/menus/impress.desktop.orig ++++ sysui/desktop/menus/impress.desktop @@ -3,7 +3,7 @@ Version=1.0 Terminal=false Icon=impress @@ -51,10 +61,12 @@ -Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Presentations; +Categories=Office;Presentation;X-Red-Hat-Base;X-MandrivaLinux-Office-Presentations; Exec=${UNIXBASISROOTNAME} --impress %U - MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-flat-xml;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/vnd.stardivision.impress;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroenabled.12; + MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-flat-xml;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/vnd.stardivision.impress;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroenabled.12;application/vnd.ms-powerpoint.slideshow.macroEnabled.12;application/vnd.openxmlformats-officedocument.presentationml.slideshow; Name=%PRODUCTNAME Impress ---- sysui/desktop/menus/writer.desktop.old 2012-02-24 16:34:51.000000000 +0100 -+++ sysui/desktop/menus/writer.desktop 2012-03-01 16:35:23.000000000 +0100 +Index: sysui/desktop/menus/writer.desktop +=================================================================== +--- sysui/desktop/menus/writer.desktop.orig ++++ sysui/desktop/menus/writer.desktop @@ -3,7 +3,7 @@ Version=1.0 Terminal=false Icon=writer @@ -62,5 +74,5 @@ -Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Wordprocessors; +Categories=Office;WordProcessor;X-Red-Hat-Base;X-MandrivaLinux-Office-Wordprocessors; Exec=${UNIXBASISROOTNAME} --writer %U - MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-flat-xml;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/vnd.stardivision.writer;application/msword;application/vnd.ms-word;application/x-doc;application/x-hwp;application/rtf;text/rtf;application/vnd.wordperfect;application/wordperfect;application/vnd.lotus-wordpro;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12; + MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-flat-xml;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/vnd.stardivision.writer;application/msword;application/vnd.ms-word;application/x-doc;application/x-hwp;application/rtf;text/rtf;application/vnd.wordperfect;application/wordperfect;application/vnd.lotus-wordpro;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;application/vnd.ms-works;application/vnd.stardivision.writer-global;application/x-extension-txt;application/x-t602;text/plain; Name=%PRODUCTNAME Writer ++++++ distro-install-file-lists-3.5.diff ++++++ --- /var/tmp/diff_new_pack.4pl8hd/_old 2012-06-01 22:32:28.000000000 +0200 +++ /var/tmp/diff_new_pack.4pl8hd/_new 2012-06-01 22:32:28.000000000 +0200 @@ -1,5 +1,7 @@ ---- bin/distro-install-file-lists.old 2012-03-21 18:45:58.000000000 +0100 -+++ bin/distro-install-file-lists 2012-03-22 10:37:48.000000000 +0100 +Index: bin/distro-install-file-lists +=================================================================== +--- bin/distro-install-file-lists.orig ++++ bin/distro-install-file-lists @@ -74,7 +74,6 @@ if test "z$OOO_VENDOR" != "zDebian" ; th rm -f common_list.txt @@ -34,17 +36,25 @@ if test "$SPLIT_OPT_FEATURES" = "YES" ; then if test "z$OOO_VENDOR" = "zMandriva" ; then merge_flists gid_Module_Optional_Binfilter $FILELISTSDIR/filter-binfilter_list.txt -@@ -235,6 +246,9 @@ if test "z$OOO_VENDOR" != "zDebian" ; th - add_used_directories mono_list.txt common_list.txt - # add the files from GAC if it was installed - test -f mono_gac && cat mono_gac >>mono_list.txt -+ +@@ -203,6 +214,9 @@ if test "z$OOO_VENDOR" != "zDebian" ; th + + cd $FILELISTSDIR + + # postgresql subpackage + test -f $DESTDIR/gid_Module_Optional_PostgresqlSdbc && cp $DESTDIR/gid_Module_Optional_PostgresqlSdbc postgresql_list.txt || : ++ + # kde subpackage + test -f $DESTDIR/gid_Module_Optional_Kde && cp $DESTDIR/gid_Module_Optional_Kde kde_list.txt || : + mv_file_between_flists kde_list.txt common_list.txt $INSTALLDIR/program/kdefilepicker +@@ -237,6 +251,7 @@ if test "z$OOO_VENDOR" != "zDebian" ; th + # add the files from GAC if it was installed + test -f $SRC_ROOT/mono_extra_list.txt && cat $SRC_ROOT/mono_extra_list.txt >>mono_list.txt ++ # mailmerge if test "$SPLIT_OPT_FEATURES" = "YES" ; then -@@ -247,8 +261,9 @@ if test "z$OOO_VENDOR" != "zDebian" ; th + if test "z$OOO_VENDOR" = "zMandriva" ; then +@@ -248,8 +263,9 @@ if test "z$OOO_VENDOR" != "zDebian" ; th add_used_directories $flist common_list.txt fi @@ -55,7 +65,7 @@ mv_file_between_flists officebean_list.txt common_list.txt $INSTALLDIR/program/classes/officebean.jar mv_file_between_flists officebean_list.txt common_list.txt $INSTALLDIR/program/libofficebean.so add_used_directories officebean_list.txt common_list.txt -@@ -267,17 +282,6 @@ if test "z$OOO_VENDOR" != "zDebian" ; th +@@ -268,17 +284,6 @@ if test "z$OOO_VENDOR" != "zDebian" ; th add_used_directories sdk_doc_list.txt sdk_list.txt fi ++++++ implement-unicode-6.1-hebrew-line.diff ++++++ From 20c24114143d6d38774b56a142fd4ae05094308e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caol...@redhat.com> Date: Sun, 13 May 2012 22:41:30 +0100 Subject: [PATCH] Resolves: fdo#49849 implement Unicode 6.1 hebrew line breaking rules i.e. sync with svn diff -c 31071 http://source.icu-project.org/repos/icu/icu/trunk/source/data/brkitr/line.txt Change-Id: I I I41b3d02f1a0da3b83a9684f29d466660d96254c6 --- i18npool/qa/cppunit/test_breakiterator.cxx | 89 +++++++++++++++++--------- i18npool/source/breakiterator/data/README | 12 ++++ i18npool/source/breakiterator/data/line.txt | 57 +++++++++++------- 3 files changed, 105 insertions(+), 53 deletions(-) create mode 100644 i18npool/source/breakiterator/data/README Index: libreoffice-core-3.5.4.3/i18npool/qa/cppunit/test_breakiterator.cxx =================================================================== --- libreoffice-core-3.5.4.3.orig/i18npool/qa/cppunit/test_breakiterator.cxx +++ libreoffice-core-3.5.4.3/i18npool/qa/cppunit/test_breakiterator.cxx @@ -45,6 +45,7 @@ #include <com/sun/star/i18n/WordType.hpp> #include <rtl/strbuf.hxx> +#include <rtl/ustrbuf.hxx> #include <string.h> @@ -64,6 +65,9 @@ public: void testWeak(); void testAsian(); void testThai(); +#if TODO + void testNorthernThai(); +#endif CPPUNIT_TEST_SUITE(TestBreakIterator); CPPUNIT_TEST(testLineBreaking); @@ -260,28 +264,30 @@ void TestBreakIterator::testThai() aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("th")); aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TH")); - i18n::Boundary aBounds; - { - const sal_Unicode THAI1[] = { 0x0E01, 0x0E38, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A }; - ::rtl::OUString aTest(THAI1, SAL_N_ELEMENTS(THAI1)); - aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale, - i18n::WordType::DICTIONARY_WORD, true); - CPPUNIT_ASSERT_MESSAGE("Should skip full word", - aBounds.startPos == 0 && aBounds.endPos == aTest.getLength()); - } - -#ifdef TODO - { - const sal_Unicode NORTHERN_THAI1[] = { 0x0E01, 0x0E38, 0x0E4A, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A }; - ::rtl::OUString aTest(NORTHERN_THAI1, SAL_N_ELEMENTS(NORTHERN_THAI1)); - aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale, - i18n::WordType::DICTIONARY_WORD, true); - CPPUNIT_ASSERT_MESSAGE("Should skip full word", - aBounds.startPos == 0 && aBounds.endPos == aTest.getLength()); - } -#endif + const sal_Unicode THAI1[] = { 0x0E01, 0x0E38, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A }; + ::rtl::OUString aTest(THAI1, SAL_N_ELEMENTS(THAI1)); + i18n::Boundary aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale, + i18n::WordType::DICTIONARY_WORD, true); + CPPUNIT_ASSERT_MESSAGE("Should skip full word", + aBounds.startPos == 0 && aBounds.endPos == aTest.getLength()); } +#if TODO +void TestBreakIterator::testNorthernThai() +{ + lang::Locale aLocale; + aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nod")); + aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TH")); + + const sal_Unicode NORTHERN_THAI1[] = { 0x0E01, 0x0E38, 0x0E4A, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A }; + ::rtl::OUString aTest(NORTHERN_THAI1, SAL_N_ELEMENTS(NORTHERN_THAI1)); + i18n::Boundary aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale, + i18n::WordType::DICTIONARY_WORD, true); + CPPUNIT_ASSERT_MESSAGE("Should skip full word", + aBounds.startPos == 0 && aBounds.endPos == aTest.getLength()); +} +#endif + TestBreakIterator::TestBreakIterator() { m_xContext = cppu::defaultBootstrap_InitialComponentContext(); Index: libreoffice-core-3.5.4.3/i18npool/source/breakiterator/data/README =================================================================== --- /dev/null +++ libreoffice-core-3.5.4.3/i18npool/source/breakiterator/data/README @@ -0,0 +1,12 @@ +The originals of these come from svn checkout +http://source.icu-project.org/repos/icu/icu/trunk/source/data/brkitr they no +longer appear in the icu tarballs, but are in icu's svn + +At various stages these copies have been customized and are not horribly out of +sync. It unclear which diffs from the base versions are deliberate and which +are now accidental :-( + +We need to review the various issues referenced in the commits that caused +custimizations and see if they're still relevant or not, write regression tests +for them, if any are still relavant then apply the changes back on top of the +latest versions. Index: libreoffice-core-3.5.4.3/i18npool/source/breakiterator/data/line.txt =================================================================== --- libreoffice-core-3.5.4.3.orig/i18npool/source/breakiterator/data/line.txt +++ libreoffice-core-3.5.4.3/i18npool/source/breakiterator/data/line.txt @@ -61,11 +61,13 @@ $BB = [:LineBreak = Break_Before:]; $BK = [:LineBreak = Mandatory_Break:]; $B2 = [:LineBreak = Break_Both:]; $CB = [:LineBreak = Contingent_Break:]; +$CJ = [:LineBreak = Conditional_Japanese_Starter:]; $CL = [:LineBreak = Close_Punctuation:] ; $CM = [:LineBreak = Combining_Mark:]; $CR = [:LineBreak = Carriage_Return:]; $EX = [:LineBreak = Exclamation:]; $GL = [:LineBreak = Glue:]; +$HL = [:LineBreak = Hebrew_Letter:]; $HY = [:LineBreak = Hyphen:]; $H2 = [:LineBreak = H2:]; $H3 = [:LineBreak = H3:]; @@ -77,7 +79,7 @@ $JV = [:LineBreak = JV:]; $JT = [:LineBreak = JT:]; $LF = [:LineBreak = Line_Feed:]; $NL = [:LineBreak = Next_Line:]; -$NS = [:LineBreak = Nonstarter:]; +$NS = [[:LineBreak = Nonstarter:] $CJ]; $NU = [:LineBreak = Numeric:]; $OP = [[:LineBreak = Open_Punctuation:] - $DG]; $PO = [:LineBreak = Postfix_Numeric:]; @@ -118,6 +120,7 @@ $B2cm = $B2 $CM*; $CLcm = $CL $CM*; $EXcm = $EX $CM*; $GLcm = $GL $CM*; +$HLcm = $HL $CM*; $HYcm = $HY $CM*; $H2cm = $H2 $CM*; $H3cm = $H3 $CM*; @@ -150,6 +153,7 @@ $B2 $CM+; $CL $CM+; $EX $CM+; $GL $CM+; +$HL $CM+; $HY $CM+; $H2 $CM+; $H3 $CM+; @@ -186,7 +190,7 @@ $CANT_CM = [ $SP $BK $CR $LF $NL $ZW $CM # so for this one case we need to manually list out longer sequences. # $AL_FOLLOW_NOCM = [$BK $CR $LF $NL $ZW $SP]; -$AL_FOLLOW_CM = [$CL $EX $IS $SY $WJ $GL $QU $BA $HY $NS $IN $NU $ALPlus $OP]; +$AL_FOLLOW_CM = [$CL $EX $HL $IS $SY $WJ $GL $QU $BA $HY $NS $IN $NU $ALPlus $OP]; $AL_FOLLOW = [$AL_FOLLOW_NOCM $AL_FOLLOW_CM]; @@ -320,8 +324,13 @@ $LB20NonBreaks $CM* ($BAcm | $HYcm | $NS $BBcm [^$CB]; # $BB x $BBcm $LB20NonBreaks $CM*; +# LB 21a Don't break after Hebrew + Hyphen +# HL (HY | BA) x +# +$HLcm ($HYcm | $BAcm) [^$CB]?; + # LB 22 -$ALcm $INcm; +($ALcm | $HLcm) $INcm; $CM+ $INcm; # by rule 10, any otherwise unattached CM behaves as AL $IDcm $INcm; $INcm $INcm; @@ -331,16 +340,18 @@ $NUcm $INcm; # $LB 23 $IDcm $POcm; $ALcm $NUcm; # includes $LB19 +$HLcm $NUcm; $CM+ $NUcm; # Rule 10, any otherwise unattached CM behaves as AL $NUcm $ALcm; +$NUcm $HLcm; # # LB 24 # $PRcm $IDcm; $ALcm $PRcm; -$PRcm $ALcm; -$POcm $ALcm; +$PRcm ($ALcm | $HLcm); +$POcm ($ALcm | $HLcm); # # LB 25 Numbers. @@ -361,8 +372,8 @@ $PRcm ($JLcm | $JVcm | $JTcm | $H2cm | $ # LB 28 Do not break between alphabetics # -$ALcm $ALcm; -$CM+ $ALcm; # The $CM+ is from rule 10, and unattached CM is treated as AL +($ALcm | $HLcm) ($ALcm | $HLcm); +$CM+ ($ALcm | $HLcm); # The $CM+ is from rule 10, an unattached CM is treated as AL # LB 29 $IScm ($ALcm | $NUcm); @@ -371,11 +382,9 @@ $IScm ($ALcm | $NUcm); # Rule 30 Do not break between letters, numbers or ordinary symbols # and opening or closing punctuation # -($ALcm | $NUcm) $OPcm; +($ALcm | $HLcm | $NUcm) $OPcm; $CM+ $OPcm; -$CLcm ($ALcm | $NUcm); - - +$CLcm ($ALcm | $HLcm | $NUcm); # # Reverse Rules. @@ -391,6 +400,7 @@ $CM+ $B2; $CM+ $CL; $CM+ $EX; $CM+ $GL; +$CM+ $HL; $CM+ $HY; $CM+ $H2; $CM+ $H3; @@ -544,24 +554,25 @@ $CM* ($BA | $HY | $NS) $CM* [$LB20NonBre $CM* [$LB20NonBreaks-$CM] $CM* $BB; # BB x . [^$CB] $CM* $BB; # - +# LB21a +[^$CB] $CM* ($HY | $BA) $CM* $HL; # LB 22 -$CM* $IN $CM* $ALPlus; +$CM* $IN $CM* ($ALPlus | $HL); $CM* $IN $CM* $ID; $CM* $IN $CM* $IN; $CM* $IN $CM* $NU; # LB 23 $CM* $PO $CM* $ID; -$CM* $NU $CM* $ALPlus; -$CM* $ALPlus $CM* $NU; +$CM* $NU $CM* ($ALPlus | $HL); +$CM* ($ALPlus | $HL) $CM* $NU; # LB 24 $CM* $ID $CM* $PR; $CM* $PR $CM* $ALPlus; -$CM* $ALPlus $CM* $PR; -$CM* $ALPlus $CM* $PO; +$CM* ($ALPlus | $HL) $CM* $PR; +$CM* ($ALPlus | $HL) $CM* $PO; $CM* $ALPlus $CM* ($IS | $SY | $HY)+ / $SP; $CM* $NU+ $CM* $HY+ / $SP; @@ -580,15 +591,14 @@ $CM* $PO $CM* ($H3 | $H2 | $JT | $JV | $ $CM* ($H3 | $H2 | $JT | $JV | $JL) $CM* $PR; # LB 28 -$CM* $ALPlus $CM* $ALPlus; - +$CM* ($ALPlus | $HL) $CM* ($ALPlus | $HL); # LB 29 $CM* ($NU | $ALPlus) $CM* $IS+ [^$SP]; # LB 30 -$CM* $OP $CM* ($NU | $ALPlus); -$CM* ($NU | $ALPlus) $CM* ($CL | $SY)+ [^$SP]; +$CM* $OP $CM* ($ALPlus | $HL | $NU); +$CM* ($ALPlus | $HL | $NU) $CM* ($CL | $SY)+ [^$SP]; ## ------------------------------------------------- @@ -609,6 +619,9 @@ $SP+ $CM* $QU; $SP+ $CM* $CL; $SP+ $CM* $B2; +# LB 21 +$CM* ($HY | $BA) $CM* $HL; + # LB 18 ($CM* ($IS | $SY))+ $CM* $NU; $CL $CM* ($NU | $IS | $SY); @@ -629,6 +642,6 @@ $dictionary $dictionary; # turn off rule chaining. We don't want to move more # than necessary. # -[$CM $OP $QU $CL $B2 $PR $HY $SP $dictionary]+ [^$CM $OP $QU $CL $B2 $PR $HY $dictionary]; +[$CM $OP $QU $CL $B2 $PR $HY $BA $SP $dictionary]+ [^$CM $OP $QU $CL $B2 $PR $HY $BA $dictionary]; $dictionary $dictionary; ++++++ jvmfwk-disable-gcj.diff ++++++ From 72c7b66480870e42fbdf5d555986d2f9da3786b1 Mon Sep 17 00:00:00 2001 From: Petr Mladek <pmla...@suse.cz> Date: Fri, 5 Aug 2011 17:34:05 +0200 Subject: [PATCH] jvmfwk-disable-gcj.diff: LO newer worked well with it --- .../OpenOfficeorg/javavendors_linux.xml | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml index 489511f..5262ca4 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml @@ -18,9 +18,6 @@ <vendor name="Blackdown Java-Linux Team"> <minVersion>1.5.0</minVersion> </vendor> - <vendor name="Free Software Foundation, Inc."> - <minVersion>1.5.0</minVersion> - </vendor> <vendor name="BEA Systems, Inc."> <minVersion>1.5.0</minVersion> </vendor> @@ -31,7 +28,6 @@ <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> <library vendor="IBM Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> <library vendor="Blackdown Java-Linux Team">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> - <library vendor="Free Software Foundation, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> <library vendor="BEA Systems, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> </plugins> </javaSelection> -- 1.7.8.3 ++++++ libreoffice-binfilter-3.5.3.2.tar.bz2 -> libreoffice-binfilter-3.5.4.3.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/libreoffice/libreoffice-binfilter-3.5.3.2.tar.bz2 /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-binfilter-3.5.4.3.tar.bz2 differ: char 11, line 1 ++++++ libreoffice-core-3.5.3.2.tar.bz2 -> libreoffice-core-3.5.4.3.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/libreoffice/libreoffice-core-3.5.3.2.tar.bz2 /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-core-3.5.4.3.tar.bz2 differ: char 11, line 1 ++++++ libreoffice-help-3.5.3.2.tar.bz2 -> libreoffice-help-3.5.4.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-help-3.5.3.2/ChangeLog new/libreoffice-help-3.5.4.3/ChangeLog --- old/libreoffice-help-3.5.3.2/ChangeLog 2012-04-24 16:26:54.000000000 +0200 +++ new/libreoffice-help-3.5.4.3/ChangeLog 2012-05-17 19:08:45.000000000 +0200 @@ -1,19 +1,19 @@ -2012-04-24 Petr Mladek <pmla...@suse.cz> [2d66ea8f284bbcb664d664a37b09c957bd0cb635] +2012-05-17 Petr Mladek <pmla...@suse.cz> [16e71e2a700e258c0e04315b12e37cdbc8942d75] -Version 3.5.3.2, tag libreoffice-3.5.3.2 (3.5.3-rc2) +Version 3.5.4.3, tag suse-3.5.4.3 (SUSE LO 3.5-beta1) +Change-Id: I3cea1a73852cd019dab2a2ffa45fc9848f8b03ad -2012-04-18 Petr Mladek <pmla...@suse.cz> [d554af73674fe1bbaced540f416cc141d9ec35e5] +2012-04-25 Petr Mladek <pmla...@suse.cz> [3ae7c41ffbe69b714a197c871d63f537397435f4] -Branch libreoffice-3-5-3 +Branch suse-3.5 -This is 'libreoffice-3-5-3' - the stable branch for the 3.5.3 release. -Only very safe changes, reviewed by three people are allowed. +This is 'suse-3.5' - the stable branch for the SUSE 3.5 release. +It will be used for the official maintenance update for SLED, openSUSE, +and Windows. -If you want to commit more complicated fix for the next 3.5.x release, -please use the 'libreoffice-3-5' branch. - -If you want to build something cool, unstable, and risky, use master. +We want here all safe L3 and other important fixes. +Only safe changes are allowed. 2012-02-14 Stanislav Horacek <stanislav.hora...@gmail.com> [f269e467c4a88d3103224d8941a226e50d504010] ++++++ libreoffice-help-en-US.spec.in ++++++ --- /var/tmp/diff_new_pack.4pl8hd/_old 2012-06-01 22:32:29.000000000 +0200 +++ /var/tmp/diff_new_pack.4pl8hd/_new 2012-06-01 22:32:29.000000000 +0200 @@ -18,7 +18,7 @@ Name: libreoffice-help-en-US @DO_NOT_EDIT_COMMENT@ -Version: 3.5.3.2 +Version: 3.5.4.3 Release: 0 %define gnu_make_version 3.82 %define gnu_make_snapshot 20120301 ++++++ libreoffice-help-groupX.spec.in ++++++ --- /var/tmp/diff_new_pack.4pl8hd/_old 2012-06-01 22:32:29.000000000 +0200 +++ /var/tmp/diff_new_pack.4pl8hd/_new 2012-06-01 22:32:29.000000000 +0200 @@ -18,7 +18,7 @@ Name: libreoffice-help-group@GROUP_NUMBER@ @DO_NOT_EDIT_COMMENT@ -Version: 3.5.3.2 +Version: 3.5.4.3 Release: 0 %define gnu_make_version 3.82 %define gnu_make_snapshot 20120301 ++++++ libreoffice-l10n.spec.in ++++++ --- /var/tmp/diff_new_pack.4pl8hd/_old 2012-06-01 22:32:29.000000000 +0200 +++ /var/tmp/diff_new_pack.4pl8hd/_new 2012-06-01 22:32:29.000000000 +0200 @@ -18,7 +18,7 @@ @DO_NOT_EDIT_COMMENT@ Name: libreoffice-l10n -Version: 3.5.3.2 +Version: 3.5.4.3 Release: 0 %define piece l10n %define ooo_home libreoffice ++++++ libreoffice-poppler-0.17.0-reject-fix.diff ++++++ --- /var/tmp/diff_new_pack.4pl8hd/_old 2012-06-01 22:32:29.000000000 +0200 +++ /var/tmp/diff_new_pack.4pl8hd/_new 2012-06-01 22:32:29.000000000 +0200 @@ -31,6 +31,17 @@ str->reset(); int c; +@@ -398,10 +398,8 @@ int PDFOutDev::parseFont( long long nNew + int nSize = 0; + + GooString* pFamily = gfxFont->getName(); +-#if !POPPLER_CHECK_VERSION(0, 20, 0) + if( ! pFamily ) + pFamily = gfxFont->getOrigName(); +-#endif + if( pFamily ) + { + aNewFont.familyName.clear(); @@ -493,11 +489,7 @@ void PDFOutDev::endPage() printf("endPage\n"); } ++++++ libreoffice-translations-3.5.3.2.tar.bz2 -> libreoffice-translations-3.5.4.3.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/libreoffice/libreoffice-translations-3.5.3.2.tar.bz2 /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-translations-3.5.4.3.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org