ooo-build r13633 - in trunk: . patches/dev300

From: rengelhard svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r13633 - in trunk: . patches/dev300
Date: Tue, 19 Aug 2008 20:22:32 +0000 (UTC)
Author: rengelhard
Date: Tue Aug 19 20:22:32 2008
New Revision: 13633
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13633&view=rev

Log:
2008-08-19  Rene Engelhard  <rene debian org>

        * patches/dev300/reportdesign-mention-package.diff: update for m3
        * patches/dev300/buildfix-sdext-memcmp-header.diff: copy of -filter-
          for m3
        * patches/dev300/apply: adapt for above



Added:
   trunk/patches/dev300/buildfix-sdext-memcmp-header.diff   (contents, props changed)
      - copied, changed from r13632, /trunk/patches/dev300/buildfix-filter-memcmp-header.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/reportdesign-mention-package.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Aug 19 20:22:32 2008
@@ -993,7 +993,10 @@
 [ Gcc43 ]
 # gcc 4.3 requires #include <string.h> for strdup, memcmp etc.
 buildfix-bridges-strdup-header.diff, i#89762, kohei
+[ Gcc43 < dev300-m30 < ooo300-m3 ]
 buildfix-filter-memcmp-header.diff, i#89803, kohei
+[ Gcc43 >= dev300-m30 >= ooo300-m3 ]
+buildfix-sdext-memcmp-header.diff, i#89803, kohei
 
 [ Java14 ]
 

Copied: trunk/patches/dev300/buildfix-sdext-memcmp-header.diff (from r13632, /trunk/patches/dev300/buildfix-filter-memcmp-header.diff)
==============================================================================
--- /trunk/patches/dev300/buildfix-filter-memcmp-header.diff	(original)
+++ trunk/patches/dev300/buildfix-sdext-memcmp-header.diff	Tue Aug 19 20:22:32 2008
@@ -1,7 +1,7 @@
 diff --git filter/source/pdfimport/wrapper/wrapper.cxx filter/source/pdfimport/wrapper/wrapper.cxx
 index daa5e51..8855715 100755
---- filter/source/pdfimport/wrapper/wrapper.cxx
-+++ filter/source/pdfimport/wrapper/wrapper.cxx
+--- sdext/source/pdfimport/wrapper/wrapper.cxx
++++ sdext/source/pdfimport/wrapper/wrapper.cxx
 @@ -69,6 +69,8 @@
  #include <boost/scoped_ptr.hpp>
  #include <boost/scoped_array.hpp>

Modified: trunk/patches/dev300/reportdesign-mention-package.diff
==============================================================================
--- trunk/patches/dev300/reportdesign-mention-package.diff	(original)
+++ trunk/patches/dev300/reportdesign-mention-package.diff	Tue Aug 19 20:22:32 2008
@@ -32,7 +32,7 @@
                 Pos = MAP_APPFONT ( DLG_WIDTH / 2 + (CELL_PADDING/2), ACTION_LINE_START) ;
 --- dbaccess/source/ui/dlg/localize.sdf-old	2008-04-29 12:45:07.000000000 +0200
 +++ dbaccess/source/ui/dlg/localize.sdf	2008-04-29 12:47:49.000000000 +0200
-@@ -7202,50 +7202,8 @@
+@@ -7279,50 +7279,8 @@
  dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	pushbutton	RID_EXTENSION_NOT_PRESENT_DLG	PB_DOWNLOAD			0	vi	Tái ~vá...				2002-02-02 02:02:02
  dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	pushbutton	RID_EXTENSION_NOT_PRESENT_DLG	PB_DOWNLOAD			0	zh-CN	äè(~D)...				2002-02-02 02:02:02
  dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	pushbutton	RID_EXTENSION_NOT_PRESENT_DLG	PB_DOWNLOAD			0	zh-TW	äè(~D)...				2002-02-02 02:02:02
@@ -42,7 +42,7 @@
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	br	Evit digeriÃ ur marilh ho po ezhomm eus an askouezhad %RPT_EXTENSION_NAME.\n\nKlikaÃ war 'PellgargaÃ...' evit pellgargaÃ ha staliaÃ an askouezhad.				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	ca	Per a obrir un informe necessiteu l'extensiÃ %RPT_EXTENSION_NAME.\n\nFeu clic a "Baixa..." per a baixar i instalÂlar l'extensiÃ.				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	cs	Pro otevÅenÃ sestavy je potÅeba rozÅÃÅenÃ %RPT_EXTENSION_NAME.\n\nKlepnÄte na 'StÃhnout...', pokud chcete rozÅÃÅenÃ stÃhnout a nainstalovat.				2002-02-02 02:02:02
--dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	da	For at Ãbne en rapport krÃves udvidelsen %RPT_EXTENSION_NAME.\n\nKlik pÃ 'Hent...' for at hente og installere udvidelsen.				2002-02-02 02:02:02
+-dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				1	da	For at Ãbne en rapport krÃves udvidelsen %RPT_EXTENSION_NAME.\n\nKlik pÃ 'Hent...' for at hente og installere udvidelsen.				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	de	Zum Ãffnen eines Berichts wird die Erweiterung %RPT_EXTENSION_NAME benÃtigt.\n\nKlicken Sie auf 'Download...', um die Erweiterung herunterzuladen und zu installieren.				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	el	ÎÎÎ ÎÎ ÎÎÎÎÎÎÏÎ ÎÎÎ ÎÎÎÏÎÏÎ ÏÏÎÎÎÎÎÏÏÎ ÏÎÎ ÎÏÎÎÏÎÏÎ  %RPT_EXTENSION_NAME.\n\nÎÎÏÎÏÏÎ 'ÎÎÏÎ...' ÎÎÎ ÎÎ ÎÎÎÎÏÎ ÎÎÏÎ ÎÎÎ ÎÎÎÎÏÎÏÏÎÏÎ ÏÎÏ ÎÏÎÎÏÎÏÎÏ.				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				1	eo	Por malfermi raporton vi bezonas la etendajxon %RPT_EXTENSION_NAME.\n\nAlklaku 'Elsxuti...' por elsxuti kaj instali la etendajxon.				2002-02-02 02:02:02
@@ -52,9 +52,9 @@
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	gl	NecesÃtase a extensiÃn %RPT_EXTENSION_NAME para abrir o informe.\n\nPrema 'Descargar...' para descargar e instalar a extensiÃn.				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				13691	gu	àààààà ààààà àààà àààà %RPT_EXTENSION_NAME àààààààààà ààààà àà.\n\nàààààààààà ààààààà àààà ààà ààààààà àààà àààà 'ààààààà...' ààààà àààà.				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	hr	Za otvaranje izvjeÅÄa morate imati %RPT_EXTENSION_NAME proÅirenje.\n\nKliknite na  'Preuzmi...' kako bi preuzeli i instalirali proÅirenje.				2002-02-02 02:02:02
--dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	hu	TillÃgget %RPT_EXTENSION_NAME krÃvs fÃr att du ska kunna Ãppna rapporter.\n\nKlicka pÃ Ladda ner... fÃr att hÃmta och installera tillÃgget.				2002-02-02 02:02:02
+-dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	hu	JelentÃs megnyitÃsÃhoz %RPT_EXTENSION_NAME bÅvÃtÃsre van szÃksÃg.\n\nKattintson a âLetÃltÃs...â lehetÅsÃgre a bÅvÃtÃs letÃltÃse Ãs telepÃtÃse ÃrdekÃben.				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	it	Per aprire un rapporto Ã necessaria l'estensione %RPT_EXTENSION_NAME.\n\nFare clic su Scarica per scaricare e installare l'estensione.				2002-02-02 02:02:02
--dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	ja	To open a report you require the extension %RPT_EXTENSION_NAME.\n\nClick 'Download...' to download and install the extension.				2002-02-02 02:02:02
+-dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	ja	ãããããéããããæåæè %RPT_EXTENSION_NAME ãåèããã\n\nããããããã...ããããããããããæåæèãããããããããããããããããããã				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	km	ááááááâáááâáááááááááâááá ááááâááááááááâáááááâáááááá %RPT_EXTENSION_NAMEÂá\n\nááá 'ááááá...' ááááááâáááâáá áááâáááááâáááááâááááááÂá				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	ko	ëêìë ìëë íìì %RPT_EXTENSION_NAMEì(ê) íìíëë.\n\n'ëìëë...'ë íëíê íììë ëìëë ë ììíëë.				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	lt	Ataskaitai atverti reikalingas plÄtinys %RPT_EXTENSION_NAME.\n\nSpustelÄkite âAtsisiÅsti...â, kad atsisiÅstumÄte ir ÄdiegtumÄte plÄtinÄ.				2002-02-02 02:02:02
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]