ooo-build r15506 - in trunk: . bin/piece patches/dev300

[pmladek svn gnome org]

Author: pmladek
Date: Mon Mar  9 14:23:20 2009
New Revision: 15506
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15506&view=rev

Log:
2009-03-09  Petr Mladek  <pmladek suse cz>

	* default tag ooo310-m4		(builds here)

	* patches/dev300/piece-reportbuilder.diff:
	* patches/dev300/piece-jfreereport.diff: fix split build with
	  ooo310-m4
	* bin/piece/env-libs-gui: copied from env-libs_gui

	* patches/dev300/ucb-neon-0.24.diff: fix ooo310-m4 build with neon-0.24



Added:
   trunk/bin/piece/env-libs-gui   (props changed)
      - copied unchanged from r15494, /trunk/bin/piece/env-libs_gui
   trunk/patches/dev300/piece-jfreereport.diff
   trunk/patches/dev300/ucb-neon-0.24.diff
Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/patches/dev300/apply
   trunk/patches/dev300/piece-reportbuilder.diff

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Mar  9 14:23:20 2009
@@ -3,7 +3,7 @@
 AC_CONFIG_SRCDIR(bin/build-ooo)
 AC_PREFIX_DEFAULT(/usr)
 
-DEFAULT_TAG=ooo310-m2
+DEFAULT_TAG=ooo310-m4
 # For the upstream packages it is like:
 # DEFAULT_TAG=OOO310_m1
 

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Mar  9 14:23:20 2009
@@ -1198,10 +1198,14 @@
 # allow to use the prebuilt jsr173_1.0_api.jar
 build-prebuilt-stax.diff, i#93116, pmladek
 
-[ BuildBits < ooo310-m5 ]
+[ BuildBits < dev300-m44 < ooo310-m5 ]
 # fix MIPS build with OpenJDK
 config_office-openjdk-paths-mips.diff
 
+[ BuildBits >= dev300-m43 >= ooo310-m4 ]
+# fix build with neon-0.24
+ucb-neon-0.24.diff, pmladek
+
 [ Java14 ]
 
 # enable build with Java 1.4; can't go upstream
@@ -2868,6 +2872,7 @@
 piece-desktop-avoid-user-conf-symlinks.diff, pmladek
 
 [ PieceBits >= dev300-m43 >= ooo310-m4 ]
+piece-jfreereport.diff
 piece-reportbuilder.diff
 
 [ PieceBits < dev300-m43 < ooo310-m4 ]

Added: trunk/patches/dev300/piece-jfreereport.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/piece-jfreereport.diff	Mon Mar  9 14:23:20 2009
@@ -0,0 +1,11 @@
+--- jfreereport/java/libbase/makefile.mk.old	2009-03-04 20:22:23.000000000 +0100
++++ jfreereport/java/libbase/makefile.mk	2009-03-09 14:26:49.000000000 +0100
+@@ -70,7 +70,7 @@ $(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) :
+ ALLTAR : $(CLASSDIR)$/$(TARGET)$(VERSION).jar 
+ 
+ $(CLASSDIR)$/commons-logging-1.1.1.jar : 
+-	$(COPY) $(SOLARBINDIR)$/commons-logging-1.1.1.jar $(CLASSDIR)$/commons-logging-1.1.1.jar
++	$(COPY) $(SOLARPIECE)$/$(INPATH)$/bin$/commons-logging-1.1.1.jar $(CLASSDIR)$/commons-logging-1.1.1.jar
+ 	
+ $(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(CLASSDIR)$/commons-logging-1.1.1.jar $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+ 	$(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)$(VERSION).jar

Modified: trunk/patches/dev300/piece-reportbuilder.diff
==============================================================================
--- trunk/patches/dev300/piece-reportbuilder.diff	(original)
+++ trunk/patches/dev300/piece-reportbuilder.diff	Mon Mar  9 14:23:20 2009
@@ -117,3 +117,16 @@
  PROCESSOUT=$(MISC)$/$(EXTNAME)
  PROCESSORDIR=$(SOLARBINDIR)
  
+--- reportbuilder/util/makefile.mk.old	2009-03-04 20:21:55.000000000 +0100
++++ reportbuilder/util/makefile.mk	2009-03-09 14:42:27.000000000 +0100
+@@ -130,6 +130,10 @@ $(EXTENSIONDIR)$/%.jar : $(SOLARBINDIR)$
+ 	@@-$(MKDIRHIER) $(@:d)
+     $(COPY) $< $@
+ 
++$(EXTENSIONDIR)$/%.jar : $(SOLARPIECE)$/$(INPATH)$/bin$/%.jar
++	@@-$(MKDIRHIER) $(@:d)
++    $(COPY) $< $@
++
+ $(EXTENSIONDIR)$/readme_en-US.% : $(PRJ)$/license$/readme_en-US.%
+ 	@@-$(MKDIRHIER) $(@:d)
+     $(COPY) $< $@

Added: trunk/patches/dev300/ucb-neon-0.24.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/ucb-neon-0.24.diff	Mon Mar  9 14:23:20 2009
@@ -0,0 +1,19 @@
+--- ucb/source/ucp/webdav/NeonSession.cxx.old	2009-02-26 09:39:43.000000000 +0100
++++ ucb/source/ucp/webdav/NeonSession.cxx	2009-03-09 13:25:15.000000000 +0100
+@@ -763,11 +763,13 @@ void NeonSession::Init()
+         // Note: Calling ne_set_[server|proxy]_auth more than once per
+         //       m_pHttpSession instance sometimes(?) crashes Neon! ( last
+         //       checked: 0.22.0)
+-        //ne_set_server_auth( m_pHttpSession, NeonSession_NeonAuth, this );
++#if NEON_VERSION >= 0x0260
+ 		ne_add_server_auth( m_pHttpSession, NE_AUTH_ALL, NeonSession_NeonAuth, this ); 
+-        //ne_set_proxy_auth ( m_pHttpSession, NeonSession_NeonAuth, this );
+ 		ne_add_proxy_auth ( m_pHttpSession, NE_AUTH_ALL, NeonSession_NeonAuth, this );
+-
++#else
++		ne_set_server_auth( m_pHttpSession, NeonSession_NeonAuth, this );
++		ne_set_proxy_auth ( m_pHttpSession, NeonSession_NeonAuth, this );
++#endif
+     }
+ }
+