ooo-build r11318 - in trunk: . patches/src680

From: rengelhard svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r11318 - in trunk: . patches/src680
Date: Fri, 18 Jan 2008 13:24:01 +0000 (GMT)
Author: rengelhard
Date: Fri Jan 18 13:24:01 2008
New Revision: 11318
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11318&view=rev

Log:
2008-01-18  Rene Engelhard  <rene debian org>

        * patches/src680/writerfilter-qnametostr-NOOPTFILES.diff: hack around
          OOM
        * patches/src680/apply,
          patches/src680/debian-system-jfreereport.diff: update and enable
          again
        * patches/src680/reportdesigner-fix-jarlist.diff: fix jar packaging
          into sun-report-builder.oxt
        * patches/src680/apply: apply scaddins-erf-crash-fix-065.diff and
          svx-delay-load-forms.diff only for < ooh680-m4


Added:
   trunk/patches/src680/reportdesigner-fix-jarlist.diff
   trunk/patches/src680/writerfilter-qnametostr-NOOPTFILES.diff
Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply
   trunk/patches/src680/debian-system-jfreereport.diff
   trunk/patches/src680/reportdesigner-no-license.diff

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Fri Jan 18 13:24:01 2008
@@ -211,16 +211,21 @@
 # move gl_ES to localedata_es to save dependency & memory
 i18npool-less-dependencies.diff, i#84206, jholesov
 
+[ TemporaryHacks < ooh680-m4 ]
 # dont initialize forms on the Writer startup, rather do it when the first form
 # control is created
 svx-delay-load-forms.diff, i#84259, jholesov
 
+[ TemporaryHacks ]
 # Make the historically very verbose build quieter, helps us see warnings.
 quiet-build.diff, i#84497, michael
 
 # further performance tweaks to configmgr
 speed-configmgr-misc.diff, i#84751, michael
 
+# gcc OOMs here otherwise (x86_64)
+writerfilter-qnametostr-NOOPTFILES.diff
+
 [ CJK ]
 #set default CJK font fontsize as 10.5pt
 sw-default-cjk-fontsize.diff i#72010, jianhua
@@ -357,8 +362,6 @@
 # no bogus license question when registering this extension
 reportdesigner-no-license.diff
 
-
-
 [ Fixes ]
 # sd printing fixes
 printing-bugfix-254573.diff, n#254573, rodo
@@ -461,6 +464,10 @@
 # Fix pasting Czech characters (UTF-8 html was not treated as UTF-8)
 sw-paste-czech-characters.diff, i#84642, n#334930, jholesov
 
+[ Fixes == ooh680-m3 ]
+# not REPRORTJARFILES
+reportdesigner-fix-jarlist.diff, i#85359
+
 [ SELinux ]
 # make OOo work under SELinux
 ooo80816.selinux.bridges.diff, i#80816
@@ -666,9 +673,11 @@
 # Launch navigator when double-clicking the leftmost status area box.
 sc-status-bar-launch-navigator.diff, i#49491, kohei
 
+[ CalcFixes < ooh680-m4 ]
 # Fix crashes on erf(0.65).  This is fixed in dr58 CWS upstream.
 scaddins-erf-crash-fix-065.diff, i#84395, kohei
 
+[ CalcFixes ]
 # Import sheet names properly from Lotus 1-2-3 document.
 sc-lotus123-import-sheetname.diff, i#84496, kohei
 
@@ -1906,7 +1915,7 @@
 palette-enhanced-hatch.diff
 
 [ DebianBaseOnly ]
-#debian-system-jfreereport.diff
+debian-system-jfreereport.diff
 
 [ Fixes ]
 svx-sdrobjeditview-update-edit-area.diff, n#305205, rodo

Modified: trunk/patches/src680/debian-system-jfreereport.diff
==============================================================================
--- trunk/patches/src680/debian-system-jfreereport.diff	(original)
+++ trunk/patches/src680/debian-system-jfreereport.diff	Fri Jan 18 13:24:01 2008
@@ -30,21 +30,21 @@
 diff -u -u -r1.10.2.1 makefile.mk
 --- reportdesign/util/makefile.mk    11 Jan 2008 08:21:17 -0000      1.10.2.1
 +++ reportdesign/util/makefile.mk    15 Jan 2008 01:33:52 -0000
-@@ -234,17 +234,6 @@
- .ENDIF  # "$(GUI)"!="WNT"
-
- REPRORTJARFILES := \
--       $(ZIP1DIR)$/flute-1.3-jfree-20061107.jar                                                        \
--       $(ZIP1DIR)$/jcommon-1.0.10.jar                                                                          \
--       $(ZIP1DIR)$/jcommon-serializer-0.2.0.jar                                                        \
--       $(ZIP1DIR)$/libfonts-0.3.3.jar                                                                          \
--       $(ZIP1DIR)$/libformula-0.1.14.jar                                                                       \
--       $(ZIP1DIR)$/liblayout-0.2.8.jar                                                                         \
--       $(ZIP1DIR)$/libloader-0.3.6.jar                                                                         \
--       $(ZIP1DIR)$/librepository-0.1.4.jar                                                                     \
--       $(ZIP1DIR)$/libxml-0.9.9.jar                                                                            \
--       $(ZIP1DIR)$/pentaho-reporting-flow-engine-0.9.2.jar                                     \
--       $(ZIP1DIR)$/sac.jar                                                                                                     \
+@@ -226,17 +226,6 @@
+                        $(ZIP1DIR)$/readme_en-US.txt
+ 
+ REPORTJARFILES := \
+-       $(ZIP1DIR)$/flute-1.3-jfree-20061107.jar                               \
+-       $(ZIP1DIR)$/jcommon-1.0.10.jar                                         \
+-       $(ZIP1DIR)$/jcommon-serializer-0.2.0.jar                               \
+-       $(ZIP1DIR)$/libfonts-0.3.3.jar                                         \
+-       $(ZIP1DIR)$/libformula-0.1.14.jar                                      \
+-       $(ZIP1DIR)$/liblayout-0.2.8.jar                                        \
+-       $(ZIP1DIR)$/libloader-0.3.6.jar                                        \
+-       $(ZIP1DIR)$/librepository-0.1.4.jar                                    \
+-       $(ZIP1DIR)$/libxml-0.9.9.jar                                           \
+-       $(ZIP1DIR)$/pentaho-reporting-flow-engine-0.9.2.jar                    \
+-       $(ZIP1DIR)$/sac.jar                                                    \
         $(ZIP1DIR)$/sun-report-builder.jar
-
+ 
  # --- Targets ----------------------------------

Added: trunk/patches/src680/reportdesigner-fix-jarlist.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/reportdesigner-fix-jarlist.diff	Fri Jan 18 13:24:01 2008
@@ -0,0 +1,11 @@
+--- reportdesign/util/makefile.mk-old	2008-01-18 12:56:07.000000000 +0100
++++ reportdesign/util/makefile.mk	2008-01-18 12:55:20.000000000 +0100
+@@ -225,7 +225,7 @@
+ 			$(ZIP1DIR)$/readme_en-US.html \
+ 			$(ZIP1DIR)$/readme_en-US.txt
+ 
+-REPRORTJARFILES := \
++REPORTJARFILES := \
+ 	$(ZIP1DIR)$/flute-1.3-jfree-20061107.jar							\
+ 	$(ZIP1DIR)$/jcommon-1.0.10.jar										\
+ 	$(ZIP1DIR)$/jcommon-serializer-0.2.0.jar							\

Modified: trunk/patches/src680/reportdesigner-no-license.diff
==============================================================================
--- trunk/patches/src680/reportdesigner-no-license.diff	(original)
+++ trunk/patches/src680/reportdesigner-no-license.diff	Fri Jan 18 13:24:01 2008
@@ -25,7 +25,7 @@
  
  .IF "$(ZIP1TARGETN)"!=""
 -$(ZIP1TARGETN) :  $(TXTFILES) $(XMLFILES) $(HTMLFILES) $(REPORTJARFILES)
-+$(ZIP1TARGETN) :  $$(XMLFILES) $(HTMLFILES) $(REPORTJARFILES)
++$(ZIP1TARGETN) :  $(XMLFILES) $(HTMLFILES) $(REPORTJARFILES)
  .ENDIF          # "$(ZIP1TARGETN)"!="
  
  $(MISC)$/update_report.flag : $(XCU_FILES)

Added: trunk/patches/src680/writerfilter-qnametostr-NOOPTFILES.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/writerfilter-qnametostr-NOOPTFILES.diff	Fri Jan 18 13:24:01 2008
@@ -0,0 +1,17 @@
+Index: source/resourcemodel/makefile.mk
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/resourcemodel/makefile.mk,v
+retrieving revision 1.5.12.13
+diff -u -u -r1.5.12.13 makefile.mk
+--- writerfilter/source/resourcemodel/makefile.mk	7 Dec 2007 09:39:19 -0000	1.5.12.13
++++ writerfilter/source/resourcemodel/makefile.mk	18 Jan 2008 08:10:31 -0000
+@@ -50,6 +50,9 @@
+ 
+ # --- Files --------------------------------------------------------
+ 
++NOOPTFILES= \
++	$(SLO)$/qnametostr.obj
++
+ SLOFILES= \
+ 	$(SLO)$/qnametostr.obj \
+ 	$(SLO)$/sprmcodetostr.obj \
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]