ooo-build r14264 - in branches/ooo-build-3-0: . patches/dev300

[szalaik svn gnome org]

Author: szalaik
Date: Thu Oct  9 12:19:23 2008
New Revision: 14264
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14264&view=rev

Log:
2008-10-09  Kalman Szalai - KAMI <kamihir freemail hu> 

	* patches/dev300/speed-symbolic-functions.diff
	* patches/dev300/pdfimport-system-poppler.diff:
	Fix patching, or wrong patch order?



Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/patches/dev300/pdfimport-system-poppler.diff
   branches/ooo-build-3-0/patches/dev300/speed-symbolic-functions.diff

Modified: branches/ooo-build-3-0/patches/dev300/pdfimport-system-poppler.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/pdfimport-system-poppler.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/pdfimport-system-poppler.diff	Thu Oct  9 12:19:23 2008
@@ -10,7 +10,7 @@
  AC_ARG_WITH(system-db,
  [  --with-system-db        Use berkeley db already on system
  ],,)
-@@ -5387,20 +5387,35 @@ AC_SUBST(ENABLE_PRESENTER_SCREEN)
+@@ -5387,20 +5387,34 @@ AC_SUBST(ENABLE_PRESENTER_SCREEN)
  
  AC_MSG_CHECKING([whether to build the PDF Import extension])
  if test -n "$enable_pdfimport" -a "$enable_pdfimport" != "no"; then

Modified: branches/ooo-build-3-0/patches/dev300/speed-symbolic-functions.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/speed-symbolic-functions.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/speed-symbolic-functions.diff	Thu Oct  9 12:19:23 2008
@@ -38,9 +38,9 @@
  ToFile( "HAVE_LD_HASH_STYLE","@HAVE_LD_HASH_STYLE@","e" );
 +ToFile( "HAVE_LD_BSYMBOLIC_FUNCTIONS",
 +		"@HAVE_LD_BSYMBOLIC_FUNCTIONS@","e" );
+ ToFile( "WITH_LINKER_HASH_STYLE","@WITH_LINKER_HASH_STYLE@","e" );
  ToFile( "CXX",               $CXX,               "e" );
  ToFile( "MINGWCXX",          "@MINGWCXX@",       "e" );
- ToFile( "MINGWSTRIP",        "@MINGWSTRIP@",     "e" );
 --- solenv/inc/unxlngi6.mk.old	2008-01-28 18:31:50.000000000 +0100
 +++ solenv/inc/unxlngi6.mk	2008-01-28 18:49:03.000000000 +0100
 @@ -157,6 +157,9 @@ LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$