GNOME.org
 

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

Author: rengelhard
Date: Tue Aug  5 22:27:20 2008
New Revision: 13479
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13479&view=rev

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

        * patches/dev300/apply,
          patches/dev300/debian-splash.diff,
          patches/dev300/debian-splash-m29.diff,
          patches/dev300/debian-system-lucene.diff,
          patches/dev300/debian-system-lucene-m29.diff,
          patches/dev300/configures-explicit-arch.diff,
          patches/dev300/configures-explicit-arch-m29.diff: first part of
          ooo300-m1 update (and with it also some m29/m30 things)


Added:
   trunk/patches/dev300/configures-explicit-arch-m29.diff   (props changed)
      - copied unchanged from r13476, /trunk/patches/dev300/configures-explicit-arch.diff
   trunk/patches/dev300/debian-splash-m29.diff   (props changed)
      - copied unchanged from r13476, /trunk/patches/dev300/debian-splash.diff
   trunk/patches/dev300/debian-system-lucene-m29.diff   (props changed)
      - copied unchanged from r13476, /trunk/patches/dev300/debian-system-lucene.diff
   trunk/patches/dev300/nsplugin-path-m28.diff
      - copied unchanged from r13476, /trunk/patches/dev300/nsplugin-path.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/configures-explicit-arch.diff
   trunk/patches/dev300/debian-splash.diff
   trunk/patches/dev300/debian-system-lucene.diff
   trunk/patches/dev300/nsplugin-path.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Aug  5 22:27:20 2008
@@ -395,12 +395,18 @@
 # IMPORTANT: the second part of the patch is build-ant-1.6-swext.diff
 build-ant-1.6.diff, i#90830, pmladek
 
-[ Fixes ]
-# sd printing fixes
-printing-bugfix-254573.diff, n#254573, rodo
 
+# FIXME: Was fixed in m1 as masterfix. I'd bet it will be in m30, too, but...
+[ Fixes >= dev300-m30 >= ooo300-m1 ]
 # more intelligent nsplugin seeking
 nsplugin-path.diff, i#49590, michael
+[ Fixes < dev300-m30 < ooo300-m1 ]
+# more intelligent nsplugin seeking
+nsplugin-path-m28.diff, i#49590, michael
+
+[ Fixes ]
+# sd printing fixes
+printing-bugfix-254573.diff, n#254573, rodo
 
 # use basic (advanced) shapes for rectangle/ellipse on draw/impress's toolbars. make shapes wrap words by default, n#171052, rodo
 sd-toolbar-advanced-shapes.diff, n#171052, rodo
@@ -858,11 +864,14 @@
 reportdesign-mention-package.diff, rengelha
 
 
-[ DebianOnly ]
-
+[ DebianOnly >= dev300-m20 >= ooo300-m1]
 SectionOwner => rengelha
 # fix the splash progressbar colors
 debian-splash.diff
+[ DebianOnly < dev300-m30 < ooo300-m1 ]
+SectionOwner => rengelha
+# fix the splash progressbar colors
+debian-splash-m29.diff
 
 [ DroplineGNOMEOnly ]
 SectionOwner => DropLine
@@ -919,6 +928,14 @@
 # strictly required on SL10.1/SLED10 where the xulrunner-nss.pc is broken
 libxmlsec-system-nss.diff, i#69368, n#195272, pmladek
 
+
+[ BuildBits < dev300-m39 < ooo300-m1 ]
+# fix the --enable-reportdesign configure check to work
+buildfix-enable-reportdesign-check.diff, i#87518, pmladek
+
+# fix evo2 driver build
+buildfix-connectivity-evoab2.diff, i#91025, pmladek
+
 [ BuildBits ]
 novell-win32-agfa-monotype-fonts.diff, tml
 
@@ -926,9 +943,7 @@
 # even when it is built with JDK 1.5
 build-java-target.diff, pmladek
 
-# fix the --enable-reportdesign configure check to work
-buildfix-enable-reportdesign-check.diff, i#87518, pmladek
-
+[ BuildBits ]
 # do not create '.' subdirectories
 # omit './' in paths
 solenv-installer-cleaner-paths.diff, pmladek
@@ -938,9 +953,6 @@
 # gid_Module_Langpack_Basis_es.es
 solenv-installer-lang-filelist-names.diff, pmladek
 
-# fix evo2 driver build
-buildfix-connectivity-evoab2.diff, i#91025, pmladek
-
 # allow to get path also from ./file
 # otherwise, it installed the license files into ugly subdirectories
 # for example into <ooo-home>/LICENSE.html/LICENSE.html
@@ -2070,11 +2082,15 @@
 debian-system-jfreereport.diff
 [ DebianBaseSystemApacheCommons ]
 debian-system-apache-commons.diff
-[ DebianBaseSystemLucene ]
+[ DebianBaseSystemLucene >= dev300-m30 >= ooo300-m1 ]
 debian-system-lucene.diff
+[ DebianBaseSystemLucene < dev300-m30 < ooo300-m1 ]
+debian-system-lucene-m29.diff
 
-[ DebianBaseOnly ]
+[ DebianBaseOnly >= dev300-m30 >= ooo300-m1 ]
 configures-explicit-arch.diff
+[ DebianBaseOnly < dev300-m30 < ooo300-m1 ]
+configures-explicit-arch-m29.diff
 
 [ Fixes ]
 svx-sdrobjeditview-update-edit-area.diff, n#305205, n#347355, rodo
@@ -2283,8 +2299,11 @@
 cppcanvas-fix-roundcorners.diff, rodo
 slideshow-media-control.diff, i#91250, thorsten
 
+[ Fixes < dev300-m29 < ooo300-m1 ]
 vcl-linking-randr.diff, i#90809, n#398244, thorsten
+vcl-gtk-slideshow-crash.diff, i#91496, thorsten
 
+[ Fixes ]
 sd-macro-nudges.diff, i#91249, n#188199, thorsten
 
 sd-more-title-styles.diff, i#23221, thorsten
@@ -2293,7 +2312,6 @@
 config_office-disable-atl.diff, thorsten
 xmlsecurity-disable-moz.diff, thorsten
 solenv-paths.diff, caolan
-vcl-gtk-slideshow-crash.diff, i#91496, thorsten
 cairocanvas-colorspace-fix.diff, thorsten
 slideshow-colorspace-fix.diff, thorsten
 slideshow-cutblack.diff, thorsten

Modified: trunk/patches/dev300/configures-explicit-arch.diff
==============================================================================
--- trunk/patches/dev300/configures-explicit-arch.diff	(original)
+++ trunk/patches/dev300/configures-explicit-arch.diff	Tue Aug  5 22:27:20 2008
@@ -114,22 +114,6 @@
  
  BUILD_DIR=$(CONFIGURE_DIR)
  
-Index: freetype/makefile.mk
-===================================================================
-RCS file: /cvs/external/freetype/makefile.mk,v
-retrieving revision 1.24
-diff -u -u -r1.24 makefile.mk
---- freetype/makefile.mk	3 Aug 2007 13:56:02 -0000	1.24
-+++ freetype/makefile.mk	11 Apr 2008 07:54:08 -0000
-@@ -62,7 +62,7 @@
- #relative to CONFIGURE_DIR
- .IF "$(OS)"=="MACOSX"
- CONFIGURE_ACTION=./configure
--CONFIGURE_FLAGS=--with-pic --without-zlib
-+CONFIGURE_FLAGS=--with-pic --without-zlib --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
- .ELSE
- CONFIGURE_ACTION=$(GNUMAKE)
- CONFIGURE_FLAGS=setup CFG="--with-pic --without-zlib"
 Index: icu/makefile.mk
 ===================================================================
 RCS file: /cvs/external/icu/makefile.mk,v

Modified: trunk/patches/dev300/debian-splash.diff
==============================================================================
--- trunk/patches/dev300/debian-splash.diff	(original)
+++ trunk/patches/dev300/debian-splash.diff	Tue Aug  5 22:27:20 2008
@@ -1,11 +1,11 @@
---- scp2/source/ooo/ooo_brand-old	2005-09-14 23:48:03.232375952 +0200
-+++ scp2/source/ooo/ooo_brand.scp	2005-09-14 23:48:32.327952752 +0200
-@@ -61,7 +61,7 @@
-     Section = "Bootstrap";
-     Order = 2;
-     Key = "ProgressBarColor";
--    Value = "4,68,155";
-+    Value = "215,7,81";
- End
- 
- ProfileItem gid_Brand_Profileitem_Soffice_ProgressFrameColor
+--- instsetoo_native/util/openoffice.lst-old	2008-08-06 00:03:46.000000000 +0200
++++ instsetoo_native/util/openoffice.lst	2008-08-06 00:04:01.000000000 +0200
+@@ -23,7 +23,7 @@
+ 			LIBRARYVERSION 9.0.0
+             REGISTRATION_HOST https://registration2.services.openoffice.org/RegistrationWeb
+ 			REGISTRATIONURL http://survey.services.openoffice.org/user/index.php
+-			PROGRESSBARCOLOR 4,68,155
++			PROGRESSBARCOLOR 215,7,81
+ 			PROGRESSSIZE 412,7
+ 			PROGRESSPOSITION 14,230
+ 			PROGRESSFRAMECOLOR 58,159,232

Modified: trunk/patches/dev300/debian-system-lucene.diff
==============================================================================
--- trunk/patches/dev300/debian-system-lucene.diff	(original)
+++ trunk/patches/dev300/debian-system-lucene.diff	Tue Aug  5 22:27:20 2008
@@ -7,5 +7,5 @@
 +++ xmlhelp/source/com/sun/star/help/MANIFEST.MF	27 Jun 2008 21:05:05 -0000
 @@ -1,2 +1,2 @@
  RegistrationClassName: com.sun.star.help.HelpSearch
--Class-Path: lucene-core-2.3.jar
-+Class-Path: file:///usr/share/java/lucene-core.jar
+-Class-Path: lucene-core-2.3.jar lucene-analyzers-2.3.jar
++Class-Path: file:///usr/share/java/lucene-core.jar file:///usr/share/java/lucene-analyzers.jar

Modified: trunk/patches/dev300/nsplugin-path.diff
==============================================================================
--- trunk/patches/dev300/nsplugin-path.diff	(original)
+++ trunk/patches/dev300/nsplugin-path.diff	Tue Aug  5 22:27:20 2008
@@ -5,9 +5,9 @@
  #include <sys/types.h>
  #include <strings.h>
 +#include <dlfcn.h>
- #if defined(SOLARIS) && !defined(__GNUC__)
- #include <varargs.h>
- #else
+ #include <stdarg.h>
+ // For vsnprintf()
+ #define NSP_vsnprintf vsnprintf
 @@ -125,6 +126,96 @@ restoreUTF8(char *pPath)
      return 0;
  }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]