GNOME.org
 

ooo-build r13207 - in trunk: . bin patches/dev300 patches/evo2 patches/postgresql

Author: rengelhard
Date: Mon Jul 14 23:42:43 2008
New Revision: 13207
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13207&view=rev

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

        * bin/unpack: add -libs_extern_sys to CORE_PKGS as some of the patches
          patch e.g. berkeleydb and it fails if it's not exctracted
        * patches/dev300/apply,
          patches/dev300/zoom-combobox.diff,
          patches/dev300/zoom-combobox-m22.diff,
          patches/dev300/tango-icons-default-w32.diff,
          patches/dev300/tango-icons-default-w32-m23.diff,
          patches/postgresql/sdbc-postgresql-config_office.diff
          patches/postgresql/sdbc-postgresql-config_office-m22.diff,
          patches/evo2/default-evo2-ab.diff,
          patches/evo2/default-evo2-ab-m23.diff: more dev300-m23/-24. still
          much to go


Added:
   trunk/patches/dev300/tango-icons-default-w32-m23.diff
      - copied unchanged from r13205, /trunk/patches/dev300/tango-icons-default-w32.diff
   trunk/patches/dev300/zoom-combobox-m22.diff
      - copied unchanged from r13205, /trunk/patches/dev300/zoom-combobox.diff
   trunk/patches/evo2/default-evo2-ab-m23.diff   (props changed)
      - copied unchanged from r13205, /trunk/patches/evo2/default-evo2-ab.diff
   trunk/patches/postgresql/sdbc-postgresql-config_office-m22.diff   (props changed)
      - copied unchanged from r13205, /trunk/patches/postgresql/sdbc-postgresql-config_office.diff
Modified:
   trunk/ChangeLog
   trunk/bin/unpack
   trunk/patches/dev300/apply
   trunk/patches/dev300/tango-icons-default-w32.diff
   trunk/patches/dev300/zoom-combobox.diff
   trunk/patches/evo2/default-evo2-ab.diff
   trunk/patches/postgresql/sdbc-postgresql-config_office.diff

Modified: trunk/bin/unpack
==============================================================================
--- trunk/bin/unpack	(original)
+++ trunk/bin/unpack	Mon Jul 14 23:42:43 2008
@@ -57,7 +57,7 @@
 	if test "z$PIECE" != "z"; then
 		CORE_PKGS=$PIECE
 	else
-		CORE_PKGS="sdk ure base calc l10n writer impress artwork filters testing bootstrap libs_gui libs_core libs_extern components postprocess"
+		CORE_PKGS="sdk ure base calc l10n writer impress artwork filters testing bootstrap libs_gui libs_core libs_extern libs_extern_sys components postprocess"
 	fi
 	for pkg in $CORE_PKGS; do
 		check_tarball "$OOO_SPLIT_PREFIX$pkg.tar.bz2"
@@ -589,11 +589,7 @@
 if ! echo $CONFIGURE_OPTIONS $PROPAGATED_ARCHS | grep -q disable-mediawiki; then
   SWEXT_PACKAGE=$CVSTAG-swext.tar.bz2
   check_tarball $SRCDIR/$SWEXT_PACKAGE
-  if echo $SWEXT_PACKAGE | grep -q bz2; then \
-      tar xfj $SRCDIR/$SWEXT_PACKAGE -C $OOBUILDDIR
-  else
-      tar xfz $SRCDIR/$SWEXT_PACKAGE -C $OOBUILDDIR
-  fi
+  tar xfj $SRCDIR/$SWEXT_PACKAGE -C $OOBUILDDIR
 fi
 
 # OxygenOffice extras

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Jul 14 23:42:43 2008
@@ -612,12 +612,19 @@
 sw-html-insert-unknown-tags.diff, i#59064, mloiseleur
 
 
-[ CalcFixes ]
+[ CalcFixes < dev300-m23 ]
+# Replace usability numb Zoom dialog with a Combo Box
+# FIXME: this conflicts with Sun's duplication of this work,
+# eg. print preview
+zoom-combobox-m22.diff, michael
+
+[ CalcFixes >= dev300-m23 ]
 # Replace usability numb Zoom dialog with a Combo Box
 # FIXME: this conflicts with Sun's duplication of this work,
 # eg. print preview
 zoom-combobox.diff, michael
 
+[ CalcFixes ]
 # make some symbols from sc visible when compiling with gcc4, necessary since m121
 gcc4-visibility-sc.diff, i#53261, pmladek
 # Fix for b.x.c 62193
@@ -1241,7 +1248,7 @@
 #FIXME src680: system-libc.diff, i#69033, rengelha
 
 
-[ Icons ]
+[ Icons < dev300-m24 ]
 # Make insensitive toolbar icons look far nicer
 gui-insensitive.diff, i#35555, michael
 
@@ -1249,6 +1256,11 @@
 # default to large icons in the toolbar
 gui-toolbox-large-icons.diff, jholesov
 
+[ TangoIcons < dev300-m24 ]
+# use it by default under Win32
+tango-icons-default-w32-m23.diff, n#254855, pmladek
+
+[ TangoIcons >= dev300-m24 ]
 # use it by default under Win32
 tango-icons-default-w32.diff, n#254855, pmladek
 
@@ -1301,6 +1313,7 @@
 # Let the KDE and Gtk+ fpickers build and install FIXME IZ number
 fpicker-common-scp2.diff, jholesov
 
+[ Fpickers < dev300-m23 ]
 # Missing accel in Gtk+ fpicker. n#354447
 fpicker-gtk-accel-n354447.diff, n#354447, hub
 
@@ -1691,7 +1704,13 @@
 [ PostgreSQL ]
 sdbc-postgresql.diff
 sdbc-postgresql-build-lst.diff
+
+[ PostgreSQL < dev300-m23 ]
+sdbc-postgresql-config_office-m22.diff
+[ PostgreSQL >= dev300-m23 ]
 sdbc-postgresql-config_office.diff
+
+[ PostgreSQL ]
 connectivity-workben-postgresql.diff
 gcc-4.3-postgresql.diff
 

Modified: trunk/patches/dev300/tango-icons-default-w32.diff
==============================================================================
--- trunk/patches/dev300/tango-icons-default-w32.diff	(original)
+++ trunk/patches/dev300/tango-icons-default-w32.diff	Mon Jul 14 23:42:43 2008
@@ -1,12 +1,12 @@
 --- vcl/source/app/settings.cxx.old1	2007-03-28 20:48:59.000000000 +0200
 +++ vcl/source/app/settings.cxx	2007-03-28 20:46:36.000000000 +0200
-@@ -803,7 +803,8 @@ ULONG StyleSettings::GetCurrentSymbolsSt
- 			{
- 				const ::rtl::OUString &rDesktopEnvironment = Application::GetDesktopEnvironment();
+@@ -812,7 +812,8 @@
  
--				if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "gnome" ) )
-+				if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "gnome" ) ||
-+				    rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "windows" ) )
- 					snFallbackDesktopStyle = STYLE_SYMBOLS_TANGO;
- 				else if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "kde" ) )
- 					snFallbackDesktopStyle = STYLE_SYMBOLS_CRYSTAL;
+     if( bCont )
+     {
+-        if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "gnome" ) )
++        if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "gnome" ) ||
++	     rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "windows" ) )
+             nRet = STYLE_SYMBOLS_TANGO;
+         else if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "kde" ) )
+             nRet = STYLE_SYMBOLS_CRYSTAL;

Modified: trunk/patches/dev300/zoom-combobox.diff
==============================================================================
--- trunk/patches/dev300/zoom-combobox.diff	(original)
+++ trunk/patches/dev300/zoom-combobox.diff	Mon Jul 14 23:42:43 2008
@@ -27,20 +27,21 @@
 diff -u -r1.38 helpid.hrc
 --- svx/inc/helpid.hrc	30 Apr 2003 08:23:57 -0000	1.38
 +++ svx/inc/helpid.hrc	17 Aug 2003 16:31:26 -0000
-@@ -768,6 +768,7 @@
- #define HID_SVX_OPTIONS_ONLINEUPDATE                (HID_SVX_EXT0_START + 186)
- #define HID_OPTIONS_CHART_DEFCOLORS                 (HID_SVX_EXT0_START + 187)
- #define HID_OPTIONS_MULTIPATH_LIST                  (HID_SVX_EXT0_START + 188)
-+#define HID_ZOOM_COMBOBOX                           (HID_SVX_EXT0_START + 189)
+@@ -807,6 +807,8 @@
+ 
+ #define HID_NUMBERFORMAT_WND_NUMBER_PREVIEW         (HID_SVX_EXT0_START + 207)
  
++#define HID_ZOOM_COMBOBOX                           (HID_SVX_EXT0_START + 189)
++
  // please adjust ACT_SVX_HID_END2 below if you add entries here!
  
-@@ -806,7 +806,7 @@
+ // -----------------------------------------------------------------------
+@@ -818,7 +820,7 @@
  #error Resource-Ueberlauf in #line, #file
  #endif
  
--#define ACT_SVX_HID_END2        HID_OPTIONS_MULTIPATH_LIST
-+#define ACT_SVX_HID_END2        HID_ZOOM_COMBOBOX
+-#define ACT_SVX_HID_END2    HID_NUMBERFORMAT_WND_NUMBER_PREVIEW
++#define ACT_SVX_HID_END2    HID_ZOOM_COMBOBOX
  #if ACT_SVX_HID_END2 > HID_SVX_EXT0_END
  #error resource overrun in #line, #file
  #endif

Modified: trunk/patches/evo2/default-evo2-ab.diff
==============================================================================
--- trunk/patches/evo2/default-evo2-ab.diff	(original)
+++ trunk/patches/evo2/default-evo2-ab.diff	Mon Jul 14 23:42:43 2008
@@ -1,17 +1,16 @@
 --- extensions/source/abpilot/abspilot.cxx	19 Dec 2005 17:26:24 -0000	1.13
 +++ extensions/source/abpilot/abspilot.cxx	16 Feb 2006 12:45:38 -0000
-@@ -151,12 +151,9 @@ namespace abp
- 		m_pCancel->SetClickHdl( LINK( this, OAddessBookSourcePilot, OnCancelClicked) );
- 
+@@ -124,11 +124,9 @@
  		// some initial settings
--#ifdef WITH_MOZILLA
- #ifdef UNX
+ #ifdef MACOSX
+         m_aSettings.eType = AST_MACAB;
+-#elif WITH_MOZILLA
+-#ifdef UNX
 -		m_aSettings.eType = AST_MORK;
--#else
+ #else
 -		m_aSettings.eType = AST_OE;
--#endif
 +// FIXME: if KDE use KAB instead
 +		m_aSettings.eType = AST_EVOLUTION;
+ #endif
  #else
  		m_aSettings.eType = AST_OTHER;
- #endif

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	Mon Jul 14 23:42:43 2008
@@ -37,9 +37,9 @@
 --- 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
 @@ -1892,6 +1892,7 @@
- ToFile( "ENABLE_JAM",        "@ENABLE_JAM@",       "e" );
- ToFile( "USE_XINERAMA",      "@USE_XINERAMA@",     "e" );
  ToFile( "XINERAMA_LINK",     "@XINERAMA_LINK@",    "e" );
+ ToFile( "SYSTEM_REDLAND",    "@SYSTEM_REDLAND@",   "e" );
+ ToFile( "REDLAND_LIBS",      "@REDLAND_LIBS@",     "e" );
 +ToFile( "SYSTEM_POSTGRESQL",  "@SYSTEM_POSTGRESQL@", "e" );
  ToFile( "SYSTEM_HUNSPELL",   "@SYSTEM_HUNSPELL@",  "e" );
  ToFile( "HUNSPELL_CFLAGS",   "@HUNSPELL_CFLAGS@",  "e" );
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]