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

From: rengelhard svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r11260 - in trunk: . patches/src680
Date: Tue, 15 Jan 2008 02:38:43 +0000 (GMT)
Author: rengelhard
Date: Tue Jan 15 02:38:43 2008
New Revision: 11260
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11260&view=rev

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

        * patches/src680/apply,
          patches/src680/unxsplash-rework-m1.diff,
          patches/src680/unxsplash-rework.diff,
          patches/src680/cws-unifysound01-vcl-m1.diff,
          patches/src680/cws-unifysound01-vcl.diff,
          patches/src680/reportdesigner-no-license-m1.diff,
          patches/src680/reportdesigner-no-license.diff: ooh680-m2
        * patches/src680/debian-system-jfreereport.diff: unconditionally
          update for m2 ...
        * patches/src680/apply: ... but disable for now because we don't
          have the libs in the archive yet
        * patches/src680/apply: disable
          buildfix-x86-64-visibility-workaround-binfilter.diff ad that contains
          writerfilter(!) hunks and doeesn't apply. FIXME.
        * patches/src680/apply,
          patches/src680/buildfix-libformula-gcj-source.diff: buildfix for
          libformula with gcj


Added:
   trunk/patches/src680/buildfix-libformula-gcj-source.diff
   trunk/patches/src680/cws-unifysound01-vcl-m1.diff
      - copied unchanged from r11245, /trunk/patches/src680/cws-unifysound01-vcl.diff
   trunk/patches/src680/reportdesigner-no-license-m1.diff
      - copied unchanged from r11245, /trunk/patches/src680/reportdesigner-no-license.diff
   trunk/patches/src680/unxsplash-rework-m1.diff
      - copied unchanged from r11245, /trunk/patches/src680/unxsplash-rework.diff
Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply
   trunk/patches/src680/cws-unifysound01-vcl.diff
   trunk/patches/src680/debian-system-jfreereport.diff
   trunk/patches/src680/reportdesigner-no-license.diff
   trunk/patches/src680/unxsplash-rework.diff

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Tue Jan 15 02:38:43 2008
@@ -271,11 +271,21 @@
 cws-unifysound01-solenv.diff
 cws-unifysound01-svx.diff
 cws-unifysound01-sw.diff
+
+[ CWSBackports < ooh680-m2 ]
+cws-unifysound01-vcl-m1.diff
+
+[ CWSBackports >= ooh680-m2 ]
 cws-unifysound01-vcl.diff
 
+[ CWSBackports ]
 # Use stlport just on the archs where it is needed from historical reasons
 cws-newportstl.diff
+
+[ CWSBackports < ooh680-m2 ]
 buildfix-stl-anachronism.diff, i#83519
+
+[ CWSBackports ]
 # not for upstreaming: hack to work even on gcc's with broken -fvisibility-inlines-hidden
 buildfix-x86-64-visibility-workaround.diff
 
@@ -301,6 +311,8 @@
 # JDKs too
 buildfix-qadevOOo-java-encoding.diff, brosenk
 
+[ GCJ >= ooh680-m2 ]
+buildfix-libformula-gcj-source.diff, i#85249
 
 # Fixes that were not accepted up-stream, but are still useful
 [ FixesNotForUpstream ]
@@ -326,10 +338,16 @@
 #and still want to have the cairo canvas working
 x11_extensions-new-xrender-headers.diff
 
+sdext-no-license.diff
+
+[ FixesNotForUpstream < ooh680-m2 ]
+# no bogus license question when registering this extension
+reportdesigner-no-license-m1.diff
+
+[ FixesNotForUpstream >= ooh680-m2 ]
 # no bogus license question when registering this extension
 reportdesigner-no-license.diff
 
-sdext-no-license.diff
 
 
 [ Fixes ]
@@ -490,10 +508,15 @@
 gnome-vfs-late-init.diff, i#84137, jholesov
 
 
-[ QuickStarter ]
+[ QuickStarter < ooh680-m2 ]
+# External splash screen implementation / 2nd time accelerator
+unxsplash-rework-m1.diff, i#60696, michael/jholesov
+
+[ QuickStarter >= ooh680-m2 ]
 # External splash screen implementation / 2nd time accelerator
 unxsplash-rework.diff, i#60696, michael/jholesov
 
+[ QuickStarter ]
 # handling of osl pipe has changed, see i#84045
 unxsplash-new-osl-pipe.diff, i#60696, jholesov
 
@@ -979,7 +1002,8 @@
 stlport-solaris-fileno.diff, fridrich
 #FIXME ooh680: gcc-4.3-binfilter.diff, i#83276, pmladek
 
-buildfix-x86-64-visibility-workaround-binfilter.diff
+# FIXME: contains writerfilter!?
+#buildfix-x86-64-visibility-workaround-binfilter.diff
 
 [ VCL ]
 
@@ -1848,7 +1872,7 @@
 palette-enhanced-hatch.diff
 
 [ DebianBaseOnly ]
-debian-system-jfreereport.diff
+#debian-system-jfreereport.diff
 
 [ Fixes ]
 svx-sdrobjeditview-update-edit-area.diff, n#305205, rodo

Added: trunk/patches/src680/buildfix-libformula-gcj-source.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/buildfix-libformula-gcj-source.diff	Tue Jan 15 02:38:43 2008
@@ -0,0 +1,20 @@
+? buildfix-libformula-gcj.diff
+? unxlngppc.pro
+Index: patches/libformula.patch
+===================================================================
+RCS file: /cvs/external/jfreereport/patches/libformula.patch,v
+retrieving revision 1.2.8.1
+diff -u -u -r1.2.8.1 libformula.patch
+--- jfreereport/patches/libformula.patch	11 Jan 2008 08:28:50 -0000	1.2.8.1
++++ jfreereport/patches/libformula.patch	15 Jan 2008 02:26:11 -0000
+@@ -15,7 +15,7 @@
+   #
+   # Make sure that JDK 1.2 compatible class files are generated
+   build.target=1.4
+-! build.source=1.2
++! build.source=1.3
+   build.retro.target=1.2
+   build.retro.jdk=/opt/jdk1.2.2
+-  
+\ No newline at end of file
++  

Modified: trunk/patches/src680/cws-unifysound01-vcl.diff
==============================================================================
--- trunk/patches/src680/cws-unifysound01-vcl.diff	(original)
+++ trunk/patches/src680/cws-unifysound01-vcl.diff	Tue Jan 15 02:38:43 2008
@@ -238,14 +238,14 @@
 RCS file: /cvs/gsl/vcl/aqua/source/app/salinst.cxx,v
 retrieving revision 1.40
 retrieving revision 1.38.10.3
-@@ -58,7 +58,6 @@
- 
- SLOFILES=   $(SLO)$/salinst.obj			\
- 			$(SLO)$/saltimer.obj		\
--			$(SLO)$/salsound.obj		\
- 			$(SLO)$/salsys.obj
- 
- .ENDIF		# "$(GUIBASE)"!="aqua"
+@@ -61,7 +61,6 @@
+             $(SLO)$/vclnsapp.obj        \
+                        $(SLO)$/saltimer.obj            \
+                        $(SLO)$/salnstimer.obj          \
+-                       $(SLO)$/salsound.obj            \
+                        $(SLO)$/salsys.obj
+
+ .ENDIF         # "$(GUIBASE)"!="aqua"
 diff -u -p -u -p -r1.40 -r1.38.10.3
 --- vcl/aqua/source/app/salinst.cxx	9 Oct 2007 15:12:57 -0000	1.40
 +++ vcl/aqua/source/app/salinst.cxx	16 Oct 2007 08:32:33 -0000	1.38.10.3

Modified: trunk/patches/src680/debian-system-jfreereport.diff
==============================================================================
--- trunk/patches/src680/debian-system-jfreereport.diff	(original)
+++ trunk/patches/src680/debian-system-jfreereport.diff	Tue Jan 15 02:38:43 2008
@@ -1,45 +1,50 @@
---- reportdesign/util/makefile.mk-old	2007-12-10 00:09:42.000000000 +0100
-+++ reportdesign/util/makefile.mk	2007-12-10 00:10:04.000000000 +0100
-@@ -218,17 +218,6 @@
- 			$(ZIP1DIR)$/readme_en-US.txt
- 
- REPORTJARFILES := \
--	$(ZIP1DIR)$/jcommon-1.0.10.jar						\
--	$(ZIP1DIR)$/sac.jar							\
--	$(ZIP1DIR)$/libxml-0.9.5.jar						\
--	$(ZIP1DIR)$/flute-1.3-jfree-20061107.jar				\
--	$(ZIP1DIR)$/jfreereport-0.9.0-05.jar					\
--	$(ZIP1DIR)$/liblayout-0.2.6.jar						\
--	$(ZIP1DIR)$/libloader-0.3.4.jar						\
--	$(ZIP1DIR)$/libformula-0.1.8.jar					\
--	$(ZIP1DIR)$/librepository-0.1.1.jar					\
--	$(ZIP1DIR)$/libfonts-0.2.6.jar						\
--	$(ZIP1DIR)$/jcommon-serializer-0.1.0.jar				\
- 	$(ZIP1DIR)$/sun-report-builder.jar
- 
- # --- Targets ----------------------------------
 Index: java/com/sun/star/report/pentaho/Manifest.mf
 ===================================================================
 RCS file: /cvs/dba/reportdesign/java/com/sun/star/report/pentaho/Manifest.mf,v
-retrieving revision 1.2
-diff -u -u -r1.2 Manifest.mf
---- reportdesign/java/com/sun/star/report/pentaho/Manifest.mf        9 Jul 2007 11:56:04 -0000       1.2
-+++ reportdesign/java/com/sun/star/report/pentaho/Manifest.mf        6 Nov 2007 12:32:45 -0000
-@@ -1,7 +1,12 @@
+retrieving revision 1.2.68.1
+diff -u -u -r1.2.68.1 Manifest.mf
+--- reportdesign/java/com/sun/star/report/pentaho/Manifest.mf        11 Jan 2008 08:20:34 -0000      1.2.68.1
++++ reportdesign/java/com/sun/star/report/pentaho/Manifest.mf        15 Jan 2008 01:33:52 -0000
+@@ -1,6 +1,13 @@
  RegistrationClassName: com.sun.star.report.pentaho.SOReportJobFactory
--Class-Path: jcommon-1.0.10.jar sac.jar 
--  libxml-0.9.5.jar flute-1.3-jfree-20061107.jar jfreereport-0.9.0-05.jar
--  liblayout-0.2.6.jar libloader-0.3.4.jar libfonts-0.2.6.jar
--  jcommon-serializer-0.1.0.jar libformula-0.1.8.jar 
--  librepository-0.1.1.jar
-+Class-Path: file:///usr/share/java/jcommon-1.0.10.jar
-+  file:///usr/share/java/sac.jar file:///usr/share/java/libxml-0.9.5.jar
-+  file:///usr/share/java/flute-1.3-jfree-20061107.jar
-+  file:///usr/share/java/jfreereport-0.9.0-05.jar
-+  file:///usr/share/java/liblayout-0.2.6.jar
-+  file:///usr/share/java/libloader-0.3.4.jar
-+  file:///usr/share/java/libfonts-0.2.6.jar
-+  file:///usr/share/java/jcommon-serializer-0.1.0.jar
-+  file:///usr/share/java/libformula-0.1.8.jar 
-+  file:///usr/share/java/librepository-0.1.1.jar
- UNO-Type-Path: 
+-Class-Path: flute-1.3-jfree-20061107.jar jcommon-1.0.10.jar
+-  jcommon-serializer-0.2.0.jar libfonts-0.3.3.jar libformula-0.1.14.jar
+-  liblayout-0.2.8.jar libloader-0.3.6.jar librepository-0.1.4.jar
+-  libxml-0.9.9.jar pentaho-reporting-flow-engine-0.9.2.jar sac.jar
++Class-Path: file:///usr/share/java/flute-1.3-jfree-20061107.jar
++  file:///usr/share/java/jcommon-1.0.10.jar
++  file:///usr/share/java/jcommon-serializer-0.2.0.jar
++  file:///usr/share/java/libfonts-0.3.3.jar
++  file:///usr/share/java/libformula-0.1.14.jar
++  file:///usr/share/java/liblayout-0.2.8.jar
++  file:///usr/share/java/libloader-0.3.6.jar
++  file:///usr/share/java/librepository-0.1.4.jar
++  file:///usr/share/java/libxml-0.9.9.jar
++  file:///usr/share/java/pentaho-reporting-flow-engine-0.9.2.jar
++  file:///usr/share/java/sac.jar
+ UNO-Type-Path:
+Index: util/makefile.mk
+===================================================================
+RCS file: /cvs/dba/reportdesign/util/makefile.mk,v
+retrieving revision 1.10.2.1
+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                                                                                                     \
+        $(ZIP1DIR)$/sun-report-builder.jar
+
+ # --- Targets ----------------------------------

Modified: trunk/patches/src680/reportdesigner-no-license.diff
==============================================================================
--- trunk/patches/src680/reportdesigner-no-license.diff	(original)
+++ trunk/patches/src680/reportdesigner-no-license.diff	Tue Jan 15 02:38:43 2008
@@ -6,9 +6,9 @@
 --- reportdesign/util/makefile.mk	27 Aug 2007 08:18:57 -0000	1.3.4.1.4.4
 +++ reportdesign/util/makefile.mk	30 Aug 2007 14:55:14 -0000
 @@ -225,14 +225,6 @@
- 			$(ZIP1DIR)$/readme_en-US.html \
- 			$(ZIP1DIR)$/readme_en-US.txt
- 
+                        $(ZIP1DIR)$/readme_en-US.html \
+                        $(ZIP1DIR)$/readme_en-US.txt
+
 -.IF "$(GUI)"!="WNT"
 -TXTFILES:=$(foreach,i,$(alllangiso) $(ZIP1DIR)$/registration$/LICENSE_$i)
 -LICLINES:=$(foreach,i,$(TXTFILES)  <license-text xlink:href="registration/$(i:f)" lang="$(subst,LICENSE_, $(i:f))" license-id="$(subst,LICENSE_, $(i:f))" />)
@@ -17,9 +17,9 @@
 -LICLINES:=$(foreach,i,$(TXTFILES)  <license-text xlink:href="registration/$(i:f)" lang="$(subst,.txt, $(subst,license_, $(i:f)))" license-id="$(subst,.txt, $(subst,license_, $(i:f)))" />)
 -.ENDIF  # "$(GUI)"!="WNT"
 -
- REPORTJARFILES := \
- 	$(ZIP1DIR)$/jcommon-1.0.10.jar										\
- 	$(ZIP1DIR)$/sac.jar													\
+ REPRORTJARFILES := \
+        $(ZIP1DIR)$/flute-1.3-jfree-20061107.jar                                                        \
+        $(ZIP1DIR)$/jcommon-1.0.10.jar                                                                          \
 @@ -251,7 +243,7 @@
  .INCLUDE : target.mk
  
@@ -57,7 +57,7 @@
 @@ -1,5 +1,3 @@
 -    </simple-license>
 -  </registration>
-   <version value="1.0.1"/>
+   <version value="1.0.2"/>
    <identifier value="com.sun.reportdesigner"/>
    <dependencies>
 Index: util/pre.xml

Modified: trunk/patches/src680/unxsplash-rework.diff
==============================================================================
--- trunk/patches/src680/unxsplash-rework.diff	(original)
+++ trunk/patches/src680/unxsplash-rework.diff	Tue Jan 15 02:38:43 2008
@@ -202,20 +202,19 @@
 +		AddStringListParam_Impl( CMD_STRINGPARAM_SPLASHPIPE, aArgStr.Copy( 13 ) );
 +		return sal_True;
 +    }
-     else if ( aArgStr.Copy(0, 8).EqualsIgnoreCaseAscii( "-accept=" ))
-     {
- 		AddStringListParam_Impl( CMD_STRINGPARAM_ACCEPT, aArgStr.Copy( 8 ) );
-@@ -875,7 +880,9 @@ sal_Bool CommandLineArgs::IsEmptyOrAcceptOnly() const
+     #ifdef MACOSX
+     /* #i84053# ignore -psn on Mac
+       Platform dependent #ifdef here is ugly, however this is currently
+@@ -929,7 +929,8 @@
  {
      osl::MutexGuard  aMutexGuard( m_aMutex );
- 
--    return m_eArgumentCount == NONE || ( ( m_eArgumentCount == ONE ) && ( m_aStrParams[ CMD_STRINGPARAM_ACCEPT ].getLength() ) );
+
+-    return m_eArgumentCount == NONE ||
 +    return m_eArgumentCount == NONE ||
-+        ( ( m_eArgumentCount == ONE ) && ( m_aStrParams[ CMD_STRINGPARAM_SPLASHPIPE ].getLength() ) ) ||
-+        ( ( m_eArgumentCount == ONE ) && ( m_aStrParams[ CMD_STRINGPARAM_ACCEPT ].getLength() ) );
++           ( ( m_eArgumentCount == ONE ) && ( m_aStrParams[ CMD_STRINGPARAM_SPLASHPIPE ].getLength() )) ||
+            ( ( m_eArgumentCount == ONE ) && ( m_aStrParams[ CMD_STRINGPARAM_ACCEPT ].getLength() )) ||
+            ( ( m_eArgumentCount == ONE ) && ( m_aBoolParams[ CMD_BOOLPARAM_PSN ] ));
  }
- 
- } // namespace desktop
 diff --git a/desktop/source/app/cmdlineargs.hxx b/desktop/source/app/cmdlineargs.hxx
 index 877a909..83f1c67 100644
 --- desktop/source/app/cmdlineargs.hxx
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]