------------------------------------------------------------
revno: 2031
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Wed 2010-06-16 22:17:41 +0200
message:
update to ooo-build 3.2.1.4
removed:
patches/backport-ftruncate-check.diff
patches/fix-incorrect-automatic-print-area-assignment.diff
patches/fix-save-performance-with-hidden-rows.diff
patches/hu-translation-fixes.diff
patches/kde4-statusbar-redrawing-border-width.diff
patches/powerpc-fixes.diff
modified:
changelog
patches/fix-nodep-check.diff
patches/fix-smoketest-without-java.diff
patches/installer-globals-max-1-regcomp.diff
patches/series
rules
source/components
=== modified file 'changelog'
--- a/changelog 2010-06-16 20:12:23 +0000
+++ b/changelog 2010-06-16 20:17:41 +0000
@@ -1,11 +1,14 @@
openoffice.org (1:3.2.1-3) UNRELEASED; urgency=low
+ * ooo-build:
+ - update (3.2.1.4)
+
* debian/rules:
- make smoketest install into debian/smoketest/tmp as some buildds
only have a 128m /tmp...
- don't run smoketest on gcj archs when on the buildds
- -- Rene Engelhard <r...@debian.org> Wed, 16 Jun 2010 10:04:26 +0200
+ -- Rene Engelhard <r...@debian.org> Wed, 16 Jun 2010 22:16:01 +0200
openoffice.org (1:3.2.1-2) unstable; urgency=low
=== removed file 'patches/backport-ftruncate-check.diff'
--- a/patches/backport-ftruncate-check.diff 2010-06-03 19:58:55 +0000
+++ b/patches/backport-ftruncate-check.diff 1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-diff --git a/patches/dev300/apply b/patches/dev300/apply
-index 6ba77b8..d9a7e7b 100644
---- openoffice.org-3.2.1/ooo-build-3-2-1-3/patches/dev300/apply
-+++ openoffice.org-3.2.1/ooo-build-3-2-1-3/patches/dev300/apply
-@@ -2843,6 +2843,8 @@ icu-arm.diff, doko
- [ Fixes ]
- svx-sdrobjeditview-update-edit-area.diff, n#305205, n#347355, rodo
- goodies-eps-filter-unix.diff, n#200053, rodo
-+# allow to start OOo on cifs; do not truncate the files there
-+backport-ftruncate-check.diff, i#108106, cmc
-
- [ EMFPlus ]
- SectionOwner => rodo
-diff --git a/patches/dev300/backport-ftruncate-check.diff
b/patches/dev300/backport-ftruncate-check.diff
-new file mode 100644
-index 0000000..ceb2d5c
---- /dev/null
-+++
openoffice.org-3.2.1/ooo-build-3-2-1-3/patches/dev300/backport-ftruncate-check.diff
-@@ -0,0 +1,27 @@
-+diff -r 28ba3ecf6c22 -r db44de918518
bridges/source/cpp_uno/shared/vtablefactory.cxx
-+--- bridges/source/cpp_uno/shared/vtablefactory.cxx Mon Oct 12 09:26:03
2009 +0000
-++++ bridges/source/cpp_uno/shared/vtablefactory.cxx Mon Oct 12 13:29:25
2009 +0000
-+@@ -272,7 +272,7 @@
-+ char *tmpfname = new char[aTmpName.getLength()+1];
-+ strncpy(tmpfname, aTmpName.getStr(), aTmpName.getLength()+1);
-+ if ((block.fd = mkstemp(tmpfname)) == -1)
-+- perror("creation of executable memory area failed");
-++ perror("creation of executable memory area failed");
-+ if (block.fd == -1)
-+ {
-+ delete[] tmpfname;
-+@@ -280,7 +280,13 @@
-+ }
-+ unlink(tmpfname);
-+ delete[] tmpfname;
-+- ftruncate(block.fd, block.size);
-++ if (ftruncate(block.fd, block.size) == -1)
-++ {
-++ perror("truncation of executable memory area failed");
-++ close(block.fd);
-++ block.fd = -1;
-++ break;
-++ }
-+ block.start = mmap(NULL, block.size, PROT_READ | PROT_WRITE,
MAP_SHARED, block.fd, 0);
-+ if (block.start== MAP_FAILED) {
-+ block.start = 0;
=== removed file 'patches/fix-incorrect-automatic-print-area-assignment.diff'
--- a/patches/fix-incorrect-automatic-print-area-assignment.diff
2010-06-03 19:58:55 +0000
+++ b/patches/fix-incorrect-automatic-print-area-assignment.diff
1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-diff --git a/patches/dev300/calc-perf-extend-print-area.diff
b/patches/dev300/calc-perf-extend-print-area.diff
-index 04337c4..72d864e 100644
----
openoffice.org-3.2.1/ooo-build-3-2-1-3/patches/dev300/calc-perf-extend-print-area.diff
-+++
openoffice.org-3.2.1/ooo-build-3-2-1-3/patches/dev300/calc-perf-extend-print-area.diff
-@@ -231,8 +231,8 @@ index e55582b..614a9b5 100644
- + pCell = aIter.next();
- }
- +
--+ rEndCol = nPrintCol;
--+ return;
-++ if (nPrintCol > rEndCol)
-++ rEndCol = nPrintCol;
- }
- + nCol = aColData.mnCol1; // move toward 0.
- }
=== modified file 'patches/fix-nodep-check.diff'
--- a/patches/fix-nodep-check.diff 2010-06-10 22:27:36 +0000
+++ b/patches/fix-nodep-check.diff 2010-06-16 20:17:41 +0000
@@ -1,7 +1,7 @@
diff --git a/bin/build-ooo b/bin/build-ooo
index 6a4cd28..4553a94 100755
---- openoffice.org-3.2.1/ooo-build-3-2-1-3/bin/build-ooo
-+++ openoffice.org-3.2.1/ooo-build-3-2-1-3/bin/build-ooo
+--- openoffice.org-3.2.1/ooo-build-3-2-1-4/bin/build-ooo
++++ openoffice.org-3.2.1/ooo-build-3-2-1-4/bin/build-ooo
@@ -75,12 +75,11 @@ else
. $OOBUILDDIR/*.Set.sh
fi
=== removed file 'patches/fix-save-performance-with-hidden-rows.diff'
--- a/patches/fix-save-performance-with-hidden-rows.diff 2010-06-04
17:10:32 +0000
+++ b/patches/fix-save-performance-with-hidden-rows.diff 1970-01-01
00:00:00 +0000
@@ -1,45 +0,0 @@
-diff --git a/patches/dev300/apply b/patches/dev300/apply
-index d0759aa..e8f7e33 100644
---- openoffice.org-3.2.1/ooo-build-3-2-1-3/patches/dev300/apply
-+++ openoffice.org-3.2.1/ooo-build-3-2-1-3/patches/dev300/apply
-@@ -3862,6 +3862,9 @@ mdds-prj-d-lst.diff, kohei
- mdds-build-dependency-sc.diff, kohei
- system-mdds.diff, rengelha
-
-+# Fix poor performance on saving document with hidden rows.
-+calc-perf-ods-export-hidden-rows.diff, deb#582785, kohei
-+
- [ GentooExperimental ]
- SectionOwner => hmth
- # jemalloc, FreeBSD 7 allocator
-diff --git a/patches/dev300/calc-perf-ods-export-hidden-rows.diff
b/patches/dev300/calc-perf-ods-export-hidden-rows.diff
-new file mode 100644
-index 0000000..9fa54e1
---- /dev/null
-+++
openoffice.org-3.2.1/ooo-build-3-2-1-3/patches/dev300/calc-perf-ods-export-hidden-rows.diff
-@@ -0,0 +1,25 @@
-+diff --git sc/source/core/data/document.cxx sc/source/core/data/document.cxx
-+index 6490cf4..75c5266 100644
-+--- sc/source/core/data/document.cxx
-++++ sc/source/core/data/document.cxx
-+@@ -3717,15 +3717,18 @@ SCROW ScDocument::GetNextDifferentChangedRow( SCTAB
nTab, SCROW nStart, bool bCa
-+ {
-+ if ( ValidTab(nTab) && pTab[nTab] && pTab[nTab]->GetRowFlagsArray() &&
pTab[nTab]->mpRowHeights )
-+ {
-++ // Use the original row height for comparison, which may not be zero
-++ // even for hidden rows; it's the height before the row has become
-++ // hidden.
-+ BYTE nStartFlags = pTab[nTab]->GetRowFlags(nStart);
-+- USHORT nStartHeight = pTab[nTab]->GetOriginalHeight(nStart);
-++ USHORT nStartHeight = pTab[nTab]->GetRowHeight(nStart, NULL, NULL,
false);
-+ for (SCROW nRow = nStart + 1; nRow <= MAXROW; nRow++)
-+ {
-+ size_t nIndex; // ignored
-+ SCROW nFlagsEndRow;
-+ SCROW nHeightEndRow;
-+ BYTE nFlags = pTab[nTab]->GetRowFlagsArray()->GetValue( nRow,
nIndex, nFlagsEndRow );
-+- USHORT nHeight = pTab[nTab]->GetRowHeight(nRow, NULL,
&nHeightEndRow);
-++ USHORT nHeight = pTab[nTab]->GetRowHeight(nRow, NULL,
&nHeightEndRow, false);
-+ if (((nStartFlags & CR_MANUALBREAK) != (nFlags &
CR_MANUALBREAK)) ||
-+ ((nStartFlags & CR_MANUALSIZE) != (nFlags & CR_MANUALSIZE))
||
-+ (bCareManualSize && (nStartFlags & CR_MANUALSIZE) &&
(nStartHeight != nHeight)) ||
=== modified file 'patches/fix-smoketest-without-java.diff'
--- a/patches/fix-smoketest-without-java.diff 2010-06-10 14:07:27 +0000
+++ b/patches/fix-smoketest-without-java.diff 2010-06-16 20:17:41 +0000
@@ -1,5 +1,5 @@
--- /dev/null 2010-05-24 16:58:35.275686347 +0200
-+++
openoffice.org-3.2.1/ooo-build-3-2-1-3/patches/dev300/fix-smoketest-without-java.diff
2010-06-08 15:21:36.000000000 +0200
++++
openoffice.org-3.2.1/ooo-build-3-2-1-4/patches/dev300/fix-smoketest-without-java.diff
2010-06-08 15:21:36.000000000 +0200
@@ -0,0 +1,22 @@
+diff --git a/smoketestoo_native/data/scripts/Global.xba
b/smoketestoo_native/data/scripts/Global.xba
+--- smoketestoo_native/data/scripts/Global.xba
@@ -25,8 +25,8 @@
+ if Environ("WITH_BINFILTER") = "NO" then
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 3a732ae..f4ceb02 100644
---- openoffice.org-3.2.1/ooo-build-3-2-1-3/patches/dev300/apply
-+++ openoffice.org-3.2.1/ooo-build-3-2-1-3/patches/dev300/apply
+--- openoffice.org-3.2.1/ooo-build-3-2-1-4/patches/dev300/apply
++++ openoffice.org-3.2.1/ooo-build-3-2-1-4/patches/dev300/apply
@@ -506,6 +506,9 @@ sfx2-check-existing-template-dirs.diff, i#100518, pmladek
# FIXME: temporarily disabled as this causes a race condition in calc's cell
format dialog.
#vcl-kerning-fix.diff, n#464436, i#26519, cbosdo
=== removed file 'patches/hu-translation-fixes.diff'
--- a/patches/hu-translation-fixes.diff 2010-06-01 13:11:46 +0000
+++ b/patches/hu-translation-fixes.diff 1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-diff --git a/src/sdf/fixes-hu.sdf b/src/sdf/fixes-hu.sdf
-index 89a6542..36727d6 100644
---- openoffice.org-3.2.1/ooo-build-3-2-1-3/src/sdf/fixes-hu.sdf
-+++ openoffice.org-3.2.1/ooo-build-3-2-1-3/src/sdf/fixes-hu.sdf
-@@ -1,5 +1,21 @@
--svx source\cui\chardlg.src 0 tristatebox
RID_SVXPAGE_CHAR_EFFECTS CB_OUTLINE 82 en-US
Out~line 20100415 16:29:54
--svx source\cui\chardlg.src 0 tristatebox
RID_SVXPAGE_CHAR_EFFECTS CB_OUTLINE 82 hu
Kö~rvonalas 2010-03-25 22:00:00
-+helpcontent2 source\text\scalc\01\02140600.xhp 0 help
hd_id3147344 14 0 en-US Series Type
20051120 17:50:58
-+helpcontent2 source\text\scalc\01\02140600.xhp 0 help
hd_id3147344 14 0 hu Sorozat típusa
20051120 17:50:58
-+helpcontent2 source\text\scalc\01\02140600.xhp 0 help
hd_id3148488 16 0 en-US Linear
20051120 17:50:58
-+helpcontent2 source\text\scalc\01\02140600.xhp 0 help
hd_id3148488 16 0 hu Számtani sorozat
20051120 17:50:58
-+helpcontent2 source\text\scalc\01\02140600.xhp 0 help
par_id3159238 17 0 en-US \<ahelp
hid=\"SC:RADIOBUTTON:RID_SCDLG_FILLSERIES:BTN_ARITHMETIC\"\>Creates a linear
number series using the defined increment and end value.\</ahelp\>
20051120 17:50:58
-+helpcontent2 source\text\scalc\01\02140600.xhp 0 help
par_id3159238 17 0 hu \<ahelp
hid=\"SC:RADIOBUTTON:RID_SCDLG_FILLSERIES:BTN_ARITHMETIC\"\>A megadott
növekménnyel, mint különbséggel számtani sorozatot készít a megadott
végértékig.\</ahelp\> 20051120 17:50:58
-+helpcontent2 source\text\scalc\01\02140600.xhp 0 help
hd_id3149210 18 0 en-US Growth
20051120 17:50:58
-+helpcontent2 source\text\scalc\01\02140600.xhp 0 help
hd_id3149210 18 0 hu Mértani sorozat
20051120 17:50:58
-+helpcontent2 source\text\scalc\01\02140600.xhp 0 help
par_id3150364 19 0 en-US \<ahelp
hid=\"SC:RADIOBUTTON:RID_SCDLG_FILLSERIES:BTN_GEOMETRIC\"\>Creates a growth
series using the defined increment and end value.\</ahelp\>
20051120 17:50:58
-+helpcontent2 source\text\scalc\01\02140600.xhp 0 help
par_id3150364 19 0 hu \<ahelp
hid=\"SC:RADIOBUTTON:RID_SCDLG_FILLSERIES:BTN_GEOMETRIC\"\>A megadott
növekménnyel, mint hányadossal mértani sorozatot készít a megadott
végértékig.\</ahelp\> 20051120 17:50:58
-+helpcontent2 source\text\scalc\01\02140600.xhp 0 help
hd_id3149528 20 0 en-US Date
20051120 17:50:58
-+helpcontent2 source\text\scalc\01\02140600.xhp 0 help
hd_id3149528 20 0 hu Dátumsorozat
20051120 17:50:58
-+helpcontent2 source\text\scalc\01\02140600.xhp 0 help
par_id3153308 26 0 en-US In this area you can
specify the desired unit of time. This area is only active if the
\<emph\>Date\</emph\> option has been chosen in the \<emph\>Series
type\</emph\> area. 20051120 17:50:58
-+helpcontent2 source\text\scalc\01\02140600.xhp 0 help
par_id3153308 26 0 hu A területen
meghatározhatja a kívánt időegységet. A terület csak akkor aktív, ha a
\<emph\>Sorozat típusa\</emph\> terület \<emph\>Dátum\</emph\> beállítását
választotta. 20051120 17:50:58
-+helpcontent2 source\text\scalc\01\02140600.xhp 0 help
par_id3148605 28 0 en-US \<ahelp
hid=\"SC:RADIOBUTTON:RID_SCDLG_FILLSERIES:BTN_DAY\"\>Use the
\<emph\>Date\</emph\> series type and this option to create a series using
seven days.\</ahelp\> 20051120 17:50:58
-+helpcontent2 source\text\scalc\01\02140600.xhp 0 help
par_id3148605 28 0 hu \<ahelp
hid=\"SC:RADIOBUTTON:RID_SCDLG_FILLSERIES:BTN_DAY\"\>Használja a
\<emph\>Dátum\</emph\> sorozattípust és ezt a beállítást egy hét napot használó
sorozat létrehozásához.\</ahelp\> 20051120 17:50:58
-+helpcontent2 source\text\scalc\01\02140600.xhp 0 help
par_id3150108 30 0 en-US \<ahelp
hid=\"SC:RADIOBUTTON:RID_SCDLG_FILLSERIES:BTN_DAY_OF_WEEK\"\>Use the
\<emph\>Date\</emph\> series type and this option to create a series of five
day sets.\</ahelp\> 20051120 17:50:58
-+helpcontent2 source\text\scalc\01\02140600.xhp 0 help
par_id3150108 30 0 hu \<ahelp
hid=\"SC:RADIOBUTTON:RID_SCDLG_FILLSERIES:BTN_DAY_OF_WEEK\"\>Használja a
\<emph\>Dátum\</emph\> sorozattípust és ezt a beállítást, ha a sorozat tagjai
csak hétköznapokra eshetnek.\</ahelp\> 20051120
17:50:58
- helpcontent2 source\text\shared\01\05020301.xhp 0 help
par_id3153624 3 0 en-US Use zero (0) or the
number sign (#) as placeholders in your number format code to represent
numbers. The (#) only displays significant digits, while the (0) displays
zeroes if there are fewer digits in the number than in the number format.
20051120 17:50:58
- helpcontent2 source\text\shared\01\05020301.xhp 0 help
par_id3153624 3 0 hu Használjon nullát (0)
vagy a szám jelet (#) helykitöltőnek a számformátumkódban a számok jelölésére.
A (#) csak lényeges számjegyeket, míg a (0) nullákat jelenít meg, ha a számban
a számformátumban megadottaknál kevesebb számjegy van.
20051120 17:50:58
- helpcontent2 source\text\shared\01\05020301.xhp 0 help
par_id3147088 7 0 en-US 0 (Zero)
20051120 17:50:58
-@@ -39,4 +55,12 @@ helpcontent2 source\text\shared\01\05020301.xhp
0 help par_id3154302 103 0 hu
- helpcontent2 source\text\shared\01\05020301.xhp 0 help
par_id1002200811423518 0 en-US The above
listed formatting codes work with your language version of %PRODUCTNAME.
However, when you need to switch the locale of %PRODUCTNAME to another locale,
you will need to know the formatting codes used in that other locale.
20051120 17:50:58
- helpcontent2 source\text\shared\01\05020301.xhp 0 help
par_id1002200811423518 0 hu A fent
felsorolt formázási kódok az %PRODUCTNAME jelen nyelvi verziójával működnek. Ha
azonban az %PRODUCTNAME területi beállítását módosítania kell, ismernie kell a
másik területi beállításnál használt formátumkódokat.
20051120 17:50:58
- helpcontent2 source\text\shared\01\05020301.xhp 0 help
par_id1002200811423556 0 en-US For example, if
your software is set to an English locale, and you want to format a year with
four digits, you enter YYYY as a formatting code. When you switch to a German
locale, you must use JJJJ instead. The following table lists only the localized
differences. 20051120 17:50:58
--helpcontent2 source\text\shared\01\05020301.xhp 0 help
par_id1002200811423556 0 hu Ha például a
szoftver angol vagy magyar területi beállítást használ, és egy évszámot négy
számjegyen kíván ábrázolni, formátumkódként az YYYY használható. Ha átvált
német területi beállításra, a JJJJ kódot kell használnia. A következő táblázat
csak a lokalizációból fakadó különbségeket sorolja fel.
20051120 17:50:58
-+helpcontent2 source\text\shared\01\05020301.xhp 0 help
par_id1002200811423556 0 hu Ha például a
szoftver magyar területi beállítást használ, és egy évszámot négy számjegyen
kíván ábrázolni, formátumkódként az YYYY használható. Ha átvált német területi
beállításra, a JJJJ kódot kell használnia. A következő táblázat csak a
lokalizációból fakadó különbségeket sorolja fel.
20051120 17:50:58
-+sc source\ui\src\miscdlgs.src 0 radiobutton
RID_SCDLG_FILLSERIES BTN_ARITHMETIC 69 en-US Li~near
20051120 17:50:58
-+sc source\ui\src\miscdlgs.src 0 radiobutton
RID_SCDLG_FILLSERIES BTN_ARITHMETIC 69 hu
Számtani sorozat 20051120 17:50:58
-+sc source\ui\src\miscdlgs.src 0 radiobutton
RID_SCDLG_FILLSERIES BTN_GEOMETRIC 69 en-US ~Growth
20051120 17:50:58
-+sc source\ui\src\miscdlgs.src 0 radiobutton
RID_SCDLG_FILLSERIES BTN_GEOMETRIC 69 hu Mértani
sorozat 20051120 17:50:58
-+sc source\ui\src\miscdlgs.src 0 radiobutton
RID_SCDLG_FILLSERIES BTN_DATE 69 en-US Da~te
20051120 17:50:58
-+sc source\ui\src\miscdlgs.src 0 radiobutton
RID_SCDLG_FILLSERIES BTN_DATE 69 hu
Dá~tumsorozat 20051120 17:50:58
-+sc source\ui\src\miscdlgs.src 0 fixedline
RID_SCDLG_FILLSERIES FL_TYPE 75 en-US Series type
20051120 17:50:58
-+sc source\ui\src\miscdlgs.src 0 fixedline
RID_SCDLG_FILLSERIES FL_TYPE 75 hu Sorozat típusa
20051120 17:50:58
=== modified file 'patches/installer-globals-max-1-regcomp.diff'
--- a/patches/installer-globals-max-1-regcomp.diff 2010-06-14 07:22:41
+0000
+++ b/patches/installer-globals-max-1-regcomp.diff 2010-06-16 20:17:41
+0000
@@ -1,5 +1,5 @@
--- /dev/null 2010-05-24 16:58:35.275686347 +0200
-+++
openoffice.org-3.2.1/ooo-build-3-2-1-3/patches/dev300/installer-globals-max-1-regcomp.diff
2010-06-11 00:39:33.000000000 +0200
++++
openoffice.org-3.2.1/ooo-build-3-2-1-4/patches/dev300/installer-globals-max-1-regcomp.diff
2010-06-11 00:39:33.000000000 +0200
@@ -0,0 +1,14 @@
+diff --git a/solenv/bin/modules/installer/globals.pm
b/solenv/bin/modules/installer/globals.pm
+--- solenv/bin/modules/installer/globals.pm
@@ -17,8 +17,8 @@
+ $fix_number_of_cab_files = 1;
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 3a732ae..5f1c32a 100644
---- openoffice.org-3.2.1/ooo-build-3-2-1-3/patches/dev300/apply
-+++ openoffice.org-3.2.1/ooo-build-3-2-1-3/patches/dev300/apply
+--- openoffice.org-3.2.1/ooo-build-3-2-1-4/patches/dev300/apply
++++ openoffice.org-3.2.1/ooo-build-3-2-1-4/patches/dev300/apply
@@ -307,6 +307,10 @@ gcc-HelpLinker.diff
# configmgr paths are not yet existing then
speed-sal-fewer-lstats.diff, i#89730, jholesov
=== removed file 'patches/kde4-statusbar-redrawing-border-width.diff'
--- a/patches/kde4-statusbar-redrawing-border-width.diff 2010-06-14
18:53:53 +0000
+++ b/patches/kde4-statusbar-redrawing-border-width.diff 1970-01-01
00:00:00 +0000
@@ -1,55 +0,0 @@
-diff --git a/patches/dev300/apply b/patches/dev300/apply
-index 9eeb20a..f53e9e9 100644
---- openoffice.org-3.2.1/ooo-build-3-2-1-3/patches/dev300/apply
-+++ openoffice.org-3.2.1/ooo-build-3-2-1-3/patches/dev300/apply
-@@ -2345,6 +2345,8 @@ kde4-border-frame.diff, i#111464, jholesov
-
- # redraw the status bar when needed; backport from CWS vcl109; fix by pl
- kde4-statusbar-redrawing.diff, bnc#567886, i#107945, pmladek
-+# do not crash with non-Oxygen theme; use better border width
-+kde4-statusbar-redrawing-2.diff, bnc#612491, i#109176, pmladek
-
- [ KDE4Experimental ]
- # Not yet ported to co-exist with the KDE3 stuff
-diff --git a/patches/dev300/kde4-statusbar-redrawing-2.diff
b/patches/dev300/kde4-statusbar-redrawing-2.diff
-new file mode 100644
-index 0000000..24fe201
---- /dev/null
-+++
openoffice.org-3.2.1/ooo-build-3-2-1-3/patches/dev300/kde4-statusbar-redrawing-2.diff
-@@ -0,0 +1,36 @@
-+--- vcl/unx/kde4/KDESalGraphics.cxx.old 2010-06-14 14:21:03.000000000
+0200
-++++ vcl/unx/kde4/KDESalGraphics.cxx 2010-06-14 17:03:45.000000000 +0200
-+@@ -454,15 +454,28 @@ BOOL KDESalGraphics::drawNativeControl(
-+ lcl_drawFrame(QStyle::PE_Frame, m_image,
-+
vclStateValue2StateFlag(nControlState, value));
-+
-+- int size = kapp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin);
-++ // draw just the border, see
http://qa.openoffice.org/issues/show_bug.cgi?id=107945
-++ // FIXME: how to get the actual frame width?
QStyle::PM_DefaultFrameWidth is "1" for Oxygen
-++ // and the frame is 2 pixels in reality
-++ int nFrameWidth =
kapp->style()->pixelMetric(QStyle::PM_DefaultFrameWidth) + 1;
-+ pTempClipRegion = XCreateRegion();
-+ XRectangle xRect = { widgetRect.left(), widgetRect.top(),
widgetRect.width(), widgetRect.height() };
-+ XUnionRectWithRegion( &xRect, pTempClipRegion, pTempClipRegion );
-+ XLIB_Region pSubtract = XCreateRegion();
-+- xRect.x += size;
-+- xRect.y += size;
-+- xRect.width -= 2* size;
-+- xRect.height -= 2*size;
-++ xRect.x += nFrameWidth;
-++ xRect.y += nFrameWidth;
-++
-++ // do not crash for too small widgets, see
http://qa.openoffice.org/issues/show_bug.cgi?id=112102
-++ if ( xRect.width > 2*nFrameWidth )
-++ xRect.width -= 2*nFrameWidth;
-++ else
-++ xRect.width = 0;
-++
-++ if (xRect.height > 2*nFrameWidth)
-++ xRect.height -= 2*nFrameWidth;
-++ else
-++ xRect.height = 0;
-++
-+ XUnionRectWithRegion( &xRect, pSubtract, pSubtract );
-+ XSubtractRegion( pTempClipRegion, pSubtract, pTempClipRegion );
-+ XDestroyRegion( pSubtract );
=== removed file 'patches/powerpc-fixes.diff'
--- a/patches/powerpc-fixes.diff 2010-06-05 16:29:48 +0000
+++ b/patches/powerpc-fixes.diff 1970-01-01 00:00:00 +0000
@@ -1,431 +0,0 @@
---- /dev/null 2010-05-24 16:58:35.275686347 +0200
-+++
openoffice.org-3.2.1/ooo-build-3-2-1-3/patches/dev300/powerpc-fix-argument-passing-in-a-rare-case.diff
2010-06-04 19:31:51.000000000 +0200
-@@ -0,0 +1,57 @@
-+From 7b734f0e908f3668d78c3885226bff3c83b484ad Mon Sep 17 00:00:00 2001
-+From: Sebastian Andrzej Siewior <bige...@linutronix.de>
-+Date: Tue, 24 Nov 2009 17:24:01 +0100
-+Subject: [PATCH 1/2] powerpc: fix argument passing in a rare case
-+
-+lets assume the following call:
-+
-+void func(void *this, long long l1, long long l2, int i1, long long l3,
-+ int i2)
-+
-+which should be translated to
-+ r3 this
-+ r4 <pad>
-+ r5 upper l1
-+ r6 lower l1
-+ r7 upper l2
-+ r8 lower l2
-+ r9 i1
-+ r10 <pad>
-+ stack +8 upper l3
-+ stack +12 lower l3
-+ stack +16 i2
-+
-+ng is compared less than 7. If ng is 7 than the parameter is saved on
-+the stack. This is correct. The following integer value will be saved in
-+r10 because ng is still 7 and this is less than 8. This is wrong because
-+this argument should be saved on stack.
-+
-+The code is different but the bug is the same as in mozilla's #520367
-+
-+Signed-off-by: Sebastian Andrzej Siewior <bige...@linutronix.de>
-+---
-+ .../source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx | 6 +++---
-+ 1 files changed, 3 insertions(+), 3 deletions(-)
-+
-+diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx
b/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx
-+index 238354b..5aadd16 100644
-+--- bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx
-++++ bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx
-+@@ -164,11 +164,11 @@ static typelib_TypeClass cpp2uno_call(
-+
-+ case typelib_TypeClass_HYPER:
-+ case typelib_TypeClass_UNSIGNED_HYPER:
-+- if (ng < 7) {
-+- if (ng & 1) {
-++ if (ng & 1) {
-+ ng++;
-+ gpreg++;
-+- }
-++ }
-++ if (ng < 8) {
-+ pCppArgs[nPos] = gpreg;
-+ pUnoArgs[nPos] = gpreg;
-+ ng += 2;
-+--
-+1.6.2.5
-+
---- /dev/null 2010-05-24 16:58:35.275686347 +0200
-+++
openoffice.org-3.2.1/ooo-build-3-2-1-3/patches/dev300/powerpc-softfloat-support.diff
2010-06-04 19:39:30.000000000 +0200
-@@ -0,0 +1,353 @@
-+
-+# HG changeset patch
-+# User Caolán McNamara <c...@openoffice.org>
-+# Date 1259668046 0
-+# Node ID 461f556673a244a5208b5d0e23bb810fe7406845
-+# Parent 0d1746fada9b675ea9c7a85bbd4470788323a329
-+cmcfixes68: #i107183# ppc-linux: add support for softfloat toolchains
-+
-+diff -r 0d1746fada9b -r 461f556673a2
bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx
-+--- bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx Tue Dec 01
11:43:22 2009 +0000
-++++ bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx Tue Dec 01
11:47:26 2009 +0000
-+@@ -61,7 +61,9 @@
-+ sal_Int64 * pRegisterReturn /* space for register return */ )
-+ {
-+ int ng = 0; //number of gpr registers used
-++#ifndef __NO_FPRS__
-+ int nf = 0; //number of fpr regsiters used
-++#endif
-+ void ** pCppStack; //temporary stack pointer
-+
-+ // gpreg: [ret *], this, [gpr params]
-+@@ -123,11 +125,23 @@
-+ {
-+
-+ case typelib_TypeClass_DOUBLE:
-++#ifndef __NO_FPRS__
-+ if (nf < 8) {
-+ pCppArgs[nPos] = fpreg;
-+ pUnoArgs[nPos] = fpreg;
-+ nf++;
-+ fpreg += 2;
-++#else
-++ if (ng & 1) {
-++ ng++;
-++ gpreg++;
-++ }
-++ if (ng < 8) {
-++ pCppArgs[nPos] = gpreg;
-++ pUnoArgs[nPos] = gpreg;
-++ ng += 2;
-++ gpreg += 2;
-++#endif
-+ } else {
-+ if (((long)ovrflw) & 4) ovrflw++;
-+ pCppArgs[nPos] = ovrflw;
-+@@ -139,6 +153,7 @@
-+ case typelib_TypeClass_FLOAT:
-+ // fpreg are all double values so need to
-+ // modify fpreg to be a single word float value
-++#ifndef __NO_FPRS__
-+ if (nf < 8) {
-+ float tmp = (float) (*((double *)fpreg));
-+ (*((float *) fpreg)) = tmp;
-+@@ -146,6 +161,13 @@
-+ pUnoArgs[nPos] = fpreg;
-+ nf++;
-+ fpreg += 2;
-++#else
-++ if (ng < 8) {
-++ pCppArgs[nPos] = gpreg;
-++ pUnoArgs[nPos] = gpreg;
-++ ng++;
-++ gpreg++;
-++#endif
-+ } else {
-+ #if 0 /* abi is not being followed correctly */
-+ if (((long)ovrflw) & 4) ovrflw++;
-+@@ -488,10 +510,12 @@
-+ static void cpp_vtable_call( int nFunctionIndex, int nVtableOffset, void**
gpregptr, void** fpregptr, void** ovrflw)
-+ {
-+ sal_Int32 gpreg[8];
-++ memcpy( gpreg, gpregptr, 32);
-++
-++#ifndef __NO_FPRS__
-+ double fpreg[8];
-+-
-+- memcpy( gpreg, gpregptr, 32);
-+ memcpy( fpreg, fpregptr, 64);
-++#endif
-+
-+ volatile long nRegReturn[2];
-+
-+@@ -499,10 +523,14 @@
-+ // fprintf(stderr,"in cpp_vtable_call nVtableOffset is
%x\n",nVtableOffset);
-+ // fflush(stderr);
-+
-+- sal_Bool bComplex = nFunctionIndex & 0x80000000 ? sal_True :
sal_False;
-+-
-+ typelib_TypeClass aType =
-+- cpp_mediate( nFunctionIndex, nVtableOffset, (void**)gpreg,
(void**)fpreg, ovrflw, (sal_Int64*)nRegReturn );
-++ cpp_mediate( nFunctionIndex, nVtableOffset, (void**)gpreg,
-++#ifndef __NO_FPRS__
-++ (void**)fpreg,
-++#else
-++ NULL,
-++#endif
-++ ovrflw, (sal_Int64*)nRegReturn );
-+
-+ switch( aType )
-+ {
-+@@ -524,13 +552,25 @@
-+ break;
-+
-+ case typelib_TypeClass_FLOAT:
-++#ifndef __NO_FPRS__
-+ __asm__( "lfs 1,%0\n\t" : :
-+ "m" (*((float*)nRegReturn)) );
-++ #else
-++ __asm__( "lwz 3,%0\n\t" : :
-++ "m"(nRegReturn[0]) );
-++#endif
-+ break;
-+
-+ case typelib_TypeClass_DOUBLE:
-++#ifndef __NO_FPRS__
-+ __asm__( "lfd 1,%0\n\t" : :
-+ "m" (*((double*)nRegReturn)) );
-++#else
-++ __asm__( "lwz 3,%0\n\t" : :
-++ "m"(nRegReturn[0]) );
-++ __asm__( "lwz 4,%0\n\t" : :
-++ "m"(nRegReturn[1]) );
-++#endif
-+ break;
-+
-+ case typelib_TypeClass_HYPER:
-+@@ -577,6 +617,7 @@
-+
-+
-+ // # next save fpr 1 to fpr 8 (aligned to 8)
-++ // if dedicated floating point registers are used
-+ // stfd f1,-2016(r1)
-+ // stfd f2,-2008(r1)
-+ // stfd f3,-2000(r1)
-+@@ -604,6 +645,10 @@
-+
-+ // #now load up the pointer to the saved fpr registers
-+ // addi r6,r1,-2016
-++ // if no dedicated floating point registers are used than we have NULL
-++ // pointer there
-++ // li r6, 0
-++ //
-+
-+ // #now load up the pointer to the overflow call stack
-+ // addi r7,r1,8
-+@@ -617,6 +662,7 @@
-+ * p++ = 0x9101f814;
-+ * p++ = 0x9121f818;
-+ * p++ = 0x9141f81c;
-++#ifndef __NO_FPRS__
-+ * p++ = 0xd821f820;
-+ * p++ = 0xd841f828;
-+ * p++ = 0xd861f830;
-+@@ -625,6 +671,17 @@
-+ * p++ = 0xd8c1f848;
-+ * p++ = 0xd8e1f850;
-+ * p++ = 0xd901f858;
-++#else
-++ /* these nops could be replaced with a smaller codeSnippetSize - 8 * 4
*/
-++ * p++ = 0x60000000;
-++ * p++ = 0x60000000;
-++ * p++ = 0x60000000;
-++ * p++ = 0x60000000;
-++ * p++ = 0x60000000;
-++ * p++ = 0x60000000;
-++ * p++ = 0x60000000;
-++ * p++ = 0x60000000;
-++#endif
-+ * p++ = 0x3c600000 | (((unsigned long)cpp_vtable_call) >> 16);
-+ * p++ = 0x60630000 | (((unsigned long)cpp_vtable_call) & 0x0000FFFF);
-+ * p++ = 0x7c6903a6;
-+@@ -633,7 +690,11 @@
-+ * p++ = 0x3c800000 | (((unsigned long)vtableOffset) >> 16);
-+ * p++ = 0x60840000 | (((unsigned long)vtableOffset) & 0x0000FFFF);
-+ * p++ = 0x38a1f800;
-++#ifndef __NO_FPRS__
-+ * p++ = 0x38c1f820;
-++#else
-++ * p++ = 0x38c00000;
-++#endif
-+ * p++ = 0x38e10008;
-+ * p++ = 0x4e800420;
-+ return (code + codeSnippetSize);
-+diff -r 0d1746fada9b -r 461f556673a2
bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx
-+--- bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx Tue Dec 01
11:43:22 2009 +0000
-++++ bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx Tue Dec 01
11:47:26 2009 +0000
-+@@ -137,8 +137,8 @@
-+ OUString const & unoName = *(OUString const
*)&pTypeDescr->aBase.pTypeName;
-+
-+ MutexGuard guard( m_mutex );
-+- t_rtti_map::const_iterator iFind( m_rttis.find( unoName ) );
-+- if (iFind == m_rttis.end())
-++ t_rtti_map::const_iterator iRttiFind( m_rttis.find( unoName ) );
-++ if (iRttiFind == m_rttis.end())
-+ {
-+ // RTTI symbol
-+ OStringBuffer buf( 64 );
-+@@ -202,7 +202,7 @@
-+ }
-+ else
-+ {
-+- rtti = iFind->second;
-++ rtti = iRttiFind->second;
-+ }
-+
-+ return rtti;
-+diff -r 0d1746fada9b -r 461f556673a2
bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx
-+--- bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx Tue Dec 01
11:43:22 2009 +0000
-++++ bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx Tue Dec 01
11:47:26 2009 +0000
-+@@ -74,12 +74,14 @@
-+ void (*ptr)();
-+ int gpr[8]; // storage for gpregisters, map to r3-r10
-+ int off; // offset used to find function
-++#ifndef __NO_FPRS__
-+ double fpr[8]; // storage for fpregisters, map to f1-f8
-++ int f; // number of fprs mapped so far
-++ double dret; // temporary function return values
-++#endif
-+ int n; // number of gprs mapped so far
-+- int f; // number of fprs mapped so far
-+ long *p; // pointer to parameter overflow area
-+ int c; // character of parameter type being
decoded
-+- double dret; // temporary function return values
-+ int iret, iret2;
-+
-+ // Because of the Power PC calling conventions we could be passing
-+@@ -93,7 +95,7 @@
-+
-+ // Note: could require up to 2*nStackLongs words of parameter stack
area
-+ // if the call has many float parameters (i.e. floats take up only 1
-+- // word on the stack but take 2 words in parameter area in the
-++ // word on the stack but double takes 2 words in parameter area in the
-+ // stack frame .
-+
-+ // Update! floats on the outgoing parameter stack only take up 1 word
-+@@ -119,7 +121,9 @@
-+
-+ // now begin to load the C++ function arguments into storage
-+ n = 0;
-++#ifndef __NO_FPRS__
-+ f = 0;
-++#endif
-+
-+ // now we need to parse the entire signature string */
-+ // until we get the END indicator */
-+@@ -143,8 +147,16 @@
-+ c = *pPT;
-+ switch (c) {
-+ case 'D': /* type is double */
-++#ifndef __NO_FPRS__
-+ if (f < 8) {
-+ fpr[f++] = *((double *)pStackLongs); /* store in register */
-++#else
-++ if (n & 1)
-++ n++;
-++ if (n < 8) {
-++ gpr[n++] = *pStackLongs;
-++ gpr[n++] = *(pStackLongs+1);
-++#endif
-+ } else {
-+ if (((long) p) & 4)
-+ p++;
-+@@ -163,8 +175,13 @@
-+ store floats as a *single* word on outgoing parameter stack
-+ to match what gcc actually does
-+ */
-++#ifndef __NO_FPRS__
-+ if (f < 8) {
-+ fpr[f++] = *((float *)pStackLongs);
-++#else
-++ if (n < 8) {
-++ gpr[n++] = *pStackLongs;
-++#endif
-+ } else {
-+ #if 0 /* if abi were followed */
-+ if (((long) p) & 4)
-+@@ -243,6 +260,7 @@
-+ "lwz 8, 20(%0)\n\t"
-+ "lwz 9, 24(%0)\n\t"
-+ "lwz 10, 28(%0)\n\t"
-++#ifndef __NO_FPRS__
-+ "lfd 1, 0(%1)\n\t"
-+ "lfd 2, 8(%1)\n\t"
-+ "lfd 3, 16(%1)\n\t"
-+@@ -252,16 +270,24 @@
-+ "lfd 7, 48(%1)\n\t"
-+ "lfd 8, 56(%1)\n\t"
-+ : : "r" (gpr), "r" (fpr)
-++#else
-++ : : "r" (gpr)
-++#endif
-+ : "0", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12"
-+ );
-+
-+ (*ptr)();
-+
-+ __asm__ __volatile__ (
-+- "mr %1, 3\n\t"
-+- "mr %2, 4\n\t"
-+- "fmr %0, 1\n\t"
-+- : "=f" (dret), "=r" (iret), "=r" (iret2) : );
-++ "mr %0, 3\n\t"
-++ "mr %1, 4\n\t"
-++#ifndef __NO_FPRS__
-++ "fmr %2, 1\n\t"
-++ : "=r" (iret), "=r" (iret2), "=f" (dret)
-++#else
-++ : "=r" (iret), "=r" (iret2)
-++#endif
-++ : );
-+
-+ switch( eReturnType )
-+ {
-+@@ -284,10 +310,21 @@
-+ *(unsigned char*)pRegisterReturn = (unsigned char)iret;
-+ break;
-+ case typelib_TypeClass_FLOAT:
-++#ifndef __NO_FPRS__
-+ *(float*)pRegisterReturn = (float)dret;
-++#else
-++ ((unsigned int*)pRegisterReturn)[0] = iret;
-++#endif
-+ break;
-+ case typelib_TypeClass_DOUBLE:
-++#ifndef __NO_FPRS__
-+ *(double*)pRegisterReturn = dret;
-++#else
-++ ((unsigned int*)pRegisterReturn)[0] = iret;
-++ ((unsigned int*)pRegisterReturn)[1] = iret2;
-++#endif
-++ break;
-++ default:
-+ break;
-+ }
-+ }
-+@@ -399,6 +436,8 @@
-+ case typelib_TypeClass_UNSIGNED_HYPER:
-+ *pPT++ = 'H';
-+ pCppStack += sizeof(sal_Int32); // extra long
-++ default:
-++ break;
-+ }
-+
-+ // no longer needed
-+@@ -518,7 +557,6 @@
-+ // is my surrogate
-+ bridges::cpp_uno::shared::UnoInterfaceProxy * pThis
-+ = static_cast< bridges::cpp_uno::shared::UnoInterfaceProxy *>
(pUnoI);
-+- typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-+
-+ switch (pMemberDescr->eTypeClass)
-+ {
-+
-diff --git a/patches/dev300/apply b/patches/dev300/apply
-index e8f7e33..3a732ae 100644
---- openoffice.org-3.2.1/ooo-build-3-2-1-3/patches/dev300/apply
-+++ openoffice.org-3.2.1/ooo-build-3-2-1-3/patches/dev300/apply
-@@ -1253,6 +1253,10 @@ db4.8.diff, rengelha
- # find gsicheck in the solver
- transex3-localize-gsicheck-path.diff, i#109378, pmladek
-
-+[ Fixes < dev300-m69 ]
-+powerpc-fix-argument-passing-in-a-rare-case.diff, i#107182
-+powerpc-softfloat-support.diff, i#107183
-+
- [ Fixes < dev300-m66 ]
- armeabi-softfp-buildfix.diff, i#105302, doko
-
=== modified file 'patches/series'
--- a/patches/series 2010-06-14 18:53:53 +0000
+++ b/patches/series 2010-06-16 20:17:41 +0000
@@ -1,9 +1,3 @@
-hu-translation-fixes.diff
-backport-ftruncate-check.diff
-fix-incorrect-automatic-print-area-assignment.diff
-fix-save-performance-with-hidden-rows.diff
-powerpc-fixes.diff
fix-smoketest-without-java.diff
fix-nodep-check.diff
installer-globals-max-1-regcomp.diff
-kde4-statusbar-redrawing-border-width.diff
=== modified file 'rules'
--- a/rules 2010-06-16 20:12:23 +0000
+++ b/rules 2010-06-16 20:17:41 +0000
@@ -71,7 +71,7 @@
#TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE)
TAG=$(MWS)_$(MILESTONE)
#OOO_BUILD_BRANCH=ooo-build-3-2-1
-OOO_BUILD_VERSION=3.2.1.3
+OOO_BUILD_VERSION=3.2.1.4
OOO_BUILD_TAG=OOO_BUILD_$(shell echo $(OOO_BUILD_VERSION) | sed -e 's/\./_/g')
OOO_BUILD_TREE=ooo-build-$(shell echo $(OOO_BUILD_VERSION) | sed -e 's/\./-/g')
SOURCE_TREE=$(OOO_BUILD_TREE)/build/$(TAG)
=== modified file 'source/components'
--- a/source/components 2010-06-01 13:11:46 +0000
+++ b/source/components 2010-06-16 20:17:41 +0000
@@ -1,3 +1,3 @@
-ooo-build-3-2-1-3
-ext-sources-ooo-build-3-2-1-3
+ooo-build-3-2-1-4
+ext-sources-ooo-build-3-2-1-4
translation-updates-20100526
