ooo-build r15206 - in trunk: . patches/dev300 patches/gstreamer patches/postgresql

From: rengelhard svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r15206 - in trunk: . patches/dev300 patches/gstreamer patches/postgresql
Date: Wed, 28 Jan 2009 13:22:34 +0000 (UTC)
Author: rengelhard
Date: Wed Jan 28 13:22:34 2009
New Revision: 15206
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15206&view=rev

Log:
2009-01-28  Rene Engelhard  <rene debian org>

        * patches/dev300/apply,
          patches/dev300/ooo59127.vcl.honourcairofont.diff,
          patches/dev300/ooo59127.vcl.honourcairofont-m39.diff,
          patches/gstreamer/gstreamer-config-office.diff,
          patches/gstreamer/gstreamer-config-office-m39.diff,
          patches/postgresql/sdbc-postgresql-config_office.diff,
          patches/postgresql/sdbc-postgresql-config_office-m39.diff,
          patches/dev300/internal-mesa-headers-config_office.diff,
          patches/dev300/internal-mesa-headers-config_office-m49.diff
          : m40

        * patches/dev300/cws-impress-161.diff: move ...
        * patches/dev300/cws-impress161.diff: ... this
        * patches/dev300/apply: adapt

        * patches/dev300/seamonkey-is-iceape.diff,
          patches/dev300/system-lpsolve-rpath.diff,
          patches/dev300/configures-explicit-arch.diff: update unconditionally
          for m40

        * patches/dev300/novell-win32-agfa-monotype-fonts.diff: revert mmeeks'
          "fix"
        * patches/dev300/apply: fix the conditionals instead


Added:
   trunk/patches/dev300/cws-impress161.diff   (props changed)
      - copied unchanged from r15203, /trunk/patches/dev300/cws-impress-161.diff
   trunk/patches/dev300/internal-mesa-headers-config_office-m39.diff
      - copied unchanged from r15203, /trunk/patches/dev300/internal-mesa-headers-config_office.diff
   trunk/patches/dev300/ooo59127.vcl.honourcairofont-m39.diff
      - copied unchanged from r15203, /trunk/patches/dev300/ooo59127.vcl.honourcairofont.diff
   trunk/patches/gstreamer/gstreamer-config-office-m39.diff   (props changed)
      - copied unchanged from r15203, /trunk/patches/gstreamer/gstreamer-config-office.diff
Removed:
   trunk/patches/dev300/cws-impress-161.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/configures-explicit-arch.diff
   trunk/patches/dev300/internal-mesa-headers-config_office.diff
   trunk/patches/dev300/novell-win32-agfa-monotype-fonts.diff
   trunk/patches/dev300/ooo59127.vcl.honourcairofont.diff
   trunk/patches/dev300/seamonkey-is-iceape.diff
   trunk/patches/dev300/system-lpsolve-rpath.diff
   trunk/patches/gstreamer/gstreamer-config-office.diff
   trunk/patches/postgresql/sdbc-postgresql-config_office.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Jan 28 13:22:34 2009
@@ -1329,7 +1329,9 @@
 
 [ BuildBits < dev300-m38 ]
 novell-win32-agfa-monotype-fonts-m37.diff, tml
-[ BuildBits >= dev300-m38]
+[ BuildBits >= dev300-m38 < dev300-m40 ]
+novell-win32-agfa-monotype-fonts-m39.diff, tml
+[ BuildBits >= dev300-49 ]
 novell-win32-agfa-monotype-fonts.diff, tml
 
 [ BuildBits <= dev300-m39 ]
@@ -2305,11 +2307,13 @@
 [ PostgreSQL ]
 sdbc-postgresql.diff
 sdbc-postgresql-build-lst.diff
-sdbc-postgresql-config_office.diff
 connectivity-workben-postgresql.diff
 gcc-4.3-postgresql.diff
 
-
+[ PostgreSQL >= dev300-m40 ]
+sdbc-postgresql-config_office.diff
+[ PostgreSQL < dev300-m40 ]
+sdbc-postgresql-config_office-m39.diff
 
 [ ArkOnly ]
 SectionOwner => brosenk
@@ -2453,9 +2457,14 @@
 
 ooo86080.unopkg.bodge.diff
 
-[ CairoFonts ]
+[ CairoFonts < dev300-m40 ]
 # needs Gtk2.0 >= 2.10 and cairo, so this is on the own section
 ooo59127.vcl.honourcairofont.diff
+[ CairoFonts >= dev300-m40]
+# needs Gtk2.0 >= 2.10 and cairo, so this is on the own section
+ooo59127.vcl.honourcairofont.diff
+
+[ CairoFonts ]
 psprint-fontconfig-fix.diff, n#407958, thorsten
 
 [ GStreamer ]
@@ -2469,7 +2478,10 @@
 [ GStreamer <= dev300-m36 ]
 gstreamer-config-office-m36.diff
 
-[ GStreamer > dev300-m36 ]
+[ GStreamer > dev300-m36 < dev300-m40 ]
+gstreamer-config-office-m39.diff
+
+[ GStreamer >= dev300-m40 ]
 gstreamer-config-office.diff
 
 [ GStreamer ]
@@ -2917,9 +2929,11 @@
 
 sd-slideshow-slideshowview-transformation-fix.diff, rodo
 
+[ Fixes < dev300-m39 ]
+sd-inplace-deselection-fix.diff, i#89283, n#384506, thorsten
+
 [ Fixes ]
 sd-view-zoom-fix.diff, n#380013, i#88939, thorsten
-sd-inplace-deselection-fix.diff, i#89283, n#384506, thorsten
 
 sd-custom-show-fix.diff, n#355638, i#90145, thorsten
 
@@ -2962,8 +2976,13 @@
 # TODO file up-stream
 lockfile-less-symbols.diff, jholesov
 
-[ InternalMesaHeaders ]
+[ InternalMesaHeaders < dev300-m40 ]
+internal-mesa-headers-config_office-m39.diff, fridrich
+
+[ InternalMesaHeaders >= dev300-m40 ]
 internal-mesa-headers-config_office.diff, fridrich
+
+[ InternalMesaHeaders ]
 internal-mesa-headers-slideshow.diff, fridrich
 internal-mesa-headers-mesa.diff, fridrich
 
@@ -2995,8 +3014,10 @@
 cppcanvas-fix-roundcorners.diff, rodo
 slideshow-media-control.diff, i#91250, thorsten
 
+[ Fixes < dev300-m39 ]
 sd-macro-nudges.diff, i#91249, n#188199, thorsten
 
+[ Fixes ]
 sd-more-title-styles.diff, i#23221, thorsten
 officecfg-bighandles-default.diff, thorsten
 
@@ -3154,8 +3175,9 @@
 cws-impress162-slideshow.diff, i#94193, thorsten
 [ Fixes < dev300-m38 ]
 slideshow-blink-text-fix.diff, i#96047, thorsten
-[ Fixes ]
+[ Fixes < dev300-m39 ]
 basegfx-missing-inline-fix.diff, i#96585, thorsten
+[ Fixes ]
 canvas-directx-lostdevice-fix.diff, n#445628, thorsten
 
 # fix wrong en-US accelerators in Impress

Modified: trunk/patches/dev300/configures-explicit-arch.diff
==============================================================================
--- trunk/patches/dev300/configures-explicit-arch.diff	(original)
+++ trunk/patches/dev300/configures-explicit-arch.diff	Wed Jan 28 13:22:34 2009
@@ -13,8 +13,8 @@
 RCS file: /cvs/tools/config_office/bootstrap.1,v
 retrieving revision 1.21
 diff -u -u -r1.21 bootstrap.1
---- config_office/bootstrap.1	26 Jun 2007 17:48:08 -0000	1.21
-+++ config_office/bootstrap.1	11 Apr 2008 07:54:07 -0000
+--- bootstrap.1	26 Jun 2007 17:48:08 -0000	1.21
++++ bootstrap.1	11 Apr 2008 07:54:07 -0000
 @@ -36,7 +36,12 @@
              $GNUMAKE distclean || exit
          fi
@@ -34,8 +34,8 @@
 RCS file: /cvs/tools/config_office/set_soenv.in,v
 retrieving revision 1.168.4.1
 diff -u -u -r1.168.4.1 set_soenv.in
---- config_office/set_soenv.in	23 Jan 2008 17:07:28 -0000	1.168.4.1
-+++ config_office/set_soenv.in	11 Apr 2008 07:54:08 -0000
+--- set_soenv.in	23 Jan 2008 17:07:28 -0000	1.168.4.1
++++ set_soenv.in	11 Apr 2008 07:54:08 -0000
 @@ -1602,6 +1602,13 @@
  CreateFileHeader( *OUT_SH, $UPD, $platform, "sh/bash/ksh", "#" );
  CreateFileHeader( *OUT_BAT, $UPD, $platform, "4nt", "rem" ) if defined($outfile_bat);

Modified: trunk/patches/dev300/internal-mesa-headers-config_office.diff
==============================================================================
--- trunk/patches/dev300/internal-mesa-headers-config_office.diff	(original)
+++ trunk/patches/dev300/internal-mesa-headers-config_office.diff	Wed Jan 28 13:22:34 2009
@@ -1,5 +1,5 @@
---- config_office/configure.in	2008-03-17 12:31:19.000000000 +0100
-+++ config_office/configure.in	2008-03-17 12:38:18.000000000 +0100
+--- configure.in	2008-03-17 12:31:19.000000000 +0100
++++ configure.in	2008-03-17 12:38:18.000000000 +0100
 @@ -440,6 +440,9 @@
  AC_ARG_WITH(system-xrender,
  [  --with-system-xrender-headers  Use XRender headers already on system
@@ -31,8 +31,8 @@
  dnl Check for building neon
  dnl ===================================================================
  AC_MSG_CHECKING([whether to use neon])
---- config_office/set_soenv.in	2008-03-17 12:31:19.000000000 +0100
-+++ config_office/set_soenv.in	2008-03-17 12:38:55.000000000 +0100
+--- set_soenv.in	2008-03-17 12:31:19.000000000 +0100
++++ set_soenv.in	2008-03-17 12:38:55.000000000 +0100
 @@ -2043,6 +2043,7 @@
  ToFile( "LIBXSLT_LIBS",      "@LIBXSLT_LIBS@",     "e" );
  ToFile( "SYSTEM_SANE_HEADER","@SYSTEM_SANE_HEADER@","e" );

Modified: trunk/patches/dev300/novell-win32-agfa-monotype-fonts.diff
==============================================================================
--- trunk/patches/dev300/novell-win32-agfa-monotype-fonts.diff	(original)
+++ trunk/patches/dev300/novell-win32-agfa-monotype-fonts.diff	Wed Jan 28 13:22:34 2009
@@ -1,5 +1,5 @@
---- config_office/configure.in
-+++ config_office/configure.in
+--- configure.in
++++ configure.in
 @@ -75,6 +75,11 @@
                            distributions where AFM files or TrueType Fonts
                            are known to be available.

Modified: trunk/patches/dev300/ooo59127.vcl.honourcairofont.diff
==============================================================================
--- trunk/patches/dev300/ooo59127.vcl.honourcairofont.diff	(original)
+++ trunk/patches/dev300/ooo59127.vcl.honourcairofont.diff	Wed Jan 28 13:22:34 2009
@@ -274,8 +274,8 @@
 +
  
  .INCLUDE :	target.mk
---- config_office/configure.in        3 Nov 2006 14:25:09 -0000       1.184.2.2
-+++ config_office/configure.in        21 Dec 2006 16:36:54 -0000
+--- configure.in        3 Nov 2006 14:25:09 -0000       1.184.2.2
++++ configure.in        21 Dec 2006 16:36:54 -0000
 @@ -4466,6 +4466,10 @@
  
     if test "$ENABLE_GTK" = "TRUE" ; then

Modified: trunk/patches/dev300/seamonkey-is-iceape.diff
==============================================================================
--- trunk/patches/dev300/seamonkey-is-iceape.diff	(original)
+++ trunk/patches/dev300/seamonkey-is-iceape.diff	Wed Jan 28 13:22:34 2009
@@ -1,5 +1,5 @@
---- config_office/configure.in-old	2008-05-03 23:27:00.000000000 +0200
-+++ config_office/configure.in	2008-05-03 23:27:37.000000000 +0200
+--- configure.in-old	2008-05-03 23:27:00.000000000 +0200
++++ configure.in	2008-05-03 23:27:37.000000000 +0200
 @@ -511,7 +511,7 @@
                            components cannot be built against a contemporary
                            mozilla. The flavour used can be specified by

Modified: trunk/patches/dev300/system-lpsolve-rpath.diff
==============================================================================
--- trunk/patches/dev300/system-lpsolve-rpath.diff	(original)
+++ trunk/patches/dev300/system-lpsolve-rpath.diff	Wed Jan 28 13:22:34 2009
@@ -14,8 +14,8 @@
  SOFFICELIB=-lsofficeapp
  UNOPKGLIB=-lunopkgapp
  
---- config_office/configure.in-old	2008-04-29 12:59:49.000000000 +0200
-+++ config_office/configure.in	2008-04-29 13:00:07.000000000 +0200
+--- configure.in-old	2008-04-29 12:59:49.000000000 +0200
++++ configure.in	2008-04-29 13:00:07.000000000 +0200
 @@ -4772,7 +4772,7 @@
      AC_CHECK_HEADER(lpsolve/lp_lib.h, [],
         [ AC_MSG_ERROR(lpsolve headers not found.)], [])

Modified: trunk/patches/gstreamer/gstreamer-config-office.diff
==============================================================================
--- trunk/patches/gstreamer/gstreamer-config-office.diff	(original)
+++ trunk/patches/gstreamer/gstreamer-config-office.diff	Wed Jan 28 13:22:34 2009
@@ -1,7 +1,7 @@
 diff --git config_office/configure.in config_office/configure.in
 index 4ff07ea..bfe9198 100644
---- config_office/configure.in
-+++ config_office/configure.in
+--- configure.in
++++ configure.in
 @@ -908,6 +908,7 @@ case "$build_os" in
  	solaris*)
  		test_gtk=yes
@@ -71,8 +71,8 @@
  
 diff --git config_office/set_soenv.in config_office/set_soenv.in
 index 7f49931..7320345 100644
---- config_office/set_soenv.in
-+++ config_office/set_soenv.in
+--- set_soenv.in
++++ set_soenv.in
 @@ -1756,6 +1756,7 @@ ToFile( "ENABLE_DBUS",       "@ENABLE_DBUS@",      "e" );
  ToFile( "ENABLE_GCONF",      "@ENABLE_GCONF@",     "e" );
  ToFile( "ENABLE_GNOMEVFS",   "@ENABLE_GNOMEVFS@",  "e" );

Modified: trunk/patches/postgresql/sdbc-postgresql-config_office.diff
==============================================================================
--- trunk/patches/postgresql/sdbc-postgresql-config_office.diff	(original)
+++ trunk/patches/postgresql/sdbc-postgresql-config_office.diff	Wed Jan 28 13:22:34 2009
@@ -3,8 +3,8 @@
 RCS file: /cvs/tools/config_office/configure.in,v
 retrieving revision 1.209
 diff -u -u -r1.209 configure.in
---- config_office/configure.in	18 Jun 2007 16:36:20 -0000	1.209
-+++ config_office/configure.in	18 Jul 2007 16:01:44 -0000
+--- configure.in	18 Jun 2007 16:36:20 -0000	1.209
++++ configure.in	18 Jul 2007 16:01:44 -0000
 @@ -3226,6 +3226,23 @@
  AC_SUBST(HSQLDB_JAR)
  
@@ -34,8 +34,8 @@
 RCS file: /cvs/tools/config_office/set_soenv.in,v
 retrieving revision 1.149
 diff -u -u -r1.149 set_soenv.in
---- config_office/set_soenv.in        18 Jun 2007 16:36:33 -0000      1.149
-+++ config_office/set_soenv.in        19 Jul 2007 17:26:36 -0000
+--- set_soenv.in        18 Jun 2007 16:36:33 -0000      1.149
++++ set_soenv.in        19 Jul 2007 17:26:36 -0000
 @@ -1892,6 +1892,7 @@
  ToFile( "XINERAMA_LINK",     "@XINERAMA_LINK@",    "e" );
  ToFile( "SYSTEM_REDLAND",    "@SYSTEM_REDLAND@",   "e" );
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]